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

8292867: RISC-V: Simplify weak CAS return value handling #10006

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Aug 24, 2022

I see that current weak CAS implementations in macroAssembler_riscv.cpp return 0 on success, and then invert it in riscv.ad to match the Java's boolean result. I think we can just return the final value from MacroAssembler.

Additional testing:

  • Linux RISC-V fastdebug java/lang/invoke/VarHandles/
  • Linux RISC-V fastdebug compiler/unsafe

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-8292867: RISC-V: Simplify weak CAS return value handling

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10006

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 24, 2022

👋 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 Aug 24, 2022
@openjdk
Copy link

openjdk bot commented Aug 24, 2022

@shipilev 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 Aug 24, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 24, 2022

Webrevs

Copy link
Contributor

@yadongw yadongw left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link
Member

@RealFYang RealFYang left a comment

Choose a reason for hiding this comment

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

Looks fine. I checked that we covered all the callsites of the macro assembler function.

@openjdk
Copy link

openjdk bot commented Aug 25, 2022

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

8292867: RISC-V: Simplify weak CAS return value handling

Reviewed-by: yadongwang, fyang

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

  • 88af204: 8292494: Ensure SystemDictionary::set_platform_loader and set_system_loader are called only once
  • 8d3d439: 8292903: enhance round_up_power_of_2 assertion output
  • 054c23f: 8290025: Remove the Sweeper
  • dc7e256: 8290376: G1: Refactor G1MMUTracker::when_sec
  • 5a20bc4: 8292715: Cleanup Problemlist
  • 7b81a9c: 8289764: gc/lock tests failed with "OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects"
  • 76ee549: 8292329: Enable CDS shared heap for zero builds
  • 14623c6: 8292739: Invalid legacy entries may be returned by Provider.getServices() call
  • 568be58: 8290469: Add new positioning options to PassFailJFrame test framework
  • 69448f9: 8292679: Simplify thread creation in gtest and port 2 tests to new way
  • ... and 2 more: https://git.openjdk.org/jdk/compare/c0623972cffdbcd7f80e84a1ec344fd382a4a5cc...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 Aug 25, 2022
@shipilev
Copy link
Member Author

Testing is clean, many (all?) potential reviewers from RISC-V land have reviewed, so I am integrating.

/integrate

@openjdk
Copy link

openjdk bot commented Aug 25, 2022

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

  • 88af204: 8292494: Ensure SystemDictionary::set_platform_loader and set_system_loader are called only once
  • 8d3d439: 8292903: enhance round_up_power_of_2 assertion output
  • 054c23f: 8290025: Remove the Sweeper
  • dc7e256: 8290376: G1: Refactor G1MMUTracker::when_sec
  • 5a20bc4: 8292715: Cleanup Problemlist
  • 7b81a9c: 8289764: gc/lock tests failed with "OutOfMemoryError: Java heap space: failed reallocation of scalar replaced objects"
  • 76ee549: 8292329: Enable CDS shared heap for zero builds
  • 14623c6: 8292739: Invalid legacy entries may be returned by Provider.getServices() call
  • 568be58: 8290469: Add new positioning options to PassFailJFrame test framework
  • 69448f9: 8292679: Simplify thread creation in gtest and port 2 tests to new way
  • ... and 2 more: https://git.openjdk.org/jdk/compare/c0623972cffdbcd7f80e84a1ec344fd382a4a5cc...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 25, 2022

@shipilev Pushed as commit f57d342.

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

@shipilev shipilev deleted the JDK-8292867-riscv-weakcas-return branch September 5, 2022 13:42
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