perf stat aggregation: Add separate die member

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

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index cc017c7..bac37fe 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1221,10 +1221,10 @@ static struct aggr_cpu_id perf_stat__get_aggr(struct perf_stat_config *config,
 
        cpu = map->map[idx];
 
-       if (config->cpus_aggr_map->map[cpu] == -1)
-               config->cpus_aggr_map->map[cpu] = get_id(config, map, idx).id;
+       if (cpu_map__aggr_cpu_id_is_empty(config->cpus_aggr_map->map[cpu]))
+               config->cpus_aggr_map->map[cpu] = get_id(config, map, idx);
 
-       id.id = config->cpus_aggr_map->map[cpu];
+       id = config->cpus_aggr_map->map[cpu];
        return id;
 }
 
@@ -1369,7 +1369,7 @@ static struct aggr_cpu_id perf_env__get_socket(struct perf_cpu_map *map, int idx
        struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id();
 
        if (cpu != -1)
-               id.id = env->cpu[cpu].socket_id;
+               id.socket = env->cpu[cpu].socket_id;
 
        return id;
 }
@@ -1382,18 +1382,12 @@ static struct aggr_cpu_id perf_env__get_die(struct perf_cpu_map *map, int idx, v
 
        if (cpu != -1) {
                /*
-                * Encode socket in bit range 15:8
-                * die_id is relative to socket,
-                * we need a global id. So we combine
-                * socket + die id
+                * die_id is relative to socket, so start
+                * with the socket ID and then add die to
+                * make a unique ID.
                 */
-               if (WARN_ONCE(env->cpu[cpu].socket_id >> 8, "The socket id number is too big.\n"))
-                       return cpu_map__empty_aggr_cpu_id();
-
-               if (WARN_ONCE(env->cpu[cpu].die_id >> 8, "The die id number is too big.\n"))
-                       return cpu_map__empty_aggr_cpu_id();
-
-               id.id = (env->cpu[cpu].socket_id << 8) | (env->cpu[cpu].die_id & 0xff);
+               id.socket = env->cpu[cpu].socket_id;
+               id.die = env->cpu[cpu].die_id;
        }
 
        return id;
@@ -1407,24 +1401,16 @@ static struct aggr_cpu_id perf_env__get_core(struct perf_cpu_map *map, int idx,
 
        if (cpu != -1) {
                /*
-                * Encode socket in bit range 31:24
-                * encode die id in bit range 23:16
                 * core_id is relative to socket and die,
                 * we need a global id. So we combine
                 * socket + die id + core id
                 */
-               if (WARN_ONCE(env->cpu[cpu].socket_id >> 8, "The socket id number is too big.\n"))
-                       return cpu_map__empty_aggr_cpu_id();
-
-               if (WARN_ONCE(env->cpu[cpu].die_id >> 8, "The die id number is too big.\n"))
-                       return cpu_map__empty_aggr_cpu_id();
-
                if (WARN_ONCE(env->cpu[cpu].core_id >> 16, "The core id number is too big.\n"))
                        return cpu_map__empty_aggr_cpu_id();
 
-               id.id = (env->cpu[cpu].socket_id << 24) |
-                      (env->cpu[cpu].die_id << 16) |
-                      (env->cpu[cpu].core_id & 0xffff);
+               id.socket = env->cpu[cpu].socket_id;
+               id.die = env->cpu[cpu].die_id;
+               id.id = env->cpu[cpu].core_id & 0xffff;
        }
 
        return id;
@@ -1435,7 +1421,7 @@ static struct aggr_cpu_id perf_env__get_node(struct perf_cpu_map *map, int idx,
        int cpu = perf_env__get_cpu(data, map, idx);
        struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id();
 
-       id.id = perf_env__numa_node(data, cpu);
+       id.node = perf_env__numa_node(data, cpu);
        return id;
 }