perf annotate-data: small random fixes and updates
Namhyung Kim
maintainercover perf annotate-data: small random fixes and updates
Hello,
I found some problems in the data type profiling with perf annotate. The patch 1 should go to perf-tools and others can go to perf-tools-next.
Thanks,
Namhyung
Namhyung Kim (4):
perf annotate: Make sure to call symbol__annotate2() in TUI perf annotate-data: Fix global variable lookup perf annotate-data: Do not delete non-asm lines perf annotate: Get rid of symbol__ensure_annotate()
tools/perf/ui/browsers/annotate.c | 2 +- tools/perf/util/annotate-data.c | 10 ++- tools/perf/util/annotate.c | 104 ++++++++++++++++++++---------- 3 files changed, 80 insertions(+), 36 deletions(-)
base-commit: b6347cb5e04e9c1d17342ab46e2ace2d448de727
Signature · 1 line
2.44.0.478.gd926399ef9-goog
Namhyung Kim
maintainerPATCH 1/4 perf annotate: Make sure to call symbol__annotate2() in TUI
The symbol__annotate2() initializes some data structures needed by TUI. It has a logic to prevent calling it multiple times by checking if it has the annotated source. But data type profiling uses a different code (symbol__annotate) to allocate the annotated lines in advance. So TUI missed to call symbol__annotate2() when it shows the annotation browser.
Make symbol__annotate() reentrant and handle that situation properly. This fixes a crash in the annotation browser started by perf report in TUI like below.
$ perf report -s type,sym --tui # and press 'a' key and then move down
--- tools/perf/ui/browsers/annotate.c | 2 +- tools/perf/util/annotate.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)
tools/perf/ui/browsers/annotate.c +1 -1
@@ -970,7 +970,7 @@ int symbol__tui_annotate(struct map_symbol *ms, struct evsel *evsel,if (dso->annotate_warned)return -1 ; -if (not_annotated) { +if (not_annotated || !sym->annotate2) { err =symbol__annotate2 (ms, evsel, &browser.arch);if (err) {char msg[BUFSIZ ];
tools/perf/util/annotate.c +3 -0
@@ -879,6 +879,9 @@ int symbol__annotate(struct map_symbol *ms, struct evsel *evsel,if (parch) *parch = arch; +if (!list_empty (¬es->src->source)) +return 0 ; + args.arch = arch; args.ms = *ms;if (annotate_opts.full_addr)
Signature · 1 line
2.44.0.478.gd926399ef9-goog
Namhyung Kim
maintainerPATCH 2/4 perf annotate-data: Fix global variable lookup
In reply to Namhyung KimThe recent change in the global variable handling added a bug to miss setting the return value even if it found a data type. Also add the type name in the debug message.
--- tools/perf/util/annotate-data.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/perf/util/annotate-data.c +3 -1
@@ -1468,8 +1468,10 @@ static int find_data_type_die(struct data_loc_info *dloc, Dwarf_Die *type_die) &offset, type_die)) { dloc->type_offset = offset; -pr_debug_dtp ("found PC-rel by addr=%#" PRIx64" offset=%#x\n" , +pr_debug_dtp ("found PC-rel by addr=%#" PRIx64" offset=%#x" , dloc->var_addr, offset); +pr_debug_type_name (type_die,TSR_KIND_TYPE ); + ret =0 ; goto out; } }
Signature · 1 line
2.44.0.478.gd926399ef9-goog
Namhyung Kim
maintainerPATCH 3/4 perf annotate-data: Do not delete non-asm lines
In reply to Namhyung KimFor data type profiling, it removed non-instruction lines from the list of annotation lines. It was to simplify the implementation dealing with instructions like to calculate the PC-relative address and to search the shortest path to the target instruction or basic block.
But it means that it removes all the comments and debug information in the annotate output like source file name and line numbers. To support both code annotation and data type annotation, it'd be better to keep the non-instruction lines as well.
So this change is to skip those lines during the data type profiling and to display them in the normal perf annotate output.
No function changes intended (other than having more lines).
--- tools/perf/util/annotate-data.c | 6 +++ tools/perf/util/annotate.c | 93 ++++++++++++++++++++++++--------- 2 files changed, 74 insertions(+), 25 deletions(-)
tools/perf/util/annotate-data.c +6 -0
@@ -1314,6 +1314,8 @@ static int find_data_type_insn(struct data_loc_info *dloc, int reg,list_for_each_entry (bb, basic_blocks, list) {struct disasm_line *dl = bb->begin; +BUG_ON (bb->begin->al.offset ==-1 || bb->end->al.offset ==-1 ); +pr_debug_dtp ("bb: [%" PRIx64" - %" PRIx64"]\n" , bb->begin->al.offset, bb->end->al.offset);
@@ -1321,6 +1323,10 @@ static int find_data_type_insn(struct data_loc_info *dloc, int reg,u64 this_ip = sym->start + dl->al.offset;u64 addr =map__rip_2objdump (dloc->ms->map, this_ip); +/* Skip comment or debug info lines */ +if (dl->al.offset ==-1 ) +continue ; +/* Update variable type at this address */ update_var_state (&state, dloc, addr, dl->al.offset, var_types);
tools/perf/util/annotate.c +68 -25
148 lines not on this page · raw message
Signature · 1 line
2.44.0.478.gd926399ef9-goog
Namhyung Kim
maintainerPATCH 4/4 perf annotate: Get rid of symbol__ensure_annotate()
In reply to Namhyung KimNow symbol__annotate() is reentrant and it doesn't need to remove non-instruction lines. Let's get rid of symbol__ensure_annotate() and call symbol__annotate() directly. Also we can use it to get the arch pointer instead of calling evsel__get_arch() directly.
--- tools/perf/util/annotate.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
tools/perf/util/annotate.c +2 -12
@@ -2140,14 +2140,6 @@ int annotate_get_insn_location(struct arch *arch, struct disasm_line *dl,return 0 ; } -static void symbol__ensure_annotate (struct map_symbol *ms,struct evsel *evsel) -{ -struct annotation *notes =symbol__annotation (ms->sym); - -if (list_empty (¬es->src->source)) -symbol__annotate (ms, evsel,NULL ); -} -static struct disasm_line *find_disasm_line (struct symbol *sym,u64 ip,bool allow_update) {
@@ -2322,14 +2314,12 @@ struct annotated_data_type *hist_entry__get_data_type(struct hist_entry *he)return NULL ; } -if (evsel__get_arch (evsel, &arch) <0 ) { +/* Make sure it has the disasm of the function */ +if (symbol__annotate (ms, evsel, &arch) <0 ) { ann_data_stat.no_insn++;return NULL ; } -/* Make sure it runs objdump to get disasm of the function */ -symbol__ensure_annotate (ms, evsel); -/* * Get a disasm to extract the location from the insn. * This is too slow...
Signature · 1 line
2.44.0.478.gd926399ef9-goog
Quoted 10 lines · Namhyung Kim
Hello,
I found some problems in the data type profiling with perf annotate. The patch 1 should go to perf-tools and others can go to perf-tools-next.
Thanks,
Namhyung
Quoted 5 lines
Namhyung Kim (4):
perf annotate: Make sure to callsymbol__annotate2()in TUI perf annotate-data: Fix global variable lookup perf annotate-data: Do not delete non-asm lines perf annotate: Get rid ofsymbol__ensure_annotate()
Thanks,
Ian
Quoted 10 lines
tools/perf/ui/browsers/annotate.c | 2 +- tools/perf/util/annotate-data.c | 10 ++- tools/perf/util/annotate.c | 104 ++++++++++++++++++++---------- 3 files changed, 80 insertions(+), 36 deletions(-)base-commit:
b6347cb5e04e9c1d17342ab46e2ace2d448de727--
2.44.0.478.gd926399ef9-goog
Arnaldo Carvalho de Melo
maintainerQuoted 11 lines · Ian Rogers
Quoted 8 lines · Namhyung Kim
I found some problems in the data type profiling with perf annotate. The patch 1 should go to perf-tools and others can go to perf-tools-next.
Namhyung Kim (4):
perf annotate: Make sure to callsymbol__annotate2()in TUI perf annotate-data: Fix global variable lookup perf annotate-data: Do not delete non-asm lines perf annotate: Get rid ofsymbol__ensure_annotate()Reviewed-by Ian Rogers <[email protected]>
Applied 2-4 to perf-tools-next,
Thanks,
- Arnaldo