Mercurial > hg > graal-compiler
changeset 19273:63c619b0cc83
Rename LowLevelPhaseSuite to LIRPhaseSuite.
author | Josef Eisl <josef.eisl@jku.at> |
---|---|
date | Wed, 11 Feb 2015 15:37:43 +0100 |
parents | 2b0bc8ad8372 |
children | ae17c7a2f7b1 |
files | graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BasicCompilerConfiguration.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRHighTier.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRLowTier.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRMidTier.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhaseSuite.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRSuites.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LowLevelPhaseSuite.java graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/CompilerConfiguration.java |
diffstat | 8 files changed, 94 insertions(+), 94 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BasicCompilerConfiguration.java Wed Feb 11 15:35:41 2015 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/phases/BasicCompilerConfiguration.java Wed Feb 11 15:37:43 2015 +0100 @@ -45,15 +45,15 @@ return new LowTier(); } - public LowLevelPhaseSuite<LowLevelHighTierContext> createLowLevelHighTier() { + public LIRPhaseSuite<LowLevelHighTierContext> createLowLevelHighTier() { return new LIRHighTier(); } - public LowLevelPhaseSuite<LowLevelMidTierContext> createLowLevelMidTier() { + public LIRPhaseSuite<LowLevelMidTierContext> createLowLevelMidTier() { return new LIRMidTier(); } - public LowLevelPhaseSuite<LowLevelLowTierContext> createLowLevelLowTier() { + public LIRPhaseSuite<LowLevelLowTierContext> createLowLevelLowTier() { return new LIRLowTier(); }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRHighTier.java Wed Feb 11 15:35:41 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRHighTier.java Wed Feb 11 15:37:43 2015 +0100 @@ -25,7 +25,7 @@ import com.oracle.graal.lir.constopt.*; import com.oracle.graal.lir.phases.LowLevelHighTierPhase.*; -public class LIRHighTier extends LowLevelPhaseSuite<LowLevelHighTierContext> { +public class LIRHighTier extends LIRPhaseSuite<LowLevelHighTierContext> { public LIRHighTier() { if (ConstantLoadOptimization.Options.LowLevelOptConstantLoadOptimization.getValue()) { appendPhase(new ConstantLoadOptimization());
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRLowTier.java Wed Feb 11 15:35:41 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRLowTier.java Wed Feb 11 15:37:43 2015 +0100 @@ -26,7 +26,7 @@ import com.oracle.graal.lir.phases.LowLevelLowTierPhase.*; import com.oracle.graal.options.*; -public class LIRLowTier extends LowLevelPhaseSuite<LowLevelLowTierContext> { +public class LIRLowTier extends LIRPhaseSuite<LowLevelLowTierContext> { public static class Options { // @formatter:off @Option(help = "", type = OptionType.Debug)
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRMidTier.java Wed Feb 11 15:35:41 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRMidTier.java Wed Feb 11 15:37:43 2015 +0100 @@ -26,7 +26,7 @@ import com.oracle.graal.lir.phases.LowLevelMidTierPhase.*; import com.oracle.graal.lir.stackslotalloc.*; -public class LIRMidTier extends LowLevelPhaseSuite<LowLevelMidTierContext> { +public class LIRMidTier extends LIRPhaseSuite<LowLevelMidTierContext> { public LIRMidTier() { appendPhase(new LinearScanPhase());
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRPhaseSuite.java Wed Feb 11 15:37:43 2015 +0100 @@ -0,0 +1,78 @@ +/* + * 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 LIRPhaseSuite<C> extends LIRPhase<C> { + private final List<LIRPhase<C>> phases; + + public LIRPhaseSuite() { + phases = new ArrayList<>(); + } + + /** + * Add a new phase at the beginning of this suite. + */ + public final void prependPhase(LIRPhase<C> phase) { + phases.add(0, phase); + } + + /** + * Add a new phase at the end of this suite. + */ + public final void appendPhase(LIRPhase<C> phase) { + phases.add(phase); + } + + public final ListIterator<LIRPhase<C>> findPhase(Class<? extends LIRPhase<C>> phaseClass) { + ListIterator<LIRPhase<C>> it = phases.listIterator(); + if (findNextPhase(it, phaseClass)) { + return it; + } else { + return null; + } + } + + public static <C> boolean findNextPhase(ListIterator<LIRPhase<C>> it, Class<? extends LIRPhase<C>> phaseClass) { + while (it.hasNext()) { + LIRPhase<C> phase = it.next(); + if (phaseClass.isInstance(phase)) { + return true; + } + } + return false; + } + + @Override + protected <B extends AbstractBlock<B>> void run(TargetDescription target, LIRGenerationResult lirGenRes, List<B> codeEmittingOrder, List<B> linearScanOrder, C context) { + for (LIRPhase<C> phase : phases) { + phase.apply(target, lirGenRes, codeEmittingOrder, linearScanOrder, context); + } + } + +}
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRSuites.java Wed Feb 11 15:35:41 2015 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRSuites.java Wed Feb 11 15:37:43 2015 +0100 @@ -31,11 +31,11 @@ public class LIRSuites { - private final LowLevelPhaseSuite<LowLevelHighTierContext> highTier; - private final LowLevelPhaseSuite<LowLevelMidTierContext> midTier; - private final LowLevelPhaseSuite<LowLevelLowTierContext> lowTier; + private final LIRPhaseSuite<LowLevelHighTierContext> highTier; + private final LIRPhaseSuite<LowLevelMidTierContext> midTier; + private final LIRPhaseSuite<LowLevelLowTierContext> lowTier; - public LIRSuites(LowLevelPhaseSuite<LowLevelHighTierContext> highTier, LowLevelPhaseSuite<LowLevelMidTierContext> midTier, LowLevelPhaseSuite<LowLevelLowTierContext> lowTier) { + public LIRSuites(LIRPhaseSuite<LowLevelHighTierContext> highTier, LIRPhaseSuite<LowLevelMidTierContext> midTier, LIRPhaseSuite<LowLevelLowTierContext> lowTier) { this.highTier = highTier; this.midTier = midTier; this.lowTier = lowTier; @@ -49,7 +49,7 @@ * {@link LIRGeneratorTool#newVariable variables}, {@link LIRGenerationResult#getFrameMap stack * slots} and {@link LIRGenerationResult#getFrameMapBuilder virtual stack slots}. */ - public LowLevelPhaseSuite<LowLevelHighTierContext> getHighTier() { + public LIRPhaseSuite<LowLevelHighTierContext> getHighTier() { return highTier; } @@ -60,7 +60,7 @@ * After the {@link LIRMidTier} there should be no more {@link Variable}s and * {@link VirtualStackSlot}s. */ - public LowLevelPhaseSuite<LowLevelMidTierContext> getMidTier() { + public LIRPhaseSuite<LowLevelMidTierContext> getMidTier() { return midTier; } @@ -71,7 +71,7 @@ * A {@link LowLevelLowTierPhase} must not introduce new {@link Variable}s, * {@link VirtualStackSlot}s or {@link StackSlot}s. */ - public LowLevelPhaseSuite<LowLevelLowTierContext> getLowTier() { + public LIRPhaseSuite<LowLevelLowTierContext> getLowTier() { return lowTier; }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LowLevelPhaseSuite.java Wed Feb 11 15:35:41 2015 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,78 +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 LowLevelPhaseSuite<C> extends LIRPhase<C> { - private final List<LIRPhase<C>> phases; - - public LowLevelPhaseSuite() { - phases = new ArrayList<>(); - } - - /** - * Add a new phase at the beginning of this suite. - */ - public final void prependPhase(LIRPhase<C> phase) { - phases.add(0, phase); - } - - /** - * Add a new phase at the end of this suite. - */ - public final void appendPhase(LIRPhase<C> phase) { - phases.add(phase); - } - - public final ListIterator<LIRPhase<C>> findPhase(Class<? extends LIRPhase<C>> phaseClass) { - ListIterator<LIRPhase<C>> it = phases.listIterator(); - if (findNextPhase(it, phaseClass)) { - return it; - } else { - return null; - } - } - - public static <C> boolean findNextPhase(ListIterator<LIRPhase<C>> it, Class<? extends LIRPhase<C>> phaseClass) { - while (it.hasNext()) { - LIRPhase<C> phase = it.next(); - if (phaseClass.isInstance(phase)) { - return true; - } - } - return false; - } - - @Override - protected <B extends AbstractBlock<B>> void run(TargetDescription target, LIRGenerationResult lirGenRes, List<B> codeEmittingOrder, List<B> linearScanOrder, C context) { - for (LIRPhase<C> phase : phases) { - phase.apply(target, lirGenRes, codeEmittingOrder, linearScanOrder, context); - } - } - -}
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/CompilerConfiguration.java Wed Feb 11 15:35:41 2015 +0100 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/CompilerConfiguration.java Wed Feb 11 15:37:43 2015 +0100 @@ -37,9 +37,9 @@ PhaseSuite<LowTierContext> createLowTier(); - LowLevelPhaseSuite<LowLevelHighTierContext> createLowLevelHighTier(); + LIRPhaseSuite<LowLevelHighTierContext> createLowLevelHighTier(); - LowLevelPhaseSuite<LowLevelMidTierContext> createLowLevelMidTier(); + LIRPhaseSuite<LowLevelMidTierContext> createLowLevelMidTier(); - LowLevelPhaseSuite<LowLevelLowTierContext> createLowLevelLowTier(); + LIRPhaseSuite<LowLevelLowTierContext> createLowLevelLowTier(); }