perf annotate: Add --code-with-type support for TUI

Until now, the --code-with-type option is available only on stdio.
But it was an artifical limitation because of an implemention issue.

Implement the same logic in annotation_line__write() for stdio2/TUI
and remove the limitation and update the man page.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20250816031635.25318-8-namhyung@kernel.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 46090c5b42b4762ff1354ba66b5aa9b65a952338..547f1a2680185e3cf288389e0521bd0e44c42034 100644 (file)
--- a/tools/perf/Documentation/perf-annotate.txt
+++ b/tools/perf/Documentation/perf-annotate.txt
@@ -170,7 +170,6 @@ include::itrace.txt[]
 
 --code-with-type::
        Show data type info in code annotation (for memory instructions only).
-       Currently it only works with --stdio option.
 
 
 SEE ALSO

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 5d57d2913f3d9a3353efcb9b442f8111895a22c6..646f43b0f7c4c9b0a44cef1e60d6f4c55b744f5a 100644 (file)
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -917,11 +917,6 @@ int cmd_annotate(int argc, const char **argv)
                symbol_conf.annotate_data_sample = true;
        } else if (annotate_opts.code_with_type) {
                symbol_conf.annotate_data_member = true;
-
-               if (!annotate.use_stdio) {
-                       pr_err("--code-with-type only works with --stdio.\n");
-                       goto out_delete;
-               }
        }
 
        setup_browser(true);

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 3e8b111e3f12b030107edf287adb0a2bad181382..e5b35336f0d33d7e5621e50f5aade8c0562c08ce 100644 (file)
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -4,6 +4,7 @@
 #include "../ui.h"
 #include "../../util/annotate.h"
 #include "../../util/debug.h"
+#include "../../util/debuginfo.h"
 #include "../../util/dso.h"
 #include "../../util/hist.h"
 #include "../../util/sort.h"
@@ -1119,6 +1120,9 @@ int __hist_entry__tui_annotate(struct hist_entry *he, struct map_symbol *ms,
 
        ui_helpline__push("Press ESC to exit");
 
+       if (annotate_opts.code_with_type)
+               browser.dbg = debuginfo__new(dso__long_name(dso));
+
        browser.b.width = notes->src->widths.max_line_len;
        browser.b.nr_entries = notes->src->nr_entries;
        browser.b.entries = &notes->src->source;
@@ -1129,6 +1133,8 @@ int __hist_entry__tui_annotate(struct hist_entry *he, struct map_symbol *ms,
 
        ret = annotate_browser__run(&browser, evsel, hbt);
 
+       if (annotate_opts.code_with_type)
+               debuginfo__delete(browser.dbg);
        if (not_annotated && !notes->src->tried_source)
                annotated_source__purge(notes->src);
 

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 698bc4f559e83043ec3448c87a0818c53d5497c8..99e976d254493de236de548b1075596a5b235a1b 100644 (file)
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1362,6 +1362,11 @@ static int symbol__annotate_fprintf2(struct symbol *sym, FILE *fp,
        };
        struct annotation_line *al;
 
+       if (annotate_opts.code_with_type) {
+               evsel__get_arch(apd->evsel, &apd->arch);
+               apd->dbg = debuginfo__new(dso__long_name(map__dso(apd->he->ms.map)));
+       }
+
        list_for_each_entry(al, &notes->src->source, node) {
                if (annotation_line__filter(al))
                        continue;
@@ -1370,6 +1375,9 @@ static int symbol__annotate_fprintf2(struct symbol *sym, FILE *fp,
                wops.first_line = false;
        }
 
+       if (annotate_opts.code_with_type)
+               debuginfo__delete(apd->dbg);
+
        return 0;
 }
 
@@ -1935,6 +1943,36 @@ err:
        return -ENOMEM;
 }
 
+static int disasm_line__snprint_type_info(struct disasm_line *dl,
+                                         char *buf, int len,
+                                         struct annotation_print_data *apd)
+{
+       struct annotated_data_type *data_type;
+       char member[256];
+       int offset = 0;
+       int printed;
+
+       scnprintf(buf, len, " ");
+
+       if (!annotate_opts.code_with_type || apd->dbg == NULL)
+               return 1;
+
+       data_type = __hist_entry__get_data_type(apd->he, apd->arch, apd->dbg, dl, &offset);
+       if (data_type == NULL || data_type == NO_TYPE)
+               return 1;
+
+       printed = scnprintf(buf, len, "\t\t# data-type: %s", data_type->self.type_name);
+
+       if (data_type != &stackop_type && data_type != &canary_type && len > printed)
+               printed += scnprintf(buf + printed, len - printed, " +%#x", offset);
+
+       if (annotated_data_type__get_member_name(data_type, member, sizeof(member), offset) &&
+           len > printed) {
+               printed += scnprintf(buf + printed, len - printed, " (%s)", member);
+       }
+       return printed;
+}
+
 void annotation_line__write(struct annotation_line *al, struct annotation *notes,
                            const struct annotation_write_ops *wops,
                            struct annotation_print_data *apd)
@@ -2118,11 +2156,14 @@ print_addr:
 
                width -= printed;
 
-               disasm_line__write(disasm_line(al), notes, obj, bf, sizeof(bf), obj__printf, obj__write_graph);
+               printed = disasm_line__write(disasm_line(al), notes, obj, bf, sizeof(bf),
+                                            obj__printf, obj__write_graph);
 
-               obj__printf(obj, "%-*s", width, bf);
+               obj__printf(obj, "%s", bf);
+               width -= printed;
 
-               (void)apd;
+               disasm_line__snprint_type_info(disasm_line(al), bf, sizeof(bf), apd);
+               obj__printf(obj, "%-*s", width, bf);
        }
 
 }