changeset 248:21f3179b8244

Runners: reshuffle run profiles and VM modes to probe/use.
author shade
date Fri, 13 May 2016 02:46:37 +0300
parents 43189e8da359
children 82422038cf9d
files jcstress-core/src/main/java/org/openjdk/jcstress/Options.java jcstress-core/src/main/java/org/openjdk/jcstress/vm/VMSupport.java
diffstat 2 files changed, 9 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/Options.java	Fri May 13 02:01:20 2016 +0300
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/Options.java	Fri May 13 02:46:37 2016 +0300
@@ -154,12 +154,9 @@
 
         this.minStride = orDefault(set.valueOf(minStride), 10);
         this.maxStride = orDefault(set.valueOf(maxStride), 10000);
-        this.time = orDefault(set.valueOf(time), 1000);
-        this.iters = orDefault(set.valueOf(iters), 5);
         this.testFilter = orDefault(set.valueOf(testFilter), ".*");
         this.deoptRatio = orDefault(set.valueOf(deoptRatio), 5);
 
-        this.forks = orDefault(set.valueOf(forks), 1);
         this.parse = orDefault(set.has(parse), false);
         if (this.parse) {
             this.resultFile = set.valueOf(parse);
@@ -200,20 +197,22 @@
         if (this.mode.equalsIgnoreCase("quick")) {
             this.time = 300;
             this.iters = 5;
-            this.forks = 0;
+            this.forks = 1;
         } else
         if (this.mode.equalsIgnoreCase("default")) {
-            // do nothing
+            this.time = orDefault(set.valueOf(time), 1000);
+            this.iters = orDefault(set.valueOf(iters), 5);
+            this.forks = orDefault(set.valueOf(forks), 1);
         } else
         if (this.mode.equalsIgnoreCase("tough")) {
-            this.time = 5000;
+            this.time = 1000;
             this.iters = 10;
             this.forks = 10;
         } else
         if (this.mode.equalsIgnoreCase("stress")) {
             this.time = 1000;
-            this.iters = 5;
-            this.forks = 100;
+            this.iters = 50;
+            this.forks = 10;
         } else {
             System.err.println("Unknown test mode: " + this.mode);
             System.err.println();
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/vm/VMSupport.java	Fri May 13 02:01:20 2016 +0300
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/vm/VMSupport.java	Fri May 13 02:46:37 2016 +0300
@@ -79,13 +79,9 @@
         List<List<String>> modes = Arrays.asList(
                 Arrays.asList("-Xint"),
                 Arrays.asList("-client"),
+                Arrays.asList("-XX:TieredStopAtLevel=1"),
                 Arrays.asList("-server"),
-                Arrays.asList("-server", "-XX:+UnlockDiagnosticVMOptions", "-XX:+StressLCM", "-XX:+StressGCM"),
-                Arrays.asList("-XX:-TieredCompilation"),
-                Arrays.asList("-XX:-TieredCompilation", "-XX:+UnlockDiagnosticVMOptions", "-XX:+StressLCM", "-XX:+StressGCM"),
-                Arrays.asList("-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1"),
-                Arrays.asList("-XX:+TieredCompilation", "-XX:TieredStopAtLevel=2"),
-                Arrays.asList("-XX:+TieredCompilation", "-XX:TieredStopAtLevel=3")
+                Arrays.asList("-server", "-XX:+UnlockDiagnosticVMOptions", "-XX:+StressLCM", "-XX:+StressGCM")
         );
 
         System.out.println("Probing what VM modes are available:");