Skip to content

Commit 9a689b0

Browse files
DingliZhangDingliZhang
committed
8382393: Enable VectorStoreMaskIdentityTest.java IR tests for RISC-V
Reviewed-by: fyang, epeter
1 parent eac3968 commit 9a689b0

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

‎test/hotspot/jtreg/compiler/vectorapi/VectorStoreMaskIdentityTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private static void verifyResult(int vlen) {
7373
IRNode.VECTOR_LOAD_MASK, "= 0",
7474
IRNode.VECTOR_STORE_MASK, "= 0",
7575
IRNode.VECTOR_MASK_CAST, "= 0" },
76-
applyIfCPUFeatureOr = { "asimd", "true", "avx", "true" },
76+
applyIfCPUFeatureOr = { "asimd", "true", "avx", "true", "rvv", "true" },
7777
applyIf = { "MaxVectorSize", ">= 16" })
7878
public static void testVectorMaskStoreIdentityByte() {
7979
VectorMask<Byte> mask_byte_64 = VectorMask.fromArray(B64, mask_in, 0);
@@ -93,7 +93,7 @@ public static void testVectorMaskStoreIdentityByte() {
9393
IRNode.VECTOR_LOAD_MASK, "= 0",
9494
IRNode.VECTOR_STORE_MASK, "= 0",
9595
IRNode.VECTOR_MASK_CAST, "= 0" },
96-
applyIfCPUFeatureOr = { "sve", "true", "avx2", "true" },
96+
applyIfCPUFeatureOr = { "sve", "true", "avx2", "true", "rvv", "true" },
9797
applyIf = { "MaxVectorSize", "> 16" })
9898
public static void testVectorMaskStoreIdentityByte256() {
9999
VectorMask<Byte> mask_byte_64 = VectorMask.fromArray(B64, mask_in, 0);
@@ -113,7 +113,7 @@ public static void testVectorMaskStoreIdentityByte256() {
113113
IRNode.VECTOR_LOAD_MASK, "= 0",
114114
IRNode.VECTOR_STORE_MASK, "= 0",
115115
IRNode.VECTOR_MASK_CAST, "= 0" },
116-
applyIfCPUFeatureOr = { "asimd", "true", "avx", "true" },
116+
applyIfCPUFeatureOr = { "asimd", "true", "avx", "true", "rvv", "true" },
117117
applyIf = { "MaxVectorSize", ">= 16" })
118118
public static void testVectorMaskStoreIdentityShort() {
119119
VectorMask<Short> mask_short_128 = VectorMask.fromArray(S128, mask_in, 0);
@@ -133,7 +133,7 @@ public static void testVectorMaskStoreIdentityShort() {
133133
IRNode.VECTOR_LOAD_MASK, "= 0",
134134
IRNode.VECTOR_STORE_MASK, "= 0",
135135
IRNode.VECTOR_MASK_CAST, "= 0" },
136-
applyIfCPUFeatureOr = { "sve", "true", "avx2", "true" },
136+
applyIfCPUFeatureOr = { "sve", "true", "avx2", "true", "rvv", "true" },
137137
applyIf = { "MaxVectorSize", "> 16" })
138138
public static void testVectorMaskStoreIdentityShort256() {
139139
VectorMask<Short> mask_short_128 = VectorMask.fromArray(S128, mask_in, 0);
@@ -153,7 +153,7 @@ public static void testVectorMaskStoreIdentityShort256() {
153153
IRNode.VECTOR_LOAD_MASK, "= 0",
154154
IRNode.VECTOR_STORE_MASK, "= 0",
155155
IRNode.VECTOR_MASK_CAST, "= 0" },
156-
applyIfCPUFeatureOr = { "asimd", "true", "avx", "true" },
156+
applyIfCPUFeatureOr = { "asimd", "true", "avx", "true", "rvv", "true" },
157157
applyIf = { "MaxVectorSize", ">= 16" })
158158
public static void testVectorMaskStoreIdentityInt() {
159159
VectorMask<Integer> mask_int_128 = VectorMask.fromArray(I128, mask_in, 0);
@@ -173,7 +173,7 @@ public static void testVectorMaskStoreIdentityInt() {
173173
IRNode.VECTOR_LOAD_MASK, "= 0",
174174
IRNode.VECTOR_STORE_MASK, "= 0",
175175
IRNode.VECTOR_MASK_CAST, "= 0" },
176-
applyIfCPUFeatureOr = { "sve", "true", "avx2", "true" },
176+
applyIfCPUFeatureOr = { "sve", "true", "avx2", "true", "rvv", "true" },
177177
applyIf = { "MaxVectorSize", "> 16" })
178178
public static void testVectorMaskStoreIdentityInt256() {
179179
VectorMask<Integer> mask_int_128 = VectorMask.fromArray(I128, mask_in, 0);
@@ -193,7 +193,7 @@ public static void testVectorMaskStoreIdentityInt256() {
193193
IRNode.VECTOR_LOAD_MASK, "= 0",
194194
IRNode.VECTOR_STORE_MASK, "= 0",
195195
IRNode.VECTOR_MASK_CAST, "= 0" },
196-
applyIfCPUFeatureOr = { "asimd", "true" },
196+
applyIfCPUFeatureOr = { "asimd", "true", "rvv", "true" },
197197
applyIf = { "MaxVectorSize", ">= 16" })
198198
public static void testVectorMaskStoreIdentityLong() {
199199
VectorMask<Long> mask_long_128 = VectorMask.fromArray(L128, mask_in, 0);
@@ -213,7 +213,7 @@ public static void testVectorMaskStoreIdentityLong() {
213213
IRNode.VECTOR_LOAD_MASK, "= 0",
214214
IRNode.VECTOR_STORE_MASK, "= 0",
215215
IRNode.VECTOR_MASK_CAST, "= 0" },
216-
applyIfCPUFeatureOr = { "sve", "true", "avx2", "true" },
216+
applyIfCPUFeatureOr = { "sve", "true", "avx2", "true", "rvv", "true" },
217217
applyIf = { "MaxVectorSize", "> 16" })
218218
public static void testVectorMaskStoreIdentityLong256() {
219219
VectorMask<Long> mask_long_256 = VectorMask.fromArray(L256, mask_in, 0);
@@ -233,7 +233,7 @@ public static void testVectorMaskStoreIdentityLong256() {
233233
IRNode.VECTOR_LOAD_MASK, "= 0",
234234
IRNode.VECTOR_STORE_MASK, "= 0",
235235
IRNode.VECTOR_MASK_CAST, "= 0" },
236-
applyIfCPUFeatureOr = { "asimd", "true", "avx", "true" },
236+
applyIfCPUFeatureOr = { "asimd", "true", "avx", "true", "rvv", "true" },
237237
applyIf = { "MaxVectorSize", ">= 16" })
238238
public static void testVectorMaskStoreIdentityFloat() {
239239
VectorMask<Float> mask_float_128 = VectorMask.fromArray(F128, mask_in, 0);
@@ -253,7 +253,7 @@ public static void testVectorMaskStoreIdentityFloat() {
253253
IRNode.VECTOR_LOAD_MASK, "= 0",
254254
IRNode.VECTOR_STORE_MASK, "= 0",
255255
IRNode.VECTOR_MASK_CAST, "= 0" },
256-
applyIfCPUFeatureOr = { "sve", "true", "avx2", "true" },
256+
applyIfCPUFeatureOr = { "sve", "true", "avx2", "true", "rvv", "true" },
257257
applyIf = { "MaxVectorSize", "> 16" })
258258
public static void testVectorMaskStoreIdentityFloat256() {
259259
VectorMask<Float> mask_float_128 = VectorMask.fromArray(F128, mask_in, 0);
@@ -273,7 +273,7 @@ public static void testVectorMaskStoreIdentityFloat256() {
273273
IRNode.VECTOR_LOAD_MASK, "= 0",
274274
IRNode.VECTOR_STORE_MASK, "= 0",
275275
IRNode.VECTOR_MASK_CAST, "= 0" },
276-
applyIfCPUFeatureOr = { "asimd", "true" },
276+
applyIfCPUFeatureOr = { "asimd", "true", "rvv", "true" },
277277
applyIf = { "MaxVectorSize", ">= 16" })
278278
public static void testVectorMaskStoreIdentityDouble() {
279279
VectorMask<Double> mask_double_128 = VectorMask.fromArray(D128, mask_in, 0);
@@ -293,7 +293,7 @@ public static void testVectorMaskStoreIdentityDouble() {
293293
IRNode.VECTOR_LOAD_MASK, "= 0",
294294
IRNode.VECTOR_STORE_MASK, "= 0",
295295
IRNode.VECTOR_MASK_CAST, "= 0" },
296-
applyIfCPUFeatureOr = { "sve", "true", "avx2", "true" },
296+
applyIfCPUFeatureOr = { "sve", "true", "avx2", "true", "rvv", "true" },
297297
applyIf = { "MaxVectorSize", "> 16" })
298298
public static void testVectorMaskStoreIdentityDouble256() {
299299
VectorMask<Double> mask_double_256 = VectorMask.fromArray(D256, mask_in, 0);
@@ -314,4 +314,4 @@ public static void main(String[] args) {
314314
.addFlags("--add-modules=jdk.incubator.vector")
315315
.start();
316316
}
317-
}
317+
}

0 commit comments

Comments
 (0)