perf c2c: Add annotation support to perf c2c report

Perf c2c report currently specified the code address and source:line
information in the cacheline browser, while it is lack of annotation
support like perf report to directly show the disassembly code for
the particular symbol shared that same cacheline. This patches add
a key 'a' binding to the cacheline browser which reuse the annotation
browser to show the disassembly view for easier analysis of cacheline
contentions.

Signed-off-by: Tianyou Li <tianyou.li@intel.com>
Reviewed-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
Reviewed-by: Thomas Falcon <thomas.falcon@intel.com>
Reviewed-by: Jiebin Sun <jiebin.sun@intel.com>
Reviewed-by: Pan Deng <pan.deng@intel.com>
Reviewed-by: Zhiguo Zhou <zhiguo.zhou@intel.com>
Reviewed-by: Wangyang Guo <wangyang.guo@intel.com>
Tested-by: Ravi Bangoria <ravi.bangoria@amd.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/Documentation/perf-c2c.txt b/tools/perf/Documentation/perf-c2c.txt
index f4af2dd6ab3185250056614d5bb6837f24a46dac..40b0f71a2c44eb642ff3bb234631a614b7c4fc9d 100644 (file)
--- a/tools/perf/Documentation/perf-c2c.txt
+++ b/tools/perf/Documentation/perf-c2c.txt
@@ -143,6 +143,13 @@ REPORT OPTIONS
        feature, which causes cacheline sharing to behave like the cacheline
        size is doubled.
 
+-M::
+--disassembler-style=::
+       Set disassembler style for objdump.
+
+--objdump=<path>::
+        Path to objdump binary.
+
 C2C RECORD
 ----------
 The perf c2c record command setup options related to HITM cacheline analysis

diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
index 9e9ff471ddd16e46c5dff4e1cf2527b05a896256..a37e886ff3d75314e2e9beb678d9815a4527507f 100644 (file)
--- a/tools/perf/builtin-c2c.c
+++ b/tools/perf/builtin-c2c.c
@@ -45,6 +45,8 @@
 #include "pmus.h"
 #include "string2.h"
 #include "util/util.h"
