Refactor list builder benchmark generators

Abduqodiri Qurbonzoda · Abduqodiri Qurbonzoda · commit 28e71dfa6e52 · 2019-06-21T05:33:07.000+03:00
diff --git a/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/clojure/builder/utils.kt b/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/clojure/builder/utils.kt
@@ -25,7 +25,7 @@ fun persistentListBuilderAdd(size: Int, immutablePercentage: Double): clojure.la
 
     var list = clojure.lang.PersistentVector.EMPTY
     repeat(times = immutableSize) {
-        list = list.cons("some element")
+        list = list.cons("another element")
     }
 
     val builder = list.asTransient() as clojure.lang.ITransientVector
diff --git a/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/kotlin/builder/utils.kt b/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/kotlin/builder/utils.kt
@@ -25,7 +25,7 @@ fun persistentListBuilderAdd(size: Int, immutablePercentage: Double): kotlinx.co
 
     var list = kotlinx.collections.immutable.persistentListOf<String>()
     repeat(times = immutableSize) {
-        list = list.add("some element")
+        list = list.add("another element")
     }
 
     val builder = list.builder()
diff --git a/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/paguro/Add.kt b/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/paguro/Add.kt
@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package benchmarks.immutableList.paguroRrbTree
+package benchmarks.immutableList.paguro
 
 import org.openjdk.jmh.annotations.*
 import java.util.concurrent.TimeUnit
diff --git a/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/paguro/Get.kt b/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/paguro/Get.kt
@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package benchmarks.immutableList.paguroRrbTree
+package benchmarks.immutableList.paguro
 
 import org.openjdk.jmh.annotations.*
 import java.util.concurrent.TimeUnit
diff --git a/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/paguro/Iterate.kt b/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/paguro/Iterate.kt
@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package benchmarks.immutableList.paguroRrbTree
+package benchmarks.immutableList.paguro
 
 import org.openjdk.jmh.annotations.*
 import java.util.concurrent.TimeUnit
diff --git a/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/paguro/Remove.kt b/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/paguro/Remove.kt
@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package benchmarks.immutableList.paguroRrbTree
+package benchmarks.immutableList.paguro
 
 import org.openjdk.jmh.annotations.*
 import java.util.concurrent.TimeUnit
diff --git a/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/paguro/Set.kt b/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/paguro/Set.kt
@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package benchmarks.immutableList.paguroRrbTree
+package benchmarks.immutableList.paguro
 
 import org.openjdk.jmh.annotations.*
 import java.util.concurrent.TimeUnit
diff --git a/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/paguro/builder/utils.kt b/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/paguro/builder/utils.kt
@@ -25,7 +25,7 @@ fun persistentListBuilderAdd(size: Int, immutablePercentage: Double): org.organi
 
     var list = org.organicdesign.fp.collections.RrbTree.empty<String>()
     repeat(times = immutableSize) {
-        list = list.append("some element")
+        list = list.append("another element")
     }
 
     val builder = list.mutable()
diff --git a/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/paguro/utils.kt b/benchmarks-libraries/src/jmh/java/benchmarks/immutableList/paguro/utils.kt
@@ -16,7 +16,7 @@
 
 // Auto-generated file. DO NOT EDIT!
 
