perf report: Fix no branch type statistics report issue
PATCH 1/1 perf report: Fix no branch type statistics report issue
Previously we could get the report of branch type statistics.
For example,
perf record -j any,save_type ...
perf report --stdio
#
# Branch Statistics:
#
COND_FWD: 40.6%
COND_BWD: 4.1%
CROSS_4K: 24.7%
CROSS_2M: 12.3%
COND: 44.7%
UNCOND: 0.0%
IND: 6.1%
CALL: 24.5%
RET: 24.7%But now for the recent perf, it can't report the branch type statistics.
It's a regression issue caused by commit 40c39e304641 ("perf report: Fix a no annotate browser displayed issue"), which only counts the branch type statistics for browser mode.
This patch moves the branch_type_count() outside of ui__has_annotation() checking, then branch type statistics can work for stdio mode.
--- tools/perf/builtin-report.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
tools/perf/builtin-report.c +4 -5
@@ -186,24 +186,23 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter, {struct hist_entry *he = iter->he;struct report *rep = arg; -struct branch_info *bi; +struct branch_info *bi = he->branch_info;struct perf_sample *sample = iter->sample;struct evsel *evsel = iter->evsel;int err; +branch_type_count (&rep->brtype_stat, &bi->flags, + bi->from.addr, bi->to.addr); +if (!ui__has_annotation () && !rep->symbol_ipc)return 0 ; - bi = he->branch_info; err =addr_map_symbol__inc_samples (&bi->from, sample, evsel);if (err) goto out; err =addr_map_symbol__inc_samples (&bi->to, sample, evsel); -branch_type_count (&rep->brtype_stat, &bi->flags, - bi->from.addr, bi->to.addr); - out:return err; }
Signature · 1 line
2.17.1
Em Fri, Mar 13, 2020 at 09:46:07PM +0800, Jin Yao escreveu:
Quoted 22 lines
Previously we could get the report of branch type statistics.
For example,
perf record -j any,save_type ...
perf report --stdio#
# Branch Statistics:
#
COND_FWD: 40.6%
COND_BWD: 4.1%CROSS_4K: 24.7% CROSS_2M: 12.3% COND: 44.7% UNCOND: 0.0% IND: 6.1% CALL: 24.5% RET: 24.7%But now for the recent perf, it can't report the branch type statistics.
Quoted 8 lines
It's a regression issue caused by commit
40c39e304641("perf report: Fix a no annotate browser displayed issue"), which only counts the branch type statistics for browser mode.This patch moves the
branch_type_count()outside ofui__has_annotation()checking, then branch type statistics can work for stdio mode.Fixes 40c39e304641 ("perf report: Fix a no annotate browser displayed issue")
Thanks, tested before/after, matches description, applied.
- Arnaldo
Quoted 41 lines
Signed-off-by Jin Yao <[email protected]>--- tools/perf/builtin-report.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)tools/perf/builtin-report.c +4
-5@@ -186,24 +186,23 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter, {struct hist_entry *he = iter->he;struct report *rep = arg; -struct branch_info *bi; +struct branch_info *bi = he->branch_info;struct perf_sample *sample = iter->sample;struct evsel *evsel = iter->evsel;int err; +branch_type_count (&rep->brtype_stat, &bi->flags, + bi->from.addr, bi->to.addr); +if (!ui__has_annotation () && !rep->symbol_ipc)return 0 ; - bi = he->branch_info; err =addr_map_symbol__inc_samples (&bi->from, sample, evsel);if (err) goto out; err =addr_map_symbol__inc_samples (&bi->to, sample, evsel); -branch_type_count (&rep->brtype_stat, &bi->flags, - bi->from.addr, bi->to.addr); - out:return err; }Signature · 1 line
2.17.1
Signature · 1 line
- Arnaldo
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: c3b10649a80e9da2892c1fd3038c53abd57588f6 Gitweb: https://git.kernel.org/tip/c3b10649a80e9da2892c1fd3038c53abd57588f6 Author: Jin Yao <[email protected]> AuthorDate: Fri, 13 Mar 2020 21:46:07 +08:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Tue, 17 Mar 2020 18:01:40 -03:00
perf report: Fix no branch type statistics report issue
Previously we could get the report of branch type statistics.
For example:
# perf record -j any,save_type ... # t perf report --stdio
#
# Branch Statistics:
#
COND_FWD: 40.6%
COND_BWD: 4.1%
CROSS_4K: 24.7%
CROSS_2M: 12.3%
COND: 44.7%
UNCOND: 0.0%
IND: 6.1%
CALL: 24.5%
RET: 24.7%But now for the recent perf, it can't report the branch type statistics.
It's a regression issue caused by commit 40c39e304641 ("perf report: Fix a no annotate browser displayed issue"), which only counts the branch type statistics for browser mode.
This patch moves the branch_type_count() outside of ui__has_annotation() checking, then branch type statistics can work for stdio mode.
--- tools/perf/builtin-report.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
tools/perf/builtin-report.c +4 -5
@@ -186,24 +186,23 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter, {struct hist_entry *he = iter->he;struct report *rep = arg; -struct branch_info *bi; +struct branch_info *bi = he->branch_info;struct perf_sample *sample = iter->sample;struct evsel *evsel = iter->evsel;int err; +branch_type_count (&rep->brtype_stat, &bi->flags, + bi->from.addr, bi->to.addr); +if (!ui__has_annotation () && !rep->symbol_ipc)return 0 ; - bi = he->branch_info; err =addr_map_symbol__inc_samples (&bi->from, sample, evsel);if (err) goto out; err =addr_map_symbol__inc_samples (&bi->to, sample, evsel); -branch_type_count (&rep->brtype_stat, &bi->flags, - bi->from.addr, bi->to.addr); - out:return err; }