Mercurial > hg > truffle
changeset 19270:292442bed972
Rename LowLevelSuites to LIRSuites.
line wrap: on
line diff
--- a/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.baseline/src/com/oracle/graal/baseline/BaselineBytecodeParser.java Wed Feb 11 15:22:53 2015 +0100 @@ -146,8 +146,8 @@ } try (Scope s = Debug.scope("LowLevelTier", this)) { - LowLevelSuites lowLevelSuites = backend.getSuites().getDefaultLowLevelSuites(); - return GraalCompiler.emitLowLevel(target, codeEmittingOrder, linearScanOrder, lirGenRes, gen, lowLevelSuites); + LIRSuites lirSuites = backend.getSuites().getDefaultLIRSuites(); + return GraalCompiler.emitLowLevel(target, codeEmittingOrder, linearScanOrder, lirGenRes, gen, lirSuites); } catch (Throwable e) { throw Debug.handle(e); }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Wed Feb 11 15:22:53 2015 +0100 @@ -90,7 +90,7 @@ private final Providers providers; private final Backend backend; private final DerivedOptionValue<Suites> suites; - private final DerivedOptionValue<LowLevelSuites> lowLevelSuites; + private final DerivedOptionValue<LIRSuites> lirSuites; /** * Can be overridden by unit tests to verify properties of the graph. @@ -166,8 +166,8 @@ return ret; } - protected LowLevelSuites createLowLevelSuites() { - LowLevelSuites ret = backend.getSuites().createLowLevelSuites(); + protected LIRSuites createLIRSuites() { + LIRSuites ret = backend.getSuites().createLIRSuites(); return ret; } @@ -175,7 +175,7 @@ this.backend = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend(); this.providers = getBackend().getProviders(); this.suites = new DerivedOptionValue<>(this::createSuites); - this.lowLevelSuites = new DerivedOptionValue<>(this::createLowLevelSuites); + this.lirSuites = new DerivedOptionValue<>(this::createLIRSuites); installSubstitutions(); } @@ -196,7 +196,7 @@ } this.providers = backend.getProviders(); this.suites = new DerivedOptionValue<>(this::createSuites); - this.lowLevelSuites = new DerivedOptionValue<>(this::createLowLevelSuites); + this.lirSuites = new DerivedOptionValue<>(this::createLIRSuites); installSubstitutions(); } @@ -364,8 +364,8 @@ return suites.getValue(); } - protected LowLevelSuites getLowLevelSuites() { - return lowLevelSuites.getValue(); + protected LIRSuites getLIRSuites() { + return lirSuites.getValue(); } protected Providers getProviders() { @@ -754,7 +754,7 @@ lastCompiledGraph = graphToCompile; CallingConvention cc = getCallingConvention(getCodeCache(), Type.JavaCallee, graphToCompile.method(), false); Request<CompilationResult> request = new Request<>(graphToCompile, cc, installedCodeOwner, getProviders(), getBackend(), getCodeCache().getTarget(), null, getDefaultGraphBuilderSuite(), - OptimisticOptimizations.ALL, getProfilingInfo(graphToCompile), getSpeculationLog(), getSuites(), getLowLevelSuites(), new CompilationResult(), + OptimisticOptimizations.ALL, getProfilingInfo(graphToCompile), getSpeculationLog(), getSuites(), getLIRSuites(), new CompilationResult(), CompilationResultBuilderFactory.Default); return GraalCompiler.compile(request); }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InfopointReasonTest.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/InfopointReasonTest.java Wed Feb 11 15:22:53 2015 +0100 @@ -61,7 +61,7 @@ final StructuredGraph graph = parseEager(method); CallingConvention cc = getCallingConvention(getCodeCache(), Type.JavaCallee, graph.method(), false); final CompilationResult cr = compileGraph(graph, cc, graph.method(), getProviders(), getBackend(), getCodeCache().getTarget(), null, getDefaultGraphBuilderSuite(), - OptimisticOptimizations.ALL, getProfilingInfo(graph), null, getSuites(), getLowLevelSuites(), new CompilationResult(), CompilationResultBuilderFactory.Default); + OptimisticOptimizations.ALL, getProfilingInfo(graph), null, getSuites(), getLIRSuites(), new CompilationResult(), CompilationResultBuilderFactory.Default); for (Infopoint sp : cr.getInfopoints()) { assertNotNull(sp.reason); if (sp instanceof Call) { @@ -84,7 +84,7 @@ CallingConvention cc = getCallingConvention(getCodeCache(), Type.JavaCallee, graph.method(), false); PhaseSuite<HighTierContext> graphBuilderSuite = getCustomGraphBuilderSuite(GraphBuilderConfiguration.getFullDebugDefault()); final CompilationResult cr = compileGraph(graph, cc, graph.method(), getProviders(), getBackend(), getCodeCache().getTarget(), null, graphBuilderSuite, OptimisticOptimizations.ALL, - getProfilingInfo(graph), getSpeculationLog(), getSuites(), getLowLevelSuites(), new CompilationResult(), CompilationResultBuilderFactory.Default); + getProfilingInfo(graph), getSpeculationLog(), getSuites(), getLIRSuites(), new CompilationResult(), CompilationResultBuilderFactory.Default); int lineSPs = 0; for (Infopoint sp : cr.getInfopoints()) { assertNotNull(sp.reason);
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/BackendTest.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/backend/BackendTest.java Wed Feb 11 15:22:53 2015 +0100 @@ -58,7 +58,7 @@ } CallingConvention cc = getCallingConvention(getCodeCache(), Type.JavaCallee, graph.method(), false); - LIRGenerationResult lirGen = GraalCompiler.emitLIR(getBackend(), getBackend().getTarget(), schedule, graph, null, cc, null, getLowLevelSuites()); + LIRGenerationResult lirGen = GraalCompiler.emitLIR(getBackend(), getBackend().getTarget(), schedule, graph, null, cc, null, getLIRSuites()); return lirGen; }
--- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/InvokeGraal.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/tutorial/InvokeGraal.java Wed Feb 11 15:22:53 2015 +0100 @@ -97,7 +97,7 @@ /* * The low-level phases that are applied to the low-level representation. */ - LowLevelSuites lowLevelSuites = backend.getSuites().createLowLevelSuites(); + LIRSuites lirSuites = backend.getSuites().createLIRSuites(); /* * The calling convention for the machine code. You should have a very good reason @@ -123,7 +123,7 @@ SpeculationLog speculationLog = null; /* Invoke the whole Graal compilation pipeline. */ - GraalCompiler.compileGraph(graph, callingConvention, method, providers, backend, target, cache, graphBuilderSuite, optimisticOpts, profilingInfo, speculationLog, suites, lowLevelSuites, + GraalCompiler.compileGraph(graph, callingConvention, method, providers, backend, target, cache, graphBuilderSuite, optimisticOpts, profilingInfo, speculationLog, suites, lirSuites, compilationResult, factory); /*
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Wed Feb 11 15:22:53 2015 +0100 @@ -144,7 +144,7 @@ public final ProfilingInfo profilingInfo; public final SpeculationLog speculationLog; public final Suites suites; - public final LowLevelSuites lowLevelSuites; + public final LIRSuites lirSuites; public final T compilationResult; public final CompilationResultBuilderFactory factory; @@ -162,13 +162,13 @@ * @param profilingInfo * @param speculationLog * @param suites - * @param lowLevelSuites + * @param lirSuites * @param compilationResult * @param factory */ public Request(StructuredGraph graph, CallingConvention cc, ResolvedJavaMethod installedCodeOwner, Providers providers, Backend backend, TargetDescription target, Map<ResolvedJavaMethod, StructuredGraph> cache, PhaseSuite<HighTierContext> graphBuilderSuite, OptimisticOptimizations optimisticOpts, ProfilingInfo profilingInfo, - SpeculationLog speculationLog, Suites suites, LowLevelSuites lowLevelSuites, T compilationResult, CompilationResultBuilderFactory factory) { + SpeculationLog speculationLog, Suites suites, LIRSuites lirSuites, T compilationResult, CompilationResultBuilderFactory factory) { this.graph = graph; this.cc = cc; this.installedCodeOwner = installedCodeOwner; @@ -181,7 +181,7 @@ this.profilingInfo = profilingInfo; this.speculationLog = speculationLog; this.suites = suites; - this.lowLevelSuites = lowLevelSuites; + this.lirSuites = lirSuites; this.compilationResult = compilationResult; this.factory = factory; } @@ -207,8 +207,8 @@ */ public static <T extends CompilationResult> T compileGraph(StructuredGraph graph, CallingConvention cc, ResolvedJavaMethod installedCodeOwner, Providers providers, Backend backend, TargetDescription target, Map<ResolvedJavaMethod, StructuredGraph> cache, PhaseSuite<HighTierContext> graphBuilderSuite, OptimisticOptimizations optimisticOpts, - ProfilingInfo profilingInfo, SpeculationLog speculationLog, Suites suites, LowLevelSuites lowLevelSuites, T compilationResult, CompilationResultBuilderFactory factory) { - return compile(new Request<>(graph, cc, installedCodeOwner, providers, backend, target, cache, graphBuilderSuite, optimisticOpts, profilingInfo, speculationLog, suites, lowLevelSuites, + ProfilingInfo profilingInfo, SpeculationLog speculationLog, Suites suites, LIRSuites lirSuites, T compilationResult, CompilationResultBuilderFactory factory) { + return compile(new Request<>(graph, cc, installedCodeOwner, providers, backend, target, cache, graphBuilderSuite, optimisticOpts, profilingInfo, speculationLog, suites, lirSuites, compilationResult, factory)); } @@ -222,7 +222,7 @@ try (Scope s0 = Debug.scope("GraalCompiler", r.graph, r.providers.getCodeCache())) { Assumptions assumptions = new Assumptions(OptAssumptions.getValue()); SchedulePhase schedule = emitFrontEnd(r.providers, r.target, r.graph, assumptions, r.cache, r.graphBuilderSuite, r.optimisticOpts, r.profilingInfo, r.speculationLog, r.suites); - emitBackEnd(r.graph, null, r.cc, r.installedCodeOwner, r.backend, r.target, r.compilationResult, r.factory, assumptions, schedule, null, r.lowLevelSuites); + emitBackEnd(r.graph, null, r.cc, r.installedCodeOwner, r.backend, r.target, r.compilationResult, r.factory, assumptions, schedule, null, r.lirSuites); } catch (Throwable e) { throw Debug.handle(e); } @@ -277,10 +277,10 @@ public static <T extends CompilationResult> void emitBackEnd(StructuredGraph graph, Object stub, CallingConvention cc, ResolvedJavaMethod installedCodeOwner, Backend backend, TargetDescription target, T compilationResult, CompilationResultBuilderFactory factory, Assumptions assumptions, SchedulePhase schedule, RegisterConfig registerConfig, - LowLevelSuites lowLevelSuites) { + LIRSuites lirSuites) { try (TimerCloseable a = BackEnd.start()) { LIRGenerationResult lirGen = null; - lirGen = emitLIR(backend, target, schedule, graph, stub, cc, registerConfig, lowLevelSuites); + lirGen = emitLIR(backend, target, schedule, graph, stub, cc, registerConfig, lirSuites); try (Scope s = Debug.scope("CodeGen", lirGen, lirGen.getLIR())) { emitCode(backend, assumptions, lirGen, compilationResult, installedCodeOwner, factory); } catch (Throwable e) { @@ -303,7 +303,7 @@ } public static LIRGenerationResult emitLIR(Backend backend, TargetDescription target, SchedulePhase schedule, StructuredGraph graph, Object stub, CallingConvention cc, - RegisterConfig registerConfig, LowLevelSuites lowLevelSuites) { + RegisterConfig registerConfig, LIRSuites lirSuites) { List<Block> blocks = schedule.getCFG().getBlocks(); Block startBlock = schedule.getCFG().getStartBlock(); assert startBlock != null; @@ -343,7 +343,7 @@ } try (Scope s = Debug.scope("LowLevelTier", nodeLirGen)) { - return emitLowLevel(target, codeEmittingOrder, linearScanOrder, lirGenRes, lirGen, lowLevelSuites); + return emitLowLevel(target, codeEmittingOrder, linearScanOrder, lirGenRes, lirGen, lirSuites); } catch (Throwable e) { throw Debug.handle(e); } @@ -353,15 +353,15 @@ } public static <T extends AbstractBlock<T>> LIRGenerationResult emitLowLevel(TargetDescription target, List<T> codeEmittingOrder, List<T> linearScanOrder, LIRGenerationResult lirGenRes, - LIRGeneratorTool lirGen, LowLevelSuites lowLevelSuites) { + LIRGeneratorTool lirGen, LIRSuites lirSuites) { LowLevelHighTierContext highTierContext = new LowLevelHighTierContext(lirGen); - lowLevelSuites.getHighTier().apply(target, lirGenRes, codeEmittingOrder, linearScanOrder, highTierContext); + lirSuites.getHighTier().apply(target, lirGenRes, codeEmittingOrder, linearScanOrder, highTierContext); LowLevelMidTierContext midTierContext = new LowLevelMidTierContext(); - lowLevelSuites.getMidTier().apply(target, lirGenRes, codeEmittingOrder, linearScanOrder, midTierContext); + lirSuites.getMidTier().apply(target, lirGenRes, codeEmittingOrder, linearScanOrder, midTierContext); LowLevelLowTierContext lowTierContext = new LowLevelLowTierContext(); - lowLevelSuites.getLowTier().apply(target, lirGenRes, codeEmittingOrder, linearScanOrder, lowTierContext); + lirSuites.getLowTier().apply(target, lirGenRes, codeEmittingOrder, linearScanOrder, lowTierContext); return lirGenRes; }
--- a/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.hotspot.test/src/com/oracle/graal/hotspot/test/AheadOfTimeCompilationTest.java Wed Feb 11 15:22:53 2015 +0100 @@ -212,9 +212,9 @@ // create suites everytime, as we modify options for the compiler SuitesProvider suitesProvider = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getSuites(); final Suites suitesLocal = suitesProvider.createSuites(); - final LowLevelSuites lowLevelSuitesLocal = suitesProvider.createLowLevelSuites(); + final LIRSuites lirSuitesLocal = suitesProvider.createLIRSuites(); final CompilationResult compResult = compileGraph(graph, cc, method, getProviders(), getBackend(), getCodeCache().getTarget(), null, getDefaultGraphBuilderSuite(), - OptimisticOptimizations.ALL, getProfilingInfo(graph), getSpeculationLog(), suitesLocal, lowLevelSuitesLocal, new CompilationResult(), + OptimisticOptimizations.ALL, getProfilingInfo(graph), getSpeculationLog(), suitesLocal, lirSuitesLocal, new CompilationResult(), CompilationResultBuilderFactory.Default); addMethod(method, compResult); }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Wed Feb 11 15:22:53 2015 +0100 @@ -139,8 +139,8 @@ return providers.getSuites().getDefaultSuites(); } - protected LowLevelSuites getLowLevelSuites(HotSpotProviders providers) { - return providers.getSuites().getDefaultLowLevelSuites(); + protected LIRSuites getLIRSuites(HotSpotProviders providers) { + return providers.getSuites().getDefaultLIRSuites(); } protected PhaseSuite<HighTierContext> getGraphBuilderSuite(HotSpotProviders providers) { @@ -228,7 +228,7 @@ cc = new CallingConvention(cc.getStackSize(), cc.getReturn(), tmp.getArgument(0)); } Suites suites = getSuites(providers); - LowLevelSuites lowLevelSuites = getLowLevelSuites(providers); + LIRSuites lirSuites = getLIRSuites(providers); ProfilingInfo profilingInfo = getProfilingInfo(); OptimisticOptimizations optimisticOpts = getOptimisticOpts(profilingInfo); if (isOSR) { @@ -237,7 +237,7 @@ optimisticOpts.remove(Optimization.RemoveNeverExecutedCode); } result = compileGraph(graph, cc, method, providers, backend, backend.getTarget(), graphCache, getGraphBuilderSuite(providers), optimisticOpts, profilingInfo, - method.getSpeculationLog(), suites, lowLevelSuites, new CompilationResult(), CompilationResultBuilderFactory.Default); + method.getSpeculationLog(), suites, lirSuites, new CompilationResult(), CompilationResultBuilderFactory.Default); } result.setId(getId()); result.setEntryBCI(entryBCI);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSuitesProvider.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotSuitesProvider.java Wed Feb 11 15:22:53 2015 +0100 @@ -45,7 +45,7 @@ protected final DerivedOptionValue<Suites> defaultSuites; protected final PhaseSuite<HighTierContext> defaultGraphBuilderSuite; - private final DerivedOptionValue<LowLevelSuites> defaultLowLevelSuites; + private final DerivedOptionValue<LIRSuites> defaultLIRSuites; protected final HotSpotGraalRuntimeProvider runtime; private class SuitesSupplier implements OptionSupplier<Suites> { @@ -58,12 +58,12 @@ } - private class LowLevelSuitesSupplier implements OptionSupplier<LowLevelSuites> { + private class LIRSuitesSupplier implements OptionSupplier<LIRSuites> { private static final long serialVersionUID = -1558586374095874299L; - public LowLevelSuites get() { - return createLowLevelSuites(); + public LIRSuites get() { + return createLIRSuites(); } } @@ -72,7 +72,7 @@ this.runtime = runtime; this.defaultGraphBuilderSuite = createGraphBuilderSuite(); this.defaultSuites = new DerivedOptionValue<>(new SuitesSupplier()); - this.defaultLowLevelSuites = new DerivedOptionValue<>(new LowLevelSuitesSupplier()); + this.defaultLIRSuites = new DerivedOptionValue<>(new LIRSuitesSupplier()); } public Suites getDefaultSuites() { @@ -135,12 +135,12 @@ return gbs; } - public LowLevelSuites getDefaultLowLevelSuites() { - return defaultLowLevelSuites.getValue(); + public LIRSuites getDefaultLIRSuites() { + return defaultLIRSuites.getValue(); } - public LowLevelSuites createLowLevelSuites() { - return Suites.createDefaultLowLevelSuites(); + public LIRSuites createLIRSuites() { + return Suites.createDefaultLIRSuites(); } }
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/HotSpotNativeFunctionInterface.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/nfi/HotSpotNativeFunctionInterface.java Wed Feb 11 15:22:53 2015 +0100 @@ -161,11 +161,11 @@ private InstalledCode installNativeFunctionStub(long functionPointer, Class<?> returnType, Class<?>... argumentTypes) { StructuredGraph g = getGraph(providers, factory, functionPointer, returnType, argumentTypes); Suites suites = providers.getSuites().createSuites(); - LowLevelSuites lowLevelSuites = providers.getSuites().createLowLevelSuites(); + LIRSuites lirSuites = providers.getSuites().createLIRSuites(); PhaseSuite<HighTierContext> phaseSuite = backend.getSuites().getDefaultGraphBuilderSuite().copy(); CallingConvention cc = getCallingConvention(providers.getCodeCache(), Type.JavaCallee, g.method(), false); CompilationResult compResult = GraalCompiler.compileGraph(g, cc, g.method(), providers, backend, backend.getTarget(), null, phaseSuite, OptimisticOptimizations.ALL, - DefaultProfilingInfo.get(TriState.UNKNOWN), null, suites, lowLevelSuites, new CompilationResult(), CompilationResultBuilderFactory.Default); + DefaultProfilingInfo.get(TriState.UNKNOWN), null, suites, lirSuites, new CompilationResult(), CompilationResultBuilderFactory.Default); InstalledCode installedCode; try (Scope s = Debug.scope("CodeInstall", providers.getCodeCache(), g.method())) { installedCode = providers.getCodeCache().addMethod(g.method(), compResult, null, null);
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/Stub.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/Stub.java Wed Feb 11 15:22:53 2015 +0100 @@ -176,9 +176,9 @@ Suites suites = new Suites(new PhaseSuite<>(), defaultSuites.getMidTier(), defaultSuites.getLowTier()); SchedulePhase schedule = emitFrontEnd(providers, target, graph, assumptions, null, providers.getSuites().getDefaultGraphBuilderSuite(), OptimisticOptimizations.ALL, getProfilingInfo(graph), null, suites); - LowLevelSuites lowLevelSuites = providers.getSuites().getDefaultLowLevelSuites(); + LIRSuites lirSuites = providers.getSuites().getDefaultLIRSuites(); emitBackEnd(graph, Stub.this, incomingCc, getInstalledCodeOwner(), backend, target, compResult, CompilationResultBuilderFactory.Default, assumptions, schedule, - getRegisterConfig(), lowLevelSuites); + getRegisterConfig(), lirSuites); } catch (Throwable e) { throw Debug.handle(e); }
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/DefaultSuitesProvider.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/DefaultSuitesProvider.java Wed Feb 11 15:22:53 2015 +0100 @@ -32,7 +32,7 @@ private final DerivedOptionValue<Suites> defaultSuites; private final PhaseSuite<HighTierContext> defaultGraphBuilderSuite; - private final DerivedOptionValue<LowLevelSuites> defaultLowLevelSuites; + private final DerivedOptionValue<LIRSuites> defaultLIRSuites; private class SuitesSupplier implements OptionSupplier<Suites> { @@ -44,12 +44,12 @@ } - private class LowLevelSuitesSupplier implements OptionSupplier<LowLevelSuites> { + private class LIRSuitesSupplier implements OptionSupplier<LIRSuites> { private static final long serialVersionUID = 312070237227476252L; - public LowLevelSuites get() { - return createLowLevelSuites(); + public LIRSuites get() { + return createLIRSuites(); } } @@ -57,7 +57,7 @@ public DefaultSuitesProvider() { this.defaultGraphBuilderSuite = createGraphBuilderSuite(); this.defaultSuites = new DerivedOptionValue<>(new SuitesSupplier()); - this.defaultLowLevelSuites = new DerivedOptionValue<>(new LowLevelSuitesSupplier()); + this.defaultLIRSuites = new DerivedOptionValue<>(new LIRSuitesSupplier()); } public Suites getDefaultSuites() { @@ -78,12 +78,12 @@ return suite; } - public LowLevelSuites getDefaultLowLevelSuites() { - return defaultLowLevelSuites.getValue(); + public LIRSuites getDefaultLIRSuites() { + return defaultLIRSuites.getValue(); } - public LowLevelSuites createLowLevelSuites() { - return Suites.createDefaultLowLevelSuites(); + public LIRSuites createLIRSuites() { + return Suites.createDefaultLIRSuites(); } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LIRSuites.java Wed Feb 11 15:22:53 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 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; + +public class LIRSuites { + + private final LowLevelPhaseSuite<LowLevelHighTierContext> highTier; + private final LowLevelPhaseSuite<LowLevelMidTierContext> midTier; + private final LowLevelPhaseSuite<LowLevelLowTierContext> lowTier; + + public LIRSuites(LowLevelPhaseSuite<LowLevelHighTierContext> highTier, LowLevelPhaseSuite<LowLevelMidTierContext> midTier, LowLevelPhaseSuite<LowLevelLowTierContext> lowTier) { + this.highTier = highTier; + this.midTier = midTier; + this.lowTier = lowTier; + } + + /** + * {@link LowLevelHighTierPhase}s are executed between {@link LIR} generation and register + * allocation. + * <p> + * {@link LowLevelHighTierPhase Implementers} can create new + * {@link LIRGeneratorTool#newVariable variables}, {@link LIRGenerationResult#getFrameMap stack + * slots} and {@link LIRGenerationResult#getFrameMapBuilder virtual stack slots}. + */ + public LowLevelPhaseSuite<LowLevelHighTierContext> getHighTier() { + return highTier; + } + + /** + * {@link LowLevelMidTierPhase}s are responsible for register allocation and translating + * {@link VirtualStackSlot}s into {@link StackSlot}s. + * <p> + * After the {@link LowLevelMidTier} there should be no more {@link Variable}s and + * {@link VirtualStackSlot}s. + */ + public LowLevelPhaseSuite<LowLevelMidTierContext> getMidTier() { + return midTier; + } + + /** + * {@link LowLevelLowTierPhase}s are executed after register allocation and before machine code + * generation. + * <p> + * A {@link LowLevelLowTierPhase} must not introduce new {@link Variable}s, + * {@link VirtualStackSlot}s or {@link StackSlot}s. + */ + public LowLevelPhaseSuite<LowLevelLowTierContext> getLowTier() { + return lowTier; + } + +}
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/phases/LowLevelSuites.java Wed Feb 11 13:44:39 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 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; - -public class LowLevelSuites { - - private final LowLevelPhaseSuite<LowLevelHighTierContext> highTier; - private final LowLevelPhaseSuite<LowLevelMidTierContext> midTier; - private final LowLevelPhaseSuite<LowLevelLowTierContext> lowTier; - - public LowLevelSuites(LowLevelPhaseSuite<LowLevelHighTierContext> highTier, LowLevelPhaseSuite<LowLevelMidTierContext> midTier, LowLevelPhaseSuite<LowLevelLowTierContext> lowTier) { - this.highTier = highTier; - this.midTier = midTier; - this.lowTier = lowTier; - } - - /** - * {@link LowLevelHighTierPhase}s are executed between {@link LIR} generation and register - * allocation. - * <p> - * {@link LowLevelHighTierPhase Implementers} can create new - * {@link LIRGeneratorTool#newVariable variables}, {@link LIRGenerationResult#getFrameMap stack - * slots} and {@link LIRGenerationResult#getFrameMapBuilder virtual stack slots}. - */ - public LowLevelPhaseSuite<LowLevelHighTierContext> getHighTier() { - return highTier; - } - - /** - * {@link LowLevelMidTierPhase}s are responsible for register allocation and translating - * {@link VirtualStackSlot}s into {@link StackSlot}s. - * <p> - * After the {@link LowLevelMidTier} there should be no more {@link Variable}s and - * {@link VirtualStackSlot}s. - */ - public LowLevelPhaseSuite<LowLevelMidTierContext> getMidTier() { - return midTier; - } - - /** - * {@link LowLevelLowTierPhase}s are executed after register allocation and before machine code - * generation. - * <p> - * A {@link LowLevelLowTierPhase} must not introduce new {@link Variable}s, - * {@link VirtualStackSlot}s or {@link StackSlot}s. - */ - public LowLevelPhaseSuite<LowLevelLowTierContext> getLowTier() { - return lowTier; - } - -}
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/Suites.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/Suites.java Wed Feb 11 15:22:53 2015 +0100 @@ -130,21 +130,21 @@ return new Suites(config); } - public static LowLevelSuites createDefaultLowLevelSuites() { + public static LIRSuites createDefaultLIRSuites() { String selected = CompilerConfiguration.getValue(); if (selected.equals("")) { - return new LowLevelSuites(defaultConfiguration.createLowLevelHighTier(), defaultConfiguration.createLowLevelMidTier(), defaultConfiguration.createLowLevelLowTier()); + return new LIRSuites(defaultConfiguration.createLowLevelHighTier(), defaultConfiguration.createLowLevelMidTier(), defaultConfiguration.createLowLevelLowTier()); } else { - return createLowLevelSuites(selected); + return createLIRSuites(selected); } } - public static LowLevelSuites createLowLevelSuites(String name) { + public static LIRSuites createLIRSuites(String name) { CompilerConfiguration config = configurations.get(name); if (config == null) { throw new GraalInternalError("unknown compiler configuration: " + name); } - return new LowLevelSuites(config.createLowLevelHighTier(), config.createLowLevelMidTier(), config.createLowLevelLowTier()); + return new LIRSuites(config.createLowLevelHighTier(), config.createLowLevelMidTier(), config.createLowLevelLowTier()); } }
--- a/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/SuitesProvider.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.phases/src/com/oracle/graal/phases/tiers/SuitesProvider.java Wed Feb 11 15:22:53 2015 +0100 @@ -46,12 +46,12 @@ /** * Get the default phase suites of this compiler. */ - LowLevelSuites getDefaultLowLevelSuites(); + LIRSuites getDefaultLIRSuites(); /** * Create a new set of low-level phase suites. Initially, the suites are the same as the - * {@link #getDefaultLowLevelSuites default} suites. + * {@link #getDefaultLIRSuites default} suites. */ - LowLevelSuites createLowLevelSuites(); + LIRSuites createLIRSuites(); }
--- a/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/HotSpotTruffleRuntime.java Wed Feb 11 15:22:53 2015 +0100 @@ -176,7 +176,7 @@ MetaAccessProvider metaAccess = providers.getMetaAccess(); SuitesProvider suitesProvider = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend().getSuites(); Suites suites = suitesProvider.createSuites(); - LowLevelSuites lowLevelSuites = suitesProvider.createLowLevelSuites(); + LIRSuites lirSuites = suitesProvider.createLIRSuites(); removeInliningPhase(suites); StructuredGraph graph = new StructuredGraph(javaMethod); new GraphBuilderPhase.Instance(metaAccess, providers.getStampProvider(), new Assumptions(false), providers.getConstantReflection(), GraphBuilderConfiguration.getEagerDefault(), @@ -186,7 +186,7 @@ Backend backend = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend(); CompilationResultBuilderFactory factory = getOptimizedCallTargetInstrumentationFactory(backend.getTarget().arch.getName(), javaMethod); return compileGraph(graph, cc, javaMethod, providers, backend, providers.getCodeCache().getTarget(), null, graphBuilderSuite, OptimisticOptimizations.ALL, getProfilingInfo(graph), null, - suites, lowLevelSuites, new CompilationResult(), factory); + suites, lirSuites, new CompilationResult(), factory); } private static Providers getGraalProviders() {
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java Wed Feb 11 13:44:39 2015 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerImpl.java Wed Feb 11 15:22:53 2015 +0100 @@ -60,7 +60,7 @@ private final Providers providers; private final Suites suites; - private final LowLevelSuites lowLevelSuites; + private final LIRSuites lirSuites; private final PartialEvaluator partialEvaluator; private final Backend backend; private final GraphBuilderConfiguration config; @@ -82,7 +82,7 @@ ConstantReflectionProvider constantReflection = new TruffleConstantReflectionProvider(backend.getProviders().getConstantReflection(), backend.getProviders().getMetaAccess()); this.providers = backend.getProviders().copyWith(truffleReplacements).copyWith(constantReflection); this.suites = backend.getSuites().getDefaultSuites(); - this.lowLevelSuites = backend.getSuites().getDefaultLowLevelSuites(); + this.lirSuites = backend.getSuites().getDefaultLIRSuites(); ResolvedJavaType[] skippedExceptionTypes = getSkippedExceptionTypes(providers.getMetaAccess()); GraphBuilderConfiguration eagerConfig = GraphBuilderConfiguration.getEagerDefault().withSkippedExceptionTypes(skippedExceptionTypes); @@ -157,7 +157,7 @@ CallingConvention cc = getCallingConvention(codeCache, Type.JavaCallee, graph.method(), false); CompilationResult compilationResult = new CompilationResult(name); result = compileGraph(graph, cc, graph.method(), providers, backend, codeCache.getTarget(), null, createGraphBuilderSuite(), Optimizations, getProfilingInfo(graph), speculationLog, - suites, lowLevelSuites, compilationResult, CompilationResultBuilderFactory.Default); + suites, lirSuites, compilationResult, CompilationResultBuilderFactory.Default); } catch (Throwable e) { throw Debug.handle(e); }