changeset 4643:a47f7a901c7a

use GraphOrder in CanonicalizerPhase (leads to fewer iterations)
author Lukas Stadler <lukas.stadler@jku.at>
date Mon, 20 Feb 2012 14:22:23 +0100
parents 9f781aae2470
children d39cc9734e92
files graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/CanonicalizerPhase.java
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/CanonicalizerPhase.java	Mon Feb 20 14:20:28 2012 +0100
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/CanonicalizerPhase.java	Mon Feb 20 14:22:23 2012 +0100
@@ -24,6 +24,7 @@
 
 import com.oracle.max.cri.ci.*;
 import com.oracle.max.cri.ri.*;
+import com.oracle.max.graal.compiler.util.*;
 import com.oracle.max.graal.debug.*;
 import com.oracle.max.graal.graph.*;
 import com.oracle.max.graal.nodes.*;
@@ -52,9 +53,11 @@
 
     @Override
     protected void run(StructuredGraph graph) {
-        NodeWorkList nodeWorkList = graph.createNodeWorkList(!newNodes, MAX_ITERATION_PER_NODE);
+        NodeWorkList nodeWorkList = graph.createNodeWorkList(false, MAX_ITERATION_PER_NODE);
         if (newNodes) {
             nodeWorkList.addAll(graph.getNewNodes());
+        } else {
+            nodeWorkList.addAll(new GraphOrder(graph));
         }
 
         canonicalize(graph, nodeWorkList, runtime, target, assumptions);