iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf stat aggregation: Start using cpu_aggr_id in map

Browse Source 
Use the new cpu_aggr_id struct in the cpu map instead of int so that it
can store more data.

No functional changes.

Signed-off-by: James Clark <james.clark@arm.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: John 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-8-james.clark@arm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
James Clark
2020-11-26 16:13:23 +02:00
committed by Arnaldo Carvalho de Melo
parent d526e1a033
commit ff5232956e
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/perf/builtin-stat.c
View File

@ -1221,10 +1221,10 @@ static struct aggr_cpu_id perf_stat__get_aggr(struct perf_stat_config *config,
cpu = map->map[idx]; cpu = map->map[idx];
if (config->cpus_aggr_map->map[cpu] == -1) if (cpu_map__aggr_cpu_id_is_empty(config->cpus_aggr_map->map[cpu]))
config->cpus_aggr_map->map[cpu] = get_id(config, map, idx).id; config->cpus_aggr_map->map[cpu] = get_id(config, map, idx);
id.id = config->cpus_aggr_map->map[cpu]; id = config->cpus_aggr_map->map[cpu];
return id; return id;
} }

8
tools/perf/util/cpumap.c
View File

@ -97,14 +97,14 @@ struct perf_cpu_map *perf_cpu_map__empty_new(int nr)
struct cpu_aggr_map *cpu_aggr_map__empty_new(int nr) struct cpu_aggr_map *cpu_aggr_map__empty_new(int nr)
{ {
struct cpu_aggr_map *cpus = malloc(sizeof(*cpus) + sizeof(int) * nr); struct cpu_aggr_map *cpus = malloc(sizeof(*cpus) + sizeof(struct aggr_cpu_id) * nr);
if (cpus != NULL) { if (cpus != NULL) {
int i; int i;
cpus->nr = nr; cpus->nr = nr;
for (i = 0; i < nr; i++) for (i = 0; i < nr; i++)
cpus->map[i] = -1; cpus->map[i] = cpu_map__empty_aggr_cpu_id();
refcount_set(&cpus->refcnt, 1); refcount_set(&cpus->refcnt, 1);
} }
@ -169,11 +169,11 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct cpu_aggr_map **res,
for (cpu = 0; cpu < nr; cpu++) { for (cpu = 0; cpu < nr; cpu++) {
s1 = f(cpus, cpu, data); s1 = f(cpus, cpu, data);
for (s2 = 0; s2 < c->nr; s2++) { for (s2 = 0; s2 < c->nr; s2++) {
if (s1.id == c->map[s2]) if (cpu_map__compare_aggr_cpu_id(s1, c->map[s2]))
break; break;
} }
if (s2 == c->nr) { if (s2 == c->nr) {
c->map[c->nr] = s1.id; c->map[c->nr] = s1;
c->nr++; c->nr++;
} }
} }

2
tools/perf/util/cpumap.h
View File

@ -14,7 +14,7 @@ struct aggr_cpu_id {
struct cpu_aggr_map { struct cpu_aggr_map {
refcount_t refcnt; refcount_t refcnt;
int nr; int nr;
int map[]; struct aggr_cpu_id map[];
}; };
struct perf_record_cpu_map_data; struct perf_record_cpu_map_data;

6
tools/perf/util/stat-display.c
View File

@ -506,7 +506,7 @@ static void aggr_update_shadow(struct perf_stat_config *config,
struct evsel *counter; struct evsel *counter;
for (s = 0; s < config->aggr_map->nr; s++) { for (s = 0; s < config->aggr_map->nr; s++) {
id.id = config->aggr_map->map[s]; id = config->aggr_map->map[s];
evlist__for_each_entry(evlist, counter) { evlist__for_each_entry(evlist, counter) {
val = 0; val = 0;
for (cpu = 0; cpu < evsel__nr_cpus(counter); cpu++) { for (cpu = 0; cpu < evsel__nr_cpus(counter); cpu++) {
@ -638,7 +638,7 @@ static void print_counter_aggrdata(struct perf_stat_config *config,
struct aggr_cpu_id id; struct aggr_cpu_id id;
double uval; double uval;
ad.id.id = id.id = config->aggr_map->map[s]; ad.id = id = config->aggr_map->map[s];
ad.val = ad.ena = ad.run = 0; ad.val = ad.ena = ad.run = 0;
ad.nr = 0; ad.nr = 0;
if (!collect_data(config, counter, aggr_cb, &ad)) if (!collect_data(config, counter, aggr_cb, &ad))
@ -1166,7 +1166,7 @@ static void print_percore_thread(struct perf_stat_config *config,
for (int i = 0; i < evsel__nr_cpus(counter); i++) { for (int i = 0; i < evsel__nr_cpus(counter); i++) {
s2 = config->aggr_get_id(config, evsel__cpus(counter), i); s2 = config->aggr_get_id(config, evsel__cpus(counter), i);
for (s = 0; s < config->aggr_map->nr; s++) { for (s = 0; s < config->aggr_map->nr; s++) {
id.id = config->aggr_map->map[s]; id = config->aggr_map->map[s];
if (cpu_map__compare_aggr_cpu_id(s2, id)) if (cpu_map__compare_aggr_cpu_id(s2, id))
break; break;
} }