-
Notifications
You must be signed in to change notification settings - Fork 37
8315247: GenShen: Condition calls to post-write barrier code generation by a flag #313
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
Conversation
test at caller of post-write-barrier for ShenandoahCardBarrier, and assert in post-barrier/generation code that we are in generational mode.
👋 Welcome back ysr! A progress list of the required criteria for merging this PR into |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor nit - can we have a consistent, more helpful message for the assertions?
assert(ShenandoahHeap::heap()->mode()->is_generational(), "Not needed");
Maybe:
assert(ShenandoahHeap::heap()->mode()->is_generational(), "Expected generational mode here");
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks pretty good. Have you sent it through the test pipeline?
If we have this ShenandoahCardBarrier flag, I'd be inclined to use it everywhere we currently have the query heap->mode()->is_generational(). It ought to be more efficient. Before you make that global change, maybe we should confirm that William (and other interested reviewers) like that approach.
src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
Outdated
Show resolved
Hide resolved
src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp
Outdated
Show resolved
Hide resolved
src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
Outdated
Show resolved
Hide resolved
src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp
Outdated
Show resolved
Hide resolved
src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp
Outdated
Show resolved
Hide resolved
Following Kelvin's suggestion, I removed any reference to generational mode in the barrier/generayion code itself, and instead just assert that the I used the message |
configurations. Exit with an error message if the user tries to change it.
conflicts with ShenandoahGCMode.
Did a spin through test pipeline and will run another following the latest changes. All looks good from what I can tell from tests, including jtreg's & SPECjbb as well. Opened official PR from draft and will link JBS ticket momentarily. |
/issue JDK-8315247 |
@ysramakrishna This issue is referenced in the PR title - it will now be updated. |
Webrevs
|
Made changes stemming from review feedback & discussion. Please take another look and let me know how this looks. Thanks! |
@ysramakrishna 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:
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 no new commits pushed to the ➡️ To integrate this PR with the above commit message to the |
/integrate |
Going to push as commit ade7796. |
@ysramakrishna Pushed as commit ade7796. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Protect the card barrier code generation by a new global
ShenandoahCardBarrier
, which is disabled by default and enabled for GenShen (generational mode Shenandoah) only. If the user forces the barrier flag to a value inconsistent with mode, we exit with an appropriate error message.The intention of the change is two-fold:
The changes have been made for x86, aarch, and ppc, and tested as follows:
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/shenandoah.git pull/313/head:pull/313
$ git checkout pull/313
Update a local copy of the PR:
$ git checkout pull/313
$ git pull https://git.openjdk.org/shenandoah.git pull/313/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 313
View PR using the GUI difftool:
$ git pr show -t 313
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/shenandoah/pull/313.diff
Webrev
Link to Webrev Comment