diff options
author | Andi Kleen <ak@linux.intel.com> | 2013-09-20 10:40:42 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-10-04 04:06:10 -0400 |
commit | 0126d493b62e1306db09e1019c05e0bfe84ae8e7 (patch) | |
tree | a9e627f3d7fee77e3fa8a52cc47748c49d17d294 /tools | |
parent | f5d05bcec409aec2c41727077ad818f7c4db005b (diff) |
tools/perf/record: Add abort_tx,no_tx,in_tx branch filter options to perf record -j
Make perf record -j aware of the new in_tx,no_tx,abort_tx branch qualifiers.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1379688044-14173-5-git-send-email-andi@firstfloor.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/Documentation/perf-record.txt | 3 | ||||
-rw-r--r-- | tools/perf/builtin-record.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt index e297b74471b8..6bec1c944849 100644 --- a/tools/perf/Documentation/perf-record.txt +++ b/tools/perf/Documentation/perf-record.txt | |||
@@ -166,6 +166,9 @@ following filters are defined: | |||
166 | - u: only when the branch target is at the user level | 166 | - u: only when the branch target is at the user level |
167 | - k: only when the branch target is in the kernel | 167 | - k: only when the branch target is in the kernel |
168 | - hv: only when the target is at the hypervisor level | 168 | - hv: only when the target is at the hypervisor level |
169 | - in_tx: only when the target is in a hardware transaction | ||
170 | - no_tx: only when the target is not in a hardware transaction | ||
171 | - abort_tx: only when the target is a hardware transaction abort | ||
169 | 172 | ||
170 | + | 173 | + |
171 | The option requires at least one branch type among any, any_call, any_ret, ind_call. | 174 | The option requires at least one branch type among any, any_call, any_ret, ind_call. |
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index a41ac41546c9..8384b54e1eba 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c | |||
@@ -618,6 +618,9 @@ static const struct branch_mode branch_modes[] = { | |||
618 | BRANCH_OPT("any_call", PERF_SAMPLE_BRANCH_ANY_CALL), | 618 | BRANCH_OPT("any_call", PERF_SAMPLE_BRANCH_ANY_CALL), |
619 | BRANCH_OPT("any_ret", PERF_SAMPLE_BRANCH_ANY_RETURN), | 619 | BRANCH_OPT("any_ret", PERF_SAMPLE_BRANCH_ANY_RETURN), |
620 | BRANCH_OPT("ind_call", PERF_SAMPLE_BRANCH_IND_CALL), | 620 | BRANCH_OPT("ind_call", PERF_SAMPLE_BRANCH_IND_CALL), |
621 | BRANCH_OPT("abort_tx", PERF_SAMPLE_BRANCH_ABORT_TX), | ||
622 | BRANCH_OPT("in_tx", PERF_SAMPLE_BRANCH_IN_TX), | ||
623 | BRANCH_OPT("no_tx", PERF_SAMPLE_BRANCH_NO_TX), | ||
621 | BRANCH_END | 624 | BRANCH_END |
622 | }; | 625 | }; |
623 | 626 | ||