Skip to content

Commit 0ecd417

Browse files
xuemingshen-oraclexuemingshen-oracle
committed
update
1 parent 5eee410 commit 0ecd417

37 files changed

Lines changed: 695 additions & 638 deletions

‎test/jdk/jdk/incubator/vector/AbstractVectorTest.java‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,20 +110,15 @@ static int[] fillInts(int[] a, IntOp f) {
110110
}
111111

112112
static final List<IntFunction<boolean[]>> BOOLEAN_MASK_GENERATORS = List.of(
113-
withToString("mask[i % 2]", (int l) -> {
114-
boolean[] a = new boolean[l];
115-
for (int i = 0; i < l; i++) {
116-
a[i] = (i % 2 == 0);
117-
}
118-
return a;
113+
withToString("mask[i % 2]", (int s) -> {
114+
return fill_boolean(s,
115+
i -> ((i % 2) == 0));
119116
}),
120-
withToString("mask[i % 5]", (int l) -> {
121-
boolean[] a = new boolean[l];
122-
for (int i = 0; i < l; i++) {
123-
a[i] = (i % 2 == 0);
124-
}
125-
return a;
117+
withToString("mask[i % 5]", (int s) -> {
118+
return fill_boolean(s,
119+
i -> ((i % 5) == 0));
126120
}),
121+
127122
withToString("mask[true]", (int l) -> {
128123
boolean[] a = new boolean[l];
129124
Arrays.fill(a, true);

‎test/jdk/jdk/incubator/vector/Byte128VectorTests.java‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,12 +1125,6 @@ static byte bits(byte e) {
11251125
.flatMap(pair -> BYTE_SATURATING_GENERATORS_ASSOC.stream().map(f -> List.of(pair.get(0), pair.get(1), f)))
11261126
.collect(Collectors.toList());
11271127

1128-
@DataProvider
1129-
public Object[][] boolUnaryOpProvider() {
1130-
return BOOL_ARRAY_GENERATORS.stream().
1131-
map(f -> new Object[]{f}).
1132-
toArray(Object[][]::new);
1133-
}
11341128

11351129
static final List<List<IntFunction<byte[]>>> BYTE_GENERATOR_TRIPLES =
11361130
BYTE_GENERATOR_PAIRS.stream().
@@ -1262,15 +1256,23 @@ public Object[][] maskProvider() {
12621256
}
12631257

12641258
@DataProvider
1265-
public Object[][] maskLongProvider() {
1259+
public Object[][] longMaskProvider() {
12661260
return LONG_MASK_GENERATORS.stream().
12671261
map(f -> new Object[]{f}).
12681262
toArray(Object[][]::new);
12691263
}
12701264

12711265
@DataProvider
1272-
public Object[][] maskBinaryOpProvider() {
1273-
return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
1266+
public Object[][] boolMaskBinaryOpProvider() {
1267+
return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
1268+
map(List::toArray).
1269+
toArray(Object[][]::new);
1270+
}
1271+
1272+
@DataProvider
1273+
public Object[][] boolMaskUnaryOpProvider() {
1274+
return BOOLEAN_MASK_GENERATORS.stream().
1275+
map(f -> new Object[]{f}).
12741276
toArray(Object[][]::new);
12751277
}
12761278

@@ -4501,7 +4503,7 @@ static boolean anyTrue(boolean[] a, int idx) {
45014503
return res;
45024504
}
45034505

4504-
@Test(dataProvider = "boolUnaryOpProvider")
4506+
@Test(dataProvider = "boolMaskUnaryOpProvider")
45054507
static void anyTrueByte128VectorTests(IntFunction<boolean[]> fm) {
45064508
boolean[] mask = fm.apply(SPECIES.length());
45074509
boolean[] r = fmr.apply(SPECIES.length());
@@ -4525,7 +4527,7 @@ static boolean allTrue(boolean[] a, int idx) {
45254527
return res;
45264528
}
45274529

4528-
@Test(dataProvider = "boolUnaryOpProvider")
4530+
@Test(dataProvider = "boolMaskUnaryOpProvider")
45294531
static void allTrueByte128VectorTests(IntFunction<boolean[]> fm) {
45304532
boolean[] mask = fm.apply(SPECIES.length());
45314533
boolean[] r = fmr.apply(SPECIES.length());
@@ -6431,7 +6433,7 @@ static boolean band(boolean a, boolean b) {
64316433
return a & b;
64326434
}
64336435

6434-
@Test(dataProvider = "maskBinaryOpProvider")
6436+
@Test(dataProvider = "boolMaskBinaryOpProvider")
64356437
static void maskandByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
64366438
boolean[] a = fa.apply(SPECIES.length());
64376439
boolean[] b = fb.apply(SPECIES.length());
@@ -6452,7 +6454,7 @@ static boolean bor(boolean a, boolean b) {
64526454
return a | b;
64536455
}
64546456

6455-
@Test(dataProvider = "maskBinaryOpProvider")
6457+
@Test(dataProvider = "boolMaskBinaryOpProvider")
64566458
static void maskorByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
64576459
boolean[] a = fa.apply(SPECIES.length());
64586460
boolean[] b = fb.apply(SPECIES.length());
@@ -6473,7 +6475,7 @@ static boolean bxor(boolean a, boolean b) {
64736475
return a != b;
64746476
}
64756477

6476-
@Test(dataProvider = "maskBinaryOpProvider")
6478+
@Test(dataProvider = "boolMaskBinaryOpProvider")
64776479
static void maskxorByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
64786480
boolean[] a = fa.apply(SPECIES.length());
64796481
boolean[] b = fb.apply(SPECIES.length());
@@ -6494,7 +6496,7 @@ static boolean bandNot(boolean a, boolean b) {
64946496
return a & !b;
64956497
}
64966498

6497-
@Test(dataProvider = "maskBinaryOpProvider")
6499+
@Test(dataProvider = "boolMaskBinaryOpProvider")
64986500
static void maskandNotByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
64996501
boolean[] a = fa.apply(SPECIES.length());
65006502
boolean[] b = fb.apply(SPECIES.length());
@@ -6515,7 +6517,7 @@ static boolean beq(boolean a, boolean b) {
65156517
return a == b;
65166518
}
65176519

6518-
@Test(dataProvider = "maskBinaryOpProvider")
6520+
@Test(dataProvider = "boolMaskBinaryOpProvider")
65196521
static void maskeqByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
65206522
boolean[] a = fa.apply(SPECIES.length());
65216523
boolean[] b = fb.apply(SPECIES.length());
@@ -6536,8 +6538,8 @@ static boolean unot(boolean a) {
65366538
return !a;
65376539
}
65386540

6539-
@Test(dataProvider = "maskBinaryOpProvider")
6540-
static void masknotByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
6541+
@Test(dataProvider = "boolMaskUnaryOpProvider")
6542+
static void masknotByte128VectorTests(IntFunction<boolean[]> fa) {
65416543
boolean[] a = fa.apply(SPECIES.length());
65426544
boolean[] r = new boolean[a.length];
65436545

@@ -6564,12 +6566,12 @@ static void assertArraysEquals(long[] r, long[] a, long bits) {
65646566
}
65656567
}
65666568

6567-
@Test(dataProvider = "maskLongProvider")
6569+
@Test(dataProvider = "longMaskProvider")
65686570
static void maskFromToLongByte128VectorTests(IntFunction<long[]> fa) {
65696571
long[] a = fa.apply(SPECIES.length());
65706572
long[] r = new long[a.length];
65716573

6572-
for (int ic = 0; ic < INVOC_COUNT * INVOC_COUNT; ic++) {
6574+
for (int ic = 0; ic < INVOC_COUNT; ic++) {
65736575
for (int i = 0; i < a.length; i++) {
65746576
VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
65756577
r[i] = vmask.toLong();
@@ -6888,7 +6890,7 @@ static void shuffleEqualsByte128VectorTestsSmokeTest(BiFunction<Integer,Integer,
68886890
}
68896891
}
68906892

6891-
@Test(dataProvider = "maskBinaryOpProvider")
6893+
@Test(dataProvider = "boolMaskBinaryOpProvider")
68926894
static void maskEqualsByte128VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
68936895
boolean[] a = fa.apply(SPECIES.length());
68946896
boolean[] b = fb.apply(SPECIES.length());

‎test/jdk/jdk/incubator/vector/Byte256VectorTests.java‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,12 +1125,6 @@ static byte bits(byte e) {
11251125
.flatMap(pair -> BYTE_SATURATING_GENERATORS_ASSOC.stream().map(f -> List.of(pair.get(0), pair.get(1), f)))
11261126
.collect(Collectors.toList());
11271127

1128-
@DataProvider
1129-
public Object[][] boolUnaryOpProvider() {
1130-
return BOOL_ARRAY_GENERATORS.stream().
1131-
map(f -> new Object[]{f}).
1132-
toArray(Object[][]::new);
1133-
}
11341128

11351129
static final List<List<IntFunction<byte[]>>> BYTE_GENERATOR_TRIPLES =
11361130
BYTE_GENERATOR_PAIRS.stream().
@@ -1262,15 +1256,23 @@ public Object[][] maskProvider() {
12621256
}
12631257

12641258
@DataProvider
1265-
public Object[][] maskLongProvider() {
1259+
public Object[][] longMaskProvider() {
12661260
return LONG_MASK_GENERATORS.stream().
12671261
map(f -> new Object[]{f}).
12681262
toArray(Object[][]::new);
12691263
}
12701264

12711265
@DataProvider
1272-
public Object[][] maskBinaryOpProvider() {
1273-
return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().map(List::toArray).
1266+
public Object[][] boolMaskBinaryOpProvider() {
1267+
return BOOLEAN_MASK_COMPARE_GENERATOR_PAIRS.stream().
1268+
map(List::toArray).
1269+
toArray(Object[][]::new);
1270+
}
1271+
1272+
@DataProvider
1273+
public Object[][] boolMaskUnaryOpProvider() {
1274+
return BOOLEAN_MASK_GENERATORS.stream().
1275+
map(f -> new Object[]{f}).
12741276
toArray(Object[][]::new);
12751277
}
12761278

@@ -4501,7 +4503,7 @@ static boolean anyTrue(boolean[] a, int idx) {
45014503
return res;
45024504
}
45034505

4504-
@Test(dataProvider = "boolUnaryOpProvider")
4506+
@Test(dataProvider = "boolMaskUnaryOpProvider")
45054507
static void anyTrueByte256VectorTests(IntFunction<boolean[]> fm) {
45064508
boolean[] mask = fm.apply(SPECIES.length());
45074509
boolean[] r = fmr.apply(SPECIES.length());
@@ -4525,7 +4527,7 @@ static boolean allTrue(boolean[] a, int idx) {
45254527
return res;
45264528
}
45274529

4528-
@Test(dataProvider = "boolUnaryOpProvider")
4530+
@Test(dataProvider = "boolMaskUnaryOpProvider")
45294531
static void allTrueByte256VectorTests(IntFunction<boolean[]> fm) {
45304532
boolean[] mask = fm.apply(SPECIES.length());
45314533
boolean[] r = fmr.apply(SPECIES.length());
@@ -6431,7 +6433,7 @@ static boolean band(boolean a, boolean b) {
64316433
return a & b;
64326434
}
64336435

6434-
@Test(dataProvider = "maskBinaryOpProvider")
6436+
@Test(dataProvider = "boolMaskBinaryOpProvider")
64356437
static void maskandByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
64366438
boolean[] a = fa.apply(SPECIES.length());
64376439
boolean[] b = fb.apply(SPECIES.length());
@@ -6452,7 +6454,7 @@ static boolean bor(boolean a, boolean b) {
64526454
return a | b;
64536455
}
64546456

6455-
@Test(dataProvider = "maskBinaryOpProvider")
6457+
@Test(dataProvider = "boolMaskBinaryOpProvider")
64566458
static void maskorByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
64576459
boolean[] a = fa.apply(SPECIES.length());
64586460
boolean[] b = fb.apply(SPECIES.length());
@@ -6473,7 +6475,7 @@ static boolean bxor(boolean a, boolean b) {
64736475
return a != b;
64746476
}
64756477

6476-
@Test(dataProvider = "maskBinaryOpProvider")
6478+
@Test(dataProvider = "boolMaskBinaryOpProvider")
64776479
static void maskxorByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
64786480
boolean[] a = fa.apply(SPECIES.length());
64796481
boolean[] b = fb.apply(SPECIES.length());
@@ -6494,7 +6496,7 @@ static boolean bandNot(boolean a, boolean b) {
64946496
return a & !b;
64956497
}
64966498

6497-
@Test(dataProvider = "maskBinaryOpProvider")
6499+
@Test(dataProvider = "boolMaskBinaryOpProvider")
64986500
static void maskandNotByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
64996501
boolean[] a = fa.apply(SPECIES.length());
65006502
boolean[] b = fb.apply(SPECIES.length());
@@ -6515,7 +6517,7 @@ static boolean beq(boolean a, boolean b) {
65156517
return a == b;
65166518
}
65176519

6518-
@Test(dataProvider = "maskBinaryOpProvider")
6520+
@Test(dataProvider = "boolMaskBinaryOpProvider")
65196521
static void maskeqByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
65206522
boolean[] a = fa.apply(SPECIES.length());
65216523
boolean[] b = fb.apply(SPECIES.length());
@@ -6536,8 +6538,8 @@ static boolean unot(boolean a) {
65366538
return !a;
65376539
}
65386540

6539-
@Test(dataProvider = "maskBinaryOpProvider")
6540-
static void masknotByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
6541+
@Test(dataProvider = "boolMaskUnaryOpProvider")
6542+
static void masknotByte256VectorTests(IntFunction<boolean[]> fa) {
65416543
boolean[] a = fa.apply(SPECIES.length());
65426544
boolean[] r = new boolean[a.length];
65436545

@@ -6564,12 +6566,12 @@ static void assertArraysEquals(long[] r, long[] a, long bits) {
65646566
}
65656567
}
65666568

6567-
@Test(dataProvider = "maskLongProvider")
6569+
@Test(dataProvider = "longMaskProvider")
65686570
static void maskFromToLongByte256VectorTests(IntFunction<long[]> fa) {
65696571
long[] a = fa.apply(SPECIES.length());
65706572
long[] r = new long[a.length];
65716573

6572-
for (int ic = 0; ic < INVOC_COUNT * INVOC_COUNT; ic++) {
6574+
for (int ic = 0; ic < INVOC_COUNT; ic++) {
65736575
for (int i = 0; i < a.length; i++) {
65746576
VectorMask vmask = VectorMask.fromLong(SPECIES, a[i]);
65756577
r[i] = vmask.toLong();
@@ -6888,7 +6890,7 @@ static void shuffleEqualsByte256VectorTestsSmokeTest(BiFunction<Integer,Integer,
68886890
}
68896891
}
68906892

6891-
@Test(dataProvider = "maskBinaryOpProvider")
6893+
@Test(dataProvider = "boolMaskBinaryOpProvider")
68926894
static void maskEqualsByte256VectorTests(IntFunction<boolean[]> fa, IntFunction<boolean[]> fb) {
68936895
boolean[] a = fa.apply(SPECIES.length());
68946896
boolean[] b = fb.apply(SPECIES.length());

0 commit comments

Comments
 (0)