# HG changeset patch
# User Andreas Woess <andreas.woess@jku.at>
# Date 1374502843 -7200
# Node ID 3cf5f371dc9f9d2caef0210322519f148fa5a706
# Parent  50f3f395855590d346ca2755943ecdd17308a5f9
Truffle: print inlined call target and rename profiling option.

diff -r 50f3f3958555 -r 3cf5f371dc9f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Mon Jul 22 16:17:45 2013 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Mon Jul 22 16:20:43 2013 +0200
@@ -50,7 +50,7 @@
         this.originalInvokeCounter = compilationThreshold;
         this.rootNode.setCallTarget(this);
 
-        if (TruffleProfiling.getValue()) {
+        if (TruffleCallTargetProfiling.getValue()) {
             registerCallTarget(this);
         }
     }
@@ -75,7 +75,7 @@
 
     @Override
     public Object call(PackedFrame caller, Arguments args) {
-        if (TruffleProfiling.getValue()) {
+        if (TruffleCallTargetProfiling.getValue()) {
             callCount++;
         }
         if (CompilerDirectives.injectBranchProbability(CompilerDirectives.FASTPATH_PROBABILITY, compiledMethod != null)) {
@@ -138,7 +138,7 @@
                                     (timeCompilationFinished - timeCompilationStarted) / 1e6, (timePartialEvaluationFinished - timeCompilationStarted) / 1e6,
                                     (timeCompilationFinished - timePartialEvaluationFinished) / 1e6, nodeCountPartialEval, nodeCountLowered, codeSize);
                 }
-                if (TruffleProfiling.getValue()) {
+                if (TruffleCallTargetProfiling.getValue()) {
                     resetProfiling();
                 }
             }
@@ -237,16 +237,16 @@
             return inlined;
         }
 
-        private void printCallSiteInfo(InliningPolicy policy, List<InlinableCallSiteInfo> inlinableCallSites, String msg) {
+        private static void printCallSiteInfo(InliningPolicy policy, List<InlinableCallSiteInfo> inlinableCallSites, String msg) {
             for (InlinableCallSiteInfo candidate : inlinableCallSites) {
                 printCallSiteInfo(policy, candidate, msg);
             }
         }
 
-        private void printCallSiteInfo(InliningPolicy policy, InlinableCallSiteInfo callSite, String msg) {
+        private static void printCallSiteInfo(InliningPolicy policy, InlinableCallSiteInfo callSite, String msg) {
             String calls = String.format("%4s/%4s", callSite.getCallCount(), policy.callerInvocationCount);
             String nodes = String.format("%3s/%3s", callSite.getInlineNodeCount(), policy.callerNodeCount);
-            OUT.printf("[truffle] %-9s %-50s |Nodes %6s |Calls %6s %7.3f |into %s\n", msg, callSite.getCallSite(), nodes, calls, policy.metric(callSite), target.getRootNode());
+            OUT.printf("[truffle] %-9s %-50s |Nodes %6s |Calls %6s %7.3f |%s\n", msg, callSite.getCallSite(), nodes, calls, policy.metric(callSite), callSite.getCallSite().getCallTarget());
         }
 
         private static final class InliningPolicy {
@@ -405,7 +405,7 @@
 
     private static Map<OptimizedCallTarget, Integer> callTargets;
     static {
-        if (TruffleProfiling.getValue()) {
+        if (TruffleCallTargetProfiling.getValue()) {
             callTargets = new WeakHashMap<>();
 
             Runtime.getRuntime().addShutdownHook(new Thread() {
diff -r 50f3f3958555 -r 3cf5f371dc9f graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java	Mon Jul 22 16:17:45 2013 +0200
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleCompilerOptions.java	Mon Jul 22 16:20:43 2013 +0200
@@ -88,6 +88,6 @@
     @Option(help = "")
     public static final OptionValue<Boolean> TraceTruffleInliningDetails = new OptionValue<>(false);
     @Option(help = "")
-    public static final OptionValue<Boolean> TruffleProfiling = new StableOptionValue<>(false);
+    public static final OptionValue<Boolean> TruffleCallTargetProfiling = new StableOptionValue<>(false);
     // @formatter:on
 }