RFR: 8263904: compiler/intrinsics/bmi/verifycode/BzhiTestI2L.java fails on x86_32

[Vladimir Ivanov]

On Mon, 22 Mar 2021 17:21:05 GMT, Marcus G K Williams <github.com+168222+mgkwill at openjdk.org> wrote:

>> Hi all,
>> 
>> compiler/intrinsics/bmi/verifycode/BzhiTestI2L.java fails on x86_32.
>> The reason is that currently the bzhiq instruction is only generated on x86_64.
>> So it shouldn't be run on x86_32.
>> 
>> Thanks.
>> Best regards,
>> Jie
>
> Thanks! Looks good to me.

The test already does some platform sensing itself (in `BmiIntrinsicBase::test()`), so mixing it with `@requires` doesn't look pretty.

What about something like the following?
diff --git a/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BmiIntrinsicBase.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BmiIntrinsicBase.java
index 47adc9e98fb..be605108caa 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BmiIntrinsicBase.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BmiIntrinsicBase.java
@@ -63,6 +63,10 @@ public class BmiIntrinsicBase extends CompilerWhiteBoxTest {
             return;
         }
 
+        if ((bmiTestCase instanceof BmiTestCase_x64Only) && !Platform.isX64()) {
+            System.out.println("Unsupported platform, test SKIPPED");
+        }
+
         if (!Platform.isServer()) {
             throw new Error("TESTBUG: Not server VM");
         }
@@ -227,4 +231,10 @@ public class BmiIntrinsicBase extends CompilerWhiteBoxTest {
             return cnt;
         }
     }
+
+    abstract static class BmiTestCase_x64Only extends BmiTestCase_x64 {
+        protected BmiTestCase_x64Only(Method method) {
+            super(method);
+        }
+    }
 }
diff --git a/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BzhiTestI2L.java b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BzhiTestI2L.java
index 8a55a236f51..531e9077dbf 100644
--- a/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BzhiTestI2L.java
+++ b/test/hotspot/jtreg/compiler/intrinsics/bmi/verifycode/BzhiTestI2L.java
@@ -41,7 +41,7 @@ import compiler.intrinsics.bmi.TestBzhiI2L;
 
 import java.lang.reflect.Method;
 
-public class BzhiTestI2L extends BmiIntrinsicBase.BmiTestCase_x64 {
+public class BzhiTestI2L extends BmiIntrinsicBase.BmiTestCase_x64Only {
 
     protected BzhiTestI2L(Method method) {
         super(method);

-------------

PR: https://git.openjdk.java.net/jdk/pull/3104