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

perf cpumap: Remove map+index get_die() 



Migrate final users to appropriate cpu variant.

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-9-irogers@google.com


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

tools/perf/tests/topology.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -136,7 +136,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) 




	// Test that die ID contains socket and die

	// Test that die ID contains socket and die

	for (i = 0; i < map->nr; i++) {

	for (i = 0; i < map->nr; i++) {

		id = cpu_map__get_die(map, i, NULL);

		id = cpu_map__get_die_aggr_by_cpu(perf_cpu_map__cpu(map, i), NULL);

		TEST_ASSERT_VAL("Die map - Socket ID doesn't match",

		TEST_ASSERT_VAL("Die map - Socket ID doesn't match",

			session->header.env.cpu[map->map[i]].socket_id == id.socket);

			session->header.env.cpu[map->map[i]].socket_id == id.socket);

tools/perf/util/cpumap.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -216,15 +216,6 @@ struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data) 
	return id;

	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 cpu_map__get_core_id(int cpu)

{

{

	int value, ret = cpu__get_topology_int(cpu, "core_id", &value);

	int value, ret = cpu__get_topology_int(cpu, "core_id", &value);

tools/perf/util/cpumap.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,6 @@ 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_aggr_by_cpu(int cpu, void *data);

int cpu_map__get_die_id(int cpu);

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_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);

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_aggr_by_cpu(int cpu, void *data);

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(struct perf_cpu_map *map, int idx, void *data);

tools/perf/util/stat.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -336,7 +336,7 @@ static int check_per_pkg(struct evsel *counter, 
	 * On multi-die system, die_id > 0. On no-die system, die_id = 0.

	 * On multi-die system, die_id > 0. On no-die system, die_id = 0.

	 * We use hashmap(socket, die) to check the used socket+die pair.

	 * We use hashmap(socket, die) to check the used socket+die pair.

	 */

	 */

	d = cpu_map__get_die(cpus, cpu, NULL).die;

	d = cpu_map__get_die_id(cpu);

	if (d < 0)

	if (d < 0)

		return -1;

		return -1;