8271515: Integration of JEP 417: Vector API (Third Incubator) by PaulSandoz · Pull Request #5873 · openjdk/jdk

PaulSandoz · 2021-10-08T21:25:26Z

This PR improves the performance of vector operations that accept masks on architectures that support masking in hardware, specifically Intel AVX512 and ARM SVE.

On architectures that do not support masking in hardware the same technique as before is applied to most operations, specifically composition using blend.

Masked loads/stores are a special form of masked operation that require additional care to ensure out-of-bounds access throw exceptions. The range checking has not been fully optimized and will require further work.

No API enhancements were required and only a few additional tests were needed.

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8271515: Integration of JEP 417: Vector API (Third Incubator)

Reviewers

Vladimir Kozlov (@vnkozlov - Reviewer) ⚠️ Review applies to f558b74
Sandhya Viswanathan (@sviswa7 - Reviewer) ⚠️ Review applies to 101cd23
Nick Gasson (@nick-arm - Reviewer) ⚠️ Review applies to 571e6f3

Contributors

Sandhya Viswanathan <sviswanathan@openjdk.org>
Jatin Bhateja <jbhateja@openjdk.org>
Ningsheng Jian <njian@openjdk.org>
Xiaohong Gong <xgong@openjdk.org>
Eric Liu <eliu@openjdk.org>
Jie Fu <jiefu@openjdk.org>
Vladimir Ivanov <vlivanov@openjdk.org>
John R Rose <jrose@openjdk.org>
Paul Sandoz <psandoz@openjdk.org>
Rado Smogura <mail@smogura.eu>

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5873/head:pull/5873
$ git checkout pull/5873

Update a local copy of the PR:
$ git checkout pull/5873
$ git pull https://git.openjdk.java.net/jdk pull/5873/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5873

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5873.diff

bridgekeeper · 2021-10-08T21:26:41Z

👋 Welcome back psandoz! 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 · 2021-10-08T21:28:57Z

@PaulSandoz The following labels will be automatically applied to this pull request:

core-libs
hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

PaulSandoz · 2021-10-08T21:41:16Z

/contributor add sviswanathan
/contributor add jbhateja
/contributor add njian
/contributor add xgong
/contributor add eliu
/contributor add jiefu
/contributor add vlivanov
/contributor add jrose
/contributor add psandoz

openjdk · 2021-10-08T21:41:40Z

@PaulSandoz
Contributor Sandhya Viswanathan <sviswanathan@openjdk.org> successfully added.

openjdk · 2021-10-08T21:42:51Z

@PaulSandoz
Contributor Jatin Bhateja <jbhateja@openjdk.org> successfully added.

openjdk · 2021-10-08T21:43:49Z

@PaulSandoz
Contributor Ningsheng Jian <njian@openjdk.org> successfully added.

openjdk · 2021-10-08T21:44:55Z

@PaulSandoz
Contributor Xiaohong Gong <xgong@openjdk.org> successfully added.

openjdk · 2021-10-08T21:45:57Z

@PaulSandoz
Contributor Eric Liu <eliu@openjdk.org> successfully added.

openjdk · 2021-10-08T21:47:50Z

@PaulSandoz
Contributor Jie Fu <jiefu@openjdk.org> successfully added.

openjdk · 2021-10-08T21:49:46Z

@PaulSandoz
Contributor Vladimir Ivanov <vlivanov@openjdk.org> successfully added.

openjdk · 2021-10-08T21:51:31Z

@PaulSandoz
Contributor John R Rose <jrose@openjdk.org> successfully added.

openjdk · 2021-10-08T21:52:37Z

@PaulSandoz
Contributor Paul Sandoz <psandoz@openjdk.org> successfully added.

PaulSandoz · 2021-10-13T18:23:49Z

/contributor add Rado Smogura mail@smogura.eu

openjdk · 2021-10-13T18:24:16Z

@PaulSandoz
Contributor Rado Smogura <mail@smogura.eu> successfully added.

mlbridge · 2021-10-13T18:37:22Z

Webrevs

PaulSandoz · 2021-10-13T18:40:10Z

/csr

openjdk · 2021-10-13T18:41:07Z

@PaulSandoz this pull request will not be integrated until the CSR request JDK-8274028 for issue JDK-8271515 has been approved.

vnkozlov

C2 and x86 changes seems fine.

sviswa7 · 2021-10-19T22:35:59Z

The Java changes look good to me.

nick-arm

AArch64 changes look ok apart from some minor comments.

nick-arm · 2021-10-20T03:04:26Z

+  }
+
+  const int num_of_regs = PRegisterImpl::number_of_saved_registers;
+  unsigned char regs[num_of_regs];


Seems clearer to use PRegisterImpl::number_of_saved_registers directly rather than introducing num_of_regs.

nick-arm · 2021-10-20T03:06:05Z

+  return total_push_bytes / 8;
+}
+
+// Return the number of dwords poped


nick-arm · 2021-10-20T03:09:08Z

    number_of_governing_registers = 8,
+    // AArch64 has 8 governing predicate registers, but p7 is used as an
+    // all-1s register so the predicates to save are from p0 to p6 if we
+    // don't have non-governing predicate registers support.


