2023-06-26 05:44:22

by Ian Rogers

Subject: [PATCH v1] perf pmu: Correct auto_merge_stats test

The original logic was:
https://lore.kernel.org/all/[email protected]/
return !is_pmu_hybrid(pmu->name)

is_pmu_hybrid was removed but with the incorrect condition which was
fixed for core PMUs but not uncore. This change fixes both.

Fixes: e23421426e13 ("perf pmu: Correct perf_pmu__auto_merge_stats() affecting hybrid")
Signed-off-by: Ian Rogers <[email protected]>
---
tools/perf/util/pmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index 64fa568a5426..8d5ecd4ff1a9 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -1427,7 +1427,7 @@ bool perf_pmu__supports_legacy_cache(const struct perf_pmu *pmu)

bool perf_pmu__auto_merge_stats(const struct perf_pmu *pmu)
{
- return pmu->is_core && perf_pmus__num_core_pmus() == 1;
+ return !pmu->is_core || perf_pmus__num_core_pmus() == 1;
}

bool perf_pmu__have_event(const struct perf_pmu *pmu, const char *name)
--
2.41.0.162.gfafddb0af9-goog

2023-06-26 22:55:09

by Namhyung Kim

Subject: Re: [PATCH v1] perf pmu: Correct auto_merge_stats test

Hi Ian,

On Sun, Jun 25, 2023 at 10:31 PM Ian Rogers <[email protected]> wrote:
>
> The original logic was:
> https://lore.kernel.org/all/[email protected]/
> return !is_pmu_hybrid(pmu->name)
>
> is_pmu_hybrid was removed but with the incorrect condition which was
> fixed for core PMUs but not uncore. This change fixes both.
>
> Fixes: e23421426e13 ("perf pmu: Correct perf_pmu__auto_merge_stats() affecting hybrid")
> Signed-off-by: Ian Rogers <[email protected]>

Tested-by: Namhyung Kim <[email protected]>

Thanks,
Namhyung


> ---
> tools/perf/util/pmu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index 64fa568a5426..8d5ecd4ff1a9 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -1427,7 +1427,7 @@ bool perf_pmu__supports_legacy_cache(const struct perf_pmu *pmu)
>
> bool perf_pmu__auto_merge_stats(const struct perf_pmu *pmu)
> {
> - return pmu->is_core && perf_pmus__num_core_pmus() == 1;
> + return !pmu->is_core || perf_pmus__num_core_pmus() == 1;
> }
>
> bool perf_pmu__have_event(const struct perf_pmu *pmu, const char *name)
> --
> 2.41.0.162.gfafddb0af9-goog
>

2023-06-27 20:07:45

by Namhyung Kim

Subject: Re: [PATCH v1] perf pmu: Correct auto_merge_stats test

On Mon, Jun 26, 2023 at 3:15 PM Namhyung Kim <[email protected]> wrote:
>
> Hi Ian,
>
> On Sun, Jun 25, 2023 at 10:31 PM Ian Rogers <[email protected]> wrote:
> >
> > The original logic was:
> > https://lore.kernel.org/all/[email protected]/
> > return !is_pmu_hybrid(pmu->name)
> >
> > is_pmu_hybrid was removed but with the incorrect condition which was
> > fixed for core PMUs but not uncore. This change fixes both.
> >
> > Fixes: e23421426e13 ("perf pmu: Correct perf_pmu__auto_merge_stats() affecting hybrid")
> > Signed-off-by: Ian Rogers <[email protected]>
>
> Tested-by: Namhyung Kim <[email protected]>

Applied to perf-tools-next, thanks!