perf annotate: Support multiple events without group
PATCH 1/1 perf annotate: Support multiple events without group
See example,
perf record -e cycles,branches ./div
perf annotate main --stdio or
perf annotate main --stdio2 or
perf annotate main
The "perf annotate" should show both cycles and branches on the left side, but actually it only shows one event cycles.
It works with events group like:
perf record -e "{cycles,branches}" ./div
It should work too even without group.
This patch uses 'symbol_conf.nr_events > 1' to check if it's the multiple events case.
With this patch,
perf record -e cycles,branches ./div
perf annotate main --stdio2
......
for (i = 0; i < 2000000000; i++) {
flag = compute_flag();
4.85 5.83 38: xor %eax,%eax
0.01 0.01 → callq compute_flagcount++; 4.44 2.27 mov count,%edx 0.00 0.00 add $0x1,%edx
......
--- tools/perf/util/annotate.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tools/perf/util/annotate.c +8 -0
@@ -1054,6 +1054,8 @@ annotation_line__new(struct annotate_args *args, size_t privsize)if (perf_evsel__is_group_event (evsel)) nr = evsel->nr_members; +else if (symbol_conf.nr_events > nr) + nr = symbol_conf.nr_events; size +=sizeof (al->samples[0 ]) * nr;
@@ -1326,6 +1328,8 @@ annotation_line__print(struct annotation_line *al, struct symbol *sym, u64 startif (perf_evsel__is_group_event (evsel)) width *= evsel->nr_members; +else if (symbol_conf.nr_events >1 ) + width *= symbol_conf.nr_events;if (!*al->line)printf (" %*s:\n" , width," " );
@@ -1967,6 +1971,8 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,if (perf_evsel__is_group_event (evsel)) width *= evsel->nr_members; +else if (symbol_conf.nr_events >1 ) + width *= symbol_conf.nr_events; graph_dotted_len = printf(" %-*.*s| Source code & Disassembly of %s for %s (%" PRIu64 " samples)\n", width, width, symbol_conf.show_total_period ? "Period" :
@@ -2578,6 +2584,8 @@ int symbol__annotate2(struct symbol *sym, struct map *map, struct perf_evsel *evif (perf_evsel__is_group_event (evsel)) nr_pcnt = evsel->nr_members; +else if (symbol_conf.nr_events > nr_pcnt) + nr_pcnt = symbol_conf.nr_events; err =symbol__annotate (sym, map, evsel,0 , parch);if (err)
Signature · 1 line
2.7.4
Hi,
Any comments for this fix?
Thanks
Jin Yao
Quoted 80 lines · Jin Yao
See example,
perf record -e cycles,branches ./div
perf annotate main --stdio or
perf annotate main --stdio2 or
perf annotate mainThe "perf annotate" should show both cycles and branches on the left side, but actually it only shows one event cycles.
It works with events group like:
perf record -e "{cycles,branches}" ./divIt should work too even without group.
This patch uses 'symbol_conf.nr_events > 1' to check if it's the multiple events case.
With this patch,
perf record -e cycles,branches ./div
perf annotate main --stdio2...... for (i = 0; i < 2000000000; i++) { flag = compute_flag(); 4.85 5.83 38: xor %eax,%eax 0.01 0.01 → callq compute_flagcount++; 4.44 2.27 mov count,%edx 0.00 0.00 add $0x1,%edx......
Signed-off-by Jin Yao <[email protected]>--- tools/perf/util/annotate.c | 8 ++++++++ 1 file changed, 8 insertions(+)tools/perf/util/annotate.c +8
-0@@ -1054,6 +1054,8 @@ annotation_line__new(struct annotate_args *args, size_t privsize)if (perf_evsel__is_group_event (evsel)) nr = evsel->nr_members; +else if (symbol_conf.nr_events > nr) + nr = symbol_conf.nr_events; size +=sizeof (al->samples[0 ]) * nr;@@ -1326,6 +1328,8 @@ annotation_line__print(struct annotation_line *al, struct symbol *sym, u64 startif (perf_evsel__is_group_event (evsel)) width *= evsel->nr_members; +else if (symbol_conf.nr_events >1 ) + width *= symbol_conf.nr_events;if (!*al->line)printf (" %*s:\n" , width," " );@@ -1967,6 +1971,8 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,if (perf_evsel__is_group_event (evsel)) width *= evsel->nr_members; +else if (symbol_conf.nr_events >1 ) + width *= symbol_conf.nr_events; graph_dotted_len = printf(" %-*.*s| Source code & Disassembly of %s for %s (%" PRIu64 " samples)\n", width, width, symbol_conf.show_total_period ? "Period" :@@ -2578,6 +2584,8 @@ int symbol__annotate2(struct symbol *sym, struct map *map, struct perf_evsel *evif (perf_evsel__is_group_event (evsel)) nr_pcnt = evsel->nr_members; +else if (symbol_conf.nr_events > nr_pcnt) + nr_pcnt = symbol_conf.nr_events; err =symbol__annotate (sym, map, evsel,0 , parch);if (err)
Arnaldo Carvalho de Melo
maintainerEm Thu, May 10, 2018 at 09:59:22PM +0800, Jin Yao escreveu:
Quoted 7 lines
See example,
perf record -e cycles,branches ./div
perf annotate main --stdio or
perf annotate main --stdio2 or
perf annotate main
Quoted 7 lines
The "perf annotate" should show both cycles and branches on the left side, but actually it only shows one event cycles.
It works with events group like:
perf record -e "{cycles,branches}" ./divIt should work too even without group.
Humm, I think that this should be done the way it is for perf report, i.e. you select the group output by using --group, no?
Jiri, isn't that how it is done in 'perf report' for non-explicit groups?
- Arnaldo
Quoted 66 lines
This patch uses 'symbol_conf.nr_events > 1' to check if it's the multiple events case.
With this patch,
perf record -e cycles,branches ./div
perf annotate main --stdio2...... for (i = 0; i < 2000000000; i++) { flag = compute_flag(); 4.85 5.83 38: xor %eax,%eax 0.01 0.01 → callq compute_flagcount++; 4.44 2.27 mov count,%edx 0.00 0.00 add $0x1,%edx......
Signed-off-by Jin Yao <[email protected]>--- tools/perf/util/annotate.c | 8 ++++++++ 1 file changed, 8 insertions(+)tools/perf/util/annotate.c +8
-0@@ -1054,6 +1054,8 @@ annotation_line__new(struct annotate_args *args, size_t privsize)if (perf_evsel__is_group_event (evsel)) nr = evsel->nr_members; +else if (symbol_conf.nr_events > nr) + nr = symbol_conf.nr_events; size +=sizeof (al->samples[0 ]) * nr;@@ -1326,6 +1328,8 @@ annotation_line__print(struct annotation_line *al, struct symbol *sym, u64 startif (perf_evsel__is_group_event (evsel)) width *= evsel->nr_members; +else if (symbol_conf.nr_events >1 ) + width *= symbol_conf.nr_events;if (!*al->line)printf (" %*s:\n" , width," " );@@ -1967,6 +1971,8 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map,if (perf_evsel__is_group_event (evsel)) width *= evsel->nr_members; +else if (symbol_conf.nr_events >1 ) + width *= symbol_conf.nr_events; graph_dotted_len = printf(" %-*.*s| Source code & Disassembly of %s for %s (%" PRIu64 " samples)\n", width, width, symbol_conf.show_total_period ? "Period" :@@ -2578,6 +2584,8 @@ int symbol__annotate2(struct symbol *sym, struct map *map, struct perf_evsel *evif (perf_evsel__is_group_event (evsel)) nr_pcnt = evsel->nr_members; +else if (symbol_conf.nr_events > nr_pcnt) + nr_pcnt = symbol_conf.nr_events; err =symbol__annotate (sym, map, evsel,0 , parch);if (err)Signature · 1 line
2.7.4
Quoted 14 lines · Arnaldo Carvalho de Melo
Em Thu, May 10, 2018 at 09:59:22PM +0800, Jin Yao escreveu:
Quoted 13 lines
See example,
perf record -e cycles,branches ./div
perf annotate main --stdio or
perf annotate main --stdio2 or
perf annotate mainThe "perf annotate" should show both cycles and branches on the left side, but actually it only shows one event cycles.
It works with events group like:
perf record -e "{cycles,branches}" ./div
Quoted 7 lines
Quoted 1 line
It should work too even without group.
Humm, I think that this should be done the way it is for perf report, i.e. you select the group output by using --group, no?
Jiri, isn't that how it is done in 'perf report' for non-explicit groups?
yep, if there's no event group, the --group will enable the group output in report.. sounds ok to follow this also in annotate
'perf report' TUI offers list of events to choose from and the --stdio version prints report for each event annotate could do the same
jirka
Quoted 23 lines · Jiri Olsa
Quoted 14 lines · Arnaldo Carvalho de Melo
Em Thu, May 10, 2018 at 09:59:22PM +0800, Jin Yao escreveu:
Quoted 13 lines
See example,
perf record -e cycles,branches ./div
perf annotate main --stdio or
perf annotate main --stdio2 or
perf annotate mainThe "perf annotate" should show both cycles and branches on the left side, but actually it only shows one event cycles.
It works with events group like:
perf record -e "{cycles,branches}" ./divQuoted 7 lines
Quoted 1 line
It should work too even without group.
Humm, I think that this should be done the way it is for perf report, i.e. you select the group output by using --group, no?
Jiri, isn't that how it is done in 'perf report' for non-explicit groups?
Quoted 9 lines
yep, if there's no event group, the --group will enable the group output in report.. sounds ok to follow this also in annotate
'perf report' TUI offers list of events to choose from and the --stdio version prints report for each event annotate could do the same
jirka
Hi Jiri, Arnaldo,
OK, thanks, I will look at --group and see how it works.
Yes, using a unified interface (--group) for non-explicit groups is a good choice.
Thanks
Jin Yao