perf evlist: Allow setting arbitrary leader
Ian Rogers
reviewerPATCH v3 1/2 perf evlist: Allow setting arbitrary leader
The leader of a group is the first, but allow it to be an arbitrary list member so that for Intel topdown events slots may always be the group leader.
v3. Switched list_entry to list_first_entry as suggested by Arnaldo
Carvalho de Melo <[email protected]>.
--- tools/lib/perf/evlist.c | 15 +++++++++------ tools/lib/perf/include/internal/evlist.h | 2 +- tools/perf/util/parse-events.c | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-)
tools/lib/perf/evlist.c +9 -6
@@ -643,14 +643,14 @@ perf_evlist__next_mmap(struct perf_evlist *evlist, struct perf_mmap *map,return overwrite ? evlist->mmap_ovw_first : evlist->mmap_first; } -void __perf_evlist__set_leader (struct list_head *list) +void __perf_evlist__set_leader (struct list_head *list,struct perf_evsel *leader) { -struct perf_evsel *evsel, *leader; +struct perf_evsel *first, *last, *evsel; - leader = list_entry(list->next, struct perf_evsel, node); - evsel = list_entry(list->prev, struct perf_evsel, node); + first = list_first_entry(list, struct perf_evsel, node); + last = list_last_entry(list, struct perf_evsel, node); - leader->nr_members = evsel->idx - leader->idx +1 ; + leader->nr_members = last->idx - first->idx +1 ;__perf_evlist__for_each_entry (list, evsel) evsel->leader = leader;
@@ -659,7 +659,10 @@ void __perf_evlist__set_leader(struct list_head *list)void perf_evlist__set_leader (struct perf_evlist *evlist) {if (evlist->nr_entries) { +struct perf_evsel *first =list_entry (evlist->entries.next, + struct perf_evsel, node); + evlist->nr_groups = evlist->nr_entries >1 ?1 :0 ; -__perf_evlist__set_leader (&evlist->entries); +__perf_evlist__set_leader (&evlist->entries, first); } }
tools/lib/perf/include/internal/evlist.h +1 -1
@@ -127,5 +127,5 @@ int perf_evlist__id_add_fd(struct perf_evlist *evlist,void perf_evlist__reset_id_hash (struct perf_evlist *evlist); -void __perf_evlist__set_leader (struct list_head *list); +void __perf_evlist__set_leader (struct list_head *list,struct perf_evsel *leader);#endif /* __LIBPERF_INTERNAL_EVLIST_H */
tools/perf/util/parse-events.c +2 -2
@@ -1834,8 +1834,8 @@ void parse_events__set_leader(char *name, struct list_head *list,if (parse_events__set_leader_for_uncore_aliase (name, list, parse_state))return ; -__perf_evlist__set_leader (list); - leader = list_entry(list->next, struct evsel, core.node); + leader = list_first_entry(list, struct evsel, core.node); +__perf_evlist__set_leader (list, &leader->core); leader->group_name = name ?strdup (name) :NULL ; }
Signature · 1 line
2.34.0.rc2.393.gf8c9666880-goog
Ian Rogers
reviewerPATCH v3 2/2 perf parse-events: Architecture specific leader override
Currently topdown events must appear after a slots event:
$ perf stat -e '{slots,topdown-fe-bound}' /bin/true Performance counter stats for '/bin/true':
3,183,090 slots
986,133 topdown-fe-boundReversing the events yields:
$ perf stat -e '{topdown-fe-bound,slots}' /bin/true
Error:
The sys_perf_event_open() syscall returned with 22 (Invalid argument) for event (topdown-fe-bound).For metrics the order of events is determined by iterating over a hashmap, and so slots isn't guaranteed to be first which can yield this error.
Change the set_leader in parse-events, called when a group is closed, so that rather than always making the first event the leader, if the slots event exists then it is made the leader. It is then moved to the head of the evlist otherwise it won't be opened in the correct order.
The result is:
$ perf stat -e '{topdown-fe-bound,slots}' /bin/true Performance counter stats for '/bin/true':
3,274,795 slots
1,001,702 topdown-fe-boundA problem with this approach is the slots event is identified by name, names can be overwritten like 'cpu/slots,name=foo/' and this causes the leader change to fail.
The change also modifies and fixes mixed groups like, with the change:
$ perf stat -e '{instructions,slots,topdown-fe-bound}' -a -- sleep 2Performance counter stats for 'system wide':
5574985410 slots
971981616 instructions
1348461887 topdown-fe-bound2.001263120 seconds time elapsed
Without the change:
$ perf stat -e '{instructions,slots,topdown-fe-bound}' -a -- sleep 2Performance counter stats for 'system wide':
<not counted> instructions
<not counted> slots
<not supported> topdown-fe-bound2.006247990 seconds time elapsed
Something that may be undesirable here is that the events are reordered in the output.
v2. Move the list_move operation into parse_events__set_leader as
suggested by Jiri Olsa <[email protected]>.
v3. Switched list_entry to list_first_entry as suggested by Arnaldo
Carvalho de Melo <[email protected]>.
--- tools/perf/arch/x86/util/evlist.c | 17 +++++++++++++++++ tools/perf/util/evlist.h | 1 + tools/perf/util/parse-events.c | 8 +++++++- 3 files changed, 25 insertions(+), 1 deletion(-)
tools/perf/arch/x86/util/evlist.c +17 -0
@@ -17,3 +17,20 @@ int arch_evlist__add_default_attrs(struct evlist *evlist)else return parse_events (evlist,TOPDOWN_L1_EVENTS ,NULL ); } + +struct evsel *arch_evlist__leader (struct list_head *list) +{ +struct evsel *evsel, *first; + + first = list_first_entry(list, struct evsel, core.node); + +if (!pmu_have_event ("cpu" ,"slots" )) +return first; + +__evlist__for_each_entry (list, evsel) { +if (evsel->pmu_name && !strcmp (evsel->pmu_name,"cpu" ) && + evsel->name &&strstr (evsel->name,"slots" )) +return evsel; + } +return first; +}
tools/perf/util/evlist.h +1 -0
@@ -110,6 +110,7 @@ int __evlist__add_default_attrs(struct evlist *evlist, __evlist__add_default_attrs(evlist, array, ARRAY_SIZE(array))int arch_evlist__add_default_attrs (struct evlist *evlist); +struct evsel *arch_evlist__leader (struct list_head *list);int evlist__add_dummy (struct evlist *evlist);
tools/perf/util/parse-events.c +7 -1
@@ -1821,6 +1821,11 @@ parse_events__set_leader_for_uncore_aliase(char *name, struct list_head *list,return ret; } +__weak struct evsel *arch_evlist__leader (struct list_head *list) +{ + return list_first_entry(list, struct evsel, core.node); +} +void parse_events__set_leader (char *name,struct list_head *list,struct parse_events_state *parse_state) {
@@ -1834,9 +1839,10 @@ void parse_events__set_leader(char *name, struct list_head *list,if (parse_events__set_leader_for_uncore_aliase (name, list, parse_state))return ; - leader = list_first_entry(list, struct evsel, core.node); + leader =arch_evlist__leader (list);__perf_evlist__set_leader (list, &leader->core); leader->group_name = name ?strdup (name) :NULL ; +list_move (&leader->core.node, list); }/* list_event is assumed to point to malloc'ed memory */
Signature · 1 line
2.34.0.rc2.393.gf8c9666880-goog
Em Tue, Nov 30, 2021 at 09:49:44AM -0800, Ian Rogers escreveu:
Quoted 6 lines
The leader of a group is the first, but allow it to be an arbitrary list member so that for Intel topdown events slots may always be the group leader.
v3. Switched
list_entrytolist_first_entryas suggested by Arnaldo
Carvalho de Melo <[email protected]>.
Thanks, applied both patches.
- Arnaldo
Quoted 73 lines
Reviewed-by Kajol Jain<[email protected]>Acked-by Jiri Olsa <[email protected]>Signed-off-by Ian Rogers <[email protected]>--- tools/lib/perf/evlist.c | 15 +++++++++------ tools/lib/perf/include/internal/evlist.h | 2 +- tools/perf/util/parse-events.c | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-)tools/lib/perf/evlist.c +9
-6@@ -643,14 +643,14 @@ perf_evlist__next_mmap(struct perf_evlist *evlist, struct perf_mmap *map,return overwrite ? evlist->mmap_ovw_first : evlist->mmap_first; } -void __perf_evlist__set_leader (struct list_head *list) +void __perf_evlist__set_leader (struct list_head *list,struct perf_evsel *leader) { -struct perf_evsel *evsel, *leader; +struct perf_evsel *first, *last, *evsel; - leader = list_entry(list->next, struct perf_evsel, node); - evsel = list_entry(list->prev, struct perf_evsel, node); + first = list_first_entry(list, struct perf_evsel, node); + last = list_last_entry(list, struct perf_evsel, node); - leader->nr_members = evsel->idx - leader->idx +1 ; + leader->nr_members = last->idx - first->idx +1 ;__perf_evlist__for_each_entry (list, evsel) evsel->leader = leader;@@ -659,7 +659,10 @@ void __perf_evlist__set_leader(struct list_head *list)void perf_evlist__set_leader (struct perf_evlist *evlist) {if (evlist->nr_entries) { +struct perf_evsel *first =list_entry (evlist->entries.next, + struct perf_evsel, node); + evlist->nr_groups = evlist->nr_entries >1 ?1 :0 ; -__perf_evlist__set_leader (&evlist->entries); +__perf_evlist__set_leader (&evlist->entries, first); } }tools/lib/perf/include/internal/evlist.h +1
-1@@ -127,5 +127,5 @@ int perf_evlist__id_add_fd(struct perf_evlist *evlist,void perf_evlist__reset_id_hash (struct perf_evlist *evlist); -void __perf_evlist__set_leader (struct list_head *list); +void __perf_evlist__set_leader (struct list_head *list,struct perf_evsel *leader);#endif /* __LIBPERF_INTERNAL_EVLIST_H */ tools/perf/util/parse-events.c +2
-2@@ -1834,8 +1834,8 @@ void parse_events__set_leader(char *name, struct list_head *list,if (parse_events__set_leader_for_uncore_aliase (name, list, parse_state))return ; -__perf_evlist__set_leader (list); - leader = list_entry(list->next, struct evsel, core.node); + leader = list_first_entry(list, struct evsel, core.node); +__perf_evlist__set_leader (list, &leader->core); leader->group_name = name ?strdup (name) :NULL ; }Signature · 1 line
2.34.0.rc2.393.gf8c9666880-goog
Signature · 1 line
- Arnaldo