8333652: RISC-V: compiler/vectorapi/VectorGatherMaskFoldingTest.java fails when using RVV #19564

zifeihan · 2024-06-05T15:26:57Z

Hi, We are experiencing test failures in test/hotspot/jtreg/compiler/vectorapi/VectorGatherMaskFoldingTest.java on Banana Pi BPI-F3 board (has RVV1.0), see jbs issue for exception information.

related C2 instruct:

jdk/src/hotspot/cpu/riscv/riscv_v.ad

Lines 4805 to 4811 in 326dbb1

    
           __ vmv1r_v(as_VectorRegister($dst$$reg), as_VectorRegister($idx$$reg)); 
        
           BasicType bt = Matcher::vector_element_basic_type(this); 
        
           Assembler::SEW sew = Assembler::elemtype_to_sew(bt); 
        
           __ vsetvli_helper(bt, Matcher::vector_length(this)); 
        
           __ vsll_vi(as_VectorRegister($dst$$reg), as_VectorRegister($dst$$reg), (int)sew); 
        
           __ vluxei32_v(as_VectorRegister($dst$$reg), as_Register($mem$$base), 
        
                         as_VectorRegister($dst$$reg));

As rvv1.0 manual requirements for vector indexed loads[1]: Vector unit-stride and constant-stride use the EEW/EMUL encoded in the instruction for the data values, while vector indexed loads and stores use the EEW/EMUL encoded in the instruction for the index values and the SEW/LMUL encoded in vtype for the data values.
So in this case where a 64-bit vector index is used, we need to use the vluxei64_v (64-bit indexed load)

Testing

Run VectorGatherMaskFoldingTest.java on Banana Pi BPI-F3 board (with RVV1.0)
test/jdk/jdk/incubator/vector on Banana Pi BPI-F3 board (with RVV1.0)
Run VectorGatherMaskFoldingTest.java on SOPHON SG2042 (without RVV1.0)

[1] https://github.com/riscv/riscv-v-spec/blob/v1.0/v-spec.adoc#sec-vector-loadstore-width-encoding

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-8333652: RISC-V: compiler/vectorapi/VectorGatherMaskFoldingTest.java fails when using RVV (Bug - P4)

Reviewers