-package benchmarks.immutableList.paguroRrbTree
+package benchmarks.immutableList.paguro
 
 
 fun persistentListAdd(size: Int): org.organicdesign.fp.collections.RrbTree.ImRrbt<String> {
diff --git a/benchmarks-libraries/src/main/kotlin/generators/benchmarkSourceGenerator.kt b/benchmarks-libraries/src/main/kotlin/generators/benchmarkSourceGenerator.kt
@@ -103,16 +103,16 @@ private const val BENCHMARKS_ROOT = "src/jmh/java/"
 
 private val listImpls = listOf(
         KotlinListImplementation,
-        PaguroRrbTreeListImplementation,
+        PaguroListImplementation,
         CyclopsListImplementation,
         ClojureListImplementation,
         ScalaListImplementation,
         VavrListImplementation
 )
 private val listBuilderImpls = listOf(
-        ListBuilderKotlinBenchmark(),
-        ListBuilderPaguroBenchmark(),
-        ListBuilderClojureBenchmark()
+        KotlinListBuilderImplementation,
+        PaguroListBuilderImplementation,
+        ClojureListBuilderImplementation
 )
 
 private val mapImpls = listOf(
@@ -178,13 +178,22 @@ fun generateBenchmarks() {
             listImpls.filterIsInstance<ListRemoveBenchmark>().map { ListRemoveBenchmarkGenerator(it) },
             listImpls.filterIsInstance<ListSetBenchmark>().map { ListSetBenchmarkGenerator(it) }
     )*/
-    val listBuilderBenchmarks = listOf(
+    val listBuilderBenchmarks = listBuilderImpls.map { listOf(
+            ListBuilderAddBenchmarkGenerator(it),
+            ListBuilderGetBenchmarkGenerator(it),
+            ListBuilderRemoveBenchmarkGenerator(it),
+            ListBuilderSetBenchmarkGenerator(it),
+            ListBuilderUtilsGenerator(it)
+    ) } + listBuilderImpls.filter(ListBuilderImplementation::isIterable).map { listOf(
+            ListBuilderIterateBenchmarkGenerator(it)
+    ) }
+    /*listOf(
             listBuilderImpls.filterIsInstance<ListBuilderAddBenchmark>().map { ListBuilderAddBenchmarkGenerator(it) },
             listBuilderImpls.filterIsInstance<ListBuilderGetBenchmark>().map { ListBuilderGetBenchmarkGenerator(it) },
             listBuilderImpls.filterIsInstance<ListBuilderIterateBenchmark>().map { ListBuilderIterateBenchmarkGenerator(it) },
             listBuilderImpls.filterIsInstance<ListBuilderRemoveBenchmark>().map { ListBuilderRemoveBenchmarkGenerator(it) },
             listBuilderImpls.filterIsInstance<ListBuilderSetBenchmark>().map { ListBuilderSetBenchmarkGenerator(it) }
-    )
+    )*/
 
     val mapBenchmarks = listOf(
             mapImpls.filterIsInstance<MapGetBenchmark>().map { MapGetBenchmarkGenerator(it) },
@@ -226,8 +235,6 @@ fun generateBenchmarks() {
 }
 
 fun generateUtils() {
-    val listBuilderUtils = listBuilderImpls.filterIsInstance<ListBuilderBenchmarkUtils>().map { ListBuilderUtilsGenerator(it) }
-
     val mapUtils = mapImpls.filterIsInstance<MapBenchmarkUtils>().map { MapUtilsGenerator(it) }
     val mapBuilderUtils = mapBuilderImpls.filterIsInstance<MapBuilderBenchmarkUtils>().map { MapBuilderUtilsGenerator(it) }
 
@@ -239,7 +246,7 @@ fun generateUtils() {
             CommonUtilsGenerator()
     )
 
-    val utils = listBuilderUtils + mapUtils + mapBuilderUtils + setUtils + setBuilderUtils + commonUtils
+    val utils = mapUtils + mapBuilderUtils + setUtils + setBuilderUtils + commonUtils
 
     utils.forEach { util ->
         val path = util.getPackage().replace('.', '/') + "/" + util.outputFileName + ".kt"
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableList/impl/clojure.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableList/impl/clojure.kt
@@ -19,10 +19,13 @@ package generators.immutableList.impl
 import generators.immutableList.*
 
 object ClojureListImplementation: ListImplementation {
-    override val packageName: String = "clojure"
+    override val packageName: String
+            = "clojure"
 
-    override fun type(): String = "clojure.lang.PersistentVector"
-    override fun empty(): String = "clojure.lang.PersistentVector.EMPTY"
+    override fun type(): String
+            = "clojure.lang.PersistentVector"
+    override fun empty(): String
+            = "clojure.lang.PersistentVector.EMPTY"
 
     override fun getOperation(list: String, index: String): String
             = "$list.get($index)"
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableList/impl/cyclops.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableList/impl/cyclops.kt
@@ -19,10 +19,13 @@ package generators.immutableList.impl
 import generators.immutableList.*
 
 object CyclopsListImplementation: ListImplementation {
-    override val packageName: String = "cyclops"
+    override val packageName: String
+            = "cyclops"
 
-    override fun type(): String = "cyclops.data.Vector<$listElementType>"
-    override fun empty(): String = "cyclops.data.Vector.empty<$listElementType>()"
+    override fun type(): String
+            = "cyclops.data.Vector<$listElementType>"
+    override fun empty(): String
+            = "cyclops.data.Vector.empty<$listElementType>()"
 
     override fun getOperation(list: String, index: String): String
             = "$list.get($index)"
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableList/impl/kotlin.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableList/impl/kotlin.kt
@@ -19,10 +19,13 @@ package generators.immutableList.impl
 import generators.immutableList.*
 
 object KotlinListImplementation: ListImplementation {
-    override val packageName: String = "kotlin"
+    override val packageName: String
+            = "kotlin"
 
-    override fun type(): String = "kotlinx.collections.immutable.PersistentList<$listElementType>"
-    override fun empty(): String = "kotlinx.collections.immutable.persistentListOf<$listElementType>()"
+    override fun type(): String
+            = "kotlinx.collections.immutable.PersistentList<$listElementType>"
+    override fun empty(): String
+            = "kotlinx.collections.immutable.persistentListOf<$listElementType>()"
 
     override fun getOperation(list: String, index: String): String
             = "$list.get($index)"
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableList/impl/paguro.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableList/impl/paguro.kt
@@ -18,11 +18,14 @@ package generators.immutableList.impl
 
 import generators.immutableList.*
 
-object PaguroRrbTreeListImplementation: ListImplementation {
-    override val packageName: String = "paguroRrbTree"
+object PaguroListImplementation: ListImplementation {
+    override val packageName: String
+            = "paguro"
 
-    override fun type(): String = "org.organicdesign.fp.collections.RrbTree.ImRrbt<$listElementType>"
-    override fun empty(): String = "org.organicdesign.fp.collections.RrbTree.empty<$listElementType>()"
+    override fun type(): String
+            = "org.organicdesign.fp.collections.RrbTree.ImRrbt<$listElementType>"
+    override fun empty(): String
+            = "org.organicdesign.fp.collections.RrbTree.empty<$listElementType>()"
 
     override fun getOperation(list: String, index: String): String
             = "$list.get($index)"
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableList/impl/scala.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableList/impl/scala.kt
@@ -19,10 +19,13 @@ package generators.immutableList.impl
 import generators.immutableList.*
 
 object ScalaListImplementation: ListImplementation {
-    override val packageName: String = "scala"
+    override val packageName: String
+            = "scala"
 
-    override fun type(): String = "scala.collection.immutable.Vector<$listElementType>"
-    override fun empty(): String = "scala.collection.immutable.`Vector\$`.`MODULE\$`.empty<$listElementType>()"
+    override fun type(): String
+            = "scala.collection.immutable.Vector<$listElementType>"
+    override fun empty(): String
+            = "scala.collection.immutable.`Vector\$`.`MODULE\$`.empty<$listElementType>()"
 
     override fun getOperation(list: String, index: String): String
             = "$list.apply($index)"
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableList/impl/vavr.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableList/impl/vavr.kt
@@ -19,10 +19,13 @@ package generators.immutableList.impl
 import generators.immutableList.*
 
 object VavrListImplementation: ListImplementation {
-    override val packageName: String = "vavr"
+    override val packageName: String
+            = "vavr"
 
-    override fun type(): String = "io.vavr.collection.Vector<$listElementType>"
-    override fun empty(): String = "io.vavr.collection.Vector.empty<$listElementType>()"
+    override fun type(): String
+            = "io.vavr.collection.Vector<$listElementType>"
+    override fun empty(): String
+            = "io.vavr.collection.Vector.empty<$listElementType>()"
 
     override fun getOperation(list: String, index: String): String
             = "$list.apply($index)"
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/addGenerator.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/addGenerator.kt
@@ -19,13 +19,7 @@ package generators.immutableListBuilder
 import generators.BenchmarkSourceGenerator
 import java.io.PrintWriter
 
-interface ListBuilderAddBenchmark {
-    val packageName: String
-    fun listBuilderType(T: String): String
-    val getOperation: String
-}
-
-class ListBuilderAddBenchmarkGenerator(private val impl: ListBuilderAddBenchmark) : BenchmarkSourceGenerator() {
+class ListBuilderAddBenchmarkGenerator(private val impl: ListBuilderImplementation) : BenchmarkSourceGenerator() {
     override val outputFileName: String = "Add"
 
     override fun getPackage(): String {
@@ -44,19 +38,20 @@ open class Add {
     var immutablePercentage: Double = 0.0
 
     @Benchmark
-    fun addLast(): ${impl.listBuilderType("String")} {
+    fun addLast(): ${impl.type()} {
         return persistentListBuilderAdd(size, immutablePercentage)
     }
 
     @Benchmark
     fun addLastAndGet(bh: Blackhole) {
         val builder = persistentListBuilderAdd(size, immutablePercentage)
         for (i in 0 until size) {
-            bh.consume(builder.${impl.getOperation}(i))
+            bh.consume(${impl.getOperation("builder", "i")})
         }
     }
         """.trimIndent())
-        if (impl is ListBuilderIterateBenchmark) {
+
+        if (impl.isIterable) {
             out.println("""
     @Benchmark
     fun addLastAndIterate(bh: Blackhole) {
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/getGenerator.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/getGenerator.kt
@@ -19,14 +19,7 @@ package generators.immutableListBuilder
 import generators.BenchmarkSourceGenerator
 import java.io.PrintWriter
 
-interface ListBuilderGetBenchmark {
-    val packageName: String
-    fun emptyOf(T: String): String
-    fun listBuilderType(T: String): String
-    val getOperation: String
-}
-
-class ListBuilderGetBenchmarkGenerator(private val impl: ListBuilderGetBenchmark) : BenchmarkSourceGenerator() {
+class ListBuilderGetBenchmarkGenerator(private val impl: ListBuilderImplementation) : BenchmarkSourceGenerator() {
     override val outputFileName: String = "Get"
 
     override fun getPackage(): String {
@@ -44,7 +37,7 @@ open class Get {
     @Param("0.0", "50.0")
     var immutablePercentage: Double = 0.0
 
-    private var builder: ${impl.listBuilderType("String")} = ${impl.emptyOf("String")}
+    private var builder: ${impl.type()} = ${impl.empty()}
 
     @Setup(Level.Trial)
     fun prepare() {
@@ -54,7 +47,7 @@ open class Get {
     @Benchmark
     fun getByIndex(bh: Blackhole) {
         for (i in 0 until size) {
-            bh.consume(builder.${impl.getOperation}(i))
+            bh.consume(${impl.getOperation("builder", "i")})
         }
     }
 }
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/impl/clojure.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/impl/clojure.kt
@@ -18,28 +18,32 @@ package generators.immutableListBuilder.impl
 
 import generators.immutableListBuilder.*
 
-class ListBuilderClojureBenchmark:
-        ListBuilderAddBenchmark,
-        ListBuilderGetBenchmark,
-        ListBuilderRemoveBenchmark,
-        ListBuilderSetBenchmark,
-        ListBuilderBenchmarkUtils
-{
-    override val packageName: String = "clojure.builder"
-
-    override fun listBuilderType(T: String): String = "clojure.lang.ITransientVector"
-
-    override fun emptyOf(T: String): String = "clojure.lang.PersistentVector.EMPTY.asTransient() as clojure.lang.ITransientVector"
-    override fun immutableOf(T: String): String = "clojure.lang.PersistentVector.EMPTY"
-
-    override val addOperation: String = "conj"
-    override val immutableAddOperation: String = "cons"
-
-    override fun removeAtOperation(builder: String): String = "pop()"
-
-    override val getOperation: String = "valAt"
-
-    override val setOperation: String = "assocN"
-
-    override fun builderOperation(list: String): String = "$list.asTransient() as clojure.lang.ITransientVector"
+object ClojureListBuilderImplementation: ListBuilderImplementation {
+    override val packageName: String
+            = "clojure.builder"
+
+    override fun type(): String
+            = "clojure.lang.ITransientVector"
+    override fun empty(): String
+            = "clojure.lang.PersistentVector.EMPTY.asTransient() as clojure.lang.ITransientVector"
+
+    override fun getOperation(builder: String, index: String): String
+            = "$builder.valAt($index)"
+    override fun setOperation(builder: String, index: String, newValue: String): String
+            = "$builder.assocN($index, $newValue)"
+    override fun addOperation(builder: String, element: String): String
+            = "$builder.conj($element)"
+    override fun removeLastOperation(builder: String): String
+            = "$builder.pop()"
+
+    override val isIterable: Boolean
+            = false
+
+    override fun builderOperation(immutable: String): String
+            = "$immutable.asTransient() as clojure.lang.ITransientVector"
+
+    override fun immutableEmpty(): String
+            = "clojure.lang.PersistentVector.EMPTY"
+    override fun immutableAddOperation(immutable: String, element: String): String
+            = "$immutable.cons($element)"
 }
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/impl/kotlin.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/impl/kotlin.kt
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/impl/paguro.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/impl/paguro.kt
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/iterateGenerator.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/iterateGenerator.kt
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/listBuilderImplementation.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/listBuilderImplementation.kt
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/removeGenerator.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/removeGenerator.kt
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/setGenerator.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/setGenerator.kt
diff --git a/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/utilsGenerator.kt b/benchmarks-libraries/src/main/kotlin/generators/immutableListBuilder/utilsGenerator.kt

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ fun persistentListBuilderAdd(size: Int, immutablePercentage: Double): clojure.la`
`25`	`25`
`26`	`26`	`var list = clojure.lang.PersistentVector.EMPTY`
`27`	`27`	`repeat(times = immutableSize) {`
`28`		`- list = list.cons("some element")`
	`28`	`+ list = list.cons("another element")`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`val builder = list.asTransient() as clojure.lang.ITransientVector`