Use two bounded optimizer sweeps

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/translation/imoptimizer/ImOptimizer.java

@@ -39,8 +39,6 @@ public class ImOptimizer {
         localPasses.add(new GlobalsInliner());
         localPasses.add(new DispatchCheckDeduplicator());
         localPasses.add(new SimpleRewrites());
-        localPasses.add(new LocalMerger());
-        localPasses.add(new DispatchCheckDeduplicator());
     }
 
     private final TimeTaker timeTaker;
@@ -78,6 +76,23 @@ public void localOptimizations() {
 
         removeGarbage();
 
+        int optCount = runLocalOptimizationSweep();
+        if (optCount > 0) {
+            removeGarbage();
+            trans.getImProg().flatten(trans);
+        }
+
+        int cleanupCount = runLocalOptimizationSweep();
+        if (cleanupCount > 0) {
+            removeGarbage();
+            trans.getImProg().flatten(trans);
+        }
+
+        WLogger.info("=== Local optimization passes done! Opts: " + (optCount + cleanupCount) + " ===");
+        totalCount.forEach((k, v) -> WLogger.info("== " + k + ":   " + v));
+    }
+
+    private int runLocalOptimizationSweep() {
         int optCount = 0;
         LocalPlayerContextAnalyzer localPlayerContextAnalyzer = null;
         for (OptimizerPass pass : localPasses) {
@@ -101,14 +116,7 @@ public void localOptimizations() {
             optCount += count;
             totalCount.put(pass.getName(), totalCount.getOrDefault(pass.getName(), 0) + count);
         }
-
-        if (optCount > 0) {
-            removeGarbage();
-            trans.getImProg().flatten(trans);
-        }
-
-        WLogger.info("=== Local optimization pass done! Opts: " + optCount + " ===");
-        totalCount.forEach((k, v) -> WLogger.info("== " + k + ":   " + v));
+        return optCount;
     }
 
     public void doNullsetting() {

de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/OptimizerTests.java

@@ -1598,7 +1598,7 @@ public void repeatedLocalOptimizationStartsANewIteration() {
     }
 
     @Test
-    public void localOptimizationRunsOneSweepPerInvocation() {
+    public void localOptimizationRunsTwoBoundedSweepsPerInvocation() {
         class CountingTimeTaker extends TimeTaker.Default {
             int measurements;
 
@@ -1632,8 +1632,8 @@ public <T> T measure(String name, java.util.function.Supplier<T> f) {
 
         new ImOptimizer(timeTaker, translator).localOptimizations();
 
-        assertEquals(timeTaker.measurements, 10,
-            "the optimizer should run each configured local pass exactly once per invocation");
+        assertEquals(timeTaker.measurements, 16,
+            "the optimizer should run two fixed sweeps rather than iterating to convergence");
     }
 
     @Test