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

8297953: Fix several C2 IR matching tests for RISC-V #11453

Closed
wants to merge 1 commit into from

Conversation

feilongjiang
Copy link
Member

@feilongjiang feilongjiang commented Dec 1, 2022

Fix several IR matching tests that failed on RISC-V.

Rotate Node will be matched only when UseZbb is enabled:

  • test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeIntIdealizationTests.java
  • test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeLongIdealizationTests.java

RISC-V does not provide float branch instruction, so we do not match CMOVEI for two floating-point comparisons:

  • test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison.java

Testing:

  • test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison.java -- no tests selected as expected.

  • With -XX:+UseZbb:

    • test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeIntIdealizationTests.java -- passed
    • test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeLongIdealizationTests.java -- passed
  • With -XX:-UseZbb:

    • test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeIntIdealizationTests.java -- no tests selected as expected
    • test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeLongIdealizationTests.java -- no tests selected as expected

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-8297953: Fix several C2 IR matching tests for RISC-V

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11453

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 1, 2022

👋 Welcome back fjiang! 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 Dec 1, 2022
@openjdk
Copy link

openjdk bot commented Dec 1, 2022

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

  • hotspot-compiler

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-compiler hotspot-compiler-dev@openjdk.org label Dec 1, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 1, 2022

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 reasonable to me. Thanks.

@openjdk
Copy link

openjdk bot commented Dec 1, 2022

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

8297953: Fix several C2 IR matching tests for RISC-V

Reviewed-by: fyang, chagedorn

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:

  • 5c0ff26: 8291444: GHA builds/tests won't run manually if disabled from automatic running
  • 6d0fbb2: 8297645: Drop the test/jdk/java/net/httpclient/reactivestreams-tck-tests/TckDriver.java test
  • 687fd71: 8297549: RISC-V: Add support for Vector API vector load const operation
  • d50015a: 8297715: RISC-V: C2: Use single-bit instructions from the Zbs extension
  • 9bbcb54: 8297784: Optimize @stable field for Method.isCallerSensitive
  • 11ba759: 8297992: Tests fail after JDK-8297215 due to lack of @enablePreview
  • b035056: 8297455: Use the official ToolProvider API to call javac
  • 257aa15: 8297444: Refactor the javacserver build tool
  • e846b04: 8297875: jar should not compress the manifest directory entry
  • 82031d3: 8297294: compiler/c2/irTests/TestMulNodeIdealization.java failed compilation
  • ... and 13 more: https://git.openjdk.org/jdk/compare/2cb64a75578ccc15a1dfc8c2843aa11d05ca8aa7...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, @chhagedorn) 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 ready Pull request is ready to be integrated label Dec 1, 2022
Copy link
Member

@chhagedorn chhagedorn left a comment

Choose a reason for hiding this comment

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

Looks good!

@feilongjiang
Copy link
Member Author

@RealFYang @chhagedorn -- Thanks for looking at this.
/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 2, 2022
@openjdk
Copy link

openjdk bot commented Dec 2, 2022

@feilongjiang
Your change (at version 0721c16) is now ready to be sponsored by a Committer.

@RealFYang
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 2, 2022

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

  • 1370228: 8297941: Add override modifier in space.hpp
  • 319faa5: 8296084: javax/swing/JSpinner/4788637/bug4788637.java fails intermittently on a VM
  • b73363f: 8297686: JFR: Improve documentation of EventStream::onMetadata(Consumer)
  • 1376f33: 8297911: Memory leak in JfrUpcalls::on_retransform
  • 5c0ff26: 8291444: GHA builds/tests won't run manually if disabled from automatic running
  • 6d0fbb2: 8297645: Drop the test/jdk/java/net/httpclient/reactivestreams-tck-tests/TckDriver.java test
  • 687fd71: 8297549: RISC-V: Add support for Vector API vector load const operation
  • d50015a: 8297715: RISC-V: C2: Use single-bit instructions from the Zbs extension
  • 9bbcb54: 8297784: Optimize @stable field for Method.isCallerSensitive
  • 11ba759: 8297992: Tests fail after JDK-8297215 due to lack of @enablePreview
  • ... and 17 more: https://git.openjdk.org/jdk/compare/2cb64a75578ccc15a1dfc8c2843aa11d05ca8aa7...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 2, 2022
@openjdk openjdk bot closed this Dec 2, 2022
@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 Dec 2, 2022
@openjdk
Copy link

openjdk bot commented Dec 2, 2022

@RealFYang @feilongjiang Pushed as commit 227364d.

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

@feilongjiang feilongjiang deleted the riscv_fix_irtest branch December 30, 2022 08:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
3 participants