perf pmu: Correct auto_merge_stats test
Ian Rogers
reviewerPATCH 1/1 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.
--- tools/perf/util/pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/pmu.c +1 -1
@@ -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)
Signature · 1 line
2.41.0.162.gfafddb0af9-goog
Hi Ian,
Quoted 10 lines · Ian Rogers
The original logic was:
https://lore.kernel.org/all/[email protected]/
return !is_pmu_hybrid(pmu->name)
is_pmu_hybridwas 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]>
Thanks,
Namhyung
Quoted 20 lines
--- tools/perf/util/pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/pmu.c +1
-2@@ -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
Quoted 9 lines · Namhyung Kim
Hi Ian,
Quoted 5 lines · Ian Rogers
The original logic was:
https://lore.kernel.org/all/[email protected]/
return !is_pmu_hybrid(pmu->name)
Quoted 7 lines
Quoted 5 lines
is_pmu_hybridwas 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!