1 files changed, 21 insertions, 0 deletions

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index a3c060878faa..24b8e690fb69 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -847,6 +847,18 @@ static int perf_stat__get_core_cached(struct perf_stat_config *config,
         return perf_stat__get_aggr(config, perf_stat__get_core, map, idx);
 }
 
+static bool term_percore_set(void)
+{
+        struct perf_evsel *counter;
+
+        evlist__for_each_entry(evsel_list, counter) {
+                if (counter->percore)
+                        return true;
+        }
+
+        return false;
+}
+
 static int perf_stat_init_aggr_mode(void)
 {
         int nr;
@@ -867,6 +879,15 @@ static int perf_stat_init_aggr_mode(void)
                 stat_config.aggr_get_id = perf_stat__get_core_cached;
                 break;
         case AGGR_NONE:
+                if (term_percore_set()) {
+                        if (cpu_map__build_core_map(evsel_list->cpus,
+                                                    &stat_config.aggr_map)) {
+                                perror("cannot build core map");
+                                return -1;
+                        }
+                        stat_config.aggr_get_id = perf_stat__get_core_cached;
+                }
+                break;
         case AGGR_GLOBAL:
         case AGGR_THREAD:
         case AGGR_UNSET: