Update benchmarks to use Scala 2.12 or 2.13

README.md

@@ -321,39 +321,33 @@ have less restrictive licenses.
 Depending on your needs, you can use either of the two distributions.
 The following table contains the licensing information of all the benchmarks:
 
-| Benchmark     | Licenses      | Renaissance Distro |
-| ------------- | ------------- |:------------------:|
-| akka-uct | MIT | MIT |
-| als | APACHE2 | MIT |
-| chi-square | APACHE2 | MIT |
-| db-shootout | APACHE2 | MIT |
-| dec-tree | APACHE2 | MIT |
-| dotty | BSD3 | MIT |
-| dummy-empty | MIT | MIT |
-| dummy-failing | MIT | MIT |
-| dummy-param | MIT | MIT |
-| dummy-setup-failing | MIT | MIT |
-| dummy-teardown-failing | MIT | MIT |
-| dummy-validation-failing | MIT | MIT |
-| finagle-chirper | APACHE2 | MIT |
-| finagle-http | APACHE2 | MIT |
-| fj-kmeans | APACHE2 | MIT |
-| future-genetic | APACHE2 | MIT |
-| gauss-mix | APACHE2 | MIT |
-| log-regression | APACHE2 | MIT |
-| mnemonics | MIT | MIT |
-| movie-lens | APACHE2 | MIT |
-| naive-bayes | APACHE2 | MIT |
-| neo4j-analytics | GPL3 | GPL3 |
-| page-rank | APACHE2 | MIT |
-| par-mnemonics | MIT | MIT |
-| philosophers | BSD3 | MIT |
-| reactors | MIT | MIT |
-| rx-scrabble | GPL2 | GPL3 |
-| scala-doku | MIT | MIT |
-| scala-kmeans | MIT | MIT |
-| scala-stm-bench7 | BSD3, GPL2 | GPL3 |
-| scrabble | GPL2 | GPL3 |
+| Benchmark        | Licenses   | Distro | JVM required (min) | JVM supported (max) |
+| :--------------- | :--------- | :----: | :----------------: | :-----------------: |
+| akka-uct | MIT | MIT | 1.8 |  |
+| als | APACHE2 | MIT | 1.8 |  |
+| chi-square | APACHE2 | MIT | 1.8 |  |
+| db-shootout | APACHE2 | MIT | 1.8 |  |
+| dec-tree | APACHE2 | MIT | 1.8 |  |
+| dotty | BSD3 | MIT | 1.8 |  |
+| finagle-chirper | APACHE2 | MIT | 1.8 |  |
+| finagle-http | APACHE2 | MIT | 1.8 |  |
+| fj-kmeans | APACHE2 | MIT | 1.8 |  |
+| future-genetic | APACHE2 | MIT | 1.8 |  |
+| gauss-mix | APACHE2 | MIT | 1.8 |  |
+| log-regression | APACHE2 | MIT | 1.8 |  |
+| mnemonics | MIT | MIT | 1.8 |  |
+| movie-lens | APACHE2 | MIT | 1.8 |  |
+| naive-bayes | APACHE2 | MIT | 1.8 |  |
+| neo4j-analytics | GPL3 | GPL3 | 11 | 15 |
+| page-rank | APACHE2 | MIT | 1.8 |  |
+| par-mnemonics | MIT | MIT | 1.8 |  |
+| philosophers | BSD3 | MIT | 1.8 |  |
+| reactors | MIT | MIT | 1.8 |  |
+| rx-scrabble | GPL2 | GPL3 | 1.8 |  |
+| scala-doku | MIT | MIT | 1.8 |  |
+| scala-kmeans | MIT | MIT | 1.8 |  |
+| scala-stm-bench7 | BSD3, GPL2 | GPL3 | 1.8 |  |
+| scrabble | GPL2 | GPL3 | 1.8 |  |
 
 
 ### Design overview

benchmarks/actors-akka/src/main/scala/org/renaissance/actors/AkkaUct.scala

