Only setup mock data once for baseline profiles and benchmarks.

whisperfish · Mar 20, 2023 · ed2d6ea · ed2d6ea
1 parent e1e117c
commit ed2d6ea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/benchmark/src/main/java/org/thoughtcrime/benchmark/BaselineProfileGenerator.kt b/benchmark/src/main/java/org/thoughtcrime/benchmark/BaselineProfileGenerator.kt
@@ -26,10 +26,12 @@ class BaselineProfileGenerator {
   fun startup() = baselineProfileRule.collectBaselineProfile(
     packageName = "org.thoughtcrime.securesms",
     profileBlock = {
-      val setupIntent = Intent().apply {
-        component = ComponentName("org.thoughtcrime.securesms", "org.signal.benchmark.BenchmarkSetupActivity")
+      if (iteration == 0) {
+        val setupIntent = Intent().apply {
+          component = ComponentName("org.thoughtcrime.securesms", "org.signal.benchmark.BenchmarkSetupActivity")
+        }
+        startActivityAndWait(setupIntent)
       }
-      startActivityAndWait(setupIntent)
       startActivityAndWait()
       device.findObject(By.textContains("Buddy")).click();
       device.wait(

diff --git a/benchmark/src/main/java/org/thoughtcrime/benchmark/StartupBenchmarks.kt b/benchmark/src/main/java/org/thoughtcrime/benchmark/StartupBenchmarks.kt
@@ -52,7 +52,11 @@ class StartupBenchmarks {
       iterations = iterations,
       startupMode = StartupMode.COLD,
       compilationMode = compilationMode,
-      setupBlock = fakeDataSetupBlock
+      setupBlock = {
+        if (compilationMode !is CompilationMode.Partial || iteration == 0) {
+          fakeDataSetupBlock()
+        }
+      }
     ) {
       pressHome()
       startActivityAndWait()