Mercurial > hg > truffle

changeset 9053:1a99a8df6dad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move more phases into HighTier suite.
author Roland Schatz <roland.schatz@oracle.com>
date Fri, 12 Apr 2013 17:55:22 +0200
parents 989db61f2007
children c7f289614722
files graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/Suites.java
diffstat 2 files changed, 23 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java	Fri Apr 12 17:21:08 2013 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java	Fri Apr 12 17:55:22 2013 +0200
@@ -36,7 +36,6 @@
 import com.oracle.graal.debug.*;
 import com.oracle.graal.lir.*;
 import com.oracle.graal.lir.asm.*;
-import com.oracle.graal.loop.phases.*;
 import com.oracle.graal.nodes.*;
 import com.oracle.graal.nodes.cfg.*;
 import com.oracle.graal.nodes.spi.*;
@@ -141,30 +140,8 @@
 
         plan.runPhases(PhasePosition.HIGH_LEVEL, graph);
 
-        if (GraalOptions.FullUnroll) {
-            new LoopFullUnrollPhase().apply(graph, highTierContext);
-            if (GraalOptions.OptCanonicalizer) {
-                new CanonicalizerPhase.Instance(runtime, assumptions).apply(graph);
-            }
-        }
-
-        if (GraalOptions.OptTailDuplication) {
-            new TailDuplicationPhase().apply(graph);
-            if (GraalOptions.OptCanonicalizer) {
-                new CanonicalizerPhase.Instance(runtime, assumptions).apply(graph);
-            }
-        }
-
-        if (GraalOptions.PartialEscapeAnalysis) {
-            new PartialEscapeAnalysisPhase(true, GraalOptions.OptEarlyReadElimination).apply(graph, highTierContext);
-        }
-
         Suites.HIGH_TIER.apply(graph, highTierContext);
 
-        if (GraalOptions.OptCanonicalizer) {
-            new CanonicalizerPhase.Instance(runtime, assumptions).apply(graph);
-        }
-
         new LoweringPhase(target, runtime, replacements, assumptions).apply(graph);
 
         if (GraalOptions.OptPushThroughPi) {
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/Suites.java	Fri Apr 12 17:21:08 2013 +0200
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/Suites.java	Fri Apr 12 17:55:22 2013 +0200
@@ -28,6 +28,7 @@
 import com.oracle.graal.phases.*;
 import com.oracle.graal.phases.common.*;
 import com.oracle.graal.phases.tiers.*;
+import com.oracle.graal.virtual.phases.ea.*;
 
 public class Suites {
 
@@ -36,6 +37,24 @@
     private static PhaseSuite<HighTierContext> createHighTier() {
         ArrayList<BasePhase<? super HighTierContext>> phases = new ArrayList<>();
 
+        if (GraalOptions.FullUnroll) {
+            phases.add(new LoopFullUnrollPhase());
+            if (GraalOptions.OptCanonicalizer) {
+                phases.add(new CanonicalizerPhase());
+            }
+        }
+
+        if (GraalOptions.OptTailDuplication) {
+            phases.add(new TailDuplicationPhase());
+            if (GraalOptions.OptCanonicalizer) {
+                phases.add(new CanonicalizerPhase());
+            }
+        }
+
+        if (GraalOptions.PartialEscapeAnalysis) {
+            phases.add(new PartialEscapeAnalysisPhase(true, GraalOptions.OptEarlyReadElimination));
+        }
+
         if (GraalOptions.OptConvertDeoptsToGuards) {
             phases.add(new ConvertDeoptimizeToGuardPhase());
         }
@@ -52,6 +71,10 @@
             phases.add(new CullFrameStatesPhase());
         }
 
+        if (GraalOptions.OptCanonicalizer) {
+            phases.add(new CanonicalizerPhase());
+        }
+
         return new PhaseSuite<>("HighTier", phases);
     }
 }