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

8322954: Shenandoah: Convert evac-update closures asserts to rich asserts #17245

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jan 3, 2024

Over the years, we seem to have introduced new asserts that should really be the rich Shenandoah asserts. I looked around and found at least three places in evac-update closures.

We also do not need _mark_context->is_marked(resolved) in ShenandoahEvacUpdateCleanupOopStorageRootsClosure, because evac-ed objects are supposed to be after TAMS and thus implicitly marked.

Additional testing:

  • macos-aarch64-server-fastdebug, hotspot_gc_shenandoah
  • linux-x86_64-server-fastdebug, tier{1,2,3} with -XX:+UseShenandoahGC

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-8322954: Shenandoah: Convert evac-update closures asserts to rich asserts (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17245

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 3, 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 added the rfr Pull request is ready for review label Jan 3, 2024
@openjdk
Copy link

openjdk bot commented Jan 3, 2024

@shipilev 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 Jan 3, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 3, 2024

Webrevs

Copy link
Contributor

@earthling-amzn earthling-amzn 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
Copy link

openjdk bot commented Jan 5, 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:

8322954: Shenandoah: Convert evac-update closures asserts to rich asserts

Reviewed-by: wkemper, kdnilsen, ysr

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

  • 631a9f6: 8323073: ProblemList gc/g1/TestSkipRebuildRemsetPhase.java on linux-aarch64
  • ed9f324: 8322985: [BACKOUT] 8318562: Computational test more than 2x slower when AVX instructions are used
  • ade21a9: 8310844: [AArch64] C1 compilation fails because monitor offset in OSR buffer is too large for immediate
  • f0cfd36: 8322532: JShell : Unnamed variable issue
  • 78623c9: 8323012: C2 fails with fatal error: no reachable node should have no use
  • f0e2e43: 8323021: Shenandoah: Encountered reference count always attributed to first worker thread
  • 3dc4bd8: 8322989: New test serviceability/HeapDump/FullGCHeapDumpLimitTest.java fails
  • 1d1cd32: 8321812: Update GC tests to use execute[Limited]TestJava
  • 868f874: 8322920: Some ProcessTools.execute* functions are declared to throw Throwable
  • 2a9c358: 8322725: (tz) Update Timezone Data to 2023d
  • ... and 30 more: https://git.openjdk.org/jdk/compare/a8e4229852fac703c6271aa8c5f94f67bea44902...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 Jan 5, 2024
@shipilev
Copy link
Member Author

shipilev commented Jan 5, 2024

Thanks!

/integrate

@openjdk
Copy link

openjdk bot commented Jan 5, 2024

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

  • 631a9f6: 8323073: ProblemList gc/g1/TestSkipRebuildRemsetPhase.java on linux-aarch64
  • ed9f324: 8322985: [BACKOUT] 8318562: Computational test more than 2x slower when AVX instructions are used
  • ade21a9: 8310844: [AArch64] C1 compilation fails because monitor offset in OSR buffer is too large for immediate
  • f0cfd36: 8322532: JShell : Unnamed variable issue
  • 78623c9: 8323012: C2 fails with fatal error: no reachable node should have no use
  • f0e2e43: 8323021: Shenandoah: Encountered reference count always attributed to first worker thread
  • 3dc4bd8: 8322989: New test serviceability/HeapDump/FullGCHeapDumpLimitTest.java fails
  • 1d1cd32: 8321812: Update GC tests to use execute[Limited]TestJava
  • 868f874: 8322920: Some ProcessTools.execute* functions are declared to throw Throwable
  • 2a9c358: 8322725: (tz) Update Timezone Data to 2023d
  • ... and 30 more: https://git.openjdk.org/jdk/compare/a8e4229852fac703c6271aa8c5f94f67bea44902...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 5, 2024

@shipilev Pushed as commit 700c25f.

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

@shipilev shipilev deleted the JDK-8322954-shenandoah-rich-asserts branch January 31, 2024 16:13
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
Development

Successfully merging this pull request may close these issues.

4 participants