Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8330647: Two CDS tests fail with -UseCompressedOops and UseSerialGC/UseParallelGC #19274

Closed
wants to merge 6 commits into from
Closed

8330647: Two CDS tests fail with -UseCompressedOops and UseSerialGC/UseParallelGC #19274

wants to merge 6 commits into from

Conversation

calvinccheung
Copy link
Member

@calvinccheung calvinccheung commented May 16, 2024 •
edited by openjdk bot

The following two tests contain @requires vm.cds.write.archived.java.heap which implies UseG1GC && UseCompressedClassPointers

cds/appcds/cacheObject/ArchiveHeapTestClass.java
cds/serviceability/ReplaceCriticalClassesForSubgraphs.java

The tests would fail if options conflicting with vm.cds.write.archived.java.heap are specified via the -Dtest.cds.runtime.options property because the options would be added after the @require check.

A fix is to check if the -Dtest.cds.runtime.options property contains non-null value and throws a SkippedException.

Update:
The checking of the -Dtest.cds.runtime.options property is now performed in VMProps.java.

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8330647: Two CDS tests fail with -UseCompressedOops and UseSerialGC/UseParallelGC (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/19274/head:pull/19274
$ git checkout pull/19274

Update a local copy of the PR:
$ git checkout pull/19274
$ git pull https://git.openjdk.org/jdk.git pull/19274/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19274

View PR using the GUI difftool:
$ git pr show -t 19274

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/19274.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 16, 2024

👋 Welcome back ccheung! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented May 16, 2024 •
edited

@calvinccheung This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8330647: Two CDS tests fail with -UseCompressedOops and UseSerialGC/UseParallelGC

Reviewed-by: dholmes, iklam

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 160 new commits pushed to the master branch:

  • 0a9d1f8: 8332749: Broken link in MemorySegment.Scope.html
  • c9a7b97: 8332829: [BACKOUT] C2: crash in compiled code because of dependency on removed range check CastIIs
  • 7fd9d6c: 8332340: Add JavacBench as a test case for CDS
  • 417d174: 8331348: Some incremental builds deposit files in the make directory
  • 303ac9f: 8332671: Logging for pretouching thread stacks shows wrong memory range
  • 90758f6: 8332808: Always set java.io.tmpdir to a suitable value in the build
  • e19a421: 8332720: ubsan: instanceKlass.cpp:3550:76: runtime error: member call on null pointer of type 'struct Array'
  • 2581935: 8332528: Generate code in SwitchBootstraps.generateTypeSwitch that require fewer adaptations
  • b890336: 8328083: degrade virtual thread support for GetObjectMonitorUsage
  • 4e6d851: 8325324: Implement JEP 477: Implicitly Declared Classes and Instance Main Methods (Third Preview)
  • ... and 150 more: https://git.openjdk.org/jdk/compare/a643d6c7ac8a7bc0d3a288c1ef3f07876cf70590...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk
Copy link

openjdk bot commented May 16, 2024

@calvinccheung The following label will be automatically applied to this pull request:

  • hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label May 16, 2024
@calvinccheung calvinccheung marked this pull request as ready for review May 16, 2024 22:03
@openjdk openjdk bot added the rfr Pull request is ready for review label May 16, 2024
@mlbridge
Copy link

mlbridge bot commented May 16, 2024 •
edited

Webrevs

dholmes-ora
dholmes-ora reviewed May 17, 2024
View reviewed changes
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't the code that implements the @requires check also check for that property?

@calvinccheung
Copy link
Member Author

calvinccheung commented May 17, 2024 •
edited

Can't the code that implements the @requires check also check for that property?

Yes, I've reverted the changes in the tests and added the checking of the test.cds.runtime.options property in VMProps.java.
Also, instead of just checking for null value, it checks for if any of the options is not compatible with writing Java heap objects into the CDS archive.

dholmes-ora
dholmes-ora reviewed May 20, 2024
View reviewed changes
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update looks good. One query below. Thanks

test/jtreg-ext/requires/VMProps.java Outdated Show resolved Hide resolved
iklam
iklam approved these changes May 21, 2024
View reviewed changes
Copy link
Member

@iklam iklam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 21, 2024
dholmes-ora
dholmes-ora reviewed May 22, 2024
View reviewed changes
test/jtreg-ext/requires/VMProps.java Outdated
Comment on lines 479 to 484
for (String opt : jtropts.split(",")) {
if (opt.equals(CCP_DISABLED))
return false;
if (opt.startsWith(GC_PREFIX) && opt.endsWith(GC_SUFFIX) &&
!opt.equals(G1GC_ENABLED))
return false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on the bug report both of these conditions are needed to be enabled for there to be a problem, but you exclude based on either -XX:-UseCompressedClassPointers" or any non-G1 GC. ??

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've checked again, without the fix, the test fails if running with either -Dtest.cds.runtime.options=-XX:-UseCompressedClassPointers or any non-G1GC such as -Dtest.cds.runtime.options=-XX:+UseZGC.

stefank
stefank suggested changes May 22, 2024
View reviewed changes
Copy link
Member

@stefank stefank left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not a review of the functional changes of this fix, but since this patch does change the shared VMProps.java file I have some style requests.

test/jtreg-ext/requires/VMProps.java Outdated Show resolved Hide resolved
test/jtreg-ext/requires/VMProps.java
* @return true if the VM options specified via the "test.cds.runtime.options"
* property is compatible with writing Java heap objects into the CDS archive
*/
protected boolean isCDSRuntimeOptionsCompatible() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add braces for all the added if statements.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You missed this one:

        if (jtropts == null)
            return true;

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

stefank
stefank suggested changes May 23, 2024
View reviewed changes
test/jtreg-ext/requires/VMProps.java
* @return true if the VM options specified via the "test.cds.runtime.options"
* property is compatible with writing Java heap objects into the CDS archive
*/
protected boolean isCDSRuntimeOptionsCompatible() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You missed this one:

        if (jtropts == null)
            return true;

dholmes-ora
dholmes-ora approved these changes May 23, 2024
View reviewed changes
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay that seems fine if either condition disables writing into the CDS archive.

Thanks

@calvinccheung
Copy link
Member Author

Thanks @iklam @dholmes-ora @stefank @turbanoff for the review.

/integrate

@openjdk
Copy link

openjdk bot commented May 24, 2024

Going to push as commit c2cca2a.
Since your change was applied there have been 176 commits pushed to the master branch:

  • 6d2aeb8: 8332745: Method::is_vanilla_constructor is never used
  • cfdc64f: 8331291: java.lang.classfile.Attributes class performs a lot of static initializations
  • 0c934ff: 8325520: Vector loads and stores with indices and masks incorrectly compiled
  • c099f14: 8305457: Implement java.io.IO
  • 6a35311: 8241550: [macOS] SSLSocketImpl/ReuseAddr.java failed due to "BindException: Address already in use"
  • f16265d: 8332226: "Invalid package name:" from source launcher
  • 5a2ba95: 8325841: Remove unused references to vmSymbols.hpp
  • 239c1b3: 8332807: Parallel: Make some APIs in ParMarkBitMap private
  • 9b61a76: 8332615: RISC-V: Support vector unsigned comparison instructions for machines with RVV
  • a71b404: 8331398: G1: G1HeapRegionPrinter reclamation events should print the original region type
  • ... and 166 more: https://git.openjdk.org/jdk/compare/a643d6c7ac8a7bc0d3a288c1ef3f07876cf70590...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 24, 2024
@openjdk openjdk bot closed this May 24, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 24, 2024
@openjdk
Copy link

openjdk bot commented May 24, 2024

@calvinccheung Pushed as commit c2cca2a.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@calvinccheung calvinccheung deleted the 8330647-CDS-test-fail-ParallelGC branch May 24, 2024 16:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@turbanoff turbanoff turbanoff left review comments

@stefank stefank stefank requested changes

@iklam iklam iklam approved these changes

@dholmes-ora dholmes-ora dholmes-ora approved these changes

Assignees
No one assigned
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
5 participants
@calvinccheung @turbanoff @iklam @stefank @dholmes-ora