8277777: [Vector API] assert(r->is_XMMRegister()) failed: must be in x86_32.ad #6535

DamonFool · 2021-11-24T11:56:44Z

Hi all,

The following vector api tests fail on x86_32/AVX512 with assert(r->is_XMMRegister()) failed: must be.

jdk/incubator/vector/Byte64VectorLoadStoreTests.java
jdk/incubator/vector/Byte256VectorLoadStoreTests.java
jdk/incubator/vector/Byte128VectorLoadStoreTests.java
jdk/incubator/vector/ByteMaxVectorLoadStoreTests.java
jdk/incubator/vector/Double256VectorTests.java
jdk/incubator/vector/Double512VectorTests.java
jdk/incubator/vector/DoubleMaxVectorTests.java       
jdk/incubator/vector/Float512VectorTests.java           
jdk/incubator/vector/Float256VectorTests.java
jdk/incubator/vector/FloatMaxVectorTests.java
jdk/incubator/vector/Float128VectorTests.java
jdk/incubator/vector/Short128VectorLoadStoreTests.java
jdk/incubator/vector/Short256VectorLoadStoreTests.java
jdk/incubator/vector/Short64VectorLoadStoreTests.java
jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java

The reason is that static enum RC rc_class( OptoReg::Name reg ) [1] missed the case for KRegister.
And the AVX-512 opmask specific spilling code [2] should be located before the size assert [3].

Thanks.
Best regards,
Jie

[1] https://github.com/openjdk/jdk/blob/master/src/hotspot/cpu/x86/x86_32.ad#L747
[2] https://github.com/openjdk/jdk/blob/master/src/hotspot/cpu/x86/x86_32.ad#L1272
[3] https://github.com/openjdk/jdk/blob/master/src/hotspot/cpu/x86/x86_32.ad#L1252

Progress

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

Issue

JDK-8277777: [Vector API] assert(r->is_XMMRegister()) failed: must be in x86_32.ad

Reviewers

