8303417: RISC-V: Merge vector instructs with similar match rules #14214

yhzhu20 · 2023-05-30T12:11:43Z

Merge vector instructs with similar match rules in riscv_v.ad.

Tier 1~3 passed on QEMU with RVV supported.

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-8303417: RISC-V: Merge vector instructs with similar match rules

Reviewers

Fei Yang (@RealFYang - Reviewer)
Robbin Ehn (@robehn - Reviewer) ⚠️ Review applies to 712b3594
Dingli Zhang (@DingliZhang - Author) ⚠️ Review applies to 712b3594

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14214

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-05-30T12:12:45Z

👋 Welcome back yzhu! 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 · 2023-05-30T12:15:24Z

@yhzhu20 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 · 2023-05-30T12:23:22Z

Webrevs

01: Full - Incremental (996d94a5)
00: Full (712b3594)

RealFYang

Thanks for the cleanup. One minor comment.

RealFYang · 2023-05-31T06:00:13Z

src/hotspot/cpu/riscv/riscv_v.ad

  match(Set dst (AbsVL src));
  ins_cost(VEC_COST);
  effect(TEMP tmp);
-  format %{ "vrsub.vi $tmp, 0, $src\t#@vabsL\n\t"
+  format %{ "vrsub.vi $tmp, 0, $src\t#@vabs\n\t"


Suggestion: format %{ "vrsub.vi $tmp, $src, 0\t#@vabs\n\t"

Thanks for the review. Done.

robehn

Looks good, thanks! (minus arg order in format as pointed out)

openjdk · 2023-05-31T10:54:03Z

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

8303417: RISC-V: Merge vector instructs with similar match rules

Reviewed-by: fyang, rehn, dzhang

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

a46b5ac: 8308503: AArch64: SIGILL when running with -XX:UseBranchProtection=pac-ret on hardware without PAC feature
f9ad7df: 8300865: C2: product reduction in ProdRed_Double is not vectorized
8eda97d: 8305320: DbgStrings and AsmRemarks are leaking
0951474: 8309150: Need to escape " inside attribute values
0119969: 8309171: Test vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/TestDescription.java fails after JDK-8308341
f8a924a: 8308975: Fix signed integer overflow in compiler code, part 2
5531f6b: 8308819: add JDWP and JDI virtual thread support for ThreadReference.ForceEarlyReturn
e42a4b6: 8309236: ProblemList java/util/concurrent/locks/Lock/OOMEInAQS.java with ZGC and Generational ZGC again
8dbd384: 8308678: (fs) UnixPath::toRealPath needs additional permissions when running with SM (macOS)
c3cd481: 8304914: Use OperatingSystem, Architecture, and Version in jpackage
... and 45 more: https://git.openjdk.org/jdk/compare/e21f865d84c7c861843ff568019e1ad11d280a50...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).

DingliZhang

LGTM, thanks!

RealFYang

Updated change looks good. Thanks.

yhzhu20 · 2023-06-01T02:41:11Z

/integrate

openjdk · 2023-06-01T02:42:36Z

@yhzhu20
Your change (at version 996d94a) is now ready to be sponsored by a Committer.

RealFYang · 2023-06-01T02:42:51Z

/sponsor

openjdk · 2023-06-01T02:44:15Z

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

a46b5ac: 8308503: AArch64: SIGILL when running with -XX:UseBranchProtection=pac-ret on hardware without PAC feature
f9ad7df: 8300865: C2: product reduction in ProdRed_Double is not vectorized
8eda97d: 8305320: DbgStrings and AsmRemarks are leaking
0951474: 8309150: Need to escape " inside attribute values
0119969: 8309171: Test vmTestbase/nsk/jvmti/scenarios/jni_interception/JI05/ji05t001/TestDescription.java fails after JDK-8308341
f8a924a: 8308975: Fix signed integer overflow in compiler code, part 2
5531f6b: 8308819: add JDWP and JDI virtual thread support for ThreadReference.ForceEarlyReturn
e42a4b6: 8309236: ProblemList java/util/concurrent/locks/Lock/OOMEInAQS.java with ZGC and Generational ZGC again
8dbd384: 8308678: (fs) UnixPath::toRealPath needs additional permissions when running with SM (macOS)
c3cd481: 8304914: Use OperatingSystem, Architecture, and Version in jpackage
... and 45 more: https://git.openjdk.org/jdk/compare/e21f865d84c7c861843ff568019e1ad11d280a50...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-06-01T02:44:27Z

@RealFYang @yhzhu20 Pushed as commit 6c7225f.

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

merge vector instructs with same match rule

712b359

openjdk bot added the rfr Pull request is ready for review label May 30, 2023

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label May 30, 2023

yhzhu20 changed the title ~~8303417: RISC-V: merge vector instructs with same match rule~~ 8303417: RISC-V: Merge vector instructs with similar match rules May 30, 2023

RealFYang suggested changes May 31, 2023

View reviewed changes

robehn approved these changes May 31, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label May 31, 2023

DingliZhang approved these changes May 31, 2023

View reviewed changes

modify format in vabs

996d94a

RealFYang approved these changes Jun 1, 2023

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 1, 2023

openjdk bot added the integrated Pull request has been integrated label Jun 1, 2023

openjdk bot closed this Jun 1, 2023

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 Jun 1, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8303417: RISC-V: Merge vector instructs with similar match rules #14214

8303417: RISC-V: Merge vector instructs with similar match rules #14214

yhzhu20 commented May 30, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented May 30, 2023

openjdk bot commented May 30, 2023

mlbridge bot commented May 30, 2023 •

edited

Loading

RealFYang left a comment

RealFYang May 31, 2023

yhzhu20 Jun 1, 2023

robehn left a comment

openjdk bot commented May 31, 2023 •

edited

Loading

DingliZhang left a comment

RealFYang left a comment

yhzhu20 commented Jun 1, 2023

openjdk bot commented Jun 1, 2023

RealFYang commented Jun 1, 2023

openjdk bot commented Jun 1, 2023

openjdk bot commented Jun 1, 2023

8303417: RISC-V: Merge vector instructs with similar match rules #14214

8303417: RISC-V: Merge vector instructs with similar match rules #14214

Conversation

yhzhu20 commented May 30, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented May 30, 2023

openjdk bot commented May 30, 2023

mlbridge bot commented May 30, 2023 • edited Loading

Webrevs

RealFYang left a comment

Choose a reason for hiding this comment

RealFYang May 31, 2023

Choose a reason for hiding this comment

yhzhu20 Jun 1, 2023

Choose a reason for hiding this comment

robehn left a comment

Choose a reason for hiding this comment

openjdk bot commented May 31, 2023 • edited Loading

DingliZhang left a comment

Choose a reason for hiding this comment

RealFYang left a comment

Choose a reason for hiding this comment

yhzhu20 commented Jun 1, 2023

openjdk bot commented Jun 1, 2023

RealFYang commented Jun 1, 2023

openjdk bot commented Jun 1, 2023

openjdk bot commented Jun 1, 2023

yhzhu20 commented May 30, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented May 30, 2023 •

edited

Loading

openjdk bot commented May 31, 2023 •

edited

Loading