This comment is a bit difficult to read. How about:

// AArch64 has 8 governing predicate registers, but p7 is used as an // all-1s register so the predicates to save are from p0 to p6. We // don't support non-governing predicate registers.

nick-arm · 2021-10-20T03:11:30Z

 inline Register as_Register() {
-  assert( is_Register(), "must be");
-  // Yuk
+  assert(is_Register(), "must be");


I think it's better to leave this file as it was if you're only making whitespace changes here.

Address AArch64 review comments from Nick.

openjdk · 2021-10-20T15:24:42Z

⚠️ @PaulSandoz This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

nsjian · 2021-10-21T01:56:31Z

AArch64 changes look ok apart from some minor comments.

Thank you @nick-arm for the review! All your comments have been addressed.

nsjian · 2021-11-03T03:10:16Z

-    __ sve_$5(as_FloatRegister($dst$$reg), __ $6, as_FloatRegister($dst$$reg));
+    BasicType to_bt = Matcher::vector_element_basic_type(this);
+    Assembler::SIMD_RegVariant to_size = __ elemType_to_regVariant(to_bt);
+    __ sve_fcvtzs(as_FloatRegister($dst$$reg), __ D, ptrue, as_FloatRegister($src$$reg), __ D);


Converting from double to long and then narrow to target types did not follow JLS. I will fix it. Thanks to @fg1417 for helping to find out this issue.

Converting from double to long and then narrow to target types did not follow JLS. I will fix it. Thanks to @fg1417 for helping to find out this issue.

Fixed in the new commit. Thanks to @PaulSandoz for integrating the fix!

Hi Nick @nick-arm ,

Could you please help to review the new commit, which fixes the same issue as JDK-8276151 for SVE? Thanks!

Like JDK-8276151, SVE vector double to int and float to long conversions have similar issue. According to Java language specification [1], we should convert double/float to integer/long directly, instead of converting to long/int and then narrowing/extending to target types. Test cases will be updated in JDK-8276151. [1] https://docs.oracle.com/javase/specs/jls/se17/html/jls-5.html#jls-5.1.3

AArch64: Incorrect SVE double to int and float to long vector conversion

openjdk · 2021-11-11T05:43:28Z

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

8271515: Integration of JEP 417: Vector API (Third Incubator)

Co-authored-by: Sandhya Viswanathan <sviswanathan@openjdk.org>
Co-authored-by: Jatin Bhateja <jbhateja@openjdk.org>
Co-authored-by: Ningsheng Jian <njian@openjdk.org>
Co-authored-by: Xiaohong Gong <xgong@openjdk.org>
Co-authored-by: Eric Liu <eliu@openjdk.org>
Co-authored-by: Jie Fu <jiefu@openjdk.org>
Co-authored-by: Vladimir Ivanov <vlivanov@openjdk.org>
Co-authored-by: John R Rose <jrose@openjdk.org>
Co-authored-by: Paul Sandoz <psandoz@openjdk.org>
Co-authored-by: Rado Smogura <mail@smogura.eu>
Reviewed-by: kvn, sviswanathan, ngasson

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

0ca0acf: 8276947: Clarify how DateTimeFormatterBuilder.appendFraction handles value ranges
b0d7a9d: 8276994: java/nio/channels/Channels/TransferTo.java leaves multi-GB files in /tmp
8aae88b: 8276763: java/nio/channels/SocketChannel/AdaptorStreams.java fails with "SocketTimeoutException: Read timed out"

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

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

PaulSandoz · 2021-11-15T21:47:37Z

/integrate

openjdk · 2021-11-15T21:48:54Z

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

9326eb1: 8276095: ciReplay: replay failure due to incomplete ciMethodData information
7a87041: 8275385: Change nested classes in jdk.jdi to static nested classes
db0c8d5: 8274232: Cleanup unnecessary null comparison before instanceof check in jdk.jdi
1830b8d: 8275056: Virtualize G1CardSet containers over heap region
fe45835: 8274856: Failing jpackage tests with fastdebug/release build
9046077: 8276084: Linux DEB Bundler: release number in outputted .deb file should be optional
7fc344d: 8277028: Use service type documentation as fallback for @provides
35a831d: 8272170: Missing memory barrier when checking active state for regions
02f7900: 8276932: G1: Annotate methods with override explicitly in g1CollectedHeap.hpp
fdcd16a: 8277048: Tiny improvements to the specification text for java.util.Properties.load
... and 22 more: https://git.openjdk.java.net/jdk/compare/6f35eede4576b6252544f553c3651312b024e7ea...master

Your commit was automatically rebased without conflicts.

openjdk · 2021-11-15T21:49:16Z

@PaulSandoz Pushed as commit a59c9b2.

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

8271515: Integration of JEP 417: Vector API (Third Incubator)

4e7f606

openjdk Bot added hotspot hotspot-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Oct 8, 2021

Add new files.

8ea9647

PaulSandoz mentioned this pull request Oct 11, 2021

8275025: Unable to inline vectmask convert openjdk/panama-vector#151

Closed

2 tasks

PaulSandoz added 3 commits October 11, 2021 10:08

Apply patch from openjdk/panama-vector#151

b3554c9

Apply patch from openjdk/panama-vector#139

707121c

Apply patch from openjdk/panama-vector#142

f558b74

PaulSandoz marked this pull request as ready for review October 13, 2021 18:32

openjdk Bot added the rfr Pull request is ready for review label Oct 13, 2021

openjdk Bot added the csr Pull request needs approved CSR before integration label Oct 13, 2021

vnkozlov approved these changes Oct 13, 2021

View reviewed changes

PaulSandoz mentioned this pull request Oct 13, 2021

Make method package private. openjdk/panama-vector#152

Closed

2 tasks

Merge branch 'master' into JDK-8271515-vector-api

9945ce8

sviswa7 approved these changes Oct 19, 2021

View reviewed changes

nick-arm approved these changes Oct 20, 2021

View reviewed changes

Address review comments from Nick.

052a1cb

nsjian mentioned this pull request Oct 20, 2021

Address AArch64 review comments from Nick. PaulSandoz/jdk#1

Merged

Merge pull request #1 from nsjian/JDK-8271515

2919465

Address AArch64 review comments from Nick.

Merge branch 'master' into JDK-8271515-vector-api

c9a7722

pfustc mentioned this pull request Oct 29, 2021

8276066: Reset LoopPercentProfileLimit for x86 due to suboptimal performance #6142

Closed

3 tasks

nsjian reviewed Nov 3, 2021

View reviewed changes

Ningsheng Jian and others added 2 commits November 3, 2021 18:33

Merge pull request #2 from nsjian/vector-conversion-fix

571e6f3

AArch64: Incorrect SVE double to int and float to long vector conversion

nsjian mentioned this pull request Nov 5, 2021

8276151: AArch64: Incorrect result for double to int vector conversion #6247

Closed

3 tasks

nick-arm approved these changes Nov 5, 2021

View reviewed changes

openjdk Bot removed the csr Pull request needs approved CSR before integration label Nov 11, 2021

openjdk Bot added the ready Pull request is ready to be integrated label Nov 11, 2021

PaulSandoz added 2 commits November 11, 2021 09:02

Add missing null check post mask unboxing.

1190687

Merge branch 'master' into JDK-8271515-vector-api

44697f8

PaulSandoz mentioned this pull request Nov 11, 2021

8277015: Use blessed modifier order in Panama code #6355

Closed

3 tasks

openjdk Bot closed this Nov 15, 2021

openjdk Bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 15, 2021

nsjian mentioned this pull request Nov 17, 2021

Merge panama-vector:master openjdk/panama-vector#165

Closed

2 tasks

Conversation

PaulSandoz commented Oct 8, 2021 • edited by openjdk Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Contributors

Reviewing

Uh oh!

bridgekeeper Bot commented Oct 8, 2021

Uh oh!

openjdk Bot commented Oct 8, 2021

Uh oh!

PaulSandoz commented Oct 8, 2021

Uh oh!

openjdk Bot commented Oct 8, 2021

Uh oh!

openjdk Bot commented Oct 8, 2021

Uh oh!

openjdk Bot commented Oct 8, 2021

Uh oh!

openjdk Bot commented Oct 8, 2021

Uh oh!

openjdk Bot commented Oct 8, 2021

Uh oh!

openjdk Bot commented Oct 8, 2021

Uh oh!

openjdk Bot commented Oct 8, 2021

Uh oh!

openjdk Bot commented Oct 8, 2021

Uh oh!

openjdk Bot commented Oct 8, 2021

Uh oh!

PaulSandoz commented Oct 13, 2021

Uh oh!

openjdk Bot commented Oct 13, 2021

Uh oh!

mlbridge Bot commented Oct 13, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

PaulSandoz commented Oct 13, 2021

Uh oh!

openjdk Bot commented Oct 13, 2021

Uh oh!

vnkozlov left a comment

Choose a reason for hiding this comment

Uh oh!

sviswa7 commented Oct 19, 2021

Uh oh!

nick-arm left a comment

Choose a reason for hiding this comment

Uh oh!

nick-arm Oct 20, 2021

Choose a reason for hiding this comment

Uh oh!

nick-arm Oct 20, 2021

Choose a reason for hiding this comment

Uh oh!

nick-arm Oct 20, 2021

Choose a reason for hiding this comment

Uh oh!

nick-arm Oct 20, 2021

Choose a reason for hiding this comment

Uh oh!

openjdk Bot commented Oct 20, 2021

Uh oh!

nsjian commented Oct 21, 2021

Uh oh!

nsjian Nov 3, 2021

Choose a reason for hiding this comment

Uh oh!

nsjian Nov 5, 2021

Choose a reason for hiding this comment

Uh oh!

openjdk Bot commented Nov 11, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

PaulSandoz commented Nov 15, 2021

Uh oh!

PaulSandoz commented Oct 8, 2021 •

edited by openjdk Bot

Loading

mlbridge Bot commented Oct 13, 2021 •

edited

Loading

openjdk Bot commented Nov 11, 2021 •

edited

Loading