#79 Implement Optimizer for inefficient Member and Array Access

mirkosertic · Dec 14, 2018 · bf8c3b8 · bf8c3b8
1 parent da3739f
commit bf8c3b8
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 190 deletions.
diff --git a/core/src/main/java/de/mirkosertic/bytecoder/backend/js/JSSSACompilerBackend.java b/core/src/main/java/de/mirkosertic/bytecoder/backend/js/JSSSACompilerBackend.java
@@ -529,9 +529,11 @@ public JSCompileResult generateCodeFor(final CompileOptions aOptions, final Byte
                         theVariablesWriter.print("var ");
                         theVariablesWriter.print(theVariable.getName());
                         theVariablesWriter.print(" = null;");
-                        theVariablesWriter.print(" // type is ");
-                        theVariablesWriter.print(theVariable.resolveType().resolve().name());
-                        theVariablesWriter.print(" # of inits = " + theVariable.incomingDataFlows().size());
+                        if (aOptions.isDebugOutput()) {
+                            theVariablesWriter.print(" // type is ");
+                            theVariablesWriter.print(theVariable.resolveType().resolve().name());
+                            theVariablesWriter.print(" # of inits = " + theVariable.incomingDataFlows().size());
+                        }
                         theVariablesWriter.println();
                     }
                 }

diff --git a/core/src/main/java/de/mirkosertic/bytecoder/backend/js/JSSSAWriter.java b/core/src/main/java/de/mirkosertic/bytecoder/backend/js/JSSSAWriter.java
@@ -950,8 +950,12 @@ public void writeExpressions(final ExpressionList aExpressions) {
                 print(theVariable.getName());
                 print(" = ");
                 print(theValue);
-                print("; // type is ");
-                println(theVariable.resolveType().resolve().name() + " value type is " + theValue.resolveType());
+                if (options.isDebugOutput()) {
+                    print("; // type is ");
+                    println(theVariable.resolveType().resolve().name() + " value type is " + theValue.resolveType());
+                } else {
+                    println(";");
+                }
             } else if (theExpression instanceof PutStaticExpression) {
                 final PutStaticExpression theE = (PutStaticExpression) theExpression;
                 final BytecodeFieldRefConstant theField = theE.getField();

diff --git a/core/src/main/java/de/mirkosertic/bytecoder/optimizer/InefficientArrayWriteOptimizer.java b/core/src/main/java/de/mirkosertic/bytecoder/optimizer/InefficientArrayWriteOptimizer.java
diff --git a/core/src/main/java/de/mirkosertic/bytecoder/optimizer/InefficientFieldWriteOptimizer.java b/core/src/main/java/de/mirkosertic/bytecoder/optimizer/InefficientFieldWriteOptimizer.java
diff --git a/core/src/main/java/de/mirkosertic/bytecoder/optimizer/KnownOptimizer.java b/core/src/main/java/de/mirkosertic/bytecoder/optimizer/KnownOptimizer.java
@@ -39,8 +39,6 @@ public void optimize(final ControlFlowGraph aGraph, final BytecodeLinkerContext
             theOptimizer.add(new InlineFinalNodesOptimizer());
             theOptimizer.add(new InvokeVirtualOptimizer());
             theOptimizer.add(new InlineGotoOptimizer());
-            theOptimizer.add(new InefficientFieldWriteOptimizer());
-            theOptimizer.add(new InefficientArrayWriteOptimizer());
             run(aGraph, aLinkerContext, theOptimizer);
         }
     },

diff --git a/core/src/main/java/de/mirkosertic/bytecoder/optimizer/RedundantVariablesOptimizer.java b/core/src/main/java/de/mirkosertic/bytecoder/optimizer/RedundantVariablesOptimizer.java
@@ -15,22 +15,25 @@
  */
 package de.mirkosertic.bytecoder.optimizer;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 import de.mirkosertic.bytecoder.core.BytecodeLinkerContext;
 import de.mirkosertic.bytecoder.graph.Edge;
+import de.mirkosertic.bytecoder.ssa.ArrayStoreExpression;
 import de.mirkosertic.bytecoder.ssa.ControlFlowGraph;
 import de.mirkosertic.bytecoder.ssa.DataFlowEdgeType;
 import de.mirkosertic.bytecoder.ssa.Expression;
 import de.mirkosertic.bytecoder.ssa.ExpressionList;
 import de.mirkosertic.bytecoder.ssa.InvocationExpression;
+import de.mirkosertic.bytecoder.ssa.PutFieldExpression;
+import de.mirkosertic.bytecoder.ssa.PutStaticExpression;
 import de.mirkosertic.bytecoder.ssa.RecursiveExpressionVisitor;
 import de.mirkosertic.bytecoder.ssa.ReturnValueExpression;
 import de.mirkosertic.bytecoder.ssa.Value;
 import de.mirkosertic.bytecoder.ssa.Variable;
 import de.mirkosertic.bytecoder.ssa.VariableAssignmentExpression;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class RedundantVariablesOptimizer extends RecursiveExpressionVisitor implements Optimizer {
 
     @Override
@@ -42,7 +45,10 @@ public void optimize(final ControlFlowGraph aGraph, final BytecodeLinkerContext
     protected void visit(final ControlFlowGraph aGraph, final ExpressionList aList, final Expression aExpression, final BytecodeLinkerContext aLinkerContext) {
         if ((aExpression instanceof VariableAssignmentExpression) ||
                 (aExpression instanceof InvocationExpression) ||
-                (aExpression instanceof ReturnValueExpression)) {
+                (aExpression instanceof ReturnValueExpression) ||
+                (aExpression instanceof PutFieldExpression) ||
+                (aExpression instanceof PutStaticExpression) ||
+                (aExpression instanceof ArrayStoreExpression)) {
             boolean modified = true;
             while(modified) {
                 modified = false;

diff --git a/core/src/main/java/de/mirkosertic/bytecoder/ssa/ArrayEntryExpression.java b/core/src/main/java/de/mirkosertic/bytecoder/ssa/ArrayEntryExpression.java
@@ -31,6 +31,6 @@ public TypeRef resolveType() {
 
     @Override
     public boolean isTrulyFunctional() {
-        return false;
+        return true;
     }
 }