perf tools: Support --prefix/--prefix-strip

The objdump utility has useful --prefix / --prefix-strip options to
allow changing source code file names hardcoded into executables' debug
info. Add options to 'perf report', 'perf top' and 'perf annotate',
which are then passed to objdump.

  $ mkdir foo
  $ echo 'main() { for (;;); }' > foo/foo.c
  $ gcc -g foo/foo.c
  foo/foo.c:1:1: warning: return type defaults to ‘int’ [-Wimplicit-int]
      1 | main() { for (;;); }
        | ^~~~
  $ perf record ./a.out
  ^C[ perf record: Woken up 1 times to write data ]
  [ perf record: Captured and wrote 0.230 MB perf.data (5721 samples) ]
  $ mv foo bar
  $ perf annotate
  <does not show source code>
  $ perf annotate --prefix=/home/ak/lsrc/git/bar --prefix-strip=5
  <does show source code>

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Tested-by: Jiri Olsa <jolsa@redhat.com>
LPU-Reference: 20200107210444.214071-1-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/Documentation/perf-annotate.txt b/tools/perf/Documentation/perf-annotate.txt
index e8c972f89357d2dc47bbe57000e503f46d964f37..1b5042f134a8679bf0d6f0e707a839cd76bfce38 100644 (file)
--- a/tools/perf/Documentation/perf-annotate.txt
+++ b/tools/perf/Documentation/perf-annotate.txt
@@ -112,6 +112,12 @@ OPTIONS
 --objdump=<path>::
         Path to objdump binary.
 
+--prefix=PREFIX::
+--prefix-strip=N::
+       Remove first N entries from source file path names in executables
+       and add PREFIX. This allows to display source code compiled on systems
+       with different file system layout.
+
 --skip-missing::
        Skip symbols that cannot be annotated.
 

diff --git a/tools/perf/Documentation/perf-report.txt b/tools/perf/Documentation/perf-report.txt
index 8dbe2119686aab71600a670287ff052c0489a9ec..db61f16ffa56490c0b19cf732220b90380b1ade3 100644 (file)
--- a/tools/perf/Documentation/perf-report.txt
+++ b/tools/perf/Documentation/perf-report.txt
@@ -367,6 +367,12 @@ OPTIONS
 --objdump=<path>::
         Path to objdump binary.
 
+--prefix=PREFIX::
+--prefix-strip=N::
+       Remove first N entries from source file path names in executables
+       and add PREFIX. This allows to display source code compiled on systems
+       with different file system layout.
+
 --group::
        Show event group information together. It forces group output also
        if there are no groups defined in data file.

diff --git a/tools/perf/Documentation/perf-top.txt b/tools/perf/Documentation/perf-top.txt
index 5596129a71cf5d5136e2fba62114ebe9af411ea7..324b6b53c86b65d325dd6726bb35d82b3a03f823 100644 (file)
--- a/tools/perf/Documentation/perf-top.txt
+++ b/tools/perf/Documentation/perf-top.txt
@@ -158,6 +158,12 @@ Default is to monitor all CPUS.
 -M::
 --disassembler-style=:: Set disassembler style for objdump.
 
+--prefix=PREFIX::
+--prefix-strip=N::
+        Remove first N entries from source file path names in executables
+        and add PREFIX. This allows to display source code compiled on systems
+        with different file system layout.
+
 --source::
        Interleave source code with assembly code. Enabled by default,
        disable with --no-source.

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 5898662bc8fbc1bfaeacc04470f37139828e47ff..ff61795a4d13783011cd25682e4894b61da21643 100644 (file)
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -535,6 +535,10 @@ int cmd_annotate(int argc, const char **argv)
                    "Display raw encoding of assembly instructions (default)"),
        OPT_STRING('M', "disassembler-style", &annotate.opts.disassembler_style, "disassembler style",
                   "Specify disassembler style (e.g. -M intel for intel syntax)"),
+       OPT_STRING(0, "prefix", &annotate.opts.prefix, "prefix",
+                   "Add prefix to source file path names in programs (with --prefix-strip)"),
+       OPT_STRING(0, "prefix-strip", &annotate.opts.prefix_strip, "N",
+                   "Strip first N entries of source file path name in programs (with --prefix)"),
        OPT_STRING(0, "objdump", &annotate.opts.objdump_path, "path",
                   "objdump binary to use for disassembly and annotations"),
        OPT_BOOLEAN(0, "group", &symbol_conf.event_group,
@@ -574,6 +578,9 @@ int cmd_annotate(int argc, const char **argv)
                annotate.sym_hist_filter = argv[0];
        }
 
+       if (annotate_check_args(&annotate.opts) < 0)
+               return -EINVAL;
+
        if (symbol_conf.show_nr_samples && annotate.use_gtk) {
                pr_err("--show-nr-samples is not available in --gtk mode at this time\n");
                return ret;

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 3048c1b95b4c7087b21d9cdce05a6a1a1a9aa818..627bb65709880d0f89a3b7aab07fbc74e4ce1e9c 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -1208,6 +1208,10 @@ int cmd_report(int argc, const char **argv)
                    "Display raw encoding of assembly instructions (default)"),
        OPT_STRING('M', "disassembler-style", &report.annotation_opts.disassembler_style, "disassembler style",
                   "Specify disassembler style (e.g. -M intel for intel syntax)"),
