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 6248baa..bac37fe 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1387,11 +1387,7 @@ static struct aggr_cpu_id perf_env__get_die(struct perf_cpu_map *map, int idx, v
                 * make a unique ID.
                 */
                id.socket = env->cpu[cpu].socket_id;
                 * make a unique ID.
                 */
                id.socket = env->cpu[cpu].socket_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].die_id & 0xff;
+               id.die = env->cpu[cpu].die_id;

        }
 
        return id;
        }
 
        return id;


@@ -1405,20 +1401,16 @@ static struct aggr_cpu_id perf_env__get_core(struct perf_cpu_map *map, int idx,
 
        if (cpu != -1) {
                /*
 
        if (cpu != -1) {
                /*

-                * 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
                 */
                 * 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].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.socket = env->cpu[cpu].socket_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.socket = env->cpu[cpu].socket_id;

-               id.id = (env->cpu[cpu].die_id << 16) |
-                      (env->cpu[cpu].core_id & 0xffff);
+               id.die = env->cpu[cpu].die_id;
+               id.id = env->cpu[cpu].core_id & 0xffff;

        }
 
        return id;
        }
 
        return id;