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

8287805: Shenandoah: consolidate evacuate-update-root closures #9023

Closed

Conversation

zhengyu123
Copy link
Contributor

@zhengyu123 zhengyu123 commented Jun 3, 2022

ShenandoahEvacuateUpdateMetadataClosure and ShenandoahEvacuateUpdateRootsClosure are mostly same, can be consolidated.

Also, only uses of ShenandoahEvacuateUpdateMetadataClosure all pass MO_UNORDERED template parameter, so it can be eliminated.

Test:

  • hotspot_gc_shenandoah

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-8287805: Shenandoah: consolidate evacuate-update-root closures

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9023

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 3, 2022

👋 Welcome back zgu! 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 added the rfr Pull request is ready for review label Jun 3, 2022
@openjdk
Copy link

openjdk bot commented Jun 3, 2022

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

  • hotspot-gc
  • shenandoah

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 hotspot-gc hotspot-gc-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels Jun 3, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 3, 2022

Webrevs

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

I still dislike the fact we are calling Thread::current() on hotpath. I think we can do better. Consider this modification on top of your current PR: http://cr.openjdk.java.net/~shade/8287805/thread-1.patch -- does that look better?

@zhengyu123
Copy link
Contributor Author

I still dislike the fact we are calling Thread::current() on hotpath. I think we can do better. Consider this modification on top of your current PR: http://cr.openjdk.java.net/~shade/8287805/thread-1.patch -- does that look better?

Are your referring to ShenandoahEvacuateUpdateRootsClosure? It has to be context free closure, since it is a shared closure used by stack watermark processing.

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks fine, with minor nits.


T o = RawAccess<>::oop_load(p);
if (!CompressedOops::is_null(o)) {
if (! CompressedOops::is_null(o)) {
Copy link
Member

Choose a reason for hiding this comment

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

Redundant whitespace?

Comment on lines 144 to 145
Thread* thr = stable_thread ? _thread : Thread::current();
assert(thr == Thread::current(), "Wrong thread");
Copy link
Member

Choose a reason for hiding this comment

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

I think we can move these lines down to the only use in this thread. This would keep Thread::current() out of the hotpath.

@openjdk
Copy link

openjdk bot commented Jul 4, 2022

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

8287805: Shenandoah: consolidate evacuate-update-root closures

Reviewed-by: shade

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

  • 92067e2: 8290137: riscv: small refactoring for add_memory_int32/64
  • 87340fd: 8288883: C2: assert(allow_address || t != T_ADDRESS) failed after JDK-8283091
  • bc7a1ea: 8288948: Few J2DBench tests indicate lower primitive drawing performance with metal rendering pipeline
  • 84f2314: 8286030: Avoid JVM crash when containers share the same /tmp dir
  • 4dd236b: 8290280: riscv: Clean up stack and register handling in interpreter
  • 522b657: Merge
  • 15d3329: 8281969: Bad result for the snippet @link tag if substring/regex consists of whitespace
  • c8e0315: 8290250: Shenandoah: disable Loom for iu mode
  • fb27ddc: 8290252: Add TEST.properties to java/nio/channels/FileChannel and move tests out of largeMemory sub-dir
  • 441c33f: 8289003: JavaThread::check_is_terminated() implementation should rely on Thread-SMR
  • ... and 5 more: https://git.openjdk.org/jdk/compare/f3abb82989e79da97bcc0a837883be41d14703a3...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 ready Pull request is ready to be integrated label Jul 4, 2022
@zhengyu123
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jul 18, 2022

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

  • ea8b75c: 8290334: Update FreeType to 2.12.1
  • 6882f0e: 8290013: serviceability/jvmti/GetLocalVariable/GetLocalWithoutSuspendTest.java failed "assert(!in_vm) failed: Undersized StackShadowPages"
  • 92067e2: 8290137: riscv: small refactoring for add_memory_int32/64
  • 87340fd: 8288883: C2: assert(allow_address || t != T_ADDRESS) failed after JDK-8283091
  • bc7a1ea: 8288948: Few J2DBench tests indicate lower primitive drawing performance with metal rendering pipeline
  • 84f2314: 8286030: Avoid JVM crash when containers share the same /tmp dir
  • 4dd236b: 8290280: riscv: Clean up stack and register handling in interpreter
  • 522b657: Merge
  • 15d3329: 8281969: Bad result for the snippet @link tag if substring/regex consists of whitespace
  • c8e0315: 8290250: Shenandoah: disable Loom for iu mode
  • ... and 7 more: https://git.openjdk.org/jdk/compare/f3abb82989e79da97bcc0a837883be41d14703a3...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 18, 2022

@zhengyu123 Pushed as commit b2010a7.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated shenandoah shenandoah-dev@openjdk.org
2 participants