mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
perf annotate: Allow showing offsets in more than just jump targets
Jesper wanted to see offsets at callq sites when doing some performance investigation related to retpolines, so save him some time by providing an 'struct annotation_options' to control where offsets should appear: just on jump targets? That + call instructions? All? This puts in place the logic to show the offsets, now we need to wire this up in the TUI browser (next patch) and on the 'perf annotate --stdio2" interface, where we need a more general mechanism to setup the 'annotation_options' struct from the command line. Suggested-by: Jesper Dangaard Brouer <brouer@redhat.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: David Ahern <dsahern@gmail.com> Cc: Jin Yao <yao.jin@linux.intel.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Martin Liška <mliska@suse.cz> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com> Cc: Thomas Richter <tmricht@linux.vnet.ibm.com> Cc: Wang Nan <wangnan0@huawei.com> Link: https://lkml.kernel.org/n/tip-m3jc9c3swobye9tj08gnh5i7@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
af72cfb80a
commit
592c10e217
2 changed files with 18 additions and 2 deletions
|
@ -46,6 +46,7 @@
|
|||
struct annotation_options annotation__default_options = {
|
||||
.use_offset = true,
|
||||
.jump_arrows = true,
|
||||
.offset_level = ANNOTATION__OFFSET_JUMP_TARGETS,
|
||||
};
|
||||
|
||||
const char *disassembler_style;
|
||||
|
@ -2512,7 +2513,8 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati
|
|||
if (!notes->options->use_offset) {
|
||||
printed = scnprintf(bf, sizeof(bf), "%" PRIx64 ": ", addr);
|
||||
} else {
|
||||
if (al->jump_sources) {
|
||||
if (al->jump_sources &&
|
||||
notes->options->offset_level >= ANNOTATION__OFFSET_JUMP_TARGETS) {
|
||||
if (notes->options->show_nr_jumps) {
|
||||
int prev;
|
||||
printed = scnprintf(bf, sizeof(bf), "%*d ",
|
||||
|
@ -2523,9 +2525,14 @@ static void __annotation_line__write(struct annotation_line *al, struct annotati
|
|||
obj__printf(obj, bf);
|
||||
obj__set_color(obj, prev);
|
||||
}
|
||||
|
||||
print_addr:
|
||||
printed = scnprintf(bf, sizeof(bf), "%*" PRIx64 ": ",
|
||||
notes->widths.target, addr);
|
||||
} else if (ins__is_call(&disasm_line(al)->ins) &&
|
||||
notes->options->offset_level >= ANNOTATION__OFFSET_CALL) {
|
||||
goto print_addr;
|
||||
} else if (notes->options->offset_level == ANNOTATION__MAX_OFFSET_LEVEL) {
|
||||
goto print_addr;
|
||||
} else {
|
||||
printed = scnprintf(bf, sizeof(bf), "%-*s ",
|
||||
notes->widths.addr, " ");
|
||||
|
|
|
@ -70,8 +70,17 @@ struct annotation_options {
|
|||
show_nr_jumps,
|
||||
show_nr_samples,
|
||||
show_total_period;
|
||||
u8 offset_level;
|
||||
};
|
||||
|
||||
enum {
|
||||
ANNOTATION__OFFSET_JUMP_TARGETS = 1,
|
||||
ANNOTATION__OFFSET_CALL,
|
||||
ANNOTATION__MAX_OFFSET_LEVEL,
|
||||
};
|
||||
|
||||
#define ANNOTATION__MIN_OFFSET_LEVEL ANNOTATION__OFFSET_JUMP_TARGETS
|
||||
|
||||
extern struct annotation_options annotation__default_options;
|
||||
|
||||
struct annotation;
|
||||
|
|
Loading…
Reference in a new issue