1 files changed, 39 insertions, 4 deletions

diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index f5b4ee79568c..4c53bae5644b 100644
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -88,9 +88,17 @@ static void aggr_printout(struct perf_stat_config *config,
                         config->csv_sep);
                         break;
         case AGGR_NONE:
-                fprintf(config->output, "CPU%*d%s",
-                        config->csv_output ? 0 : -4,
-                        perf_evsel__cpus(evsel)->map[id], config->csv_sep);
+                if (evsel->percore) {
+                        fprintf(config->output, "S%d-C%*d%s",
+                                cpu_map__id_to_socket(id),
+                                config->csv_output ? 0 : -5,
+                                cpu_map__id_to_cpu(id), config->csv_sep);
+                } else {
+                        fprintf(config->output, "CPU%*d%s ",
+                                config->csv_output ? 0 : -5,
+                                perf_evsel__cpus(evsel)->map[id],
+                                config->csv_sep);
+                }
                 break;
         case AGGR_THREAD:
                 fprintf(config->output, "%*s-%*d%s",
@@ -1103,6 +1111,30 @@ static void print_footer(struct perf_stat_config *config)
                         "the same PMU. Try reorganizing the group.\n");
 }
 
+static void print_percore(struct perf_stat_config *config,
+                          struct perf_evsel *counter, char *prefix)
+{
+        bool metric_only = config->metric_only;
+        FILE *output = config->output;
+        int s;
+        bool first = true;
+
+        if (!(config->aggr_map || config->aggr_get_id))
+                return;
+
+        for (s = 0; s < config->aggr_map->nr; s++) {
+                if (prefix && metric_only)
+                        fprintf(output, "%s", prefix);
+
+                print_counter_aggrdata(config, counter, s,
+                                       prefix, metric_only,
+                                       &first);
+        }
+
+        if (metric_only)
+                fputc('\n', output);
+}
+
 void
 perf_evlist__print_counters(struct perf_evlist *evlist,
                             struct perf_stat_config *config,
@@ -1153,7 +1185,10 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
                         print_no_aggr_metric(config, evlist, prefix);
                 else {
                         evlist__for_each_entry(evlist, counter) {
-                                print_counter(config, counter, prefix);
+                                if (counter->percore)
+                                        print_percore(config, counter, prefix);
+                                else
+                                        print_counter(config, counter, prefix);
                         }
                 }
                 break;