JMH integration fixes

Signed-off-by: Luis Pinto <luis.pinto@consensys.net>

Author: lu-pinto

build.gradle

@@ -36,6 +36,7 @@ plugins {
   id 'se.patrikerdes.use-latest-versions' version '0.2.18'
   id 'com.github.ben-manes.versions' version '0.49.0'
   id 'org.jreleaser' version '1.16.0'
+  id 'me.champeau.jmh' version '0.7.3' apply false
 }
 
 description = 'A set of libraries and other tools to aid development of blockchain and other decentralized software in Java and other JVM languages'
@@ -124,6 +125,39 @@ subprojects {
     }
   }
 
+  if (file('src/jmh').directory) {
+    apply plugin: 'me.champeau.jmh'
+    tasks.named("jmh") {
+      description = "Usage: gradle jmh -Pincludes=MyBench -PasyncProfiler=<libPath> -PasyncProfilerOptions=<options>\n" +
+              "\nRun JMH benchmarks in each of the projects. Allows for controlling JMH execution directly from the command line.\n" +
+              "\t-Pincludes=<includePattern>\tInclude pattern (regular expression) for benchmarks to be executed. Defaults to including all benchmarks.\n" +
+              "\t-PasyncProfiler=<libPath>\tLibrary path to fetch the Async profiler from. Default is to disable profiling.\n" +
+              "\t-PasyncProfilerOptions=<asyncProfilerOptions>\tOptions to pass on to the Async profiler separated by ';'. Default is to produce a flamegraph with all other default profiler options.\n"
+    }
+
+    // to pass compilation as the compiler doesn't like what jmh tool is doing
+    compileJmhJava {
+      options.compilerArgs << '-Xlint:none'
+    }
+
+    jmh {
+      jmhVersion = '1.37'
+      fork = 3
+      includes = _strListCmdArg('includes', [''])
+      var asyncProfiler = _strCmdArg('asyncProfiler')
+      var asyncProfilerOptions = _strCmdArg('asyncProfilerOptions', 'output=flamegraph')
+      if (asyncProfiler != null) {
+        profilers = ['async:libPath=' + asyncProfiler + ';' + asyncProfilerOptions]
+      }
+      duplicateClassesStrategy = DuplicatesStrategy.WARN
+      jvmArgs = ['-XX:+EnableDynamicAgentLoading']
+    }
+
+    dependencies {
+      jmhAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
+    }
+  }
+
   plugins.withId('java', { _ ->
     sourceSets {
       integrationTest {
@@ -565,3 +599,18 @@ tasks.register('checkNotice') {
   }
   throw new GradleException('NOTICE file is not up-to-date')
 }
+
+def _strListCmdArg(name, defaultValue) {
+  if (!project.hasProperty(name))
+    return defaultValue
+
+  return ((String) project.property(name)).tokenize(',')
+}
+
+def _strCmdArg(name) {
+  return _strCmdArg(name, null)
+}
+
+def _strCmdArg(name, defaultValue) {
+  return project.hasProperty(name) ? project.property(name) as String : defaultValue
+}

bytes/build.gradle

@@ -10,10 +10,6 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-plugins {
-  id 'me.champeau.jmh' version '0.7.2'
-}
-
 description = 'Classes and utilities for working with byte arrays.'
 
 dependencies {
@@ -28,30 +24,6 @@ dependencies {
   testImplementation 'org.junit.jupiter:junit-jupiter-params'
   testImplementation 'org.mockito:mockito-junit-jupiter'
   testImplementation 'org.assertj:assertj-core'
-  jmhImplementation 'tools.profiler:async-profiler:3.0'
 
   testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-
-  jmhAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
-}
-
-// to pass compilation as the compiler doesn't like what jmh tool is doing
-compileJmhJava {
-    options.compilerArgs << '-Xlint:none'
-}
-
-jmh {
-  jmhVersion = '1.37'
-  if (project.hasProperty('jmh.includes')) {
-    includes = [project.property('jmh.includes')]
-  }
-
-  jvmArgs = ['-XX:LoopUnrollLimit=1',
-             '-XX:-TieredCompilation',
-             '-XX:+UnlockDiagnosticVMOptions',
-           //   '-XX:+TraceDeoptimization',
-           //   '-XX:+PrintCompilation',
-           //   '-XX:+PrintInlining',
-           //   '-XX:-Inline'
-            ]
 }

bytes/src/jmh/java/org/benchmark/BytesMegamorphicBenchmarkV1.java

@@ -9,25 +9,24 @@
 
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OperationsPerInvocation;
 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.Warmup;
 
-@Warmup(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)
+@Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)
 @BenchmarkMode(value = Mode.AverageTime)
-@State(Scope.Benchmark)
-@Fork(value = 1)
-@OutputTimeUnit(value = TimeUnit.MILLISECONDS)
-public class BytesMegamorphicBenchmarkV1 extends ProfiledBenchmark {
+@State(Scope.Thread)
+@OutputTimeUnit(value = TimeUnit.NANOSECONDS)
+public class BytesMegamorphicBenchmarkV1 {
   private static final int N = 4;
-  private static final int FACTOR = 1000000;
+  private static final int FACTOR = 1000;
   private static final Random RANDOM = new Random(23L);
   Bytes[] bytesV1;
 
@@ -54,13 +53,10 @@ private static byte[] getBytes(final int size) {
   }
 
   @Benchmark
+  @OperationsPerInvocation(N * FACTOR)
   public void test() {
     for (Bytes b : bytesV1) {
       b.get(1);
     }
   }
-
-  String getUniqueTestId() {
-    return this.getClass().getSimpleName() + "-" + mode + "-" + System.currentTimeMillis();
-  }
 }

bytes/src/jmh/java/org/benchmark/BytesMegamorphicBenchmarkV2.java

@@ -9,25 +9,24 @@
 
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OperationsPerInvocation;
 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.Warmup;
 
-@Warmup(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)
+@Warmup(iterations = 5, time = 1, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 10, time = 1, timeUnit = TimeUnit.SECONDS)
 @BenchmarkMode(value = Mode.AverageTime)
-@State(Scope.Benchmark)
-@Fork(value = 1)
-@OutputTimeUnit(value = TimeUnit.MILLISECONDS)
-public class BytesMegamorphicBenchmarkV2 extends ProfiledBenchmark {
+@State(Scope.Thread)
+@OutputTimeUnit(value = TimeUnit.NANOSECONDS)
+public class BytesMegamorphicBenchmarkV2 {
   private static final int N = 4;
-  private static final int FACTOR = 1000000;
+  private static final int FACTOR = 1000;
   private static final Random RANDOM = new Random(23L);
   Bytes[] bytesV2;
 
@@ -54,13 +53,10 @@ private static byte[] getBytes(final int size) {
   }
 
   @Benchmark
+  @OperationsPerInvocation(N * FACTOR)
   public void test() {
     for (Bytes b : bytesV2) {
       b.get(1);
     }
   }
-
-  String getUniqueTestId() {
-    return this.getClass().getSimpleName() + "-" + mode + "-" + System.currentTimeMillis();
-  }
 }