8043674: Update compiler/intrinsic/bmi tests to run it on all platforms
Reviewed-by: kvn, iignatyev, fzhinkin
Contributed-by: Dmitrij Pochepko <dmitrij.pochepko@oracle.com>
--- a/hotspot/test/compiler/intrinsics/bmi/TestAndnI.java Fri Oct 24 10:28:19 2014 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestAndnI.java Sat Oct 25 19:06:23 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");
}
--- a/hotspot/test/compiler/intrinsics/bmi/TestAndnL.java Fri Oct 24 10:28:19 2014 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestAndnL.java Sat Oct 25 19:06:23 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");
}
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsiI.java Fri Oct 24 10:28:19 2014 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsiI.java Sat Oct 25 19:06:23 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");
}
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsiL.java Fri Oct 24 10:28:19 2014 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsiL.java Sat Oct 25 19:06:23 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");
}
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsmskI.java Fri Oct 24 10:28:19 2014 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsmskI.java Sat Oct 25 19:06:23 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");
}
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsmskL.java Fri Oct 24 10:28:19 2014 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsmskL.java Sat Oct 25 19:06:23 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");
}
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsrI.java Fri Oct 24 10:28:19 2014 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsrI.java Sat Oct 25 19:06:23 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");
}
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsrL.java Fri Oct 24 10:28:19 2014 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsrL.java Sat Oct 25 19:06:23 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");
}
--- a/hotspot/test/compiler/intrinsics/bmi/TestLzcntI.java Fri Oct 24 10:28:19 2014 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestLzcntI.java Sat Oct 25 19:06:23 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");
}
--- a/hotspot/test/compiler/intrinsics/bmi/TestLzcntL.java Fri Oct 24 10:28:19 2014 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestLzcntL.java Sat Oct 25 19:06:23 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");
}
--- a/hotspot/test/compiler/intrinsics/bmi/TestTzcntI.java Fri Oct 24 10:28:19 2014 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestTzcntI.java Sat Oct 25 19:06:23 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");
}
--- a/hotspot/test/compiler/intrinsics/bmi/TestTzcntL.java Fri Oct 24 10:28:19 2014 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestTzcntL.java Sat Oct 25 19:06:23 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");
}