Better fixes for grouping of events
Ian Rogers
reviewerv5 cover Better fixes for grouping of events
The rules for grouping events have grown more complex. Topdown events must be grouped, but flags like --metric-no-group and flags on metrics don't respect this. Uncore events may be expanded using wild cards for PMU names, but then the events need reordering so the group members are adjacent. Rather than fixing metrics, this change fixes the main event parsing code to first sort and then regroup evsels.
As this is shared functionality changes to it should cause concern. The change is done with the intent of simplifying and making more robust the grouping logic, examples are given. If additional changes are necessary, they are most likely necessary to the evsel__group_pmu_name logic as the code avoids breaking groups that are on the same "group" PMU. The group_pmu_name is a variant of the pmu_name tweaked in the case of software and aux events, that use groups in a slightly different manner to conventional events.
The code was manually tested as well as passing perf test on a Intel tigerlake CPU with intel-pt.
v5. Add Adrian's Acked-by on patch 3, add a fix to the warning logic
for multiple event groups as reported by Adrian.
v4. Move the Intel pmu->auxtrace initialization to the existing
perf_pmu__get_default_config as suggested by Adrian Hunter.
v3. Rename pmu_name to group_pmu_name and add patch to warn when
events are regrouped as requested by Namhyung.
v2. Fix up the commit message on 4/10 (thanks Arnaldo). Drop
unnecessary v1 5/10 (thanks Kan). evlist->core.nr_groups wasn't being correctly maintained after the sort/regrouping and so the new patch 10/10 removes that variable and computes it from the evlist when necessary, generally just tests.
Ian Rogers (11):
libperf evlist: Avoid a use of evsel idx
perf stat: Don't remove all grouped events when CPU maps disagree perf pmu: Earlier PMU auxtrace initialization
perf stat: Modify the group test
perf evsel: Allow const evsel for certain accesses perf evsel: Add function to compute group PMU name perf parse-events: Pass ownership of the group name perf parse-events: Sort and group parsed events
perf evsel: Remove use_uncore_alias
perf evlist: Remove nr_groups
perf parse-events: Warn when events are regrouped
tools/lib/perf/evlist.c | 31 ++- tools/lib/perf/include/internal/evlist.h | 1 - tools/lib/perf/include/perf/evlist.h | 1 + tools/perf/arch/x86/util/auxtrace.c | 4 - tools/perf/arch/x86/util/evlist.c | 39 ++-- tools/perf/arch/x86/util/pmu.c | 8 +- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-stat.c | 24 +- tools/perf/tests/bpf.c | 1 - tools/perf/tests/parse-events.c | 24 +- tools/perf/tests/pfm.c | 12 +- tools/perf/tests/pmu-events.c | 2 +- tools/perf/util/evlist.c | 2 +- tools/perf/util/evlist.h | 8 +- tools/perf/util/evsel.c | 27 ++- tools/perf/util/evsel.h | 8 +- tools/perf/util/header.c | 3 +- tools/perf/util/metricgroup.c | 3 +- tools/perf/util/parse-events.c | 275 ++++++++++++----------- tools/perf/util/parse-events.h | 14 +- tools/perf/util/parse-events.y | 28 +-- tools/perf/util/pfm.c | 1 - tools/perf/util/pmu.c | 6 +- tools/perf/util/python.c | 2 +- tools/perf/util/stat-shadow.c | 2 +- 26 files changed, 284 insertions(+), 246 deletions(-)
Signature · 1 line
2.40.0.rc1.284.g88254d51c5-goog
Ian Rogers
reviewerPATCH v5 1/11 libperf evlist: Avoid a use of evsel idx
Setting the leader iterates the list, so rather than use idx (which may be changed through list reordering) just count the elements and set afterwards.
--- tools/lib/perf/evlist.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
tools/lib/perf/evlist.c +6 -7
@@ -687,15 +687,14 @@ perf_evlist__next_mmap(struct perf_evlist *evlist, struct perf_mmap *map,void __perf_evlist__set_leader (struct list_head *list,struct perf_evsel *leader) { -struct perf_evsel *first, *last, *evsel; - - first = list_first_entry(list, struct perf_evsel, node); - last = list_last_entry(list, struct perf_evsel, node); - - leader->nr_members = last->idx - first->idx +1 ; +struct perf_evsel *evsel; +int n =0 ; -__perf_evlist__for_each_entry (list, evsel) +__perf_evlist__for_each_entry (list, evsel) { evsel->leader = leader; + n++; + } + leader->nr_members = n; }void perf_evlist__set_leader (struct perf_evlist *evlist)
Signature · 1 line
2.40.0.rc1.284.g88254d51c5-goog
Ian Rogers
reviewerPATCH v5 2/11 perf stat: Don't remove all grouped events when CPU maps disagree
In reply to Ian RogersIf the events in an evlist's CPU map differ then the entire group is removed. For example:
```
$ perf stat -e '{imc_free_running/data_read/,imc_free_running/data_write/,cs}' -a sleep 1
WARNING: grouped events cpus do not match, disabling group:
anon group { imc_free_running/data_read/, imc_free_running/data_write/, cs }
```Change the behavior so that just the events not matching the leader are removed. So in the example above, just 'cs' will be removed.
Modify the warning so that it is produced once for each group, rather than once for the entire evlist. Shrink the scope and size of the warning text buffer.
--- tools/perf/builtin-stat.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
tools/perf/builtin-stat.c +15 -9
@@ -181,14 +181,13 @@ static bool cpus_map_matched(struct evsel *a, struct evsel *b)static void evlist__check_cpu_maps (struct evlist *evlist) { -struct evsel *evsel, *pos, *leader; -char buf[1024 ]; +struct evsel *evsel, *warned_leader =NULL ;if (evlist__has_hybrid (evlist))evlist__warn_hybrid_group (evlist);evlist__for_each_entry (evlist, evsel) { - leader =evsel__leader (evsel); +struct evsel *leader =evsel__leader (evsel);/* Check that leader matches cpus with each member. */ if (leader == evsel)
@@ -197,19 +196,26 @@ static void evlist__check_cpu_maps(struct evlist *evlist)continue ;/* If there's mismatch disable the group and warn user. */ -WARN_ONCE (1 ,"WARNING: grouped events cpus do not match, disabling group:\n" ); -evsel__group_desc (leader, buf,sizeof (buf)); -pr_warning (" %s\n" , buf); - +if (warned_leader != leader) { +char buf[200 ]; + +pr_warning ("WARNING: grouped events cpus do not match.\n" +"Events with CPUs not matching the leader will " +"be removed from the group.\n" ); +evsel__group_desc (leader, buf,sizeof (buf)); +pr_warning (" %s\n" , buf); + warned_leader = leader; + }if (verbose >0 ) { +char buf[200 ]; +cpu_map__snprint (leader->core.cpus, buf,sizeof (buf));pr_warning (" %s: %s\n" , leader->name, buf);cpu_map__snprint (evsel->core.cpus, buf,sizeof (buf));pr_warning (" %s: %s\n" , evsel->name, buf); } -for_each_group_evsel (pos, leader) -evsel__remove_from_group (pos, leader); +evsel__remove_from_group (evsel, leader); } }
Signature · 1 line
2.40.0.rc1.284.g88254d51c5-goog
Ian Rogers
reviewerPATCH v5 3/11 perf pmu: Earlier PMU auxtrace initialization
In reply to Ian RogersThis allows event parsing to use the evsel__is_aux_event function, which is important when determining event grouping.
--- tools/perf/arch/x86/util/auxtrace.c | 4 ---- tools/perf/arch/x86/util/pmu.c | 8 ++++++-- 2 files changed, 6 insertions(+), 6 deletions(-)
tools/perf/arch/x86/util/auxtrace.c +0 -4
@@ -26,11 +26,7 @@ struct auxtrace_record *auxtrace_record__init_intel(struct evlist *evlist,bool found_bts = false; intel_pt_pmu =perf_pmu__find (INTEL_PT_PMU_NAME ); -if (intel_pt_pmu) - intel_pt_pmu->auxtrace = true; intel_bts_pmu =perf_pmu__find (INTEL_BTS_PMU_NAME ); -if (intel_bts_pmu) - intel_bts_pmu->auxtrace = true;evlist__for_each_entry (evlist, evsel) {if (intel_pt_pmu && evsel->core.attr.type == intel_pt_pmu->type)
tools/perf/arch/x86/util/pmu.c +6 -2
@@ -27,10 +27,14 @@ static bool cached_list;struct perf_event_attr *perf_pmu__get_default_config (struct perf_pmu *pmu__maybe_unused ) {#ifdef HAVE_AUXTRACE_SUPPORT -if (!strcmp (pmu->name,INTEL_PT_PMU_NAME )) +if (!strcmp (pmu->name,INTEL_PT_PMU_NAME )) { + pmu->auxtrace = true;return intel_pt_pmu_default_config (pmu); -if (!strcmp (pmu->name,INTEL_BTS_PMU_NAME )) + } +if (!strcmp (pmu->name,INTEL_BTS_PMU_NAME )) { + pmu->auxtrace = true; pmu->selectable = true; + }#endif return NULL ; }
Signature · 1 line
2.40.0.rc1.284.g88254d51c5-goog
Ian Rogers
reviewerPATCH v5 4/11 perf stat: Modify the group test
In reply to Ian RogersCurrently nr_members is 0 for an event with no group, however, they are always a leader of their own group. A later change will make that count 1 because the event is its own leader. Make the find_stat logic consistent with this, an improvement suggested by Namhyung Kim.
--- tools/perf/util/stat-shadow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/stat-shadow.c +1 -1
@@ -163,7 +163,7 @@ static double find_stat(const struct evsel *evsel, int aggr_idx, enum stat_typecontinue ;/* Ignore evsels that are part of different groups. */ -if (evsel->core.leader->nr_members && +if (evsel->core.leader->nr_members >1 && evsel->core.leader != cur->core.leader)continue ;/* Ignore evsels with mismatched modifiers. */
Signature · 1 line
2.40.0.rc1.284.g88254d51c5-goog
Ian Rogers
reviewerPATCH v5 5/11 perf evsel: Allow const evsel for certain accesses
In reply to Ian RogersList sorting, added later to evlist, passes const elements requiring helper functions to also be const. Make the argument to evsel__find_pmu, evsel__is_aux_event and evsel__leader const.
--- tools/perf/util/evsel.c | 2 +- tools/perf/util/evsel.h | 6 +++--- tools/perf/util/pmu.c | 6 +++--- tools/perf/util/python.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-)
tools/perf/util/evsel.c +1 -1
@@ -3139,7 +3139,7 @@ bool evsel__is_hybrid(const struct evsel *evsel)return evsel->pmu_name &&perf_pmu__is_hybrid (evsel->pmu_name); } -struct evsel *evsel__leader (struct evsel *evsel) +struct evsel *evsel__leader (const struct evsel *evsel) { return container_of(evsel->core.leader, struct evsel, core); }
tools/perf/util/evsel.h +3 -3
@@ -212,8 +212,8 @@ int evsel__object_config(size_t object_size,int (*init)(struct evsel *evsel), void (*fini)(struct evsel *evsel)); -struct perf_pmu *evsel__find_pmu (struct evsel *evsel); -bool evsel__is_aux_event (struct evsel *evsel); +struct perf_pmu *evsel__find_pmu (const struct evsel *evsel); +bool evsel__is_aux_event (const struct evsel *evsel);struct evsel *evsel__new_idx (struct perf_event_attr *attr,int idx);
@@ -505,7 +505,7 @@ int evsel__store_ids(struct evsel *evsel, struct evlist *evlist);void evsel__zero_per_pkg (struct evsel *evsel);bool evsel__is_hybrid (const struct evsel *evsel); -struct evsel *evsel__leader (struct evsel *evsel); +struct evsel *evsel__leader (const struct evsel *evsel);bool evsel__has_leader (struct evsel *evsel,struct evsel *leader);bool evsel__is_leader (struct evsel *evsel);void evsel__set_leader (struct evsel *evsel,struct evsel *leader);
tools/perf/util/pmu.c +3 -3
@@ -988,7 +988,7 @@ struct perf_pmu *perf_pmu__scan(struct perf_pmu *pmu)return NULL ; } -struct perf_pmu *evsel__find_pmu (struct evsel *evsel) +struct perf_pmu *evsel__find_pmu (const struct evsel *evsel) {struct perf_pmu *pmu =NULL ;
@@ -1000,11 +1000,11 @@ struct perf_pmu *evsel__find_pmu(struct evsel *evsel)break ; } - evsel->pmu = pmu; + ((struct evsel *)evsel)->pmu = pmu;return pmu; } -bool evsel__is_aux_event (struct evsel *evsel) +bool evsel__is_aux_event (const struct evsel *evsel) {struct perf_pmu *pmu =evsel__find_pmu (evsel);
tools/perf/util/python.c +1 -1
@@ -83,7 +83,7 @@ const char *perf_env__arch(struct perf_env *env __maybe_unused)* far, for the perf python binding known usecases, revisit if this become * necessary. */ -struct perf_pmu *evsel__find_pmu (struct evsel *evsel__maybe_unused ) +struct perf_pmu *evsel__find_pmu (const struct evsel *evsel__maybe_unused ) {return NULL ; }
Signature · 1 line
2.40.0.rc1.284.g88254d51c5-goog
Ian Rogers
reviewerPATCH v5 6/11 perf evsel: Add function to compute group PMU name
In reply to Ian RogersThe computed name respects software events and aux event groups, such that the pmu_name is changed to be that of the aux event leader or group leader for software events. This is done as a later change will split events that are in different PMUs into different groups.
--- tools/perf/util/evsel.c | 24 ++++++++++++++++++++++++ tools/perf/util/evsel.h | 1 + 2 files changed, 25 insertions(+)
tools/perf/util/evsel.c +24 -0
@@ -821,6 +821,30 @@ const char *evsel__name(struct evsel *evsel)return "unknown" ; } +const char *evsel__group_pmu_name (const struct evsel *evsel) +{ +const struct evsel *leader; + +/* If the pmu_name is set use it. pmu_name isn't set for CPU and software events. */ +if (evsel->pmu_name) +return evsel->pmu_name; +/* +* Software events may be in a group with other uncore PMU events. Use +* the pmu_name of the group leader to avoid breaking the software event +* out of the group. +* +* Aux event leaders, like intel_pt, expect a group with events from +* other PMUs, so substitute the AUX event's PMU in this case. +*/ + leader =evsel__leader (evsel); +if ((evsel->core.attr.type ==PERF_TYPE_SOFTWARE ||evsel__is_aux_event (leader)) && + leader->pmu_name) { +return leader->pmu_name; + } + +return "cpu" ; +} +const char *evsel__metric_id (const struct evsel *evsel) {if (evsel->metric_id)
tools/perf/util/evsel.h +1 -0
@@ -280,6 +280,7 @@ int arch_evsel__hw_name(struct evsel *evsel, char *bf, size_t size);int __evsel__hw_cache_type_op_res_name (u8 type,u8 op,u8 result,char *bf,size_t size);const char *evsel__name (struct evsel *evsel); +const char *evsel__group_pmu_name (const struct evsel *evsel);const char *evsel__metric_id (const struct evsel *evsel);static inline bool evsel__is_tool (const struct evsel *evsel)
Signature · 1 line
2.40.0.rc1.284.g88254d51c5-goog
Ian Rogers
reviewerPATCH v5 7/11 perf parse-events: Pass ownership of the group name
In reply to Ian RogersPass ownership of the group name rather than copying and freeing the original. This saves a memory allocation and copy.
--- tools/perf/util/parse-events.c | 3 ++- tools/perf/util/parse-events.y | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
tools/perf/util/parse-events.c +2 -1
@@ -1761,6 +1761,7 @@ parse_events__set_leader_for_uncore_aliase(char *name, struct list_head *list, handled: ret =1 ; +free (name); out:free (leaders);return ret;
@@ -1786,7 +1787,7 @@ void parse_events__set_leader(char *name, struct list_head *list, leader =arch_evlist__leader (list);__perf_evlist__set_leader (list, &leader->core); - leader->group_name = name ?strdup (name) :NULL ; + leader->group_name = name;list_move (&leader->core.node, list); }
tools/perf/util/parse-events.y +1 -1
@@ -202,8 +202,8 @@ PE_NAME '{' events '}' struct list_head *list = $3; inc_group_count(list, _parse_state); + /* Takes ownership of $1. */ parse_events__set_leader($1, list, _parse_state); - free($1); $$ = list; } |
Signature · 1 line
2.40.0.rc1.284.g88254d51c5-goog
Ian Rogers
reviewerPATCH v5 8/11 perf parse-events: Sort and group parsed events
In reply to Ian RogersThis change is intended to be a no-op for most current cases, the default sort order is the order the events were parsed. Where it varies is in how groups are handled. Previously an uncore and core event that are grouped would most often cause the group to be removed:
```
$ perf stat -e '{instructions,uncore_imc_free_running_0/data_total/}' -a sleep 1
WARNING: grouped events cpus do not match, disabling group:
anon group { instructions, uncore_imc_free_running_0/data_total/ }
...
```However, when wildcards are used the events should be re-sorted and re-grouped in parse_events__set_leader, but this currently fails for simple examples:
```
$ perf stat -e '{uncore_imc_free_running/data_read/,uncore_imc_free_running/data_write/}' -a sleep 1
Performance counter stats for 'system wide':
<not counted> MiB uncore_imc_free_running/data_read/
<not counted> MiB uncore_imc_free_running/data_write/
1.000996992 seconds time elapsed
```A futher failure mode, fixed in this patch, is to force topdown events into a group.
This change moves sorting the evsels in the evlist after parsing. It requires parsing to set up groups. First the evsels are sorted respecting the existing groupings and parse order, but also reordering to ensure evsels of the same PMU and group appear together. So that software and aux events respect groups, their pmu_name is taken from the group leader. The sorting is done with list_sort removing a memory allocation.
After sorting a pass is done to correct the group leaders and for topdown events ensuring they have a group leader.
This fixes the problems seen before:
```
$ perf stat -e '{uncore_imc_free_running/data_read/,uncore_imc_free_running/data_write/}' -a sleep 1
Performance counter stats for 'system wide':
727.42 MiB uncore_imc_free_running/data_read/
81.84 MiB uncore_imc_free_running/data_write/
1.000948615 seconds time elapsed
```As well as making groups not fail for cases like:
```
$ perf stat -e '{imc_free_running_0/data_total/,imc_free_running_1/data_total/}' -a sleep 1
Performance counter stats for 'system wide':
256.47 MiB imc_free_running_0/data_total/
256.48 MiB imc_free_running_1/data_total/
1.001165442 seconds time elapsed
```--- tools/perf/arch/x86/util/evlist.c | 39 ++--- tools/perf/util/evlist.h | 2 +- tools/perf/util/parse-events.c | 240 +++++++++++++++--------------- tools/perf/util/parse-events.h | 3 +- tools/perf/util/parse-events.y | 4 +- 5 files changed, 136 insertions(+), 152 deletions(-)
tools/perf/arch/x86/util/evlist.c +16 -23
@@ -65,29 +65,22 @@ int arch_evlist__add_default_attrs(struct evlist *evlist,return ___evlist__add_default_attrs (evlist, attrs, nr_attrs); } -struct evsel *arch_evlist__leader (struct list_head *list) +int arch_evlist__cmp (const struct evsel *lhs,const struct evsel *rhs) { -struct evsel *evsel, *first, *slots =NULL ; -bool has_topdown = false; - - first = list_first_entry(list, struct evsel, core.node); - -if (!topdown_sys_has_perf_metrics ()) -return first; - -/* If there is a slots event and a topdown event then the slots event comes first. */ -__evlist__for_each_entry (list, evsel) { -if (evsel->pmu_name && !strncmp (evsel->pmu_name,"cpu" ,3 ) && evsel->name) { -if (strcasestr (evsel->name,"slots" )) { - slots = evsel; -if (slots == first) -return first; - } -if (strcasestr (evsel->name,"topdown" )) - has_topdown = true; -if (slots && has_topdown) -return slots; - } +if (topdown_sys_has_perf_metrics () && + (!lhs->pmu_name || !strncmp (lhs->pmu_name,"cpu" ,3 ))) { +/* Ensure the topdown slots comes first. */ +if (strcasestr (lhs->name,"slots" )) +return -1 ; +if (strcasestr (rhs->name,"slots" )) +return 1 ; +/* Followed by topdown events. */ +if (strcasestr (lhs->name,"topdown" ) && !strcasestr (rhs->name,"topdown" )) +return -1 ; +if (!strcasestr (lhs->name,"topdown" ) &&strcasestr (rhs->name,"topdown" )) +return 1 ; } -return first; + +/* Default ordering by insertion index. */ +return lhs->core.idx - rhs->core.idx; }
tools/perf/util/evlist.h +1 -1
@@ -119,7 +119,7 @@ int arch_evlist__add_default_attrs(struct evlist *evlist,#define evlist__add_default_attrs (evlist, array) \ arch_evlist__add_default_attrs(evlist, array, ARRAY_SIZE(array)) -struct evsel *arch_evlist__leader (struct list_head *list); +int arch_evlist__cmp (const struct evsel *lhs,const struct evsel *rhs);int evlist__add_dummy (struct evlist *evlist);struct evsel *evlist__add_aux_dummy (struct evlist *evlist,bool system_wide);
tools/perf/util/parse-events.c +116 -124
272 lines not on this page · raw message
tools/perf/util/parse-events.h +1 -2
@@ -200,8 +200,7 @@ int parse_events_copy_term_list(struct list_head *old,enum perf_pmu_event_symbol_type perf_pmu__parse_check (const char *name); -void parse_events__set_leader (char *name,struct list_head *list, -struct parse_events_state *parse_state); +void parse_events__set_leader (char *name,struct list_head *list);void parse_events_update_lists (struct list_head *list_event,struct list_head *list_all); void parse_events_evlist_error(struct parse_events_state *parse_state,
tools/perf/util/parse-events.y +2 -2
@@ -203,7 +203,7 @@ PE_NAME '{' events '}' inc_group_count(list, _parse_state); /* Takes ownership of $1. */ - parse_events__set_leader($1, list, _parse_state); + parse_events__set_leader($1, list); $$ = list; } |
@@ -212,7 +212,7 @@ PE_NAME '{' events '}' struct list_head *list = $2; inc_group_count(list, _parse_state); - parse_events__set_leader(NULL, list, _parse_state); + parse_events__set_leader(NULL, list); $$ = list; }
Signature · 1 line
2.40.0.rc1.284.g88254d51c5-goog
Ian Rogers
reviewerPATCH v5 9/11 perf evsel: Remove use_uncore_alias
In reply to Ian RogersThis flag used to be used when regrouping uncore events in particular due to wildcard matches. This is now handled by sorting evlist and so the flag is redundant.
--- tools/perf/util/evsel.c | 1 - tools/perf/util/evsel.h | 1 - tools/perf/util/parse-events.c | 12 +++--------- tools/perf/util/parse-events.h | 3 +-- tools/perf/util/parse-events.y | 11 +++++++---- 5 files changed, 11 insertions(+), 17 deletions(-)
tools/perf/util/evsel.c +0 -1
@@ -458,7 +458,6 @@ struct evsel *evsel__clone(struct evsel *orig) evsel->per_pkg = orig->per_pkg; evsel->percore = orig->percore; evsel->precise_max = orig->precise_max; - evsel->use_uncore_alias = orig->use_uncore_alias; evsel->is_libpfm_event = orig->is_libpfm_event; evsel->exclude_GH = orig->exclude_GH;
tools/perf/util/evsel.h +0 -1
@@ -89,7 +89,6 @@ struct evsel {bool per_pkg;bool percore;bool precise_max; -bool use_uncore_alias;bool is_libpfm_event;bool auto_merge_stats;bool collect_stat;
tools/perf/util/parse-events.c +3 -9
@@ -1445,15 +1445,13 @@ static int parse_events__inside_hybrid_pmu(struct parse_events_state *parse_statint parse_events_add_pmu (struct parse_events_state *parse_state,struct list_head *list,char *name,struct list_head *head_config, -bool auto_merge_stats, -bool use_alias) +bool auto_merge_stats) {struct perf_event_attr attr;struct perf_pmu_info info;struct perf_pmu *pmu;struct evsel *evsel;struct parse_events_error *err = parse_state->error; -bool use_uncore_alias;LIST_HEAD (config_terms); pmu = parse_state->fake_pmu ?:perf_pmu__find (name);
@@ -1488,8 +1486,6 @@ int parse_events_add_pmu(struct parse_events_state *parse_state,memset (&attr,0 ,sizeof (attr)); } - use_uncore_alias = (pmu->is_uncore && use_alias); -if (!head_config) { attr.type = pmu->type; evsel = __add_event(list, &parse_state->idx, &attr,
@@ -1499,7 +1495,6 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, /*cpu_list=*/NULL);if (evsel) { evsel->pmu_name = name ?strdup (name) :NULL ; - evsel->use_uncore_alias = use_uncore_alias;return 0 ; }else {return -ENOMEM ;
@@ -1560,7 +1555,6 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, evsel->use_config_name = true; evsel->pmu_name = name ?strdup (name) :NULL ; - evsel->use_uncore_alias = use_uncore_alias; evsel->percore =config_term_percore (&evsel->config_terms);if (parse_state->fake_pmu)
@@ -1622,7 +1616,7 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state,parse_events_copy_term_list (head, &orig_head);if (!parse_events_add_pmu (parse_state, list, pmu->name, orig_head, - true, true)) { +/*auto_merge_stats=*/ true)) {pr_debug ("%s -> %s/%s/\n" , str, pmu->name, alias->str); ok++;
@@ -1634,7 +1628,7 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state,if (parse_state->fake_pmu) {if (!parse_events_add_pmu (parse_state, list, str, head, - true, true)) { +/*auto_merge_stats=*/ true)) {pr_debug ("%s -> %s/%s/\n" , str,"fake_pmu" , str); ok++; }
tools/perf/util/parse-events.h +1 -2
@@ -183,8 +183,7 @@ int parse_events_add_breakpoint(struct list_head *list, int *idx,int parse_events_add_pmu (struct parse_events_state *parse_state,struct list_head *list,char *name,struct list_head *head_config, -bool auto_merge_stats, -bool use_alias); +bool auto_merge_stats); struct evsel *parse_events__add_event(int idx, struct perf_event_attr *attr, const char *name, const char *metric_id,
tools/perf/util/parse-events.y +7 -4
@@ -313,7 +313,7 @@ event_pmu_name opt_pmu_config list = alloc_list(); if (!list) CLEANUP_YYABORT; - if (parse_events_add_pmu(_parse_state, list, $1, $2, false, false)) { + if (parse_events_add_pmu(_parse_state, list, $1, $2, /*auto_merge_stats=*/false)) { struct perf_pmu *pmu = NULL; int ok = 0;
@@ -330,8 +330,10 @@ event_pmu_name opt_pmu_config !perf_pmu__match(pattern, pmu->alias_name, $1)) { if (parse_events_copy_term_list(orig_terms, &terms)) CLEANUP_YYABORT; - if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, true, false)) + if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, + /*auto_merge_stats=*/true)) { ok++; + } parse_events_terms__delete(terms); } }
@@ -407,7 +409,8 @@ PE_PMU_EVENT_FAKE sep_dc if (!list) YYABORT; - err = parse_events_add_pmu(_parse_state, list, $1, NULL, false, false); + err = parse_events_add_pmu(_parse_state, list, $1, /*head_config=*/NULL, + /*auto_merge_stats=*/false); free($1); if (err < 0) { free(list);
@@ -425,7 +428,7 @@ PE_PMU_EVENT_FAKE opt_pmu_config if (!list) YYABORT; - err = parse_events_add_pmu(_parse_state, list, $1, $2, false, false); + err = parse_events_add_pmu(_parse_state, list, $1, $2, /*auto_merge_stats=*/false); free($1); parse_events_terms__delete($2); if (err < 0) {
Signature · 1 line
2.40.0.rc1.284.g88254d51c5-goog
Ian Rogers
reviewerPATCH v5 10/11 perf evlist: Remove nr_groups
In reply to Ian RogersMaintaining the number of groups during event parsing is problematic and since changing to sort/regroup events can only be computed by a linear pass over the evlist. As the value is generally only used in tests, rather than hold it in a variable compute it by passing over the evlist when necessary.
This change highlights that libpfm's counting of groups with a single entry disagreed with regular event parsing. The libpfm tests are updated accordingly.
--- tools/lib/perf/evlist.c | 18 +++++++++++++++++- tools/lib/perf/include/internal/evlist.h | 1 - tools/lib/perf/include/perf/evlist.h | 1 + tools/perf/builtin-record.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/tests/bpf.c | 1 - tools/perf/tests/parse-events.c | 22 +++++++++++----------- tools/perf/tests/pfm.c | 12 ++++++------ tools/perf/util/evlist.c | 2 +- tools/perf/util/evlist.h | 6 ++++++ tools/perf/util/header.c | 3 +-- tools/perf/util/parse-events.c | 1 - tools/perf/util/parse-events.h | 1 - tools/perf/util/parse-events.y | 10 ---------- tools/perf/util/pfm.c | 1 - 15 files changed, 45 insertions(+), 38 deletions(-)
tools/lib/perf/evlist.c +17 -1
@@ -703,7 +703,23 @@ void perf_evlist__set_leader(struct perf_evlist *evlist)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, first); } } + +int perf_evlist__nr_groups (struct perf_evlist *evlist) +{ +struct perf_evsel *evsel; +int nr_groups =0 ; + +perf_evlist__for_each_evsel (evlist, evsel) { +/* +* evsels by default have a nr_members of 1, and they are their +* own leader. If the nr_members is >1 then this is an +* indication of a group. +*/ +if (evsel->leader == evsel && evsel->nr_members >1 ) + nr_groups++; + } +return nr_groups; +}
tools/lib/perf/include/internal/evlist.h +0 -1
@@ -17,7 +17,6 @@ struct perf_mmap_param;struct perf_evlist {struct list_head entries;int nr_entries; -int nr_groups;bool has_user_cpus;bool needs_map_propagation;/**
tools/lib/perf/include/perf/evlist.h +1 -0
@@ -47,4 +47,5 @@ LIBPERF_API struct perf_mmap *perf_evlist__next_mmap(struct perf_evlist *evlist, (pos) = perf_evlist__next_mmap((evlist), (pos), overwrite)) LIBPERF_API void perf_evlist__set_leader(struct perf_evlist *evlist); +LIBPERF_API int perf_evlist__nr_groups(struct perf_evlist *evlist);#endif /* __LIBPERF_EVLIST_H */
tools/perf/builtin-record.c +1 -1
@@ -2474,7 +2474,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) rec->tool.ordered_events = false; } -if (!rec->evlist->core.nr_groups) +if (evlist__nr_groups (rec->evlist) ==0 )perf_header__clear_feat (&session->header,HEADER_GROUP_DESC );if (data->is_pipe) {
tools/perf/builtin-report.c +1 -1
@@ -1481,7 +1481,7 @@ int cmd_report(int argc, const char **argv)setup_forced_leader (&report, session->evlist); -if (symbol_conf.group_sort_idx && !session->evlist->core.nr_groups) { +if (symbol_conf.group_sort_idx &&evlist__nr_groups (session->evlist) ==0 ) {parse_options_usage (NULL , options,"group-sort-idx" ,0 ); ret = -EINVAL ; goto error;
tools/perf/tests/bpf.c +0 -1
@@ -153,7 +153,6 @@ static int do_test(struct bpf_object *obj, int (*func)(void), }evlist__splice_list_tail (evlist, &parse_state.list); - evlist->core.nr_groups = parse_state.nr_groups;evlist__config (evlist, &opts,NULL );
tools/perf/tests/parse-events.c +11 -11
@@ -53,7 +53,7 @@ static int test__checkevent_tracepoint(struct evlist *evlist)struct evsel *evsel =evlist__first (evlist);TEST_ASSERT_VAL ("wrong number of entries" ,1 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong number of groups" ,0 == evlist->core.nr_groups); +TEST_ASSERT_VAL ("wrong number of groups" ,0 ==evlist__nr_groups (evlist));TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_TRACEPOINT == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong sample_type" ,PERF_TP_SAMPLE_TYPE == evsel->core.attr.sample_type);
@@ -66,7 +66,7 @@ static int test__checkevent_tracepoint_multi(struct evlist *evlist)struct evsel *evsel;TEST_ASSERT_VAL ("wrong number of entries" , evlist->core.nr_entries >1 ); -TEST_ASSERT_VAL ("wrong number of groups" ,0 == evlist->core.nr_groups); +TEST_ASSERT_VAL ("wrong number of groups" ,0 ==evlist__nr_groups (evlist));evlist__for_each_entry (evlist, evsel) { TEST_ASSERT_VAL("wrong type",
@@ -677,7 +677,7 @@ static int test__group1(struct evlist *evlist)struct evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong number of groups" ,1 == evlist->core.nr_groups); +TEST_ASSERT_VAL ("wrong number of groups" ,1 ==evlist__nr_groups (evlist));/* instructions:k */ evsel = leader =evlist__first (evlist);
@@ -719,7 +719,7 @@ static int test__group2(struct evlist *evlist)struct evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,3 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong number of groups" ,1 == evlist->core.nr_groups); +TEST_ASSERT_VAL ("wrong number of groups" ,1 ==evlist__nr_groups (evlist));/* faults + :ku modifier */ evsel = leader =evlist__first (evlist);
@@ -775,7 +775,7 @@ static int test__group3(struct evlist *evlist __maybe_unused)struct evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,5 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong number of groups" ,2 == evlist->core.nr_groups); +TEST_ASSERT_VAL ("wrong number of groups" ,2 ==evlist__nr_groups (evlist));/* group1 syscalls:sys_enter_openat:H */ evsel = leader =evlist__first (evlist);
@@ -868,7 +868,7 @@ static int test__group4(struct evlist *evlist __maybe_unused)struct evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong number of groups" ,1 == evlist->core.nr_groups); +TEST_ASSERT_VAL ("wrong number of groups" ,1 ==evlist__nr_groups (evlist));/* cycles:u + p */ evsel = leader =evlist__first (evlist);
@@ -912,7 +912,7 @@ static int test__group5(struct evlist *evlist __maybe_unused)struct evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,5 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong number of groups" ,2 == evlist->core.nr_groups); +TEST_ASSERT_VAL ("wrong number of groups" ,2 ==evlist__nr_groups (evlist));/* cycles + G */ evsel = leader =evlist__first (evlist);
@@ -998,7 +998,7 @@ static int test__group_gh1(struct evlist *evlist)struct evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong number of groups" ,1 == evlist->core.nr_groups); +TEST_ASSERT_VAL ("wrong number of groups" ,1 ==evlist__nr_groups (evlist));/* cycles + :H group modifier */ evsel = leader =evlist__first (evlist);
@@ -1038,7 +1038,7 @@ static int test__group_gh2(struct evlist *evlist)struct evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong number of groups" ,1 == evlist->core.nr_groups); +TEST_ASSERT_VAL ("wrong number of groups" ,1 ==evlist__nr_groups (evlist));/* cycles + :G group modifier */ evsel = leader =evlist__first (evlist);
@@ -1078,7 +1078,7 @@ static int test__group_gh3(struct evlist *evlist)struct evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong number of groups" ,1 == evlist->core.nr_groups); +TEST_ASSERT_VAL ("wrong number of groups" ,1 ==evlist__nr_groups (evlist));/* cycles:G + :u group modifier */ evsel = leader =evlist__first (evlist);
@@ -1118,7 +1118,7 @@ static int test__group_gh4(struct evlist *evlist)struct evsel *evsel, *leader;TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); -TEST_ASSERT_VAL ("wrong number of groups" ,1 == evlist->core.nr_groups); +TEST_ASSERT_VAL ("wrong number of groups" ,1 ==evlist__nr_groups (evlist));/* cycles:G + :uG group modifier */ evsel = leader =evlist__first (evlist);
tools/perf/tests/pfm.c +6 -6
@@ -76,7 +76,7 @@ static int test__pfm_events(struct test_suite *test __maybe_unused,count_pfm_events (&evlist->core), table[i].nr_events);TEST_ASSERT_EQUAL (table[i].events, - evlist->core.nr_groups, +evlist__nr_groups (evlist),0 );evlist__delete (evlist);
@@ -103,22 +103,22 @@ static int test__pfm_group(struct test_suite *test __maybe_unused, { .events = "{instructions}", .nr_events = 1, - .nr_groups = 1, + .nr_groups = 0, }, { .events = "{instructions},{}", .nr_events = 1, - .nr_groups = 1, + .nr_groups = 0, }, { .events = "{},{instructions}", .nr_events = 1, - .nr_groups = 1, + .nr_groups = 0, }, { .events = "{instructions},{instructions}", .nr_events = 2, - .nr_groups = 2, + .nr_groups = 0, }, { .events = "{instructions,cycles},{instructions,cycles}",
@@ -161,7 +161,7 @@ static int test__pfm_group(struct test_suite *test __maybe_unused,count_pfm_events (&evlist->core), table[i].nr_events);TEST_ASSERT_EQUAL (table[i].events, - evlist->core.nr_groups, +evlist__nr_groups (evlist), table[i].nr_groups);evlist__delete (evlist);
tools/perf/util/evlist.c +1 -1
@@ -1777,7 +1777,7 @@ bool evlist__exclude_kernel(struct evlist *evlist)*/ void evlist__force_leader (struct evlist *evlist) { -if (!evlist->core.nr_groups) { +if (evlist__nr_groups (evlist) ==0 ) {struct evsel *leader =evlist__first (evlist);evlist__set_leader (evlist);
tools/perf/util/evlist.h +6 -0
@@ -9,6 +9,7 @@#include <api/fd/array.h> #include <internal/evlist.h> #include <internal/evsel.h> +#include <perf/evlist.h> #include "events_stats.h" #include "evsel.h" #include <pthread.h>
@@ -255,6 +256,11 @@ static inline struct evsel *evlist__last(struct evlist *evlist) return container_of(evsel, struct evsel, core); } +static inline int evlist__nr_groups (struct evlist *evlist) +{ +return perf_evlist__nr_groups (&evlist->core); +} +int evlist__strerror_open (struct evlist *evlist,int err,char *buf,size_t size);int evlist__strerror_mmap (struct evlist *evlist,int err,char *buf,size_t size);
tools/perf/util/header.c +1 -2
@@ -786,7 +786,7 @@ static int write_pmu_mappings(struct feat_fd *ff,static int write_group_desc (struct feat_fd *ff,struct evlist *evlist) { -u32 nr_groups = evlist->core.nr_groups; +u32 nr_groups =evlist__nr_groups (evlist);struct evsel *evsel;int ret;
@@ -2807,7 +2807,6 @@ static int process_group_desc(struct feat_fd *ff, void *data __maybe_unused)* Rebuild group relationship based on the group_desc */ session = container_of(ff->ph, struct perf_session, header); - session->evlist->core.nr_groups = nr_groups; i = nr =0 ;evlist__for_each_entry (session->evlist, evsel) {
tools/perf/util/parse-events.c +0 -1
@@ -2260,7 +2260,6 @@ int __parse_events(struct evlist *evlist, const char *str,if (!ret) {struct evsel *last; - evlist->core.nr_groups += parse_state.nr_groups; last =evlist__last (evlist); last->cmdline_group_boundary = true;
tools/perf/util/parse-events.h +0 -1
@@ -122,7 +122,6 @@ struct parse_events_error {struct parse_events_state {struct list_head list;int idx; -int nr_groups;struct parse_events_error *error;struct evlist *evlist;struct list_head *terms;
tools/perf/util/parse-events.y +0 -10
@@ -49,14 +49,6 @@ static void free_list_evsel(struct list_head* list_evsel) free(list_evsel); } -static void inc_group_count(struct list_head *list, - struct parse_events_state *parse_state) -{ - /* Count groups only have more than 1 members */ - if (!list_is_last(list->next, list)) - parse_state->nr_groups++; -} - %} %token PE_START_EVENTS PE_START_TERMS
@@ -201,7 +193,6 @@ PE_NAME '{' events '}' { struct list_head *list = $3; - inc_group_count(list, _parse_state); /* Takes ownership of $1. */ parse_events__set_leader($1, list); $$ = list;
@@ -211,7 +202,6 @@ PE_NAME '{' events '}' { struct list_head *list = $2; - inc_group_count(list, _parse_state); parse_events__set_leader(NULL, list); $$ = list; }
tools/perf/util/pfm.c +0 -1
@@ -112,7 +112,6 @@ int parse_libpfm_events_option(const struct option *opt, const char *str, "cannot close a non-existing event group\n"); goto error; } - evlist->core.nr_groups++; grp_leader =NULL ; grp_evt =-1 ; }
Signature · 1 line
2.40.0.rc1.284.g88254d51c5-goog
Ian Rogers
reviewerPATCH v5 11/11 perf parse-events: Warn when events are regrouped
In reply to Ian RogersUse if an event is reordered or the number of groups increases to signal that regrouping has happened and warn about it. Disable the warning in the case wild card PMU names are used and for metrics.
--- tools/perf/tests/parse-events.c | 2 +- tools/perf/tests/pmu-events.c | 2 +- tools/perf/util/metricgroup.c | 3 ++- tools/perf/util/parse-events.c | 39 ++++++++++++++++++++++++--------- tools/perf/util/parse-events.h | 7 +++--- tools/perf/util/parse-events.y | 1 + 6 files changed, 38 insertions(+), 16 deletions(-)
tools/perf/tests/parse-events.c +1 -1
@@ -2103,7 +2103,7 @@ static int test_event_fake_pmu(const char *str)parse_events_error__init (&err);perf_pmu__test_parse_init (); - ret =__parse_events (evlist, str, &err, &perf_pmu__fake); + ret =__parse_events (evlist, str, &err, &perf_pmu__fake,/*warn_if_reordered=*/ true);if (ret) {pr_debug ("failed to parse event '%s', err %d, str '%s'\n" , str, ret, err.str);
tools/perf/tests/pmu-events.c +1 -1
@@ -785,7 +785,7 @@ static int check_parse_id(const char *id, struct parse_events_error *error,*/ perf_pmu__test_parse_init (); } - ret =__parse_events (evlist, dup, error, fake_pmu); + ret =__parse_events (evlist, dup, error, fake_pmu,/*warn_if_reordered=*/ true);free (dup);evlist__delete (evlist);
tools/perf/util/metricgroup.c +2 -1
@@ -1441,7 +1441,8 @@ static int parse_ids(bool metric_no_merge, struct perf_pmu *fake_pmu, }pr_debug ("Parsing metric events '%s'\n" , events.buf);parse_events_error__init (&parse_error); - ret =__parse_events (parsed_evlist, events.buf, &parse_error, fake_pmu); + ret =__parse_events (parsed_evlist, events.buf, &parse_error, fake_pmu, +/*warn_if_reordered=*/ false);if (ret) {parse_events_error__print (&parse_error, events.buf); goto err_out;
tools/perf/util/parse-events.c +29 -10
@@ -2157,11 +2157,13 @@ static int evlist__cmp(void *state, const struct list_head *l, const struct listreturn arch_evlist__cmp (lhs, rhs); } -static void parse_events__sort_events_and_fix_groups (struct list_head *list) +static bool parse_events__sort_events_and_fix_groups (struct list_head *list) { -int idx =-1 ; +int idx =0 , unsorted_idx =-1 ;struct evsel *pos, *cur_leader =NULL ;struct perf_evsel *cur_leaders_grp =NULL ; +bool idx_changed = false; +int orig_num_leaders =0 , num_leaders =0 ;/* * Compute index to insert ungrouped events at. Place them where the
@@ -2170,15 +2172,22 @@ static void parse_events__sort_events_and_fix_groups(struct list_head *list)list_for_each_entry (pos, list, core.node) {const struct evsel *pos_leader =evsel__leader (pos); -if (pos != pos_leader || pos->core.nr_members >1 ) -continue ; +if (pos == pos_leader) + orig_num_leaders++; - idx = pos->core.idx; -break ; +/* +* Ensure indexes are sequential, in particular for multiple +* event lists being merged. The indexes are used to detect when +* the user order is modified. +*/ + pos->core.idx = idx++; + +if (unsorted_idx ==-1 && pos == pos_leader && pos->core.nr_members <2 ) + unsorted_idx = pos->core.idx; }/* Sort events. */ -list_sort (&idx, list, evlist__cmp); +list_sort (&unsorted_idx, list, evlist__cmp);/* * Recompute groups, splitting for PMUs and adding groups for events
@@ -2192,6 +2201,8 @@ static void parse_events__sort_events_and_fix_groups(struct list_head *list)bool force_grouped =arch_evsel__must_be_in_group (pos);/* Reset index and nr_members. */ +if (pos->core.idx != idx) + idx_changed = true; pos->core.idx = idx++; pos->core.nr_members =0 ;
@@ -2225,12 +2236,18 @@ static void parse_events__sort_events_and_fix_groups(struct list_head *list) } }list_for_each_entry (pos, list, core.node) { - pos->core.leader->nr_members++; +struct evsel *pos_leader =evsel__leader (pos); + +if (pos == pos_leader) + num_leaders++; + pos_leader->core.nr_members++; } +return idx_changed || num_leaders != orig_num_leaders; }int __parse_events (struct evlist *evlist,const char *str, -struct parse_events_error *err,struct perf_pmu *fake_pmu) +struct parse_events_error *err,struct perf_pmu *fake_pmu, +bool warn_if_reordered) {struct parse_events_state parse_state = { .list =LIST_HEAD_INIT (parse_state.list),
@@ -2250,7 +2267,9 @@ int __parse_events(struct evlist *evlist, const char *str,return -1 ; } -parse_events__sort_events_and_fix_groups (&parse_state.list); +if (parse_events__sort_events_and_fix_groups (&parse_state.list) && + warn_if_reordered && !parse_state.wild_card_pmus) +pr_warning ("WARNING: events were regrouped to match PMUs\n" );/* * Add list to the evlist even with errors to allow callers to clean up.
tools/perf/util/parse-events.h +4 -3
@@ -26,13 +26,13 @@ int parse_events_option(const struct option *opt, const char *str, int unset);int parse_events_option_new_evlist (const struct option *opt,const char *str,int unset); __attribute__((nonnull (1 ,2 ,3 )))int __parse_events (struct evlist *evlist,const char *str,struct parse_events_error *error, -struct perf_pmu *fake_pmu); +struct perf_pmu *fake_pmu,bool warn_if_reordered); -__attribute__((nonnull)) +__attribute__((nonnull (1 ,2 ,3 )))static inline int parse_events (struct evlist *evlist,const char *str,struct parse_events_error *err) { -return __parse_events (evlist, str, err,NULL ); +return __parse_events (evlist, str, err,/*fake_pmu=*/ NULL ,/*warn_if_reordered=*/ true); }int parse_event (struct evlist *evlist,const char *str);
@@ -128,6 +128,7 @@ struct parse_events_state {int stoken;struct perf_pmu *fake_pmu;char *hybrid_pmu_name; +bool wild_card_pmus; };void parse_events__shrink_config_terms (void );
tools/perf/util/parse-events.y +1 -0
@@ -323,6 +323,7 @@ event_pmu_name opt_pmu_config if (!parse_events_add_pmu(_parse_state, list, pmu->name, terms, /*auto_merge_stats=*/true)) { ok++; + parse_state->wild_card_pmus = true; } parse_events_terms__delete(terms); }
Signature · 1 line
2.40.0.rc1.284.g88254d51c5-goog
Arnaldo Carvalho de Melo
maintainerEm Sat, Mar 11, 2023 at 06:15:32PM -0800, Ian Rogers escreveu:
Quoted 16 lines
The rules for grouping events have grown more complex. Topdown events must be grouped, but flags like --metric-no-group and flags on metrics don't respect this. Uncore events may be expanded using wild cards for PMU names, but then the events need reordering so the group members are adjacent. Rather than fixing metrics, this change fixes the main event parsing code to first sort and then regroup evsels.
As this is shared functionality changes to it should cause concern. The change is done with the intent of simplifying and making more robust the grouping logic, examples are given. If additional changes are necessary, they are most likely necessary to the
evsel__group_pmu_namelogic as the code avoids breaking groups that are on the same "group" PMU. Thegroup_pmu_nameis a variant of thepmu_nametweaked in the case of software and aux events, that use groups in a slightly different manner to conventional events.
Quoted 5 lines
The code was manually tested as well as passing perf test on a Intel tigerlake CPU with intel-pt.
v5. Add Adrian's Acked-by on patch 3, add a fix to the warning logic
for multiple event groups as reported by Adrian.
Appled locally, testing.
- Arnaldo
Quoted 54 lines
v4. Move the Intel
pmu->auxtraceinitialization to the existing
perf_pmu__get_default_configas suggested by Adrian Hunter.
v3. Renamepmu_nametogroup_pmu_nameand add patch to warn when
events are regrouped as requested by Namhyung.
v2. Fix up the commit message on 4/10 (thanks Arnaldo). Drop
unnecessary v1 5/10 (thanks Kan).evlist->core.nr_groupswasn't being correctly maintained after the sort/regrouping and so the new patch 10/10 removes that variable and computes it from the evlist when necessary, generally just tests.Ian Rogers (11):
libperf evlist: Avoid a use of evsel idx
perf stat: Don't remove all grouped events when CPU maps disagree perf pmu: Earlier PMU auxtrace initialization
perf stat: Modify the group test
perf evsel: Allow const evsel for certain accesses perf evsel: Add function to compute group PMU name perf parse-events: Pass ownership of the group name perf parse-events: Sort and group parsed events
perf evsel: Removeuse_uncore_alias
perf evlist: Removenr_groups
perf parse-events: Warn when events are regroupedtools/lib/perf/evlist.c | 31 ++- tools/lib/perf/include/internal/evlist.h | 1 - tools/lib/perf/include/perf/evlist.h | 1 + tools/perf/arch/x86/util/auxtrace.c | 4 - tools/perf/arch/x86/util/evlist.c | 39 ++-- tools/perf/arch/x86/util/pmu.c | 8 +- tools/perf/builtin-record.c | 2 +- tools/perf/builtin-report.c | 2 +- tools/perf/builtin-stat.c | 24 +- tools/perf/tests/bpf.c | 1 - tools/perf/tests/parse-events.c | 24 +- tools/perf/tests/pfm.c | 12 +- tools/perf/tests/pmu-events.c | 2 +- tools/perf/util/evlist.c | 2 +- tools/perf/util/evlist.h | 8 +- tools/perf/util/evsel.c | 27 ++- tools/perf/util/evsel.h | 8 +- tools/perf/util/header.c | 3 +- tools/perf/util/metricgroup.c | 3 +- tools/perf/util/parse-events.c | 275 ++++++++++++----------- tools/perf/util/parse-events.h | 14 +- tools/perf/util/parse-events.y | 28 +-- tools/perf/util/pfm.c | 1 - tools/perf/util/pmu.c | 6 +- tools/perf/util/python.c | 2 +- tools/perf/util/stat-shadow.c | 2 +- 26 files changed, 284 insertions(+), 246 deletions(-)Signature · 1 line
2.40.0.rc1.284.g88254d51c5-goog
Signature · 1 line
- Arnaldo