commit cc5223ea0672dd53318b758772d078435118e196
author Clément Béra <clementbera@google.com> Wed Apr 20 12:14:55 2022 +0000
committer Clément Béra <clementbera@google.com> Wed Apr 20 12:16:16 2022 +0000
tree d5a071e042ebefc97f0499caa9c0610c801cafa3
parent b29a2de8f5945e7de2ea7db8c8ab844863e3c86e

Re-enable loop unrolling

Bug: b/225857834
Change-Id: Icdca3b3b92e37cd8431beecaed70dea548207f9a

src/main/java/com/android/tools/r8/ir/optimize/NaturalIntLoopRemover.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/NaturalIntLoopRemover.java b/src/main/java/com/android/tools/r8/ir/optimize/NaturalIntLoopRemover.java
index 0974cdd..e55a1b0 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/NaturalIntLoopRemover.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/NaturalIntLoopRemover.java
@@ -30,7 +30,7 @@
 public class NaturalIntLoopRemover {
 
   public void run(AppView<?> appView, IRCode code) {
-    if (!appView.testing().enableExperimentalLoopUnrolling) {
+    if (!appView.options().enableLoopUnrolling) {
       return;
     }
     boolean loopRemoved = false;

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 8942e41..2ff4ba6 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -360,6 +360,7 @@
   public boolean enableRedundantFieldLoadElimination = true;
   // TODO(b/138917494): Disable until we have numbers on potential performance penalties.
   public boolean enableRedundantConstNumberOptimization = false;
+  public boolean enableLoopUnrolling = true;
 
   public String synthesizedClassPrefix = "";
 
@@ -1815,7 +1816,6 @@
     public boolean enableEnumUnboxingDebugLogs = false;
     public boolean forceRedundantConstNumberRemoval = false;
     public boolean enableExperimentalDesugaredLibraryKeepRuleGenerator = false;
-    public boolean enableExperimentalLoopUnrolling = false;
     public boolean invertConditionals = false;
     public boolean placeExceptionalBlocksLast = false;
     public boolean dontCreateMarkerInD8 = false;

src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1Iterations.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1Iterations.java b/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1Iterations.java
index 6bbfb60..dc3ca19 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1Iterations.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1Iterations.java
@@ -33,7 +33,6 @@
         .setMinApi(parameters.getApiLevel())
         .addProgramClasses(Main.class)
         .addKeepMainRule(Main.class)
-        .addOptionsModification(options -> options.testing.enableExperimentalLoopUnrolling = true)
         .enableInliningAnnotations()
         .noMinification()
         .compile()

src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1IterationsEscape.java

diff --git a/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1IterationsEscape.java b/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1IterationsEscape.java
index 2f54f61..07efa85 100644
--- a/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1IterationsEscape.java
+++ b/src/test/java/com/android/tools/r8/ir/optimize/loops/LoopWith1IterationsEscape.java
@@ -32,7 +32,6 @@
         .setMinApi(parameters.getApiLevel())
         .addProgramClasses(Main.class)
         .addKeepMainRule(Main.class)
-        .addOptionsModification(options -> options.testing.enableExperimentalLoopUnrolling = true)
         .enableInliningAnnotations()
         .noMinification()
         .compile()