perf stat aggregation: Add separate core 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 10a5205..d164f7b 100644 (file)
--- a/tools/perf/util/cpumap.c
+++ b/tools/perf/util/cpumap.c
@@ -154,8 +154,10 @@ static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer)
                return a->node - b->node;
        else if (a->socket != b->socket)
                return a->socket - b->socket;
                return a->node - b->node;
        else if (a->socket != b->socket)
                return a->socket - b->socket;

-       else
+       else if (a->die != b->die)

                return a->die - b->die;
                return a->die - b->die;

+       else
+               return a->core - b->core;

 }
 
 int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
 }
 
 int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,


@@ -258,10 +260,7 @@ struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *da
         * 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
         */
         * 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 = (cpu & 0xffff);
+       id.core = cpu;

        return id;
 }
 
        return id;
 }
 


@@ -620,7 +619,8 @@ bool cpu_map__compare_aggr_cpu_id(struct aggr_cpu_id a, struct aggr_cpu_id b)
        return a.id == b.id &&
                a.node == b.node &&
                a.socket == b.socket &&
        return a.id == b.id &&
                a.node == b.node &&
                a.socket == b.socket &&

-               a.die == b.die;
+               a.die == b.die &&
+               a.core == b.core;

 }
 
 bool cpu_map__aggr_cpu_id_is_empty(struct aggr_cpu_id a)
 }
 
 bool cpu_map__aggr_cpu_id_is_empty(struct aggr_cpu_id a)


@@ -628,7 +628,8 @@ bool cpu_map__aggr_cpu_id_is_empty(struct aggr_cpu_id a)
        return a.id == -1 &&
                a.node == -1 &&
                a.socket == -1 &&
        return a.id == -1 &&
                a.node == -1 &&
                a.socket == -1 &&

-               a.die == -1;
+               a.die == -1 &&
+               a.core == -1;

 }
 
 struct aggr_cpu_id cpu_map__empty_aggr_cpu_id(void)
 }
 
 struct aggr_cpu_id cpu_map__empty_aggr_cpu_id(void)


@@ -637,7 +638,8 @@ struct aggr_cpu_id cpu_map__empty_aggr_cpu_id(void)
                .id = -1,
                .node = -1,
                .socket = -1,
                .id = -1,
                .node = -1,
                .socket = -1,

-               .die = -1
+               .die = -1,
+               .core = -1

        };
        return ret;
 }
        };
        return ret;
 }