Merge pull request #6818 from retronym/topic/benchpress

Enable benchmarks to compare HEAD with a previous release

Author: retronym

build.sbt

@@ -551,15 +551,24 @@ lazy val scalacheckLib = project.in(file("src") / "scalacheck")
     libraryDependencies += testInterfaceDep
   )
 
+// The scala version used by the benchmark suites, leave undefined to use the ambient version.")
+def benchmarkScalaVersion = System.getProperty("benchmark.scala.version", "")
+
 lazy val bench = project.in(file("test") / "benchmarks")
-  .dependsOn(library, compiler)
-  .settings(instanceSettings)
+  .dependsOn((if (benchmarkScalaVersion == "") Seq[sbt.ClasspathDep[sbt.ProjectReference]](library, compiler) else Nil): _*)
+  .settings(if (benchmarkScalaVersion == "") instanceSettings else Seq(scalaVersion := benchmarkScalaVersion, crossPaths := false))
   .settings(disableDocs)
   .settings(disablePublishing)
   .enablePlugins(JmhPlugin)
   .settings(
     name := "test-benchmarks",
+    autoScalaLibrary := false,
+    crossPaths := true, // needed to enable per-scala-version source directories (https://github.com/sbt/sbt/pull/1799)
     libraryDependencies += "org.openjdk.jol" % "jol-core" % "0.6",
+    libraryDependencies ++= {
+      if (benchmarkScalaVersion == "") Nil
+      else "org.scala-lang" % "scala-compiler" % benchmarkScalaVersion :: Nil
+    },
     scalacOptions ++= Seq("-feature", "-opt:l:inline", "-opt-inline-from:**")
   )
 
@@ -1049,6 +1058,7 @@ intellij := {
     val buildModule = ("scala-build", scalabuild.BuildInfo.buildClasspath.split(java.io.File.pathSeparator).toSeq.map(new File(_)))
     // `sbt projects` lists all modules in the build
     buildModule :: List(
+      moduleDeps(bench).value,
       moduleDeps(compilerP).value,
       moduleDeps(interactive).value,
       moduleDeps(junit).value,

src/intellij/benchmarks.iml.SAMPLE

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <output url="file://$MODULE_DIR$/../../../test/benchmarks/target/classes" />
+    <output-test url="file://$MODULE_DIR$/../../../test/benchmarks/target/test-classes" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../test/benchmarks">
+      <sourceFolder url="file://$MODULE_DIR$/../../test/benchmarks/src/main/scala" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../test/benchmarks/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../test/benchmarks/src/main/scala-2.13/scala" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../test/benchmarks/src/main/scala-2.13/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="library" />
+    <orderEntry type="module" module-name="reflect" />
+    <orderEntry type="module" module-name="compiler" />
+    <orderEntry type="module" module-name="interactive" />
+    <orderEntry type="library" name="bench-deps" level="project" />
+    <orderEntry type="library" name="starr" level="project" />
+  </component>
+</module>

src/intellij/junit.iml.SAMPLE

@@ -2,7 +2,7 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager">
     <output url="file://$MODULE_DIR$/../../build/quick/classes/junit" />
-    <output-test url="file://$MODULE_DIR$/../../out/test/junit" />
+    <output-test url="file://$MODULE_DIR$/../../target/junit/test-classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../test/junit">
       <sourceFolder url="file://$MODULE_DIR$/../../test/junit" isTestSource="true" />

src/intellij/scala-build.iml.SAMPLE

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="scala-build" external.linked.project.path="$MODULE_DIR$/../../project" external.root.project.path="$MODULE_DIR$/../.." external.system.id="SBT" sbt.imports="sbt._, Keys._, dsl._, _root_.sbt.plugins.IvyPlugin, _root_.sbt.plugins.JvmPlugin, _root_.sbt.plugins.CorePlugin, _root_.sbt.plugins.JUnitXmlReportPlugin" sbt.resolvers="https://repo1.maven.org/maven2/|maven|public, https://oss.sonatype.org/content/repositories/snapshots|maven|sonatype-snapshots, https://scala-ci.typesafe.com/artifactory/scala-release-temp/|maven|private-repo, $USER_HOME$/.ivy2/cache|ivy|Local cache" type="SBT_MODULE" version="4">
+<module external.linked.project.id="scala-build" external.linked.project.path="$MODULE_DIR$/../../project" external.root.project.path="$MODULE_DIR$/../.." external.system.id="SBT" sbt.imports="sbt._, Keys._, dsl._, _root_.sbt.plugins.IvyPlugin, _root_.sbt.plugins.JvmPlugin, _root_.sbt.plugins.CorePlugin, _root_.sbt.plugins.JUnitXmlReportPlugin, _root_.pl.project13.scala.sbt.JmhPlugin, _root_.scala.build.BuildSettings.autoImport._, _root_.com.typesafe.tools.mima.plugin.MimaPlugin.autoImport._" sbt.resolvers="https://repo1.maven.org/maven2/|maven|public, https://oss.sonatype.org/content/repositories/snapshots|maven|sonatype-snapshots, https://scala-ci.typesafe.com/artifactory/scala-release-temp/|maven|private-repo, $USER_HOME$/.ivy2/cache|ivy|Local cache" type="SBT_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../project">

src/intellij/scala.ipr.SAMPLE

@@ -165,6 +165,7 @@
   </component>
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/benchmarks.iml" filepath="$PROJECT_DIR$/benchmarks.iml" />
       <module fileurl="file://$PROJECT_DIR$/compiler.iml" filepath="$PROJECT_DIR$/compiler.iml" />
       <module fileurl="file://$PROJECT_DIR$/interactive.iml" filepath="$PROJECT_DIR$/interactive.iml" />
       <module fileurl="file://$PROJECT_DIR$/junit.iml" filepath="$PROJECT_DIR$/junit.iml" />
@@ -196,6 +197,16 @@
     <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
   </component>
   <component name="libraryTable">
+    <library name="bench-deps">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-asm/bundles/scala-asm-6.0.0-scala-1.jar!/" />
+        <root url="jar://$USER_HOME$/.ivy2/cache/org.openjdk.jmh/jmh-core/jars/jmh-core-1.19.jar!/" />
+        <root url="jar://$USER_HOME$/.ivy2/cache/org.openjdk.jol/jol-core/jars/jol-core-0.5.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
+
     <library name="compiler-deps">
       <CLASSES>
         <root url="jar://$USER_HOME$/.ivy2/cache/org.scala-lang.modules/scala-asm/bundles/scala-asm-6.0.0-scala-1.jar!/" />