Extend PrintAnalysisCallTree option

PrintAnalysisCallTree option accept a list of methods to print
the call tree of them, or an empty string to print all call trees.

Author: ziyilin

docs/reference-manual/native-image/Reports.md

@@ -17,7 +17,10 @@ the image heap, respectively.
 The call tree is a a breadth-first tree reduction of the call graph as seen by the points-to analysis.
 The points-to analysis eliminates calls to methods that it determines cannot be reachable at runtime, based on the analysed receiver types.
 It also completely eliminates invocations in unreachable code blocks, e.g., blocks guarded by a type check that always fails.
-The call tree report is enabled using the `-H:+PrintAnalysisCallTree` option.
+The call tree report is enabled using the `-H:PrintAnalysisCallTree=<comma-separated method list>` option. 
+Only the specified methods' call tree will be printed out, while `-H:PrintAnalysisCallTree=` prints call tree for all entry methods. 
+The method should be specified with its full qualified name, such as `java.lang.String.hashCode()` for normal method 
+and `java.lang.String.<clinit>()` for class static initialization method.
 It produces a file with the structure:
 
 ```

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/AnalysisReportsOptions.java

@@ -36,7 +36,7 @@ public class AnalysisReportsOptions {
     public static final OptionKey<String> AnalysisStatisticsFile = new OptionKey<>(null);
 
     @Option(help = "Print analysis call tree, a breadth-first tree reduction of the call graph.")//
-    public static final OptionKey<Boolean> PrintAnalysisCallTree = new OptionKey<>(false);
+    public static final OptionKey<String> PrintAnalysisCallTree = new OptionKey<>(null);
 
     @Option(help = "Print image object hierarchy.")//
     public static final OptionKey<Boolean> PrintImageObjectTree = new OptionKey<>(false);

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/reports/CallTreePrinter.java

@@ -52,11 +52,17 @@
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
 public final class CallTreePrinter {
+    private static Set<String> printMethods = new HashSet<>();
+    private static Set<Integer> printedID = new HashSet<>();
+    private static boolean printAll = false;
 
-    public static void print(BigBang bigbang, String reportsPath, String reportName) {
+    public static void print(BigBang bigbang, String printCallTreeMethods, String reportsPath, String reportName) {
         CallTreePrinter printer = new CallTreePrinter(bigbang);
         printer.buildCallTree();
-
+        Arrays.stream(printCallTreeMethods.split(",")).forEach(printMethods::add);
+        if (printCallTreeMethods.length() == 0) {
+            printAll = true;
+        }
         ReportUtils.report("call tree", reportsPath, "call_tree_" + reportName, "txt",
                         printer::printMethods);
         ReportUtils.report("list of used methods", reportsPath, "used_methods_" + reportName, "txt",
@@ -221,40 +227,64 @@ private void printMethods(PrintWriter out) {
         while (iterator.hasNext()) {
             MethodNode node = iterator.next();
             boolean lastEntryPoint = !iterator.hasNext();
-            out.format("%s%s %s %n", lastEntryPoint ? LAST_CHILD : CHILD, "entry", node.format());
-            printCallTreeNode(out, lastEntryPoint ? EMPTY_INDENT : CONNECTING_INDENT, node);
+            printCallTreeNode(out, lastEntryPoint ? EMPTY_INDENT : CONNECTING_INDENT, node, false, lastEntryPoint ? LAST_CHILD : CHILD);
         }
         out.println();
     }
 
-    private static void printCallTreeNode(PrintWriter out, String prefix, MethodNode node) {
+    private static void printCallTreeNode(PrintWriter out, String prefix, MethodNode node, boolean shouldPrint, String beginning) {
+        boolean print = shouldPrint;
+        if (!shouldPrint) {
+            String methodName = node.method.getQualifiedName();
+            if (printAll || printMethods.remove(methodName)) {
+                print = true;
+                out.format("%s%s %s %n", beginning, "entry", node.format());
+            }
+        }
 
         for (int invokeIdx = 0; invokeIdx < node.invokes.size(); invokeIdx++) {
             InvokeNode invoke = node.invokes.get(invokeIdx);
             boolean lastInvoke = invokeIdx == node.invokes.size() - 1;
             if (invoke.isDirectInvoke) {
                 if (invoke.callees.size() > 0) {
                     Node calleeNode = invoke.callees.get(0);
-                    out.format("%s%s%s %s @bci=%s %n", prefix, (lastInvoke ? LAST_CHILD : CHILD),
-                                    "directly calls", calleeNode.format(), invoke.formatLocation());
-                    if (calleeNode instanceof MethodNode) {
-                        printCallTreeNode(out, prefix + (lastInvoke ? EMPTY_INDENT : CONNECTING_INDENT), (MethodNode) calleeNode);
+                    boolean isNative = invoke.targetMethod.wrapped.getClass().getName().equals("com.oracle.svm.jni.hosted.JNINativeCallWrapperMethod");
+                    if (print) {
+                        calleeNode = extendNodeReference(calleeNode);
+                        out.format("%s%s%s %s @bci=%s %s %n", prefix, (lastInvoke ? LAST_CHILD : CHILD),
+                                        "directly calls", calleeNode.format(), invoke.formatLocation(), isNative ? "(Native Method)" : "");
+                    }
+                    if (!isNative && calleeNode instanceof MethodNode) {
+                        printCallTreeNode(out, prefix + (lastInvoke ? EMPTY_INDENT : CONNECTING_INDENT), (MethodNode) calleeNode, print, beginning);
                     }
                 }
             } else {
-                out.format("%s%s%s %s @bci=%s%n", prefix, (lastInvoke ? LAST_CHILD : CHILD),
-                                "virtually calls", invoke.formatTarget(), invoke.formatLocation());
+                if (print) {
+                    out.format("%s%s%s %s @bci=%s%n", prefix, (lastInvoke ? LAST_CHILD : CHILD),
+                                    "virtually calls", invoke.formatTarget(), invoke.formatLocation());
+                }
                 for (int calleeIdx = 0; calleeIdx < invoke.callees.size(); calleeIdx++) {
                     boolean lastCallee = calleeIdx == invoke.callees.size() - 1;
                     Node calleeNode = invoke.callees.get(calleeIdx);
-                    out.format("%s%s%s %s %n", prefix + (lastInvoke ? EMPTY_INDENT : CONNECTING_INDENT), (lastCallee ? LAST_CHILD : CHILD),
-                                    "is overridden by", calleeNode.format());
+                    if (print) {
+                        calleeNode = extendNodeReference(calleeNode);
+                        out.format("%s%s%s %s %n", prefix + (lastInvoke ? EMPTY_INDENT : CONNECTING_INDENT), (lastCallee ? LAST_CHILD : CHILD),
+                                        "is overridden by", calleeNode.format());
+                    }
                     if (calleeNode instanceof MethodNode) {
-                        printCallTreeNode(out, prefix + (lastInvoke ? EMPTY_INDENT : CONNECTING_INDENT) + (lastCallee ? EMPTY_INDENT : CONNECTING_INDENT), (MethodNode) calleeNode);
+                        printCallTreeNode(out, prefix + (lastInvoke ? EMPTY_INDENT : CONNECTING_INDENT) + (lastCallee ? EMPTY_INDENT : CONNECTING_INDENT), (MethodNode) calleeNode, print, beginning);
                     }
                 }
             }
         }
+
+    }
+
+    private static Node extendNodeReference(Node calleeNode) {
+        if (calleeNode instanceof MethodNodeReference && printedID.add(((MethodNodeReference) calleeNode).methodNode.id)) {
+            calleeNode = ((MethodNodeReference) calleeNode).methodNode;
+        }
+        return calleeNode;
     }
 
     private void printUsedMethods(PrintWriter out) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java

@@ -776,8 +776,8 @@ private boolean runPointsToAnalysis(String imageName, OptionValues options, Debu
                     StatisticsPrinter.print(bigbang, SubstrateOptions.reportsPath(), ReportUtils.extractImageName(imageName));
                 }
 
-                if (AnalysisReportsOptions.PrintAnalysisCallTree.getValue(options)) {
-                    CallTreePrinter.print(bigbang, SubstrateOptions.reportsPath(), ReportUtils.extractImageName(imageName));
+                if (AnalysisReportsOptions.PrintAnalysisCallTree.hasBeenSet(options)) {
+                    CallTreePrinter.print(bigbang, AnalysisReportsOptions.PrintAnalysisCallTree.getValue(options), SubstrateOptions.reportsPath(), ReportUtils.extractImageName(imageName));
                 }
 
                 if (AnalysisReportsOptions.PrintImageObjectTree.getValue(options)) {