Commit 51b826fa authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf cpumap: Rename empty functions 



Remove cpu_map from name as a cpu_map isn't used. Pass a const pointer
rather than by value to avoid unnecessary copying.

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


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

tools/perf/builtin-stat.c

+6 −6
Original line number Diff line number Diff line
@@ -1349,9 +1349,9 @@ static struct aggr_cpu_id perf_stat__get_node(struct perf_stat_config *config __ 
static struct aggr_cpu_id perf_stat__get_aggr(struct perf_stat_config *config,

					      aggr_get_id_t get_id, int cpu)

{

	struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id();

	struct aggr_cpu_id id = aggr_cpu_id__empty();



	if (cpu_map__aggr_cpu_id_is_empty(config->cpus_aggr_map->map[cpu]))

	if (aggr_cpu_id__is_empty(&config->cpus_aggr_map->map[cpu]))

		config->cpus_aggr_map->map[cpu] = get_id(config, cpu);



	id = config->cpus_aggr_map->map[cpu];
@@ -1480,7 +1480,7 @@ static void perf_stat__exit_aggr_mode(void) 
static struct aggr_cpu_id perf_env__get_socket_aggr_by_cpu(int cpu, void *data)

{

	struct perf_env *env = data;

	struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id();

	struct aggr_cpu_id id = aggr_cpu_id__empty();



	if (cpu != -1)

		id.socket = env->cpu[cpu].socket_id;
@@ -1491,7 +1491,7 @@ static struct aggr_cpu_id perf_env__get_socket_aggr_by_cpu(int cpu, void *data) 
static struct aggr_cpu_id perf_env__get_die_aggr_by_cpu(int cpu, void *data)

{

	struct perf_env *env = data;

	struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id();

	struct aggr_cpu_id id = aggr_cpu_id__empty();



	if (cpu != -1) {

		/*
@@ -1509,7 +1509,7 @@ static struct aggr_cpu_id perf_env__get_die_aggr_by_cpu(int cpu, void *data) 
static struct aggr_cpu_id perf_env__get_core_aggr_by_cpu(int cpu, void *data)

{

	struct perf_env *env = data;

	struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id();

	struct aggr_cpu_id id = aggr_cpu_id__empty();



	if (cpu != -1) {

		/*
@@ -1527,7 +1527,7 @@ static struct aggr_cpu_id perf_env__get_core_aggr_by_cpu(int cpu, void *data) 


static struct aggr_cpu_id perf_env__get_node_aggr_by_cpu(int cpu, void *data)

{

	struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id();

	struct aggr_cpu_id id = aggr_cpu_id__empty();



	id.node = perf_env__numa_node(data, cpu);

	return id;

tools/perf/util/cpumap.c

+12 −12
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ struct cpu_aggr_map *cpu_aggr_map__empty_new(int nr) 


		cpus->nr = nr;

		for (i = 0; i < nr; i++)

			cpus->map[i] = cpu_map__empty_aggr_cpu_id();

			cpus->map[i] = aggr_cpu_id__empty();



		refcount_set(&cpus->refcnt, 1);

	}
@@ -130,7 +130,7 @@ int cpu_map__get_socket_id(int cpu) 


struct aggr_cpu_id cpu_map__get_socket_aggr_by_cpu(int cpu, void *data __maybe_unused)

{

	struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id();

	struct aggr_cpu_id id = aggr_cpu_id__empty();



	id.socket = cpu_map__get_socket_id(cpu);

	return id;
@@ -209,7 +209,7 @@ struct aggr_cpu_id cpu_map__get_die_aggr_by_cpu(int cpu, void *data) 
	 * make a unique ID.

	 */

	id = cpu_map__get_socket_aggr_by_cpu(cpu, data);

	if (cpu_map__aggr_cpu_id_is_empty(id))

	if (aggr_cpu_id__is_empty(&id))

		return id;



	id.die = die;
@@ -234,7 +234,7 @@ struct aggr_cpu_id cpu_map__get_core_aggr_by_cpu(int cpu, void *data) 


	/* cpu_map__get_die returns a struct with socket and die set*/

	id = cpu_map__get_die_aggr_by_cpu(cpu, data);

	if (cpu_map__aggr_cpu_id_is_empty(id))

	if (aggr_cpu_id__is_empty(&id))

		return id;



	/*
@@ -248,7 +248,7 @@ struct aggr_cpu_id cpu_map__get_core_aggr_by_cpu(int cpu, void *data) 


struct aggr_cpu_id cpu_map__get_node_aggr_by_cpu(int cpu, void *data __maybe_unused)

{

	struct aggr_cpu_id id = cpu_map__empty_aggr_cpu_id();

	struct aggr_cpu_id id = aggr_cpu_id__empty();



	id.node = cpu_map__get_node_id(cpu);

	return id;
@@ -602,16 +602,16 @@ bool aggr_cpu_id__equal(const struct aggr_cpu_id *a, const struct aggr_cpu_id *b 
		a->core == b->core;

}



bool cpu_map__aggr_cpu_id_is_empty(struct aggr_cpu_id a)

bool aggr_cpu_id__is_empty(const struct aggr_cpu_id *a)

{

	return a.thread == -1 &&

		a.node == -1 &&

		a.socket == -1 &&

		a.die == -1 &&

		a.core == -1;

	return a->thread == -1 &&

		a->node == -1 &&

		a->socket == -1 &&

		a->die == -1 &&

		a->core == -1;

}



struct aggr_cpu_id cpu_map__empty_aggr_cpu_id(void)

struct aggr_cpu_id aggr_cpu_id__empty(void)

{

	struct aggr_cpu_id ret = {

		.thread = -1,

tools/perf/util/cpumap.h

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ int cpu_map__cpu(struct perf_cpu_map *cpus, int idx); 
bool cpu_map__has(struct perf_cpu_map *cpus, int cpu);



bool aggr_cpu_id__equal(const struct aggr_cpu_id *a, const struct aggr_cpu_id *b);

bool cpu_map__aggr_cpu_id_is_empty(struct aggr_cpu_id a);

struct aggr_cpu_id cpu_map__empty_aggr_cpu_id(void);

bool aggr_cpu_id__is_empty(const struct aggr_cpu_id *a);

struct aggr_cpu_id aggr_cpu_id__empty(void);



#endif /* __PERF_CPUMAP_H */

tools/perf/util/stat-display.c

+5 −5
Original line number Diff line number Diff line
@@ -698,7 +698,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 = aggr_cpu_id__empty();

		id.core = cpu;

	}

	printout(config, id, nr, counter, uval,
@@ -780,7 +780,7 @@ static struct perf_aggr_thread_value *sort_aggr_thread( 
			continue;



		buf[i].counter = counter;

		buf[i].id = cpu_map__empty_aggr_cpu_id();

		buf[i].id = aggr_cpu_id__empty();

		buf[i].id.thread = thread;

		buf[i].uval = uval;

		buf[i].val = val;
@@ -868,7 +868,7 @@ static void print_counter_aggr(struct perf_stat_config *config, 
		fprintf(output, "%s", prefix);



	uval = cd.avg * counter->scale;

	printout(config, cpu_map__empty_aggr_cpu_id(), 0, counter, uval, prefix, cd.avg_running,

	printout(config, aggr_cpu_id__empty(), 0, counter, uval, prefix, cd.avg_running,

		 cd.avg_enabled, cd.avg, &rt_stat);

	if (!metric_only)

		fprintf(output, "\n");
@@ -911,7 +911,7 @@ static void print_counter(struct perf_stat_config *config, 
			fprintf(output, "%s", prefix);



		uval = val * counter->scale;

		id = cpu_map__empty_aggr_cpu_id();

		id = aggr_cpu_id__empty();

		id.core = cpu;

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

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

			fputs(prefix, config->output);

		evlist__for_each_entry(evlist, counter) {

			id = cpu_map__empty_aggr_cpu_id();

			id = aggr_cpu_id__empty();

			id.core = cpu;

			if (first) {

				aggr_printout(config, counter, id, 0);