Merge pull request #7689 from brunnerant/tuple-tweaks-03

Improve performance of tuple operations

Author: nicolasstucki

bench-run/inputs/map.in

@@ -0,0 +1 @@
+size:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50

bench-run/inputs/zip.in

@@ -0,0 +1 @@
+size:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Concat.scala

@@ -10,8 +10,6 @@ class Concat {
   var sizes: String = _
   var tuple1: Tuple = _
   var tuple2: Tuple = _
-  var array1: Array[Object] = _
-  var array2: Array[Object] = _
 
   def tupleOfSize(n: Int): Tuple = {
     var t: Tuple = ()
@@ -26,17 +24,10 @@ class Concat {
     val size2 = sizes.split(' ')(1).toInt
     tuple1 = tupleOfSize(size1)
     tuple2 = tupleOfSize(size2)
-    array1 = Array.fill(size1)("elem")
-    array2 = Array.fill(size2)("elem")
   }
 
   @Benchmark
   def tupleConcat(): Tuple = {
     DynamicTuple.dynamicConcat(tuple1, tuple2)
   }
-
-  @Benchmark
-  def arrayConcat(): Array[Object] = {
-    array1 ++ array2
-  }
 }

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Cons.scala

@@ -8,7 +8,8 @@ class Cons {
   @Param(Array("0"))
   var size: Int = _
   var tuple: Tuple = _
-  var array: Array[Object] = _
+  var array1: Array[Object] = _
+  var array2: Array[Object] = _
 
   @Setup
   def setup(): Unit = {
@@ -17,7 +18,8 @@ class Cons {
     for (i <- 1 to size)
       tuple = "elem" *: tuple
 
-    array = Array.fill(size)("elem")
+    array1 = new Array[Object](size)
+    array2 = new Array[Object](size + 1)
   }
 
   @Benchmark
@@ -26,7 +28,13 @@ class Cons {
   }
 
   @Benchmark
-  def arrayCons(): Array[Object] = {
-    DynamicTuple.cons$Array("elem", array)
+  def createArray(): Array[Object] = {
+    new Array[Object](size + 1)
+  }
+
+  @Benchmark
+  def consArray(): Array[Object] = {
+    System.arraycopy(array1, 0, array2, 1, size)
+    array2
   }
 }

bench-run/src/main/scala/dotty/tools/benchmarks/tuples/ArrayOps.scala renamed to bench-run/src/main/scala/dotty/tools/benchmarks/tuples/Conversions.scala

@@ -4,7 +4,7 @@ import org.openjdk.jmh.annotations._
 import scala.runtime.DynamicTuple
 
 @State(Scope.Thread)
-class ArrayOps {
+class Conversions {
   @Param(Array("1"))
   var size: Int = _
   var tuple: Tuple = _