# HG changeset patch # User Josef Eisl # Date 1423665803 -3600 # Node ID ae17c7a2f7b187b8f610e78152f4c4491b155baa # Parent 63c619b0cc83669fe9fa77d4731636250f9dfaf5 Rename LowLevel{High,Mid,Low}TierPhase LIR{High,Mid,Low}TierPhase. diff -r 63c619b0cc83 -r ae17c7a2f7b1 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:37:43 2015 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed Feb 11 15:43:23 2015 +0100 @@ -45,9 +45,9 @@ import com.oracle.graal.lir.framemap.*; import com.oracle.graal.lir.gen.*; import com.oracle.graal.lir.phases.*; -import com.oracle.graal.lir.phases.LowLevelHighTierPhase.LowLevelHighTierContext; -import com.oracle.graal.lir.phases.LowLevelLowTierPhase.LowLevelLowTierContext; -import com.oracle.graal.lir.phases.LowLevelMidTierPhase.LowLevelMidTierContext; +import com.oracle.graal.lir.phases.LIRHighTierPhase.LIRHighTierContext; +import com.oracle.graal.lir.phases.LIRLowTierPhase.LIRLowTierContext; +import com.oracle.graal.lir.phases.LIRMidTierPhase.LIRMidTierContext; import com.oracle.graal.nodes.*; import com.oracle.graal.nodes.cfg.*; import com.oracle.graal.nodes.spi.*; @@ -354,13 +354,13 @@ public static > LIRGenerationResult emitLowLevel(TargetDescription target, List codeEmittingOrder, List linearScanOrder, LIRGenerationResult lirGenRes, LIRGeneratorTool lirGen, LIRSuites lirSuites) { - LowLevelHighTierContext highTierContext = new LowLevelHighTierContext(lirGen); + LIRHighTierContext highTierContext = new LIRHighTierContext(lirGen); lirSuites.getHighTier().apply(target, lirGenRes, codeEmittingOrder, linearScanOrder, highTierContext); - LowLevelMidTierContext midTierContext = new LowLevelMidTierContext(); + LIRMidTierContext midTierContext = new LIRMidTierContext(); lirSuites.getMidTier().apply(target, lirGenRes, codeEmittingOrder, linearScanOrder, midTierContext); - LowLevelLowTierContext lowTierContext = new LowLevelLowTierContext(); + LIRLowTierContext lowTierContext = new LIRLowTierContext(); lirSuites.getLowTier().apply(target, lirGenRes, codeEmittingOrder, linearScanOrder, lowTierContext); return lirGenRes; diff -r 63c619b0cc83 -r ae17c7a2f7b1 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:37:43 2015 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BasicCompilerConfiguration.java Wed Feb 11 15:43:23 2015 +0100 @@ -24,9 +24,9 @@ import com.oracle.graal.api.runtime.*; import com.oracle.graal.lir.phases.*; -import com.oracle.graal.lir.phases.LowLevelHighTierPhase.*; -import com.oracle.graal.lir.phases.LowLevelLowTierPhase.*; -import com.oracle.graal.lir.phases.LowLevelMidTierPhase.*; +import com.oracle.graal.lir.phases.LIRHighTierPhase.*; +import com.oracle.graal.lir.phases.LIRLowTierPhase.*; +import com.oracle.graal.lir.phases.LIRMidTierPhase.*; import com.oracle.graal.phases.*; import com.oracle.graal.phases.tiers.*; @@ -45,15 +45,15 @@ return new LowTier(); } - public LIRPhaseSuite createLowLevelHighTier() { + public LIRPhaseSuite createLowLevelHighTier() { return new LIRHighTier(); } - public LIRPhaseSuite createLowLevelMidTier() { + public LIRPhaseSuite createLowLevelMidTier() { return new LIRMidTier(); } - public LIRPhaseSuite createLowLevelLowTier() { + public LIRPhaseSuite createLowLevelLowTier() { return new LIRLowTier(); } diff -r 63c619b0cc83 -r ae17c7a2f7b1 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ControlFlowOptimizer.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ControlFlowOptimizer.java Wed Feb 11 15:37:43 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/ControlFlowOptimizer.java Wed Feb 11 15:43:23 2015 +0100 @@ -35,7 +35,7 @@ /** * This class performs basic optimizations on the control flow graph after LIR generation. */ -public final class ControlFlowOptimizer extends LowLevelLowTierPhase { +public final class ControlFlowOptimizer extends LIRLowTierPhase { /** * Performs control flow optimizations on the given LIR graph. diff -r 63c619b0cc83 -r ae17c7a2f7b1 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/EdgeMoveOptimizer.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/EdgeMoveOptimizer.java Wed Feb 11 15:37:43 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/EdgeMoveOptimizer.java Wed Feb 11 15:43:23 2015 +0100 @@ -48,7 +48,7 @@ * Because this optimization works best when a block contains only a few moves, it has a huge impact * on the number of blocks that are totally empty. */ -public final class EdgeMoveOptimizer extends LowLevelLowTierPhase { +public final class EdgeMoveOptimizer extends LIRLowTierPhase { @Override protected > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder) { diff -r 63c619b0cc83 -r ae17c7a2f7b1 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/NullCheckOptimizer.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/NullCheckOptimizer.java Wed Feb 11 15:37:43 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/NullCheckOptimizer.java Wed Feb 11 15:43:23 2015 +0100 @@ -31,7 +31,7 @@ import com.oracle.graal.lir.gen.*; import com.oracle.graal.lir.phases.*; -public final class NullCheckOptimizer extends LowLevelLowTierPhase { +public final class NullCheckOptimizer extends LIRLowTierPhase { @Override protected > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder) { diff -r 63c619b0cc83 -r ae17c7a2f7b1 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/RedundantMoveElimination.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/RedundantMoveElimination.java Wed Feb 11 15:37:43 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/RedundantMoveElimination.java Wed Feb 11 15:43:23 2015 +0100 @@ -41,7 +41,7 @@ /** * Removes move instructions, where the destination value is already in place. */ -public final class RedundantMoveElimination extends LowLevelLowTierPhase { +public final class RedundantMoveElimination extends LIRLowTierPhase { @Override protected > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder) { diff -r 63c619b0cc83 -r ae17c7a2f7b1 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanPhase.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanPhase.java Wed Feb 11 15:37:43 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LinearScanPhase.java Wed Feb 11 15:43:23 2015 +0100 @@ -29,7 +29,7 @@ import com.oracle.graal.lir.gen.*; import com.oracle.graal.lir.phases.*; -public final class LinearScanPhase extends LowLevelMidTierPhase { +public final class LinearScanPhase extends LIRMidTierPhase { @Override protected > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder) { diff -r 63c619b0cc83 -r ae17c7a2f7b1 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LocationMarker.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LocationMarker.java Wed Feb 11 15:37:43 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/lsra/LocationMarker.java Wed Feb 11 15:43:23 2015 +0100 @@ -42,7 +42,7 @@ * Mark all live references for a frame state. The frame state use this information to build the OOP * maps. */ -public final class LocationMarker extends LowLevelMidTierPhase { +public final class LocationMarker extends LIRMidTierPhase { public static class Options { // @formatter:off diff -r 63c619b0cc83 -r ae17c7a2f7b1 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:37:43 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/constopt/ConstantLoadOptimization.java Wed Feb 11 15:43:23 2015 +0100 @@ -47,7 +47,7 @@ * a constant, which is potentially scheduled into a block with high probability, with one or more * definitions in blocks with a lower probability. */ -public final class ConstantLoadOptimization extends LowLevelHighTierPhase { +public final class ConstantLoadOptimization extends LIRHighTierPhase { public static class Options { // @formatter:off diff -r 63c619b0cc83 -r ae17c7a2f7b1 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:37:43 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRHighTier.java Wed Feb 11 15:43:23 2015 +0100 @@ -23,9 +23,9 @@ package com.oracle.graal.lir.phases; import com.oracle.graal.lir.constopt.*; -import com.oracle.graal.lir.phases.LowLevelHighTierPhase.*; +import com.oracle.graal.lir.phases.LIRHighTierPhase.*; -public class LIRHighTier extends LIRPhaseSuite { +public class LIRHighTier extends LIRPhaseSuite { public LIRHighTier() { if (ConstantLoadOptimization.Options.LowLevelOptConstantLoadOptimization.getValue()) { appendPhase(new ConstantLoadOptimization()); diff -r 63c619b0cc83 -r ae17c7a2f7b1 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRHighTierPhase.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRHighTierPhase.java Wed Feb 11 15:43:23 2015 +0100 @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.graal.lir.phases; + +import java.util.*; + +import com.oracle.graal.api.code.*; +import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.lir.gen.*; + +public abstract class LIRHighTierPhase extends LIRPhase { + + public static final class LIRHighTierContext { + private final LIRGeneratorTool lirGen; + + public LIRHighTierContext(LIRGeneratorTool lirGen) { + this.lirGen = lirGen; + } + + } + + @Override + protected final > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder, LIRHighTierContext context) { + run(target, lirGenRes, codeEmittingOrder, linearScanOrder, context.lirGen); + } + + protected abstract > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder, LIRGeneratorTool lirGen); + +} diff -r 63c619b0cc83 -r ae17c7a2f7b1 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:37:43 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRLowTier.java Wed Feb 11 15:43:23 2015 +0100 @@ -23,10 +23,10 @@ package com.oracle.graal.lir.phases; import com.oracle.graal.lir.*; -import com.oracle.graal.lir.phases.LowLevelLowTierPhase.*; +import com.oracle.graal.lir.phases.LIRLowTierPhase.*; import com.oracle.graal.options.*; -public class LIRLowTier extends LIRPhaseSuite { +public class LIRLowTier extends LIRPhaseSuite { public static class Options { // @formatter:off @Option(help = "", type = OptionType.Debug) diff -r 63c619b0cc83 -r ae17c7a2f7b1 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRLowTierPhase.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRLowTierPhase.java Wed Feb 11 15:43:23 2015 +0100 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.graal.lir.phases; + +import java.util.*; + +import com.oracle.graal.api.code.*; +import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.lir.gen.*; + +public abstract class LIRLowTierPhase extends LIRPhase { + + public static final class LIRLowTierContext { + } + + @Override + protected final > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder, LIRLowTierContext context) { + run(target, lirGenRes, codeEmittingOrder, linearScanOrder); + } + + protected abstract > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder); + +} diff -r 63c619b0cc83 -r ae17c7a2f7b1 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:37:43 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRMidTier.java Wed Feb 11 15:43:23 2015 +0100 @@ -23,10 +23,10 @@ package com.oracle.graal.lir.phases; import com.oracle.graal.lir.alloc.lsra.*; -import com.oracle.graal.lir.phases.LowLevelMidTierPhase.*; +import com.oracle.graal.lir.phases.LIRMidTierPhase.*; import com.oracle.graal.lir.stackslotalloc.*; -public class LIRMidTier extends LIRPhaseSuite { +public class LIRMidTier extends LIRPhaseSuite { public LIRMidTier() { appendPhase(new LinearScanPhase()); diff -r 63c619b0cc83 -r ae17c7a2f7b1 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRMidTierPhase.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRMidTierPhase.java Wed Feb 11 15:43:23 2015 +0100 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package com.oracle.graal.lir.phases; + +import java.util.*; + +import com.oracle.graal.api.code.*; +import com.oracle.graal.compiler.common.cfg.*; +import com.oracle.graal.lir.gen.*; + +public abstract class LIRMidTierPhase extends LIRPhase { + + public static final class LIRMidTierContext { + } + + @Override + protected final > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder, LIRMidTierContext context) { + run(target, lirGenRes, codeEmittingOrder, linearScanOrder); + } + + protected abstract > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder); + +} diff -r 63c619b0cc83 -r ae17c7a2f7b1 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRSuites.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRSuites.java Wed Feb 11 15:37:43 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRSuites.java Wed Feb 11 15:43:23 2015 +0100 @@ -25,53 +25,53 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.lir.*; import com.oracle.graal.lir.gen.*; -import com.oracle.graal.lir.phases.LowLevelHighTierPhase.LowLevelHighTierContext; -import com.oracle.graal.lir.phases.LowLevelLowTierPhase.LowLevelLowTierContext; -import com.oracle.graal.lir.phases.LowLevelMidTierPhase.LowLevelMidTierContext; +import com.oracle.graal.lir.phases.LIRHighTierPhase.LIRHighTierContext; +import com.oracle.graal.lir.phases.LIRLowTierPhase.LIRLowTierContext; +import com.oracle.graal.lir.phases.LIRMidTierPhase.LIRMidTierContext; public class LIRSuites { - private final LIRPhaseSuite highTier; - private final LIRPhaseSuite midTier; - private final LIRPhaseSuite lowTier; + private final LIRPhaseSuite highTier; + private final LIRPhaseSuite midTier; + private final LIRPhaseSuite lowTier; - public LIRSuites(LIRPhaseSuite highTier, LIRPhaseSuite midTier, LIRPhaseSuite lowTier) { + public LIRSuites(LIRPhaseSuite highTier, LIRPhaseSuite midTier, LIRPhaseSuite lowTier) { this.highTier = highTier; this.midTier = midTier; this.lowTier = lowTier; } /** - * {@link LowLevelHighTierPhase}s are executed between {@link LIR} generation and register + * {@link LIRHighTierPhase}s are executed between {@link LIR} generation and register * allocation. *

