Messages in this thread | | | Date | Tue, 1 Aug 2023 11:40:29 -0400 | Subject | Re: [PATCH v1 1/4] perf parse-events x86: Avoid sorting uops_retired.slots | From | "Liang, Kan" <> |
| |
On 2023-08-01 1:36 a.m., Ian Rogers wrote: > As topdown.slots may appear as slots it may get confused with > uops_retired.slots which is an invalid perf metric event group > leader. Special case uops_retired.slots to avoid this confusion. >
Does any name with format "name.slots" cause the confusion? If so, I don't think we can stop others from naming like the above format.
Is it better to hard code the topdown.slots/slots, rather than uops_retired.slots?
Thanks, Kan
> Signed-off-by: Ian Rogers <irogers@google.com> > --- > tools/perf/arch/x86/util/evlist.c | 7 ++++--- > tools/perf/arch/x86/util/evsel.c | 7 +++---- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/tools/perf/arch/x86/util/evlist.c b/tools/perf/arch/x86/util/evlist.c > index cbd582182932..b1ce0c52d88d 100644 > --- a/tools/perf/arch/x86/util/evlist.c > +++ b/tools/perf/arch/x86/util/evlist.c > @@ -75,11 +75,12 @@ int arch_evlist__add_default_attrs(struct evlist *evlist, > > int arch_evlist__cmp(const struct evsel *lhs, const struct evsel *rhs) > { > - if (topdown_sys_has_perf_metrics() && evsel__sys_has_perf_metrics(lhs)) { > + if (topdown_sys_has_perf_metrics() && > + (arch_evsel__must_be_in_group(lhs) || arch_evsel__must_be_in_group(rhs))) { > /* Ensure the topdown slots comes first. */ > - if (strcasestr(lhs->name, "slots")) > + if (strcasestr(lhs->name, "slots") && !strcasestr(lhs->name, "uops_retired.slots")) > return -1; > - if (strcasestr(rhs->name, "slots")) > + if (strcasestr(rhs->name, "slots") && !strcasestr(rhs->name, "uops_retired.slots")) > return 1; > /* Followed by topdown events. */ > if (strcasestr(lhs->name, "topdown") && !strcasestr(rhs->name, "topdown")) > diff --git a/tools/perf/arch/x86/util/evsel.c b/tools/perf/arch/x86/util/evsel.c > index 81d22657922a..090d0f371891 100644 > --- a/tools/perf/arch/x86/util/evsel.c > +++ b/tools/perf/arch/x86/util/evsel.c > @@ -40,12 +40,11 @@ bool evsel__sys_has_perf_metrics(const struct evsel *evsel) > > bool arch_evsel__must_be_in_group(const struct evsel *evsel) > { > - if (!evsel__sys_has_perf_metrics(evsel)) > + if (!evsel__sys_has_perf_metrics(evsel) || !evsel->name || > + strcasestr(evsel->name, "uops_retired.slots")) > return false; > > - return evsel->name && > - (strcasestr(evsel->name, "slots") || > - strcasestr(evsel->name, "topdown")); > + return strcasestr(evsel->name, "topdown") || strcasestr(evsel->name, "slots"); > } > > int arch_evsel__hw_name(struct evsel *evsel, char *bf, size_t size)
| |