perf stat aggregation: Add separate die member

[linux-2.6-microblaze.git] / tools / perf / util / stat-display.c

diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index 7903922..dcce753 100644 (file)
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -73,8 +73,8 @@ static void aggr_printout(struct perf_stat_config *config,
        switch (config->aggr_mode) {
        case AGGR_CORE:
                fprintf(config->output, "S%d-D%d-C%*d%s%*d%s",
-                       cpu_map__id_to_socket(id.id),
-                       cpu_map__id_to_die(id.id),
+                       id.socket,
+                       id.die,
                        config->csv_output ? 0 : -8,
                        cpu_map__id_to_cpu(id.id),
                        config->csv_sep,
@@ -84,9 +84,9 @@ static void aggr_printout(struct perf_stat_config *config,
                break;
        case AGGR_DIE:
                fprintf(config->output, "S%d-D%*d%s%*d%s",
-                       cpu_map__id_to_socket(id.id << 16),
+                       id.socket,
                        config->csv_output ? 0 : -8,
-                       cpu_map__id_to_die(id.id << 16),
+                       id.die,
                        config->csv_sep,
                        config->csv_output ? 0 : 4,
                        nr,
@@ -95,7 +95,7 @@ static void aggr_printout(struct perf_stat_config *config,
        case AGGR_SOCKET:
                fprintf(config->output, "S%*d%s%*d%s",
                        config->csv_output ? 0 : -5,
-                       id.id,
+                       id.socket,
                        config->csv_sep,
                        config->csv_output ? 0 : 4,
                        nr,
@@ -113,8 +113,8 @@ static void aggr_printout(struct perf_stat_config *config,
        case AGGR_NONE:
                if (evsel->percore && !config->percore_show_thread) {
                        fprintf(config->output, "S%d-D%d-C%*d%s",
-                               cpu_map__id_to_socket(id.id),
-                               cpu_map__id_to_die(id.id),
+                               id.socket,
+                               id.die,
                                config->csv_output ? 0 : -3,
                                cpu_map__id_to_cpu(id.id), config->csv_sep);
                } else if (id.id > -1) {