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 8f4ee36..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,
@@ -104,7 +104,7 @@ static void aggr_printout(struct perf_stat_config *config,
        case AGGR_NODE:
                fprintf(config->output, "N%*d%s%*d%s",
                        config->csv_output ? 0 : -5,
-                       id.id,
+                       id.node,
                        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) {
@@ -506,7 +506,7 @@ static void aggr_update_shadow(struct perf_stat_config *config,
        struct evsel *counter;
 
        for (s = 0; s < config->aggr_map->nr; s++) {
-               id.id = config->aggr_map->map[s];
+               id = config->aggr_map->map[s];
                evlist__for_each_entry(evlist, counter) {
                        val = 0;
                        for (cpu = 0; cpu < evsel__nr_cpus(counter); cpu++) {
@@ -638,7 +638,7 @@ static void print_counter_aggrdata(struct perf_stat_config *config,
        struct aggr_cpu_id id;
        double uval;
 
-       ad.id.id = id.id = config->aggr_map->map[s];
+       ad.id = id = config->aggr_map->map[s];
        ad.val = ad.ena = ad.run = 0;
        ad.nr = 0;
        if (!collect_data(config, counter, aggr_cb, &ad))
@@ -1166,7 +1166,7 @@ static void print_percore_thread(struct perf_stat_config *config,
        for (int i = 0; i < evsel__nr_cpus(counter); i++) {
                s2 = config->aggr_get_id(config, evsel__cpus(counter), i);
                for (s = 0; s < config->aggr_map->nr; s++) {
-                       id.id = config->aggr_map->map[s];
+                       id = config->aggr_map->map[s];
                        if (cpu_map__compare_aggr_cpu_id(s2, id))
                                break;
                }