Commit 95582596 authored by Akihiro Nagai's avatar Akihiro Nagai Committed by Arnaldo Carvalho de Melo

perf script: Print branch_from and branch_to of BTS events

BTS records branch_from_addr and branch_to_addr in IP and ADDR field in perf_sample.
This patch enables to print them in following format,

<from_addr> <from_symbol> (<from_dso>) => <to_addr> <to_symbol> (<to_dso>)

Sample:
 ffffffff814675d2 irq_return ([kernel.kallsyms]) => 3f03e016b0    _start (/lib64/ld-2.14.so)
 ffffffff814675d2 irq_return ([kernel.kallsyms]) => 3f03e016b0    _start (/lib64/ld-2.14.so)
       3f03e016b3     _start (/lib64/ld-2.14.so) => 3f03e04b80 _dl_start (/lib64/ld-2.14.so)
 ffffffff814675d2 irq_return ([kernel.kallsyms]) => 3f03e04b80 _dl_start (/lib64/ld-2.14.so)
 ffffffff814675d2 irq_return ([kernel.kallsyms]) => 3f03e04ba6 _dl_start (/lib64/ld-2.14.so)
 ffffffff814675d2 irq_return ([kernel.kallsyms]) => 3f03e04bad _dl_start (/lib64/ld-2.14.so)
       3f03e04bfb  _dl_start (/lib64/ld-2.14.so) => 3f03e04c1d _dl_start (/lib64/ld-2.14.so)
[snip]

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20120130044309.2384.44252.stgit@linux3Signed-off-by: default avatarAkihiro Nagai <akihiro.nagai.hw@hitachi.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 547a92e0
...@@ -304,6 +304,13 @@ static void print_sample_start(struct perf_sample *sample, ...@@ -304,6 +304,13 @@ static void print_sample_start(struct perf_sample *sample,
} }
} }
static bool is_bts_event(struct perf_event_attr *attr)
{
return ((attr->type == PERF_TYPE_HARDWARE) &&
(attr->config & PERF_COUNT_HW_BRANCH_INSTRUCTIONS) &&
(attr->sample_period == 1));
}
static bool sample_addr_correlates_sym(struct perf_event_attr *attr) static bool sample_addr_correlates_sym(struct perf_event_attr *attr)
{ {
if ((attr->type == PERF_TYPE_SOFTWARE) && if ((attr->type == PERF_TYPE_SOFTWARE) &&
...@@ -312,6 +319,9 @@ static bool sample_addr_correlates_sym(struct perf_event_attr *attr) ...@@ -312,6 +319,9 @@ static bool sample_addr_correlates_sym(struct perf_event_attr *attr)
(attr->config == PERF_COUNT_SW_PAGE_FAULTS_MAJ))) (attr->config == PERF_COUNT_SW_PAGE_FAULTS_MAJ)))
return true; return true;
if (is_bts_event(attr))
return true;
return false; return false;
} }
...@@ -353,6 +363,33 @@ static void print_sample_addr(union perf_event *event, ...@@ -353,6 +363,33 @@ static void print_sample_addr(union perf_event *event,
} }
} }
static void print_sample_bts(union perf_event *event,
struct perf_sample *sample,
struct perf_evsel *evsel,
struct machine *machine,
struct thread *thread)
{
struct perf_event_attr *attr = &evsel->attr;
/* print branch_from information */
if (PRINT_FIELD(IP)) {
if (!symbol_conf.use_callchain)
printf(" ");
else
printf("\n");
perf_event__print_ip(event, sample, machine, evsel,
PRINT_FIELD(SYM), PRINT_FIELD(DSO));
}
printf(" => ");
/* print branch_to information */
if (PRINT_FIELD(ADDR))
print_sample_addr(event, sample, machine, thread, attr);
printf("\n");
}
static void process_event(union perf_event *event __unused, static void process_event(union perf_event *event __unused,
struct perf_sample *sample, struct perf_sample *sample,
struct perf_evsel *evsel, struct perf_evsel *evsel,
...@@ -366,6 +403,11 @@ static void process_event(union perf_event *event __unused, ...@@ -366,6 +403,11 @@ static void process_event(union perf_event *event __unused,
print_sample_start(sample, thread, attr); print_sample_start(sample, thread, attr);
if (is_bts_event(attr)) {
print_sample_bts(event, sample, evsel, machine, thread);
return;
}
if (PRINT_FIELD(TRACE)) if (PRINT_FIELD(TRACE))
print_trace_event(sample->cpu, sample->raw_data, print_trace_event(sample->cpu, sample->raw_data,
sample->raw_size); sample->raw_size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment