perf stat aggregation: Add separate die member

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

diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
index ea81586..10a5205 100644 (file)
--- a/tools/perf/util/cpumap.c
+++ b/tools/perf/util/cpumap.c
@@ -97,14 +97,14 @@ struct perf_cpu_map *perf_cpu_map__empty_new(int nr)
 
 struct cpu_aggr_map *cpu_aggr_map__empty_new(int nr)
 {
-       struct cpu_aggr_map *cpus = malloc(sizeof(*cpus) + sizeof(int) * nr);
+       struct cpu_aggr_map *cpus = malloc(sizeof(*cpus) + sizeof(struct aggr_cpu_id) * nr);
 
        if (cpus != NULL) {
                int i;
 
                cpus->nr = nr;
                for (i = 0; i < nr; i++)
-                       cpus->map[i] = -1;
+                       cpus->map[i] = cpu_map__empty_aggr_cpu_id();
 
                refcount_set(&cpus->refcnt, 1);
        }
@@ -139,7 +139,7 @@ struct aggr_cpu_id cpu_map__get_socket(struct perf_cpu_map *map, int idx,
 
        cpu = map->map[idx];
 
-       id.id = cpu_map__get_socket_id(cpu);
+       id.socket = cpu_map__get_socket_id(cpu);
        return id;
 }
 
@@ -148,7 +148,14 @@ static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer)
        struct aggr_cpu_id *a = (struct aggr_cpu_id *)a_pointer;
        struct aggr_cpu_id *b = (struct aggr_cpu_id *)b_pointer;
 
-       return a->id - b->id;
+       if (a->id != b->id)
+               return a->id - b->id;
+       else if (a->node != b->node)
+               return a->node - b->node;
+       else if (a->socket != b->socket)
+               return a->socket - b->socket;
+       else
+               return a->die - b->die;
 }
 
 int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
@@ -169,11 +176,11 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
        for (cpu = 0; cpu < nr; cpu++) {
                s1 = f(cpus, cpu, data);
                for (s2 = 0; s2 < c->nr; s2++) {
-                       if (s1.id == c->map[s2])
+                       if (cpu_map__compare_aggr_cpu_id(s1, c->map[s2]))
                                break;
                }
                if (s2 == c->nr) {
-                       c->map[c->nr] = s1.id;
+                       c->map[c->nr] = s1;
                        c->nr++;
                }
        }
@@ -193,7 +200,7 @@ int cpu_map__get_die_id(int cpu)
 
 struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *data)
 {
-       int cpu, s;
+       int cpu, die;
        struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id();
 
        if (idx > map->nr)
@@ -201,28 +208,21 @@ struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *dat
 
        cpu = map->map[idx];
 
-       id.id = cpu_map__get_die_id(cpu);
+       die = cpu_map__get_die_id(cpu);
        /* There is no die_id on legacy system. */
-       if (id.id == -1)
-               id.id = 0;
-
-       s = cpu_map__get_socket(map, idx, data).id;
-       if (s == -1)
-               return cpu_map__empty_aggr_cpu_id();
+       if (die == -1)
+               die = 0;
 
        /*
-        * Encode socket in bit range 15:8
-        * die_id is relative to socket, and
-        * 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(id.id >> 8, "The die id number is too big.\n"))
-               return cpu_map__empty_aggr_cpu_id();
-
-       if (WARN_ONCE(s >> 8, "The socket id number is too big.\n"))
-               return cpu_map__empty_aggr_cpu_id();
+       id = cpu_map__get_socket(map, idx, data);
+       if (cpu_map__aggr_cpu_id_is_empty(id))
+               return id;
 
-       id.id = (s << 8) | (id.id & 0xff);
+       id.die = die;
        return id;
 }
 
@@ -249,22 +249,19 @@ struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *da
 
        cpu = cpu_map__get_core_id(cpu);
 
-       /* cpu_map__get_die returns the combination of socket + die id */
+       /* cpu_map__get_die returns a struct with socket and die set*/
        id = cpu_map__get_die(map, idx, data);
        if (cpu_map__aggr_cpu_id_is_empty(id))
                return id;
 
        /*
-        * 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
+        * core_id is relative to socket and die, we need a global id.
+        * So we combine the result from cpu_map__get_die with the core id
         */
        if (WARN_ONCE(cpu >> 16, "The core id number is too big.\n"))
                return cpu_map__empty_aggr_cpu_id();
 
-       id.id = (id.id << 16) | (cpu & 0xffff);
+       id.id = (cpu & 0xffff);
        return id;
 }
 
@@ -275,7 +272,7 @@ struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *da
        if (idx < 0 || idx >= map->nr)
                return id;
 
-       id.id = cpu_map__get_node_id(map->map[idx]);
+       id.node = cpu_map__get_node_id(map->map[idx]);
        return id;
 }
 
@@ -620,18 +617,27 @@ const struct perf_cpu_map *cpu_map__online(void) /* thread unsafe */
 
 bool cpu_map__compare_aggr_cpu_id(struct aggr_cpu_id a, struct aggr_cpu_id b)
 {
-       return a.id == b.id;
+       return a.id == b.id &&
+               a.node == b.node &&
+               a.socket == b.socket &&
+               a.die == b.die;
 }
 
 bool cpu_map__aggr_cpu_id_is_empty(struct aggr_cpu_id a)
 {
-       return a.id == -1;
+       return a.id == -1 &&
+               a.node == -1 &&
+               a.socket == -1 &&
+               a.die == -1;
 }
 
 struct aggr_cpu_id cpu_map__empty_aggr_cpu_id(void)
 {
        struct aggr_cpu_id ret = {
-               .id = -1
+               .id = -1,
+               .node = -1,
+               .socket = -1,
+               .die = -1
        };
        return ret;
 }