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

8272147: Consolidate preserved marks handling with other STW collectors #14274

Closed
wants to merge 7 commits into from

Conversation

lgxbslgx
Copy link
Member

@lgxbslgx lgxbslgx commented Jun 1, 2023

Hi all,

This patch removes the class markSweep.hpp::PreservedMark and uses the shared PreservedMarksSet instead.

In order to keep the meaning of the field _preserved_marks in markSweep,
I need to use OopAndMarkWord explicitly. So I move OopAndMarkWord out of PreservedMarks.

Tests:
hotspot:tier1 passed locally (x86 & linux).

Thanks for the review.

Best Regards,
-- Guoxiong


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-8272147: Consolidate preserved marks handling with other STW collectors (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14274

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 1, 2023

👋 Welcome back gli! 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 JDK-8272147 8272147: Consolidate preserved marks handling with other STW collectors Jun 1, 2023
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 1, 2023
@openjdk
Copy link

openjdk bot commented Jun 1, 2023

@lgxbslgx The following label will be automatically applied to this pull request:

  • hotspot-gc

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

@openjdk openjdk bot added the hotspot-gc hotspot-gc-dev@openjdk.org label Jun 1, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 1, 2023

Webrevs

src/hotspot/share/gc/serial/genMarkSweep.cpp Outdated Show resolved Hide resolved
src/hotspot/share/gc/shared/preservedMarks.hpp Outdated Show resolved Hide resolved
@openjdk
Copy link

openjdk bot commented Jun 7, 2023

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

8272147: Consolidate preserved marks handling with other STW collectors

Reviewed-by: tschatzl, ayang, rkennke

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

  • fdaa2c4: 8309306: G1: Move is_obj_dead from HeapRegion to G1CollectedHeap
  • 4bc6bbb: 8309814: [IR Framework] Dump socket output string in which IR encoding was not found
  • cf9e635: 8309462: [AIX] vmTestbase/nsk/jvmti/RunAgentThread/agentthr001/TestDescription.java crashing due to empty while loop
  • 268ec61: 8308184: Launching java with large number of jars in classpath with java.protocol.handler.pkgs system property set can lead to StackOverflowError
  • 4d47069: 4516654: Metalworks Demo: Window title not displayed fully in Low Vision Theme
  • 408cadb: 8309467: Pattern dominance should be adjusted
  • 6c3e621: 8308749: C2 failed: regular loops only (counted loop inside infinite loop)
  • f5cbe53: 8027711: Unify wildcarding syntax for CompileCommand and CompileOnly
  • 4d66d97: 8309549: com/sun/tools/attach/warnings/DynamicLoadWarningTest.java fails on AIX
  • 3981297: 8309703: AIX build fails after JDK-8280982
  • ... and 119 more: https://git.openjdk.org/jdk/compare/fdb5893bf0ad277dbaa2aaffb76478d808d2431d...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 Jun 7, 2023
@lgxbslgx
Copy link
Member Author

Waiting for another review.

Copy link
Contributor

@rkennke rkennke left a comment

Choose a reason for hiding this comment

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

This is a nice improvement! All looks good to me, I only have a relatively minor naming question, I leave it up to you to change it or not.

src/hotspot/share/gc/shared/preservedMarks.hpp Outdated Show resolved Hide resolved
Copy link
Contributor

@tschatzl tschatzl left a comment

Choose a reason for hiding this comment

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

Lgtm.
Please fix the naming suggested by @rkennke though before pushing.

elem.set_mark();
}
assert_empty();
}

void PreservedMarks::adjust_preserved_mark(PreservedMark* elem) {
oop obj = elem->get_oop();
if (obj->is_forwarded()) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Pre-existing: we probably only need to check this because G1 full gc preserves marks during marking, unlike the other collectors which (attempt to) preserve marks for actually forwarded objects.
I'll file an RFE for this.

@lgxbslgx
Copy link
Member Author

@albertnetymk @rkennke @tschatzl Thanks for the reviews. I will integrate this patch after Pre-submit tests passing.

@lgxbslgx
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 12, 2023

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

  • 6cd166a: 8309403: Serial: Remove the useless adaptive size policy in GenCollectedHeap
  • 5d5ae35: 8308966: Add intrinsic for float/double modulo for x86 AVX2 and AVX512
  • 8e4e6b0: 8309761: Leak class loader constraints
  • fdaa2c4: 8309306: G1: Move is_obj_dead from HeapRegion to G1CollectedHeap
  • 4bc6bbb: 8309814: [IR Framework] Dump socket output string in which IR encoding was not found
  • cf9e635: 8309462: [AIX] vmTestbase/nsk/jvmti/RunAgentThread/agentthr001/TestDescription.java crashing due to empty while loop
  • 268ec61: 8308184: Launching java with large number of jars in classpath with java.protocol.handler.pkgs system property set can lead to StackOverflowError
  • 4d47069: 4516654: Metalworks Demo: Window title not displayed fully in Low Vision Theme
  • 408cadb: 8309467: Pattern dominance should be adjusted
  • 6c3e621: 8308749: C2 failed: regular loops only (counted loop inside infinite loop)
  • ... and 122 more: https://git.openjdk.org/jdk/compare/fdb5893bf0ad277dbaa2aaffb76478d808d2431d...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 12, 2023

@lgxbslgx Pushed as commit 0727507.

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

@lgxbslgx lgxbslgx deleted the JDK-8272147 branch June 12, 2023 16:12
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
4 participants