Rework benchmark files for report

Author: timotheeandres

bench-micro/src/main/scala/dotty/tools/benchmarks/inlinetraits/Boxing.scala renamed to bench-micro/src/main/scala/dotty/tools/benchmarks/inlinetraits/BoxingBenchmark.scala

@@ -0,0 +1,35 @@
+package dotty.tools.benchmarks.inlinetraits
+
+import org.openjdk.jmh.annotations._
+import java.util.concurrent.TimeUnit.SECONDS
+import scala.util.Random
+
+@Fork(10)
+@Threads(3)
+@Warmup(iterations = 3, time = 5, timeUnit = SECONDS)
+@Measurement(iterations = 5, time = 10, timeUnit = SECONDS)
+@State(Scope.Benchmark)
+class MatrixBenchmark {
+  val n: Int = 100
+
+  def intMatrixElems: List[List[Int]] =
+    List.tabulate(n, n)((_, _) => Random.nextInt())
+
+  @Param(Array("standard", "specialized", "inlinetrait"))
+  var libType: String = _
+
+  var m1: BenchmarkMatrix = _
+  var m2: BenchmarkMatrix = _
+
+  @Setup(Level.Trial)
+  def setup = {
+    Random.setSeed(n)
+
+    val matrixFactory = BenchmarkMatrix.ofType(libType)
+    m1 = matrixFactory(intMatrixElems)
+    m2 = matrixFactory(intMatrixElems)
+  }
+
+  @Benchmark
+  def matrixBenchmark = (m1 + m2) * m1 // O(n^3) loops
+}

bench-micro/src/main/scala/dotty/tools/benchmarks/inlinetraits/MatrixBenchmark.scala

@@ -17,6 +17,7 @@ object BenchmarkMatrix:
     }
 
 private class StdBenchmarkMatrix(val m: StdIntMatrix) extends BenchmarkMatrix:
+  import standard.IntMatrixLib.{+, `*`}
   override def +(n: BenchmarkMatrix): StdBenchmarkMatrix = n match {
     case stdN: StdBenchmarkMatrix => StdBenchmarkMatrix(this.m + stdN.m)
   }
@@ -25,16 +26,16 @@ private class StdBenchmarkMatrix(val m: StdIntMatrix) extends BenchmarkMatrix:
   }
 
 private class SpeBenchmarkMatrix(val m: SpeIntMatrix) extends BenchmarkMatrix:
-  import specialized.IntMatrixLib
-
+  import specialized.IntMatrixLib.{+ => plus, `*` => times}
   override def +(n: BenchmarkMatrix): SpeBenchmarkMatrix = n match {
-    case speN: SpeBenchmarkMatrix => SpeBenchmarkMatrix(IntMatrixLib.+(this.m)(speN.m))
+    case speN: SpeBenchmarkMatrix => SpeBenchmarkMatrix(plus(this.m)(speN.m))
   }
   override def *(n: BenchmarkMatrix): SpeBenchmarkMatrix = n match {
-    case speN: SpeBenchmarkMatrix => SpeBenchmarkMatrix(IntMatrixLib.*(this.m)(speN.m))
+    case speN: SpeBenchmarkMatrix => SpeBenchmarkMatrix(times(this.m)(speN.m))
   }
 
 private class InlBenchmarkMatrix(val m: InlIntMatrix) extends BenchmarkMatrix:
+  import inlinetrait.IntMatrixLib.{+, `*`}
   override def +(n: BenchmarkMatrix): InlBenchmarkMatrix = n match {
     case inlN: InlBenchmarkMatrix => InlBenchmarkMatrix(this.m + inlN.m)
   }

bench-micro/src/main/scala/dotty/tools/benchmarks/inlinetraits/MatrixOps.scala

@@ -1,23 +1,16 @@
 package dotty.tools.benchmarks.inlinetraits
 
 import org.openjdk.jmh.annotations._
-import java.util.concurrent.TimeUnit.{SECONDS, MILLISECONDS}
+import java.util.concurrent.TimeUnit.SECONDS
 import scala.util.Random
 
-@BenchmarkMode(Array(Mode.AverageTime))
-@Fork(2)
+@Fork(10)
 @Threads(3)
-@Warmup(iterations = 3, time = 3, timeUnit = SECONDS)
-@Measurement(iterations = 5, time = 5, timeUnit = SECONDS)
-@OutputTimeUnit(MILLISECONDS)
+@Warmup(iterations = 3, time = 5, timeUnit = SECONDS)
+@Measurement(iterations = 5, time = 10, timeUnit = SECONDS)
 @State(Scope.Benchmark)
