Modify the mapping of warmup data to androidx.benchmark

Author: kx412764776

plugin/main/src/kotlinx/benchmark/gradle/AndroidMultiplatformTasks.kt

@@ -104,6 +104,9 @@ private fun Project.createAndroidBenchmarkGenerateSourceTask(target: AndroidBenc
                 val targetDir = generatedAndroidProjectDir(target, compilation)
                     .resolve("microbenchmark/src/androidTest/kotlin")
 
+                if (targetDir.exists()) {
+                    targetDir.deleteRecursively()
+                }
                 targetDir.mkdirs()
 
                 generateBenchmarkSourceFiles(targetDir, classDescriptors)
@@ -193,6 +196,7 @@ private fun captureLogcatOutput() {
                                     .replace(Regex("\\[\\d+: "), "[")
                     )
 
+                line.contains("Warmup") -> println(line.substring(line.indexOf("Warmup")))
                 line.contains("Iteration") -> println(line.substring(line.indexOf("Iteration")))
                 line.contains("run finished") -> println(line.substring(line.indexOf("run finished")))
                 line.contains("finished") -> println()

plugin/main/src/kotlinx/benchmark/gradle/AndroidSourceGenerator.kt

@@ -239,15 +239,19 @@ private fun generateCommonMeasurableMethod(
 
     methodSpecBuilder
         .addStatement(
-            "val state = %T(warmupCount = $warmupIterations, repeatCount = $measurementIterations)",
+            "val state = %T(repeatCount = ${warmupIterations + measurementIterations})",
             ClassName("androidx.benchmark", "BenchmarkState")
         )
         .beginControlFlow("while (state.keepRunning())")
         .addStatement("$propertyName.${method.name}()")
         .endControlFlow()
         .addStatement("val measurementResult = state.getMeasurementTimeNs()")
         .beginControlFlow("measurementResult.forEachIndexed { index, time ->")
-        .addStatement("Log.d(\"KotlinBenchmark\", \"Iteration \${index + 1}: \$time ns\")")
+        .beginControlFlow("if (index < $warmupIterations)")
+        .addStatement("Log.d(\"KotlinBenchmark\", \"Warmup \${index + 1}: \$time ns\")")
+        .nextControlFlow("else")
+        .addStatement("Log.d(\"KotlinBenchmark\", \"Iteration \${index - $warmupIterations + 1}: \$time ns\")")
+        .endControlFlow()
         .endControlFlow()
 
     typeSpecBuilder.addFunction(methodSpecBuilder.build())

plugin/main/src/kotlinx/benchmark/gradle/BenchmarksPlugin.kt

@@ -123,8 +123,9 @@ constructor(
                     println("processConfigurations: AndroidBenchmarkTarget")
                     config.target.compilations.all { compilation ->
                         // This block is called for each compilation when they are materialized
-                        println("handling compilation: $compilation")
-                        processAndroidCompilation(config, compilation)
+                        if (compilation.compilationName == "release") {
+                            processAndroidCompilation(config, compilation)
+                        }
                     }
                 }
             }