8298345: Fix another two C2 IR matching tests for RISC-V #11577

zifeihan · 2022-12-08T03:26:38Z

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

Vector api Node will be matched only when UseRVV is enabled:

test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java
test/hotspot/jtreg/compiler/vectorization/TestAutoVecIntMinMax.java

Please take a look and have some reviews. Thanks a lot.

Testing:

fastdebug on unmatched board without support for RVV
- test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java - no tests selected as expected
- test/hotspot/jtreg/compiler/vectorization/TestAutoVecIntMinMax.java - no tests selected as expected
fastdebug with -XX:+UseRVV on QEMU
- test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java - The C2 graph generated by the test is as expected
- test/hotspot/jtreg/compiler/vectorization/TestAutoVecIntMinMax.java -The C2 graph generated by the test is as expected
fastdebug with -XX:-UseRVV on QEMU
- test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java - no tests selected as expected
- test/hotspot/jtreg/compiler/vectorization/TestAutoVecIntMinMax.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-8298345: Fix another two C2 IR matching tests for RISC-V

Reviewers

Fei Yang (@RealFYang - Reviewer)
Dingli Zhang (@DingliZhang - Author)
Feilong Jiang (@feilongjiang - Author)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11577

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

Using diff file

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

bridgekeeper · 2022-12-08T03:28:01Z

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

openjdk · 2022-12-08T03:30:36Z

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

mlbridge · 2022-12-08T03:34:47Z

Webrevs

00: Full (b3c458d6)

RealFYang

Looks reasonable to me. Thanks.

openjdk · 2022-12-08T03:53:28Z

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

8298345: Fix another two C2 IR matching tests for RISC-V

Reviewed-by: fyang, dzhang, 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 23 new commits pushed to the master branch:

c16eb89: 8298138: Shenandoah: HdrSeq asserts "sub-bucket index (512) overflow for value ( 1.00)"
3dfadee: 8292289: [vectorapi] Improve the implementation of VectorTestNode
d35e840: 8297295: Remove ThreadGroup.allowThreadSuspension
175e3d3: 8296149: Start of release updates for JDK 21
d562d3f: 8297642: PhaseIdealLoop::only_has_infinite_loops must detect all loops that never lead to termination
fc52f21: 8298255: JFR provide information about dynamization of number of compiler threads
e555d54: 8298383: JFR: GenerateJfrFiles.java lacks copyright header
c084431: 8298379: JFR: Some UNTIMED events only sets endTime
ea108f5: 8298129: Let checkpoint event sizes grow beyond u4 limit
165dcdd: 8297718: Make NMT free:ing protocol more granular
... and 13 more: https://git.openjdk.org/jdk/compare/74f346b33f7fa053ad5c99ef85baa32b7fb12fa6...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) 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).

DingliZhang

LGTM, thanks! (Not a reviewer.)

feilongjiang

Thanks for the fixing, with one comment:

feilongjiang · 2022-12-08T06:26:20Z

test/hotspot/jtreg/compiler/c2/irTests/TestAutoVectorization2DArray.java

@@ -29,7 +29,9 @@
 * @test
 * @bug 8279258
 * @summary Auto-vectorization enhancement for two-dimensional array operations
- * @requires (os.arch != "x86" & os.arch != "i386") | vm.opt.UseSSE == "null" | vm.opt.UseSSE >= 2
+ * @requires ((os.arch == "x86" | os.arch == "i386") & (vm.opt.UseSSE == "null" | vm.opt.UseSSE >= 2))


Did you check that still works on other arches? e.g.: x64/aarch64

Did you check that still works on other arches? e.g.: x64/aarch64

Hi, thanks for the review.
I tested it under x86_64 GNU/Linux and aarch64 GNU/Linux, and both passed the test normally.

zifeihan · 2022-12-08T22:51:32Z

@RealFYang @DingliZhang @feilongjiang Thanks for the review.
/integrate

openjdk · 2022-12-08T23:13:23Z

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

TheShermanTanker · 2022-12-09T12:42:16Z

/sponsor

openjdk · 2022-12-09T12:44:02Z

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

