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

perf cpumap: Drop in cpu_aggr_map struct 



Replace usages of perf_cpu_map with cpu_aggr map in places that are
involved with 'perf stat' aggregation.

This will then later be changed to be a map of cpu_aggr_id rather than
an int so that more data can be stored.

No functional changes.

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 avatarJohn Garry <john.garry@huawei.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Link: https://lore.kernel.org/r/20201126141328.6509-7-james.clark@arm.com


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

tools/perf/builtin-stat.c

+22 −7
Original line number Diff line number Diff line
@@ -1320,14 +1320,29 @@ static int perf_stat_init_aggr_mode(void) 
	 * the aggregation translate cpumap.

	 */

	nr = perf_cpu_map__max(evsel_list->core.cpus);

	stat_config.cpus_aggr_map = perf_cpu_map__empty_new(nr + 1);

	stat_config.cpus_aggr_map = cpu_aggr_map__empty_new(nr + 1);

	return stat_config.cpus_aggr_map ? 0 : -ENOMEM;

}



static void cpu_aggr_map__delete(struct cpu_aggr_map *map)

{

	if (map) {

		WARN_ONCE(refcount_read(&map->refcnt) != 0,

			  "cpu_aggr_map refcnt unbalanced\n");

		free(map);

	}

}



static void cpu_aggr_map__put(struct cpu_aggr_map *map)

{

	if (map && refcount_dec_and_test(&map->refcnt))

		cpu_aggr_map__delete(map);

}



static void perf_stat__exit_aggr_mode(void)

{

	perf_cpu_map__put(stat_config.aggr_map);

	perf_cpu_map__put(stat_config.cpus_aggr_map);

	cpu_aggr_map__put(stat_config.aggr_map);

	cpu_aggr_map__put(stat_config.cpus_aggr_map);

	stat_config.aggr_map = NULL;

	stat_config.cpus_aggr_map = NULL;

}
@@ -1425,25 +1440,25 @@ static struct aggr_cpu_id perf_env__get_node(struct perf_cpu_map *map, int idx, 
}



static int perf_env__build_socket_map(struct perf_env *env, struct perf_cpu_map *cpus,

				      struct perf_cpu_map **sockp)

				      struct cpu_aggr_map **sockp)

{

	return cpu_map__build_map(cpus, sockp, perf_env__get_socket, env);

}



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

				   struct perf_cpu_map **diep)

				   struct cpu_aggr_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 perf_cpu_map *cpus,

				    struct perf_cpu_map **corep)

				    struct cpu_aggr_map **corep)

{

	return cpu_map__build_map(cpus, corep, perf_env__get_core, env);

}



static int perf_env__build_node_map(struct perf_env *env, struct perf_cpu_map *cpus,

				    struct perf_cpu_map **nodep)

				    struct cpu_aggr_map **nodep)

{

	return cpu_map__build_map(cpus, nodep, perf_env__get_node, env);

}

tools/perf/util/cpumap.c

+6 −6
Original line number Diff line number Diff line
@@ -151,12 +151,12 @@ static int cmp_aggr_cpu_id(const void *a_pointer, const void *b_pointer) 
	return a->id - b->id;

}



int cpu_map__build_map(struct perf_cpu_map *cpus, struct perf_cpu_map **res,

int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,

		       struct aggr_cpu_id (*f)(struct perf_cpu_map *map, int cpu, void *data),

		       void *data)

{

	int nr = cpus->nr;

	struct perf_cpu_map *c = perf_cpu_map__empty_new(nr);

	struct cpu_aggr_map *c = cpu_aggr_map__empty_new(nr);

	int cpu, s2;

	struct aggr_cpu_id s1;
@@ -279,22 +279,22 @@ struct aggr_cpu_id cpu_map__get_node(struct perf_cpu_map *map, int idx, void *da 
	return id;

}



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

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

{

	return cpu_map__build_map(cpus, sockp, cpu_map__get_socket, NULL);

}



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

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

{

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

}



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

int cpu_map__build_core_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **corep)

{

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

}



int cpu_map__build_node_map(struct perf_cpu_map *cpus, struct perf_cpu_map **numap)

int cpu_map__build_node_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **numap)

{

	return cpu_map__build_map(cpus, numap, cpu_map__get_node, NULL);

}

tools/perf/util/cpumap.h

+5 −5
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ int cpu_map__get_core_id(int cpu); 
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(struct perf_cpu_map *map, int idx, void *data);

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

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

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

int cpu_map__build_node_map(struct perf_cpu_map *cpus, struct perf_cpu_map **nodep);

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

int cpu_map__build_core_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **corep);

int cpu_map__build_node_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **nodep);

const struct perf_cpu_map *cpu_map__online(void); /* thread unsafe */



static inline int cpu_map__socket(struct perf_cpu_map *sock, int s)
@@ -69,7 +69,7 @@ int cpu__max_cpu(void); 
int cpu__max_present_cpu(void);

int cpu__get_node(int cpu);



int cpu_map__build_map(struct perf_cpu_map *cpus, struct perf_cpu_map **res,

int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,

		       struct aggr_cpu_id (*f)(struct perf_cpu_map *map, int cpu, void *data),

		       void *data);

tools/perf/util/stat.h

+2 −2
Original line number Diff line number Diff line
@@ -139,9 +139,9 @@ struct perf_stat_config { 
	const char		*csv_sep;

	struct stats		*walltime_nsecs_stats;

	struct rusage		 ru_data;

	struct perf_cpu_map		*aggr_map;

	struct cpu_aggr_map	*aggr_map;

	aggr_get_id_t		 aggr_get_id;

	struct perf_cpu_map		*cpus_aggr_map;

	struct cpu_aggr_map	*cpus_aggr_map;

	u64			*walltime_run;

	struct rblist		 metric_events;

	int			 ctl_fd;

CRA Git | Maintained and supported by SUSTech CRA and CCSE