Messages in this thread Patch in this message | | | Date | Sun, 25 Jun 2023 22:30:48 -0700 | Subject | [PATCH v1] perf pmu: Correct auto_merge_stats test | From | Ian Rogers <> |
| |
The original logic was: https://lore.kernel.org/all/20230527072210.2900565-35-irogers@google.com/ 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 <irogers@google.com> --- 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
| |