@@ -1417,11 +1417,6 @@ bool is_pmu_core(const char *name)
return !strcmp(name, "cpu") || is_sysfs_pmu_core(name);
}
-bool is_pmu_hybrid(const char *name)
-{
- return !strcmp(name, "cpu_atom") || !strcmp(name, "cpu_core");
-}
-
bool perf_pmu__supports_legacy_cache(const struct perf_pmu *pmu)
{
return pmu->is_core;
@@ -1429,7 +1424,7 @@ bool perf_pmu__supports_legacy_cache(const struct perf_pmu *pmu)
bool perf_pmu__auto_merge_stats(const struct perf_pmu *pmu)
{
- return !is_pmu_hybrid(pmu->name);
+ return pmu->is_core && perf_pmus__num_core_pmus() > 1;
}
bool perf_pmu__have_event(const struct perf_pmu *pmu, const char *name)
@@ -221,7 +221,6 @@ int perf_pmu__format_parse(int dirfd, struct list_head *head);
void perf_pmu__del_formats(struct list_head *formats);
bool is_pmu_core(const char *name);
-bool is_pmu_hybrid(const char *name);
bool perf_pmu__supports_legacy_cache(const struct perf_pmu *pmu);
bool perf_pmu__auto_merge_stats(const struct perf_pmu *pmu);
bool perf_pmu__have_event(const struct perf_pmu *pmu, const char *name);