Re: [PATCH v4 5/9] perf annotate: Add --code-with-type support for TUI

[Namhyung Kim <namhyung@kernel.org>]

On Fri, Jul 25, 2025 at 05:31:52PM -0700, Ian Rogers wrote:
> On Fri, Jul 25, 2025 at 12:38 PM Namhyung Kim <namhyung@kernel.org> wrote:
> >
> > 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.
> > Make disasm_line__write() return the number of printed characters so
> > that it can skip unnecessary operations when the screen is full.
> 
> This change seems to be different from the rest of what is the patch,
> is it possible to have it is a patch before this one?

Yep, will do in the next version.

Thanks,
Namhyung

> 
> > Remove the limitation and update the man page.
> >
> > Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> > ---
> >  tools/perf/Documentation/perf-annotate.txt |  1 -
> >  tools/perf/builtin-annotate.c              |  5 --
> >  tools/perf/ui/browsers/annotate.c          |  6 +++
> >  tools/perf/util/annotate.c                 | 61 +++++++++++++++++++---
> >  4 files changed, 61 insertions(+), 12 deletions(-)
> >
> > diff --git a/tools/perf/Documentation/perf-annotate.txt b/tools/perf/Documentation/perf-annotate.txt
> > index 46090c5b42b4762f..547f1a2680185e3c 100644
> > --- 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 5d57d2913f3d9a33..646f43b0f7c4c9b0 100644
> > --- 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 23bea5b165774ae7..cdee1969f3131a7c 100644
> > --- 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"
> > @@ -1101,6 +1102,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;
> > @@ -1111,6 +1115,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 d69e406c1bc289cd..06ddc7a9f58722a4 100644
> > --- 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;
> >  }
> >
> > @@ -1743,7 +1751,7 @@ static double annotation_line__max_percent(struct annotation_line *al,
> >         return percent_max;
> >  }
> >
> > -static void disasm_line__write(struct disasm_line *dl, struct annotation *notes,
> > +static int disasm_line__write(struct disasm_line *dl, struct annotation *notes,
> >                                void *obj, char *bf, size_t size,
> >                                void (*obj__printf)(void *obj, const char *fmt, ...),
> >                                void (*obj__write_graph)(void *obj, int graph))
> > @@ -1771,8 +1779,8 @@ static void disasm_line__write(struct disasm_line *dl, struct annotation *notes,
> >                 obj__printf(obj, "  ");
> >         }
> >
> > -       disasm_line__scnprintf(dl, bf, size, !annotate_opts.use_offset,
> > -                              notes->src->widths.max_ins_name);
> > +       return disasm_line__scnprintf(dl, bf, size, !annotate_opts.use_offset,
> > +                                     notes->src->widths.max_ins_name);
> >  }
> >
> >  static void ipc_coverage_string(char *bf, int size, struct annotation *notes)
> > @@ -2116,11 +2124,52 @@ void annotation_line__write(struct annotation_line *al, struct annotation *notes
> >
> >                 width -= printed + 3;
> >
> > -               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", bf);
> > +               width -= printed;
> > +
> > +               if (annotate_opts.code_with_type && apd->dbg) {
> > +                       struct annotated_data_type *data_type;
> > +                       int offset = 0;
> > +
> > +                       data_type = __hist_entry__get_data_type(apd->he, apd->arch,
> > +                                                               apd->dbg,
> > +                                                               disasm_line(al),
> > +                                                               &offset);
> > +                       if (data_type && data_type != NO_TYPE) {
> > +                               char member[256];
> > +
> > +                               printed = scnprintf(bf, sizeof(bf),
> > +                                                   "\t\t# data-type: %s",
> > +                                                   data_type->self.type_name);
> >
> > -               obj__printf(obj, "%-*s", width, bf);
> > +                               if (data_type != &stackop_type &&
> > +                                   data_type != &canary_type &&
> > +                                   sizeof(bf) > (size_t)printed) {
> > +                                       printed += scnprintf(bf + printed,
> > +                                                            sizeof(bf) - printed,
> > +                                                            " +%#x", offset);
> > +                               }
> > +
> > +                               if (annotated_data_type__get_member_name(data_type,
> > +                                                                        member,
> > +                                                                        sizeof(member),
> > +                                                                        offset) &&
> > +                                   sizeof(bf) > (size_t)printed) {
> > +                                       printed += scnprintf(bf + printed,
> > +                                                            sizeof(bf) - printed,
> > +                                                            " (%s)", member);
> > +                               }
> >
> > -               (void)apd;
> > +                               obj__printf(obj, "%-*s", width, bf);
> > +                       } else {
> > +                               obj__printf(obj, "%-*s", width, " ");
> > +                       }
> > +               } else {
> > +                       obj__printf(obj, "%-*s", width, " ");
> > +               }
> >         }
> >
> >  }
> > --
> > 2.50.1
> >