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

perf stat aggregation: Add separate core member 



Add core 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-12-james.clark@arm.com


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

tools/perf/builtin-stat.c

+3 −6
Original line number Diff line number Diff line
@@ -1402,15 +1402,12 @@ static struct aggr_cpu_id perf_env__get_core(struct perf_cpu_map *map, int idx, 
	if (cpu != -1) {

		/*

		 * core_id is relative to socket and die,

		 * we need a global id. So we combine

		 * socket + die id + core id

		 * we need a global id. So we set

		 * socket, die id and core 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.die = env->cpu[cpu].die_id;

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

		id.core = env->cpu[cpu].core_id;

	}



	return id;

tools/perf/tests/topology.c

+5 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) 
	for (i = 0; i < map->nr; i++) {

		id = cpu_map__get_core(map, i, NULL);

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

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

			session->header.env.cpu[map->map[i]].core_id == id.core);



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

			session->header.env.cpu[map->map[i]].socket_id == id.socket);
@@ -119,6 +119,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[map->map[i]].die_id == id.die);

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

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

	}



	// Test that die ID contains socket and die
@@ -132,6 +133,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 - ID is set", id.id == -1);

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

	}



	// Test that socket ID contains only socket
@@ -143,6 +145,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) 
		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);

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

	}



	// Test that node ID contains only node
@@ -153,6 +156,7 @@ static int check_cpu_topology(char *path, struct perf_cpu_map *map) 
		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);

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

	}

	perf_session__delete(session);

tools/perf/util/cpumap.c

+10 −8
Original line number Diff line number Diff line
@@ -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;

	else

	else if (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,
@@ -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

	 */

	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;

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

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

		a.die == -1;

		a.die == -1 &&

		a.core == -1;

}



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,

		.die = -1

		.die = -1,

		.core = -1

	};

	return ret;

}

tools/perf/util/cpumap.h

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

	int socket;

	int die;

	int core;

};



struct cpu_aggr_map {
@@ -50,11 +51,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_cpu(int id)

{

	return id & 0xffff;

}



int cpu__setup_cpunode_map(void);



int cpu__max_node(void);

tools/perf/util/stat-display.c

+8 −8
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static void aggr_printout(struct perf_stat_config *config, 
			id.socket,

			id.die,

			config->csv_output ? 0 : -8,

			cpu_map__id_to_cpu(id.id),

			id.core,

			config->csv_sep,

			config->csv_output ? 0 : 4,

			nr,
@@ -116,11 +116,11 @@ static void aggr_printout(struct perf_stat_config *config, 
				id.socket,

				id.die,

				config->csv_output ? 0 : -3,

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

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

				id.core, config->csv_sep);

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

			fprintf(config->output, "CPU%*d%s",

				config->csv_output ? 0 : -7,

				evsel__cpus(evsel)->map[id.id],

				evsel__cpus(evsel)->map[id.core],

				config->csv_sep);

		}

		break;
@@ -326,7 +326,7 @@ static int first_shadow_cpu(struct perf_stat_config *config, 
	int i;



	if (config->aggr_mode == AGGR_NONE)

		return id.id;

		return id.core;



	if (!config->aggr_get_id)

		return 0;
@@ -658,7 +658,7 @@ static void print_counter_aggrdata(struct perf_stat_config *config, 
	uval = val * counter->scale;

	if (cpu != -1) {

		id = cpu_map__empty_aggr_cpu_id();

		id.id = cpu;

		id.core = cpu;

	}

	printout(config, id, nr, counter, uval,

		 prefix, run, ena, 1.0, &rt_stat);
@@ -871,7 +871,7 @@ static void print_counter(struct perf_stat_config *config, 


		uval = val * counter->scale;

		id = cpu_map__empty_aggr_cpu_id();

		id.id = cpu;

		id.core = cpu;

		printout(config, id, 0, counter, uval, prefix,

			 run, ena, 1.0, &rt_stat);
@@ -898,7 +898,7 @@ static void print_no_aggr_metric(struct perf_stat_config *config, 
			fputs(prefix, config->output);

		evlist__for_each_entry(evlist, counter) {

			id = cpu_map__empty_aggr_cpu_id();

			id.id = cpu;

			id.core = cpu;

			if (first) {

				aggr_printout(config, counter, id, 0);

				first = false;

CRA Git | Maintained and supported by SUSTech CRA and CCSE