perf annotate: Return arch from symbol__disassemble() and save it in browser

In annotate browser, we will add support to check fused instructions.
While this is x86-specific feature so we need the annotate browser to
know what the arch it runs on.

symbol__disassemble() has figured out the arch. This patch just lets the
arch return from symbol__disassemble and save the arch in annotate
browser.

Signed-off-by: Yao Jin <yao.jin@linux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1497840958-4759-2-git-send-email-yao.jin@linux.intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 10b6362ca0bf7e0b6d5fce4697b15645ba816f02..2bcfa46913c84a9e698d6b5fbc698daa61eaf7de 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -134,7 +134,7 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he)
                return err;
        }
 
-       err = symbol__disassemble(sym, map, NULL, 0);
+       err = symbol__disassemble(sym, map, NULL, 0, NULL);
        if (err == 0) {
 out_assign:
                top->sym_filter_entry = he;

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 7a03389b7a03b8a9088869f8e4d083fcde79b69a..27f41f28dcb49a10a1bcb2319f012d9953e552f2 100644 (file)
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -46,12 +46,15 @@ static struct annotate_browser_opt {
        .jump_arrows    = true,
 };
 
+struct arch;
+
 struct annotate_browser {
        struct ui_browser b;
        struct rb_root    entries;
        struct rb_node    *curr_hot;
        struct disasm_line  *selection;
        struct disasm_line  **offsets;
+       struct arch         *arch;
        int                 nr_events;
        u64                 start;
        int                 nr_asm_entries;
@@ -1070,7 +1073,8 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map,
                  (nr_pcnt - 1);
        }
 
-       err = symbol__disassemble(sym, map, perf_evsel__env_arch(evsel), sizeof_bdl);
+       err = symbol__disassemble(sym, map, perf_evsel__env_arch(evsel),
+                                 sizeof_bdl, &browser.arch);
        if (err) {
                char msg[BUFSIZ];
                symbol__strerror_disassemble(sym, map, err, msg, sizeof(msg));

diff --git a/tools/perf/ui/gtk/annotate.c b/tools/perf/ui/gtk/annotate.c
index e99ba86158d29b9ab637e66bac3182f7f429d88f..d903fd493416bf557c23e9d5d4f59d5fcd83efcc 100644 (file)
--- a/tools/perf/ui/gtk/annotate.c
+++ b/tools/perf/ui/gtk/annotate.c
@@ -168,7 +168,8 @@ static int symbol__gtk_annotate(struct symbol *sym, struct map *map,
        if (map->dso->annotate_warned)
                return -1;
 
-       err = symbol__disassemble(sym, map, perf_evsel__env_arch(evsel), 0);
+       err = symbol__disassemble(sym, map, perf_evsel__env_arch(evsel),
+                                 0, NULL);
        if (err) {
                char msg[BUFSIZ];
                symbol__strerror_disassemble(sym, map, err, msg, sizeof(msg));

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index ddbd56df91878884a4de5da2a29aae991e0689a0..be1caabb92906befc755d1b99e22cb6a0439dc34 100644 (file)
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1379,7 +1379,9 @@ static const char *annotate__norm_arch(const char *arch_name)
        return normalize_arch((char *)arch_name);
 }
 
-int symbol__disassemble(struct symbol *sym, struct map *map, const char *arch_name, size_t privsize)
+int symbol__disassemble(struct symbol *sym, struct map *map,
+                       const char *arch_name, size_t privsize,
+                       struct arch **parch)
 {
        struct dso *dso = map->dso;
        char command[PATH_MAX * 2];
@@ -1405,6 +1407,9 @@ int symbol__disassemble(struct symbol *sym, struct map *map, const char *arch_na
        if (arch == NULL)
                return -ENOTSUP;
 
+       if (parch)
+               *parch = arch;
+
        if (arch->init) {
                err = arch->init(arch);
                if (err) {
@@ -1901,7 +1906,8 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map,
        struct rb_root source_line = RB_ROOT;
        u64 len;
 
-       if (symbol__disassemble(sym, map, perf_evsel__env_arch(evsel), 0) < 0)
+       if (symbol__disassemble(sym, map, perf_evsel__env_arch(evsel),
+                               0, NULL) < 0)
                return -1;
 
        len = symbol__size(sym);

diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 948aa8e6fd394729bc67441823f64c17508756d6..21055034aedd6a07177d0954d629a48862c514a1 100644 (file)
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -158,7 +158,9 @@ int hist_entry__inc_addr_samples(struct hist_entry *he, int evidx, u64 addr);
 int symbol__alloc_hist(struct symbol *sym);
 void symbol__annotate_zero_histograms(struct symbol *sym);
 
-int symbol__disassemble(struct symbol *sym, struct map *map, const char *arch_name, size_t privsize);
+int symbol__disassemble(struct symbol *sym, struct map *map,
+                       const char *arch_name, size_t privsize,
+                       struct arch **parch);
 
 enum symbol_disassemble_errno {
        SYMBOL_ANNOTATE_ERRNO__SUCCESS          = 0,