1 files changed, 10 insertions, 31 deletions

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 89c95289fd51..bc0eec1ce4be 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -699,10 +699,10 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)
         OPT_BOOLEAN(0, "header-only", &report.header_only,
                     "Show only data header."),
         OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
-                   "sort by key(s): pid, comm, dso, symbol, parent, cpu, srcline,"
-                   " dso_to, dso_from, symbol_to, symbol_from, mispredict,"
-                   " weight, local_weight, mem, symbol_daddr, dso_daddr, tlb, "
-                   "snoop, locked, abort, in_tx, transaction"),
+                   "sort by key(s): pid, comm, dso, symbol, parent, cpu, srcline, ..."
+                   " Please refer the man page for the complete list."),
+        OPT_STRING('F', "fields", &field_order, "key[,keys...]",
+                   "output field(s): overhead, period, sample plus all of sort keys"),
         OPT_BOOLEAN(0, "showcpuutilization", &symbol_conf.show_cpu_utilization,
                     "Show sample percentage for different cpu modes"),
         OPT_STRING('p', "parent", &parent_pattern, "regex",
@@ -807,52 +807,31 @@ repeat:
         if (branch_mode == -1 && has_br_stack)
                 sort__mode = SORT_MODE__BRANCH;
 
-        /* sort__mode could be NORMAL if --no-branch-stack */
-        if (sort__mode == SORT_MODE__BRANCH) {
-                /*
-                 * if no sort_order is provided, then specify
-                 * branch-mode specific order
-                 */
-                if (sort_order == default_sort_order)
-                        sort_order = "comm,dso_from,symbol_from,"
-                                     "dso_to,symbol_to";
-
-        }
         if (report.mem_mode) {
                 if (sort__mode == SORT_MODE__BRANCH) {
                         pr_err("branch and mem mode incompatible\n");
                         goto error;
                 }
                 sort__mode = SORT_MODE__MEMORY;
-
-                /*
-                 * if no sort_order is provided, then specify
-                 * branch-mode specific order
-                 */
-                if (sort_order == default_sort_order)
-                        sort_order = "local_weight,mem,sym,dso,symbol_daddr,dso_daddr,snoop,tlb,locked";
         }
 
         if (setup_sorting() < 0) {
-                parse_options_usage(report_usage, options, "s", 1);
+                if (sort_order)
+                        parse_options_usage(report_usage, options, "s", 1);
+                if (field_order)
+                        parse_options_usage(sort_order ? NULL : report_usage,
+                                            options, "F", 1);
                 goto error;
         }
 
-        if (parent_pattern != default_parent_pattern) {
-                if (sort_dimension__add("parent") < 0)
-                        goto error;
-        }
-
         /* Force tty output for header output. */
         if (report.header || report.header_only)
                 use_browser = 0;
 
         if (strcmp(input_name, "-") != 0)
                 setup_browser(true);
-        else {
+        else
                 use_browser = 0;
-                perf_hpp__init();
-        }
 
         if (report.header || report.header_only) {
                 perf_session__fprintf_info(session, stdout,