4 files changed, 62 insertions, 10 deletions

diff --git a/tools/perf/Documentation/perf-top.txt b/tools/perf/Documentation/perf-top.txt
index f6a23eb294e7..556cec09bf50 100644
--- a/tools/perf/Documentation/perf-top.txt
+++ b/tools/perf/Documentation/perf-top.txt
@@ -160,9 +160,10 @@ Default is to monitor all CPUS.
 -g::
         Enables call-graph (stack chain/backtrace) recording.
 
---call-graph::
+--call-graph [mode,type,min[,limit],order[,key][,branch]]::
         Setup and enable call-graph (stack chain/backtrace) recording,
-        implies -g.
+        implies -g.  See `--call-graph` section in perf-record and
+        perf-report man pages for details.
 
 --children::
         Accumulate callchain of children to parent entry so that then can
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 6f641fd68296..1de381d3f29f 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1053,8 +1053,22 @@ callchain_opt(const struct option *opt, const char *arg, int unset)
 static int
 parse_callchain_opt(const struct option *opt, const char *arg, int unset)
 {
-        symbol_conf.use_callchain = true;
-        return record_parse_callchain_opt(opt, arg, unset);
+        struct record_opts *record = (struct record_opts *)opt->value;
+
+        record->callgraph_set = true;
+        callchain_param.enabled = !unset;
+        callchain_param.record_mode = CALLCHAIN_FP;
+
+        /*
+         * --no-call-graph
+         */
+        if (unset) {
+                symbol_conf.use_callchain = false;
+                callchain_param.record_mode = CALLCHAIN_NONE;
+                return 0;
+        }
+
+        return parse_callchain_top_opt(arg);
 }
 
 static int perf_top_config(const char *var, const char *value, void *cb)
@@ -1079,6 +1093,8 @@ parse_percent_limit(const struct option *opt, const char *arg,
         return 0;
 }
 
+const char top_callchain_help[] = CALLCHAIN_RECORD_HELP ", " CALLCHAIN_REPORT_HELP;
+
 int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
 {
         char errbuf[BUFSIZ];
@@ -1154,11 +1170,11 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
         OPT_BOOLEAN('n', "show-nr-samples", &symbol_conf.show_nr_samples,
                     "Show a column with the number of samples"),
         OPT_CALLBACK_NOOPT('g', NULL, &top.record_opts,
-                           NULL, "enables call-graph recording",
+                           NULL, "enables call-graph recording and display",
                            &callchain_opt),
         OPT_CALLBACK(0, "call-graph", &top.record_opts,
-                     "mode[,dump_size]", record_callchain_help,
-                     &parse_callchain_opt),
+                     "mode[,dump_size],output_type,min_percent[,print_limit],call_order[,branch]",
+                     top_callchain_help, &parse_callchain_opt),
         OPT_BOOLEAN(0, "children", &symbol_conf.cumulate_callchain,
                     "Accumulate callchains of children and show total overhead as well"),
         OPT_INTEGER(0, "max-stack", &top.max_stack,
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 773fe13ce627..842be32899ee 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -77,12 +77,14 @@ static int parse_callchain_sort_key(const char *value)
         return -1;
 }
 
-int
-parse_callchain_report_opt(const char *arg)
+static int
+__parse_callchain_report_opt(const char *arg, bool allow_record_opt)
 {
         char *tok;
         char *endptr;
         bool minpcnt_set = false;
+        bool record_opt_set = false;
+        bool try_stack_size = false;
 
         symbol_conf.use_callchain = true;
 
@@ -100,6 +102,28 @@ parse_callchain_report_opt(const char *arg)
                     !parse_callchain_order(tok) ||
                     !parse_callchain_sort_key(tok)) {
                         /* parsing ok - move on to the next */
+                        try_stack_size = false;
+                        goto next;
+                } else if (allow_record_opt && !record_opt_set) {
+                        if (parse_callchain_record(tok, &callchain_param))
+                                goto try_numbers;
+
+                        /* assume that number followed by 'dwarf' is stack size */
+                        if (callchain_param.record_mode == CALLCHAIN_DWARF)
+                                try_stack_size = true;
+
+                        record_opt_set = true;
+                        goto next;
+                }
+
+try_numbers:
+                if (try_stack_size) {
+                        unsigned long size = 0;
+
+                        if (get_stack_size(tok, &size) < 0)
+                                return -1;
+                        callchain_param.dump_size = size;
+                        try_stack_size = false;
                 } else if (!minpcnt_set) {
                         /* try to get the min percent */
                         callchain_param.min_percent = strtod(tok, &endptr);
@@ -112,7 +136,7 @@ parse_callchain_report_opt(const char *arg)
                         if (tok == endptr)
                                 return -1;
                 }
-
+next:
                 arg = NULL;
         }
 
@@ -123,6 +147,16 @@ parse_callchain_report_opt(const char *arg)
         return 0;
 }
 
+int parse_callchain_report_opt(const char *arg)
+{
+        return __parse_callchain_report_opt(arg, false);
+}
+
+int parse_callchain_top_opt(const char *arg)
+{
+        return __parse_callchain_report_opt(arg, true);
+}
+
 int perf_callchain_config(const char *var, const char *value)
 {
         char *endptr;
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index c9e3a2e85a72..836d59a001bc 100644
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -192,6 +192,7 @@ extern const char record_callchain_help[];
 extern int parse_callchain_record(const char *arg, struct callchain_param *param);
 int parse_callchain_record_opt(const char *arg, struct callchain_param *param);
 int parse_callchain_report_opt(const char *arg);
+int parse_callchain_top_opt(const char *arg);
 int perf_callchain_config(const char *var, const char *value);
 
 static inline void callchain_cursor_snapshot(struct callchain_cursor *dest,