Skip to content

Commit 5c45bd7

Browse files
Use wildcard for default var value in benchmark
1 parent df5a75e commit 5c45bd7

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,24 @@ import scala.util.Random
1313
@State(Scope.Benchmark)
1414
class InlineTraitBenchmark {
1515
// @Param(Array("100", "200", "300"))
16-
var n: Int = 300
16+
var matrixSize: Int = 300
1717

18-
def intMatrixElems(): Seq[Seq[Int]] =
19-
Seq.tabulate(n, n)((_, _) => Random.nextInt())
18+
def intMatrixElems: List[List[Int]] =
19+
List.tabulate(matrixSize, matrixSize)((_, _) => Random.nextInt())
2020

2121
@Param(Array("standard", "specialized", "inlinetrait"))
22-
var matrixLibType: String = ""
22+
var libType: String = _
2323

24-
var m1 = BenchmarkMatrix.empty
25-
var m2 = BenchmarkMatrix.empty
24+
var m1: BenchmarkMatrix = _
25+
var m2: BenchmarkMatrix = _
2626

2727
@Setup(Level.Trial)
2828
def setup = {
29-
Random.setSeed(n)
30-
val matrixFactory = BenchmarkMatrix.ofType(matrixLibType)
31-
m1 = matrixFactory(intMatrixElems())
32-
m2 = matrixFactory(intMatrixElems())
29+
Random.setSeed(matrixSize)
30+
31+
val matrixFactory = BenchmarkMatrix.ofType(libType)
32+
m1 = matrixFactory(intMatrixElems)
33+
m2 = matrixFactory(intMatrixElems)
3334
}
3435

3536
@Benchmark

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ object BenchmarkMatrix:
1616
case "inlinetrait" => InlBenchmarkMatrix(InlIntMatrix(elems*))
1717
}
1818

19-
val empty: BenchmarkMatrix = new BenchmarkMatrix {
20-
override def +(n: BenchmarkMatrix): BenchmarkMatrix = ???
21-
override def *(n: BenchmarkMatrix): BenchmarkMatrix = ???
22-
}
23-
24-
2519
private class StdBenchmarkMatrix(val m: StdIntMatrix) extends BenchmarkMatrix:
2620
override def +(n: BenchmarkMatrix): StdBenchmarkMatrix = n match {
2721
case stdN: StdBenchmarkMatrix => StdBenchmarkMatrix(this.m + stdN.m)

0 commit comments

Comments
 (0)