8297953: Fix several C2 IR matching tests for RISC-V

Reviewed-by: fyang, chagedorn
openjdk · Dec 2, 2022 · 227364d · 227364d · openjdk-notifier · Dec 2, 2022
1 parent 1370228
commit 227364d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeIntIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeIntIdealizationTests.java
@@ -31,7 +31,7 @@
  * @summary Test that Ideal transformations of RotateLeftNode* are being performed as expected.
  * @library /test/lib /
  * @run driver compiler.c2.irTests.RotateLeftNodeIntIdealizationTests
- * @requires os.arch == "x86_64" | os.arch == "aarch64" | os.arch == "riscv64"
+ * @requires os.arch == "x86_64" | os.arch == "aarch64" | (os.arch == "riscv64" & vm.opt.UseZbb == true)
  */
 public class RotateLeftNodeIntIdealizationTests {
 

diff --git a/test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeLongIdealizationTests.java b/test/hotspot/jtreg/compiler/c2/irTests/RotateLeftNodeLongIdealizationTests.java
@@ -31,7 +31,7 @@
  * @summary Test that Ideal transformations of RotateLeftNode* are being performed as expected.
  * @library /test/lib /
  * @run driver compiler.c2.irTests.RotateLeftNodeLongIdealizationTests
- * @requires os.arch == "x86_64" | os.arch == "aarch64" | os.arch == "riscv64"
+ * @requires os.arch == "x86_64" | os.arch == "aarch64" | (os.arch == "riscv64" & vm.opt.UseZbb == true)
  */
 public class RotateLeftNodeLongIdealizationTests {
 

diff --git a/test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison.java b/test/hotspot/jtreg/compiler/c2/irTests/TestFPComparison.java
@@ -31,6 +31,7 @@
  * @summary Test that code generation for fp comparison works as intended
  * @library /test/lib /
  * @run driver compiler.c2.irTests.TestFPComparison
+ * @requires os.arch != "riscv64"
  */
 public class TestFPComparison {
     static final double[] DOUBLES = new double[] {

diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java b/test/hotspot/jtreg/compiler/lib/ir_framework/TestFramework.java
@@ -139,6 +139,7 @@ public class TestFramework {
                     "UseAVX",
                     "UseSSE",
                     "UseSVE",
+                    "UseZbb",
                     "Xlog",
                     "LogCompilation"
             )