1 files changed, 99 insertions, 10 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index f15731a3d438..51709a961496 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -40,10 +40,11 @@
 struct perf_annotate {
         struct perf_tool tool;
         struct perf_session *session;
-        bool       use_tui, use_stdio, use_gtk;
+        bool       use_tui, use_stdio, use_stdio2, use_gtk;
         bool       full_paths;
         bool       print_line;
         bool       skip_missing;
+        bool       has_br_stack;
         const char *sym_hist_filter;
         const char *cpu_list;
         DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);
@@ -146,16 +147,78 @@ static void process_branch_stack(struct branch_stack *bs, struct addr_location *
         free(bi);
 }
 
+static int hist_iter__branch_callback(struct hist_entry_iter *iter,
+                                      struct addr_location *al __maybe_unused,
+                                      bool single __maybe_unused,
+                                      void *arg __maybe_unused)
+{
+        struct hist_entry *he = iter->he;
+        struct branch_info *bi;
+        struct perf_sample *sample = iter->sample;
+        struct perf_evsel *evsel = iter->evsel;
+        int err;
+
+        hist__account_cycles(sample->branch_stack, al, sample, false);
+
+        bi = he->branch_info;
+        err = addr_map_symbol__inc_samples(&bi->from, sample, evsel->idx);
+
+        if (err)
+                goto out;
+
+        err = addr_map_symbol__inc_samples(&bi->to, sample, evsel->idx);
+
+out:
+        return err;
+}
+
+static int process_branch_callback(struct perf_evsel *evsel,
+                                   struct perf_sample *sample,
+                                   struct addr_location *al __maybe_unused,
+                                   struct perf_annotate *ann,
+                                   struct machine *machine)
+{
+        struct hist_entry_iter iter = {
+                .evsel          = evsel,
+                .sample         = sample,
+                .add_entry_cb   = hist_iter__branch_callback,
+                .hide_unresolved        = symbol_conf.hide_unresolved,
+                .ops            = &hist_iter_branch,
+        };
+
+        struct addr_location a;
+        int ret;
+
+        if (machine__resolve(machine, &a, sample) < 0)
+                return -1;
+
+        if (a.sym == NULL)
+                return 0;
+
+        if (a.map != NULL)
+                a.map->dso->hit = 1;
+
+        ret = hist_entry_iter__add(&iter, &a, PERF_MAX_STACK_DEPTH, ann);
+        return ret;
+}
+
+static bool has_annotation(struct perf_annotate *ann)
+{
+        return ui__has_annotation() || ann->use_stdio2;
+}
+
 static int perf_evsel__add_sample(struct perf_evsel *evsel,
                                   struct perf_sample *sample,
                                   struct addr_location *al,
-                                  struct perf_annotate *ann)
+                                  struct perf_annotate *ann,
+                                  struct machine *machine)
 {
         struct hists *hists = evsel__hists(evsel);
         struct hist_entry *he;
         int ret;
 
-        if (ann->sym_hist_filter != NULL &&
+        if ((!ann->has_br_stack || !has_annotation(ann)) &&
+            ann->sym_hist_filter != NULL &&
             (al->sym == NULL ||
              strcmp(ann->sym_hist_filter, al->sym->name) != 0)) {
                 /* We're only interested in a symbol named sym_hist_filter */
@@ -178,6 +241,9 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel,
          */
         process_branch_stack(sample->branch_stack, al, sample);
 
+        if (ann->has_br_stack && has_annotation(ann))
+                return process_branch_callback(evsel, sample, al, ann, machine);
+
         he = hists__add_entry(hists, al, NULL, NULL, NULL, sample, true);
         if (he == NULL)
                 return -ENOMEM;
@@ -206,7 +272,8 @@ static int process_sample_event(struct perf_tool *tool,
         if (ann->cpu_list && !test_bit(sample->cpu, ann->cpu_bitmap))
                 goto out_put;
 
-        if (!al.filtered && perf_evsel__add_sample(evsel, sample, &al, ann)) {
+        if (!al.filtered &&
+            perf_evsel__add_sample(evsel, sample, &al, ann, machine)) {
                 pr_warning("problem incrementing symbol count, "
                            "skipping event\n");
                 ret = -1;
@@ -220,8 +287,11 @@ static int hist_entry__tty_annotate(struct hist_entry *he,
                                     struct perf_evsel *evsel,
                                     struct perf_annotate *ann)
 {
-        return symbol__tty_annotate(he->ms.sym, he->ms.map, evsel,
-                                    ann->print_line, ann->full_paths, 0, 0);
+        if (!ann->use_stdio2)
+                return symbol__tty_annotate(he->ms.sym, he->ms.map, evsel,
+                                            ann->print_line, ann->full_paths, 0, 0);
+        return symbol__tty_annotate2(he->ms.sym, he->ms.map, evsel,
+                                     ann->print_line, ann->full_paths);
 }
 
 static void hists__find_annotations(struct hists *hists,
@@ -238,6 +308,10 @@ static void hists__find_annotations(struct hists *hists,
                 if (he->ms.sym == NULL || he->ms.map->dso->annotate_warned)
                         goto find_next;
 
+                if (ann->sym_hist_filter &&
+                    (strcmp(he->ms.sym->name, ann->sym_hist_filter) != 0))
+                        goto find_next;
+
                 notes = symbol__annotation(he->ms.sym);
                 if (notes->src == NULL) {
 find_next:
@@ -269,6 +343,7 @@ find_next:
                         nd = rb_next(nd);
                 } else if (use_browser == 1) {
                         key = hist_entry__tui_annotate(he, evsel, NULL);
+
                         switch (key) {
                         case -1:
                                 if (!ann->skip_missing)
@@ -420,6 +495,9 @@ int cmd_annotate(int argc, const char **argv)
         OPT_BOOLEAN(0, "gtk", &annotate.use_gtk, "Use the GTK interface"),
         OPT_BOOLEAN(0, "tui", &annotate.use_tui, "Use the TUI interface"),
         OPT_BOOLEAN(0, "stdio", &annotate.use_stdio, "Use the stdio interface"),
+        OPT_BOOLEAN(0, "stdio2", &annotate.use_stdio2, "Use the stdio interface"),
+        OPT_BOOLEAN(0, "ignore-vmlinux", &symbol_conf.ignore_vmlinux,
+                    "don't load vmlinux even if found"),
         OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
                    "file", "vmlinux pathname"),
         OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,
@@ -489,20 +567,22 @@ int cmd_annotate(int argc, const char **argv)
         if (annotate.session == NULL)
                 return -1;
 
+        annotate.has_br_stack = perf_header__has_feat(&annotate.session->header,
+                                                      HEADER_BRANCH_STACK);
+
         ret = symbol__annotation_init();
         if (ret < 0)
                 goto out_delete;
 
+        annotation_config__init();
+
         symbol_conf.try_vmlinux_path = true;
 
         ret = symbol__init(&annotate.session->header.env);
         if (ret < 0)
                 goto out_delete;
 
-        if (setup_sorting(NULL) < 0)
-                usage_with_options(annotate_usage, options);
-
-        if (annotate.use_stdio)
+        if (annotate.use_stdio || annotate.use_stdio2)
                 use_browser = 0;
         else if (annotate.use_tui)
                 use_browser = 1;
@@ -511,6 +591,15 @@ int cmd_annotate(int argc, const char **argv)
 
         setup_browser(true);
 
+        if ((use_browser == 1 || annotate.use_stdio2) && annotate.has_br_stack) {
+                sort__mode = SORT_MODE__BRANCH;
+                if (setup_sorting(annotate.session->evlist) < 0)
+                        usage_with_options(annotate_usage, options);
+        } else {
+                if (setup_sorting(NULL) < 0)
+                        usage_with_options(annotate_usage, options);
+        }
+
         ret = __cmd_annotate(&annotate);
 
 out_delete: