Skip to content

Conversation

@tkrodriguez
Copy link
Contributor

@tkrodriguez tkrodriguez commented May 30, 2024

This exposes the required values for JVMCI to support generational ZGC. It includes a few things worth mentioning. JVMCI still exports XBarrierSetRuntime as fields in CompilerToVM::Data under the original name of ZBarrierSetRuntime. I have exported the XBarrierSetRuntime and ZBarrierSetRuntime functions as addresses under their actual name. This permits backward compatibility until all the required parts are in place. We can eventually delete the CompilerToVM::Data names.

I added ZBarrierSetRuntime::load_barrier_on_oop_array paralleling XBarrierSetRuntime::load_barrier_on_oop_array as we use that for a vector barrier. I could create the function as part of JVMCIRuntime if there are any concerns about including that in the ZGC core.


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-8333300: [JVMCI] add support for generational ZGC (Enhancement - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19490

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 30, 2024

👋 Welcome back never! 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 30, 2024

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

8333300: [JVMCI] add support for generational ZGC

Reviewed-by: dnsimon, kvn, eosterlund

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

  • a81e1bf: 8332252: Clean up vmTestbase/vm/share
  • 99e4d77: 8333117: Remove support of remote and manual debuggee launchers
  • 9ef86da: 8334170: bug6492108.java test failed with exception Image comparison failed at (0, 0) for image 4
  • 001d686: 8332587: RISC-V: secondary_super_cache does not scale well
  • 5cad0b4: 8322708: Global HTML attributes are not allowed
  • 6420846: 8334396: RISC-V: verify perf of ReverseBytesI/L
  • c6f3bf4: 8334026: Provide a diagnostic PrintMemoryMapAtExit switch on Linux
  • cabd104: 8334164: The fix for JDK-8322811 should use _filename.is_set() rather than strcmp()
  • d7dad50: 8334544: C2: wrong control assigned in PhaseIdealLoop::clone_assertion_predicate_for_unswitched_loops()
  • ff30240: 8334239: Introduce macro for ubsan method/function exclusions
  • ... and 1 more: https://git.openjdk.org/jdk/compare/fad6644eabbad6b6d3472206d9db946408aca612...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 the rfr Pull request is ready for review label May 30, 2024
@openjdk
Copy link

openjdk bot commented May 30, 2024

@tkrodriguez The following labels will be automatically applied to this pull request:

  • graal
  • hotspot

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

@openjdk openjdk bot added graal graal-dev@openjdk.org hotspot hotspot-dev@openjdk.org labels May 30, 2024
@mlbridge
Copy link

mlbridge bot commented May 30, 2024

Webrevs

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 30, 2024
Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

nmethod.cpp changes are fine.
ZGC changes have to be reviewed by GC group.

How you tested it to exercise new code (GenZGC + Graal)?

@vnkozlov
Copy link
Contributor

And it broke RISC build based on GHA failure for cross compilation.

@tkrodriguez
Copy link
Contributor Author

Testing of the combined Graal and JVMCI changes are in progress. I hit one main failure that I'm investigating and think I see the problem. I'll put it the combo all together for testing once I've got that resolved.

Copy link
Contributor

@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.

Great work. Looks good.

@tkrodriguez
Copy link
Contributor Author

There was one fix I needed to include to use NativeAccess to read from the JVMCI handles when repacking them. It's only checking for null and not actually accessing the contents so it was benignly broken with singlegen ZGC. Generational ZGC includes new verify oop logic which was catching this.

@openjdk
Copy link

openjdk bot commented Jun 4, 2024

⚠️ @tkrodriguez This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@dougxc
Copy link
Member

dougxc commented Jun 9, 2024

@vnkozlov @fisk any feedback on changes since you approved? I'd love to merge this asap.

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Last version is good.

@dougxc
Copy link
Member

dougxc commented Jun 10, 2024

Thanks for all the reviews and input. I'm integrating this on Tom's behalf since he is on vacation.

/integrate

@openjdk
Copy link

openjdk bot commented Jun 10, 2024

@dougxc Only the author (@tkrodriguez) is allowed to issue the integrate command.

@fisk
Copy link
Contributor

fisk commented Jun 10, 2024

Still good.

@xmas92
Copy link
Member

xmas92 commented Jun 10, 2024

Just note it still says JVMIC.

@tkrodriguez
Copy link
Contributor Author

I've tested against latest bits and everything was clean. Thanks for the reviews.

/integrate

@openjdk
Copy link

openjdk bot commented Jun 20, 2024

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

  • de8ee97: 8334333: MissingResourceCauseTestRun.java fails if run by root
  • 265a0f5: 8334490: Normalize string with locale invariant toLowerCase()
  • 1b1dba8: 8333358: java/io/IO/IO.java test fails intermittently
  • a81e1bf: 8332252: Clean up vmTestbase/vm/share
  • 99e4d77: 8333117: Remove support of remote and manual debuggee launchers
  • 9ef86da: 8334170: bug6492108.java test failed with exception Image comparison failed at (0, 0) for image 4
  • 001d686: 8332587: RISC-V: secondary_super_cache does not scale well
  • 5cad0b4: 8322708: Global HTML attributes are not allowed
  • 6420846: 8334396: RISC-V: verify perf of ReverseBytesI/L
  • c6f3bf4: 8334026: Provide a diagnostic PrintMemoryMapAtExit switch on Linux
  • ... and 4 more: https://git.openjdk.org/jdk/compare/fad6644eabbad6b6d3472206d9db946408aca612...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 20, 2024

@tkrodriguez Pushed as commit 187710e.

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

@DamonFool
Copy link
Member

Hi, please see: #19818
Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

graal graal-dev@openjdk.org hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

6 participants