# HG changeset patch # User Thomas Wuerthinger # Date 1361481874 28800 # Node ID 72971ec0d7aea0ad52ef72e4fcf7e7163395a9e2 # Parent 13344e69455e8e81494e005cc00272e6aed67e28 Remove usage of GraalCompiler.target field. diff -r 13344e69455e -r 72971ec0d7ae graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java --- a/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Thu Feb 21 13:11:52 2013 -0800 +++ b/graal/com.oracle.graal.compiler.test/src/com/oracle/graal/compiler/test/GraalCompilerTest.java Thu Feb 21 13:24:34 2013 -0800 @@ -359,7 +359,7 @@ GraphBuilderPhase graphBuilderPhase = new GraphBuilderPhase(runtime, GraphBuilderConfiguration.getDefault(), OptimisticOptimizations.ALL); phasePlan.addPhase(PhasePosition.AFTER_PARSING, graphBuilderPhase); editPhasePlan(method, graph, phasePlan); - CompilationResult compResult = graalCompiler.compileMethod(method, graph, null, phasePlan, OptimisticOptimizations.ALL); + CompilationResult compResult = graalCompiler.compileMethod(runtime().getTarget(), method, graph, null, phasePlan, OptimisticOptimizations.ALL); if (printCompilation) { TTY.println(String.format("@%-6d Graal %-70s %-45s %-50s | %4dms %5dB", id, "", "", "", System.currentTimeMillis() - start, compResult.getTargetCodeSize())); } diff -r 13344e69455e -r 72971ec0d7ae 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 Thu Feb 21 13:11:52 2013 -0800 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/GraalCompiler.java Thu Feb 21 13:24:34 2013 -0800 @@ -48,11 +48,6 @@ public class GraalCompiler { /** - * The target that this compiler has been configured for. - */ - public final TargetDescription target; - - /** * The runtime that this compiler has been configured for. */ public final GraalCodeCacheProvider runtime; @@ -62,13 +57,13 @@ */ public final Backend backend; - public GraalCompiler(GraalCodeCacheProvider runtime, TargetDescription target, Backend backend) { + public GraalCompiler(GraalCodeCacheProvider runtime, Backend backend) { this.runtime = runtime; - this.target = target; this.backend = backend; } - public CompilationResult compileMethod(final ResolvedJavaMethod method, final StructuredGraph graph, final GraphCache cache, final PhasePlan plan, final OptimisticOptimizations optimisticOpts) { + public CompilationResult compileMethod(final TargetDescription target, final ResolvedJavaMethod method, final StructuredGraph graph, final GraphCache cache, final PhasePlan plan, + final OptimisticOptimizations optimisticOpts) { assert (method.getModifiers() & Modifier.NATIVE) == 0 : "compiling native methods is not supported"; return Debug.scope("GraalCompiler", new Object[]{graph, method, this}, new Callable() { @@ -78,7 +73,7 @@ final LIR lir = Debug.scope("FrontEnd", new Callable() { public LIR call() { - return emitHIR(graph, assumptions, cache, plan, optimisticOpts); + return emitHIR(target, graph, assumptions, cache, plan, optimisticOpts); } }); final FrameMap frameMap = Debug.scope("BackEnd", lir, new Callable() { @@ -110,8 +105,10 @@ /** * Builds the graph, optimizes it. + * + * @param target */ - public LIR emitHIR(StructuredGraph graph, Assumptions assumptions, GraphCache cache, PhasePlan plan, OptimisticOptimizations optimisticOpts) { + public LIR emitHIR(TargetDescription target, StructuredGraph graph, Assumptions assumptions, GraphCache cache, PhasePlan plan, OptimisticOptimizations optimisticOpts) { if (graph.start().next() == null) { plan.runPhases(PhasePosition.AFTER_PARSING, graph); diff -r 13344e69455e -r 72971ec0d7ae graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Thu Feb 21 13:11:52 2013 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/CompilationTask.java Thu Feb 21 13:24:34 2013 -0800 @@ -146,7 +146,7 @@ // System.out.println("compiling intrinsic " + method); } InlinedBytecodes.add(method.getCodeSize()); - return graalRuntime.getCompiler().compileMethod(method, graph, graalRuntime.getCache(), plan, optimisticOpts); + return graalRuntime.getCompiler().compileMethod(graalRuntime.getTarget(), method, graph, graalRuntime.getCache(), plan, optimisticOpts); } }); } finally { diff -r 13344e69455e -r 72971ec0d7ae graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Thu Feb 21 13:11:52 2013 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotGraalRuntime.java Thu Feb 21 13:24:34 2013 -0800 @@ -141,7 +141,7 @@ HotSpotBackend backend = createBackend(); GraalOptions.StackShadowPages = config.stackShadowPages; - compiler = new GraalCompiler(getRuntime(), getTarget(), backend); + compiler = new GraalCompiler(getRuntime(), backend); if (GraalOptions.CacheGraphs) { cache = new HotSpotGraphCache(); } @@ -262,6 +262,9 @@ if (clazz == DisassemblerProvider.class || clazz == BytecodeDisassemblerProvider.class) { return (T) getRuntime(); } + if (clazz == HotSpotRuntime.class) { + return (T) runtime; + } if (clazz == GraalCompiler.class) { return (T) getCompiler(); } diff -r 13344e69455e -r 72971ec0d7ae graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Thu Feb 21 13:11:52 2013 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/VMToCompilerImpl.java Thu Feb 21 13:24:34 2013 -0800 @@ -36,7 +36,6 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; -import com.oracle.graal.compiler.*; import com.oracle.graal.debug.*; import com.oracle.graal.debug.internal.*; import com.oracle.graal.hotspot.*; @@ -143,10 +142,9 @@ } // Install intrinsics. - GraalCompiler compiler = graalRuntime.getCompiler(); - final HotSpotRuntime runtime = (HotSpotRuntime) compiler.runtime; + final HotSpotRuntime runtime = graalRuntime.getCapability(HotSpotRuntime.class); if (GraalOptions.Intrinsify) { - Debug.scope("InstallSnippets", new Object[]{new DebugDumpScope("InstallSnippets"), compiler}, new Runnable() { + Debug.scope("InstallSnippets", new Object[]{new DebugDumpScope("InstallSnippets")}, new Runnable() { @Override public void run() { diff -r 13344e69455e -r 72971ec0d7ae graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/Stub.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/Stub.java Thu Feb 21 13:11:52 2013 -0800 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/Stub.java Thu Feb 21 13:24:34 2013 -0800 @@ -117,7 +117,7 @@ PhasePlan phasePlan = new PhasePlan(); GraphBuilderPhase graphBuilderPhase = new GraphBuilderPhase(runtime, GraphBuilderConfiguration.getDefault(), OptimisticOptimizations.ALL); phasePlan.addPhase(PhasePosition.AFTER_PARSING, graphBuilderPhase); - final CompilationResult compResult = compiler.compileMethod(stubMethod, graph, null, phasePlan, OptimisticOptimizations.ALL); + final CompilationResult compResult = compiler.compileMethod(runtime().getTarget(), stubMethod, graph, null, phasePlan, OptimisticOptimizations.ALL); final CodeInfo[] info = new CodeInfo[1]; stubCode = Debug.scope("CodeInstall", new Object[]{compiler, stubMethod}, new Callable() { diff -r 13344e69455e -r 72971ec0d7ae graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinterObserver.java --- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinterObserver.java Thu Feb 21 13:11:52 2013 -0800 +++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinterObserver.java Thu Feb 21 13:24:34 2013 -0800 @@ -28,7 +28,6 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; -import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.alloc.*; import com.oracle.graal.compiler.gen.*; import com.oracle.graal.debug.*; @@ -100,10 +99,6 @@ private static final AtomicInteger uniqueId = new AtomicInteger(); public void dumpSandboxed(Object object, String message) { - GraalCompiler compiler = Debug.contextLookup(GraalCompiler.class); - if (compiler == null) { - return; - } if (cfgPrinter == null) { cfgFile = new File("compilations-" + timestamp + "_" + uniqueId.incrementAndGet() + ".cfg"); @@ -120,7 +115,7 @@ return; } - cfgPrinter.target = compiler.target; + cfgPrinter.target = Debug.contextLookup(TargetDescription.class); if (object instanceof LIR) { cfgPrinter.lir = (LIR) object; } else { @@ -131,7 +126,7 @@ cfgPrinter.cfg = cfgPrinter.lir.cfg; } - CodeCacheProvider runtime = compiler.runtime; + CodeCacheProvider runtime = Debug.contextLookup(CodeCacheProvider.class); if (object instanceof BciBlockMapping) { BciBlockMapping blockMap = (BciBlockMapping) object; diff -r 13344e69455e -r 72971ec0d7ae graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/WordTest.java --- a/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/WordTest.java Thu Feb 21 13:11:52 2013 -0800 +++ b/graal/com.oracle.graal.snippets.test/src/com/oracle/graal/snippets/WordTest.java Thu Feb 21 13:24:34 2013 -0800 @@ -29,7 +29,6 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.api.meta.*; import com.oracle.graal.api.runtime.*; -import com.oracle.graal.compiler.*; import com.oracle.graal.compiler.test.*; import com.oracle.graal.nodes.*; import com.oracle.graal.snippets.Snippet.SnippetInliningPolicy; @@ -43,7 +42,7 @@ private final SnippetInstaller installer; public WordTest() { - TargetDescription target = Graal.getRequiredCapability(GraalCompiler.class).target; + TargetDescription target = Graal.getRequiredCapability(CodeCacheProvider.class).getTarget(); installer = new SnippetInstaller(runtime, new Assumptions(false), target); }