+#include "util/symbol.h"
+#include "util/annotate.h"
 
 struct c2c_hists {
        struct hists            hists;
@@ -62,6 +64,7 @@ struct compute_stats {
 
 struct c2c_hist_entry {
        struct c2c_hists        *hists;
+       struct evsel            *evsel;
        struct c2c_stats         stats;
        unsigned long           *cpuset;
        unsigned long           *nodeset;
@@ -225,6 +228,12 @@ he__get_c2c_hists(struct hist_entry *he,
        return hists;
 }
 
+static void c2c_he__set_evsel(struct c2c_hist_entry *c2c_he,
+                               struct evsel *evsel)
+{
+       c2c_he->evsel = evsel;
+}
+
 static void c2c_he__set_cpu(struct c2c_hist_entry *c2c_he,
                            struct perf_sample *sample)
 {
@@ -275,6 +284,33 @@ static void compute_stats(struct c2c_hist_entry *c2c_he,
                update_stats(&cstats->load, weight);
 }
 
+/*
+ * Return true if annotation is possible. When list is NULL,
+ * it means that we are called at the c2c_browser level,
+ * in that case we allow annotation to be initialized. When list
+ * is non-NULL, it means that we are called at the cacheline_browser
+ * level, in that case we allow annotation only if use_browser
+ * is set and symbol information is available.
+ */
+static bool perf_c2c__has_annotation(struct perf_hpp_list *list)
+{
+       if (use_browser != 1)
+               return false;
+       return !list || list->sym;
+}
+
+static void perf_c2c__evsel_hists_inc_stats(struct evsel *evsel,
+                                           struct hist_entry *he,
+                                           struct perf_sample *sample)
+{
+       struct hists *evsel_hists = evsel__hists(evsel);
+
+       hists__inc_nr_samples(evsel_hists, he->filtered);
+       evsel_hists->stats.total_period += sample->period;
+       if (!he->filtered)
+               evsel_hists->stats.total_non_filtered_period += sample->period;
+}
+
 static int process_sample_event(const struct perf_tool *tool __maybe_unused,
                                union perf_event *event,
                                struct perf_sample *sample,
@@ -334,8 +370,15 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused,
 
        c2c_he__set_cpu(c2c_he, sample);
        c2c_he__set_node(c2c_he, sample);
+       c2c_he__set_evsel(c2c_he, evsel);
 
        hists__inc_nr_samples(&c2c_hists->hists, he->filtered);
+
+       if (perf_c2c__has_annotation(NULL)) {
+               perf_c2c__evsel_hists_inc_stats(evsel, he, sample);
+               addr_map_symbol__inc_samples(mem_info__iaddr(mi), sample, evsel);
+       }
+
        ret = hist_entry__append_callchain(he, sample);
 
        if (!ret) {
@@ -371,6 +414,7 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused,
 
                c2c_he__set_cpu(c2c_he, sample);
                c2c_he__set_node(c2c_he, sample);
+               c2c_he__set_evsel(c2c_he, evsel);
 
                hists__inc_nr_samples(&c2c_hists->hists, he->filtered);
                ret = hist_entry__append_callchain(he, sample);
@@ -1997,6 +2041,9 @@ static int c2c_hists__init_sort(struct perf_hpp_list *hpp_list, char *name, stru
        if (dim == &dim_dso)
                hpp_list->dso = 1;
 
+       if (dim == &dim_symbol || dim == &dim_iaddr)
+               hpp_list->sym = 1;
+
        perf_hpp_list__register_sort_field(hpp_list, &c2c_fmt->fmt);
        return 0;
 }
@@ -2550,6 +2597,40 @@ static void perf_c2c__hists_fprintf(FILE *out, struct perf_session *session)
 }
 
 #ifdef HAVE_SLANG_SUPPORT
+
+static int perf_c2c__toggle_annotation(struct hist_browser *browser)
+{
+       struct hist_entry *he = browser->he_selection;
+       struct symbol *sym = NULL;
+       struct annotated_source *src = NULL;
+       struct c2c_hist_entry *c2c_he = NULL;
+
+       if (!perf_c2c__has_annotation(he->hists->hpp_list)) {
+               ui_browser__help_window(&browser->b, "No annotation support");
+               return 0;
+       }
+
+       if (he == NULL) {
+               ui_browser__help_window(&browser->b, "No entry selected for annotation");
+               return 0;
+       }
+
+       sym = he->ms.sym;
+       if (sym == NULL) {
+               ui_browser__help_window(&browser->b, "Can not annotate, no symbol found");
+               return 0;
+       }
+
+       src = symbol__hists(sym, 0);
+       if (src == NULL) {
+               ui_browser__help_window(&browser->b, "Failed to initialize annotation source");
+               return 0;
+       }
+
+       c2c_he = container_of(he, struct c2c_hist_entry, he);
+       return hist_entry__tui_annotate(he, c2c_he->evsel, NULL);
+}
+
 static void c2c_browser__update_nr_entries(struct hist_browser *hb)
 {
        u64 nr_entries = 0;
@@ -2617,6 +2698,7 @@ static int perf_c2c__browse_cacheline(struct hist_entry *he)
        " ENTER         Toggle callchains (if present) \n"
        " n             Toggle Node details info \n"
        " s             Toggle full length of symbol and source line columns \n"
+       " a             Toggle annotation view \n"
        " q             Return back to cacheline list \n";
 
        if (!he)
@@ -2651,6 +2733,9 @@ static int perf_c2c__browse_cacheline(struct hist_entry *he)
                        c2c.node_info = (c2c.node_info + 1) % 3;
                        setup_nodes_header();
                        break;
+               case 'a':
+                       perf_c2c__toggle_annotation(browser);
+                       break;
                case 'q':
                        goto out;
                case '?':
@@ -3006,6 +3091,7 @@ static int perf_c2c__report(int argc, const char **argv)
        const char *display = NULL;
        const char *coalesce = NULL;
        bool no_source = false;
+       const char *disassembler_style = NULL, *objdump_path = NULL;
        const struct option options[] = {
        OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
                   "file", "vmlinux pathname"),
@@ -3033,6 +3119,10 @@ static int perf_c2c__report(int argc, const char **argv)
        OPT_BOOLEAN(0, "stitch-lbr", &c2c.stitch_lbr,
                    "Enable LBR callgraph stitching approach"),
        OPT_BOOLEAN(0, "double-cl", &chk_double_cl, "Detect adjacent cacheline false sharing"),
+       OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",
+                  "Specify disassembler style (e.g. -M intel for intel syntax)"),
+       OPT_STRING(0, "objdump", &objdump_path, "path",
+                  "objdump binary to use for disassembly and annotations"),
        OPT_PARENT(c2c_options),
        OPT_END()
        };
@@ -3040,6 +3130,12 @@ static int perf_c2c__report(int argc, const char **argv)
        const char *output_str, *sort_str = NULL;
        struct perf_env *env;
 
+       annotation_options__init();
+
+       err = hists__init();
+       if (err < 0)
+               goto out;
+
        argc = parse_options(argc, argv, options, report_c2c_usage,
                             PARSE_OPT_STOP_AT_NON_OPTION);
        if (argc)
@@ -3052,6 +3148,27 @@ static int perf_c2c__report(int argc, const char **argv)
        if (c2c.stats_only)
                c2c.use_stdio = true;
 
+       /**
+        * Annotation related options disassembler_style, objdump_path are set
+        * in the c2c_options, so we can use them here.
+        */
+       if (disassembler_style) {
+               annotate_opts.disassembler_style = strdup(disassembler_style);
+               if (!annotate_opts.disassembler_style) {
+                       err = -ENOMEM;
+                       pr_err("Failed to allocate memory for annotation options\n");
+                       goto out;
+               }
+       }
+       if (objdump_path) {
+               annotate_opts.objdump_path = strdup(objdump_path);
+               if (!annotate_opts.objdump_path) {
+                       err = -ENOMEM;
+                       pr_err("Failed to allocate memory for annotation options\n");
+                       goto out;
+               }
+       }
+
        err = symbol__validate_sym_arguments();
        if (err)
                goto out;
@@ -3126,6 +3243,38 @@ static int perf_c2c__report(int argc, const char **argv)
        if (err)
                goto out_mem2node;
 
+       if (c2c.use_stdio)
+               use_browser = 0;
+       else
+               use_browser = 1;
+
+       /*
+        * Only in the TUI browser we are doing integrated annotation,
+        * so don't allocate extra space that won't be used in the stdio
+        * implementation.
+        */
+       if (perf_c2c__has_annotation(NULL)) {
+               int ret = symbol__annotation_init();
+
+               if (ret < 0)
+                       goto out_mem2node;
+               /*
+                * For searching by name on the "Browse map details".
+                * providing it only in verbose mode not to bloat too
+                * much struct symbol.
+                */
+               if (verbose > 0) {
+                       /*
+                        * XXX: Need to provide a less kludgy way to ask for
+                        * more space per symbol, the u32 is for the index on
+                        * the ui browser.
+                        * See symbol__browser_index.
+                        */
+                       symbol_conf.priv_size += sizeof(u32);
+               }
+               annotation_config__init();
+       }
+
        if (symbol__init(env) < 0)
                goto out_mem2node;
 
@@ -3135,11 +3284,6 @@ static int perf_c2c__report(int argc, const char **argv)
                goto out_mem2node;
        }
 
-       if (c2c.use_stdio)
-               use_browser = 0;
-       else
-               use_browser = 1;
-
        setup_browser(false);
 
        err = perf_session__process_events(session);
@@ -3210,6 +3354,7 @@ out_mem2node:
 out_session:
        perf_session__delete(session);
 out:
+       annotation_options__exit();
        return err;
 }