Skip to content

8309129: AArch64: guarantee(T != T2S) failed: "incorrect arrangement" after JDK-8307795 #14245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

8309129: AArch64: guarantee(T != T2S) failed: "incorrect arrangement" after JDK-8307795 #14245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8fc4020
8309129: AArch64: guarantee(T != T2S) failed: "incorrect arrangement"…
changpeng1997 May 31, 2023
7736013
Merge branch 'openjdk:master' into fix_truecount
changpeng1997 Jun 1, 2023
c15e7b8
Update ProblemList and test case
changpeng1997 Jun 1, 2023
a534234
Merge branch 'openjdk:master' into fix_truecount
changpeng1997 Jun 5, 2023
48aa729
Update test case
changpeng1997 Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/hotspot/cpu/aarch64/aarch64_vector.ad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5522,12 +5522,12 @@ instruct vstoremask_truecount_neon(iRegINoSp dst, vReg src, immI_gt_1 size, vReg
// Input "src" is a vector mask represented as lanes with
// 0/-1 as element values.
uint esize = (uint)$size$$constant;
if (esize == 8) {
__ addpd($vtmp$$FloatRegister, $src$$FloatRegister);
uint length_in_bytes = Matcher::vector_length_in_bytes(this, $src);
Assembler::SIMD_Arrangement arrangement = Assembler::esize2arrangement(esize,
/* isQ */ length_in_bytes == 16);
if (arrangement == __ T2D || arrangement == __ T2S) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see jdk/incubator/vector/Float64VectorTests.java covers the case arrangement == __ T2S.
Is there a test covering the case arrangement == __ T2D?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see jdk/incubator/vector/Float64VectorTests.java covers the case arrangement == __ T2S. Is there a test covering the case arrangement == __ T2D?

Thanks for your review.
I don't find such a case. I will add a test case in TestVectorMaskTrueCount.java to cover arrangement == __ T2D.

__ addpv($vtmp$$FloatRegister, arrangement, $src$$FloatRegister, $src$$FloatRegister);
} else {
uint length_in_bytes = Matcher::vector_length_in_bytes(this, $src);
Assembler::SIMD_Arrangement arrangement = Assembler::esize2arrangement(esize,
/* isQ */ length_in_bytes == 16);
__ addv($vtmp$$FloatRegister, arrangement, $src$$FloatRegister);
}
__ smov($dst$$Register, $vtmp$$FloatRegister, __ B, 0);
Expand Down
10 changes: 5 additions & 5 deletions src/hotspot/cpu/aarch64/aarch64_vector_ad.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3832,12 +3832,12 @@ instruct vstoremask_truecount_neon(iRegINoSp dst, vReg src, immI_gt_1 size, vReg
// Input "src" is a vector mask represented as lanes with
// 0/-1 as element values.
uint esize = (uint)$size$$constant;
if (esize == 8) {
__ addpd($vtmp$$FloatRegister, $src$$FloatRegister);
uint length_in_bytes = Matcher::vector_length_in_bytes(this, $src);
Assembler::SIMD_Arrangement arrangement = Assembler::esize2arrangement(esize,
/* isQ */ length_in_bytes == 16);
if (arrangement == __ T2D || arrangement == __ T2S) {
__ addpv($vtmp$$FloatRegister, arrangement, $src$$FloatRegister, $src$$FloatRegister);
} else {
uint length_in_bytes = Matcher::vector_length_in_bytes(this, $src);
Assembler::SIMD_Arrangement arrangement = Assembler::esize2arrangement(esize,
/* isQ */ length_in_bytes == 16);
__ addv($vtmp$$FloatRegister, arrangement, $src$$FloatRegister);
}
__ smov($dst$$Register, $vtmp$$FloatRegister, __ B, 0);
Expand Down
64 changes: 52 additions & 12 deletions test/hotspot/jtreg/compiler/vectorapi/TestVectorMaskTrueCount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@
*/

public class TestVectorMaskTrueCount {
private static final VectorSpecies<Double> SPECIES = DoubleVector.SPECIES_PREFERRED;
private static final VectorSpecies<Float> SPECIES_F = FloatVector.SPECIES_64;
private static final VectorSpecies<Double> SPECIES_D = DoubleVector.SPECIES_128;
private static final VectorSpecies<Integer> SPECIES_I = IntVector.SPECIES_128;
private static final int LENGTH = 1024;
private static final Random RD = new Random();
private static boolean[] ba;
Expand All @@ -57,11 +59,11 @@ public class TestVectorMaskTrueCount {
}
}

static int maskAndTrueCount(boolean[] a, boolean[] b, int idx) {
static int maskAndTrueCount(boolean[] a, boolean[] b, int idx, int count) {
int trueCount = 0;
boolean[] c = new boolean[SPECIES.length()];
boolean[] c = new boolean[count];

for (int i = idx; i < idx + SPECIES.length(); i++) {
for (int i = idx; i < idx + count; i++) {
c[i - idx] = a[i] & b[i];
}

Expand All @@ -72,23 +74,61 @@ static int maskAndTrueCount(boolean[] a, boolean[] b, int idx) {
return trueCount;
}

static void assertArrayEquals(int[] r, boolean[] a, boolean[] b) {
for (int i = 0; i < a.length; i += SPECIES.length()) {
Asserts.assertEquals(r[i], maskAndTrueCount(a, b, i));
static void assertArrayEqualsFloat(int[] r, boolean[] a, boolean[] b) {
for (int i = 0; i < a.length; i += SPECIES_F.length()) {
Asserts.assertEquals(r[i], maskAndTrueCount(a, b, i, SPECIES_F.length()));
}
}

static void assertArrayEqualsDouble(int[] r, boolean[] a, boolean[] b) {
for (int i = 0; i < a.length; i += SPECIES_D.length()) {
Asserts.assertEquals(r[i], maskAndTrueCount(a, b, i, SPECIES_D.length()));
}
}

static void assertArrayEqualsInteger(int[] r, boolean[] a, boolean[] b) {
for (int i = 0; i < a.length; i += SPECIES_I.length()) {
Asserts.assertEquals(r[i], maskAndTrueCount(a, b, i, SPECIES_I.length()));
}
}

@Test
@IR(counts = { IRNode.VSTOREMASK_TRUECOUNT, ">= 1" })
public static void testFloat() {
int[] r = new int[LENGTH];
for (int i = 0; i < LENGTH; i += SPECIES_F.length()) {
VectorMask<Float> ma = VectorMask.fromArray(SPECIES_F, ba, i);
VectorMask<Float> mb = VectorMask.fromArray(SPECIES_F, bb, i);
r[i] = ma.and(mb).trueCount();
}

assertArrayEqualsFloat(r, ba, bb);
}

@Test
@IR(counts = { IRNode.VSTOREMASK_TRUECOUNT, ">= 1" })
public static void testDouble() {
int[] r = new int[LENGTH];
for (int i = 0; i < LENGTH; i += SPECIES_D.length()) {
VectorMask<Double> ma = VectorMask.fromArray(SPECIES_D, ba, i);
VectorMask<Double> mb = VectorMask.fromArray(SPECIES_D, bb, i);
r[i] = ma.and(mb).trueCount();
}

assertArrayEqualsDouble(r, ba, bb);
}

@Test
@IR(counts = { IRNode.VSTOREMASK_TRUECOUNT, ">= 1" })
public static void test() {
public static void testInt() {
int[] r = new int[LENGTH];
for (int i = 0; i < LENGTH; i += SPECIES.length()) {
VectorMask<Double> ma = VectorMask.fromArray(SPECIES, ba, i);
VectorMask<Double> mb = VectorMask.fromArray(SPECIES, bb, i);
for (int i = 0; i < LENGTH; i += SPECIES_I.length()) {
VectorMask<Integer> ma = VectorMask.fromArray(SPECIES_I, ba, i);
VectorMask<Integer> mb = VectorMask.fromArray(SPECIES_I, bb, i);
r[i] = ma.and(mb).trueCount();
}

assertArrayEquals(r, ba, bb);
assertArrayEqualsInteger(r, ba, bb);
}

public static void main(String[] args) {
Expand Down
1 change: 0 additions & 1 deletion test/jdk/ProblemList.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,6 @@ jdk/incubator/concurrent/ScopedValue/StressStackOverflow.java 8303498 linux-s3

jdk/incubator/vector/ShortMaxVectorTests.java 8306592 generic-i586
jdk/incubator/vector/LoadJsvmlTest.java 8305390 windows-x64
jdk/incubator/vector/Float64VectorTests.java 8309129 generic-aarch64

############################################################################

Expand Down