Simplify Runner logic

Author: mincong-h

src/test/java/io/vavr/JmhRunner.java

@@ -87,27 +87,27 @@ public enum Includes {
 
     @SuppressWarnings("unused")
     public static void runQuickNoAsserts(Array<Class<?>> groups, Includes... includes) {
-        run(5, 5, 10, ForkJvm.ENABLE, VerboseMode.NORMAL, Assertions.DISABLE, PrintInlining.DISABLE, groups, includes).print();
+        run(5, 5, 10, VerboseMode.NORMAL, PrintInlining.DISABLE, groups, includes).print();
     }
 
     @SuppressWarnings("unused")
     public static void runNormalNoAsserts(Array<Class<?>> groups, Includes... includes) {
-        run(7, 7, 300, ForkJvm.ENABLE, VerboseMode.NORMAL, Assertions.DISABLE, PrintInlining.DISABLE, groups, includes).print();
+        run(7, 7, 300, VerboseMode.NORMAL, PrintInlining.DISABLE, groups, includes).print();
     }
 
     @SuppressWarnings("unused")
     public static void runSlowNoAsserts(Array<Class<?>> groups, Includes... includes) {
-        run(15, 15, 400, ForkJvm.ENABLE, VerboseMode.EXTRA, Assertions.DISABLE, PrintInlining.DISABLE, groups, includes).print();
+        run(15, 15, 400, VerboseMode.EXTRA, PrintInlining.DISABLE, groups, includes).print();
     }
 
-    private static BenchmarkPerformanceReporter run(int warmupIterations, int measurementIterations, int millis, ForkJvm forkJvm, VerboseMode silent, Assertions assertions, PrintInlining printInlining, Array<Class<?>> groups, Includes[] includes) {
+    private static BenchmarkPerformanceReporter run(int warmupIterations, int measurementIterations, int millis, VerboseMode silent, PrintInlining printInlining, Array<Class<?>> groups, Includes[] includes) {
         final Array<String> includeNames = Array.of(includes.length == 0 ? Includes.values() : includes).map(Includes::toString);
         final Array<String> classNames = groups.map(Class::getCanonicalName);
-        final Array<RunResult> results = run(warmupIterations, measurementIterations, millis, forkJvm, silent, assertions, printInlining, classNames, includeNames);
+        final Array<RunResult> results = run(warmupIterations, measurementIterations, millis, silent, printInlining, classNames, includeNames);
         return BenchmarkPerformanceReporter.of(includeNames, classNames, results);
     }
 
-    private static Array<RunResult> run(int warmupIterations, int measurementIterations, int millis, ForkJvm forkJvm, VerboseMode verboseMode, Assertions assertions, PrintInlining printInlining, Array<String> classNames, Array<String> includeNames) {
+    private static Array<RunResult> run(int warmupIterations, int measurementIterations, int millis, VerboseMode verboseMode, PrintInlining printInlining, Array<String> classNames, Array<String> includeNames) {
         try {
             final ChainedOptionsBuilder builder = new OptionsBuilder()
                     .shouldDoGC(true)
@@ -119,10 +119,10 @@ private static Array<RunResult> run(int warmupIterations, int measurementIterati
                     .warmupIterations(warmupIterations)
                     .measurementTime(TimeValue.milliseconds(millis))
                     .measurementIterations(measurementIterations)
-                    .forks(forkJvm.forkCount)
+                    .forks(1)
                   /* We are using 4Gb and setting NewGen to 100% to avoid GC during testing.
                      Any GC during testing will destroy the iteration (i.e. introduce unreliable noise in the measurement), which should get ignored as an outlier */
-                    .jvmArgsAppend("-XX:+UseG1GC", "-Xss100m", "-Xms4g", "-Xmx4g", "-XX:MaxGCPauseMillis=1000", "-XX:+UnlockExperimentalVMOptions", "-XX:G1NewSizePercent=100", "-XX:G1MaxNewSizePercent=100", assertions.vmArg);
+                    .jvmArgsAppend("-XX:+UseG1GC", "-Xss100m", "-Xms4g", "-Xmx4g", "-XX:MaxGCPauseMillis=1000", "-XX:+UnlockExperimentalVMOptions", "-XX:G1NewSizePercent=100", "-XX:G1MaxNewSizePercent=100", "-disableassertions");
 
             final String includePattern = includeNames.mkString("\\..*?\\b(", "|", ")_");
             classNames.forEach(name -> builder.include(name + includePattern));
@@ -137,27 +137,6 @@ Any GC during testing will destroy the iteration (i.e. introduce unreliable nois
         }
     }
 
-    /* Options */
-    private enum ForkJvm {
-        ENABLE(1);
-
-        final int forkCount;
-
-        ForkJvm(int forkCount) {
-            this.forkCount = forkCount;
-        }
-    }
-
-    private enum Assertions {
-        DISABLE("-disableassertions");
-
-        final String vmArg;
-
-        Assertions(String vmArg) {
-            this.vmArg = vmArg;
-        }
-    }
-
     private enum PrintInlining {
         ENABLE,
         DISABLE

src/test/java/io/vavr/MemoryUsage.java

@@ -26,18 +26,10 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-import static java.lang.Math.max;
-
 public class MemoryUsage {
     private static final DecimalFormat FORMAT = new DecimalFormat("#,##0");
     private static Map<Integer, LinkedHashSet<Seq<CharSeq>>> memoryUsages = TreeMap.empty(); // if forked, this will be reset every time
 
-    private static Seq<Integer> columnSizes(int size) {
-        return memoryUsages.get(size)
-                .map(rows -> rows.map(row -> row.map(CharSeq::length))).get()
-                .reduce((row1, row2) -> row1.zip(row2).map(ts -> max(ts._1, ts._2)));
-    }
-
     static void storeMemoryUsages(int elementCount, Object target) {
         memoryUsages = memoryUsages.put(elementCount, memoryUsages.get(elementCount).getOrElse(LinkedHashSet.empty()).add(Array.of(
                 toHumanReadableName(target),