Commit ca2c9b76 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Add aggr creators that are passed a cpu 



The cpu_map and index can get confused. Add variants of the cpu_map__get
routines that are passed a cpu. Make the existing cpu_map__get routines
use the new functions with a view to remove them when no longer used.

Reviewed-by: default avatarJames Clark <james.clark@arm.com>
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Vineet Singh <vineet.singh@intel.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: zhengjun.xing@intel.com
Link: https://lore.kernel.org/r/20220105061351.120843-3-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 818ab78c

tools/perf/util/cpumap.c

+46 −33
Original line number Diff line number Diff line
@@ -128,19 +128,21 @@ int cpu_map__get_socket_id(int cpu) 
	return ret ?: value;

}



struct aggr_cpu_id cpu_map__get_socket(struct perf_cpu_map *map, int idx,

					void *data __maybe_unused)

struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data __maybe_unused)

{

	int cpu;

	struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id();



	if (idx > map->nr)

	id.socket = cpu_map__get_socket_id(cpu);

	return id;

}



	cpu = map->map[idx];

struct aggr_cpu_id cpu_map__get_socket(struct perf_cpu_map *map, int idx,

				       void *data)

{

	if (idx < 0 || idx > map->nr)

		return cpu_map__empty_aggr_cpu_id();



	id.socket = cpu_map__get_socket_id(cpu);

	return id;

	return cpu_map__get_socket_aggr_by_cpu(map->map[idx], data);

}



static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer)
@@ -200,15 +202,10 @@ int cpu_map__get_die_id(int cpu) 
	return ret ?: value;

}



struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *data)

struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data)

{

	int cpu, die;

	struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id();



	if (idx > map->nr)

		return id;



	cpu = map->map[idx];

	struct aggr_cpu_id id;

	int die;



	die = cpu_map__get_die_id(cpu);

	/* There is no die_id on legacy system. */
@@ -220,7 +217,7 @@ struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *dat 
	 * with the socket ID and then add die to

	 * make a unique ID.

	 */

	id = cpu_map__get_socket(map, idx, data);

	id = cpu_map__get_socket_aggr_by_cpu(cpu, data);

	if (cpu_map__aggr_cpu_id_is_empty(id))

		return id;
@@ -228,6 +225,15 @@ struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *dat 
	return id;

}



struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx,

				    void *data)

{

	if (idx < 0 || idx > map->nr)

		return cpu_map__empty_aggr_cpu_id();



	return cpu_map__get_die_aggr_by_cpu(map->map[idx], data);

}



int cpu_map__get_core_id(int cpu)

{

	int value, ret = cpu__get_topology_int(cpu, "core_id", &value);
@@ -239,20 +245,13 @@ int cpu_map__get_node_id(int cpu) 
	return cpu__get_node(cpu);

}



struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data)

struct aggr_cpu_id cpu_map__get_core_aggr_by_cpu(int cpu, void *data)

{

	int cpu;

	struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id();



	if (idx > map->nr)

		return id;



	cpu = map->map[idx];



	cpu = cpu_map__get_core_id(cpu);

	struct aggr_cpu_id id;

	int core = cpu_map__get_core_id(cpu);



	/* cpu_map__get_die returns a struct with socket and die set*/

	id = cpu_map__get_die(map, idx, data);

	id = cpu_map__get_die_aggr_by_cpu(cpu, data);

	if (cpu_map__aggr_cpu_id_is_empty(id))

		return id;
@@ -260,19 +259,33 @@ 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

	 */

	id.core = cpu;

	id.core = core;

	return id;



}



struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data __maybe_unused)

struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data)

{

	if (idx < 0 || idx > map->nr)

		return cpu_map__empty_aggr_cpu_id();



	return cpu_map__get_core_aggr_by_cpu(map->map[idx], data);

}



struct aggr_cpu_id cpu_map__get_node_aggr_by_cpu(int cpu, void *data __maybe_unused)

{

	struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id();



	if (idx < 0 || idx >= map->nr)

	id.node = cpu_map__get_node_id(cpu);

	return id;

}



	id.node = cpu_map__get_node_id(map->map[idx]);

	return id;

struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data)

{

	if (idx < 0 || idx >= map->nr)

		return cpu_map__empty_aggr_cpu_id();



	return cpu_map__get_node_aggr_by_cpu(map->map[idx], data);

}



int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp)

tools/perf/util/cpumap.h

+5 −1
Original line number Diff line number Diff line
@@ -31,12 +31,16 @@ size_t cpu_map__snprint(struct perf_cpu_map *map, char *buf, size_t size); 
size_t cpu_map__snprint_mask(struct perf_cpu_map *map, char *buf, size_t size);

size_t cpu_map__fprintf(struct perf_cpu_map *map, FILE *fp);

int cpu_map__get_socket_id(int cpu);

struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data);

struct aggr_cpu_id cpu_map__get_socket(struct perf_cpu_map *map, int idx, void *data);

int cpu_map__get_die_id(int cpu);

struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data);

struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *data);

int cpu_map__get_core_id(int cpu);

struct aggr_cpu_id cpu_map__get_core_aggr_by_cpu(int cpu, void *data);

struct aggr_cpu_id cpu_map__get_core(struct perf_cpu_map *map, int idx, void *data);

int cpu_map__get_node_id(int cpu);

struct aggr_cpu_id cpu_map__get_node_aggr_by_cpu(int cpu, void *data);

struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *data);

int cpu_map__build_socket_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **sockp);

int cpu_map__build_die_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **diep);