Merge pull request #8 from k163377/fixes_and_add_benchmarks

k163377 · web-flow · commit 7a1ae61367ab · 2020-12-06T14:26:28.000+09:00
Fixes and add Benchmarks.
diff --git a/src/jmh/kotlin/com/mapk/fastkfunction/fastkfunction/BenchmarkTargets.kt b/src/jmh/kotlin/com/mapk/fastkfunction/fastkfunction/BenchmarkTargets.kt
@@ -1,4 +1,4 @@
-package com.mapk.fastkfunction.benchmarktargets
+package com.mapk.fastkfunction.fastkfunction
 
 data class Constructor5(
     val arg1: Int,
diff --git a/src/jmh/kotlin/com/mapk/fastkfunction/fastkfunction/CallConstructorBenchmark.kt b/src/jmh/kotlin/com/mapk/fastkfunction/fastkfunction/CallConstructorBenchmark.kt
@@ -1,7 +1,7 @@
-package com.mapk.fastkfunction
+package com.mapk.fastkfunction.fastkfunction
 
+import com.mapk.fastkfunction.FastKFunction
 import com.mapk.fastkfunction.argumentbucket.ArgumentBucket
-import com.mapk.fastkfunction.benchmarktargets.Constructor5
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.State
@@ -17,6 +17,7 @@ open class CallConstructorBenchmark {
 
     private val javaConstructor: Constructor<Constructor5> = function.javaConstructor!!
     private val fastKFunction: FastKFunction<Constructor5> = FastKFunction.of(function, null)
+    private val collection: Collection<Int> = listOf(1, 2, 3, 4, 5)
     private val argumentBucket: ArgumentBucket = fastKFunction.generateBucket()
         .apply { (0 until 5).forEach { this[it] = it + 1 } }
 
@@ -35,6 +36,9 @@ open class CallConstructorBenchmark {
     @Benchmark
     fun fastKFunctionCall(): Constructor5 = fastKFunction.call(1, 2, 3, 4, 5)
 
+    @Benchmark
+    fun fastKFunctionCallByCollection(): Constructor5 = fastKFunction.callByCollection(collection)
+
     @Benchmark
     fun fastKFunctionCallBy(): Constructor5 = fastKFunction.callBy(argumentBucket)
 }
diff --git a/src/jmh/kotlin/com/mapk/fastkfunction/fastkfunction/CallInstanceMethodBenchmark.kt b/src/jmh/kotlin/com/mapk/fastkfunction/fastkfunction/CallInstanceMethodBenchmark.kt
@@ -1,7 +1,7 @@
-package com.mapk.fastkfunction
+package com.mapk.fastkfunction.fastkfunction
 
+import com.mapk.fastkfunction.FastKFunction
 import com.mapk.fastkfunction.argumentbucket.ArgumentBucket
-import com.mapk.fastkfunction.benchmarktargets.Constructor5
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.State
@@ -19,6 +19,7 @@ open class CallInstanceMethodBenchmark {
     private val javaMethod: Method = function.javaMethod!!
     private val fastKFunctionWithoutInstance: FastKFunction<Constructor5> = FastKFunction.of(function, null)
     private val fastKFunctionWithInstance: FastKFunction<Constructor5> = FastKFunction.of(function, instance)
+    private val collection: Collection<Int> = listOf(1, 2, 3, 4, 5)
     private val argumentBucket: ArgumentBucket = fastKFunctionWithoutInstance.generateBucket()
         .apply { (0 until 5).forEach { this[it] = it + 1 } }
 
@@ -37,12 +38,19 @@ open class CallInstanceMethodBenchmark {
     @Benchmark
     fun fastKFunctionWithoutInstanceCall(): Constructor5 = fastKFunctionWithoutInstance.call(1, 2, 3, 4, 5)
 
+    @Benchmark
+    fun fastKFunctionWithoutInstanceCallByCollection(): Constructor5 = fastKFunctionWithoutInstance.call(collection)
+
     @Benchmark
     fun fastKFunctionWithoutInstanceCallBy(): Constructor5 = fastKFunctionWithoutInstance.callBy(argumentBucket)
 
     @Benchmark
     fun fastKFunctionWithInstanceCall(): Constructor5 = fastKFunctionWithInstance.call(1, 2, 3, 4, 5)
 
+    @Benchmark
+    fun fastKFunctionWithInstanceCallByCollection(): Constructor5 =
+        fastKFunctionWithInstance.callByCollection(collection)
+
     @Benchmark
     fun fastKFunctionWithInstanceCallBy(): Constructor5 = fastKFunctionWithInstance.callBy(argumentBucket)
 }
diff --git a/src/jmh/kotlin/com/mapk/fastkfunction/fastkfunction/CallObjectMethodBenchmark.kt b/src/jmh/kotlin/com/mapk/fastkfunction/fastkfunction/CallObjectMethodBenchmark.kt
@@ -1,7 +1,7 @@
-package com.mapk.fastkfunction
+package com.mapk.fastkfunction.fastkfunction
 
+import com.mapk.fastkfunction.FastKFunction
 import com.mapk.fastkfunction.argumentbucket.ArgumentBucket
-import com.mapk.fastkfunction.benchmarktargets.Constructor5
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.State
@@ -36,6 +36,7 @@ open class CallObjectMethodBenchmark {
     private val fastKFunctionByReflectionWithInstance: FastKFunction<Constructor5> =
         FastKFunction.of(functionByReflection, objectInstance)
 
+    private val collection: Collection<Int> = listOf(1, 2, 3, 4, 5)
     private val argumentBucket: ArgumentBucket = fastKFunctionByMethodReferenceWithoutInstance.generateBucket()
         .apply { (0 until 5).forEach { this[it] = it + 1 } }
 
@@ -61,6 +62,10 @@ open class CallObjectMethodBenchmark {
     fun fastKFunctionByMethodReferenceWithoutInstanceCall(): Constructor5 =
         fastKFunctionByMethodReferenceWithoutInstance.call(1, 2, 3, 4, 5)
 
+    @Benchmark
+    fun fastKFunctionByMethodReferenceWithoutInstanceCallByCollection(): Constructor5 =
+        fastKFunctionByMethodReferenceWithoutInstance.callByCollection(collection)
+
     @Benchmark
     fun fastKFunctionByMethodReferenceWithoutInstanceCallBy(): Constructor5 =
         fastKFunctionByMethodReferenceWithoutInstance.callBy(argumentBucket)
@@ -69,6 +74,10 @@ open class CallObjectMethodBenchmark {
     fun fastKFunctionByMethodReferenceWithInstanceCall(): Constructor5 =
         fastKFunctionByMethodReferenceWithInstance.call(1, 2, 3, 4, 5)
 
+    @Benchmark
+    fun fastKFunctionByMethodReferenceWithInstanceCallByCollection(): Constructor5 =
+        fastKFunctionByMethodReferenceWithInstance.callByCollection(collection)
+
     @Benchmark
     fun fastKFunctionByMethodReferenceWithInstanceCallBy(): Constructor5 =
         fastKFunctionByMethodReferenceWithInstance.callBy(argumentBucket)
@@ -77,6 +86,10 @@ open class CallObjectMethodBenchmark {
     fun fastKFunctionByReflectionWithoutInstanceCall(): Constructor5 =
         fastKFunctionByReflectionWithoutInstance.call(1, 2, 3, 4, 5)
 
+    @Benchmark
+    fun fastKFunctionByReflectionWithoutInstanceCallByCollection(): Constructor5 =
+        fastKFunctionByReflectionWithoutInstance.callByCollection(collection)
+
     @Benchmark
     fun fastKFunctionByReflectionWithoutInstanceCallBy(): Constructor5 =
         fastKFunctionByReflectionWithoutInstance.callBy(argumentBucket)
@@ -85,6 +98,10 @@ open class CallObjectMethodBenchmark {
     fun fastKFunctionByReflectionWithInstanceCall(): Constructor5 =
         fastKFunctionByReflectionWithInstance.call(1, 2, 3, 4, 5)
 
+    @Benchmark
+    fun fastKFunctionByReflectionWithInstanceCallByCollection(): Constructor5 =
+        fastKFunctionByReflectionWithInstance.callByCollection(collection)
+
     @Benchmark
     fun fastKFunctionByReflectionWithInstanceCallBy(): Constructor5 =
         fastKFunctionByReflectionWithInstance.callBy(argumentBucket)
diff --git a/src/jmh/kotlin/com/mapk/fastkfunction/fastkfunction/CallTopLevelExtensionFunBenchmark.kt b/src/jmh/kotlin/com/mapk/fastkfunction/fastkfunction/CallTopLevelExtensionFunBenchmark.kt
@@ -1,8 +1,7 @@
-package com.mapk.fastkfunction
+package com.mapk.fastkfunction.fastkfunction
 
+import com.mapk.fastkfunction.FastKFunction
 import com.mapk.fastkfunction.argumentbucket.ArgumentBucket
-import com.mapk.fastkfunction.benchmarktargets.Constructor5
-import com.mapk.fastkfunction.benchmarktargets.topLevelExtensionFun5
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.State
@@ -30,6 +29,7 @@ open class CallTopLevelExtensionFunBenchmark {
     private val fastKFunctionFromClass: FastKFunction<Constructor5> =
         FastKFunction.of(functionFromClass, receiverInstance)
 
+    private val collection: Collection<Int> = listOf(1, 2, 3, 4, 5)
     private val argumentBucket: ArgumentBucket = fastKFunctionByMethodReferenceWithoutInstance.generateBucket()
         .apply { (0 until 5).forEach { this[it] = it + 1 } }
 
@@ -55,6 +55,10 @@ open class CallTopLevelExtensionFunBenchmark {
     fun fastKFunctionByMethodReferenceWithoutInstanceCall(): Constructor5 =
         fastKFunctionByMethodReferenceWithoutInstance.call(1, 2, 3, 4, 5)
 
+    @Benchmark
+    fun fastKFunctionByMethodReferenceWithoutInstanceCallByCollection(): Constructor5 =
+        fastKFunctionByMethodReferenceWithoutInstance.callByCollection(collection)
+
     @Benchmark
     fun fastKFunctionByMethodReferenceWithoutInstanceCallBy(): Constructor5 =
         fastKFunctionByMethodReferenceWithoutInstance.callBy(argumentBucket)
@@ -63,6 +67,10 @@ open class CallTopLevelExtensionFunBenchmark {
     fun fastKFunctionByMethodReferenceWithInstanceCall(): Constructor5 =
         fastKFunctionByMethodReferenceWithInstance.call(1, 2, 3, 4, 5)
 
+    @Benchmark
+    fun fastKFunctionByMethodReferenceWithInstanceCallByCollection(): Constructor5 =
+        fastKFunctionByMethodReferenceWithInstance.callByCollection(collection)
+
     @Benchmark
     fun fastKFunctionByMethodReferenceWithInstanceCallBy(): Constructor5 =
         fastKFunctionByMethodReferenceWithInstance.callBy(argumentBucket)
@@ -71,6 +79,10 @@ open class CallTopLevelExtensionFunBenchmark {
     fun fastKFunctionFromClassCall(): Constructor5 =
         fastKFunctionFromClass.call(1, 2, 3, 4, 5)
 
+    @Benchmark
+    fun fastKFunctionFromClassCallByCollection(): Constructor5 =
+        fastKFunctionFromClass.callByCollection(collection)
+
     @Benchmark
     fun fastKFunctionFromClassCallBy(): Constructor5 =
         fastKFunctionFromClass.callBy(argumentBucket)
diff --git a/src/jmh/kotlin/com/mapk/fastkfunction/fastkfunction/CallTopLevelFunBenchmark.kt b/src/jmh/kotlin/com/mapk/fastkfunction/fastkfunction/CallTopLevelFunBenchmark.kt
@@ -1,8 +1,7 @@
-package com.mapk.fastkfunction
+package com.mapk.fastkfunction.fastkfunction
 
+import com.mapk.fastkfunction.FastKFunction
 import com.mapk.fastkfunction.argumentbucket.ArgumentBucket
-import com.mapk.fastkfunction.benchmarktargets.Constructor5
-import com.mapk.fastkfunction.benchmarktargets.topLevelFun5
 import org.openjdk.jmh.annotations.Benchmark
 import org.openjdk.jmh.annotations.Scope
 import org.openjdk.jmh.annotations.State
@@ -18,6 +17,7 @@ open class CallTopLevelFunBenchmark {
 
     private val javaMethod: Method = function.javaMethod!!
     private val fastKFunction: FastKFunction<Constructor5> = FastKFunction.of(function, null)
+    private val collection: Collection<Int> = listOf(1, 2, 3, 4, 5)
     private val argumentBucket: ArgumentBucket = fastKFunction.generateBucket()
         .apply { (0 until 5).forEach { this[it] = it + 1 } }
 
@@ -36,6 +36,9 @@ open class CallTopLevelFunBenchmark {
     @Benchmark
     fun fastKFunctionCall(): Constructor5 = fastKFunction.call(1, 2, 3, 4, 5)
 
+    @Benchmark
+    fun fastKFunctionCallByCollection(): Constructor5 = fastKFunction.callByCollection(collection)
+
     @Benchmark
     fun fastKFunctionCallBy(): Constructor5 = fastKFunction.callBy(argumentBucket)
 }
diff --git a/src/main/kotlin/com/mapk/fastkfunction/FastKFunction.kt b/src/main/kotlin/com/mapk/fastkfunction/FastKFunction.kt
@@ -160,10 +160,8 @@ sealed class FastKFunction<T> {
             method.parameters.size != parameters.size ->
                 instance
                     ?.let {
-                        val generator = BucketGenerator(parameters, instance)
-                        val valueParameters = parameters.subList(1, parameters.size)
-
-                        TopLevelExtensionFunction(function, method, instance, generator, valueParameters)
+                        // KFunctionとしては値パラメータを求めていないため、バケツにはインスタンスを設定しない
+                        TopLevelExtensionFunction(function, method, it, BucketGenerator(parameters, null), parameters)
                     } ?: Function(function, parameters)
             // トップレベル関数
             else -> TopLevelFunction(function, method, parameters)
@@ -186,9 +184,8 @@ sealed class FastKFunction<T> {
                 InstanceFunction(function, method, instance, generator, valueParameters)
             } else {
                 instance
-                    ?.let {
-                        InstanceFunction(function, method, instance, BucketGenerator(parameters, null), parameters)
-                    } ?: Function(function, parameters)
+                    ?.let { InstanceFunction(function, method, it, BucketGenerator(parameters, null), parameters) }
+                    ?: Function(function, parameters)
             }
         }
 
diff --git a/src/test/kotlin/com/mapk/fastkfunction/fastkfunction/UseDefaultValueCallTest.kt b/src/test/kotlin/com/mapk/fastkfunction/fastkfunction/UseDefaultValueCallTest.kt
@@ -9,7 +9,6 @@ import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.MethodSource
 import java.util.stream.Stream
 import kotlin.reflect.KFunction
-import kotlin.reflect.KParameter
 import kotlin.reflect.full.companionObject
 import kotlin.reflect.full.companionObjectInstance
 import kotlin.reflect.full.functions
@@ -109,7 +108,7 @@ private class UseDefaultValueCallTest {
     fun test(target: KFunction<Dst>, instance: Any?, default: DefaultValues) {
         val sut = FastKFunction.of(target, instance)
         val bucket = sut.generateBucket().apply {
-            val params = target.parameters.filter { it.kind == KParameter.Kind.VALUE && !it.isOptional }
+            val params = sut.valueParameters
 
             set(params[0], 100)
             set(params[1], "txt")

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.mapk.fastkfunction.benchmarktargets`
	`1`	`+package com.mapk.fastkfunction.fastkfunction`
`2`	`2`
`3`	`3`	`data class Constructor5(`
`4`	`4`	`val arg1: Int,`