perf annotate: Fix source code annotate with objdump
Namhyung Kim
maintainerPATCH v2 1/1 perf annotate: Fix source code annotate with objdump
Recently it uses llvm and capstone to speed up annotation or disassembly of instructions. But they don't support source code view yet. Until it fixed, we can force to use objdump for source code annotation.
To prevent performance loss, it's disabled by default and turned it on when user requests it in TUI by pressing 's' key.
Reported-by Ingo Molnar <[email protected]>
Signed-off-by Namhyung Kim <[email protected]>
---
v2)
* fix build error (Arnaldo)
* move to the first line when new asm line isn't found (Arnaldo)
tools/perf/ui/browsers/annotate.c | 51 +++++++++++++++++++++++++++++-- tools/perf/util/annotate.c | 2 ++ tools/perf/util/annotate.h | 1 + tools/perf/util/disasm.c | 7 +++++ 4 files changed, 59 insertions(+), 2 deletions(-)
tools/perf/ui/browsers/annotate.c +49 -2
@@ -345,6 +345,23 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser, browser->curr_hot =rb_last (&browser->entries); } +static struct annotation_line *annotate_browser__find_new_asm_line ( +struct annotate_browser *browser, +int idx_asm) +{ +struct annotation_line *al; +struct list_head *head = browser->b.entries; + +/* find an annotation line in the new list with the same idx_asm */ +list_for_each_entry (al, head, node) { +if (al->idx_asm == idx_asm) +return al; + } + +/* There are no asm lines */ +return NULL ; +} +static struct annotation_line *annotate_browser__find_next_asm_line (struct annotate_browser *browser,struct annotation_line *al)
@@ -368,7 +385,8 @@ static struct annotation_line *annotate_browser__find_next_asm_line(return NULL ; } -static bool annotate_browser__toggle_source (struct annotate_browser *browser) +static bool annotate_browser__toggle_source (struct annotate_browser *browser, +struct evsel *evsel) {struct annotation *notes =browser__annotation (&browser->b);struct annotation_line *al;
@@ -377,6 +395,35 @@ static bool annotate_browser__toggle_source(struct annotate_browser *browser) browser->b.seek (&browser->b, offset,SEEK_CUR ); al = list_entry(browser->b.top, struct annotation_line, node); +if (!annotate_opts.annotate_src) + annotate_opts.annotate_src = true; + +/* +* It's about to get source code annotation for the first time. +* Drop the existing annotation_lines and get the new one with source. +* And then move to the original line at the same asm index. +*/ +if (annotate_opts.hide_src_code && !notes->src->tried_source) { +struct map_symbol *ms = browser->b.priv; +int orig_idx_asm = al->idx_asm; + + notes->src->tried_source = true; + +/* annotate again with source code info */ + annotate_opts.hide_src_code = false; +annotated_source__purge (notes->src); +symbol__annotate2 (ms, evsel, &browser->arch); + annotate_opts.hide_src_code = true; + + browser->b.entries = ¬es->src->source; + al =annotate_browser__find_new_asm_line (browser, orig_idx_asm); +if (unlikely (al ==NULL )) { + al =list_first_entry (¬es->src->source, + struct annotation_line, node); + } + browser->b.seek (&browser->b, al->idx_asm,SEEK_SET ); + } +if (annotate_opts.hide_src_code) {if (al->idx_asm < offset) offset = al->idx;
@@ -833,7 +880,7 @@ static int annotate_browser__run(struct annotate_browser *browser, nd = browser->curr_hot;break ;case 's' : -if (annotate_browser__toggle_source (browser)) +if (annotate_browser__toggle_source (browser, evsel))ui_helpline__puts (help);annotate__scnprintf_title (hists, title,sizeof (title));annotate_browser__show (&browser->b, title, help);
tools/perf/util/annotate.c +2 -0
@@ -1451,6 +1451,7 @@ void annotated_source__purge(struct annotated_source *as)list_del_init (&al->node);disasm_line__free (disasm_line (al)); } + as->tried_source = false; }static size_t disasm_line__fprintf (struct disasm_line *dl,FILE *fp)
@@ -2280,6 +2281,7 @@ void annotation_options__init(void) opt->annotate_src = true; opt->offset_level =ANNOTATION__OFFSET_JUMP_TARGETS ; opt->percent_type =PERCENT_PERIOD_LOCAL ; + opt->hide_src_code = true; opt->hide_src_code_on_title = true; }
tools/perf/util/annotate.h +1 -0
@@ -294,6 +294,7 @@ struct annotated_source {int nr_entries;int nr_asm_entries;int max_jump_sources; +bool tried_source;u64 start;struct {u8 addr;
tools/perf/util/disasm.c +7 -0
@@ -2284,6 +2284,13 @@ int symbol__disassemble(struct symbol *sym, struct annotate_args *args) } } +/* FIXME: LLVM and CAPSTONE should support source code */ +if (options->annotate_src && !options->hide_src_code) { + err =symbol__disassemble_objdump (symfs_filename, sym, args); +if (err ==0 ) + goto out_remove_tmp; + } + err =-1 ;for (u8 i =0 ; i <ARRAY_SIZE (options->disassemblers) && err !=0 ; i++) {enum perf_disassembler dis = options->disassemblers[i];
Signature · 1 line
2.49.0