Commit db5742b6 authored by Kan Liang's avatar Kan Liang Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Support per-die aggregation 



It is useful to aggregate counts per die. E.g. Uncore becomes die-scope
on Xeon Cascade Lake-AP.

Introduce a new option "--per-die" to support per-die aggregation.

The global id for each core has been changed to socket + die id + core
id. The global id for each die is socket + die id.

Add die information for per-core aggregation. The output of per-core
aggregation will be changed from "S0-C0" to "S0-D0-C0". Any scripts
which rely on the output format of per-core aggregation probably be
broken.

For 'perf stat record/report', there is no die information when
processing the old perf.data. The per-die result will be the same as
per-socket.

Committer notes:

Renamed 'die' variable to 'die_id' to fix the build in some systems:

    CC       /tmp/build/perf/builtin-script.o
  cc1: warnings being treated as errors
  builtin-stat.c: In function 'perf_env__get_die':
  builtin-stat.c:963: error: declaration of 'die' shadows a global declaration
  util/util.h:19: error: shadowed declaration is here
  mv: cannot stat `/tmp/build/perf/.builtin-stat.o.tmp': No such file or directory

Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Reviewed-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lkml.kernel.org/n/tip-bsnhx7vgsuu6ei307mw60mbj@git.kernel.org


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

tools/perf/Documentation/perf-stat.txt

+10 −0
Original line number Diff line number Diff line
@@ -200,6 +200,13 @@ use --per-socket in addition to -a. (system-wide). The output includes the 
socket number and the number of online processors on that socket. This is

useful to gauge the amount of aggregation.



--per-die::

Aggregate counts per processor die for system-wide mode measurements.  This

is a useful mode to detect imbalance between dies.  To enable this mode,

use --per-die in addition to -a. (system-wide).  The output includes the

die number and the number of online processors on that die. This is

useful to gauge the amount of aggregation.



--per-core::

Aggregate counts per physical processor for system-wide mode measurements.  This

is a useful mode to detect imbalance between physical cores.  To enable this mode,
@@ -239,6 +246,9 @@ Input file name. 
--per-socket::

Aggregate counts per processor socket for system-wide mode measurements.



--per-die::

Aggregate counts per processor die for system-wide mode measurements.



--per-core::

Aggregate counts per physical processor for system-wide mode measurements.

tools/perf/builtin-stat.c

+81 −6
Original line number Diff line number Diff line
@@ -777,6 +777,8 @@ static struct option stat_options[] = { 
		    "stop workload and print counts after a timeout period in ms (>= 10ms)"),

	OPT_SET_UINT(0, "per-socket", &stat_config.aggr_mode,

		     "aggregate counts per processor socket", AGGR_SOCKET),

	OPT_SET_UINT(0, "per-die", &stat_config.aggr_mode,

		     "aggregate counts per processor die", AGGR_DIE),

	OPT_SET_UINT(0, "per-core", &stat_config.aggr_mode,

		     "aggregate counts per physical processor core", AGGR_CORE),

	OPT_SET_UINT(0, "per-thread", &stat_config.aggr_mode,
@@ -801,6 +803,12 @@ static int perf_stat__get_socket(struct perf_stat_config *config __maybe_unused, 
	return cpu_map__get_socket(map, cpu, NULL);

}



static int perf_stat__get_die(struct perf_stat_config *config __maybe_unused,

			      struct cpu_map *map, int cpu)

{

	return cpu_map__get_die(map, cpu, NULL);

}



static int perf_stat__get_core(struct perf_stat_config *config __maybe_unused,

			       struct cpu_map *map, int cpu)

{
@@ -841,6 +849,12 @@ static int perf_stat__get_socket_cached(struct perf_stat_config *config, 
	return perf_stat__get_aggr(config, perf_stat__get_socket, map, idx);

}



static int perf_stat__get_die_cached(struct perf_stat_config *config,

					struct cpu_map *map, int idx)

{

	return perf_stat__get_aggr(config, perf_stat__get_die, map, idx);

}



static int perf_stat__get_core_cached(struct perf_stat_config *config,

				      struct cpu_map *map, int idx)

{
@@ -871,6 +885,13 @@ static int perf_stat_init_aggr_mode(void) 
		}

		stat_config.aggr_get_id = perf_stat__get_socket_cached;

		break;

	case AGGR_DIE:

		if (cpu_map__build_die_map(evsel_list->cpus, &stat_config.aggr_map)) {

			perror("cannot build die map");

			return -1;

		}

		stat_config.aggr_get_id = perf_stat__get_die_cached;

		break;

	case AGGR_CORE:

		if (cpu_map__build_core_map(evsel_list->cpus, &stat_config.aggr_map)) {

			perror("cannot build core map");
@@ -936,21 +957,55 @@ static int perf_env__get_socket(struct cpu_map *map, int idx, void *data) 
	return cpu == -1 ? -1 : env->cpu[cpu].socket_id;

}



static int perf_env__get_die(struct cpu_map *map, int idx, void *data)

{

	struct perf_env *env = data;

	int die_id = -1, cpu = perf_env__get_cpu(env, map, idx);



	if (cpu != -1) {

		/*

		 * Encode socket in bit range 15:8

		 * die_id is relative to socket,

		 * we need a global id. So we combine

		 * socket + die id

		 */

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

			return -1;



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

			return -1;



		die_id = (env->cpu[cpu].socket_id << 8) | (env->cpu[cpu].die_id & 0xff);

	}



	return die_id;

}



static int perf_env__get_core(struct cpu_map *map, int idx, void *data)

{

	struct perf_env *env = data;

	int core = -1, cpu = perf_env__get_cpu(env, map, idx);



	if (cpu != -1) {

		int socket_id = env->cpu[cpu].socket_id;



		/*

		 * Encode socket in upper 16 bits

		 * core_id is relative to socket, and

		 * Encode socket in bit range 31:24

		 * 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 + core id.

		 * socket + die id + core id

		 */

		core = (socket_id << 16) | (env->cpu[cpu].core_id & 0xffff);

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

			return -1;



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

			return -1;



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

			return -1;



		core = (env->cpu[cpu].socket_id << 24) |

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

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

	}



	return core;
@@ -962,6 +1017,12 @@ static int perf_env__build_socket_map(struct perf_env *env, struct cpu_map *cpus 
	return cpu_map__build_map(cpus, sockp, perf_env__get_socket, env);

}



static int perf_env__build_die_map(struct perf_env *env, struct cpu_map *cpus,

				   struct cpu_map **diep)

{

	return cpu_map__build_map(cpus, diep, perf_env__get_die, env);

}



static int perf_env__build_core_map(struct perf_env *env, struct cpu_map *cpus,

				    struct cpu_map **corep)

{
@@ -973,6 +1034,11 @@ static int perf_stat__get_socket_file(struct perf_stat_config *config __maybe_un 
{

	return perf_env__get_socket(map, idx, &perf_stat.session->header.env);

}

static int perf_stat__get_die_file(struct perf_stat_config *config __maybe_unused,

				   struct cpu_map *map, int idx)

{

	return perf_env__get_die(map, idx, &perf_stat.session->header.env);

}



static int perf_stat__get_core_file(struct perf_stat_config *config __maybe_unused,

				    struct cpu_map *map, int idx)
@@ -992,6 +1058,13 @@ static int perf_stat_init_aggr_mode_file(struct perf_stat *st) 
		}

		stat_config.aggr_get_id = perf_stat__get_socket_file;

		break;

	case AGGR_DIE:

		if (perf_env__build_die_map(env, evsel_list->cpus, &stat_config.aggr_map)) {

			perror("cannot build die map");

			return -1;

		}

		stat_config.aggr_get_id = perf_stat__get_die_file;

		break;

	case AGGR_CORE:

		if (perf_env__build_core_map(env, evsel_list->cpus, &stat_config.aggr_map)) {

			perror("cannot build core map");
@@ -1542,6 +1615,8 @@ static int __cmd_report(int argc, const char **argv) 
	OPT_STRING('i', "input", &input_name, "file", "input file name"),

	OPT_SET_UINT(0, "per-socket", &perf_stat.aggr_mode,

		     "aggregate counts per processor socket", AGGR_SOCKET),

	OPT_SET_UINT(0, "per-die", &perf_stat.aggr_mode,

		     "aggregate counts per processor die", AGGR_DIE),

	OPT_SET_UINT(0, "per-core", &perf_stat.aggr_mode,

		     "aggregate counts per physical processor core", AGGR_CORE),

	OPT_SET_UINT('A', "no-aggr", &perf_stat.aggr_mode,

tools/perf/util/cpumap.c

+50 −7
Original line number Diff line number Diff line
@@ -380,6 +380,39 @@ int cpu_map__get_die_id(int cpu) 
	return ret ?: value;

}



int cpu_map__get_die(struct cpu_map *map, int idx, void *data)

{

	int cpu, die_id, s;



	if (idx > map->nr)

		return -1;



	cpu = map->map[idx];



	die_id = cpu_map__get_die_id(cpu);

	/* There is no die_id on legacy system. */

	if (die_id == -1)

		die_id = 0;



	s = cpu_map__get_socket(map, idx, data);

	if (s == -1)

		return -1;



	/*

	 * Encode socket in bit range 15:8

	 * die_id is relative to socket, and

	 * we need a global id. So we combine

	 * socket + die id

	 */

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

		return -1;



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

		return -1;



	return (s << 8) | (die_id & 0xff);

}



int cpu_map__get_core_id(int cpu)

{

	int value, ret = cpu__get_topology_int(cpu, "core_id", &value);
@@ -388,7 +421,7 @@ int cpu_map__get_core_id(int cpu) 


int cpu_map__get_core(struct cpu_map *map, int idx, void *data)

{

	int cpu, s;

	int cpu, s_die;



	if (idx > map->nr)

		return -1;
@@ -397,17 +430,22 @@ int cpu_map__get_core(struct cpu_map *map, int idx, void *data) 


	cpu = cpu_map__get_core_id(cpu);



	s = cpu_map__get_socket(map, idx, data);

	if (s == -1)

	/* s_die is the combination of socket + die id */

	s_die = cpu_map__get_die(map, idx, data);

	if (s_die == -1)

		return -1;



	/*

	 * encode socket in upper 16 bits

	 * core_id is relative to socket, and

	 * encode socket in bit range 31:24

	 * 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+ core id

	 * socket + die id + core id

	 */

	return (s << 16) | (cpu & 0xffff);

	if (WARN_ONCE(cpu >> 16, "The core id number is too big.\n"))

		return -1;



	return (s_die << 16) | (cpu & 0xffff);

}



int cpu_map__build_socket_map(struct cpu_map *cpus, struct cpu_map **sockp)
@@ -415,6 +453,11 @@ int cpu_map__build_socket_map(struct cpu_map *cpus, struct cpu_map **sockp) 
	return cpu_map__build_map(cpus, sockp, cpu_map__get_socket, NULL);

}



int cpu_map__build_die_map(struct cpu_map *cpus, struct cpu_map **diep)

{

	return cpu_map__build_map(cpus, diep, cpu_map__get_die, NULL);

}



int cpu_map__build_core_map(struct cpu_map *cpus, struct cpu_map **corep)

{

	return cpu_map__build_map(cpus, corep, cpu_map__get_core, NULL);

tools/perf/util/cpumap.h

+8 −1
Original line number Diff line number Diff line
@@ -26,9 +26,11 @@ size_t cpu_map__fprintf(struct cpu_map *map, FILE *fp); 
int cpu_map__get_socket_id(int cpu);

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

int cpu_map__get_die_id(int cpu);

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

int cpu_map__get_core_id(int cpu);

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

int cpu_map__build_socket_map(struct cpu_map *cpus, struct cpu_map **sockp);

int cpu_map__build_die_map(struct cpu_map *cpus, struct cpu_map **diep);

int cpu_map__build_core_map(struct cpu_map *cpus, struct cpu_map **corep);

const struct cpu_map *cpu_map__online(void); /* thread unsafe */
@@ -44,7 +46,12 @@ static inline int cpu_map__socket(struct cpu_map *sock, int s) 


static inline int cpu_map__id_to_socket(int id)

{

	return id >> 16;

	return id >> 24;

}



static inline int cpu_map__id_to_die(int id)

{

	return (id >> 16) & 0xff;

}



static inline int cpu_map__id_to_cpu(int id)

tools/perf/util/stat-display.c

+25 −4
Original line number Diff line number Diff line
@@ -69,8 +69,9 @@ static void aggr_printout(struct perf_stat_config *config, 
{

	switch (config->aggr_mode) {

	case AGGR_CORE:

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

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

			cpu_map__id_to_socket(id),

			cpu_map__id_to_die(id),

			config->csv_output ? 0 : -8,

			cpu_map__id_to_cpu(id),

			config->csv_sep,
@@ -78,6 +79,16 @@ static void aggr_printout(struct perf_stat_config *config, 
			nr,

			config->csv_sep);

		break;

	case AGGR_DIE:

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

			cpu_map__id_to_socket(id << 16),

			config->csv_output ? 0 : -8,

			cpu_map__id_to_die(id << 16),

			config->csv_sep,

			config->csv_output ? 0 : 4,

			nr,

			config->csv_sep);

		break;

	case AGGR_SOCKET:

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

			config->csv_output ? 0 : -5,
@@ -89,8 +100,9 @@ static void aggr_printout(struct perf_stat_config *config, 
			break;

	case AGGR_NONE:

		if (evsel->percore) {

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

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

				cpu_map__id_to_socket(id),

				cpu_map__id_to_die(id),

				config->csv_output ? 0 : -5,

				cpu_map__id_to_cpu(id), config->csv_sep);

		} else {
@@ -407,6 +419,7 @@ static void printout(struct perf_stat_config *config, int id, int nr, 
			[AGGR_THREAD] = 1,

			[AGGR_NONE] = 1,

			[AGGR_SOCKET] = 2,

			[AGGR_DIE] = 2,

			[AGGR_CORE] = 2,

		};
@@ -879,7 +892,8 @@ static void print_no_aggr_metric(struct perf_stat_config *config, 
}



static int aggr_header_lens[] = {

	[AGGR_CORE] = 18,

	[AGGR_CORE] = 24,

	[AGGR_DIE] = 18,

	[AGGR_SOCKET] = 12,

	[AGGR_NONE] = 6,

	[AGGR_THREAD] = 24,
@@ -888,6 +902,7 @@ static int aggr_header_lens[] = { 


static const char *aggr_header_csv[] = {

	[AGGR_CORE] 	= 	"core,cpus,",

	[AGGR_DIE] 	= 	"die,cpus",

	[AGGR_SOCKET] 	= 	"socket,cpus",

	[AGGR_NONE] 	= 	"cpu,",

	[AGGR_THREAD] 	= 	"comm-pid,",
@@ -954,6 +969,11 @@ static void print_interval(struct perf_stat_config *config, 
			if (!metric_only)

				fprintf(output, "             counts %*s events\n", unit_width, "unit");

			break;

		case AGGR_DIE:

			fprintf(output, "#           time die          cpus");

			if (!metric_only)

				fprintf(output, "             counts %*s events\n", unit_width, "unit");

			break;

		case AGGR_CORE:

			fprintf(output, "#           time core            cpus");

			if (!metric_only)
@@ -1165,6 +1185,7 @@ perf_evlist__print_counters(struct perf_evlist *evlist, 


	switch (config->aggr_mode) {

	case AGGR_CORE:

	case AGGR_DIE:

	case AGGR_SOCKET:

		print_aggr(config, evlist, prefix);

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE