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

8295871: G1: Use different explicit claim marks for CLDs #10989

Closed

Conversation

tschatzl
Copy link
Contributor

@tschatzl tschatzl commented Nov 4, 2022

Hi all,

can I have reviews for this follow-up to JDK-8295118 that removes the need to clear CLD claim marks for every full gc phase by using different claim values for the different phases.

Some comments:

  • I used new g1 specific claim values instead of overloading the existing ones, which is imho clearer. I am open to better names, but something like _claim_strong_2/3 seemed too cryptic. Then again, there is now a collector specific name in the enum. Maybe the enum values should be made collector-specific in some way? Currently they already are (e.g. _claim_finalizable is only used in ZGC) as G1 does not need the values except for (multiple) _claim_strong.
  • I moved the CLD mark verification for the mark phase from prepare_collection to the constructor of G1FullGCMarker; I think this place is more fitting as directly above there is the use in the CLDToOopClosure. Also this pattern aligns with the use in the G1FullGCAdjustTask.

Testing: tier1-5

Thanks,
Thomas


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-8295871: G1: Use different explicit claim marks for CLDs

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10989

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 4, 2022

👋 Welcome back tschatzl! 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 Nov 4, 2022

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

  • hotspot

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 hotspot-dev@openjdk.org label Nov 4, 2022
@tschatzl tschatzl marked this pull request as ready for review November 4, 2022 17:23
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 4, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 4, 2022

Webrevs

Copy link
Contributor

@kstefanj kstefanj left a comment

Choose a reason for hiding this comment

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

Looks good.

One comment below that you can decide if you address or not.

src/hotspot/share/classfile/classLoaderData.hpp Outdated Show resolved Hide resolved
@openjdk
Copy link

openjdk bot commented Nov 8, 2022

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

8295871: G1: Use different explicit claim marks for CLDs

Reviewed-by: sjohanss, ayang

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

  • f2acdfd: 8296638: RISC-V: NegVI node emits wrong code when vector element basic type is T_BYTE/T_SHORT
  • bfc5816: 8295475: Move non-resource allocation strategies out of ResourceObj
  • e802b12: 8296196: Class.getEnumConstants() throws undocumented ClassCastException and NullPointerException
  • 78a08a0: 8295430: Use cmsDoTransformLineStride instead of cmsDoTransform in the loop
  • f0a6e71: 8295812: Skip the "half float" support in LittleCMS during the build
  • 79c0092: 8285635: javax/swing/JRootPane/DefaultButtonTest.java failed with Default Button not pressed for L&F: com.sun.java.swing.plaf.motif.MotifLookAndFeel
  • 0981bfb: 8296156: [macos] Resize DMG windows and background to fit additional DMG contents
  • 93fed9b: 8296448: RISC-V: Fix temp usages of heapbase register killed by MacroAssembler::en/decode_klass_not_null
  • d6e2d0d: 8296611: Problemlist several sun/security tests until JDK-8295343 is resolved
  • 102b2b3: 8292033: Move jdk.X509Certificate event logic to JCA layer
  • ... and 51 more: https://git.openjdk.org/jdk/compare/12316829b48c58e4509026543a3f2b50a57a439f...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 Nov 8, 2022
Copy link
Member

@albertnetymk albertnetymk left a comment

Choose a reason for hiding this comment

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

If the same technique can be used by Serial/Parallel (I believe so), I'd prefer sth more generic, _claim_stw_fullgc_mark/adjust.

(I am surprised that _claim_finalizable is used only by ZGC -- this essentially mirrors finalizable/strong marking, needed for conc ref-processing.)

@tschatzl
Copy link
Contributor Author

tschatzl commented Nov 9, 2022

@albertnetymk : I'll change the names according your suggestions and implement the optimization for serial/parallel gc too. Currently testing.

@tschatzl
Copy link
Contributor Author

tschatzl commented Nov 9, 2022

I decided to just do the rename and do serial/parallel support using this technique in a follow-up CR. I also explicitly made the g1 concurrent mark claim closures use _claim_strong so that (I think) the code is more clear.

@tschatzl
Copy link
Contributor Author

Thanks @albertnetymk @kstefanj for your reviews
/integrate

@openjdk
Copy link

openjdk bot commented Nov 10, 2022

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

  • 9ef7852: 8290714: Make com.sun.jndi.dns.DnsClient virtual threads friendly
  • d6468be: 8293886: The abstract keyword can be removed in AESCipher
  • 54c986e: 8296715: CLDR v42 update for tzdata 2022f
  • 4a68210: 6972078: Can not select single directory with GTKLookAndFeel
  • 4465361: 8295948: Support for Zicbop/prefetch instructions on RISC-V
  • f2acdfd: 8296638: RISC-V: NegVI node emits wrong code when vector element basic type is T_BYTE/T_SHORT
  • bfc5816: 8295475: Move non-resource allocation strategies out of ResourceObj
  • e802b12: 8296196: Class.getEnumConstants() throws undocumented ClassCastException and NullPointerException
  • 78a08a0: 8295430: Use cmsDoTransformLineStride instead of cmsDoTransform in the loop
  • f0a6e71: 8295812: Skip the "half float" support in LittleCMS during the build
  • ... and 56 more: https://git.openjdk.org/jdk/compare/12316829b48c58e4509026543a3f2b50a57a439f...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 10, 2022

@tschatzl Pushed as commit e1badb7.

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

@tschatzl tschatzl deleted the submit/8295871-different-claim-marks branch November 17, 2022 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
3 participants