perf annotate: Support '--group' option
v2 cover perf annotate: Support '--group' option
For non-explicit group, perf report has already supported a option '--group' which can enable group output.
This patch-set will support perf annotate with the same '--group'.
For example,
perf record -e cycles,branches ./div
perf annotate main --stdio --group
: Disassembly of section .text:
:
: 00000000004004b0 <main>:
: main():
:
: return i;
: }
:
: int main(void)
: {
0.00 0.00 : 4004b0: push %rbx
: int i;
: int flag;
: volatile double x = 1212121212, y = 121212;
:
: s_randseed = time(0);
0.00 0.00 : 4004b1: xor %edi,%edi
: srand(s_randseed);
0.00 0.00 : 4004b3: mov $0x77359400,%ebx
:
: return i;
: }
:v2:
---------
Arnaldo points out that it should be done the way it is for perf report --group. v2 refers to this way and the patch is totally rewritten.
Init post:
----------
Post the patch 'perf annotate: Support multiple events without group'
Jin Yao (3):
perf evlist: Create a new function perf_evlist_forced_leader perf report: Use perf_evlist_forced_leader to support '--group' perf annotate: Support '--group' option
tools/perf/builtin-annotate.c | 7 +++++++ tools/perf/builtin-report.c | 8 ++------ tools/perf/util/evlist.c | 10 ++++++++++ tools/perf/util/evlist.h | 3 +++ 4 files changed, 22 insertions(+), 6 deletions(-)
Signature · 1 line
2.7.4
PATCH v2 1/3 perf evlist: Create a new function perf_evlist_forced_leader
For non-explicit group, perf report supports a option '--group' which can enable group output. We also need to support perf annotate with the same '--group'.
Create a new function perf_evlist_forced_leader which contains common code to force setting the group leader.
--- tools/perf/util/evlist.c | 10 ++++++++++ tools/perf/util/evlist.h | 3 +++ 2 files changed, 13 insertions(+)
tools/perf/util/evlist.c +10 -0
@@ -1795,3 +1795,13 @@ bool perf_evlist__exclude_kernel(struct perf_evlist *evlist)return true; } + +void perf_evlist_forced_leader (struct perf_evlist *evlist) +{ +if (!evlist->nr_groups) { +struct perf_evsel *leader =perf_evlist__first (evlist); + +perf_evlist__set_leader (evlist); + leader->forced_leader = true; + } +}
tools/perf/util/evlist.h +3 -0
@@ -309,4 +309,7 @@ struct perf_evsel *perf_evlist__event2evsel(struct perf_evlist *evlist, union perf_event *event);bool perf_evlist__exclude_kernel (struct perf_evlist *evlist); + +void perf_evlist_forced_leader (struct perf_evlist *evlist); +#endif /* __PERF_EVLIST_H */
Signature · 1 line
2.7.4
PATCH v2 2/3 perf report: Use perf_evlist_forced_leader to support '--group'
In reply to Jin YaoSince we have created a new function perf_evlist_forced_leader, so now remove the old code and use perf_evlist_forced_leader instead.
--- tools/perf/builtin-report.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
tools/perf/builtin-report.c +2 -6
@@ -202,12 +202,8 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter,static void setup_forced_leader (struct report *report,struct perf_evlist *evlist) { -if (report->group_set && !evlist->nr_groups) { -struct perf_evsel *leader =perf_evlist__first (evlist); - -perf_evlist__set_leader (evlist); - leader->forced_leader = true; - } +if (report->group_set) +perf_evlist_forced_leader (evlist); } static int process_feature_event(struct perf_tool *tool,
Signature · 1 line
2.7.4
Re: [PATCH v2 2/3] perf report: Use perf_evlist_forced_leader to support '--group'
tools/perf/builtin-report.c static int hist_iter__branch_callback(struct hist_entry_iter *iter,
Quoted 14 lines · Jin Yao
Since we have created a new function
perf_evlist_forced_leader, so now remove the old code and useperf_evlist_forced_leaderinstead.Signed-off-by Jin Yao <[email protected]>--- tools/perf/builtin-report.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)tools/perf/builtin-report.c +0
-0@@ -202,12 +202,8 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter,
there's comment in this place, which no longer applies in here:
/*
* Events in data file are not collect in groups, but we still want
* the group display. Set the artificial group and set the leader's
* forced_leader flag to notify the display code.
*/
could you please move/change/apply it to perf_evlist_forced_leader
thanks,
jirka
Quoted 18 lines
tools/perf/builtin-report.c +2
-6static void setup_forced_leader (struct report *report,struct perf_evlist *evlist) { -if (report->group_set && !evlist->nr_groups) { -struct perf_evsel *leader =perf_evlist__first (evlist); - -perf_evlist__set_leader (evlist); - leader->forced_leader = true; - } +if (report->group_set) +perf_evlist_forced_leader (evlist); }static int process_feature_event(struct
perf_tool*tool,Signature · 1 line
2.7.4
Re: [PATCH v2 2/3] perf report: Use perf_evlist_forced_leader to support '--group'
Quoted 25 lines · Jiri Olsa
tools/perf/builtin-report.c static int hist_iter__branch_callback(struct hist_entry_iter *iter,
Quoted 14 lines · Jin Yao
Since we have created a new function
perf_evlist_forced_leader, so now remove the old code and useperf_evlist_forced_leaderinstead.Signed-off-by Jin Yao <[email protected]>--- tools/perf/builtin-report.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)tools/perf/builtin-report.c +0
-0@@ -202,12 +202,8 @@ static int hist_iter__branch_callback(struct hist_entry_iter *iter,there's comment in this place, which no longer applies in here:
/*
* Events in data file are not collect in groups, but we still want
* the group display. Set the artificial group and set the leader's
*forced_leaderflag to notify the display code.
*/
Quoted 5 lines
could you please move/change/apply it to
perf_evlist_forced_leaderthanks,
jirka
Oh, yes, I should move the comment to perf_evlist_forced_leader.
I will do it in next version.
Thanks
Jin Yao
Quoted 18 lines
Quoted 18 lines
tools/perf/builtin-report.c +2
-6static void setup_forced_leader (struct report *report,struct perf_evlist *evlist) { -if (report->group_set && !evlist->nr_groups) { -struct perf_evsel *leader =perf_evlist__first (evlist); - -perf_evlist__set_leader (evlist); - leader->forced_leader = true; - } +if (report->group_set) +perf_evlist_forced_leader (evlist); }static int process_feature_event(struct
perf_tool*tool,Signature · 1 line
2.7.4
PATCH v2 3/3 perf annotate: Support '--group' option
In reply to Jin YaoWith the '--group' option, even for non-explicit group, perf annotate will enable the group output.
For example,
perf record -e cycles,branches ./div
perf annotate main --stdio --group
: Disassembly of section .text:
:
: 00000000004004b0 <main>:
: main():
:
: return i;
: }
:
: int main(void)
: {
0.00 0.00 : 4004b0: push %rbx
: int i;
: int flag;
: volatile double x = 1212121212, y = 121212;
:
: s_randseed = time(0);
0.00 0.00 : 4004b1: xor %edi,%edi
: srand(s_randseed);
0.00 0.00 : 4004b3: mov $0x77359400,%ebx
:
: return i;
: }
:But if without --group, there is only one event reported.
perf annotate main --stdio
: Disassembly of section .text:
:
: 00000000004004b0 <main>:
: main():
:
: return i;
: }
:
: int main(void)
: {
0.00 : 4004b0: push %rbx
: int i;
: int flag;
: volatile double x = 1212121212, y = 121212;
:
: s_randseed = time(0);
0.00 : 4004b1: xor %edi,%edi
: srand(s_randseed);
0.00 : 4004b3: mov $0x77359400,%ebx
:
: return i;
: }--- tools/perf/builtin-annotate.c | 7 +++++++ 1 file changed, 7 insertions(+)
tools/perf/builtin-annotate.c +7 -0
@@ -45,6 +45,7 @@ struct perf_annotate {bool print_line;bool skip_missing;bool has_br_stack; +bool group_set;const char *sym_hist_filter;const char *cpu_list;DECLARE_BITMAP (cpu_bitmap,MAX_NR_CPUS );
@@ -508,6 +509,9 @@ int cmd_annotate(int argc, const char **argv) "Don't shorten the displayed pathnames"),OPT_BOOLEAN (0 ,"skip-missing" , &annotate.skip_missing,"Skip symbols that cannot be annotated" ), +OPT_BOOLEAN_SET (0 ,"group" , &symbol_conf.event_group, + &annotate.group_set, +"Show event group information together" ),OPT_STRING ('C' ,"cpu" , &annotate.cpu_list,"cpu" ,"list of cpus to profile" ), OPT_CALLBACK(0, "symfs", NULL, "directory", "Look for files with symbols relative to this directory",
@@ -570,6 +574,9 @@ int cmd_annotate(int argc, const char **argv) annotate.has_br_stack =perf_header__has_feat (&annotate.session->header,HEADER_BRANCH_STACK ); +if (annotate.group_set) +perf_evlist_forced_leader (annotate.session->evlist); + ret =symbol__annotation_init ();if (ret <0 ) goto out_delete;
Signature · 1 line
2.7.4