Skip to content

8304293: RISC-V: JDK-8276799 missed atomic intrinsic support for C1#19

Merged
RealFYang merged 1 commit intoopenjdk:riscv-portfrom
zifeihan:backport-JDK-8304293
Mar 22, 2023
Merged

8304293: RISC-V: JDK-8276799 missed atomic intrinsic support for C1#19
RealFYang merged 1 commit intoopenjdk:riscv-portfrom
zifeihan:backport-JDK-8304293

Conversation

@zifeihan
Copy link
Member

@zifeihan zifeihan commented Mar 21, 2023

Please review this backport to riscv-port-jdk17u.
Backport of JDK-8304293.
Let me show the IR changes before and after the modification:
java -Xcomp -XX:TieredStopAtLevel=1 -XX:+PrintIR -version > C1.log

before:

B3 (V) [33, 49] dom B1 pred: B1
empty stack
inlining depth 0
__bci__use__tid____instr____________________________________
  33   1    a35    <instance 0x00000040c003c3b8 klass=java/util/concurrent/atomic/AtomicLong>
. 8    0    l42    a25.invokespecial(a35, l27, l4)
                   jdk/internal/misc/Unsafe.getAndAddLong(Ljava/lang/Object;JJ)J
  41   1    a46    <instance 0x00000040c003c3c0 klass=java/util/concurrent/atomic/AtomicLong>
  7    1    l53    1L
. 8    0    l54    a25.invokespecial(a46, l27, l53)
                   jdk/internal/misc/Unsafe.getAndAddLong(Ljava/lang/Object;JJ)J
. 49   0    i61    ireturn i29

after:

B3 (V) [33, 49] dom B1 pred: B1
empty stack
inlining depth 0
__bci__use__tid____instr____________________________________
  33   1    a35    <instance 0x00000040c003c3b8 klass=java/util/concurrent/atomic/AtomicLong>
. 8    0    l42    UnsafeGetAndSetObject (add).(a35, l27, value l4)
  41   1    a46    <instance 0x00000040c003c3c0 klass=java/util/concurrent/atomic/AtomicLong>
  7    1    l53    1L
. 8    0    l54    UnsafeGetAndSetObject (add).(a46, l27, value l53)
. 49   0    i61    ireturn i29

Testing:

Tier1 passed without new failure on unmacthed (release).


Progress

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

Issue

  • JDK-8304293: RISC-V: JDK-8276799 missed atomic intrinsic support for C1

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/riscv-port-jdk17u.git pull/19/head:pull/19
$ git checkout pull/19

Update a local copy of the PR:
$ git checkout pull/19
$ git pull https://git.openjdk.org/riscv-port-jdk17u.git pull/19/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/riscv-port-jdk17u/pull/19.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 21, 2023

👋 Welcome back gcao! A progress list of the required criteria for merging this PR into riscv-port 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 changed the title backport c09f83ec25749af349fb5609e3641b5bb6d34072 Backport c09f83ec25749af349fb5609e3641b5bb6d34072 Mar 21, 2023
@openjdk openjdk bot changed the title Backport c09f83ec25749af349fb5609e3641b5bb6d34072 8304293: RISC-V: JDK-8276799 missed atomic intrinsic support for C1 Mar 21, 2023
@openjdk
Copy link

openjdk bot commented Mar 21, 2023

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Mar 21, 2023
@openjdk
Copy link

openjdk bot commented Mar 21, 2023

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

8304293: RISC-V: JDK-8276799 missed atomic intrinsic support for C1

Reviewed-by: fjiang

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 2 new commits pushed to the riscv-port branch:

  • f2bdd16: 8301313: RISC-V: C2: assert(false) failed: bad AD file due to missing match rule
  • 4d4daec: 8299847: RISC-V: Improve PrintOptoAssembly output of CMoveI/L nodes

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

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 21, 2023
@mlbridge
Copy link

mlbridge bot commented Mar 21, 2023

Webrevs

Copy link
Member

@feilongjiang feilongjiang left a comment

Choose a reason for hiding this comment

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

Thanks for backporting this!

@RealFYang RealFYang merged commit 63319e2 into openjdk:riscv-port Mar 22, 2023
@zifeihan zifeihan deleted the backport-JDK-8304293 branch March 23, 2023 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required ready Pull request is ready to be integrated rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

3 participants