Support data type display with a key press so that users can toggle the
output dynamically on TUI. Also display "[Type]" in the title line if
it's enabled.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/ui/browsers/annotate.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index e5b35336f0d33d7e..dfe869c20e35da77 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -533,9 +533,10 @@ static void ui_browser__init_asm_mode(struct ui_browser *browser)
static int sym_title(struct symbol *sym, struct map *map, char *title,
size_t sz, int percent_type)
{
- return snprintf(title, sz, "%s %s [Percent: %s]", sym->name,
+ return snprintf(title, sz, "%s %s [Percent: %s] %s", sym->name,
dso__long_name(map__dso(map)),
- percent_type_str(percent_type));
+ percent_type_str(percent_type),
+ annotate_opts.code_with_type ? "[Type]" : "");
}
/*
@@ -909,7 +910,8 @@ static int annotate_browser__run(struct annotate_browser *browser,
"b Toggle percent base [period/hits]\n"
"B Branch counter abbr list (Optional)\n"
"? Search string backwards\n"
- "f Toggle showing offsets to full address\n");
+ "f Toggle showing offsets to full address\n"
+ "T Toggle data type display\n");
continue;
case 'r':
script_browse(NULL, NULL);
@@ -1029,6 +1031,12 @@ static int annotate_browser__run(struct annotate_browser *browser,
case 'f':
annotation__toggle_full_addr(notes, ms);
continue;
+ case 'T':
+ annotate_opts.code_with_type ^= 1;
+ if (browser->dbg == NULL)
+ browser->dbg = debuginfo__new(dso__long_name(map__dso(ms->map)));
+ annotate_browser__show(&browser->b, title, help);
+ continue;
case K_LEFT:
case '<':
case '>':
@@ -1133,8 +1141,7 @@ 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);
+ debuginfo__delete(browser.dbg);
if (not_annotated && !notes->src->tried_source)
annotated_source__purge(notes->src);
--
2.50.1On Fri, Aug 15, 2025 at 08:16:31PM -0700, Namhyung Kim wrote:
> Support data type display with a key press so that users can toggle the
> output dynamically on TUI. Also display "[Type]" in the title line if
> it's enabled.
Testing here I see:
0.81 │ mov 0x9c(%r8),%r11d # data-type: struct cfs_rq +0x9c
If I ask for source code by pressing 's':
│ delta += sa->period_contrib; ▒
0.97 │ mov 0x9c(%r8),%r11d # data-type: struct cfs_rq +0x9c
So it is the 'period_contrib' field of 'struct cfs_rq', humm, not:
root@number:~# pahole -E --hex cfs_rq | grep 0x9c -B 10 -A10
struct sched_entity * next; /* 0x60 0x8 */
/* XXX 24 bytes hole, try to pack */
/* --- cacheline 2 boundary (128 bytes) --- */
struct sched_avg {
/* typedef u64 -> __u64 */ long long unsigned int last_update_time; /* 0x80 0x8 */
/* typedef u64 -> __u64 */ long long unsigned int load_sum; /* 0x88 0x8 */
/* typedef u64 -> __u64 */ long long unsigned int runnable_sum; /* 0x90 0x8 */
/* typedef u32 -> __u32 */ unsigned int util_sum; /* 0x98 0x4 */
/* typedef u32 -> __u32 */ unsigned int period_contrib; /* 0x9c 0x4 */
long unsigned int load_avg; /* 0xa0 0x8 */
long unsigned int runnable_avg; /* 0xa8 0x8 */
long unsigned int util_avg; /* 0xb0 0x8 */
unsigned int util_est; /* 0xb8 0x4 */
} avg __attribute__((__aligned__(64))); /* 0x80 0x40 */
/* XXX last struct has 4 bytes of padding */
/* --- cacheline 3 boundary (192 bytes) --- */
struct {
root@number:~#
So it is in a subtype and probably this is an improvement to be made,
right?
- Arnaldo
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
> tools/perf/ui/browsers/annotate.c | 17 ++++++++++++-----
> 1 file changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
> index e5b35336f0d33d7e..dfe869c20e35da77 100644
> --- a/tools/perf/ui/browsers/annotate.c
> +++ b/tools/perf/ui/browsers/annotate.c
> @@ -533,9 +533,10 @@ static void ui_browser__init_asm_mode(struct ui_browser *browser)
> static int sym_title(struct symbol *sym, struct map *map, char *title,
> size_t sz, int percent_type)
> {
> - return snprintf(title, sz, "%s %s [Percent: %s]", sym->name,
> + return snprintf(title, sz, "%s %s [Percent: %s] %s", sym->name,
> dso__long_name(map__dso(map)),
> - percent_type_str(percent_type));
> + percent_type_str(percent_type),
> + annotate_opts.code_with_type ? "[Type]" : "");
> }
>
> /*
> @@ -909,7 +910,8 @@ static int annotate_browser__run(struct annotate_browser *browser,
> "b Toggle percent base [period/hits]\n"
> "B Branch counter abbr list (Optional)\n"
> "? Search string backwards\n"
> - "f Toggle showing offsets to full address\n");
> + "f Toggle showing offsets to full address\n"
> + "T Toggle data type display\n");
> continue;
> case 'r':
> script_browse(NULL, NULL);
> @@ -1029,6 +1031,12 @@ static int annotate_browser__run(struct annotate_browser *browser,
> case 'f':
> annotation__toggle_full_addr(notes, ms);
> continue;
> + case 'T':
> + annotate_opts.code_with_type ^= 1;
> + if (browser->dbg == NULL)
> + browser->dbg = debuginfo__new(dso__long_name(map__dso(ms->map)));
> + annotate_browser__show(&browser->b, title, help);
> + continue;
> case K_LEFT:
> case '<':
> case '>':
> @@ -1133,8 +1141,7 @@ 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);
> + debuginfo__delete(browser.dbg);
> if (not_annotated && !notes->src->tried_source)
> annotated_source__purge(notes->src);
>
> --
> 2.50.1
On Wed, Aug 20, 2025 at 06:13:15PM -0300, Arnaldo Carvalho de Melo wrote:
> On Fri, Aug 15, 2025 at 08:16:31PM -0700, Namhyung Kim wrote:
> > Support data type display with a key press so that users can toggle the
> > output dynamically on TUI. Also display "[Type]" in the title line if
> > it's enabled.
>
> Testing here I see:
>
> 0.81 │ mov 0x9c(%r8),%r11d # data-type: struct cfs_rq +0x9c
>
> If I ask for source code by pressing 's':
>
> │ delta += sa->period_contrib; ▒
> 0.97 │ mov 0x9c(%r8),%r11d # data-type: struct cfs_rq +0x9c
>
> So it is the 'period_contrib' field of 'struct cfs_rq', humm, not:
>
> root@number:~# pahole -E --hex cfs_rq | grep 0x9c -B 10 -A10
> struct sched_entity * next; /* 0x60 0x8 */
>
> /* XXX 24 bytes hole, try to pack */
>
> /* --- cacheline 2 boundary (128 bytes) --- */
> struct sched_avg {
> /* typedef u64 -> __u64 */ long long unsigned int last_update_time; /* 0x80 0x8 */
> /* typedef u64 -> __u64 */ long long unsigned int load_sum; /* 0x88 0x8 */
> /* typedef u64 -> __u64 */ long long unsigned int runnable_sum; /* 0x90 0x8 */
> /* typedef u32 -> __u32 */ unsigned int util_sum; /* 0x98 0x4 */
> /* typedef u32 -> __u32 */ unsigned int period_contrib; /* 0x9c 0x4 */
> long unsigned int load_avg; /* 0xa0 0x8 */
> long unsigned int runnable_avg; /* 0xa8 0x8 */
> long unsigned int util_avg; /* 0xb0 0x8 */
> unsigned int util_est; /* 0xb8 0x4 */
> } avg __attribute__((__aligned__(64))); /* 0x80 0x40 */
>
> /* XXX last struct has 4 bytes of padding */
>
> /* --- cacheline 3 boundary (192 bytes) --- */
> struct {
> root@number:~#
>
> So it is in a subtype and probably this is an improvement to be made,
> right?
It seems %r8 contains a pointer to cfs_rq and there's a variable for sa
(sched_avg) but it actually uses the same register as it's embeded. I
think DWARF has correct location expression to find the containing data
type and the output looks ok. In general, I'd prefer seeing outer types.
Thanks,
Namhyung
© 2016 - 2025 Red Hat, Inc.