perf annotate browser: Hide non jump target addresses in offset mode
This:
0.00 : ffffffff8116bd00: lock btsl $0x0,(%r12)
100.00 : ffffffff8116bd07: sbb %eax,%eax
0.00 : ffffffff8116bd09: test %eax,%eax
0.00 : ffffffff8116bd0b: jne ffffffff8116bf5f <__mem_cgroup_commit_charge+0x28f>
0.00 : ffffffff8116bd11: mov (%r12),%rax
0.00 : ffffffff8116bd15: test $0x2,%al
0.00 : ffffffff8116bd17: jne ffffffff8116bf6e <__mem_cgroup_commit_charge+0x29e>
0.00 : ffffffff8116bd1d: test %r9b,%r9b
0.00 : ffffffff8116bd20: jne ffffffff8116be30 <__mem_cgroup_commit_charge+0x160>
0.00 : ffffffff8116bd26: xor %eax,%eax
0.00 : ffffffff8116bd28: mov %r13,0x8(%r12)
0.00 : ffffffff8116bd2d: lock orb $0x2,(%r12)
0.00 : ffffffff8116bd33: test %r9b,%r9b
0.00 : ffffffff8116bd36: je ffffffff8116bdf3 <__mem_cgroup_commit_charge+0x123>
Becomes:
0.00 : 30: lock btsl $0x0,(%r12)
100.00 : sbb %eax,%eax
0.00 : test %eax,%eax
0.00 : jne 28f
0.00 : mov (%r12),%rax
0.00 : test $0x2,%al
0.00 : jne 29e
0.00 : test %r9b,%r9b
0.00 : jne 160
0.00 : 56: xor %eax,%eax
0.00 : 58: mov %r13,0x8(%r12)
0.00 : lock orb $0x2,(%r12)
0.00 : test %r9b,%r9b
0.00 : je 123
I.e. We trow away all those useless addresses and keep just jump labels.
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-r2vmbtgz0l8coluj8flztgrn@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
parent
1b2e2df4e3
commit
b793a40185
1 changed files with 58 additions and 13 deletions
|
|
@ -11,11 +11,20 @@
|
|||
#include <pthread.h>
|
||||
#include <newt.h>
|
||||
|
||||
struct browser_disasm_line {
|
||||
struct rb_node rb_node;
|
||||
double percent;
|
||||
u32 idx;
|
||||
int idx_asm;
|
||||
bool jump_target;
|
||||
};
|
||||
|
||||
struct annotate_browser {
|
||||
struct ui_browser b;
|
||||
struct rb_root entries;
|
||||
struct rb_node *curr_hot;
|
||||
struct disasm_line *selection;
|
||||
struct disasm_line **offsets;
|
||||
u64 start;
|
||||
int nr_asm_entries;
|
||||
int nr_entries;
|
||||
|
|
@ -25,13 +34,6 @@ struct annotate_browser {
|
|||
char search_bf[128];
|
||||
};
|
||||
|
||||
struct browser_disasm_line {
|
||||
struct rb_node rb_node;
|
||||
double percent;
|
||||
u32 idx;
|
||||
int idx_asm;
|
||||
};
|
||||
|
||||
static inline struct browser_disasm_line *disasm_line__browser(struct disasm_line *dl)
|
||||
{
|
||||
return (struct browser_disasm_line *)(dl + 1);
|
||||
|
|
@ -53,6 +55,7 @@ static void annotate_browser__write(struct ui_browser *self, void *entry, int ro
|
|||
{
|
||||
struct annotate_browser *ab = container_of(self, struct annotate_browser, b);
|
||||
struct disasm_line *dl = list_entry(entry, struct disasm_line, node);
|
||||
struct browser_disasm_line *bdl = disasm_line__browser(dl);
|
||||
bool current_entry = ui_browser__is_current_entry(self, row);
|
||||
bool change_color = (!ab->hide_src_code &&
|
||||
(!current_entry || (self->use_navkeypressed &&
|
||||
|
|
@ -60,7 +63,6 @@ static void annotate_browser__write(struct ui_browser *self, void *entry, int ro
|
|||
int width = self->width;
|
||||
|
||||
if (dl->offset != -1) {
|
||||
struct browser_disasm_line *bdl = disasm_line__browser(dl);
|
||||
ui_browser__set_percent_color(self, bdl->percent, current_entry);
|
||||
slsmg_printf(" %7.2f ", bdl->percent);
|
||||
} else {
|
||||
|
|
@ -90,7 +92,11 @@ static void annotate_browser__write(struct ui_browser *self, void *entry, int ro
|
|||
if (!ab->use_offset)
|
||||
addr += ab->start;
|
||||
|
||||
printed = scnprintf(bf, sizeof(bf), " %" PRIx64 ":", addr);
|
||||
if (bdl->jump_target || !ab->use_offset)
|
||||
printed = scnprintf(bf, sizeof(bf), " %" PRIx64 ":", addr);
|
||||
else
|
||||
printed = scnprintf(bf, sizeof(bf), " ");
|
||||
|
||||
if (change_color)
|
||||
color = ui_browser__set_color(self, HE_COLORSET_ADDR);
|
||||
slsmg_write_nstring(bf, printed);
|
||||
|
|
@ -593,12 +599,39 @@ int hist_entry__tui_annotate(struct hist_entry *he, int evidx,
|
|||
timer, arg, delay_secs);
|
||||
}
|
||||
|
||||
static void annotate_browser__mark_jump_targets(struct annotate_browser *browser,
|
||||
size_t size)
|
||||
{
|
||||
u64 offset;
|
||||
|
||||
for (offset = 0; offset < size; ++offset) {
|
||||
struct disasm_line *dl = browser->offsets[offset], *dlt;
|
||||
struct browser_disasm_line *bdlt;
|
||||
|
||||
if (!dl || !dl->ins || !ins__is_jump(dl->ins))
|
||||
continue;
|
||||
|
||||
if (dl->target >= size) {
|
||||
ui__error("jump to after symbol!\n"
|
||||
"size: %zx, jump target: %" PRIx64,
|
||||
size, dl->target);
|
||||
continue;
|
||||
}
|
||||
|
||||
dlt = browser->offsets[dl->target];
|
||||
bdlt = disasm_line__browser(dlt);
|
||||
bdlt->jump_target = true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
|
||||
void(*timer)(void *arg), void *arg,
|
||||
int delay_secs)
|
||||
{
|
||||
struct disasm_line *pos, *n;
|
||||
struct annotation *notes;
|
||||
const size_t size = symbol__size(sym);
|
||||
struct map_symbol ms = {
|
||||
.map = map,
|
||||
.sym = sym,
|
||||
|
|
@ -613,7 +646,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
|
|||
.use_navkeypressed = true,
|
||||
},
|
||||
};
|
||||
int ret;
|
||||
int ret = -1;
|
||||
|
||||
if (sym == NULL)
|
||||
return -1;
|
||||
|
|
@ -621,9 +654,15 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
|
|||
if (map->dso->annotate_warned)
|
||||
return -1;
|
||||
|
||||
browser.offsets = zalloc(size * sizeof(struct disasm_line *));
|
||||
if (browser.offsets == NULL) {
|
||||
ui__error("Not enough memory!");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (symbol__annotate(sym, map, sizeof(struct browser_disasm_line)) < 0) {
|
||||
ui__error("%s", ui_helpline__last_msg);
|
||||
return -1;
|
||||
goto out_free_offsets;
|
||||
}
|
||||
|
||||
ui_helpline__push("Press <- or ESC to exit");
|
||||
|
|
@ -639,12 +678,15 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
|
|||
browser.b.width = line_len;
|
||||
bpos = disasm_line__browser(pos);
|
||||
bpos->idx = browser.nr_entries++;
|
||||
if (pos->offset != -1)
|
||||
if (pos->offset != -1) {
|
||||
bpos->idx_asm = browser.nr_asm_entries++;
|
||||
else
|
||||
browser.offsets[pos->offset] = pos;
|
||||
} else
|
||||
bpos->idx_asm = -1;
|
||||
}
|
||||
|
||||
annotate_browser__mark_jump_targets(&browser, size);
|
||||
|
||||
browser.b.nr_entries = browser.nr_entries;
|
||||
browser.b.entries = ¬es->src->source,
|
||||
browser.b.width += 18; /* Percentage */
|
||||
|
|
@ -653,5 +695,8 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
|
|||
list_del(&pos->node);
|
||||
disasm_line__free(pos);
|
||||
}
|
||||
|
||||
out_free_offsets:
|
||||
free(browser.offsets);
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue