8316645: RISC-V: Remove dependency on libatomic by adding cmpxchg 1b

[shipilev]

Clean backport on the way to improve Atomic support in 21u.

Note @robehn ;)

Additional testing:

• MacOS AArch64 server fastdebug, gtest:Atomic

---

Progress

• Change must not contain extraneous whitespace
• JDK-8317335 needs maintainer approval
• JDK-8316645 needs maintainer approval
• Commit message must refer to an issue

Issues

• JDK-8316645: RISC-V: Remove dependency on libatomic by adding cmpxchg 1b (Enhancement - P4 - Approved)
• JDK-8317335: Build on windows fails after 8316645 (Bug - P1 - Approved)

Reviewers

• Robbin Ehn (@robehn - Committer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 325

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u/pull/325.diff

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 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.

[shipilev]

/issue add 8317335

[shipilev]

This is a series of two backports, and both are clean.

/clean

[openjdk]

This backport pull request has now been updated with issue from the original commit.

[openjdk]

@shipilev
Adding additional issue to issue list: 8317335: Build on windows fails after 8316645.

[openjdk]

@shipilev This backport pull request is now marked as clean

[shipilev]

/approval request 8316645 Clean backport on the way to improve Atomic support in 21u. A series of two commits, the last one fixes a trivial build error.
/approval request 8317335 Clean backport on the way to improve Atomic support in 21u. A series of two commits, the last one fixes a trivial build error.

[openjdk]

⚠️ @shipilev This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

[openjdk]

@shipilev
8316645: The approval request has been created successfully.
8317335: The approval request has been created successfully.

[openjdk]

@shipilev
8316645: The approval request has been updated successfully.
8317335: The approval request has been updated successfully.

[mlbridge]

Webrevs

• 00: Full (dac5e03f)

[robehn]

Thank you!

[openjdk]

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

8316645: RISC-V: Remove dependency on libatomic by adding cmpxchg 1b
8317335: Build on windows fails after 8316645

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

• 421bf8a: 8316461: Fix: make test outputs TEST SUCCESS after unsuccessful exit
• 337271f: 8317920: JDWP-agent sends broken exception event with onthrow option
• 4cf572e: 8316304: (fs) Add support for BasicFileAttributes.creationTime() for Linux

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

[shipilev]

/integrate

[openjdk]

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

• eb8267d: 8316585: [REDO] runtime/InvocationTests spend a lot of time on dependency verification
• 31c759d: 8315362: NMT: summary diff reports threads count incorrectly
• 6bd2c5a: 8318474: Fix memory reporter for thread_count
• 7091631: 8319525: RISC-V: Rename *_riscv64.ad files to *_riscv.ad under riscv/gc
• 421bf8a: 8316461: Fix: make test outputs TEST SUCCESS after unsuccessful exit
• 337271f: 8317920: JDWP-agent sends broken exception event with onthrow option
• 4cf572e: 8316304: (fs) Add support for BasicFileAttributes.creationTime() for Linux

Your commit was automatically rebased without conflicts.

[openjdk]

@shipilev Pushed as commit 50c34ca.

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

[robehn]

/backport jdk11u-dev

[openjdk]

@robehn Could not automatically backport 50c34cad to openjdk/jdk11u-dev due to conflicts in the following files:

• make/autoconf/libraries.m4
• src/hotspot/os_cpu/linux_riscv/atomic_linux_riscv.hpp
• test/hotspot/gtest/runtime/test_atomic.cpp

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-robehn-50c34cad

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk21u.git 50c34cad95222c0330b31327cdc5becf56f77f71

# Backport the commit
$ git cherry-pick --no-commit 50c34cad95222c0330b31327cdc5becf56f77f71
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 50c34cad95222c0330b31327cdc5becf56f77f71'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 50c34cad95222c0330b31327cdc5becf56f77f71.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 50c34cad from the openjdk/jdk21u repository.

The commit being backported was authored by Aleksey Shipilev on 8 Nov 2023 and was reviewed by Robbin Ehn.

Thanks!