[PATCH] perf evlist: Extend arch_evsel__must_be_in_group to support hybrid systems

[PATCH] perf evlist: Extend arch_evsel__must_be_in_group to support hybrid systems

[zhengjun.xing]

From: Zhengjun Xing <zhengjun.xing@linux.intel.com>

For the hybrid system, the "slots" event changes to "cpu_core/slots/", need
extend API arch_evsel__must_be_in_group() to support hybrid systems.

In the origin code, for hybrid system event "cpu_core/slots/", the output
of the API arch_evsel__must_be_in_group() is "false" (in fact,it should be
"true"). Currently only one API evsel__remove_from_group() calls it. In
evsel__remove_from_group(), it adds the second condition to check, so the
output of evsel__remove_from_group() still is correct. That's the reason
why there isn't an instant error. I'd like to fix the issue found in API
arch_evsel__must_be_in_group() in case someone else using the function in
the other place.

Fixes: d98079c05b5a ("perf evlist: Keep topdown counters in weak group")
Signed-off-by: Zhengjun Xing <zhengjun.xing@linux.intel.com>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
---
 tools/perf/arch/x86/util/evsel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/arch/x86/util/evsel.c b/tools/perf/arch/x86/util/evsel.c
index 88306183d629..ff4561b7b600 100644
--- a/tools/perf/arch/x86/util/evsel.c
+++ b/tools/perf/arch/x86/util/evsel.c
@@ -57,6 +57,6 @@ bool arch_evsel__must_be_in_group(const struct evsel *evsel)
 		return false;
 
 	return evsel->name &&
-		(!strcasecmp(evsel->name, "slots") ||
+		(strcasestr(evsel->name, "slots") ||
 		 strcasestr(evsel->name, "topdown"));
 }
-- 
2.25.1

Re: [PATCH] perf evlist: Extend arch_evsel__must_be_in_group to support hybrid systems

[Ian Rogers]

On Wed, Jun 1, 2022 at 8:25 AM <zhengjun.xing@linux.intel.com> wrote:
>
> From: Zhengjun Xing <zhengjun.xing@linux.intel.com>
>
> For the hybrid system, the "slots" event changes to "cpu_core/slots/", need
> extend API arch_evsel__must_be_in_group() to support hybrid systems.
>
> In the origin code, for hybrid system event "cpu_core/slots/", the output
> of the API arch_evsel__must_be_in_group() is "false" (in fact,it should be
> "true"). Currently only one API evsel__remove_from_group() calls it. In
> evsel__remove_from_group(), it adds the second condition to check, so the
> output of evsel__remove_from_group() still is correct. That's the reason
> why there isn't an instant error. I'd like to fix the issue found in API
> arch_evsel__must_be_in_group() in case someone else using the function in
> the other place.
>
> Fixes: d98079c05b5a ("perf evlist: Keep topdown counters in weak group")
> Signed-off-by: Zhengjun Xing <zhengjun.xing@linux.intel.com>
> Reviewed-by: Kan Liang <kan.liang@linux.intel.com>

Acked-by: Ian Rogers <irogers@google.com>

Thanks,
Ian

> ---
>  tools/perf/arch/x86/util/evsel.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/arch/x86/util/evsel.c b/tools/perf/arch/x86/util/evsel.c
> index 88306183d629..ff4561b7b600 100644
> --- a/tools/perf/arch/x86/util/evsel.c
> +++ b/tools/perf/arch/x86/util/evsel.c
> @@ -57,6 +57,6 @@ bool arch_evsel__must_be_in_group(const struct evsel *evsel)
>                 return false;
>
>         return evsel->name &&
> -               (!strcasecmp(evsel->name, "slots") ||
> +               (strcasestr(evsel->name, "slots") ||
>                  strcasestr(evsel->name, "topdown"));
>  }
> --
> 2.25.1
>