Merge pull request sbt#499 from retronym/disable-zinc-benchmark

Allow benchmark to disable zinc's APIExtract and Dependency phases

Author: jvican

internal/zinc-benchmarks/src/main/scala/xsbt/BenchmarkBase.scala

@@ -19,6 +19,8 @@ class BenchmarkBase {
   @Param(Array("")) var _tempDir: String = _
   var _project: BenchmarkProject = _
   var _subprojectToRun: String = _
+  @Param(Array("true"))
+  var zincEnabled: Boolean = _
 
   /* Data filled in by the benchmark setup. */
   var _dir: File = _
@@ -39,7 +41,7 @@ class BenchmarkBase {
     _dir = new File(_tempDir)
     assert(_dir.exists(), s"Unexpected inexistent directory ${_tempDir}")
 
-    val compiler = new ZincBenchmark(_project)
+    val compiler = new ZincBenchmark(_project, zincEnabled = this.zincEnabled)
     _subprojectsSetup = compiler.readSetup(_dir).getOrCrash
     assert(_subprojectsSetup.nonEmpty)
 

internal/zinc-benchmarks/src/main/scala/xsbt/ZincBenchmark.scala

@@ -14,7 +14,7 @@ import sbt.internal.util.ConsoleLogger
 import sbt.io.{ IO, RichFile }
 import xsbt.ZincBenchmark.CompilationInfo
 import xsbti._
-import xsbti.compile.SingleOutput
+import xsbti.compile.{ IncOptions, SingleOutput }
 
 import scala.util.Try
 
@@ -49,7 +49,7 @@ case class ZincSetup(result: ZincBenchmark.Result[List[ProjectSetup]]) {
 /* Classes are defined `private[xsbt]` to avoid scoping issues w/ `CachedCompiler0`. */
 
 /** Instantiate a `ZincBenchmark` from a given project. */
-private[xsbt] class ZincBenchmark(toCompile: BenchmarkProject) {
+private[xsbt] class ZincBenchmark(toCompile: BenchmarkProject, zincEnabled: Boolean = true) {
   import ZincBenchmark.WriteBuildInfo
 
   def writeSetup(globalDir: File): WriteBuildInfo = {
@@ -74,7 +74,7 @@ private[xsbt] class ZincBenchmark(toCompile: BenchmarkProject) {
 
       // Set up the compiler and store the current setup
       val javaFile = new RichFile(compilationDir) / "benchmark-target"
-      val runGen = ZincBenchmark.setUpCompiler(buildInfo, javaFile)
+      val runGen = ZincBenchmark.setUpCompiler(buildInfo, javaFile, zincEnabled)
       ProjectSetup(subproject, javaFile, buildInfo, runGen)
     }
 
@@ -108,11 +108,14 @@ private[xsbt] object ZincBenchmark {
   /** Set up the compiler to compile `sources` with -cp `classpath` at `targetDir`. */
   def setUpCompiler(
       compilationInfo: CompilationInfo,
-      targetDir: File
+      targetDir: File,
+      zincEnabled: Boolean
   ): Generator = () => {
     IO.delete(targetDir)
     IO.createDirectory(targetDir)
-    val callback = new xsbti.TestCallback
+    val callback: xsbti.TestCallback = new xsbti.TestCallback {
+      override def enabled: Boolean = zincEnabled
+    }
     val compiler = prepareCompiler(targetDir, callback, compilationInfo)
     new compiler.Run
   }

project/plugins.sbt

@@ -1,6 +1,6 @@
 addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.5")
 addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.2")
-addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.27")
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.3.3")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")
 addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.12-rc5")
 libraryDependencies += "com.trueaccord.scalapb" %% "compilerplugin" % "0.6.0"