commit de557d19ed1b5930c5ed0f0d97dd1243b6d0c10b
author Christoffer Quist Adamsen <christofferqa@google.com> Wed May 22 14:52:00 2019 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed May 22 15:41:48 2019 +0200
tree 29f2c2f229190e7f45fdd90734b2db7be2a1f52d
parent fd46f467de7abde5816a9c55bf52e99b5dad790f

Introduce heuristic for spurious call graph edges

Bug: 133248798
Change-Id: I9c7b272f9c4fa65008892bb5ee92b27f4b708f48

src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java b/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java
index d4ed94b..ca9dae4 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/CallGraph.java
@@ -48,7 +48,11 @@
     }
 
     public void addCallerConcurrently(Node caller) {
-      if (caller != this) {
+      addCallerConcurrently(caller, false);
+    }
+
+    public void addCallerConcurrently(Node caller, boolean likelySpuriousCallEdge) {
+      if (caller != this && !likelySpuriousCallEdge) {
         synchronized (callers) {
           callers.add(caller);
           numberOfCallSites++;

src/main/java/com/android/tools/r8/ir/conversion/CallGraphBuilder.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/CallGraphBuilder.java b/src/main/java/com/android/tools/r8/ir/conversion/CallGraphBuilder.java
index 4606132..ad94ea4 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/CallGraphBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/CallGraphBuilder.java
@@ -115,8 +115,8 @@
 
     private void addClassInitializerTarget(DexClass clazz) {
       assert clazz != null;
-      if (clazz.hasClassInitializer() && clazz.isProgramClass()) {
-        addTarget(clazz.getClassInitializer());
+      if (clazz.isProgramClass() && clazz.hasClassInitializer()) {
+        addTarget(clazz.getClassInitializer(), false);
       }
     }
 
@@ -128,10 +128,10 @@
       }
     }
 
-    private void addTarget(DexEncodedMethod callee) {
+    private void addTarget(DexEncodedMethod callee, boolean likelySpuriousCallEdge) {
       if (!callee.accessFlags.isAbstract()) {
         assert callee.isProgramMethod(appView);
-        getOrCreateNode(callee).addCallerConcurrently(caller);
+        getOrCreateNode(callee).addCallerConcurrently(caller, likelySpuriousCallEdge);
       }
     }
 
@@ -158,7 +158,7 @@
             if (type == Type.STATIC) {
               addClassInitializerTarget(clazz);
             }
-            addTarget(singleTarget);
+            addTarget(singleTarget, false);
           }
         }
       }
@@ -187,9 +187,11 @@
                       ? appView.appInfo().lookupInterfaceTargets(method)
                       : appView.appInfo().lookupVirtualTargets(method));
       if (possibleTargets != null) {
+        boolean likelySpuriousCallEdge =
+            possibleTargets.size() >= appView.options().callGraphLikelySpuriousCallEdgeThreshold;
         for (DexEncodedMethod possibleTarget : possibleTargets) {
           if (possibleTarget.isProgramMethod(appView)) {
-            addTarget(possibleTarget);
+            addTarget(possibleTarget, likelySpuriousCallEdge);
           }
         }
       }

src/main/java/com/android/tools/r8/utils/InternalOptions.java

diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index ecbda8a..8ff922b 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -158,6 +158,7 @@
   // into stack overflows when the call graph contains large call chains. This should have a
   // negligible impact on code size as long as the threshold is large enough.
   public int callGraphCycleEliminatorMaxDepthThreshold = 256;
+  public int callGraphLikelySpuriousCallEdgeThreshold = 50;
 
   public int classInliningInstructionLimit = 50;
   // This defines the limit of instructions in the inlinee