Commit ba2ee166 authored by James Clark's avatar James Clark Committed by Arnaldo Carvalho de Melo
Browse files

perf stat aggregation: Add separate die member 



Add die as a separate member so that it doesn't have to be packed into
the int value.

Signed-off-by: default avatarJames Clark <james.clark@arm.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: default avatarJohn Garry <john.garry@huawei.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Link: https://lore.kernel.org/r/20201126141328.6509-11-james.clark@arm.com


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

tools/perf/builtin-stat.c

+3 −11
Original line number Diff line number Diff line
@@ -1387,11 +1387,7 @@ static struct aggr_cpu_id perf_env__get_die(struct perf_cpu_map *map, int idx, v 
		 * make a unique ID.

		 */

		id.socket = env->cpu[cpu].socket_id;



		if (WARN_ONCE(env->cpu[cpu].die_id >> 8, "The die id number is too big.\n"))

			return cpu_map__empty_aggr_cpu_id();



		id.id = env->cpu[cpu].die_id & 0xff;

		id.die = env->cpu[cpu].die_id;

	}



	return id;
@@ -1405,20 +1401,16 @@ static struct aggr_cpu_id perf_env__get_core(struct perf_cpu_map *map, int idx, 


	if (cpu != -1) {

		/*

		 * 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

		 */

		if (WARN_ONCE(env->cpu[cpu].die_id >> 8, "The die id number is too big.\n"))

			return cpu_map__empty_aggr_cpu_id();



		if (WARN_ONCE(env->cpu[cpu].core_id >> 16, "The core id number is too big.\n"))

			return cpu_map__empty_aggr_cpu_id();



		id.socket = env->cpu[cpu].socket_id;

		id.id = (env->cpu[cpu].die_id << 16) |

		       (env->cpu[cpu].core_id & 0xffff);

		id.die = env->cpu[cpu].die_id;

		id.id = env->cpu[cpu].core_id & 0xffff;

	}



	return id;

tools/perf/tests/topology.c

+5 −3
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) 
			session->header.env.cpu[map->map[i]].socket_id == id.socket);



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

			session->header.env.cpu[map->map[i]].die_id == cpu_map__id_to_die(id.id));

			session->header.env.cpu[map->map[i]].die_id == id.die);

		TEST_ASSERT_VAL("Core map - Node ID is set", id.node == -1);

	}
@@ -128,10 +128,10 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) 
			session->header.env.cpu[map->map[i]].socket_id == id.socket);



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

			session->header.env.cpu[map->map[i]].die_id ==

				cpu_map__id_to_die(id.id << 16));

			session->header.env.cpu[map->map[i]].die_id == id.die);



		TEST_ASSERT_VAL("Die map - Node ID is set", id.node == -1);

		TEST_ASSERT_VAL("Die map - ID is set", id.id == -1);

	}



	// Test that socket ID contains only socket
@@ -141,6 +141,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) 
			session->header.env.cpu[map->map[i]].socket_id == id.socket);



		TEST_ASSERT_VAL("Socket map - Node ID is set", id.node == -1);

		TEST_ASSERT_VAL("Socket map - Die ID is set", id.die == -1);

		TEST_ASSERT_VAL("Socket map - ID is set", id.id == -1);

	}
@@ -151,6 +152,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) 
			cpu__get_node(map->map[i]) == id.node);

		TEST_ASSERT_VAL("Node map - ID is set", id.id == -1);

		TEST_ASSERT_VAL("Node map - Socket is set", id.socket == -1);

		TEST_ASSERT_VAL("Node map - Die ID is set", id.die == -1);

	}

	perf_session__delete(session);

tools/perf/util/cpumap.c

+14 −14
Original line number Diff line number Diff line
@@ -152,8 +152,10 @@ static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer) 
		return a->id - b->id;

	else if (a->node != b->node)

		return a->node - b->node;

	else

	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,
@@ -220,10 +222,7 @@ struct aggr_cpu_id cpu_map__get_die(struct perf_cpu_map *map, int idx, void *dat 
	if (cpu_map__aggr_cpu_id_is_empty(id))

		return id;



	if (WARN_ONCE(die >> 8, "The die id number is too big.\n"))

		return cpu_map__empty_aggr_cpu_id();



	id.id = (die & 0xff);

	id.die = die;

	return id;

}
@@ -250,21 +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 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;

}
@@ -622,14 +619,16 @@ 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;

		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 &&

		a.node == -1 &&

		a.socket == -1;

		a.socket == -1 &&

		a.die == -1;

}



struct aggr_cpu_id cpu_map__empty_aggr_cpu_id(void)
@@ -637,7 +636,8 @@ struct aggr_cpu_id cpu_map__empty_aggr_cpu_id(void) 
	struct aggr_cpu_id ret = {

		.id = -1,

		.node = -1,

		.socket = -1

		.socket = -1,

		.die = -1

	};

	return ret;

}

tools/perf/util/cpumap.h

+1 −5
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ struct aggr_cpu_id { 
	int id;

	int node;

	int socket;

	int die;

};



struct cpu_aggr_map {
@@ -49,11 +50,6 @@ static inline int cpu_map__socket(struct perf_cpu_map *sock, int s) 
	return sock->map[s];

}



static inline int cpu_map__id_to_die(int id)

{

	return (id >> 16) & 0xff;

}



static inline int cpu_map__id_to_cpu(int id)

{

	return id & 0xffff;

tools/perf/util/stat-display.c

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static void aggr_printout(struct perf_stat_config *config, 
	case AGGR_CORE:

		fprintf(config->output, "S%d-D%d-C%*d%s%*d%s",

			id.socket,

			cpu_map__id_to_die(id.id),

			id.die,

			config->csv_output ? 0 : -8,

			cpu_map__id_to_cpu(id.id),

			config->csv_sep,
@@ -86,7 +86,7 @@ static void aggr_printout(struct perf_stat_config *config, 
		fprintf(config->output, "S%d-D%*d%s%*d%s",

			id.socket,

			config->csv_output ? 0 : -8,

			cpu_map__id_to_die(id.id << 16),

			id.die,

			config->csv_sep,

			config->csv_output ? 0 : 4,

			nr,
@@ -114,7 +114,7 @@ static void aggr_printout(struct perf_stat_config *config, 
		if (evsel->percore && !config->percore_show_thread) {

			fprintf(config->output, "S%d-D%d-C%*d%s",

				id.socket,

				cpu_map__id_to_die(id.id),

				id.die,

				config->csv_output ? 0 : -3,

				cpu_map__id_to_cpu(id.id), config->csv_sep);

		} else if (id.id > -1) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE