[Java] Made perf tests run with latest JMH version (which is now an official build)

Author: csoroiu

main/android/uk/co/real_logic/sbe/codec/java/BitUtil.java

@@ -78,8 +78,8 @@ public Constructor<?> run() throws Exception
  if (Modifier.isAbstract(clazz.getModifiers()))
  {
  //use this starting with api level < 18
- clazz = Class.forName("java.nio.ReadWriteDirectByteBuffer");
- constructor = clazz.getDeclaredConstructor(int.class, int.class);
+ final Class<?> rwClazz = Class.forName("java.nio.ReadWriteDirectByteBuffer");
+ constructor = rwClazz.getDeclaredConstructor(int.class, int.class);
  }
  else
  {

perf-build.xml

@@ -78,25 +78,20 @@
  </javac>
 
  <jar destfile="${dir.target.perf.dist}/microbenchmarks.jar">
- <manifest>
- <attribute name="Main-Class" value="org.openjdk.jmh.Main"/>
- </manifest>
  <fileset dir="${dir.target.perf.classes}" includes="**/*"/>
- <zipgroupfileset dir="target/dist" includes="**/sbe.jar"/>
- <zipgroupfileset dir="perf/lib" includes="**/*.jar"/>
  </jar>
  </target>
 
  <target name="java:perf:test" depends="java:compile">
- <exec executable="java" failonerror="true">
- <arg value="-jar"/>
- <arg value="target/perf/dist/microbenchmarks.jar"/>
+ <java classname="org.openjdk.jmh.Main" failonerror="true" fork="true">
+ <classpath refid="perf.tools.classpath"/>
+ <classpath path="${dir.target.perf.dist}/microbenchmarks.jar"/>
  <arg value="-wi"/>
  <arg value="3"/>
  <arg value="-i"/>
  <arg value="3"/>
  <arg value=".*Benchmark.*"/>
- </exec>
+ </java>
  </target>
 
  <target name="cpp:codegen" depends="init">

perf/java/uk/co/real_logic/protobuf/CarBenchmark.java

@@ -16,7 +16,7 @@
 
 package uk.co.real_logic.protobuf;
 
-import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
 import uk.co.real_logic.protobuf.examples.Examples;
@@ -47,13 +47,13 @@ public static class MyState
  }
  }
 
- @GenerateMicroBenchmark
+ @Benchmark
  public byte[] testEncode(final MyState state) throws Exception
  {
  return encode();
  }
 
- @GenerateMicroBenchmark
+ @Benchmark
  public Examples.Car testDecode(final MyState state) throws Exception
  {
  final byte[] buffer = state.decodeBuffer;

perf/java/uk/co/real_logic/protobuf/MarketDataBenchmark.java

@@ -15,9 +15,10 @@
  */
 package uk.co.real_logic.protobuf;
 
-import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
+
 import uk.co.real_logic.protobuf.fix.Fix;
 
 public class MarketDataBenchmark
@@ -39,13 +40,13 @@ public static class MyState
  }
  }
 
- @GenerateMicroBenchmark
+ @Benchmark
  public byte[] testEncode(final MyState state) throws Exception
  {
  return encode();
  }
 
- @GenerateMicroBenchmark
+ @Benchmark
  public Fix.MarketDataIncrementalRefreshTrades testDecode(final MyState state) throws Exception
  {
  final byte[] buffer = state.decodeBuffer;

perf/java/uk/co/real_logic/sbe/CarBenchmark.java

@@ -16,7 +16,7 @@
 
 package uk.co.real_logic.sbe;
 
-import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
 import uk.co.real_logic.sbe.examples.*;
@@ -63,7 +63,7 @@ public static class MyState
  }
  }
 
- @GenerateMicroBenchmark
+ @Benchmark
  public int testEncode(final MyState state)
  {
  final Car car = state.car;
@@ -76,7 +76,7 @@ public int testEncode(final MyState state)
  return car.size();
  }
 
- @GenerateMicroBenchmark
+ @Benchmark
  public int testDecode(final MyState state)
  {
  final Car car = state.car;

perf/java/uk/co/real_logic/sbe/MarketDataBenchmark.java

@@ -15,7 +15,7 @@
  */
 package uk.co.real_logic.sbe;
 
-import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
 import uk.co.real_logic.sbe.codec.java.DirectBuffer;
@@ -40,7 +40,7 @@ public static class MyState
  }
  }
 
- @GenerateMicroBenchmark
+ @Benchmark
  public int testEncode(final MyState state)
  {
  final MarketDataIncrementalRefreshTrades marketData = state.marketData;
@@ -53,7 +53,7 @@ public int testEncode(final MyState state)
  return marketData.size();
  }
 
- @GenerateMicroBenchmark
+ @Benchmark
  public int testDecode(final MyState state)
  {
  final MarketDataIncrementalRefreshTrades marketData = state.marketData;