Tweak benchmark

coil-kt · Apr 24, 2024 · 42cf1a5 · 42cf1a5
1 parent 318d7a6
commit 42cf1a5
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 19 deletions.
diff --git a/coil-benchmark/build.gradle.kts b/coil-benchmark/build.gradle.kts
@@ -13,10 +13,8 @@ setupTestModule(name = "coil.benchmark", config = true) {
         minSdk = 23
         buildConfigField("String", "PROJECT", "\"$targetProject\"")
         // TODO temporary, should pass with run configuration
-        testInstrumentationRunnerArguments["androidx.benchmark.fullTracing.enable"] = "true"
-        // TODO just temporary
-        testInstrumentationRunnerArguments["androidx.benchmark.suppressErrors"] = "LOW-BATTERY"
-        testInstrumentationRunnerArguments["androidx.benchmark.profiling.mode"] = "MethodTracing"
+//        testInstrumentationRunnerArguments["androidx.benchmark.fullTracing.enable"] = "true"
+//        testInstrumentationRunnerArguments["androidx.benchmark.profiling.mode"] = "MethodTracing"
     }
     buildTypes {
         create("benchmark") {

diff --git a/coil-benchmark/src/main/java/coil/benchmark/ScrollBenchmark.kt b/coil-benchmark/src/main/java/coil/benchmark/ScrollBenchmark.kt
@@ -10,7 +10,6 @@ import androidx.benchmark.macro.FrameTimingMetric
 import androidx.benchmark.macro.StartupMode
 import androidx.benchmark.macro.StartupTimingMetric
 import androidx.benchmark.macro.TraceMetric
-import androidx.benchmark.macro.TraceSectionMetric
 import androidx.benchmark.macro.junit4.MacrobenchmarkRule
 import androidx.benchmark.perfetto.ExperimentalPerfettoTraceProcessorApi
 import androidx.benchmark.perfetto.PerfettoTraceProcessor
@@ -45,18 +44,17 @@ class ScrollBenchmark {
             metrics = listOf(
                 FrameTimingMetric(),
                 StartupTimingMetric(),
-                TraceSectionMetric(
+                MicroSecondsTraceSectionMetric(
                     "coil.compose.rememberAsyncImagePainter%",
-                    TraceSectionMetric.Mode.Sum,
+                    MicroMode.Sum,
                 ),
-//                AverageTraceSectionMetric("coil.compose.rememberAsyncImagePainter%"),
-                TraceSectionMetric(
+                MicroSecondsTraceSectionMetric(
                     "AsyncImagePainter.onRemembered",
-                    TraceSectionMetric.Mode.Sum,
+                    MicroMode.Sum,
                 ),
-                AverageTraceSectionMetric("AsyncImagePainter.onRemembered"),
+                MicroSecondsTraceSectionMetric("AsyncImagePainter.onRemembered", MicroMode.Average),
             ),
-            iterations = 3,
+            iterations = 10, // 20,
             startupMode = StartupMode.COLD,
             compilationMode = compilationMode,
             measureBlock = {
@@ -71,9 +69,17 @@ class ScrollBenchmark {
     }
 }
 
+// Benchmark to give average/sum in microseconds measurements
+
+enum class MicroMode {
+    Sum,
+    Average
+}
+
 @OptIn(ExperimentalMetricApi::class)
-class AverageTraceSectionMetric(
+class MicroSecondsTraceSectionMetric(
     private val sectionName: String,
+    private val mode: MicroMode,
     private val label: String = sectionName,
     private val targetPackageOnly: Boolean = true,
 ) : TraceMetric() {
@@ -89,11 +95,26 @@ class AverageTraceSectionMetric(
             packageName = if (targetPackageOnly) captureInfo.targetPackageName else null,
         )
 
-        return listOf(
-            Measurement(
-                name = label + "AverageMs",
-                data = slices.sumOf { it.dur } / 1_000_000.0 / slices.size,
-            ),
-        )
+        return when (mode) {
+            MicroMode.Sum -> listOf(
+                Measurement(
+                    name = sectionName + "_µs",
+                    // note, this duration assumes non-reentrant slices
+                    data = slices.sumOf { it.dur } / 1_000.0,
+                ),
+                Measurement(
+                    name = sectionName + "Count",
+                    data = slices.size.toDouble(),
+                ),
+            )
+
+            MicroMode.Average -> listOf(
+                Measurement(
+                    name = label + "Average_µs",
+                    data = slices.sumOf { it.dur } / 1_000.0 / slices.size,
+                ),
+            )
+        }
+
     }
 }