- * {@link LowLevelHighTierPhase Implementers} can create new + * {@link LIRHighTierPhase Implementers} can create new * {@link LIRGeneratorTool#newVariable variables}, {@link LIRGenerationResult#getFrameMap stack * slots} and {@link LIRGenerationResult#getFrameMapBuilder virtual stack slots}. */ - public LIRPhaseSuite getHighTier() { + public LIRPhaseSuite getHighTier() { return highTier; } /** - * {@link LowLevelMidTierPhase}s are responsible for register allocation and translating + * {@link LIRMidTierPhase}s are responsible for register allocation and translating * {@link VirtualStackSlot}s into {@link StackSlot}s. *

* After the {@link LIRMidTier} there should be no more {@link Variable}s and * {@link VirtualStackSlot}s. */ - public LIRPhaseSuite getMidTier() { + public LIRPhaseSuite getMidTier() { return midTier; } /** - * {@link LowLevelLowTierPhase}s are executed after register allocation and before machine code + * {@link LIRLowTierPhase}s are executed after register allocation and before machine code * generation. *

- * A {@link LowLevelLowTierPhase} must not introduce new {@link Variable}s, + * A {@link LIRLowTierPhase} must not introduce new {@link Variable}s, * {@link VirtualStackSlot}s or {@link StackSlot}s. */ - public LIRPhaseSuite getLowTier() { + public LIRPhaseSuite getLowTier() { return lowTier; } diff -r 63c619b0cc83 -r ae17c7a2f7b1 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LowLevelHighTierPhase.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LowLevelHighTierPhase.java Wed Feb 11 15:37:43 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.graal.lir.phases; - -import java.util.*; - -import com.oracle.graal.api.code.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.gen.*; - -public abstract class LowLevelHighTierPhase extends LIRPhase { - - public static final class LowLevelHighTierContext { - private final LIRGeneratorTool lirGen; - - public LowLevelHighTierContext(LIRGeneratorTool lirGen) { - this.lirGen = lirGen; - } - - } - - @Override - protected final > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder, LowLevelHighTierContext context) { - run(target, lirGenRes, codeEmittingOrder, linearScanOrder, context.lirGen); - } - - protected abstract > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder, LIRGeneratorTool lirGen); - -} diff -r 63c619b0cc83 -r ae17c7a2f7b1 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LowLevelLowTierPhase.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LowLevelLowTierPhase.java Wed Feb 11 15:37:43 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.graal.lir.phases; - -import java.util.*; - -import com.oracle.graal.api.code.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.gen.*; - -public abstract class LowLevelLowTierPhase extends LIRPhase { - - public static final class LowLevelLowTierContext { - } - - @Override - protected final > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder, LowLevelLowTierContext context) { - run(target, lirGenRes, codeEmittingOrder, linearScanOrder); - } - - protected abstract > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder); - -} diff -r 63c619b0cc83 -r ae17c7a2f7b1 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LowLevelMidTierPhase.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LowLevelMidTierPhase.java Wed Feb 11 15:37:43 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ -package com.oracle.graal.lir.phases; - -import java.util.*; - -import com.oracle.graal.api.code.*; -import com.oracle.graal.compiler.common.cfg.*; -import com.oracle.graal.lir.gen.*; - -public abstract class LowLevelMidTierPhase extends LIRPhase { - - public static final class LowLevelMidTierContext { - } - - @Override - protected final > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder, LowLevelMidTierContext context) { - run(target, lirGenRes, codeEmittingOrder, linearScanOrder); - } - - protected abstract > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder); - -} diff -r 63c619b0cc83 -r ae17c7a2f7b1 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:37:43 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/LSStackSlotAllocator.java Wed Feb 11 15:43:23 2015 +0100 @@ -51,7 +51,7 @@ * {@link OperandFlag#UNINITIALIZED}. Otherwise the stack slot might be reused and its content * destroyed. */ -public final class LSStackSlotAllocator extends LowLevelMidTierPhase implements StackSlotAllocator { +public final class LSStackSlotAllocator extends LIRMidTierPhase implements StackSlotAllocator { public static class Options { // @formatter:off diff -r 63c619b0cc83 -r ae17c7a2f7b1 graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java Wed Feb 11 15:37:43 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java Wed Feb 11 15:43:23 2015 +0100 @@ -36,7 +36,7 @@ import com.oracle.graal.lir.gen.*; import com.oracle.graal.lir.phases.*; -public class SimpleStackSlotAllocator extends LowLevelMidTierPhase implements StackSlotAllocator { +public class SimpleStackSlotAllocator extends LIRMidTierPhase implements StackSlotAllocator { @Override protected > void run(TargetDescription target, LIRGenerationResult lirGenRes, List codeEmittingOrder, List linearScanOrder) { diff -r 63c619b0cc83 -r ae17c7a2f7b1 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:37:43 2015 +0100 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/CompilerConfiguration.java Wed Feb 11 15:43:23 2015 +0100 @@ -24,9 +24,9 @@ import com.oracle.graal.api.runtime.*; import com.oracle.graal.lir.phases.*; -import com.oracle.graal.lir.phases.LowLevelHighTierPhase.*; -import com.oracle.graal.lir.phases.LowLevelLowTierPhase.*; -import com.oracle.graal.lir.phases.LowLevelMidTierPhase.*; +import com.oracle.graal.lir.phases.LIRHighTierPhase.*; +import com.oracle.graal.lir.phases.LIRLowTierPhase.*; +import com.oracle.graal.lir.phases.LIRMidTierPhase.*; import com.oracle.graal.phases.*; public interface CompilerConfiguration extends Service { @@ -37,9 +37,9 @@ PhaseSuite createLowTier(); - LIRPhaseSuite createLowLevelHighTier(); + LIRPhaseSuite createLowLevelHighTier(); - LIRPhaseSuite createLowLevelMidTier(); + LIRPhaseSuite createLowLevelMidTier(); - LIRPhaseSuite createLowLevelLowTier(); + LIRPhaseSuite createLowLevelLowTier(); }