Merge pull request #114 from retronym/javac-benchmark-separate

Separate javac benchmark to a subproject to sidestep JPMS issue

Author: retronym

build.sbt

@@ -67,6 +67,15 @@ lazy val compilation = addJmh(project).settings(
   fork in (Test, test) := true, // jmh scoped tasks run with fork := true.
 ).settings(addJavaOptions).dependsOn(infrastructure)
 
+lazy val javaCompilation = addJmh(project).settings(
+  description := "Black box benchmark of the java compiler",
+  crossPaths := false,
+  mainClass in (Jmh, run) := Some("scala.bench.ScalacBenchmarkRunner"),
+  libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
+  testOptions in Test += Tests.Argument(TestFrameworks.JUnit),
+  fork in (Test, test) := true // jmh scoped tasks run with fork := true.
+).settings(addJavaOptions).dependsOn(infrastructure)
+
 lazy val micro = addJmh(project).settings(
   description := "Finer grained benchmarks of compiler internals",
   libraryDependencies += scalaOrganization.value % "scala-compiler" % scalaVersion.value

compilation/src/main/scala/scala/tools/nsc/HotSbtBenchmark.scala

@@ -3,10 +3,11 @@ package scala.tools.nsc
 import java.io._
 import java.nio.file._
 import java.util.concurrent.TimeUnit
-
 import org.openjdk.jmh.annotations.Mode
 import org.openjdk.jmh.annotations._
 
+import scala.bench.IOUtils
+
 @State(Scope.Benchmark)
 @BenchmarkMode(Array(org.openjdk.jmh.annotations.Mode.SampleTime))
 @OutputTimeUnit(TimeUnit.MILLISECONDS)
@@ -166,7 +167,7 @@ class HotSbtBenchmark {
   @TearDown(Level.Trial) def terminate(): Unit = {
     processOutputReader.close()
     sbtProcess.destroyForcibly()
-    BenchmarkUtils.deleteRecursive(tempDir)
-    BenchmarkUtils.deleteRecursive(scalaHome)
+    IOUtils.deleteRecursive(tempDir)
+    IOUtils.deleteRecursive(scalaHome)
   }
 }

compilation/src/main/scala/scala/tools/nsc/ScalacBenchmark.scala

@@ -3,12 +3,13 @@ package scala.tools.nsc
 import java.io.File
 import java.nio.file._
 import java.util.concurrent.TimeUnit
-
 import com.typesafe.config.ConfigFactory
 import org.openjdk.jmh.annotations.Mode._
 import org.openjdk.jmh.annotations._
 import org.openjdk.jmh.profile.AsyncProfiler
+import org.openjdk.jmh.runner.Runner
 
+import scala.bench.IOUtils
 import scala.tools.benchmark.BenchmarkDriver
 
 trait BaseBenchmarkDriver {
@@ -74,7 +75,7 @@ class ScalacBenchmark extends BenchmarkDriver {
     else {
       val sourceDir = findSourceDir
       val sourceAssemblyDir = Paths.get(ConfigFactory.load.getString("sourceAssembly.localdir"))
-      BenchmarkUtils.deleteRecursive(sourceAssemblyDir)
+      IOUtils.deleteRecursive(sourceAssemblyDir)
       BenchmarkUtils.prepareSources(sourceDir, sourceAssemblyDir, scalaVersion)
     }
 
@@ -161,3 +162,15 @@ class HotScalacBenchmark extends ScalacBenchmark {
   @Benchmark
   def compile(): Unit = compileProfiled()
 }
+
+object BakeOff {
+  def main(args: Array[String]): Unit = {
+    import org.openjdk.jmh.runner.options.Options
+    import org.openjdk.jmh.runner.options.OptionsBuilder
+    import org.openjdk.jmh.runner.options.TimeValue
+    import org.openjdk.jmh.runner.options.VerboseMode
+    val baseOpts = new OptionsBuilder().include(classOf[HotScalacBenchmark].getName).warmupTime(TimeValue.milliseconds(200)).measurementTime(TimeValue.milliseconds(200)).warmupIterations(5).measurementIterations(5).forks(2).verbosity(VerboseMode.SILENT).build
+    new OptionsBuilder().parent(baseOpts).jvmArgsPrepend("-classpath", "-")
+    new Runner(baseOpts)
+  }
+}

infrastructure/src/main/java/scala/bench/IOUtils.java

@@ -0,0 +1,28 @@
+package scala.bench;
+
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
+
+public abstract class IOUtils {
+    private IOUtils() {}
+
+    public static void deleteRecursive(Path directory) throws IOException {
+        if (Files.exists(directory)) {
+            Files.walkFileTree(directory, new SimpleFileVisitor<Path>() {
+                public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                    Files.delete(file);
+                    return FileVisitResult.CONTINUE;
+                }
+
+                public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                    Files.delete(dir);
+                    return FileVisitResult.CONTINUE;
+                }
+            });
+        }
+    }
+}

compilation/src/main/scala/scala/tools/nsc/JavacBenchmark.java renamed to javaCompilation/src/main/scala/scala/tools/nsc/JavacBenchmark.java

@@ -97,8 +97,7 @@ public int bench() {
         tempFile.mkdir();
         tempDir = tempFile;
     }
-    @TearDown(Level.Trial) public void clearTemp() {
-        BenchmarkUtils.deleteRecursive(tempDir.toPath());
+    @TearDown(Level.Trial) public void clearTemp() throws IOException {
+        scala.bench.IOUtils.deleteRecursive(tempDir.toPath());
     }
-
 }