+       OPT_STRING(0, "prefix", &report.annotation_opts.prefix, "prefix",
+                   "Add prefix to source file path names in programs (with --prefix-strip)"),
+       OPT_STRING(0, "prefix-strip", &report.annotation_opts.prefix_strip, "N",
+                   "Strip first N entries of source file path name in programs (with --prefix)"),
        OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period,
                    "Show a column with the sum of periods"),
        OPT_BOOLEAN_SET(0, "group", &symbol_conf.event_group, &report.group_set,
@@ -1287,6 +1291,9 @@ int cmd_report(int argc, const char **argv)
                report.symbol_filter_str = argv[0];
        }
 
+       if (annotate_check_args(&report.annotation_opts) < 0)
+               return -EINVAL;
+
        if (report.mmaps_mode)
                report.tasks_mode = true;
 

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 795e353de095094ae482057cafcb9d8a1f0ee984..8affcab756043dc4c31c43ccc43443446afaf37a 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1512,6 +1512,10 @@ int cmd_top(int argc, const char **argv)
                    "objdump binary to use for disassembly and annotations"),
        OPT_STRING('M', "disassembler-style", &top.annotation_opts.disassembler_style, "disassembler style",
                   "Specify disassembler style (e.g. -M intel for intel syntax)"),
+       OPT_STRING(0, "prefix", &top.annotation_opts.prefix, "prefix",
+                   "Add prefix to source file path names in programs (with --prefix-strip)"),
+       OPT_STRING(0, "prefix-strip", &top.annotation_opts.prefix_strip, "N",
+                   "Strip first N entries of source file path name in programs (with --prefix)"),
        OPT_STRING('u', "uid", &target->uid_str, "user", "user to profile"),
        OPT_CALLBACK(0, "percent-limit", &top, "percent",
                     "Don't show entries under that percent", parse_percent_limit),
@@ -1582,6 +1586,9 @@ int cmd_top(int argc, const char **argv)
        if (argc)
                usage_with_options(top_usage, options);
 
+       if (annotate_check_args(&top.annotation_opts) < 0)
+               goto out_delete_evlist;
+
        if (!top.evlist->core.nr_entries &&
            perf_evlist__add_default(top.evlist) < 0) {
                pr_err("Not enough memory for event selector list\n");

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index f5e77ed237e8f5d478abaef1dc3b9051f536b43f..ca73fb74ad03273464abe6bb86455140495542ca 100644 (file)
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1966,14 +1966,20 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args)
        err = asprintf(&command,
                 "%s %s%s --start-address=0x%016" PRIx64
                 " --stop-address=0x%016" PRIx64
-                " -l -d %s %s -C \"$1\"",
+                " -l -d %s %s %s %c%s%c %s%s -C \"$1\"",
                 opts->objdump_path ?: "objdump",
                 opts->disassembler_style ? "-M " : "",
                 opts->disassembler_style ?: "",
                 map__rip_2objdump(map, sym->start),
                 map__rip_2objdump(map, sym->end),
                 opts->show_asm_raw ? "" : "--no-show-raw-insn",
-                opts->annotate_src ? "-S" : "");
+                opts->annotate_src ? "-S" : "",
+                opts->prefix ? "--prefix " : "",
+                opts->prefix ? '"' : ' ',
+                opts->prefix ?: "",
+                opts->prefix ? '"' : ' ',
+                opts->prefix_strip ? "--prefix-strip=" : "",
+                opts->prefix_strip ?: "");
 
        if (err < 0) {
                pr_err("Failure allocating memory for the command to run\n");
@@ -3204,3 +3210,12 @@ int annotate_parse_percent_type(const struct option *opt, const char *_str,
        free(str1);
        return err;
 }
+
+int annotate_check_args(struct annotation_options *args)
+{
+       if (args->prefix_strip && !args->prefix) {
+               pr_err("--prefix-strip requires --prefix\n");
+               return -1;
+       }
+       return 0;
+}

diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 7075d98f69d91189eeb855ed3fc95c52a96e6a90..455403e8feded864661094b4c5fbb26fe8626492 100644 (file)
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -94,6 +94,8 @@ struct annotation_options {
        int  context;
        const char *objdump_path;
        const char *disassembler_style;
+       const char *prefix;
+       const char *prefix_strip;
        unsigned int percent_type;
 };
 
@@ -415,4 +417,7 @@ void annotation_config__init(void);
 
 int annotate_parse_percent_type(const struct option *opt, const char *_str,
                                int unset);
+
+int annotate_check_args(struct annotation_options *args);
+
 #endif /* __PERF_ANNOTATE_H */