RISC-V: C2: Support Zvbb Vector And-Not instruction

fix the Test format

Author: Anjian-Wen

test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java

@@ -1985,18 +1985,26 @@ public class IRNode {
     public static final String VAND_NOT_I = PREFIX + "VAND_NOT_I" + POSTFIX;
     static {
         machOnlyNameRegex(VAND_NOT_I, "vand_notI");
-        machOnlyNameRegex(VAND_NOT_I, "vandnI");
     }
 
     public static final String VAND_NOT_L = PREFIX + "VAND_NOT_L" + POSTFIX;
     static {
         machOnlyNameRegex(VAND_NOT_L, "vand_notL");
-        machOnlyNameRegex(VAND_NOT_L, "vandnL");
     }
 
-    public static final String VAND_NOT_I_MASKED = PREFIX + "VAND_NOT_I_MASKED" + POSTFIX;
+    public static final String RISCV_VAND_NOT_I = PREFIX + "RISCV_VAND_NOT_I" + POSTFIX;
     static {
-        machOnlyNameRegex(VAND_NOT_I_MASKED, "vandnI_masked");
+        machOnlyNameRegex(RISCV_VAND_NOT_I, "vandnI");
+    }
+
+    public static final String RISCV_VAND_NOT_L = PREFIX + "RISCV_VAND_NOT_L" + POSTFIX;
+    static {
+        machOnlyNameRegex(RISCV_VAND_NOT_L, "vandnL");
+    }
+
+    public static final String RISCV_VAND_NOT_I_MASKED = PREFIX + "RISCV_VAND_NOT_I_MASKED" + POSTFIX;
+    static {
+        machOnlyNameRegex(RISCV_VAND_NOT_I_MASKED, "vandnI_masked");
     }
 
     public static final String VECTOR_BLEND_B = VECTOR_PREFIX + "VECTOR_BLEND_B" + POSTFIX;

test/hotspot/jtreg/compiler/vectorapi/VectorAndNotMatchRuleTest.java

@@ -42,7 +42,7 @@
  * @key randomness
  * @library /test/lib /
  * @requires vm.compiler2.enabled
- * @requires os.arch == "riscv64" & vm.cpu.features ~= ".*zvbb.*"
+ * @requires os.arch == "riscv64"
  * @summary RISCV: [vector] zvbb extension And-Not support Test for match rules
  * @modules jdk.incubator.vector
  *
@@ -84,7 +84,7 @@ public class VectorAndNotMatchRuleTest {
 
     @Test
     @Warmup(10000)
-    @IR(counts = { IRNode.VAND_NOT_I, " >= 1" }, applyIf = {"UseZvbb", "> 0"})
+    @IR(counts = { IRNode.RISCV_VAND_NOT_I, " >= 1" }, applyIf = {"UseZvbb", "> 0"})
     public static void testVectorVAndNotI() {
         IntVector av = IntVector.fromArray(I_SPECIES, ia, 0);
         IntVector bv = IntVector.fromArray(I_SPECIES, ib, 0);
@@ -98,7 +98,7 @@ public static void testVectorVAndNotI() {
 
     @Test
     @Warmup(10000)
-    @IR(counts = { IRNode.VAND_NOT_L, " >= 1" }, applyIf = {"UseZvbb", "> 0"})
+    @IR(counts = { IRNode.RISCV_VAND_NOT_L, " >= 1" }, applyIf = {"UseZvbb", "> 0"})
     public static void testVectorVAndNotL() {
         VectorMask<Long> avm = VectorMask.fromArray(L_SPECIES, ma, 0);
         VectorMask<Long> bvm = VectorMask.fromArray(L_SPECIES, mb, 0);
@@ -113,7 +113,7 @@ public static void testVectorVAndNotL() {
 
     @Test
     @Warmup(10000)
-    @IR(counts = { IRNode.VAND_NOT_I_MASKED, " >= 1" }, applyIf = {"UseZvbb", "> 0"} )
+    @IR(counts = { IRNode.RISCV_VAND_NOT_I_MASKED, " >= 1" }, applyIf = {"UseZvbb", "> 0"} )
     public static void testVectorVAndNotIMasked() {
         VectorMask<Integer> avm = VectorMask.fromArray(I_SPECIES, ma, 0);
         IntVector av = IntVector.fromArray(I_SPECIES, ia, 0);