small tests change

dmitrij pochepko dmitrij.pochepko at oracle.com
Fri Sep 12 20:38:47 UTC 2014


Hi hotspot compiler team,

I'm a member of java sqe group, and currently i'm proposing a small fix 
for hotspot tests.
A respective Jira issue is 
https://bugs.openjdk.java.net/browse/JDK-8043674 - Update 
compiler/intrinsic/bmi tests to run it on all platforms.
A diff is attached. A bmi-related tests compare vm work using Xint and 
Xcomp modes(assuming Xcomp uses bmi instructions). In case of running on 
another platforms it's just usual comparison of Xint and Xcomp modes, 
which won't test bmi, however, some platforms might have some bmi-like 
optimizations in future(for example, a powerpc platform have the some of 
such instructions), so, it's only natural to allow bmi tests to be run 
anywhere.

What i am asking is some reviewers for this diff and(in case review is 
successfull) commiter to do the push(since i have no commiter status).


Thanks,
Dmitrij
-------------- next part --------------
diff -r 0825d4f74ef8 test/compiler/intrinsics/bmi/TestAndnI.java
--- a/test/compiler/intrinsics/bmi/TestAndnI.java	Fri Sep 12 04:22:19 2014 -0700
+++ b/test/compiler/intrinsics/bmi/TestAndnI.java	Fri Sep 12 23:48:06 2014 +0400
@@ -41,14 +41,14 @@
 
     public static void main(String args[]) throws Throwable {
         if (!CPUInfo.hasFeature("bmi1")) {
-            System.out.println("CPU does not support bmi1 feature. "+
-                               "Test skipped.");
-            return;
+            System.out.println("INFO: CPU does not support bmi1 feature.");
         }
 
         BMITestRunner.runTests(AndnIExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
         BMITestRunner.runTests(AndnICommutativeExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
     }
 
diff -r 0825d4f74ef8 test/compiler/intrinsics/bmi/TestAndnL.java
--- a/test/compiler/intrinsics/bmi/TestAndnL.java	Fri Sep 12 04:22:19 2014 -0700
+++ b/test/compiler/intrinsics/bmi/TestAndnL.java	Fri Sep 12 23:48:06 2014 +0400
@@ -41,14 +41,14 @@
 
     public static void main(String args[]) throws Throwable {
         if (!CPUInfo.hasFeature("bmi1")) {
-            System.out.println("CPU does not support bmi1 feature. " +
-                               "Test skipped.");
-            return;
+            System.out.println("INFO: CPU does not support bmi1 feature.");
         }
 
         BMITestRunner.runTests(AndnLExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
         BMITestRunner.runTests(AndnLCommutativeExpr.class, args,
+                              "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
     }
 
diff -r 0825d4f74ef8 test/compiler/intrinsics/bmi/TestBlsiI.java
--- a/test/compiler/intrinsics/bmi/TestBlsiI.java	Fri Sep 12 04:22:19 2014 -0700
+++ b/test/compiler/intrinsics/bmi/TestBlsiI.java	Fri Sep 12 23:48:06 2014 +0400
@@ -41,14 +41,14 @@
 
     public static void main(String args[]) throws Throwable {
         if (!CPUInfo.hasFeature("bmi1")) {
-            System.out.println("CPU does not support bmi1 feature. " +
-                               "Test skipped.");
-            return;
+            System.out.println("INFO: CPU does not support bmi1 feature.");
         }
 
         BMITestRunner.runTests(BlsiIExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
         BMITestRunner.runTests(BlsiICommutativeExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
     }
 
diff -r 0825d4f74ef8 test/compiler/intrinsics/bmi/TestBlsiL.java
--- a/test/compiler/intrinsics/bmi/TestBlsiL.java	Fri Sep 12 04:22:19 2014 -0700
+++ b/test/compiler/intrinsics/bmi/TestBlsiL.java	Fri Sep 12 23:48:06 2014 +0400
@@ -41,14 +41,14 @@
 
     public static void main(String args[]) throws Throwable {
         if (!CPUInfo.hasFeature("bmi1")) {
-            System.out.println("CPU does not support bmi1 feature. " +
-                               "Test skipped.");
-            return;
+            System.out.println("INFO: CPU does not support bmi1 feature.");
         }
 
         BMITestRunner.runTests(BlsiLExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
         BMITestRunner.runTests(BlsiLCommutativeExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
     }
 
diff -r 0825d4f74ef8 test/compiler/intrinsics/bmi/TestBlsmskI.java
--- a/test/compiler/intrinsics/bmi/TestBlsmskI.java	Fri Sep 12 04:22:19 2014 -0700
+++ b/test/compiler/intrinsics/bmi/TestBlsmskI.java	Fri Sep 12 23:48:06 2014 +0400
@@ -41,14 +41,14 @@
 
     public static void main(String args[]) throws Throwable {
         if (!CPUInfo.hasFeature("bmi1")) {
-            System.out.println("CPU does not support bmi1 feature. " +
-                               "Test skipped.");
-            return;
+            System.out.println("INFO: CPU does not support bmi1 feature.");
         }
 
         BMITestRunner.runTests(BlsmskIExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
         BMITestRunner.runTests(BlsmskICommutativeExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
     }
 
diff -r 0825d4f74ef8 test/compiler/intrinsics/bmi/TestBlsmskL.java
--- a/test/compiler/intrinsics/bmi/TestBlsmskL.java	Fri Sep 12 04:22:19 2014 -0700
+++ b/test/compiler/intrinsics/bmi/TestBlsmskL.java	Fri Sep 12 23:48:06 2014 +0400
@@ -41,14 +41,14 @@
 
     public static void main(String args[]) throws Throwable {
         if (!CPUInfo.hasFeature("bmi1")) {
-            System.out.println("CPU does not support bmi1 feature. " +
-                               "Test skipped.");
-            return;
+            System.out.println("INFO: CPU does not support bmi1 feature.");
         }
 
         BMITestRunner.runTests(BlsmskLExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
         BMITestRunner.runTests(BlsmskLCommutativeExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
     }
 
diff -r 0825d4f74ef8 test/compiler/intrinsics/bmi/TestBlsrI.java
--- a/test/compiler/intrinsics/bmi/TestBlsrI.java	Fri Sep 12 04:22:19 2014 -0700
+++ b/test/compiler/intrinsics/bmi/TestBlsrI.java	Fri Sep 12 23:48:06 2014 +0400
@@ -41,14 +41,14 @@
 
     public static void main(String args[]) throws Throwable {
         if (!CPUInfo.hasFeature("bmi1")) {
-            System.out.println("CPU does not support bmi1 feature. " +
-                               "Test skipped.");
-            return;
+            System.out.println("INFO: CPU does not support bmi1 feature.");
         }
 
         BMITestRunner.runTests(BlsrIExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
         BMITestRunner.runTests(BlsrICommutativeExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
     }
 
diff -r 0825d4f74ef8 test/compiler/intrinsics/bmi/TestBlsrL.java
--- a/test/compiler/intrinsics/bmi/TestBlsrL.java	Fri Sep 12 04:22:19 2014 -0700
+++ b/test/compiler/intrinsics/bmi/TestBlsrL.java	Fri Sep 12 23:48:06 2014 +0400
@@ -41,14 +41,14 @@
 
     public static void main(String args[]) throws Throwable {
         if (!CPUInfo.hasFeature("bmi1")) {
-            System.out.println("CPU does not support bmi1 feature. " +
-                               "Test skipped.");
-            return;
+            System.out.println("INFO: CPU does not support bmi1 feature.");
         }
 
         BMITestRunner.runTests(BlsrLExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
         BMITestRunner.runTests(BlsrLCommutativeExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseBMI1Instructions");
     }
 
diff -r 0825d4f74ef8 test/compiler/intrinsics/bmi/TestLzcntI.java
--- a/test/compiler/intrinsics/bmi/TestLzcntI.java	Fri Sep 12 04:22:19 2014 -0700
+++ b/test/compiler/intrinsics/bmi/TestLzcntI.java	Fri Sep 12 23:48:06 2014 +0400
@@ -41,12 +41,11 @@
 
     public static void main(String args[]) throws Throwable {
         if (!CPUInfo.hasFeature("lzcnt")) {
-            System.out.println("CPU does not support lzcnt feature. " +
-                               "Test skipped.");
-            return;
+            System.out.println("INFO: CPU does not support lzcnt feature.");
         }
 
         BMITestRunner.runTests(LzcntIExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseCountLeadingZerosInstruction");
     }
 
diff -r 0825d4f74ef8 test/compiler/intrinsics/bmi/TestLzcntL.java
--- a/test/compiler/intrinsics/bmi/TestLzcntL.java	Fri Sep 12 04:22:19 2014 -0700
+++ b/test/compiler/intrinsics/bmi/TestLzcntL.java	Fri Sep 12 23:48:06 2014 +0400
@@ -41,12 +41,11 @@
 
     public static void main(String args[]) throws Throwable {
         if (!CPUInfo.hasFeature("lzcnt")) {
-            System.out.println("CPU does not support lzcnt feature. " +
-                               "Test skipped.");
-            return;
+            System.out.println("INFO: CPU does not support lzcnt feature.");
         }
 
         BMITestRunner.runTests(LzcntLExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseCountLeadingZerosInstruction");
     }
 
diff -r 0825d4f74ef8 test/compiler/intrinsics/bmi/TestTzcntI.java
--- a/test/compiler/intrinsics/bmi/TestTzcntI.java	Fri Sep 12 04:22:19 2014 -0700
+++ b/test/compiler/intrinsics/bmi/TestTzcntI.java	Fri Sep 12 23:48:06 2014 +0400
@@ -41,12 +41,11 @@
 
     public static void main(String args[]) throws Throwable {
         if (!CPUInfo.hasFeature("bmi1")) {
-            System.out.println("CPU does not support bmi1 feature. " +
-                               "Test skipped.");
-            return;
+            System.out.println("INFO: CPU does not support bmi1 feature.");
         }
 
         BMITestRunner.runTests(TzcntIExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseCountTrailingZerosInstruction");
     }
 
diff -r 0825d4f74ef8 test/compiler/intrinsics/bmi/TestTzcntL.java
--- a/test/compiler/intrinsics/bmi/TestTzcntL.java	Fri Sep 12 04:22:19 2014 -0700
+++ b/test/compiler/intrinsics/bmi/TestTzcntL.java	Fri Sep 12 23:48:06 2014 +0400
@@ -41,12 +41,11 @@
 
     public static void main(String args[]) throws Throwable {
         if (!CPUInfo.hasFeature("bmi1")) {
-            System.out.println("CPU does not support bmi1 feature. " +
-                               "Test skipped.");
-            return;
+            System.out.println("INFO: CPU does not support bmi1 feature.");
         }
 
         BMITestRunner.runTests(TzcntLExpr.class, args,
+                               "-XX:+IgnoreUnrecognizedVMOptions",
                                "-XX:+UseCountTrailingZerosInstruction");
     }
 


More information about the hotspot-compiler-dev mailing list