-class InlineTraitBenchmark {
-  var matrixSize: Int = 300
-
-  var numPairs: Int = 3_000_000
-
-  def intMatrixElems: List[List[Int]] =
-    List.tabulate(matrixSize, matrixSize)((_, _) => Random.nextInt())
+class PairsBenchmark {
+  val numPairs: Int = 3_000_000
 
   def pairElems: List[(First, Second)] = List.tabulate(numPairs)(_ % 2 match {
     case 0 => (Random.nextInt(), Random.nextDouble())
@@ -27,26 +20,16 @@ class InlineTraitBenchmark {
   @Param(Array("standard", "specialized", "inlinetrait"))
   var libType: String = _
 
-  var m1: BenchmarkMatrix = _
-  var m2: BenchmarkMatrix = _
-
   var pairs: List[BenchmarkPair] = _
 
   @Setup(Level.Trial)
   def setup = {
-    Random.setSeed(matrixSize)
-
-    val matrixFactory = BenchmarkMatrix.ofType(libType)
-    m1 = matrixFactory(intMatrixElems)
-    m2 = matrixFactory(intMatrixElems)
+    Random.setSeed(numPairs)
 
     val pairFactory = (l: List[(First, Second)]) => l.map((_1, _2) => BenchmarkPair.ofType(libType)(_1, _2))
     pairs = pairFactory(pairElems)
   }
 
-  @Benchmark
-  def matrixBenchmark = (m1 + m2) * m1 // O(n^3) loops
-
   @Benchmark
   def pairsBenchmark = pairs.foldLeft(0){ case (sum, pair) => pair match {
       case BenchmarkPair(i: Int, d: Double) => 7 * i + 3 * d.toInt + sum

bench-micro/src/main/scala/dotty/tools/benchmarks/inlinetraits/InlineTraitBenchmark.scala renamed to bench-micro/src/main/scala/dotty/tools/benchmarks/inlinetraits/PairsBenchmark.scala

@@ -3,35 +3,28 @@ package inlinetrait
 
 import scala.reflect.ClassTag
 
-// FIXME uncomment the following code when inline traits work
-// inline trait MatrixLib[T: ClassTag]:
-//   opaque type Matrix = Array[Array[T]]
-
-//   object Matrix:
-//     def apply(rows: Seq[T]*): Matrix =
-//       rows.map(_.toArray).toArray
-
-//   extension (m: Matrix)
-//     def apply(x: Int)(y: Int): T = m(x)(y)
-//     def rows: Int = m.length
-//     def cols: Int = m(0).length
-
-object IntMatrixLib /*extends MatrixLib[Int]*/:
-  // FIXME remove manually "generated" code below and replace `IntMatrix` with `Matrix` when inline traits work properly
+inline trait MatrixLib[T: ClassTag]:
+  // FIXME make Matrix opaque once inlinedTypeRef works properly
+  /*opaque*/ type Matrix = Array[Array[T]]
+
+  // FIXME uncomment object and remove following code when inner objects work
+  /*
+   *  object Matrix:
+   *    def apply(rows: Seq[T]*): Matrix =
+   *      rows.map(_.toArray).toArray
+   */
   // ----------------------------------
-  opaque type Matrix = Array[Array[Int]]
-
-  object Matrix:
-    def apply(rows: Seq[Int]*): Matrix =
-      rows.map(_.toArray).toArray
-
-  extension (m: Matrix)
-    /*override*/ def apply(x: Int)(y: Int): Int = m(x)(y)
-    /*override*/ def rows: Int = m.length
-    /*override*/ def cols: Int = m(0).length
+  def Matrix(rows: Seq[T]*): Matrix =
+    rows.map(_.toArray).toArray
   // ----------------------------------
   // end of code to remove
 
+  extension (m: Matrix)
+    def apply(x: Int)(y: Int): T = m(x)(y)
+    def rows: Int = m.length
+    def cols: Int = m(0).length
+
+object IntMatrixLib extends MatrixLib[Int]:
   extension (m: Matrix)
     def +(n: Matrix): Matrix =
       val sum =

bench-micro/src/main/scala/dotty/tools/benchmarks/inlinetraits/PairOps.scala renamed to bench-micro/src/main/scala/dotty/tools/benchmarks/inlinetraits/PairsOps.scala

@@ -1,9 +1,7 @@
 package dotty.tools.benchmarks.inlinetraits
 package inlinetrait
 
-inline trait Pair[+T1, +T2]:
-  val _1: T1
-  val _2: T2
+inline trait Pair[+T1, +T2](val _1: T1, val _2: T2)
 
-class IntDoublePair(val _1: Int, val _2: Double) extends Pair[Int, Double]
-class CharShortPair(val _1: Char, val _2: Short) extends Pair[Char, Short]
+class IntDoublePair(override val _1: Int, override val _2: Double) extends Pair[Int, Double](_1, _2)
+class CharShortPair(override val _1: Char, override val _2: Short) extends Pair[Char, Short](_1, _2)