Mercurial > hg > graal-compiler
changeset 8281:8fde1be81b2d
LIRGenerator is transmitted across backend passes instead of just the LIR so that backend-specific, per-compilation information can be attached to the backend-specific LIRGenerator object
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 14 Mar 2013 14:08:59 +0100 |
parents | 2ddf84436009 |
children | 59744882ddeb |
files | graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXBackend.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/TargetMethodAssembler.java |
diffstat | 7 files changed, 42 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXBackend.java Thu Mar 14 13:13:59 2013 +0100 +++ b/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXBackend.java Thu Mar 14 14:08:59 2013 +0100 @@ -31,7 +31,6 @@ import com.oracle.graal.lir.*; import com.oracle.graal.lir.asm.*; import com.oracle.graal.nodes.*; -import com.oracle.graal.phases.*; /** * PTX specific backend. @@ -63,25 +62,22 @@ } @Override - public TargetMethodAssembler newAssembler(FrameMap frameMap, LIR lir) { + public TargetMethodAssembler newAssembler(LIRGenerator lirGen, CompilationResult compilationResult) { // Omit the frame if the method: // - has no spill slots or other slots allocated during register allocation // - has no callee-saved registers // - has no incoming arguments passed on the stack // - has no instructions with debug info - boolean omitFrame = GraalOptions.CanOmitFrame && frameMap.frameSize() == frameMap.initialFrameSize && frameMap.registerConfig.getCalleeSaveLayout().registers.length == 0 && - !lir.hasArgInCallerFrame() && !lir.hasDebugInfo(); - + FrameMap frameMap = lirGen.frameMap; AbstractAssembler masm = new PTXAssembler(target, frameMap.registerConfig); - HotSpotFrameContext frameContext = omitFrame ? null : new HotSpotFrameContext(); - TargetMethodAssembler tasm = new TargetMethodAssembler(target, runtime(), frameMap, masm, frameContext); + HotSpotFrameContext frameContext = new HotSpotFrameContext(); + TargetMethodAssembler tasm = new TargetMethodAssembler(target, runtime(), frameMap, masm, frameContext, compilationResult); tasm.setFrameSize(frameMap.frameSize()); - tasm.compilationResult.setCustomStackAreaOffset(frameMap.offsetToCustomArea()); return tasm; } @Override - public void emitCode(TargetMethodAssembler tasm, ResolvedJavaMethod method, LIR lir) { + public void emitCode(TargetMethodAssembler tasm, ResolvedJavaMethod method, LIRGenerator lirGen) { // Emit the prologue final String name = method.getName(); Buffer codeBuffer = tasm.asm.codeBuffer; @@ -103,7 +99,7 @@ codeBuffer.emitString(" .reg .u32 %r<16>;"); // Emit code for the LIR - lir.emitCode(tasm); + lirGen.lir.emitCode(tasm); // Emit the epilogue codeBuffer.emitString0("}");
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Thu Mar 14 13:13:59 2013 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Thu Mar 14 14:08:59 2013 +0100 @@ -51,9 +51,10 @@ final StructuredGraph graph, final GraphCache cache, final PhasePlan plan, final OptimisticOptimizations optimisticOpts, final SpeculationLog speculationLog) { assert (method.getModifiers() & Modifier.NATIVE) == 0 : "compiling native methods is not supported"; - return Debug.scope("GraalCompiler", new Object[]{graph, method, runtime}, new Callable<CompilationResult>() { + final CompilationResult compilationResult = new CompilationResult(); + Debug.scope("GraalCompiler", new Object[]{graph, method, runtime}, new Runnable() { - public CompilationResult call() { + public void run() { final Assumptions assumptions = new Assumptions(GraalOptions.OptAssumptions); final LIR lir = Debug.scope("FrontEnd", new Callable<LIR>() { @@ -61,21 +62,23 @@ return emitHIR(runtime, target, graph, assumptions, cache, plan, optimisticOpts, speculationLog); } }); - final FrameMap frameMap = Debug.scope("BackEnd", lir, new Callable<FrameMap>() { + final LIRGenerator lirGen = Debug.scope("BackEnd", lir, new Callable<LIRGenerator>() { - public FrameMap call() { + public LIRGenerator call() { return emitLIR(backend, target, lir, graph, method); } }); - return Debug.scope("CodeGen", frameMap, new Callable<CompilationResult>() { + Debug.scope("CodeGen", lirGen, new Runnable() { - public CompilationResult call() { - return emitCode(backend, getLeafGraphIdArray(graph), assumptions, method, lir, frameMap); + public void run() { + emitCode(backend, getLeafGraphIdArray(graph), assumptions, method, lirGen, compilationResult); } }); } }); + + return compilationResult; } private static long[] getLeafGraphIdArray(StructuredGraph graph) { @@ -233,11 +236,11 @@ } - public static FrameMap emitLIR(Backend backend, final TargetDescription target, final LIR lir, StructuredGraph graph, final ResolvedJavaMethod method) { + public static LIRGenerator emitLIR(Backend backend, final TargetDescription target, final LIR lir, StructuredGraph graph, final ResolvedJavaMethod method) { final FrameMap frameMap = backend.newFrameMap(); - final LIRGenerator lirGenerator = backend.newLIRGenerator(graph, frameMap, method, lir); + final LIRGenerator lirGen = backend.newLIRGenerator(graph, frameMap, method, lir); - Debug.scope("LIRGen", lirGenerator, new Runnable() { + Debug.scope("LIRGen", lirGen, new Runnable() { public void run() { for (Block b : lir.linearScanOrder()) { @@ -254,7 +257,7 @@ emitBlock(pred); } } - lirGenerator.doBlock(b); + lirGen.doBlock(b); } } }); @@ -262,15 +265,15 @@ Debug.scope("Allocator", new Runnable() { public void run() { - new LinearScan(target, method, lir, lirGenerator, frameMap).allocate(); + new LinearScan(target, method, lir, lirGen, frameMap).allocate(); } }); - return frameMap; + return lirGen; } - public static CompilationResult emitCode(Backend backend, long[] leafGraphIds, Assumptions assumptions, ResolvedJavaMethod method, LIR lir, FrameMap frameMap) { - TargetMethodAssembler tasm = backend.newAssembler(frameMap, lir); - backend.emitCode(tasm, method, lir); + public static void emitCode(Backend backend, long[] leafGraphIds, Assumptions assumptions, ResolvedJavaMethod method, LIRGenerator lirGen, CompilationResult compilationResult) { + TargetMethodAssembler tasm = backend.newAssembler(lirGen, compilationResult); + backend.emitCode(tasm, method, lirGen); CompilationResult result = tasm.finishTargetMethod(method, false); if (!assumptions.isEmpty()) { result.setAssumptions(assumptions); @@ -278,6 +281,5 @@ result.setLeafGraphIds(leafGraphIds); Debug.dump(result, "After code generation"); - return result; } }
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Thu Mar 14 13:13:59 2013 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/LIRGenerator.java Thu Mar 14 14:08:59 2013 +0100 @@ -54,14 +54,15 @@ */ public abstract class LIRGenerator extends LIRGeneratorTool { + public final FrameMap frameMap; + public final NodeMap<Value> nodeOperands; + public final LIR lir; + protected final StructuredGraph graph; protected final CodeCacheProvider runtime; protected final TargetDescription target; protected final ResolvedJavaMethod method; - protected final FrameMap frameMap; - public final NodeMap<Value> nodeOperands; - protected final LIR lir; private final DebugInfoBuilder debugInfoBuilder; private Block currentBlock;
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Thu Mar 14 13:13:59 2013 +0100 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/target/Backend.java Thu Mar 14 14:08:59 2013 +0100 @@ -52,16 +52,13 @@ public abstract LIRGenerator newLIRGenerator(StructuredGraph graph, FrameMap frameMap, ResolvedJavaMethod method, LIR lir); - public abstract TargetMethodAssembler newAssembler(FrameMap frameMap, LIR lir); + public abstract TargetMethodAssembler newAssembler(LIRGenerator lirGen, CompilationResult compilationResult); /** * Emits the code for a given method. This includes any architecture/runtime specific * prefix/suffix. A prefix typically contains the code for setting up the frame, spilling * callee-save registers, stack overflow checking, handling multiple entry points etc. A suffix * may contain out-of-line stubs and method end guard instructions. - * - * @param method the method associated with {@code lir} - * @param lir the LIR of {@code method} */ - public abstract void emitCode(TargetMethodAssembler tasm, ResolvedJavaMethod method, LIR lir); + public abstract void emitCode(TargetMethodAssembler tasm, ResolvedJavaMethod method, LIRGenerator lirGen); }
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Thu Mar 14 13:13:59 2013 +0100 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java Thu Mar 14 14:08:59 2013 +0100 @@ -259,25 +259,27 @@ } @Override - public TargetMethodAssembler newAssembler(FrameMap frameMap, LIR lir) { + public TargetMethodAssembler newAssembler(LIRGenerator lirGen, CompilationResult compilationResult) { // Omit the frame if the method: // - has no spill slots or other slots allocated during register allocation // - has no callee-saved registers // - has no incoming arguments passed on the stack // - has no instructions with debug info + FrameMap frameMap = lirGen.frameMap; + LIR lir = lirGen.lir; boolean omitFrame = GraalOptions.CanOmitFrame && frameMap.frameSize() == frameMap.initialFrameSize && frameMap.registerConfig.getCalleeSaveLayout().registers.length == 0 && !lir.hasArgInCallerFrame() && !lir.hasDebugInfo(); AbstractAssembler masm = new AMD64MacroAssembler(target, frameMap.registerConfig); HotSpotFrameContext frameContext = omitFrame ? null : new HotSpotFrameContext(); - TargetMethodAssembler tasm = new TargetMethodAssembler(target, runtime(), frameMap, masm, frameContext); + TargetMethodAssembler tasm = new TargetMethodAssembler(target, runtime(), frameMap, masm, frameContext, compilationResult); tasm.setFrameSize(frameMap.frameSize()); tasm.compilationResult.setCustomStackAreaOffset(frameMap.offsetToCustomArea()); return tasm; } @Override - public void emitCode(TargetMethodAssembler tasm, ResolvedJavaMethod method, LIR lir) { + public void emitCode(TargetMethodAssembler tasm, ResolvedJavaMethod method, LIRGenerator lirGen) { AMD64MacroAssembler asm = (AMD64MacroAssembler) tasm.asm; FrameMap frameMap = tasm.frameMap; RegisterConfig regConfig = frameMap.registerConfig; @@ -304,7 +306,7 @@ tasm.recordMark(Marks.MARK_VERIFIED_ENTRY); // Emit code for the LIR - lir.emitCode(tasm); + lirGen.lir.emitCode(tasm); boolean frameOmitted = tasm.frameContext == null; if (!frameOmitted) { @@ -316,7 +318,7 @@ } else { // No need to emit the stubs for entries back into the method since // it has no calls that can cause such "return" entries - assert !frameMap.accessesCallerFrame(); + assert !frameMap.accessesCallerFrame() : method; } if (unverifiedStub != null) {
--- a/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Thu Mar 14 13:13:59 2013 +0100 +++ b/graal/com.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java Thu Mar 14 14:08:59 2013 +0100 @@ -47,13 +47,13 @@ } @Override - public TargetMethodAssembler newAssembler(FrameMap frameMap, LIR lir) { + public TargetMethodAssembler newAssembler(LIRGenerator lirGen, CompilationResult compilationResult) { // SPARC: Create assembler. return null; } @Override - public void emitCode(TargetMethodAssembler tasm, ResolvedJavaMethod method, LIR lir) { + public void emitCode(TargetMethodAssembler tasm, ResolvedJavaMethod method, LIRGenerator lirGen) { // SPARC: Emit code } }
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/TargetMethodAssembler.java Thu Mar 14 13:13:59 2013 +0100 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/TargetMethodAssembler.java Thu Mar 14 14:08:59 2013 +0100 @@ -60,12 +60,12 @@ private List<ExceptionInfo> exceptionInfoList; - public TargetMethodAssembler(TargetDescription target, CodeCacheProvider runtime, FrameMap frameMap, AbstractAssembler asm, FrameContext frameContext) { + public TargetMethodAssembler(TargetDescription target, CodeCacheProvider runtime, FrameMap frameMap, AbstractAssembler asm, FrameContext frameContext, CompilationResult compilationResult) { this.target = target; this.runtime = runtime; this.frameMap = frameMap; this.asm = asm; - this.compilationResult = new CompilationResult(); + this.compilationResult = compilationResult; this.frameContext = frameContext; }