Tobias Hartmann (@TobiHartmann - Reviewer)
Jatin Bhateja (@jatin-bhateja - Committer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6535

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

Using diff file

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

…x86_32.ad

bridgekeeper · 2021-11-24T11:57:52Z

👋 Welcome back jiefu! 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-11-24T11:59:58Z

@DamonFool 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 · 2021-11-24T12:04:16Z

Webrevs

00: Full (5f4030c1)

TobiHartmann

That looks good to me but @jatin-bhateja should have a look as well.

openjdk · 2021-11-29T09:50:06Z

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

8277777: [Vector API] assert(r->is_XMMRegister()) failed: must be in x86_32.ad

Reviewed-by: thartmann, jbhateja

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

c733193: 8262297: ImageIO.write() method will throw IndexOutOfBoundsException
da2be99: 8277026: Remove blank lines remaining from snippet markup
0a01baa: 8277986: Typo in javadoc of java.util.zip.ZipEntry#setTime
7049c13: 8231107: Allow store password to be null when saving a PKCS12 KeyStore
ab867f6: 8272162: S4U2Self ticket without forwardable flag
dd73e3c: 8277814: ConcurrentRefineThread should report rate when deactivating
65251f7: 8151594: Move concurrent refinement thread activation logging out of GC pause
f1c20e9: 8190748: java/text/Format/DateFormat/DateFormatTest.java and NonGregorianFormatTest fail intermittently
2942646: 8276683: Malformed Javadoc inline tags in JDK source in com/sun/tools/javac/util/RawDiagnosticFormatter.java
e30e676: 8277606: String(String) constructor could copy hashIsZero
... and 60 more: https://git.openjdk.java.net/jdk/compare/96e36071b63b624d56739b014b457ffc48147c4f...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.

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

DamonFool · 2021-11-29T23:39:53Z

That looks good to me but @jatin-bhateja should have a look as well.

Thanks @TobiHartmann .

@jatin-bhateja, please kindly review it.
Thanks.

jatin-bhateja · 2021-12-01T06:33:34Z

src/hotspot/cpu/x86/x86_32.ad

@@ -755,6 +755,7 @@ static enum RC rc_class( OptoReg::Name reg ) {
    assert(UseSSE < 2, "shouldn't be used in SSE2+ mode");
    return rc_float;
  }
+  if (r->is_KRegister()) return rc_kreg;


Thanks , this looks ok to me.

jatin-bhateja · 2021-12-01T06:34:41Z

src/hotspot/cpu/x86/x86_32.ad

+  assert( size > 0, "missed a case" );
+
+  // --------------------------------------------------------------------
+  // Check for second bits still needing moving.
+  if( src_second == dst_second )
+    return size;               // Self copy; no move
+  assert( src_second_rc != rc_bad && dst_second_rc != rc_bad, "src_second & dst_second cannot be Bad" );
+
+  // Check for second word int-int move
+  if( src_second_rc == rc_int && dst_second_rc == rc_int )
+    return impl_mov_helper(cbuf,do_size,src_second,dst_second,size, st);
+
+  // Check for second word integer store
+  if( src_second_rc == rc_int && dst_second_rc == rc_stack )
+    return impl_helper(cbuf,do_size,false,ra_->reg2offset(dst_second),src_second,0x89,"MOV ",size, st);
+
+  // Check for second word integer load
+  if( dst_second_rc == rc_int && src_second_rc == rc_stack )
+    return impl_helper(cbuf,do_size,true ,ra_->reg2offset(src_second),dst_second,0x8B,"MOV ",size, st);
+


This change looks unrelated to opmask spilling.

Thanks @jatin-bhateja for your review.

Actually, the part of change just moves the AVX-512 opmask specific spilling code [1] before the size assert [2].

[1] https://github.com/openjdk/jdk/blob/master/src/hotspot/cpu/x86/x86_32.ad#L1272
[2] https://github.com/openjdk/jdk/blob/master/src/hotspot/cpu/x86/x86_32.ad#L1252

DamonFool · 2021-12-01T07:18:35Z

The build failure of Windows x64 has nothing to do with this change.
So integrate it.
Thanks.

/integrate

openjdk · 2021-12-01T07:19:54Z

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

c733193: 8262297: ImageIO.write() method will throw IndexOutOfBoundsException
da2be99: 8277026: Remove blank lines remaining from snippet markup
0a01baa: 8277986: Typo in javadoc of java.util.zip.ZipEntry#setTime
7049c13: 8231107: Allow store password to be null when saving a PKCS12 KeyStore
ab867f6: 8272162: S4U2Self ticket without forwardable flag
dd73e3c: 8277814: ConcurrentRefineThread should report rate when deactivating
65251f7: 8151594: Move concurrent refinement thread activation logging out of GC pause
f1c20e9: 8190748: java/text/Format/DateFormat/DateFormatTest.java and NonGregorianFormatTest fail intermittently
2942646: 8276683: Malformed Javadoc inline tags in JDK source in com/sun/tools/javac/util/RawDiagnosticFormatter.java
e30e676: 8277606: String(String) constructor could copy hashIsZero
... and 60 more: https://git.openjdk.java.net/jdk/compare/96e36071b63b624d56739b014b457ffc48147c4f...master

Your commit was automatically rebased without conflicts.

openjdk · 2021-12-01T07:20:08Z

@DamonFool Pushed as commit 349328c.

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

8277777: [Vector API] assert(r->is_XMMRegister()) failed: must be in …

5f4030c

…x86_32.ad

openjdk bot added the rfr Pull request is ready for review label Nov 24, 2021

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Nov 24, 2021

DamonFool mentioned this pull request Nov 25, 2021

8277843: [Vector API] scalar2vector generates incorrect type info for mask operations if Op_MaskAll is unavailable #6562

Closed

3 tasks

TobiHartmann approved these changes Nov 29, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 29, 2021

DamonFool mentioned this pull request Nov 30, 2021

8262355: Support for AVX-512 opmask register allocation. #2768

Closed

3 tasks

jatin-bhateja reviewed Dec 1, 2021

View reviewed changes

jatin-bhateja approved these changes Dec 1, 2021

View reviewed changes

openjdk bot closed this Dec 1, 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 Dec 1, 2021

DamonFool deleted the JDK-8277777 branch December 1, 2021 07:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8277777: [Vector API] assert(r->is_XMMRegister()) failed: must be in x86_32.ad #6535

8277777: [Vector API] assert(r->is_XMMRegister()) failed: must be in x86_32.ad #6535

DamonFool commented Nov 24, 2021 •

edited by openjdk bot

Loading

bridgekeeper bot commented Nov 24, 2021

openjdk bot commented Nov 24, 2021

mlbridge bot commented Nov 24, 2021

TobiHartmann left a comment

openjdk bot commented Nov 29, 2021 •

edited

Loading

DamonFool commented Nov 29, 2021

jatin-bhateja Dec 1, 2021

jatin-bhateja Dec 1, 2021

DamonFool Dec 1, 2021

DamonFool commented Dec 1, 2021

openjdk bot commented Dec 1, 2021

openjdk bot commented Dec 1, 2021

8277777: [Vector API] assert(r->is_XMMRegister()) failed: must be in x86_32.ad #6535

8277777: [Vector API] assert(r->is_XMMRegister()) failed: must be in x86_32.ad #6535

Conversation

DamonFool commented Nov 24, 2021 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Nov 24, 2021

openjdk bot commented Nov 24, 2021

mlbridge bot commented Nov 24, 2021

Webrevs

TobiHartmann left a comment

Choose a reason for hiding this comment

openjdk bot commented Nov 29, 2021 • edited Loading

DamonFool commented Nov 29, 2021

jatin-bhateja Dec 1, 2021

Choose a reason for hiding this comment

jatin-bhateja Dec 1, 2021

Choose a reason for hiding this comment

DamonFool Dec 1, 2021

Choose a reason for hiding this comment

DamonFool commented Dec 1, 2021

openjdk bot commented Dec 1, 2021

openjdk bot commented Dec 1, 2021

DamonFool commented Nov 24, 2021 •

edited by openjdk bot

Loading

openjdk bot commented Nov 29, 2021 •

edited

Loading