Mercurial > hg > truffle

changeset 12557:86c74ef1b6f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make AMD64HotSpotTruffleBackend a decorator for the default backend.
author Roland Schatz <roland.schatz@oracle.com>
date Thu, 24 Oct 2013 15:36:39 +0200
parents b247ddd2fa0f
children 0f34a60d0bc6 388bb7650808
files graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64HotSpotTruffleBackend.java graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64HotSpotTruffleBackendFactory.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleBackendFactory.java
diffstat 5 files changed, 153 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java	Thu Oct 24 13:26:27 2013 +0200
+++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java	Thu Oct 24 15:36:39 2013 +0200
@@ -252,7 +252,7 @@
     /**
      * @param installedCodeOwner see {@link Backend#emitCode}
      */
-    protected void emitCodePrefix(ResolvedJavaMethod installedCodeOwner, TargetMethodAssembler tasm, AMD64MacroAssembler asm, RegisterConfig regConfig, HotSpotVMConfig config, Label verifiedStub) {
+    public void emitCodePrefix(ResolvedJavaMethod installedCodeOwner, TargetMethodAssembler tasm, AMD64MacroAssembler asm, RegisterConfig regConfig, HotSpotVMConfig config, Label verifiedStub) {
         HotSpotProviders providers = getProviders();
         if (installedCodeOwner != null && !isStatic(installedCodeOwner.getModifiers())) {
             tasm.recordMark(Marks.MARK_UNVERIFIED_ENTRY);
@@ -282,14 +282,14 @@
     /**
      * @param installedCodeOwner see {@link Backend#emitCode}
      */
-    protected void emitCodeBody(ResolvedJavaMethod installedCodeOwner, TargetMethodAssembler tasm, LIRGenerator lirGen) {
+    public void emitCodeBody(ResolvedJavaMethod installedCodeOwner, TargetMethodAssembler tasm, LIRGenerator lirGen) {
         lirGen.lir.emitCode(tasm);
     }
 
     /**
      * @param installedCodeOwner see {@link Backend#emitCode}
      */
-    protected void emitCodeSuffix(ResolvedJavaMethod installedCodeOwner, TargetMethodAssembler tasm, LIRGenerator lirGen, AMD64MacroAssembler asm, FrameMap frameMap) {
+    public void emitCodeSuffix(ResolvedJavaMethod installedCodeOwner, TargetMethodAssembler tasm, LIRGenerator lirGen, AMD64MacroAssembler asm, FrameMap frameMap) {
         HotSpotProviders providers = getProviders();
         HotSpotFrameContext frameContext = (HotSpotFrameContext) tasm.frameContext;
         if (frameContext != null && !frameContext.isStub) {
--- a/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64HotSpotTruffleBackend.java	Thu Oct 24 13:26:27 2013 +0200
+++ b/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64HotSpotTruffleBackend.java	Thu Oct 24 15:36:39 2013 +0200
@@ -29,27 +29,35 @@
 import com.oracle.graal.asm.*;
 import com.oracle.graal.asm.amd64.*;
 import com.oracle.graal.asm.amd64.AMD64Assembler.ConditionFlag;
+import com.oracle.graal.compiler.gen.*;
+import com.oracle.graal.compiler.target.*;
 import com.oracle.graal.graph.*;
 import com.oracle.graal.hotspot.*;
 import com.oracle.graal.hotspot.amd64.*;
 import com.oracle.graal.hotspot.meta.*;
+import com.oracle.graal.lir.*;
 import com.oracle.graal.lir.asm.*;
+import com.oracle.graal.nodes.*;
+import com.oracle.graal.phases.tiers.*;
 import com.oracle.graal.truffle.*;
 import com.oracle.graal.truffle.hotspot.amd64.util.*;
 import com.oracle.truffle.api.*;
 import com.oracle.truffle.api.frame.*;
 
 /**
- * Subclass of {@link AMD64HotSpotBackend} that injects special code into
+ * Backend that decorates an existing {@link AMD64HotSpotBackend}, injecting special code into
  * {@link OptimizedCallTarget#call(PackedFrame, Arguments)} for making a tail-call to the entry
  * point of the target callee.
  */
-class AMD64HotSpotTruffleBackend extends AMD64HotSpotBackend {
+class AMD64HotSpotTruffleBackend extends Backend {
+
+    private final AMD64HotSpotBackend original;
 
     private HotSpotResolvedJavaMethod optimizedCallTargetCall;
 
-    public AMD64HotSpotTruffleBackend(HotSpotGraalRuntime runtime, HotSpotProviders providers) {
-        super(runtime, providers);
+    public AMD64HotSpotTruffleBackend(AMD64HotSpotBackend original) {
+        super(original.getProviders());
+        this.original = original;
     }
 
     private ResolvedJavaMethod getInstrumentedMethod() throws GraalInternalError {
@@ -66,34 +74,88 @@
     }
 
     @Override
-    protected void emitCodePrefix(ResolvedJavaMethod installedCodeOwner, TargetMethodAssembler tasm, AMD64MacroAssembler asm, RegisterConfig regConfig, HotSpotVMConfig config, Label verifiedStub) {
-        super.emitCodePrefix(installedCodeOwner, tasm, asm, regConfig, config, verifiedStub);
-        if (getInstrumentedMethod().equals(installedCodeOwner)) {
-            HotSpotProviders providers = getRuntime().getHostProviders();
-            Register thisRegister = providers.getCodeCache().getRegisterConfig().getCallingConventionRegisters(Type.JavaCall, Kind.Object)[0];
-            Register spillRegister = AMD64.r10; // TODO(mg): fix me
-            AMD64Address nMethodAddress = new AMD64Address(thisRegister, OptimizedCallTargetFieldInfo.getCompiledMethodFieldOffset());
-            if (config.useCompressedOops) {
-                asm.movl(spillRegister, nMethodAddress);
-                AMD64HotSpotMove.decodePointer(asm, spillRegister, providers.getRegisters().getHeapBaseRegister(), config.narrowOopBase, config.narrowOopShift, config.logMinObjAlignment);
-            } else {
-                asm.movq(spillRegister, nMethodAddress);
-            }
-            Label doProlog = new Label();
+    public SuitesProvider getSuites() {
+        return original.getSuites();
+    }
+
+    @Override
+    public DisassemblerProvider getDisassembler() {
+        return original.getDisassembler();
+    }
+
+    @Override
+    public FrameMap newFrameMap() {
+        return original.newFrameMap();
+    }
+
+    @Override
+    public LIRGenerator newLIRGenerator(StructuredGraph graph, FrameMap frameMap, CallingConvention cc, LIR lir) {
+        return original.newLIRGenerator(graph, frameMap, cc, lir);
+    }
+
+    @Override
+    protected AbstractAssembler createAssembler(FrameMap frameMap) {
+        return null;
+    }
+
+    @Override
+    public TargetMethodAssembler newAssembler(LIRGenerator lirGen, CompilationResult compilationResult) {
+        return original.newAssembler(lirGen, compilationResult);
+    }
+
+    @Override
+    public boolean shouldAllocateRegisters() {
+        return original.shouldAllocateRegisters();
+    }
+
+    @Override
+    public void emitCode(TargetMethodAssembler tasm, LIRGenerator lirGen, ResolvedJavaMethod installedCodeOwner) {
+        AMD64MacroAssembler asm = (AMD64MacroAssembler) tasm.asm;
+        FrameMap frameMap = tasm.frameMap;
+        RegisterConfig regConfig = frameMap.registerConfig;
+        HotSpotVMConfig config = original.getRuntime().getConfig();
+        Label verifiedStub = new Label();
 
-            asm.cmpq(spillRegister, 0);
-            asm.jcc(ConditionFlag.Equal, doProlog);
+        // Emit the prefix
+        original.emitCodePrefix(installedCodeOwner, tasm, asm, regConfig, config, verifiedStub);
+
+        if (getInstrumentedMethod().equals(installedCodeOwner)) {
+            // Inject code for {@link OptimizedCallTarget#call(PackedFrame, Arguments)}
+            injectCode(asm, config);
+        }
+
+        // Emit code for the LIR
+        original.emitCodeBody(installedCodeOwner, tasm, lirGen);
+
+        // Emit the suffix
+        original.emitCodeSuffix(installedCodeOwner, tasm, lirGen, asm, frameMap);
+    }
 
-            AMD64Address codeBlobAddress = new AMD64Address(spillRegister, OptimizedCallTargetFieldInfo.getCodeBlobFieldOffset());
-            asm.movq(spillRegister, codeBlobAddress);
-            asm.cmpq(spillRegister, 0);
-            asm.jcc(ConditionFlag.Equal, doProlog);
+    private void injectCode(AMD64MacroAssembler asm, HotSpotVMConfig config) {
+        HotSpotProviders providers = original.getRuntime().getHostProviders();
+        Register thisRegister = providers.getCodeCache().getRegisterConfig().getCallingConventionRegisters(Type.JavaCall, Kind.Object)[0];
+        Register spillRegister = AMD64.r10; // TODO(mg): fix me
+        AMD64Address nMethodAddress = new AMD64Address(thisRegister, OptimizedCallTargetFieldInfo.getCompiledMethodFieldOffset());
+        if (config.useCompressedOops) {
+            asm.movl(spillRegister, nMethodAddress);
+            AMD64HotSpotMove.decodePointer(asm, spillRegister, providers.getRegisters().getHeapBaseRegister(), config.narrowOopBase, config.narrowOopShift, config.logMinObjAlignment);
+        } else {
+            asm.movq(spillRegister, nMethodAddress);
+        }
+        Label doProlog = new Label();
 
-            AMD64Address verifiedEntryPointAddress = new AMD64Address(spillRegister, config.nmethodEntryOffset);
-            asm.movq(spillRegister, verifiedEntryPointAddress);
-            asm.jmp(spillRegister);
+        asm.cmpq(spillRegister, 0);
+        asm.jcc(ConditionFlag.Equal, doProlog);
 
-            asm.bind(doProlog);
-        }
+        AMD64Address codeBlobAddress = new AMD64Address(spillRegister, OptimizedCallTargetFieldInfo.getCodeBlobFieldOffset());
+        asm.movq(spillRegister, codeBlobAddress);
+        asm.cmpq(spillRegister, 0);
+        asm.jcc(ConditionFlag.Equal, doProlog);
+
+        AMD64Address verifiedEntryPointAddress = new AMD64Address(spillRegister, config.nmethodEntryOffset);
+        asm.movq(spillRegister, verifiedEntryPointAddress);
+        asm.jmp(spillRegister);
+
+        asm.bind(doProlog);
     }
 }
--- a/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64HotSpotTruffleBackendFactory.java	Thu Oct 24 13:26:27 2013 +0200
+++ b/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64HotSpotTruffleBackendFactory.java	Thu Oct 24 15:36:39 2013 +0200
@@ -23,18 +23,22 @@
 package com.oracle.graal.truffle.hotspot.amd64;
 
 import com.oracle.graal.api.runtime.*;
-import com.oracle.graal.hotspot.*;
+import com.oracle.graal.compiler.target.*;
 import com.oracle.graal.hotspot.amd64.*;
-import com.oracle.graal.hotspot.meta.*;
+import com.oracle.graal.truffle.*;
 
 /**
  * Factory to create a Truffle-specialized AMD64 HotSpot backend.
  */
-@ServiceProvider(HotSpotBackendFactory.class)
-public class AMD64HotSpotTruffleBackendFactory extends AMD64HotSpotBackendFactory {
+@ServiceProvider(TruffleBackendFactory.class)
+public class AMD64HotSpotTruffleBackendFactory implements TruffleBackendFactory {
 
     @Override
-    protected AMD64HotSpotBackend createBackend(HotSpotGraalRuntime runtime, HotSpotProviders providers) {
-        return new AMD64HotSpotTruffleBackend(runtime, providers);
+    public Backend createBackend(Backend original) {
+        return new AMD64HotSpotTruffleBackend((AMD64HotSpotBackend) original);
+    }
+
+    public String getArchitecture() {
+        return "AMD64";
     }
 }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java	Thu Oct 24 13:26:27 2013 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java	Thu Oct 24 15:36:39 2013 +0200
@@ -174,6 +174,18 @@
         return method;
     }
 
+    private static Backend instrumentBackend(Backend original) {
+        String arch = original.getTarget().arch.getName();
+
+        for (TruffleBackendFactory factory : ServiceLoader.loadInstalled(TruffleBackendFactory.class)) {
+            if (factory.getArchitecture().equals(arch)) {
+                return factory.createBackend(original);
+            }
+        }
+
+        return original;
+    }
+
     private static CompilationResult compileMethod(ResolvedJavaMethod javaMethod) {
         Providers providers = getGraalProviders();
         MetaAccessProvider metaAccess = providers.getMetaAccess();
@@ -187,8 +199,8 @@
         phasePlan.addPhase(PhasePosition.AFTER_PARSING, graphBuilderPhase);
         CallingConvention cc = getCallingConvention(providers.getCodeCache(), Type.JavaCallee, graph.method(), false);
         Backend backend = Graal.getRequiredCapability(RuntimeProvider.class).getHostBackend();
-        return GraalCompiler.compileGraph(graph, cc, javaMethod, providers, backend, providers.getCodeCache().getTarget(), null, phasePlan, OptimisticOptimizations.ALL, new SpeculationLog(), suites,
-                        new CompilationResult());
+        return GraalCompiler.compileGraph(graph, cc, javaMethod, providers, instrumentBackend(backend), providers.getCodeCache().getTarget(), null, phasePlan, OptimisticOptimizations.ALL,
+                        new SpeculationLog(), suites, new CompilationResult());
     }
 
     private static Providers getGraalProviders() {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleBackendFactory.java	Thu Oct 24 15:36:39 2013 +0200
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2013, 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.truffle;
+
+import com.oracle.graal.compiler.target.*;
+
+public interface TruffleBackendFactory {
+
+    Backend createBackend(Backend original);
+
+    /**
+     * Gets the CPU architecture of this backend.
+     */
+    String getArchitecture();
+}