@@ -27,7 +27,7 @@ final class AkkaUct extends Benchmark {
   private var bench: UctAkkaActorBenchmark.UctAkkaActorBenchmark = _
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    loopCountParam = c.intParameter("loop_count")
+    loopCountParam = c.parameter("loop_count").toPositiveInteger
 
     bench = new UctAkkaActorBenchmark.UctAkkaActorBenchmark
     bench.initialize(new Array[String](0))

benchmarks/actors-reactors/src/main/scala/org/renaissance/actors/Reactors.scala

@@ -41,7 +41,7 @@ final class Reactors extends Benchmark {
   private var expectedFibonacci: Int = _
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    scalingFactorParam = c.doubleParameter("scaling_factor")
+    scalingFactorParam = c.parameter("scaling_factor").toDouble
 
     // Instantiate the default reactor system used throughout the benchmark.
     system = ReactorSystem.default("bench-system")

benchmarks/apache-spark/src/main/scala/org/renaissance/apache/spark/Als.scala

@@ -75,7 +75,7 @@ final class Als extends Benchmark with SparkUtil {
   }
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    ratingCountParam = c.intParameter("rating_count")
+    ratingCountParam = c.parameter("rating_count").toPositiveInteger
 
     tempDirPath = c.generateTempDir("als")
     sc = setUpSparkContext(tempDirPath, THREAD_COUNT, "als")

benchmarks/apache-spark/src/main/scala/org/renaissance/apache/spark/ChiSquare.scala

@@ -85,8 +85,8 @@ final class ChiSquare extends Benchmark with SparkUtil {
   }
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    threadCountParam = c.intParameter("thread_count")
-    numberCountParam = c.intParameter("number_count")
+    threadCountParam = c.parameter("thread_count").toPositiveInteger
+    numberCountParam = c.parameter("number_count").toPositiveInteger
 
     tempDirPath = c.generateTempDir("chi_square")
     sc = setUpSparkContext(tempDirPath, threadCountParam, "chi-square")

benchmarks/apache-spark/src/main/scala/org/renaissance/apache/spark/DecTree.scala

@@ -104,8 +104,8 @@ final class DecTree extends Benchmark with SparkUtil {
   }
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    threadCountParam = c.intParameter("thread_count")
-    copyCountParam = c.intParameter("copy_count")
+    threadCountParam = c.parameter("thread_count").toPositiveInteger
+    copyCountParam = c.parameter("copy_count").toPositiveInteger
 
     tempDirPath = c.generateTempDir("dec_tree")
     sc = setUpSparkContext(tempDirPath, threadCountParam, "dec-tree")

benchmarks/apache-spark/src/main/scala/org/renaissance/apache/spark/GaussMix.scala

@@ -66,9 +66,9 @@ final class GaussMix extends Benchmark with SparkUtil {
   var tempDirPath: Path = _
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    threadCountParam = c.intParameter("thread_count")
-    numberCountParam = c.intParameter("number_count")
-    maxIterationsParam = c.intParameter("max_iterations")
+    threadCountParam = c.parameter("thread_count").toPositiveInteger
+    numberCountParam = c.parameter("number_count").toPositiveInteger
+    maxIterationsParam = c.parameter("max_iterations").toPositiveInteger
 
     tempDirPath = c.generateTempDir("gauss_mix")
     sc = setUpSparkContext(tempDirPath, threadCountParam, "gauss-mix")

benchmarks/apache-spark/src/main/scala/org/renaissance/apache/spark/LogRegression.scala

@@ -92,8 +92,8 @@ final class LogRegression extends Benchmark with SparkUtil {
   }
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    threadCountParam = c.intParameter("thread_count")
-    copyCountParam = c.intParameter("copy_count")
+    threadCountParam = c.parameter("thread_count").toPositiveInteger
+    copyCountParam = c.parameter("copy_count").toPositiveInteger
 
     tempDirPath = c.generateTempDir("log_regression")
     sc = setUpSparkContext(tempDirPath, threadCountParam, "log-regression")

benchmarks/apache-spark/src/main/scala/org/renaissance/apache/spark/MovieLens.scala

@@ -23,6 +23,7 @@ import org.renaissance.BenchmarkResult.Validators
 import org.renaissance.License
 
 import scala.io.Source
+import scala.jdk.CollectionConverters.collectionAsScalaIterableConverter
 
 @Name("movie-lens")
 @Group("apache-spark")
@@ -270,10 +271,10 @@ final class MovieLens extends Benchmark with SparkUtil {
   }
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    inputFileParam = c.stringParameter("input_file")
-    alsRanksParam = c.stringParameter("als_ranks").split(",").map(_.trim.toInt).toList
-    alsLambdasParam = c.stringParameter("als_lambdas").split(",").map(_.trim.toDouble).toList
-    alsIterationsParam = c.stringParameter("als_iterations").split(",").map(_.trim.toInt).toList
+    inputFileParam = c.parameter("input_file").value
+    alsRanksParam = c.parameter("als_ranks").toList(_.toInt).asScala.toList
+    alsLambdasParam = c.parameter("als_lambdas").toList(_.toDouble).asScala.toList
+    alsIterationsParam = c.parameter("als_iterations").toList(_.toInt).asScala.toList
 
     tempDirPath = c.generateTempDir("movie_lens")
     setUpLogger()

benchmarks/apache-spark/src/main/scala/org/renaissance/apache/spark/PageRank.scala

@@ -92,10 +92,10 @@ final class PageRank extends Benchmark with SparkUtil {
   }
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    threadCountParam = c.intParameter("thread_count")
-    inputLineCountParam = c.intParameter("input_line_count")
-    expectedRankCountParam = c.intParameter("expected_rank_count")
-    expectedRankHashParam = c.stringParameter("expected_rank_hash")
+    threadCountParam = c.parameter("thread_count").toPositiveInteger
+    inputLineCountParam = c.parameter("input_line_count").toInteger
+    expectedRankCountParam = c.parameter("expected_rank_count").toInteger
+    expectedRankHashParam = c.parameter("expected_rank_hash").value
 
     tempDirPath = c.generateTempDir("page_rank")
     sc = setUpSparkContext(tempDirPath, threadCountParam, "page-rank")

benchmarks/database/src/main/scala/org/renaissance/database/DbShootout.scala

@@ -32,34 +32,32 @@ final class DbShootout extends Benchmark {
   // TODO: Consolidate benchmark parameters across the suite.
   //  See: https://github.com/renaissance-benchmarks/renaissance/issues/27
 
-  private var readWriteEntryCountParam: Int = _
-
   // TODO: Unify handling of scratch directories throughout the suite.
   //  See: https://github.com/renaissance-benchmarks/renaissance/issues/13
 
-  var tempDirPath: Path = null
+  var tempDirPath: Path = _
 
-  var mapDb: MapDb = null
+  var mapDb: MapDb = _
 
-  var mapDbReader: MapDb.Reader = null
+  var mapDbReader: MapDb.Reader = _
 
-  var mapDbWriter: MapDb.Writer = null
+  var mapDbWriter: MapDb.Writer = _
 
-  var chronicle: Chronicle = null
+  var chronicle: Chronicle = _
 
-  var chronicleReader: Chronicle.Reader = null
+  var chronicleReader: Chronicle.Reader = _
 
-  var chronicleWriter: Chronicle.Writer = null
+  var chronicleWriter: Chronicle.Writer = _
 
-  var mvStore: MvStore = null
+  var mvStore: MvStore = _
 
-  var mvStoreReader: MvStore.Reader = null
+  var mvStoreReader: MvStore.Reader = _
 
-  var mvStoreWriter: MvStore.Writer = null
+  var mvStoreWriter: MvStore.Writer = _
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
     tempDirPath = c.generateTempDir("db_shootout")
-    readWriteEntryCountParam = c.intParameter("rw_entry_count")
+    val readWriteEntryCountParam = c.parameter("rw_entry_count").toPositiveInteger
 
     mapDb = new MapDb
     mapDbReader = new MapDb.Reader

benchmarks/dummy/src/main/java/org/renaissance/dummy/DummyParam.java

@@ -5,6 +5,8 @@
 import org.renaissance.BenchmarkResult;
 import org.renaissance.License;
 
+import java.util.List;
+
 import static org.renaissance.Benchmark.*;
 import static org.renaissance.BenchmarkResult.Validators.compound;
 import static org.renaissance.BenchmarkResult.Validators.simple;
@@ -17,20 +19,26 @@
 @Parameter(name = "meaning_of_life", defaultValue = "42")
 @Parameter(name = "beyond_reason", defaultValue = "PI")
 @Parameter(name = "reality_check", defaultValue = "3.1415926")
+@Parameter(name = "the_sky_is_blue", defaultValue = "true")
+@Parameter(name = "tough_choice", defaultValue = "to be, not to be")
 @Configuration(name = "test", settings = {"beyond_reason = E", "reality_check = 2.7182818"})
 @Configuration(name = "jmh")
 public final class DummyParam implements Benchmark {
   @Override
   public BenchmarkResult run(BenchmarkContext c) {
-    int threadCountParam = c.intParameter("thread_count");
-    int meaningOfLifeParam = c.intParameter("meaning_of_life");
-    String beyondReasonParam = c.stringParameter("beyond_reason");
-    double realityCheckParam = c.doubleParameter("reality_check");
+    int threadCountParam = c.parameter("thread_count").toPositiveInteger();
+    int meaningOfLifeParam = c.parameter("meaning_of_life").toInteger();
+    String beyondReasonParam = c.parameter("beyond_reason").value();
+    double realityCheckParam = c.parameter("reality_check").toDouble();
+    boolean theSkyIsBlueParam = c.parameter("the_sky_is_blue").toBoolean();
+    List<String> toughChoice = c.parameter("tough_choice").toList();
 
     System.out.printf("thread_count: %d\n", threadCountParam);
     System.out.printf("meaning_of_life: %d\n", meaningOfLifeParam);
     System.out.printf("beyond_reason: %s\n", beyondReasonParam);
     System.out.printf("reality_check: %f\n", realityCheckParam);
+    System.out.printf("the_sky_is_blue: %b\n", theSkyIsBlueParam);
+    System.out.printf("tough_choice: %s\n", String.join(",", toughChoice));
 
     try {
       double beyondReasonValue = Math.class.getField(beyondReasonParam).getDouble(null);

benchmarks/jdk-concurrent/src/main/scala/org/renaissance/jdk/concurrent/FjKmeans.scala

@@ -38,8 +38,8 @@ final class FjKmeans extends Benchmark {
   private var data: java.util.List[Array[java.lang.Double]] = _
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    threadCountParam = c.intParameter("thread_count")
-    vectorLengthParam = c.intParameter("vector_length")
+    threadCountParam = c.parameter("thread_count").toInteger
+    vectorLengthParam = c.parameter("vector_length").toInteger
 
     benchmark = new JavaKMeans(DIMENSION, threadCountParam)
     data = JavaKMeans.generateData(vectorLengthParam, DIMENSION, CLUSTER_COUNT)

benchmarks/jdk-concurrent/src/main/scala/org/renaissance/jdk/concurrent/FutureGenetic.scala

@@ -41,8 +41,8 @@ final class FutureGenetic extends Benchmark {
   private var benchmark: JavaJenetics = _
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    chromosomeCountParam = c.intParameter("chromosome_count")
-    generationCountParam = c.intParameter("generation_count")
+    chromosomeCountParam = c.parameter("chromosome_count").toPositiveInteger
+    generationCountParam = c.parameter("generation_count").toPositiveInteger
 
     benchmark = new JavaJenetics(
       GENE_MIN_VALUE,

benchmarks/jdk-streams/src/main/scala/org/renaissance/jdk/streams/Mnemonics.scala

@@ -28,8 +28,8 @@ final class Mnemonics extends Benchmark {
   private var coder: MnemonicsCoderWithStream = _
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    coderInputParam = c.stringParameter("coder_input")
-    expectedHashParam = c.stringParameter("expected_hash")
+    coderInputParam = c.parameter("coder_input").value
+    expectedHashParam = c.parameter("expected_hash").value
 
     // TODO Unify Mnemonics and ParMnemonics setup
     coder = new MnemonicsCoderWithStream(

benchmarks/jdk-streams/src/main/scala/org/renaissance/jdk/streams/ParMnemonics.scala

@@ -28,8 +28,8 @@ final class ParMnemonics extends Benchmark {
   private var coder: MnemonicsCoderWithStream = _
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    coderInputParam = c.stringParameter("coder_input")
-    expectedHashParam = c.stringParameter("expected_hash")
+    coderInputParam = c.parameter("coder_input").value
+    expectedHashParam = c.parameter("expected_hash").value
 
     // TODO Unify Mnemonics and ParMnemonics setup
     coder = new MnemonicsCoderWithStream(

benchmarks/jdk-streams/src/main/scala/org/renaissance/jdk/streams/Scrabble.scala

@@ -41,8 +41,8 @@ final class Scrabble extends Benchmark {
   private var scrabble: JavaScrabble = _
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    inputPathParam = c.stringParameter("input_path")
-    expectedResultParam = c.stringParameter("expected_result").split(",").map(_.trim).toSeq
+    inputPathParam = c.parameter("input_path").value
+    expectedResultParam = c.parameter("expected_result").toList().asScala.toSeq
     scrabble = new JavaScrabble(inputPathParam, scrabblePath)
   }
 

benchmarks/neo4j/src/main/scala/org/renaissance/neo4j/Neo4jAnalytics.scala

@@ -39,10 +39,6 @@ final class Neo4jAnalytics extends Benchmark {
   private val dbms = new AtomicReference[DatabaseManagementService]()
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    def requirePositiveCount(name: String) = {
-      math.max(1, c.intParameter(name))
-    }
-
     def loadResource(name: String) = {
       implicit val defaultCodec = Codec.UTF8
       Source.createBufferedSource(getClass.getResourceAsStream(name))
@@ -53,12 +49,12 @@ final class Neo4jAnalytics extends Benchmark {
 
     benchmark = new AnalyticsBenchmark(
       graphDb,
-      requirePositiveCount("long_query_threads"),
-      requirePositiveCount("long_query_repeats"),
-      requirePositiveCount("short_query_threads"),
-      requirePositiveCount("short_query_repeats"),
-      requirePositiveCount("mutator_query_threads"),
-      requirePositiveCount("mutator_query_repeats")
+      c.parameter("long_query_threads").toPositiveInteger,
+      c.parameter("long_query_repeats").toPositiveInteger,
+      c.parameter("short_query_threads").toPositiveInteger,
+      c.parameter("short_query_repeats").toPositiveInteger,
+      c.parameter("mutator_query_threads").toPositiveInteger,
+      c.parameter("mutator_query_repeats").toPositiveInteger
     )
 
     benchmark.populateDatabase(

benchmarks/rx/src/main/scala/org/renaissance/rx/RxScrabble.scala

@@ -25,17 +25,15 @@ final class RxScrabble extends Benchmark {
   // TODO: Consolidate benchmark parameters across the suite.
   //  See: https://github.com/renaissance-benchmarks/renaissance/issues/27
 
-  private var inputPathParam: String = _
-
   private var expectedHashParam: String = _
 
   private val scrabblePath: String = "/scrabble.txt"
 
   private var bench: RxScrabbleImplementation = _
 
   override def setUpBeforeAll(c: BenchmarkContext): Unit = {
-    inputPathParam = c.stringParameter("input_path")
-    expectedHashParam = c.stringParameter("expected_hash")
+    val inputPathParam = c.parameter("input_path").value
+    expectedHashParam = c.parameter("expected_hash").value
     bench = new RxScrabbleImplementation(scrabblePath, inputPathParam)
   }
 

benchmarks/scala-dotty/build.sbt

@@ -9,6 +9,7 @@ lazy val scalaDotty = (project in file("."))
     scalacOptions += "-Ytasty-reader",
     libraryDependencies ++= Seq(
       "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.2",
+      // 3.0.0-RC1 is as far as we can go with Tasty reader in 2.13.5
       "org.scala-lang" % "scala3-compiler_3.0.0-RC1" % "3.0.0-RC1"
     )
   )