commit c45fc471aa72ecae0cf28832805faccaef45c025
author Christoffer Adamsen <christofferqa@google.com> Mon Sep 09 10:10:20 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Mon Sep 09 12:31:35 2024 +0000
tree 018b90fdf058315295d130482deabaf4003a6858
parent 1f6524e59325205ff4a25e44d16e07d9890e42ed

Fix runtime collection for D8 incremental benchmarks

Change-Id: Ic1737c95de8042a44e6d8fb4d22dcce0838c14c6

src/test/java/com/android/tools/r8/benchmarks/appdumps/AppDumpBenchmarkBuilder.java

diff --git a/src/test/java/com/android/tools/r8/benchmarks/appdumps/AppDumpBenchmarkBuilder.java b/src/test/java/com/android/tools/r8/benchmarks/appdumps/AppDumpBenchmarkBuilder.java
index 8383488..de6dd63 100644
--- a/src/test/java/com/android/tools/r8/benchmarks/appdumps/AppDumpBenchmarkBuilder.java
+++ b/src/test/java/com/android/tools/r8/benchmarks/appdumps/AppDumpBenchmarkBuilder.java
@@ -18,6 +18,7 @@
 import com.android.tools.r8.benchmarks.BenchmarkEnvironment;
 import com.android.tools.r8.benchmarks.BenchmarkMethod;
 import com.android.tools.r8.benchmarks.BenchmarkMetric;
+import com.android.tools.r8.benchmarks.BenchmarkResultsSingle;
 import com.android.tools.r8.benchmarks.BenchmarkSuite;
 import com.android.tools.r8.benchmarks.BenchmarkTarget;
 import com.android.tools.r8.dump.CompilerDump;
@@ -26,6 +27,7 @@
 import com.android.tools.r8.keepanno.annotations.KeepEdge;
 import com.android.tools.r8.keepanno.annotations.KeepItemKind;
 import com.android.tools.r8.keepanno.annotations.KeepTarget;
+import com.google.common.collect.ImmutableSet;
 import java.io.IOException;
 import java.lang.annotation.RetentionPolicy;
 import java.nio.file.Files;
@@ -350,6 +352,9 @@
 
                   // Compile all files to a single DEX file.
                   List<List<Path>> compiledShards = new ArrayList<>();
+                  BenchmarkResultsSingle dexResults =
+                      new BenchmarkResultsSingle(
+                          "tmp", ImmutableSet.of(BenchmarkMetric.RunTimeRaw));
                   for (List<Path> shard : resources.getShards()) {
                     List<Path> compiledShard = new ArrayList<>(shard.size());
                     for (Path programFile : shard) {
@@ -362,12 +367,15 @@
                           .debug()
                           .setIntermediate(true)
                           .setMinApi(dumpProperties.getMinApi())
-                          .benchmarkCompile(results.getSubResults(builder.nameForDexPart()))
+                          .benchmarkCompile(dexResults)
                           .writeToZip(compiledShard::add);
                     }
                     compiledShards.add(compiledShard);
                   }
-                  results.getSubResults(builder.nameForDexPart()).doAverage();
+                  dexResults.doAverage();
+                  results
+                      .getSubResults(builder.nameForDexPart())
+                      .addRuntimeResult(dexResults.getRuntimeResults().getLong(0));
 
                   // Merge each compiled shard.
                   for (List<Path> compiledShard : compiledShards) {