commit 3191d91bd817fded60c594add822c433ac2df396
author Christoffer Adamsen <christofferqa@google.com> Mon Aug 19 10:27:53 2024 +0200
committer Christoffer Adamsen <christofferqa@google.com> Mon Aug 19 08:31:29 2024 +0000
tree 0a03126c09520950bb00100a1da4f99bbe1a1570
parent 418c5456d8d2c2ff40ca7e536d48cf13347e76bf

Handle feature splits in Composable benchmark size

Change-Id: If63e082816cd669c95f9eda265648a1e76ba64f0

src/test/testbase/java/com/android/tools/r8/R8TestCompileResult.java

diff --git a/src/test/testbase/java/com/android/tools/r8/R8TestCompileResult.java b/src/test/testbase/java/com/android/tools/r8/R8TestCompileResult.java
index 7a4f1ba..93182b1 100644
--- a/src/test/testbase/java/com/android/tools/r8/R8TestCompileResult.java
+++ b/src/test/testbase/java/com/android/tools/r8/R8TestCompileResult.java
@@ -13,7 +13,7 @@
 import com.android.tools.r8.androidresources.AndroidResourceTestingUtils.ResourceTableInspector;
 import com.android.tools.r8.benchmarks.BenchmarkResults;
 import com.android.tools.r8.dexsplitter.SplitterTestBase.SplitRunner;
-import com.android.tools.r8.errors.Unimplemented;
+import com.android.tools.r8.graph.DexType;
 import com.android.tools.r8.graph.ProgramMethod;
 import com.android.tools.r8.metadata.R8BuildMetadata;
 import com.android.tools.r8.profile.art.model.ExternalArtProfile;
@@ -22,7 +22,6 @@
 import com.android.tools.r8.shaking.ProguardConfigurationRule;
 import com.android.tools.r8.utils.AndroidApp;
 import com.android.tools.r8.utils.FileUtils;
-import com.android.tools.r8.utils.IntBox;
 import com.android.tools.r8.utils.InternalOptions;
 import com.android.tools.r8.utils.ThrowingBiConsumer;
 import com.android.tools.r8.utils.ThrowingConsumer;
@@ -324,24 +323,27 @@
   @Override
   public R8TestCompileResult benchmarkComposableCodeSize(BenchmarkResults results)
       throws IOException {
-    if (!features.isEmpty()) {
-      throw new Unimplemented();
-    }
     CodeInspector inspector = inspector();
-    ClassSubject annotationClassSubject = inspector.clazz("androidx.compose.runtime.Composable");
-    assertThat(annotationClassSubject, isPresent());
-    IntBox composableCodeSize = new IntBox();
+    assertThat(inspector.clazz("androidx.compose.runtime.Composable"), isPresent());
+    int composableCodeSize = getComposableCodeSize(inspector);
+    for (Path feature : features) {
+      composableCodeSize += getComposableCodeSize(featureInspector(feature));
+    }
+    results.addComposableCodeSizeResult(composableCodeSize);
+    return self();
+  }
+
+  private int getComposableCodeSize(CodeInspector inspector) {
+    DexType composableType =
+        inspector.getFactory().createType("Landroidx/compose/runtime/Composable;");
+    int composableCodeSize = 0;
     for (FoundClassSubject classSubject : inspector.allClasses()) {
       for (ProgramMethod method : classSubject.getDexProgramClass().directProgramMethods()) {
-        if (method
-            .getAnnotations()
-            .hasAnnotation(annotationClassSubject.getDexProgramClass().getType())) {
-          composableCodeSize.increment(
-              method.getDefinition().getCode().asDexCode().codeSizeInBytes());
+        if (method.getAnnotations().hasAnnotation(composableType)) {
+          composableCodeSize += method.getDefinition().getCode().asDexCode().codeSizeInBytes();
         }
       }
     }
-    results.addComposableCodeSizeResult(composableCodeSize.get());
-    return self();
+    return composableCodeSize;
   }
 }