Mercurial > hg > graal-compiler

changeset 13231:dad021298158

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use CompilationResultBuilderFactory to do patching of OptimizedCallTarget.call()
author Doug Simon <doug.simon@oracle.com>
date Tue, 03 Dec 2013 16:49:12 +0100
parents 01080e31692d
children f1f33d1ff3e2
files 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.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64OptimizedCallTargetInstrumentationFactory.java graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/util/OptimizedCallTargetFieldInfo.java graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/OptimizedCallTargetInstrumentation.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTargetInstrumentationFactory.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleBackendFactory.java mx/projects
diffstat 9 files changed, 237 insertions(+), 314 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64HotSpotTruffleBackend.java	Tue Dec 03 16:35:41 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-/*
- * 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.hotspot.amd64;
-
-import com.oracle.graal.amd64.*;
-import com.oracle.graal.api.code.CallingConvention.Type;
-import com.oracle.graal.api.code.*;
-import com.oracle.graal.api.meta.*;
-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.*;
-
-/**
- * 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 Backend {
-
-    private final AMD64HotSpotBackend original;
-
-    private HotSpotResolvedJavaMethod optimizedCallTargetCall;
-
-    public AMD64HotSpotTruffleBackend(AMD64HotSpotBackend original) {
-        super(original.getProviders());
-        this.original = original;
-    }
-
-    private ResolvedJavaMethod getInstrumentedMethod() throws GraalInternalError {
-        if (optimizedCallTargetCall == null) {
-            try {
-                optimizedCallTargetCall = (HotSpotResolvedJavaMethod) getProviders().getMetaAccess().lookupJavaMethod(
-                                OptimizedCallTarget.class.getDeclaredMethod("call", PackedFrame.class, Arguments.class));
-                optimizedCallTargetCall.setDontInline();
-            } catch (NoSuchMethodException | SecurityException e) {
-                throw new GraalInternalError(e);
-            }
-        }
-        return optimizedCallTargetCall;
-    }
-
-    @Override
-    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 CompilationResultBuilder newCompilationResultBuilder(LIRGenerator lirGen, CompilationResult compilationResult, CompilationResultBuilderFactory factory) {
-        return original.newCompilationResultBuilder(lirGen, compilationResult, factory);
-    }
-
-    @Override
-    public boolean shouldAllocateRegisters() {
-        return original.shouldAllocateRegisters();
-    }
-
-    @Override
-    public void emitCode(CompilationResultBuilder crb, LIRGenerator lirGen, ResolvedJavaMethod installedCodeOwner) {
-        AMD64MacroAssembler asm = (AMD64MacroAssembler) crb.asm;
-        FrameMap frameMap = crb.frameMap;
-        RegisterConfig regConfig = frameMap.registerConfig;
-        HotSpotVMConfig config = original.getRuntime().getConfig();
-        Label verifiedStub = new Label();
-
-        // Emit the prefix
-        original.emitCodePrefix(installedCodeOwner, crb, 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, crb, lirGen);
-
-        // Emit the suffix
-        original.emitCodeSuffix(installedCodeOwner, crb, lirGen, asm, frameMap);
-    }
-
-    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();
-
-        asm.cmpq(spillRegister, 0);
-        asm.jcc(ConditionFlag.Equal, 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	Tue Dec 03 16:35:41 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * 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.hotspot.amd64;
-
-import com.oracle.graal.api.runtime.*;
-import com.oracle.graal.compiler.target.*;
-import com.oracle.graal.hotspot.amd64.*;
-import com.oracle.graal.truffle.*;
-
-/**
- * Factory to create a Truffle-specialized AMD64 HotSpot backend.
- */
-@ServiceProvider(TruffleBackendFactory.class)
-public class AMD64HotSpotTruffleBackendFactory implements TruffleBackendFactory {
-
-    @Override
-    public Backend createBackend(Backend original) {
-        return new AMD64HotSpotTruffleBackend((AMD64HotSpotBackend) original);
-    }
-
-    public String getArchitecture() {
-        return "AMD64";
-    }
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/AMD64OptimizedCallTargetInstrumentationFactory.java	Tue Dec 03 16:49:12 2013 +0100
@@ -0,0 +1,87 @@
+/*
+ * 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.hotspot.amd64;
+
+import com.oracle.graal.amd64.*;
+import com.oracle.graal.api.code.CallingConvention.Type;
+import com.oracle.graal.api.code.*;
+import com.oracle.graal.api.meta.*;
+import com.oracle.graal.api.runtime.*;
+import com.oracle.graal.asm.*;
+import com.oracle.graal.asm.amd64.*;
+import com.oracle.graal.asm.amd64.AMD64Assembler.ConditionFlag;
+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.truffle.*;
+import com.oracle.graal.truffle.hotspot.*;
+
+@ServiceProvider(OptimizedCallTargetInstrumentationFactory.class)
+public class AMD64OptimizedCallTargetInstrumentationFactory implements OptimizedCallTargetInstrumentationFactory {
+
+    public CompilationResultBuilder createBuilder(CodeCacheProvider codeCache, ForeignCallsProvider foreignCalls, FrameMap frameMap, AbstractAssembler asm, FrameContext frameContext,
+                    CompilationResult compilationResult) {
+        return new OptimizedCallTargetInstrumentation(codeCache, foreignCalls, frameMap, asm, frameContext, compilationResult) {
+            @Override
+            protected void injectTailCallCode(HotSpotVMConfig config, HotSpotRegistersProvider registers) {
+                @SuppressWarnings("hiding")
+                AMD64MacroAssembler asm = (AMD64MacroAssembler) this.asm;
+                Register thisRegister = codeCache.getRegisterConfig().getCallingConventionRegisters(Type.JavaCall, Kind.Object)[0];
+                Register spillRegister = AMD64.r10; // TODO(mg): fix me
+                AMD64Address nMethodAddress = new AMD64Address(thisRegister, getFieldOffset("installedCode", OptimizedCallTarget.class));
+                if (config.useCompressedOops) {
+                    asm.movl(spillRegister, nMethodAddress);
+                    AMD64HotSpotMove.decodePointer(asm, spillRegister, registers.getHeapBaseRegister(), config.narrowOopBase, config.narrowOopShift, config.logMinObjAlignment());
+                } else {
+                    asm.movq(spillRegister, nMethodAddress);
+                }
+                Label doProlog = new Label();
+
+                asm.cmpq(spillRegister, 0);
+                asm.jcc(ConditionFlag.Equal, doProlog);
+
+                AMD64Address codeBlobAddress = new AMD64Address(spillRegister, getFieldOffset("codeBlob", HotSpotInstalledCode.class));
+                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);
+            }
+        };
+    }
+
+    public void setInstrumentedMethod(ResolvedJavaMethod method) {
+        HotSpotResolvedJavaMethod hsMethod = (HotSpotResolvedJavaMethod) method;
+        hsMethod.setDontInline();
+    }
+
+    public String getArchitecture() {
+        return "AMD64";
+    }
+}
--- a/graal/com.oracle.graal.truffle.hotspot.amd64/src/com/oracle/graal/truffle/hotspot/amd64/util/OptimizedCallTargetFieldInfo.java	Tue Dec 03 16:35:41 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
- * 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.hotspot.amd64.util;
-
-import java.lang.reflect.*;
-
-import sun.misc.*;
-
-import com.oracle.graal.graph.*;
-import com.oracle.graal.hotspot.meta.*;
-import com.oracle.graal.truffle.*;
-
-public class OptimizedCallTargetFieldInfo {
-
-    private static final Unsafe unsafe = UnsafeAccess.unsafe;
-    private static int compiledMethodFieldOffset = -1;
-    private static int codeBlobFieldOffset = -1;
-
-    public static int getCodeBlobFieldOffset() {
-        if (codeBlobFieldOffset == -1) {
-            codeBlobFieldOffset = getFieldOffset("codeBlob", HotSpotInstalledCode.class);
-        }
-        return codeBlobFieldOffset;
-    }
-
-    public static int getCompiledMethodFieldOffset() {
-        if (compiledMethodFieldOffset == -1) {
-            compiledMethodFieldOffset = getFieldOffset("installedCode", OptimizedCallTarget.class);
-        }
-        return compiledMethodFieldOffset;
-
-    }
-
-    private static int getFieldOffset(String name, Class container) {
-        try {
-            container.getDeclaredField(name).setAccessible(true);
-            Field field = container.getDeclaredField(name);
-            return (int) unsafe.objectFieldOffset(field);
-        } catch (NoSuchFieldException | SecurityException e) {
-            throw GraalInternalError.shouldNotReachHere();
-        }
-    }
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.truffle.hotspot/src/com/oracle/graal/truffle/hotspot/OptimizedCallTargetInstrumentation.java	Tue Dec 03 16:49:12 2013 +0100
@@ -0,0 +1,76 @@
+/*
+ * 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.hotspot;
+
+import java.lang.reflect.*;
+
+import com.oracle.graal.api.code.*;
+import com.oracle.graal.api.code.CompilationResult.Mark;
+import com.oracle.graal.asm.*;
+import com.oracle.graal.graph.*;
+import com.oracle.graal.hotspot.*;
+import com.oracle.graal.hotspot.bridge.*;
+import com.oracle.graal.hotspot.meta.*;
+import com.oracle.graal.lir.*;
+import com.oracle.graal.lir.asm.*;
+import com.oracle.graal.truffle.*;
+import com.oracle.truffle.api.*;
+import com.oracle.truffle.api.frame.*;
+
+/**
+ * Mechanism for injecting special code into
+ * {@link OptimizedCallTarget#call(PackedFrame, Arguments)} .
+ */
+public abstract class OptimizedCallTargetInstrumentation extends CompilationResultBuilder {
+
+    public OptimizedCallTargetInstrumentation(CodeCacheProvider codeCache, ForeignCallsProvider foreignCalls, FrameMap frameMap, AbstractAssembler asm, FrameContext frameContext,
+                    CompilationResult compilationResult) {
+        super(codeCache, foreignCalls, frameMap, asm, frameContext, compilationResult);
+    }
+
+    @Override
+    public Mark recordMark(Object id) {
+        Mark mark = super.recordMark(id);
+        if (Integer.valueOf(Marks.MARK_VERIFIED_ENTRY).equals(id)) {
+            HotSpotVMConfig config = HotSpotGraalRuntime.runtime().getConfig();
+            HotSpotRegistersProvider registers = HotSpotGraalRuntime.runtime().getHostProviders().getRegisters();
+            injectTailCallCode(config, registers);
+        }
+        return mark;
+    }
+
+    protected static int getFieldOffset(String name, Class declaringClass) {
+        try {
+            declaringClass.getDeclaredField(name).setAccessible(true);
+            Field field = declaringClass.getDeclaredField(name);
+            return (int) UnsafeAccess.unsafe.objectFieldOffset(field);
+        } catch (NoSuchFieldException | SecurityException e) {
+            throw GraalInternalError.shouldNotReachHere();
+        }
+    }
+
+    /**
+     * Injects code into the verified entry point of that makes a tail-call to the target callee.
+     */
+    protected abstract void injectTailCallCode(HotSpotVMConfig config, HotSpotRegistersProvider registers);
+}
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java	Tue Dec 03 16:35:41 2013 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java	Tue Dec 03 16:49:12 2013 +0100
@@ -34,6 +34,8 @@
 import com.oracle.graal.api.runtime.*;
 import com.oracle.graal.compiler.*;
 import com.oracle.graal.compiler.target.*;
+import com.oracle.graal.debug.*;
+import com.oracle.graal.debug.Debug.Scope;
 import com.oracle.graal.graph.*;
 import com.oracle.graal.java.*;
 import com.oracle.graal.lir.asm.*;
@@ -161,8 +163,15 @@
     public static void installOptimizedCallTargetCallMethod() {
         Providers providers = getGraalProviders();
         MetaAccessProvider metaAccess = providers.getMetaAccess();
+        CodeCacheProvider codeCache = providers.getCodeCache();
         ResolvedJavaMethod resolvedCallMethod = metaAccess.lookupJavaMethod(getCallMethod());
-        providers.getCodeCache().setDefaultMethod(resolvedCallMethod, compileMethod(resolvedCallMethod));
+        CompilationResult compResult = compileMethod(resolvedCallMethod);
+        try (Scope s = Debug.scope("CodeInstall", codeCache, resolvedCallMethod)) {
+            InstalledCode installedCode = codeCache.setDefaultMethod(resolvedCallMethod, compResult);
+            if (Debug.isDumpEnabled()) {
+                Debug.dump(new Object[]{compResult, installedCode}, "After code installation");
+            }
+        }
     }
 
     private static Method getCallMethod() {
@@ -175,16 +184,15 @@
         return method;
     }
 
-    private static Backend instrumentBackend(Backend original) {
-        String arch = original.getTarget().arch.getName();
-
-        for (TruffleBackendFactory factory : ServiceLoader.loadInstalled(TruffleBackendFactory.class)) {
+    private static CompilationResultBuilderFactory getOptimizedCallTargetInstrumentationFactory(String arch, ResolvedJavaMethod method) {
+        for (OptimizedCallTargetInstrumentationFactory factory : ServiceLoader.loadInstalled(OptimizedCallTargetInstrumentationFactory.class)) {
             if (factory.getArchitecture().equals(arch)) {
-                return factory.createBackend(original);
+                factory.setInstrumentedMethod(method);
+                return factory;
             }
         }
-
-        return original;
+        // No specialization of OptimizedCallTarget on this platform.
+        return CompilationResultBuilderFactory.Default;
     }
 
     private static CompilationResult compileMethod(ResolvedJavaMethod javaMethod) {
@@ -200,8 +208,9 @@
         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, instrumentBackend(backend), providers.getCodeCache().getTarget(), null, phasePlan, OptimisticOptimizations.ALL,
-                        new SpeculationLog(), suites, true, new CompilationResult(), CompilationResultBuilderFactory.Default);
+        CompilationResultBuilderFactory factory = getOptimizedCallTargetInstrumentationFactory(backend.getTarget().arch.getName(), javaMethod);
+        return GraalCompiler.compileGraph(graph, cc, javaMethod, providers, backend, providers.getCodeCache().getTarget(), null, phasePlan, OptimisticOptimizations.ALL, new SpeculationLog(), suites,
+                        true, new CompilationResult(), factory);
     }
 
     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/OptimizedCallTargetInstrumentationFactory.java	Tue Dec 03 16:49:12 2013 +0100
@@ -0,0 +1,45 @@
+/*
+ * 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.api.meta.*;
+import com.oracle.graal.lir.asm.*;
+import com.oracle.truffle.api.*;
+import com.oracle.truffle.api.frame.*;
+
+/**
+ * A service for creating a specialized {@link CompilationResultBuilder} used to inject code into
+ * {@link OptimizedCallTarget#call(PackedFrame, Arguments)}.
+ */
+public interface OptimizedCallTargetInstrumentationFactory extends CompilationResultBuilderFactory {
+
+    /**
+     * Gets the architecture supported by this factory.
+     */
+    String getArchitecture();
+
+    /**
+     * Notifies this object of the method that is being instrumented.
+     */
+    void setInstrumentedMethod(ResolvedJavaMethod method);
+}
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleBackendFactory.java	Tue Dec 03 16:35:41 2013 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * 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();
-}
--- a/mx/projects	Tue Dec 03 16:35:41 2013 +0100
+++ b/mx/projects	Tue Dec 03 16:49:12 2013 +0100
@@ -667,10 +667,19 @@
 project@com.oracle.graal.truffle.test@javaCompliance=1.7
 project@com.oracle.graal.truffle.test@workingSets=Graal,Truffle,Test
 
+# graal.truffle.hotspot
+project@com.oracle.graal.truffle.hotspot@subDir=graal
+project@com.oracle.graal.truffle.hotspot@sourceDirs=src
+project@com.oracle.graal.truffle.hotspot@dependencies=com.oracle.graal.truffle,com.oracle.graal.hotspot
+project@com.oracle.graal.truffle.hotspot@checkstyle=com.oracle.graal.graph
+project@com.oracle.graal.truffle.hotspot@javaCompliance=1.7
+project@com.oracle.graal.truffle.hotspot@annotationProcessors=com.oracle.graal.service.processor
+project@com.oracle.graal.truffle.hotspot@workingSets=Graal,Truffle
+
 # graal.truffle.hotspot.amd64
 project@com.oracle.graal.truffle.hotspot.amd64@subDir=graal
 project@com.oracle.graal.truffle.hotspot.amd64@sourceDirs=src
-project@com.oracle.graal.truffle.hotspot.amd64@dependencies=com.oracle.graal.truffle,com.oracle.graal.hotspot.amd64
+project@com.oracle.graal.truffle.hotspot.amd64@dependencies=com.oracle.graal.truffle.hotspot,com.oracle.graal.hotspot.amd64
 project@com.oracle.graal.truffle.hotspot.amd64@checkstyle=com.oracle.graal.graph
 project@com.oracle.graal.truffle.hotspot.amd64@javaCompliance=1.7
 project@com.oracle.graal.truffle.hotspot.amd64@annotationProcessors=com.oracle.graal.service.processor