fix benchmarking

Quafadas · Oct 4, 2024 · 9af60ba · 9af60ba
1 parent 0cdc3ca
commit 9af60ba
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/benchmark/src/Benchmark.scala b/benchmark/src/Benchmark.scala
@@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit;
 @OutputTimeUnit(TimeUnit.SECONDS)
 @State(Scope.Thread)
 @Fork(value = 1)
-@Warmup(iterations = 3)
+@Warmup(iterations = 1)
 @Measurement(iterations = 3)
 abstract class BLASBenchmark:
 

diff --git a/benchmark/src/and.scala b/benchmark/src/and.scala
@@ -30,7 +30,7 @@ import org.openjdk.jmh.infra.Blackhole
 // import vecxt.Matrix.*
 import vecxt.BoundsCheck
 import scala.compiletime.uninitialized
-import vecxt.*
+import vecxt.all.*
 import jdk.incubator.vector.VectorSpecies
 import jdk.incubator.vector.VectorOperators
 import jdk.incubator.vector.DoubleVector

diff --git a/benchmark/src/countTrue.scala b/benchmark/src/countTrue.scala
@@ -30,7 +30,7 @@ import org.openjdk.jmh.infra.Blackhole
 // import vecxt.Matrix.*
 import vecxt.BoundsCheck
 import scala.compiletime.uninitialized
-import vecxt.*
+import vecxt.all.*
 import jdk.incubator.vector.VectorSpecies
 import jdk.incubator.vector.VectorOperators
 import jdk.incubator.vector.DoubleVector

diff --git a/benchmark/src/increments.scala b/benchmark/src/increments.scala
@@ -30,7 +30,7 @@ import org.openjdk.jmh.infra.Blackhole
 // import vecxt.Matrix.*
 import vecxt.BoundsCheck
 import scala.compiletime.uninitialized
-import vecxt.*
+import vecxt.all.*
 import jdk.incubator.vector.VectorSpecies
 import jdk.incubator.vector.VectorOperators
 import jdk.incubator.vector.DoubleVector

diff --git a/benchmark/src/logical.scala b/benchmark/src/logical.scala
@@ -30,7 +30,7 @@ import org.openjdk.jmh.infra.Blackhole
 // import vecxt.Matrix.*
 import vecxt.BoundsCheck
 import scala.compiletime.uninitialized
-import vecxt.*
+import vecxt.all.*
 import jdk.incubator.vector.VectorSpecies
 import jdk.incubator.vector.VectorOperators
 import jdk.incubator.vector.DoubleVector
@@ -42,12 +42,12 @@ class LogicalBenchmark extends BLASBenchmark:
   var len: String = uninitialized;
 
   var arr: Array[Double] = uninitialized
-  
+
 
   // format: off
   @Setup(Level.Trial)
   def setup: Unit =
-    arr = randomDoubleArray(len.toInt);    
+    arr = randomDoubleArray(len.toInt);
     ()
   end setup
 
@@ -68,14 +68,14 @@ class LogicalBenchmark extends BLASBenchmark:
     val r = arr <= 4.0
     bh.consume(r);
   end lte_vec
-  
-  
+
+
 
   @Benchmark
   def lte_loop(bh: Blackhole) =
     val r = arr.lte2(4.0)
     bh.consume(r);
   end lte_loop
-  
+
 end LogicalBenchmark
-  
+
diff --git a/benchmark/src/matmul.scala b/benchmark/src/matmul.scala
@@ -27,10 +27,11 @@ package vecxt.benchmark
 
 import org.openjdk.jmh.annotations.*
 import org.openjdk.jmh.infra.Blackhole
-import vecxt.Matrix.*
+import vecxt.all.*
 import vecxt.BoundsCheck
 import scala.compiletime.uninitialized
 import BoundsCheck.DoBoundsCheck.no
+
 @State(Scope.Thread)
 class DgemmBenchmark extends BLASBenchmark:
 

diff --git a/benchmark/src/or.scala b/benchmark/src/or.scala
@@ -30,7 +30,7 @@ import org.openjdk.jmh.infra.Blackhole
 // import vecxt.Matrix.*
 import vecxt.BoundsCheck
 import scala.compiletime.uninitialized
-import vecxt.*
+import vecxt.all.*
 import jdk.incubator.vector.VectorSpecies
 import jdk.incubator.vector.VectorOperators
 import jdk.incubator.vector.DoubleVector

diff --git a/benchmark/src/sum.scala b/benchmark/src/sum.scala
@@ -30,7 +30,7 @@ import org.openjdk.jmh.infra.Blackhole
 // import vecxt.Matrix.*
 import vecxt.BoundsCheck
 import scala.compiletime.uninitialized
-import vecxt.*
+import vecxt.all.*
 import jdk.incubator.vector.VectorSpecies
 import jdk.incubator.vector.VectorOperators
 import jdk.incubator.vector.DoubleVector
@@ -58,7 +58,7 @@ class SumBenchmark extends BLASBenchmark:
     inline def sum2 =
       var sum: Double = 0.0
       var i: Int = 0
-      val sp = Matrix.Matrix.doubleSpecies
+      val sp = Matrix.doubleSpecies
       val l = sp.length()
 
       while i < sp.loopBound(vec.length) do

diff --git a/benchmark/src/vectorAddition.scala b/benchmark/src/vectorAddition.scala
@@ -27,9 +27,8 @@ package vecxt.benchmark
 
 import org.openjdk.jmh.annotations.*
 import org.openjdk.jmh.infra.Blackhole
-import vecxt.Matrix.*
 import jdk.incubator.vector.DoubleVector
-import vecxt.*
+import vecxt.all.*
 import scala.compiletime.uninitialized
 
 // format: off