changeset 371:27a6322b5857

Accept Tiered is the default mode. Ditch redundant "-client/-server" distinction.
author shade
date Tue, 28 Feb 2017 21:24:27 +0100
parents f4886026345e
children 802120309836
files jcstress-core/src/main/java/org/openjdk/jcstress/vm/VMSupport.java
diffstat 1 files changed, 6 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/vm/VMSupport.java	Tue Feb 28 21:06:49 2017 +0100
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/vm/VMSupport.java	Tue Feb 28 21:24:27 2017 +0100
@@ -126,17 +126,13 @@
                     // Tiered C1
                     Arrays.asList("-XX:TieredStopAtLevel=1"),
 
-                    // Non-tiered C1
-                    Arrays.asList("-client"),
-                    Arrays.asList("-client", "-XX:-TieredCompilation"),
+                    // Tiered C1+C2 (default)
+                    Collections.emptyList(),
+                    Arrays.asList("-XX:+UnlockDiagnosticVMOptions", "-XX:+StressLCM", "-XX:+StressGCM"),
 
-                    // Tiered C2
-                    Arrays.asList("-server"),
-                    Arrays.asList("-server", "-XX:+UnlockDiagnosticVMOptions", "-XX:+StressLCM", "-XX:+StressGCM"),
-
-                    // Non-tiered C2
-                    Arrays.asList("-server", "-XX:-TieredCompilation"),
-                    Arrays.asList("-server", "-XX:-TieredCompilation", "-XX:+UnlockDiagnosticVMOptions", "-XX:+StressLCM", "-XX:+StressGCM"));
+                    // Pure, non-tiered C2
+                    Arrays.asList("-XX:-TieredCompilation"),
+                    Arrays.asList("-XX:-TieredCompilation", "-XX:+UnlockDiagnosticVMOptions", "-XX:+StressLCM", "-XX:+StressGCM"));
         }
 
         System.out.println("Probing what VM modes are available:");