changeset 315:e74d19721aa8

Yak shaving: warmup tests should run faster. [-20 secs to run integration tests]
author shade
date Fri, 06 Dec 2013 17:15:37 +0400
parents a677c053a33e
children 9dfe9965fbf4
files jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode0_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode1_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode2_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode3_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode4_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode5_Test.java jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode6_Test.java
diffstat 7 files changed, 42 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode0_Test.java	Fri Dec 06 17:08:29 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode0_Test.java	Fri Dec 06 17:15:37 2013 +0400
@@ -69,9 +69,9 @@
     public void testBig(Control cnt) {
         if (!recorded) {
             recorded = true;
-            if (cnt.iterationTime == 1000) { // warmup
+            if (cnt.iterationTime == 100) { // warmup
                 testSequence.add("W");
-            } else if (cnt.iterationTime == 2000) {  // iteration
+            } else if (cnt.iterationTime == 200) {  // iteration
                 testSequence.add("I");
             }
         }
@@ -82,9 +82,9 @@
     public void testSmall(Control cnt) {
         if (!recorded) {
             recorded = true;
-            if (cnt.iterationTime == 1000) { // warmup
+            if (cnt.iterationTime == 100) { // warmup
                 testSequence.add("w");
-            } else if (cnt.iterationTime == 2000) {  // iteration
+            } else if (cnt.iterationTime == 200) {  // iteration
                 testSequence.add("i");
             }
         }
@@ -107,9 +107,9 @@
                 .include(Fixtures.getTestMask(this.getClass()) + ".testBig.*")
                 .shouldFailOnError(true)
                 .warmupIterations(2)
-                .warmupTime(TimeValue.seconds(1))
+                .warmupTime(TimeValue.milliseconds(100))
                 .measurementIterations(1)
-                .measurementTime(TimeValue.seconds(2))
+                .measurementTime(TimeValue.milliseconds(200))
                 .threads(1)
                 .forks(0)
                 .syncIterations(false)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode1_Test.java	Fri Dec 06 17:08:29 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode1_Test.java	Fri Dec 06 17:15:37 2013 +0400
@@ -69,9 +69,9 @@
     public void testBig(Control cnt) {
         if (!recorded) {
             recorded = true;
-            if (cnt.iterationTime == 1000) { // warmup
+            if (cnt.iterationTime == 100) { // warmup
                 testSequence.add("W");
-            } else if (cnt.iterationTime == 2000) {  // iteration
+            } else if (cnt.iterationTime == 200) {  // iteration
                 testSequence.add("I");
             }
         }
@@ -82,9 +82,9 @@
     public void testSmall(Control cnt) {
         if (!recorded) {
             recorded = true;
-            if (cnt.iterationTime == 1000) { // warmup
+            if (cnt.iterationTime == 100) { // warmup
                 testSequence.add("w");
-            } else if (cnt.iterationTime == 2000) {  // iteration
+            } else if (cnt.iterationTime == 200) {  // iteration
                 testSequence.add("i");
             }
         }
@@ -107,9 +107,9 @@
                 .include(Fixtures.getTestMask(this.getClass()) + ".testSmall.*")
                 .shouldFailOnError(true)
                 .warmupIterations(2)
-                .warmupTime(TimeValue.seconds(1))
+                .warmupTime(TimeValue.milliseconds(100))
                 .measurementIterations(1)
-                .measurementTime(TimeValue.seconds(2))
+                .measurementTime(TimeValue.milliseconds(200))
                 .threads(1)
                 .forks(0)
                 .syncIterations(false)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode2_Test.java	Fri Dec 06 17:08:29 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode2_Test.java	Fri Dec 06 17:15:37 2013 +0400
@@ -69,9 +69,9 @@
     public void testBig(Control cnt) {
         if (!recorded) {
             recorded = true;
-            if (cnt.iterationTime == 1000) { // warmup
+            if (cnt.iterationTime == 100) { // warmup
                 testSequence.add("W");
-            } else if (cnt.iterationTime == 2000) {  // iteration
+            } else if (cnt.iterationTime == 200) {  // iteration
                 testSequence.add("I");
             }
         }
@@ -82,9 +82,9 @@
     public void testSmall(Control cnt) {
         if (!recorded) {
             recorded = true;
-            if (cnt.iterationTime == 1000) { // warmup
+            if (cnt.iterationTime == 100) { // warmup
                 testSequence.add("w");
-            } else if (cnt.iterationTime == 2000) {  // iteration
+            } else if (cnt.iterationTime == 200) {  // iteration
                 testSequence.add("i");
             }
         }
@@ -107,9 +107,9 @@
                 .include(Fixtures.getTestMask(this.getClass()) + ".testBig.*")
                 .shouldFailOnError(true)
                 .warmupIterations(2)
-                .warmupTime(TimeValue.seconds(1))
+                .warmupTime(TimeValue.milliseconds(100))
                 .measurementIterations(1)
-                .measurementTime(TimeValue.seconds(2))
+                .measurementTime(TimeValue.milliseconds(200))
                 .threads(2)
                 .forks(0)
                 .syncIterations(false)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode3_Test.java	Fri Dec 06 17:08:29 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode3_Test.java	Fri Dec 06 17:15:37 2013 +0400
@@ -69,9 +69,9 @@
     public void testBig(Control cnt) {
         if (!recorded) {
             recorded = true;
-            if (cnt.iterationTime == 1000) { // warmup
+            if (cnt.iterationTime == 100) { // warmup
                 testSequence.add("W");
-            } else if (cnt.iterationTime == 2000) {  // iteration
+            } else if (cnt.iterationTime == 200) {  // iteration
                 testSequence.add("I");
             }
         }
@@ -82,9 +82,9 @@
     public void testSmall(Control cnt) {
         if (!recorded) {
             recorded = true;
-            if (cnt.iterationTime == 1000) { // warmup
+            if (cnt.iterationTime == 100) { // warmup
                 testSequence.add("w");
-            } else if (cnt.iterationTime == 2000) {  // iteration
+            } else if (cnt.iterationTime == 200) {  // iteration
                 testSequence.add("i");
             }
         }
@@ -107,9 +107,9 @@
                 .include(Fixtures.getTestMask(this.getClass()))
                 .shouldFailOnError(true)
                 .warmupIterations(2)
-                .warmupTime(TimeValue.seconds(1))
+                .warmupTime(TimeValue.milliseconds(100))
                 .measurementIterations(1)
-                .measurementTime(TimeValue.seconds(2))
+                .measurementTime(TimeValue.milliseconds(200))
                 .threads(2)
                 .forks(0)
                 .syncIterations(false)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode4_Test.java	Fri Dec 06 17:08:29 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode4_Test.java	Fri Dec 06 17:15:37 2013 +0400
@@ -69,9 +69,9 @@
     public void testBig(Control cnt) {
         if (!recorded) {
             recorded = true;
-            if (cnt.iterationTime == 1000) { // warmup
+            if (cnt.iterationTime == 100) { // warmup
                 testSequence.add("W");
-            } else if (cnt.iterationTime == 2000) {  // iteration
+            } else if (cnt.iterationTime == 200) {  // iteration
                 testSequence.add("I");
             }
         }
@@ -82,9 +82,9 @@
     public void testSmall(Control cnt) {
         if (!recorded) {
             recorded = true;
-            if (cnt.iterationTime == 1000) { // warmup
+            if (cnt.iterationTime == 100) { // warmup
                 testSequence.add("w");
-            } else if (cnt.iterationTime == 2000) {  // iteration
+            } else if (cnt.iterationTime == 200) {  // iteration
                 testSequence.add("i");
             }
         }
@@ -107,9 +107,9 @@
                 .include(Fixtures.getTestMask(this.getClass()))
                 .shouldFailOnError(true)
                 .warmupIterations(2)
-                .warmupTime(TimeValue.seconds(1))
+                .warmupTime(TimeValue.milliseconds(100))
                 .measurementIterations(1)
-                .measurementTime(TimeValue.seconds(2))
+                .measurementTime(TimeValue.milliseconds(200))
                 .threads(1)
                 .forks(0)
                 .syncIterations(false)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode5_Test.java	Fri Dec 06 17:08:29 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode5_Test.java	Fri Dec 06 17:15:37 2013 +0400
@@ -70,9 +70,9 @@
     public void testBig(Control cnt) {
         if (!recorded) {
             recorded = true;
-            if (cnt.iterationTime == 1000) { // warmup
+            if (cnt.iterationTime == 100) { // warmup
                 testSequence.add("W");
-            } else if (cnt.iterationTime == 2000) {  // iteration
+            } else if (cnt.iterationTime == 200) {  // iteration
                 testSequence.add("I");
             }
         }
@@ -83,9 +83,9 @@
     public void testSmall(Control cnt) {
         if (!recorded) {
             recorded = true;
-            if (cnt.iterationTime == 1000) { // warmup
+            if (cnt.iterationTime == 100) { // warmup
                 testSequence.add("w");
-            } else if (cnt.iterationTime == 2000) {  // iteration
+            } else if (cnt.iterationTime == 200) {  // iteration
                 testSequence.add("i");
             }
         }
@@ -108,9 +108,9 @@
                 .include(Fixtures.getTestMask(this.getClass()))
                 .shouldFailOnError(true)
                 .warmupIterations(2)
-                .warmupTime(TimeValue.seconds(1))
+                .warmupTime(TimeValue.milliseconds(100))
                 .measurementIterations(1)
-                .measurementTime(TimeValue.seconds(2))
+                .measurementTime(TimeValue.milliseconds(200))
                 .threads(1)
                 .forks(0)
                 .syncIterations(false)
--- a/jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode6_Test.java	Fri Dec 06 17:08:29 2013 +0400
+++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/bulkwarmup/WarmupMode6_Test.java	Fri Dec 06 17:15:37 2013 +0400
@@ -70,9 +70,9 @@
     public void testBig(Control cnt) {
         if (!recorded) {
             recorded = true;
-            if (cnt.iterationTime == 1000) { // warmup
+            if (cnt.iterationTime == 100) { // warmup
                 testSequence.add("W");
-            } else if (cnt.iterationTime == 2000) {  // iteration
+            } else if (cnt.iterationTime == 200) {  // iteration
                 testSequence.add("I");
             }
         }
@@ -83,9 +83,9 @@
     public void testSmall(Control cnt) {
         if (!recorded) {
             recorded = true;
-            if (cnt.iterationTime == 1000) { // warmup
+            if (cnt.iterationTime == 100) { // warmup
                 testSequence.add("w");
-            } else if (cnt.iterationTime == 2000) {  // iteration
+            } else if (cnt.iterationTime == 200) {  // iteration
                 testSequence.add("i");
             }
         }
@@ -108,9 +108,9 @@
                 .include(Fixtures.getTestMask(this.getClass()))
                 .shouldFailOnError(true)
                 .warmupIterations(2)
-                .warmupTime(TimeValue.seconds(1))
+                .warmupTime(TimeValue.milliseconds(100))
                 .measurementIterations(1)
-                .measurementTime(TimeValue.seconds(2))
+                .measurementTime(TimeValue.milliseconds(200))
                 .threads(1)
                 .forks(0)
                 .syncIterations(false)