Fei Yang (@RealFYang - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19564

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

Using diff file

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

Webrev

Link to Webrev Comment

…fails when using RVV

bridgekeeper · 2024-06-05T15:27:55Z

👋 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 · 2024-06-05T15:29:00Z

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

8333652: RISC-V: compiler/vectorapi/VectorGatherMaskFoldingTest.java fails when using RVV

Reviewed-by: fyang

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

a941397: 8329031: CPUID feature detection for Advanced Performance Extensions (Intel® APX)
8d2f9e5: 8333749: Consolidate ConstantDesc conversion in java.base
a6fc2f8: 8333412: [s390x] Add support for branch on count instruction
cf677c9: 8333823: Update --release 23 symbol information for JDK 23 build 26
18e7d7b: 8333716: Shenandoah: Check for disarmed method before taking the nmethod lock
c37d02a: 8312412: Uninitialized klassVtable::_verify_count field
17bd483: 8333680: com/sun/tools/attach/BasicTests.java fails with "SocketException: Permission denied: connect"
512b2b4: 8330420: Inverted use of DisplayVMOutputToStderr in ostream_exit
8e72d7c: 8320448: Accelerate IndexOf using AVX2
25ad862: 8332161: Test restoring echo in the Console implementation (java.base)
... and 64 more: https://git.openjdk.org/jdk/compare/67b9a081391d6ef775581d65da4b3cc302aa8dd8...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).

openjdk · 2024-06-05T15:29:23Z

@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 · 2024-06-06T02:51:50Z

Webrevs

00: Full (8ff7e930)

RealFYang

Looks reasonable.

zifeihan · 2024-06-10T08:05:00Z

@RealFYang : Thanks for the review.
/integrate

openjdk · 2024-06-10T08:06:12Z

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

RealFYang · 2024-06-10T13:43:52Z

/sponsor

openjdk · 2024-06-10T13:44:45Z

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

e0afe0b: 8326085: Remove unnecessary UpcallContext constructor
2a242db: 8325821: [REDO] use "dmb.ishst+dmb.ishld" for release barrier
e7dc76b: 8333849: (dc) DatagramChannel send/receive fails with UOE if buffer backed by memory segment allocated from shared arena
ec1664e: 8333804: java/net/httpclient/ForbiddenHeadTest.java threw an exception with 0 failures
e22fc12: 8333775: Small improvement to outputStream auto-indentation mode
7b43a8c: 8333824: Unused ClassValue in VarHandles
5f9d3e3: 8333722: Fix CompilerDirectives for non-compiler JVM variants
83b3441: 8322811: jcmd System.dump_map help info has conflicting statements
8aa35ca: 8333833: Remove the use of ByteArrayLittleEndian from UUID::toString
de55db2: 8333522: JFR SwapSpace event might read wrong free swap space size
... and 74 more: https://git.openjdk.org/jdk/compare/67b9a081391d6ef775581d65da4b3cc302aa8dd8...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-06-10T13:44:54Z

@RealFYang @zifeihan Pushed as commit ce5727d.

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

zifeihan · 2024-06-12T13:20:01Z

/backport jdk22u

openjdk · 2024-06-12T13:21:26Z

@zifeihan the backport was successfully created on the branch backport-zifeihan-ce5727df-master in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit ce5727df from the openjdk/jdk repository.

The commit being backported was authored by Gui Cao on 10 Jun 2024 and was reviewed by Fei Yang.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-zifeihan-ce5727df-master:backport-zifeihan-ce5727df-master
$ git checkout backport-zifeihan-ce5727df-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-zifeihan-ce5727df-master

zifeihan · 2024-06-12T13:25:04Z

/backport jdk21u-dev

openjdk · 2024-06-12T13:27:32Z

@zifeihan the backport was successfully created on the branch backport-zifeihan-ce5727df-master in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit ce5727df from the openjdk/jdk repository.

The commit being backported was authored by Gui Cao on 10 Jun 2024 and was reviewed by Fei Yang.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-zifeihan-ce5727df-master:backport-zifeihan-ce5727df-master
$ git checkout backport-zifeihan-ce5727df-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-zifeihan-ce5727df-master

zifeihan · 2024-06-12T16:04:49Z

/backport jdk23u

openjdk · 2024-06-12T16:05:38Z

@zifeihan the backport was successfully created on the branch backport-zifeihan-ce5727df-master in my personal fork of openjdk/jdk23u. To create a pull request with this backport targeting openjdk/jdk23u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit ce5727df from the openjdk/jdk repository.

The commit being backported was authored by Gui Cao on 10 Jun 2024 and was reviewed by Fei Yang.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk23u:

$ git fetch https://github.com/openjdk-bots/jdk23u.git backport-zifeihan-ce5727df-master:backport-zifeihan-ce5727df-master
$ git checkout backport-zifeihan-ce5727df-master
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk23u.git backport-zifeihan-ce5727df-master

⚠️ @zifeihan You are not yet a collaborator in my fork openjdk-bots/jdk23u. An invite will be sent out and you need to accept it before you can proceed.

8333652: RISC-V: compiler/vectorapi/VectorGatherMaskFoldingTest.java …

8ff7e93

…fails when using RVV

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Jun 5, 2024

zifeihan changed the title ~~RISC-V: compiler/vectorapi/VectorGatherMaskFoldingTest.java fails when using RVV~~ 8333652: RISC-V: compiler/vectorapi/VectorGatherMaskFoldingTest.java fails when using RVV Jun 5, 2024

zifeihan marked this pull request as ready for review June 6, 2024 02:48

openjdk bot added the rfr Pull request is ready for review label Jun 6, 2024

RealFYang approved these changes Jun 6, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 6, 2024

openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 10, 2024

openjdk bot added the integrated Pull request has been integrated label Jun 10, 2024

openjdk bot closed this Jun 10, 2024

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 10, 2024

zifeihan deleted the JDK-8333652 branch June 19, 2024 07:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8333652: RISC-V: compiler/vectorapi/VectorGatherMaskFoldingTest.java fails when using RVV #19564

8333652: RISC-V: compiler/vectorapi/VectorGatherMaskFoldingTest.java fails when using RVV #19564

zifeihan commented Jun 5, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jun 5, 2024

openjdk bot commented Jun 5, 2024 •

edited

Loading

openjdk bot commented Jun 5, 2024

mlbridge bot commented Jun 6, 2024

RealFYang left a comment

zifeihan commented Jun 10, 2024

openjdk bot commented Jun 10, 2024

RealFYang commented Jun 10, 2024

openjdk bot commented Jun 10, 2024

openjdk bot commented Jun 10, 2024

zifeihan commented Jun 12, 2024

openjdk bot commented Jun 12, 2024

zifeihan commented Jun 12, 2024

openjdk bot commented Jun 12, 2024

zifeihan commented Jun 12, 2024

openjdk bot commented Jun 12, 2024

	__ vmv1r_v(as_VectorRegister($dst$$reg), as_VectorRegister($idx$$reg));
	BasicType bt = Matcher::vector_element_basic_type(this);
	Assembler::SEW sew = Assembler::elemtype_to_sew(bt);
	__ vsetvli_helper(bt, Matcher::vector_length(this));
	__ vsll_vi(as_VectorRegister($dst$$reg), as_VectorRegister($dst$$reg), (int)sew);
	__ vluxei32_v(as_VectorRegister($dst$$reg), as_Register($mem$$base),
	as_VectorRegister($dst$$reg));

8333652: RISC-V: compiler/vectorapi/VectorGatherMaskFoldingTest.java fails when using RVV #19564

8333652: RISC-V: compiler/vectorapi/VectorGatherMaskFoldingTest.java fails when using RVV #19564

Conversation

zifeihan commented Jun 5, 2024 • edited by openjdk bot Loading

Testing

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Jun 5, 2024

openjdk bot commented Jun 5, 2024 • edited Loading

openjdk bot commented Jun 5, 2024

mlbridge bot commented Jun 6, 2024

Webrevs

RealFYang left a comment

Choose a reason for hiding this comment

zifeihan commented Jun 10, 2024

openjdk bot commented Jun 10, 2024

RealFYang commented Jun 10, 2024

openjdk bot commented Jun 10, 2024

openjdk bot commented Jun 10, 2024

zifeihan commented Jun 12, 2024

openjdk bot commented Jun 12, 2024

zifeihan commented Jun 12, 2024

openjdk bot commented Jun 12, 2024

zifeihan commented Jun 12, 2024

openjdk bot commented Jun 12, 2024

zifeihan commented Jun 5, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Jun 5, 2024 •

edited

Loading