# HG changeset patch
# User Josef Eisl <josef.eisl@jku.at>
# Date 1423666407 -3600
# Node ID ab81848b92642becc39ed65107ae7d25cfe832f1
# Parent  ae17c7a2f7b187b8f610e78152f4c4491b155baa
Replace remaining occurrences of LowLevel with LIR (where appropriate).

diff -r ae17c7a2f7b1 -r ab81848b9264 graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java	Wed Feb 11 15:43:23 2015 +0100
+++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java	Wed Feb 11 15:53:27 2015 +0100
@@ -145,7 +145,7 @@
                     throw Debug.handle(e);
                 }
 
-                try (Scope s = Debug.scope("LowLevelTier", this)) {
+                try (Scope s = Debug.scope("LIRTier", this)) {
                     LIRSuites lirSuites = backend.getSuites().getDefaultLIRSuites();
                     return GraalCompiler.emitLowLevel(target, codeEmittingOrder, linearScanOrder, lirGenRes, gen, lirSuites);
                 } catch (Throwable e) {
diff -r ae17c7a2f7b1 -r ab81848b9264 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java	Wed Feb 11 15:43:23 2015 +0100
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java	Wed Feb 11 15:53:27 2015 +0100
@@ -342,7 +342,7 @@
                 throw Debug.handle(e);
             }
 
-            try (Scope s = Debug.scope("LowLevelTier", nodeLirGen)) {
+            try (Scope s = Debug.scope("LIRTier", nodeLirGen)) {
                 return emitLowLevel(target, codeEmittingOrder, linearScanOrder, lirGenRes, lirGen, lirSuites);
             } catch (Throwable e) {
                 throw Debug.handle(e);
diff -r ae17c7a2f7b1 -r ab81848b9264 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BasicCompilerConfiguration.java
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BasicCompilerConfiguration.java	Wed Feb 11 15:43:23 2015 +0100
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BasicCompilerConfiguration.java	Wed Feb 11 15:53:27 2015 +0100
@@ -45,15 +45,15 @@
         return new LowTier();
     }
 
-    public LIRPhaseSuite<LIRHighTierContext> createLowLevelHighTier() {
+    public LIRPhaseSuite<LIRHighTierContext> createLIRHighTier() {
         return new LIRHighTier();
     }
 
-    public LIRPhaseSuite<LIRMidTierContext> createLowLevelMidTier() {
+    public LIRPhaseSuite<LIRMidTierContext> createLIRMidTier() {
         return new LIRMidTier();
     }
 
-    public LIRPhaseSuite<LIRLowTierContext> createLowLevelLowTier() {
+    public LIRPhaseSuite<LIRLowTierContext> createLIRLowTier() {
         return new LIRLowTier();
     }
 
diff -r ae17c7a2f7b1 -r ab81848b9264 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java	Wed Feb 11 15:43:23 2015 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java	Wed Feb 11 15:53:27 2015 +0100
@@ -52,7 +52,7 @@
     public static class Options {
         // @formatter:off
         @Option(help = "Enable constant load optimization.", type = OptionType.Debug)
-        public static final OptionValue<Boolean> LowLevelOptConstantLoadOptimization = new OptionValue<>(true);
+        public static final OptionValue<Boolean> LIROptConstantLoadOptimization = new OptionValue<>(true);
         // @formatter:on
     }
 
diff -r ae17c7a2f7b1 -r ab81848b9264 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRHighTier.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRHighTier.java	Wed Feb 11 15:43:23 2015 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRHighTier.java	Wed Feb 11 15:53:27 2015 +0100
@@ -27,7 +27,7 @@
 
 public class LIRHighTier extends LIRPhaseSuite<LIRHighTierContext> {
     public LIRHighTier() {
-        if (ConstantLoadOptimization.Options.LowLevelOptConstantLoadOptimization.getValue()) {
+        if (ConstantLoadOptimization.Options.LIROptConstantLoadOptimization.getValue()) {
             appendPhase(new ConstantLoadOptimization());
         }
     }
diff -r ae17c7a2f7b1 -r ab81848b9264 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRLowTier.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRLowTier.java	Wed Feb 11 15:43:23 2015 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRLowTier.java	Wed Feb 11 15:53:27 2015 +0100
@@ -30,27 +30,27 @@
     public static class Options {
         // @formatter:off
         @Option(help = "", type = OptionType.Debug)
-        public static final OptionValue<Boolean> LowLevelOptEdgeMoveOptimizer = new OptionValue<>(true);
+        public static final OptionValue<Boolean> LIROptEdgeMoveOptimizer = new OptionValue<>(true);
         @Option(help = "", type = OptionType.Debug)
-        public static final OptionValue<Boolean> LowLevelOptControlFlowOptmizer = new OptionValue<>(true);
+        public static final OptionValue<Boolean> LIROptControlFlowOptmizer = new OptionValue<>(true);
         @Option(help = "", type = OptionType.Debug)
-        public static final OptionValue<Boolean> LowLevelOptRedundantMoveElimination = new OptionValue<>(true);
+        public static final OptionValue<Boolean> LIROptRedundantMoveElimination = new OptionValue<>(true);
         @Option(help = "", type = OptionType.Debug)
-        public static final OptionValue<Boolean> LowLevelOptNullCheckOptimizer = new OptionValue<>(true);
+        public static final OptionValue<Boolean> LIROptNullCheckOptimizer = new OptionValue<>(true);
         // @formatter:on
     }
 
     public LIRLowTier() {
-        if (Options.LowLevelOptEdgeMoveOptimizer.getValue()) {
+        if (Options.LIROptEdgeMoveOptimizer.getValue()) {
             appendPhase(new EdgeMoveOptimizer());
         }
-        if (Options.LowLevelOptControlFlowOptmizer.getValue()) {
+        if (Options.LIROptControlFlowOptmizer.getValue()) {
             appendPhase(new ControlFlowOptimizer());
         }
-        if (Options.LowLevelOptRedundantMoveElimination.getValue()) {
+        if (Options.LIROptRedundantMoveElimination.getValue()) {
             appendPhase(new RedundantMoveElimination());
         }
-        if (Options.LowLevelOptNullCheckOptimizer.getValue()) {
+        if (Options.LIROptNullCheckOptimizer.getValue()) {
             appendPhase(new NullCheckOptimizer());
         }
     }
diff -r ae17c7a2f7b1 -r ab81848b9264 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRMidTier.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRMidTier.java	Wed Feb 11 15:43:23 2015 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRMidTier.java	Wed Feb 11 15:53:27 2015 +0100
@@ -31,7 +31,7 @@
         appendPhase(new LinearScanPhase());
 
         // build frame map
-        if (LSStackSlotAllocator.Options.LowLevelOptLSStackSlotAllocator.getValue()) {
+        if (LSStackSlotAllocator.Options.LIROptLSStackSlotAllocator.getValue()) {
             appendPhase(new LSStackSlotAllocator());
         } else {
             appendPhase(new SimpleStackSlotAllocator());
diff -r ae17c7a2f7b1 -r ab81848b9264 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhase.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhase.java	Wed Feb 11 15:43:23 2015 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhase.java	Wed Feb 11 15:53:27 2015 +0100
@@ -62,15 +62,15 @@
     }
 
     public LIRPhase() {
-        timer = Debug.timer("LowLevelPhaseTime_%s", getClass());
-        memUseTracker = Debug.memUseTracker("LowLevelPhaseMemUse_%s", getClass());
+        timer = Debug.timer("LIRPhaseTime_%s", getClass());
+        memUseTracker = Debug.memUseTracker("LIRPhaseMemUse_%s", getClass());
     }
 
     protected LIRPhase(String name) {
         assert checkName(name);
         this.name = name;
-        timer = Debug.timer("LowLevelPhaseTime_%s", getClass());
-        memUseTracker = Debug.memUseTracker("LowLevelPhaseMemUse_%s", getClass());
+        timer = Debug.timer("LIRPhaseTime_%s", getClass());
+        memUseTracker = Debug.memUseTracker("LIRPhaseMemUse_%s", getClass());
     }
 
     public final <B extends AbstractBlock<B>> void apply(TargetDescription target, LIRGenerationResult lirGenRes, List<B> codeEmittingOrder, List<B> linearScanOrder, C context) {
diff -r ae17c7a2f7b1 -r ab81848b9264 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/LSStackSlotAllocator.java
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/LSStackSlotAllocator.java	Wed Feb 11 15:43:23 2015 +0100
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/LSStackSlotAllocator.java	Wed Feb 11 15:53:27 2015 +0100
@@ -56,7 +56,7 @@
     public static class Options {
         // @formatter:off
         @Option(help = "Use linear scan stack slot allocation.", type = OptionType.Debug)
-        public static final OptionValue<Boolean> LowLevelOptLSStackSlotAllocator = new OptionValue<>(true);
+        public static final OptionValue<Boolean> LIROptLSStackSlotAllocator = new OptionValue<>(true);
         // @formatter:on
     }
 
diff -r ae17c7a2f7b1 -r ab81848b9264 graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/CompilerConfiguration.java
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/CompilerConfiguration.java	Wed Feb 11 15:43:23 2015 +0100
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/CompilerConfiguration.java	Wed Feb 11 15:53:27 2015 +0100
@@ -37,9 +37,9 @@
 
     PhaseSuite<LowTierContext> createLowTier();
 
-    LIRPhaseSuite<LIRHighTierContext> createLowLevelHighTier();
+    LIRPhaseSuite<LIRHighTierContext> createLIRHighTier();
 
-    LIRPhaseSuite<LIRMidTierContext> createLowLevelMidTier();
+    LIRPhaseSuite<LIRMidTierContext> createLIRMidTier();
 
-    LIRPhaseSuite<LIRLowTierContext> createLowLevelLowTier();
+    LIRPhaseSuite<LIRLowTierContext> createLIRLowTier();
 }
diff -r ae17c7a2f7b1 -r ab81848b9264 graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/Suites.java
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/Suites.java	Wed Feb 11 15:43:23 2015 +0100
+++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/Suites.java	Wed Feb 11 15:53:27 2015 +0100
@@ -133,7 +133,7 @@
     public static LIRSuites createDefaultLIRSuites() {
         String selected = CompilerConfiguration.getValue();
         if (selected.equals("")) {
-            return new LIRSuites(defaultConfiguration.createLowLevelHighTier(), defaultConfiguration.createLowLevelMidTier(), defaultConfiguration.createLowLevelLowTier());
+            return new LIRSuites(defaultConfiguration.createLIRHighTier(), defaultConfiguration.createLIRMidTier(), defaultConfiguration.createLIRLowTier());
         } else {
             return createLIRSuites(selected);
         }
@@ -144,7 +144,7 @@
         if (config == null) {
             throw new GraalInternalError("unknown compiler configuration: " + name);
         }
-        return new LIRSuites(config.createLowLevelHighTier(), config.createLowLevelMidTier(), config.createLowLevelLowTier());
+        return new LIRSuites(config.createLIRHighTier(), config.createLIRMidTier(), config.createLIRLowTier());
     }
 
 }