Skip to content

Commit e5aac09

Browse files
DingliZhangDingliZhang
committed
8378752: Enable some subword vector casts IR matching tests for RISC-V
Reviewed-by: fyang, jkarthikeyan
1 parent 58a7ccf commit e5aac09

File tree

3 files changed

+52
-52
lines changed

3 files changed

+52
-52
lines changed

‎test/hotspot/jtreg/compiler/loopopts/superword/TestCompatibleUseDefTypeSize.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ static Object[] test11(char[] a) {
514514
// Narrowing
515515

516516
@Test
517-
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true" },
517+
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
518518
applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
519519
counts = { IRNode.VECTOR_CAST_I2S, IRNode.VECTOR_SIZE + "min(max_int, max_short)", ">0" })
520520
public Object[] testIntToShort(int[] ints, short[] res) {
@@ -527,7 +527,7 @@ public Object[] testIntToShort(int[] ints, short[] res) {
527527

528528

529529
@Test
530-
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true" },
530+
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
531531
applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
532532
counts = { IRNode.VECTOR_CAST_I2S, IRNode.VECTOR_SIZE + "min(max_int, max_char)", ">0" })
533533
public Object[] testIntToChar(int[] ints, char[] res) {
@@ -539,7 +539,7 @@ public Object[] testIntToChar(int[] ints, char[] res) {
539539
}
540540

541541
@Test
542-
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true" },
542+
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
543543
applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
544544
counts = { IRNode.VECTOR_CAST_I2B, IRNode.VECTOR_SIZE + "min(max_int, max_byte)", ">0" })
545545
public Object[] testIntToByte(int[] ints, byte[] res) {
@@ -551,7 +551,7 @@ public Object[] testIntToByte(int[] ints, byte[] res) {
551551
}
552552

553553
@Test
554-
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true" },
554+
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
555555
applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
556556
counts = { IRNode.VECTOR_CAST_S2B, IRNode.VECTOR_SIZE + "min(max_short, max_byte)", ">0" })
557557
public Object[] testShortToByte(short[] shorts, byte[] res) {
@@ -575,7 +575,7 @@ public Object[] testLongToByte(long[] longs, byte[] res) {
575575
}
576576

577577
@Test
578-
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true" },
578+
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
579579
applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
580580
counts = { IRNode.VECTOR_CAST_L2S, IRNode.VECTOR_SIZE + "min(max_long, max_short)", ">0" })
581581
public Object[] testLongToShort(long[] longs, short[] res) {
@@ -587,7 +587,7 @@ public Object[] testLongToShort(long[] longs, short[] res) {
587587
}
588588

589589
@Test
590-
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true" },
590+
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
591591
applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
592592
counts = { IRNode.VECTOR_CAST_L2S, IRNode.VECTOR_SIZE + "min(max_long, max_char)", ">0" })
593593
public Object[] testLongToChar(long[] longs, char[] res) {
@@ -599,7 +599,7 @@ public Object[] testLongToChar(long[] longs, char[] res) {
599599
}
600600

601601
@Test
602-
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true" },
602+
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
603603
applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
604604
counts = { IRNode.VECTOR_CAST_L2I, IRNode.VECTOR_SIZE + "min(max_long, max_int)", ">0" })
605605
public Object[] testLongToInt(long[] longs, int[] res) {
@@ -611,7 +611,7 @@ public Object[] testLongToInt(long[] longs, int[] res) {
611611
}
612612

613613
@Test
614-
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true" },
614+
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
615615
applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
616616
counts = { IRNode.STORE_VECTOR, ">0" })
617617
public Object[] testShortToChar(short[] shorts, char[] res) {
@@ -625,7 +625,7 @@ public Object[] testShortToChar(short[] shorts, char[] res) {
625625
// Widening
626626

627627
@Test
628-
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true" },
628+
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
629629
applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
630630
counts = { IRNode.VECTOR_CAST_S2I, IRNode.VECTOR_SIZE + "min(max_short, max_int)", ">0" })
631631
public Object[] testShortToInt(short[] shorts, int[] res) {
@@ -637,7 +637,7 @@ public Object[] testShortToInt(short[] shorts, int[] res) {
637637
}
638638

639639
@Test
640-
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true" },
640+
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
641641
applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
642642
counts = { IRNode.VECTOR_CAST_B2I, IRNode.VECTOR_SIZE + "min(max_byte, max_int)", ">0" })
643643
public Object[] testByteToInt(byte[] bytes, int[] res) {
@@ -649,7 +649,7 @@ public Object[] testByteToInt(byte[] bytes, int[] res) {
649649
}
650650

651651
@Test
652-
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true" },
652+
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
653653
applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
654654
counts = { IRNode.VECTOR_CAST_B2S, IRNode.VECTOR_SIZE + "min(max_byte, max_short)", ">0" })
655655
public Object[] testByteToShort(byte[] bytes, short[] res) {
@@ -661,7 +661,7 @@ public Object[] testByteToShort(byte[] bytes, short[] res) {
661661
}
662662

663663
@Test
664-
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true" },
664+
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
665665
applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
666666
counts = { IRNode.VECTOR_CAST_B2S, IRNode.VECTOR_SIZE + "min(max_byte, max_char)", ">0" })
667667
public Object[] testByteToChar(byte[] bytes, char[] res) {
@@ -685,7 +685,7 @@ public Object[] testByteToLong(byte[] bytes, long[] res) {
685685
}
686686

687687
@Test
688-
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true" },
688+
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
689689
applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
690690
counts = { IRNode.VECTOR_CAST_S2L, IRNode.VECTOR_SIZE + "min(max_short, max_long)", ">0" })
691691
public Object[] testShortToLong(short[] shorts, long[] res) {
@@ -697,7 +697,7 @@ public Object[] testShortToLong(short[] shorts, long[] res) {
697697
}
698698

699699
@Test
700-
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true" },
700+
@IR(applyIfCPUFeatureOr = { "avx", "true", "asimd", "true", "rvv", "true" },
701701
applyIfOr = {"AlignVector", "false", "UseCompactObjectHeaders", "false"},
702702
counts = { IRNode.VECTOR_CAST_I2L, IRNode.VECTOR_SIZE + "min(max_int, max_long)", ">0" })
703703
public Object[] testIntToLong(int[] ints, long[] res) {

0 commit comments

Comments
 (0)