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.

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

8322957: Generational ZGC: Relocation selection must join the STS #189

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jan 17, 2024

Clean backport to fix Generational ZGC.

FYI @fisk, @stefank, I am picking this up to 21u. Tell me if this is a bad idea :)

Additional testing:

  • Linux x86_64 server fastdebug, hotspot_gc with -XX:+UseZGC -XX:+ZGenerational
  • Linux x86_64 server fastdebug, tier{1,2,3,4}
  • Linux x86_64 server fastdebug, tier{1,2,3,4} with -XX:+UseZGC -XX:+ZGenerational (some failures, look pre-existing; e.g. serviceability/sa and friends)

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8322957 needs maintainer approval

Issue

  • JDK-8322957: Generational ZGC: Relocation selection must join the STS (Bug - P2 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/189/head:pull/189
$ git checkout pull/189

Update a local copy of the PR:
$ git checkout pull/189
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/189/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 189

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/189.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 17, 2024

👋 Welcome back shade! 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 openjdk bot changed the title Backport ba23025cd8a9c1af37afea6444ce5ea2ff41e5af 8322957: Generational ZGC: Relocation selection must join the STS Jan 17, 2024
@openjdk
Copy link

openjdk bot commented Jan 17, 2024

This backport pull request has now been updated with issue from the original commit.

@shipilev shipilev force-pushed the JDK-8322957-zgc-sts-relocation branch from ba2c33f to 25c2659 Compare January 17, 2024 15:59
Copy link

@fisk fisk left a comment

Choose a reason for hiding this comment

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

Sounds like a good idea.

@shipilev shipilev marked this pull request as ready for review January 17, 2024 18:01
@openjdk
Copy link

openjdk bot commented Jan 17, 2024

⚠️ @shipilev This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 17, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 17, 2024

Webrevs

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.

Thanks for taking care of this backport!

@stefank
Copy link
Member

stefank commented Jan 17, 2024

Linux x86_64 server fastdebug, hotspot_gc with +ZGenerational

Just to be sure, you're running this with -XX:+ZGenerational together with -XX:+UseZGC? I just want to make sure that you don't accidentally run G1 when testing this.

@shipilev
Copy link
Member Author

shipilev commented Jan 17, 2024

Linux x86_64 server fastdebug, hotspot_gc with +ZGenerational

Just to be sure, you're running this with -XX:+ZGenerational together with -XX:+UseZGC? I just want to make sure that you don't accidentally run G1 when testing this.

Yes, of course. I meant to indicate that I ran the tests with Generational ZGC. I am running even more tests now, and would request push approvals next week. Thanks for chiming in here!

@shipilev
Copy link
Member Author

/approval request Clean backport to fix Generational ZGC. Applies cleanly. Tests pass. 21u PR is acked by ZGC devs.

@openjdk
Copy link

openjdk bot commented Jan 22, 2024

@shipilev
8322957: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jan 22, 2024
@openjdk
Copy link

openjdk bot commented Feb 6, 2024

@shipilev 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:

8322957: Generational ZGC: Relocation selection must join the STS

Reviewed-by: eosterlund, stefank

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 62 new commits pushed to the master branch:

  • f15349b: 8313670: Simplify shared lib name handling code in some tests
  • e75ca5a: 8309697: [TESTBUG] Remove "@requires vm.flagless" from jtreg vectorization tests
  • 38c5df1: 8323637: Capture hotspot replay files in GHA
  • 0b79e90: 8324937: GHA: Avoid multiple test suites per job
  • c6ebfdf: 8320052: Zero: Use __atomic built-ins for atomic RMW operations
  • ffab458: 8319382: com/sun/jdi/JdwpAllowTest.java shows failures on AIX if prefixLen of mask is larger than 32 in IPv6 case
  • 869df3b: 8323101: C2: assert(n->in(0) == nullptr) failed: divisions with zero check should already have bailed out earlier in split-if
  • 0466741: 8315611: Open source swing text/html and tree test
  • c971925: 8318157: RISC-V: implement ensureMaterializedForStackWalk intrinsic
  • 2518d20: 8323154: C2: assert(cmp != nullptr && cmp->Opcode() == Op_Cmp(bt)) failed: no exit test
  • ... and 52 more: https://git.openjdk.org/jdk21u-dev/compare/95142cf93bb6ac1abe085af51dac91b8e2bd739e...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 openjdk bot added ready Pull request is ready to be integrated and removed approval labels Feb 6, 2024
@shipilev
Copy link
Member Author

shipilev commented Feb 6, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Feb 6, 2024

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

  • f15349b: 8313670: Simplify shared lib name handling code in some tests
  • e75ca5a: 8309697: [TESTBUG] Remove "@requires vm.flagless" from jtreg vectorization tests
  • 38c5df1: 8323637: Capture hotspot replay files in GHA
  • 0b79e90: 8324937: GHA: Avoid multiple test suites per job
  • c6ebfdf: 8320052: Zero: Use __atomic built-ins for atomic RMW operations
  • ffab458: 8319382: com/sun/jdi/JdwpAllowTest.java shows failures on AIX if prefixLen of mask is larger than 32 in IPv6 case
  • 869df3b: 8323101: C2: assert(n->in(0) == nullptr) failed: divisions with zero check should already have bailed out earlier in split-if
  • 0466741: 8315611: Open source swing text/html and tree test
  • c971925: 8318157: RISC-V: implement ensureMaterializedForStackWalk intrinsic
  • 2518d20: 8323154: C2: assert(cmp != nullptr && cmp->Opcode() == Op_Cmp(bt)) failed: no exit test
  • ... and 52 more: https://git.openjdk.org/jdk21u-dev/compare/95142cf93bb6ac1abe085af51dac91b8e2bd739e...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 6, 2024

@shipilev Pushed as commit 85f4f38.

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

@shipilev shipilev deleted the JDK-8322957-zgc-sts-relocation branch February 7, 2024 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
3 participants