cb766c5: 8297778: Modernize and improve module jdk.sctp
11aece2: 8257197: Add additional verification code to PhaseCCP
7f9c6ce: 8297679: InvocationTargetException field named target is not declared final
5540a8c: 8298083: The "CheckBox/RadioButton[Enabled/Disabled].textForeground" stoped working
c16eb89: 8298138: Shenandoah: HdrSeq asserts "sub-bucket index (512) overflow for value ( 1.00)"
3dfadee: 8292289: [vectorapi] Improve the implementation of VectorTestNode
d35e840: 8297295: Remove ThreadGroup.allowThreadSuspension
175e3d3: 8296149: Start of release updates for JDK 21
d562d3f: 8297642: PhaseIdealLoop::only_has_infinite_loops must detect all loops that never lead to termination
fc52f21: 8298255: JFR provide information about dynamization of number of compiler threads
... and 17 more: https://git.openjdk.org/jdk/compare/74f346b33f7fa053ad5c99ef85baa32b7fb12fa6...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-12-09T12:44:24Z

@TheShermanTanker @zifeihan Pushed as commit 33d955a.

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

RISC-V: Fix another two C2 IR matching tests for RISC-V

b3c458d

openjdk bot added the rfr Pull request is ready for review label Dec 8, 2022

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Dec 8, 2022

zifeihan changed the title ~~8297238: RISC-V: Fix another two C2 IR matching tests for RISC-V~~ 8298345: RISC-V: Fix another two C2 IR matching tests for RISC-V Dec 8, 2022

zifeihan changed the title ~~8298345: RISC-V: Fix another two C2 IR matching tests for RISC-V~~ 8298345: Fix another two C2 IR matching tests for RISC-V Dec 8, 2022

RealFYang approved these changes Dec 8, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Dec 8, 2022

DingliZhang approved these changes Dec 8, 2022

View reviewed changes

feilongjiang reviewed Dec 8, 2022

View reviewed changes

feilongjiang approved these changes Dec 8, 2022

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 8, 2022

openjdk bot added the integrated Pull request has been integrated label Dec 9, 2022

openjdk bot closed this Dec 9, 2022

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 9, 2022

zifeihan deleted the JDK-8298345 branch February 14, 2023 05:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8298345: Fix another two C2 IR matching tests for RISC-V #11577

8298345: Fix another two C2 IR matching tests for RISC-V #11577

zifeihan commented Dec 8, 2022 •

edited by openjdk bot

bridgekeeper bot commented Dec 8, 2022

openjdk bot commented Dec 8, 2022

mlbridge bot commented Dec 8, 2022

RealFYang left a comment

openjdk bot commented Dec 8, 2022 •

edited

DingliZhang left a comment

feilongjiang left a comment

feilongjiang Dec 8, 2022

zifeihan Dec 8, 2022

zifeihan commented Dec 8, 2022

openjdk bot commented Dec 8, 2022

TheShermanTanker commented Dec 9, 2022

openjdk bot commented Dec 9, 2022

openjdk bot commented Dec 9, 2022

8298345: Fix another two C2 IR matching tests for RISC-V #11577

8298345: Fix another two C2 IR matching tests for RISC-V #11577

Conversation

zifeihan commented Dec 8, 2022 • edited by openjdk bot

Testing:

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Dec 8, 2022

openjdk bot commented Dec 8, 2022

mlbridge bot commented Dec 8, 2022

Webrevs

RealFYang left a comment

Choose a reason for hiding this comment

openjdk bot commented Dec 8, 2022 • edited

DingliZhang left a comment

Choose a reason for hiding this comment

feilongjiang left a comment

Choose a reason for hiding this comment

feilongjiang Dec 8, 2022

Choose a reason for hiding this comment

zifeihan Dec 8, 2022

Choose a reason for hiding this comment

zifeihan commented Dec 8, 2022

openjdk bot commented Dec 8, 2022

TheShermanTanker commented Dec 9, 2022

openjdk bot commented Dec 9, 2022

openjdk bot commented Dec 9, 2022

zifeihan commented Dec 8, 2022 •

edited by openjdk bot

openjdk bot commented Dec 8, 2022 •

edited