Fixed local variables, added blackhole to *Local benchmarks

akarnokd · akarnokd · commit 7163288b11a6 · 2015-02-03T08:28:16.000+01:00
diff --git a/src/perf/java/rx/subscriptions/CompositeSubscriptionPerf.java b/src/perf/java/rx/subscriptions/CompositeSubscriptionPerf.java
@@ -18,14 +18,8 @@
 
 import java.util.concurrent.TimeUnit;
 
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OutputTimeUnit;
-import org.openjdk.jmh.annotations.Param;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
 
 import rx.Subscription;
 
@@ -73,26 +67,28 @@ public void addRemove(TheState state) {
         
         for (int i = state.loop; i > 0; i--) {
             for (int j = values.length - 1; j >= 0; j--) {
-                csub.add(state.values[j]);
+                csub.add(values[j]);
             }
             for (int j = values.length - 1; j >= 0; j--) {
-                csub.remove(state.values[j]);
+                csub.remove(values[j]);
             }
         }
     }
     @Benchmark
-    public void addRemoveLocal(TheState state) {
+    public void addRemoveLocal(TheState state, Blackhole bh) {
         CompositeSubscription csub = new CompositeSubscription();
         Subscription[] values = state.values;
         
         for (int i = state.loop; i > 0; i--) {
             for (int j = values.length - 1; j >= 0; j--) {
-                csub.add(state.values[j]);
+                csub.add(values[j]);
             }
             for (int j = values.length - 1; j >= 0; j--) {
-                csub.remove(state.values[j]);
+                csub.remove(values[j]);
             }
         }
+        
+        bh.consume(csub);
     }
     @Benchmark
     public void addClear(TheState state) {
@@ -101,21 +97,22 @@ public void addClear(TheState state) {
         
         for (int i = state.loop; i > 0; i--) {
             for (int j = values.length - 1; j >= 0; j--) {
-                csub.add(state.values[j]);
+                csub.add(values[j]);
             }
             csub.clear();
         }
     }
     @Benchmark
-    public void addClearLocal(TheState state) {
+    public void addClearLocal(TheState state, Blackhole bh) {
         CompositeSubscription csub = new CompositeSubscription();
         Subscription[] values = state.values;
         
         for (int i = state.loop; i > 0; i--) {
             for (int j = values.length - 1; j >= 0; j--) {
-                csub.add(state.values[j]);
+                csub.add(values[j]);
             }
             csub.clear();
         }
+        bh.consume(csub);
     }
 }
diff --git a/src/perf/java/rx/subscriptions/MultipleAssignmentSubscriptionPerf.java b/src/perf/java/rx/subscriptions/MultipleAssignmentSubscriptionPerf.java
@@ -18,14 +18,8 @@
 
 import java.util.concurrent.TimeUnit;
 
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OutputTimeUnit;
-import org.openjdk.jmh.annotations.Param;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
 
 import rx.Subscription;
 
@@ -73,19 +67,20 @@ public void add(TheState state) {
         
         for (int i = state.loop; i > 0; i--) {
             for (int j = values.length - 1; j >= 0; j--) {
-                csub.set(state.values[j]);
+                csub.set(values[j]);
             }
         }
     }
     @Benchmark
-    public void addLocal(TheState state) {
+    public void addLocal(TheState state, Blackhole bh) {
         MultipleAssignmentSubscription csub = new MultipleAssignmentSubscription();
         Subscription[] values = state.values;
         
         for (int i = state.loop; i > 0; i--) {
             for (int j = values.length - 1; j >= 0; j--) {
-                csub.set(state.values[j]);
+                csub.set(values[j]);
             }
         }
+        bh.consume(csub);
     }
 }
diff --git a/src/perf/java/rx/subscriptions/SerialSubscriptionPerf.java b/src/perf/java/rx/subscriptions/SerialSubscriptionPerf.java
@@ -18,14 +18,8 @@
 
 import java.util.concurrent.TimeUnit;
 
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OutputTimeUnit;
-import org.openjdk.jmh.annotations.Param;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
 
 import rx.Subscription;
 
@@ -73,19 +67,20 @@ public void add(TheState state) {
         
         for (int i = state.loop; i > 0; i--) {
             for (int j = values.length - 1; j >= 0; j--) {
-                csub.set(state.values[j]);
+                csub.set(values[j]);
             }
         }
     }
     @Benchmark
-    public void addLocal(TheState state) {
+    public void addLocal(TheState state, Blackhole bh) {
         SerialSubscription csub = new SerialSubscription();
         Subscription[] values = state.values;
         
         for (int i = state.loop; i > 0; i--) {
             for (int j = values.length - 1; j >= 0; j--) {
-                csub.set(state.values[j]);
+                csub.set(values[j]);
             }
         }
+        bh.consume(csub);
     }
 }
diff --git a/src/perf/java/rx/subscriptions/SubscriptionListPerf.java b/src/perf/java/rx/subscriptions/SubscriptionListPerf.java
@@ -18,14 +18,8 @@
 
 import java.util.concurrent.TimeUnit;
 
-import org.openjdk.jmh.annotations.Benchmark;
-import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Mode;
-import org.openjdk.jmh.annotations.OutputTimeUnit;
-import org.openjdk.jmh.annotations.Param;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.*;
+import org.openjdk.jmh.infra.Blackhole;
 
 import rx.Subscription;
 import rx.internal.util.SubscriptionList;
@@ -74,21 +68,22 @@ public void addClear(TheState state) {
         
         for (int i = state.loop; i > 0; i--) {
             for (int j = values.length - 1; j >= 0; j--) {
-                csub.add(state.values[j]);
+                csub.add(values[j]);
             }
             csub.clear();
         }
     }
     @Benchmark
-    public void addClearLocal(TheState state) {
+    public void addClearLocal(TheState state, Blackhole bh) {
         SubscriptionList csub = new SubscriptionList();
         Subscription[] values = state.values;
         
         for (int i = state.loop; i > 0; i--) {
             for (int j = values.length - 1; j >= 0; j--) {
-                csub.add(state.values[j]);
+                csub.add(values[j]);
             }
             csub.clear();
         }
+        bh.consume(csub);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -18,14 +18,8 @@`
`18`	`18`
`19`	`19`	`import java.util.concurrent.TimeUnit;`
`20`	`20`
`21`		`-import org.openjdk.jmh.annotations.Benchmark;`
`22`		`-import org.openjdk.jmh.annotations.BenchmarkMode;`
`23`		`-import org.openjdk.jmh.annotations.Mode;`
`24`		`-import org.openjdk.jmh.annotations.OutputTimeUnit;`
`25`		`-import org.openjdk.jmh.annotations.Param;`
`26`		`-import org.openjdk.jmh.annotations.Scope;`
`27`		`-import org.openjdk.jmh.annotations.Setup;`
`28`		`-import org.openjdk.jmh.annotations.State;`
	`21`	`+import org.openjdk.jmh.annotations.*;`
	`22`	`+import org.openjdk.jmh.infra.Blackhole;`
`29`	`23`
`30`	`24`	`import rx.Subscription;`
`31`	`25`
`@@ -73,26 +67,28 @@ public void addRemove(TheState state) {`
`73`	`67`
`74`	`68`	`for (int i = state.loop; i > 0; i--) {`
`75`	`69`	`for (int j = values.length - 1; j >= 0; j--) {`
`76`		`- csub.add(state.values[j]);`
	`70`	`+ csub.add(values[j]);`
`77`	`71`	`}`
`78`	`72`	`for (int j = values.length - 1; j >= 0; j--) {`
`79`		`- csub.remove(state.values[j]);`
	`73`	`+ csub.remove(values[j]);`
`80`	`74`	`}`
`81`	`75`	`}`
`82`	`76`	`}`
`83`	`77`	`@Benchmark`
`84`		`- public void addRemoveLocal(TheState state) {`
	`78`	`+ public void addRemoveLocal(TheState state, Blackhole bh) {`
`85`	`79`	`CompositeSubscription csub = new CompositeSubscription();`
`86`	`80`	`Subscription[] values = state.values;`
`87`	`81`
`88`	`82`	`for (int i = state.loop; i > 0; i--) {`
`89`	`83`	`for (int j = values.length - 1; j >= 0; j--) {`
`90`		`- csub.add(state.values[j]);`
	`84`	`+ csub.add(values[j]);`
`91`	`85`	`}`
`92`	`86`	`for (int j = values.length - 1; j >= 0; j--) {`
`93`		`- csub.remove(state.values[j]);`
	`87`	`+ csub.remove(values[j]);`
`94`	`88`	`}`
`95`	`89`	`}`
	`90`	`+`
	`91`	`+ bh.consume(csub);`
`96`	`92`	`}`
`97`	`93`	`@Benchmark`
`98`	`94`	`public void addClear(TheState state) {`
`@@ -101,21 +97,22 @@ public void addClear(TheState state) {`
`101`	`97`
`102`	`98`	`for (int i = state.loop; i > 0; i--) {`
`103`	`99`	`for (int j = values.length - 1; j >= 0; j--) {`
`104`		`- csub.add(state.values[j]);`
	`100`	`+ csub.add(values[j]);`
`105`	`101`	`}`
`106`	`102`	`csub.clear();`
`107`	`103`	`}`
`108`	`104`	`}`
`109`	`105`	`@Benchmark`
`110`		`- public void addClearLocal(TheState state) {`
	`106`	`+ public void addClearLocal(TheState state, Blackhole bh) {`
`111`	`107`	`CompositeSubscription csub = new CompositeSubscription();`
`112`	`108`	`Subscription[] values = state.values;`
`113`	`109`
`114`	`110`	`for (int i = state.loop; i > 0; i--) {`
`115`	`111`	`for (int j = values.length - 1; j >= 0; j--) {`
`116`		`- csub.add(state.values[j]);`
	`112`	`+ csub.add(values[j]);`
`117`	`113`	`}`
`118`	`114`	`csub.clear();`
`119`	`115`	`}`
	`116`	`+ bh.consume(csub);`
`120`	`117`	`}`
`121`	`118`	`}`