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

8330242: RISC-V: Simplify and remove CORRECT_COMPILER_ATOMIC_SUPPORT in atomic_linux_riscv.hpp #18780

Closed
wants to merge 1 commit into from

Conversation

zifeihan
Copy link
Member

@zifeihan zifeihan commented Apr 15, 2024

Previously, we fixed JDK-8326936 with a workaround for one GCC bug [1]. We define a new CORRECT_COMPILER_ATOMIC_SUPPORT macro when building with GCC >= 14. Now this bug has been fixed in gcc trunk and has been backported to GCC-13 branch. The __atomic_compare_exchange atomic operation will be usable for the next GCC-13.3 release. So we should relax the condition and require GCC > 13.2. This will also help remove CORRECT_COMPILER_ATOMIC_SUPPORT macro and reuse a single FULL_COMPILER_ATOMIC_SUPPORT macro.

[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114130

Testing

  • The affected jtreg test cases all pass with jdk release built with latest gcc-13 development branch.

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-8330242: RISC-V: Simplify and remove CORRECT_COMPILER_ATOMIC_SUPPORT in atomic_linux_riscv.hpp (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18780

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 15, 2024

👋 Welcome back gcao! 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.

@zifeihan zifeihan marked this pull request as ready for review April 15, 2024 07:57
@openjdk
Copy link

openjdk bot commented Apr 15, 2024

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

8330242: RISC-V: Simplify and remove CORRECT_COMPILER_ATOMIC_SUPPORT in atomic_linux_riscv.hpp

Reviewed-by: fyang, rehn

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

  • e57a322: 8329970: Update autoconf build-aux files with latest from 2024-01-01
  • c8702ed: 8330213: RISC-V: C2: assert(false) failed: bad AD file after JDK-8316991
  • f6f038a: 8317368: [JVMCI] SIGSEGV in JVMCIEnv::initialize_installed_code on libgraal
  • fb4cf1c: 8329636: Deprecate -XX:+PreserveAllAnnotations
  • d1c6cd1: 8330133: libj2pkcs11.so crashes on some pkcs#11 v3.0 libraries
  • 76cbe48: 8329430: MetaspaceShared::preload_and_dump should clear pending exception
  • f7c8413: 8326116: JFR: Add help option to -XX:StartFlightRecording
  • 941bee1: 8327640: Allow NumberFormat strict parsing
  • 2ede143: 8330279: Typo in java.text.Bidi class description
  • 90df3b7: 8329190: (ch) DatagramChannel.receive should throw ClosedChannelException when called on closed channel
  • ... and 24 more: https://git.openjdk.org/jdk/compare/b486709b0627cfb4cf428a6508ef7c5b14e6da57...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@RealFYang, @robehn) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 15, 2024
@openjdk
Copy link

openjdk bot commented Apr 15, 2024

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

  • hotspot-runtime

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-runtime hotspot-runtime-dev@openjdk.org label Apr 15, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 15, 2024

Webrevs

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 to me. Thanks for the cleanup.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 15, 2024
Copy link
Contributor

@robehn robehn left a comment

Choose a reason for hiding this comment

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

Thanks!

@zifeihan
Copy link
Member Author

@RealFYang @robehn : Thanks for the review.
/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Apr 17, 2024
@openjdk
Copy link

openjdk bot commented Apr 17, 2024

@zifeihan
Your change (at version 77aaa2a) is now ready to be sponsored by a Committer.

@RealFYang
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Apr 17, 2024

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

  • e57a322: 8329970: Update autoconf build-aux files with latest from 2024-01-01
  • c8702ed: 8330213: RISC-V: C2: assert(false) failed: bad AD file after JDK-8316991
  • f6f038a: 8317368: [JVMCI] SIGSEGV in JVMCIEnv::initialize_installed_code on libgraal
  • fb4cf1c: 8329636: Deprecate -XX:+PreserveAllAnnotations
  • d1c6cd1: 8330133: libj2pkcs11.so crashes on some pkcs#11 v3.0 libraries
  • 76cbe48: 8329430: MetaspaceShared::preload_and_dump should clear pending exception
  • f7c8413: 8326116: JFR: Add help option to -XX:StartFlightRecording
  • 941bee1: 8327640: Allow NumberFormat strict parsing
  • 2ede143: 8330279: Typo in java.text.Bidi class description
  • 90df3b7: 8329190: (ch) DatagramChannel.receive should throw ClosedChannelException when called on closed channel
  • ... and 24 more: https://git.openjdk.org/jdk/compare/b486709b0627cfb4cf428a6508ef7c5b14e6da57...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 17, 2024

@RealFYang @zifeihan Pushed as commit cd4c3aa.

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

@zifeihan
Copy link
Member Author

/backport jdk22u

@openjdk
Copy link

openjdk bot commented Apr 17, 2024

@zifeihan the backport was successfully created on the branch backport-zifeihan-cd4c3aac in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit cd4c3aac from the openjdk/jdk repository.

The commit being backported was authored by Gui Cao on 17 Apr 2024 and was reviewed by Fei Yang and Robbin Ehn.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-zifeihan-cd4c3aac:backport-zifeihan-cd4c3aac
$ git checkout backport-zifeihan-cd4c3aac
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-zifeihan-cd4c3aac

@zifeihan zifeihan deleted the JDK-8330242 branch June 19, 2024 07:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants