Skip to content

Commit 05dac03

Browse files
shipilevshipilev
committedDec 7, 2020
8257803: Add -Xbatch to compiler/blackhole tests
Reviewed-by: dholmes
·
JEP-429-branchpoint
1 parent 29a09c8 commit 05dac03

6 files changed

+21
-20
lines changed
 

‎test/hotspot/jtreg/compiler/blackhole/BlackholeInstanceReturnTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*
2828
* @run main/othervm
2929
* -Xmx1g
30-
* -XX:TieredStopAtLevel=1
30+
* -Xbatch -XX:TieredStopAtLevel=1
3131
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
3232
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
3333
* compiler.blackhole.BlackholeInstanceReturnTest
@@ -39,7 +39,7 @@
3939
*
4040
* @run main/othervm
4141
* -Xmx1g
42-
* -XX:-TieredCompilation
42+
* -Xbatch -XX:-TieredCompilation
4343
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
4444
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
4545
* compiler.blackhole.BlackholeInstanceReturnTest
@@ -52,7 +52,7 @@
5252
*
5353
* @run main/othervm
5454
* -Xmx1g -XX:-UseCompressedOops
55-
* -XX:TieredStopAtLevel=1
55+
* -Xbatch -XX:TieredStopAtLevel=1
5656
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
5757
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
5858
* compiler.blackhole.BlackholeInstanceReturnTest
@@ -65,7 +65,7 @@
6565
*
6666
* @run main/othervm
6767
* -Xmx1g -XX:-UseCompressedOops
68-
* -XX:-TieredCompilation
68+
* -Xbatch -XX:-TieredCompilation
6969
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
7070
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
7171
* compiler.blackhole.BlackholeInstanceReturnTest

‎test/hotspot/jtreg/compiler/blackhole/BlackholeInstanceTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*
2828
* @run main/othervm
2929
* -Xmx1g
30-
* -XX:TieredStopAtLevel=1
30+
* -Xbatch -XX:TieredStopAtLevel=1
3131
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
3232
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
3333
* compiler.blackhole.BlackholeInstanceTest
@@ -39,7 +39,7 @@
3939
*
4040
* @run main/othervm
4141
* -Xmx1g
42-
* -XX:-TieredCompilation
42+
* -Xbatch -XX:-TieredCompilation
4343
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
4444
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
4545
* compiler.blackhole.BlackholeInstanceTest
@@ -52,7 +52,7 @@
5252
*
5353
* @run main/othervm
5454
* -Xmx1g -XX:-UseCompressedOops
55-
* -XX:TieredStopAtLevel=1
55+
* -Xbatch -XX:TieredStopAtLevel=1
5656
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
5757
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
5858
* compiler.blackhole.BlackholeInstanceTest
@@ -65,7 +65,7 @@
6565
*
6666
* @run main/othervm
6767
* -Xmx1g -XX:-UseCompressedOops
68-
* -XX:-TieredCompilation
68+
* -Xbatch -XX:-TieredCompilation
6969
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
7070
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
7171
* compiler.blackhole.BlackholeInstanceTest

‎test/hotspot/jtreg/compiler/blackhole/BlackholeNonVoidWarning.java

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public static void driver() throws IOException {
5353
{
5454
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
5555
"-Xmx128m",
56+
"-Xbatch",
5657
"-XX:CompileCommand=quiet",
5758
"-XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*",
5859
"compiler.blackhole.BlackholeNonVoidWarning",

‎test/hotspot/jtreg/compiler/blackhole/BlackholeNullCheckTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*
2828
* @run main/othervm
2929
* -Xmx1g
30-
* -XX:TieredStopAtLevel=1
30+
* -Xbatch -XX:TieredStopAtLevel=1
3131
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
3232
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
3333
* compiler.blackhole.BlackholeNullCheckTest
@@ -39,7 +39,7 @@
3939
*
4040
* @run main/othervm
4141
* -Xmx1g
42-
* -XX:-TieredCompilation
42+
* -Xbatch -XX:-TieredCompilation
4343
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
4444
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
4545
* compiler.blackhole.BlackholeNullCheckTest
@@ -52,7 +52,7 @@
5252
*
5353
* @run main/othervm
5454
* -Xmx1g -XX:-UseCompressedOops
55-
* -XX:TieredStopAtLevel=1
55+
* -Xbatch -XX:TieredStopAtLevel=1
5656
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
5757
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
5858
* compiler.blackhole.BlackholeNullCheckTest
@@ -65,7 +65,7 @@
6565
*
6666
* @run main/othervm
6767
* -Xmx1g -XX:-UseCompressedOops
68-
* -XX:-TieredCompilation
68+
* -Xbatch -XX:-TieredCompilation
6969
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
7070
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
7171
* compiler.blackhole.BlackholeNullCheckTest

‎test/hotspot/jtreg/compiler/blackhole/BlackholeStaticReturnTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*
2828
* @run main/othervm
2929
* -Xmx1g
30-
* -XX:TieredStopAtLevel=1
30+
* -Xbatch -XX:TieredStopAtLevel=1
3131
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
3232
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
3333
* compiler.blackhole.BlackholeStaticReturnTest
@@ -39,7 +39,7 @@
3939
*
4040
* @run main/othervm
4141
* -Xmx1g
42-
* -XX:-TieredCompilation
42+
* -Xbatch -XX:-TieredCompilation
4343
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
4444
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
4545
* compiler.blackhole.BlackholeStaticReturnTest
@@ -52,7 +52,7 @@
5252
*
5353
* @run main/othervm
5454
* -Xmx1g -XX:-UseCompressedOops
55-
* -XX:TieredStopAtLevel=1
55+
* -Xbatch -XX:TieredStopAtLevel=1
5656
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
5757
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
5858
* compiler.blackhole.BlackholeStaticReturnTest
@@ -65,7 +65,7 @@
6565
*
6666
* @run main/othervm
6767
* -Xmx1g -XX:-UseCompressedOops
68-
* -XX:-TieredCompilation
68+
* -Xbatch -XX:-TieredCompilation
6969
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
7070
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
7171
* compiler.blackhole.BlackholeStaticReturnTest

‎test/hotspot/jtreg/compiler/blackhole/BlackholeStaticTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*
2828
* @run main/othervm
2929
* -Xmx1g
30-
* -XX:TieredStopAtLevel=1
30+
* -Xbatch -XX:TieredStopAtLevel=1
3131
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
3232
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
3333
* compiler.blackhole.BlackholeStaticTest
@@ -39,7 +39,7 @@
3939
*
4040
* @run main/othervm
4141
* -Xmx1g
42-
* -XX:-TieredCompilation
42+
* -Xbatch -XX:-TieredCompilation
4343
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
4444
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
4545
* compiler.blackhole.BlackholeStaticTest
@@ -52,7 +52,7 @@
5252
*
5353
* @run main/othervm
5454
* -Xmx1g -XX:-UseCompressedOops
55-
* -XX:TieredStopAtLevel=1
55+
* -Xbatch -XX:TieredStopAtLevel=1
5656
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
5757
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
5858
* compiler.blackhole.BlackholeStaticTest
@@ -65,7 +65,7 @@
6565
*
6666
* @run main/othervm
6767
* -Xmx1g -XX:-UseCompressedOops
68-
* -XX:-TieredCompilation
68+
* -Xbatch -XX:-TieredCompilation
6969
* -XX:+UnlockDiagnosticVMOptions -XX:+AbortVMOnCompilationFailure
7070
* -XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*
7171
* compiler.blackhole.BlackholeStaticTest

0 commit comments

Comments
 (0)
Please sign in to comment.