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

8273378: Shenandoah: Remove the remaining uses of os::is_MP #5378

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Sep 6, 2021

JDK-8188764 removed many uses of os::is_MP, effectively defaulting it to true, but some Shenandoah code still has it. This is a simple omission. All current uses on x86 already imply lock prefix, so this is a cleanup, and not a functional change.

Additional testing:

  • Linux x86_64 hotspot_gc_shenandoah

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8273378: Shenandoah: Remove the remaining uses of os::is_MP

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5378/head:pull/5378
$ git checkout pull/5378

Update a local copy of the PR:
$ git checkout pull/5378
$ git pull https://git.openjdk.java.net/jdk pull/5378/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5378

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5378.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 6, 2021

👋 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 Sep 6, 2021
@openjdk
Copy link

openjdk bot commented Sep 6, 2021

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

  • hotspot
  • 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 hotspot-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels Sep 6, 2021
@mlbridge
Copy link

mlbridge bot commented Sep 6, 2021

Webrevs

@openjdk
Copy link

openjdk bot commented Sep 6, 2021

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

8273378: Shenandoah: Remove the remaining uses of os::is_MP

Reviewed-by: aph, zgu

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

  • 44c5c23: 8272164: DumpAllocStats shouldn't subclass from ResourceObj
  • 1bf5bda: 8269418: jdk/jfr/event/oldobject/TestObjectSize.java failed with "RuntimeException: No events: expected false, was true"
  • fb5b144: 8272985: Reference discovery is confused about atomicity and degree of parallelism
  • 70ed6c5: 8272878: JEP 381 cleanup: Remove unused Solaris code in sun.font.TrueTypeGlyphMapper
  • b4e5b28: 8273221: Guard GCIdMark against nested calls
  • 4d25e6f: 8273335: compiler/blackhole tests should not run with interpreter-only VMs
  • c640fe4: 7188098: TEST_BUG: closed/javax/sound/midi/Synthesizer/Receiver/bug6186488.java fails
  • cec6c06: 8272232: javax/swing/JTable/4275046/bug4275046.java failed with "Expected value in the cell: 'rededited' but found 'redEDITED'."
  • 14a3ac0: 8271911: replay compilations of methods which use JSR292 (easy cases)
  • d414a88: 8273240: Dynamic test ArchiveConsistency.java should use CDSArchiveUtils
  • ... and 13 more: https://git.openjdk.java.net/jdk/compare/aaa6f696b06b335f81efccf0966612b086dd2e73...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 Sep 6, 2021
Copy link
Contributor

@zhengyu123 zhengyu123 left a comment

Choose a reason for hiding this comment

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

LGTM

@shipilev
Copy link
Member Author

shipilev commented Sep 6, 2021

Thank you, GHA tests are green, so I am integrating.

/integrate

@openjdk
Copy link

openjdk bot commented Sep 6, 2021

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

  • 7bd4f49: 8264207: CodeStrings does not honour fixed address assumption.
  • 2cabec8: 8253343: Extract G1 Young GC algorithm related code from G1CollectedHeap
  • 44c5c23: 8272164: DumpAllocStats shouldn't subclass from ResourceObj
  • 1bf5bda: 8269418: jdk/jfr/event/oldobject/TestObjectSize.java failed with "RuntimeException: No events: expected false, was true"
  • fb5b144: 8272985: Reference discovery is confused about atomicity and degree of parallelism
  • 70ed6c5: 8272878: JEP 381 cleanup: Remove unused Solaris code in sun.font.TrueTypeGlyphMapper
  • b4e5b28: 8273221: Guard GCIdMark against nested calls
  • 4d25e6f: 8273335: compiler/blackhole tests should not run with interpreter-only VMs
  • c640fe4: 7188098: TEST_BUG: closed/javax/sound/midi/Synthesizer/Receiver/bug6186488.java fails
  • cec6c06: 8272232: javax/swing/JTable/4275046/bug4275046.java failed with "Expected value in the cell: 'rededited' but found 'redEDITED'."
  • ... and 15 more: https://git.openjdk.java.net/jdk/compare/aaa6f696b06b335f81efccf0966612b086dd2e73...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 6, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 6, 2021
@openjdk
Copy link

openjdk bot commented Sep 6, 2021

@shipilev Pushed as commit fc546d6.

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

@shipilev shipilev deleted the JDK-8273378-shenandoah-isMP branch September 13, 2021 13: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 shenandoah shenandoah-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

3 participants