perf stat: Rename to aggr_cpu_id.thread_idx

The aggr_cpu_id has a thread value but it's actually an index to the
thread_map.  To reduce possible confusion, rename it to thread_idx.

Suggested-by: Ian Rogers <irogers@google.com>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Link: https://lore.kernel.org/r/20220930202110.845199-8-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/tests/topology.c b/tools/perf/tests/topology.c
index 0b4f61b..c4630cf 100644 (file)
--- a/tools/perf/tests/topology.c
+++ b/tools/perf/tests/topology.c
@@ -147,7 +147,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)
                TEST_ASSERT_VAL("Cpu map - Die ID doesn't match",
                        session->header.env.cpu[perf_cpu_map__cpu(map, i).cpu].die_id == id.die);
                TEST_ASSERT_VAL("Cpu map - Node ID is set", id.node == -1);
-               TEST_ASSERT_VAL("Cpu map - Thread is set", id.thread == -1);
+               TEST_ASSERT_VAL("Cpu map - Thread IDX is set", id.thread_idx == -1);
        }
 
        // Test that core ID contains socket, die and core
@@ -163,7 +163,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)
                TEST_ASSERT_VAL("Core map - Die ID doesn't match",
                        session->header.env.cpu[perf_cpu_map__cpu(map, i).cpu].die_id == id.die);
                TEST_ASSERT_VAL("Core map - Node ID is set", id.node == -1);
-               TEST_ASSERT_VAL("Core map - Thread is set", id.thread == -1);
+               TEST_ASSERT_VAL("Core map - Thread IDX is set", id.thread_idx == -1);
        }
 
        // Test that die ID contains socket and die
@@ -179,7 +179,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)
                TEST_ASSERT_VAL("Die map - Node ID is set", id.node == -1);
                TEST_ASSERT_VAL("Die map - Core is set", id.core == -1);
                TEST_ASSERT_VAL("Die map - CPU is set", id.cpu.cpu == -1);
-               TEST_ASSERT_VAL("Die map - Thread is set", id.thread == -1);
+               TEST_ASSERT_VAL("Die map - Thread IDX is set", id.thread_idx == -1);
        }
 
        // Test that socket ID contains only socket
@@ -193,7 +193,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)
                TEST_ASSERT_VAL("Socket map - Die ID is set", id.die == -1);
                TEST_ASSERT_VAL("Socket map - Core is set", id.core == -1);
                TEST_ASSERT_VAL("Socket map - CPU is set", id.cpu.cpu == -1);
-               TEST_ASSERT_VAL("Socket map - Thread is set", id.thread == -1);
+               TEST_ASSERT_VAL("Socket map - Thread IDX is set", id.thread_idx == -1);
        }
 
        // Test that node ID contains only node
@@ -205,7 +205,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map)
                TEST_ASSERT_VAL("Node map - Die ID is set", id.die == -1);
                TEST_ASSERT_VAL("Node map - Core is set", id.core == -1);
                TEST_ASSERT_VAL("Node map - CPU is set", id.cpu.cpu == -1);
-               TEST_ASSERT_VAL("Node map - Thread is set", id.thread == -1);
+               TEST_ASSERT_VAL("Node map - Thread IDX is set", id.thread_idx == -1);
        }
        perf_session__delete(session);
 

diff --git a/tools/perf/util/cpumap.c b/tools/perf/util/cpumap.c
index 2389bd3..8486ca3 100644 (file)
--- a/tools/perf/util/cpumap.c
+++ b/tools/perf/util/cpumap.c
@@ -229,7 +229,7 @@ static int aggr_cpu_id__cmp(const void *a_pointer, const void *b_pointer)
        else if (a->core != b->core)
                return a->core - b->core;
        else
-               return a->thread - b->thread;
+               return a->thread_idx - b->thread_idx;
 }
 
 struct cpu_aggr_map *cpu_aggr_map__new(const struct perf_cpu_map *cpus,
@@ -667,7 +667,7 @@ const struct perf_cpu_map *cpu_map__online(void) /* thread unsafe */
 
 bool aggr_cpu_id__equal(const struct aggr_cpu_id *a, const struct aggr_cpu_id *b)
 {
-       return a->thread == b->thread &&
+       return a->thread_idx == b->thread_idx &&
                a->node == b->node &&
                a->socket == b->socket &&
                a->die == b->die &&
@@ -677,7 +677,7 @@ bool aggr_cpu_id__equal(const struct aggr_cpu_id *a, const struct aggr_cpu_id *b
 
 bool aggr_cpu_id__is_empty(const struct aggr_cpu_id *a)
 {
-       return a->thread == -1 &&
+       return a->thread_idx == -1 &&
                a->node == -1 &&
                a->socket == -1 &&
                a->die == -1 &&
@@ -688,7 +688,7 @@ bool aggr_cpu_id__is_empty(const struct aggr_cpu_id *a)
 struct aggr_cpu_id aggr_cpu_id__empty(void)
 {
        struct aggr_cpu_id ret = {
-               .thread = -1,
+               .thread_idx = -1,
                .node = -1,
                .socket = -1,
                .die = -1,

diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
index fa8a5ac..4a6d029 100644 (file)
--- a/tools/perf/util/cpumap.h
+++ b/tools/perf/util/cpumap.h
@@ -10,7 +10,7 @@
 /** Identify where counts are aggregated, -1 implies not to aggregate. */
 struct aggr_cpu_id {
        /** A value in the range 0 to number of threads. */
-       int thread;
+       int thread_idx;
        /** The numa node X as read from /sys/devices/system/node/nodeX. */
        int node;
        /**

diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c
index 570e2c0..df26fb5 100644 (file)
--- a/tools/perf/util/stat-display.c
+++ b/tools/perf/util/stat-display.c
@@ -189,14 +189,14 @@ static void aggr_printout(struct perf_stat_config *config,
        case AGGR_THREAD:
                if (config->json_output) {
                        fprintf(config->output, "\"thread\" : \"%s-%d\", ",
-                               perf_thread_map__comm(evsel->core.threads, id.thread),
-                               perf_thread_map__pid(evsel->core.threads, id.thread));
+                               perf_thread_map__comm(evsel->core.threads, id.thread_idx),
+                               perf_thread_map__pid(evsel->core.threads, id.thread_idx));
                } else {
                        fprintf(config->output, "%*s-%*d%s",
                                config->csv_output ? 0 : 16,
-                               perf_thread_map__comm(evsel->core.threads, id.thread),
+                               perf_thread_map__comm(evsel->core.threads, id.thread_idx),
                                config->csv_output ? 0 : -8,
-                               perf_thread_map__pid(evsel->core.threads, id.thread),
+                               perf_thread_map__pid(evsel->core.threads, id.thread_idx),
                                config->csv_sep);
                }
                break;
@@ -453,7 +453,7 @@ static int first_shadow_map_idx(struct perf_stat_config *config,
                return perf_cpu_map__idx(cpus, id->cpu);
 
        if (config->aggr_mode == AGGR_THREAD)
-               return id->thread;
+               return id->thread_idx;
 
        if (!config->aggr_get_id)
                return 0;
@@ -946,7 +946,7 @@ static struct perf_aggr_thread_value *sort_aggr_thread(
 
                buf[i].counter = counter;
                buf[i].id = aggr_cpu_id__empty();
-               buf[i].id.thread = thread;
+               buf[i].id.thread_idx = thread;
                buf[i].uval = uval;
                buf[i].val = val;
                buf[i].run = run;