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

perf stat: Move *_aggr_* data to 'struct perf_stat_config'

Browse Source 
Move the *_aggr_* global variables to 'struct perf_stat_config', so that
it can be passed around and used outside 'perf stat' command.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180830063252.23729-37-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa
2018-08-30 08:32:45 +02:00
committed by Arnaldo Carvalho de Melo
parent 8897a8916e
commit 6f6b6594b5
2 changed files with 64 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,8 +143,6 @@ static struct target target = {
.uid = UINT_MAX, .uid = UINT_MAX,
}; };
typedef int (*aggr_get_id_t)(struct cpu_map *m, int cpu);
#define METRIC_ONLY_LEN 20 #define METRIC_ONLY_LEN 20
static volatile pid_t child_pid = -1; static volatile pid_t child_pid = -1;
@ -164,8 +162,6 @@ static bool force_metric_only = false;
static bool no_merge = false; static bool no_merge = false;
static bool walltime_run_table = false; static bool walltime_run_table = false;
static struct timespec ref_time; static struct timespec ref_time;
static struct cpu_map *aggr_map;
static aggr_get_id_t aggr_get_id;
static bool append_file; static bool append_file;
static bool interval_count; static bool interval_count;
static const char *output_name; static const char *output_name;
@ -920,7 +916,7 @@ static int first_shadow_cpu(struct perf_stat_config *config,
{ {
int i; int i;
if (!aggr_get_id) if (!config->aggr_get_id)
return 0; return 0;
if (config->aggr_mode == AGGR_NONE) if (config->aggr_mode == AGGR_NONE)
@ -932,7 +928,7 @@ static int first_shadow_cpu(struct perf_stat_config *config,
for (i = 0; i < perf_evsel__nr_cpus(evsel); i++) { for (i = 0; i < perf_evsel__nr_cpus(evsel); i++) {
int cpu2 = perf_evsel__cpus(evsel)->map[i]; int cpu2 = perf_evsel__cpus(evsel)->map[i];
if (aggr_get_id(evsel_list->cpus, cpu2) == id) if (config->aggr_get_id(config, evsel_list->cpus, cpu2) == id)
return cpu2; return cpu2;
} }
return 0; return 0;
@ -1102,12 +1098,12 @@ static void aggr_update_shadow(struct perf_stat_config *config,
u64 val; u64 val;
struct perf_evsel *counter; struct perf_evsel *counter;
for (s = 0; s < aggr_map->nr; s++) { for (s = 0; s < config->aggr_map->nr; s++) {
id = 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 < perf_evsel__nr_cpus(counter); cpu++) { for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) {
s2 = aggr_get_id(evsel_list->cpus, cpu); s2 = config->aggr_get_id(config, evsel_list->cpus, cpu);
if (s2 != id) if (s2 != id)
continue; continue;
val += perf_counts(counter->counts, cpu, 0)->val; val += perf_counts(counter->counts, cpu, 0)->val;
@ -1147,8 +1143,8 @@ static void uniquify_event_name(struct perf_evsel *counter)
counter->uniquified_name = true; counter->uniquified_name = true;
} }
static void collect_all_aliases(struct perf_evsel *counter, static void collect_all_aliases(struct perf_stat_config *config, struct perf_evsel *counter,
void (*cb)(struct perf_evsel *counter, void *data, void (*cb)(struct perf_stat_config *config, struct perf_evsel *counter, void *data,
bool first), bool first),
void *data) void *data)
{ {
@ -1164,22 +1160,22 @@ static void collect_all_aliases(struct perf_evsel *counter,
perf_evsel__is_clock(alias) != perf_evsel__is_clock(counter)) perf_evsel__is_clock(alias) != perf_evsel__is_clock(counter))
break; break;
alias->merged_stat = true; alias->merged_stat = true;
cb(alias, data, false); cb(config, alias, data, false);
} }
} }
static bool collect_data(struct perf_evsel *counter, static bool collect_data(struct perf_stat_config *config, struct perf_evsel *counter,
void (*cb)(struct perf_evsel *counter, void *data, void (*cb)(struct perf_stat_config *config, struct perf_evsel *counter, void *data,
bool first), bool first),
void *data) void *data)
{ {
if (counter->merged_stat) if (counter->merged_stat)
return false; return false;
cb(counter, data, true); cb(config, counter, data, true);
if (no_merge) if (no_merge)
uniquify_event_name(counter); uniquify_event_name(counter);
else if (counter->auto_merge_stats) else if (counter->auto_merge_stats)
collect_all_aliases(counter, cb, data); collect_all_aliases(config, counter, cb, data);
return true; return true;
} }
@ -1190,7 +1186,8 @@ struct aggr_data {
int cpu; int cpu;
}; };
static void aggr_cb(struct perf_evsel *counter, void *data, bool first) static void aggr_cb(struct perf_stat_config *config,
struct perf_evsel *counter, void *data, bool first)
{ {
struct aggr_data *ad = data; struct aggr_data *ad = data;
int cpu, s2; int cpu, s2;
@ -1198,7 +1195,7 @@ static void aggr_cb(struct perf_evsel *counter, void *data, bool first)
for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) { for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) {
struct perf_counts_values *counts; struct perf_counts_values *counts;
s2 = aggr_get_id(perf_evsel__cpus(counter), cpu); s2 = config->aggr_get_id(config, perf_evsel__cpus(counter), cpu);
if (s2 != ad->id) if (s2 != ad->id)
continue; continue;
if (first) if (first)
@ -1232,7 +1229,7 @@ static void print_aggr(struct perf_stat_config *config,
u64 ena, run, val; u64 ena, run, val;
bool first; bool first;
if (!(aggr_map || aggr_get_id)) if (!(config->aggr_map || config->aggr_get_id))
return; return;
aggr_update_shadow(config, evlist); aggr_update_shadow(config, evlist);
@ -1241,12 +1238,12 @@ static void print_aggr(struct perf_stat_config *config,
* With metric_only everything is on a single line. * With metric_only everything is on a single line.
* Without each counter has its own line. * Without each counter has its own line.
*/ */
for (s = 0; s < aggr_map->nr; s++) { for (s = 0; s < config->aggr_map->nr; s++) {
struct aggr_data ad; struct aggr_data ad;
if (prefix && metric_only) if (prefix && metric_only)
fprintf(output, "%s", prefix); fprintf(output, "%s", prefix);
ad.id = id = aggr_map->map[s]; ad.id = id = config->aggr_map->map[s];
first = true; first = true;
evlist__for_each_entry(evlist, counter) { evlist__for_each_entry(evlist, counter) {
if (is_duration_time(counter)) if (is_duration_time(counter))
@ -1254,7 +1251,7 @@ static void print_aggr(struct perf_stat_config *config,
ad.val = ad.ena = ad.run = 0; ad.val = ad.ena = ad.run = 0;
ad.nr = 0; ad.nr = 0;
if (!collect_data(counter, aggr_cb, &ad)) if (!collect_data(config, counter, aggr_cb, &ad))
continue; continue;
nr = ad.nr; nr = ad.nr;
ena = ad.ena; ena = ad.ena;
@ -1370,7 +1367,8 @@ struct caggr_data {
double avg, avg_enabled, avg_running; double avg, avg_enabled, avg_running;
}; };
static void counter_aggr_cb(struct perf_evsel *counter, void *data, static void counter_aggr_cb(struct perf_stat_config *config __maybe_unused,
struct perf_evsel *counter, void *data,
bool first __maybe_unused) bool first __maybe_unused)
{ {
struct caggr_data *cd = data; struct caggr_data *cd = data;
@ -1393,7 +1391,7 @@ static void print_counter_aggr(struct perf_stat_config *config,
double uval; double uval;
struct caggr_data cd = { .avg = 0.0 }; struct caggr_data cd = { .avg = 0.0 };
if (!collect_data(counter, counter_aggr_cb, &cd)) if (!collect_data(config, counter, counter_aggr_cb, &cd))
return; return;
if (prefix && !metric_only) if (prefix && !metric_only)
@ -1406,7 +1404,8 @@ static void print_counter_aggr(struct perf_stat_config *config,
fprintf(output, "\n"); fprintf(output, "\n");
} }
static void counter_cb(struct perf_evsel *counter, void *data, static void counter_cb(struct perf_stat_config *config __maybe_unused,
struct perf_evsel *counter, void *data,
bool first __maybe_unused) bool first __maybe_unused)
{ {
struct aggr_data *ad = data; struct aggr_data *ad = data;
@ -1431,7 +1430,7 @@ static void print_counter(struct perf_stat_config *config,
for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) { for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) {
struct aggr_data ad = { .cpu = cpu }; struct aggr_data ad = { .cpu = cpu };
if (!collect_data(counter, counter_cb, &ad)) if (!collect_data(config, counter, counter_cb, &ad))
return; return;
val = ad.val; val = ad.val;
ena = ad.ena; ena = ad.ena;
@ -1944,12 +1943,14 @@ static const struct option stat_options[] = {
OPT_END() OPT_END()
}; };
static int perf_stat__get_socket(struct cpu_map *map, int cpu) static int perf_stat__get_socket(struct perf_stat_config *config __maybe_unused,
struct cpu_map *map, int cpu)
{ {
return cpu_map__get_socket(map, cpu, NULL); return cpu_map__get_socket(map, cpu, NULL);
} }
static int perf_stat__get_core(struct cpu_map *map, int cpu) static int perf_stat__get_core(struct perf_stat_config *config __maybe_unused,
struct cpu_map *map, int cpu)
{ {
return cpu_map__get_core(map, cpu, NULL); return cpu_map__get_core(map, cpu, NULL);
} }
@ -1966,9 +1967,8 @@ static int cpu_map__get_max(struct cpu_map *map)
return max; return max;
} }
static struct cpu_map *cpus_aggr_map; static int perf_stat__get_aggr(struct perf_stat_config *config,
aggr_get_id_t get_id, struct cpu_map *map, int idx)
static int perf_stat__get_aggr(aggr_get_id_t get_id, struct cpu_map *map, int idx)
{ {
int cpu; int cpu;
@ -1977,20 +1977,22 @@ static int perf_stat__get_aggr(aggr_get_id_t get_id, struct cpu_map *map, int id
cpu = map->map[idx]; cpu = map->map[idx];
if (cpus_aggr_map->map[cpu] == -1) if (config->cpus_aggr_map->map[cpu] == -1)
cpus_aggr_map->map[cpu] = get_id(map, idx); config->cpus_aggr_map->map[cpu] = get_id(config, map, idx);
return cpus_aggr_map->map[cpu]; return config->cpus_aggr_map->map[cpu];
} }
static int perf_stat__get_socket_cached(struct cpu_map *map, int idx) static int perf_stat__get_socket_cached(struct perf_stat_config *config,
struct cpu_map *map, int idx)
{ {
return perf_stat__get_aggr(perf_stat__get_socket, map, idx); return perf_stat__get_aggr(config, perf_stat__get_socket, map, idx);
} }
static int perf_stat__get_core_cached(struct cpu_map *map, int idx) static int perf_stat__get_core_cached(struct perf_stat_config *config,
struct cpu_map *map, int idx)
{ {
return perf_stat__get_aggr(perf_stat__get_core, map, idx); return perf_stat__get_aggr(config, perf_stat__get_core, map, idx);
} }
static int perf_stat_init_aggr_mode(void) static int perf_stat_init_aggr_mode(void)
@ -1999,18 +2001,18 @@ static int perf_stat_init_aggr_mode(void)
switch (stat_config.aggr_mode) { switch (stat_config.aggr_mode) {
case AGGR_SOCKET: case AGGR_SOCKET:
if (cpu_map__build_socket_map(evsel_list->cpus, &aggr_map)) { if (cpu_map__build_socket_map(evsel_list->cpus, &stat_config.aggr_map)) {
perror("cannot build socket map"); perror("cannot build socket map");
return -1; return -1;
} }
aggr_get_id = perf_stat__get_socket_cached; stat_config.aggr_get_id = perf_stat__get_socket_cached;
break; break;
case AGGR_CORE: case AGGR_CORE:
if (cpu_map__build_core_map(evsel_list->cpus, &aggr_map)) { if (cpu_map__build_core_map(evsel_list->cpus, &stat_config.aggr_map)) {
perror("cannot build core map"); perror("cannot build core map");
return -1; return -1;
} }
aggr_get_id = perf_stat__get_core_cached; stat_config.aggr_get_id = perf_stat__get_core_cached;
break; break;
case AGGR_NONE: case AGGR_NONE:
case AGGR_GLOBAL: case AGGR_GLOBAL:
@ -2026,16 +2028,16 @@ static int perf_stat_init_aggr_mode(void)
* the aggregation translate cpumap. * the aggregation translate cpumap.
*/ */
nr = cpu_map__get_max(evsel_list->cpus); nr = cpu_map__get_max(evsel_list->cpus);
cpus_aggr_map = cpu_map__empty_new(nr + 1); stat_config.cpus_aggr_map = cpu_map__empty_new(nr + 1);
return cpus_aggr_map ? 0 : -ENOMEM; return stat_config.cpus_aggr_map ? 0 : -ENOMEM;
} }
static void perf_stat__exit_aggr_mode(void) static void perf_stat__exit_aggr_mode(void)
{ {
cpu_map__put(aggr_map); cpu_map__put(stat_config.aggr_map);
cpu_map__put(cpus_aggr_map); cpu_map__put(stat_config.cpus_aggr_map);
aggr_map = NULL; stat_config.aggr_map = NULL;
cpus_aggr_map = NULL; stat_config.cpus_aggr_map = NULL;
} }
static inline int perf_env__get_cpu(struct perf_env *env, struct cpu_map *map, int idx) static inline int perf_env__get_cpu(struct perf_env *env, struct cpu_map *map, int idx)
@ -2093,12 +2095,14 @@ static int perf_env__build_core_map(struct perf_env *env, struct cpu_map *cpus,
return cpu_map__build_map(cpus, corep, perf_env__get_core, env); return cpu_map__build_map(cpus, corep, perf_env__get_core, env);
} }
static int perf_stat__get_socket_file(struct cpu_map *map, int idx) static int perf_stat__get_socket_file(struct perf_stat_config *config __maybe_unused,
struct cpu_map *map, int idx)
{ {
return perf_env__get_socket(map, idx, &perf_stat.session->header.env); return perf_env__get_socket(map, idx, &perf_stat.session->header.env);
} }
static int perf_stat__get_core_file(struct cpu_map *map, int idx) static int perf_stat__get_core_file(struct perf_stat_config *config __maybe_unused,
struct cpu_map *map, int idx)
{ {
return perf_env__get_core(map, idx, &perf_stat.session->header.env); return perf_env__get_core(map, idx, &perf_stat.session->header.env);
} }
@ -2109,18 +2113,18 @@ static int perf_stat_init_aggr_mode_file(struct perf_stat *st)
switch (stat_config.aggr_mode) { switch (stat_config.aggr_mode) {
case AGGR_SOCKET: case AGGR_SOCKET:
if (perf_env__build_socket_map(env, evsel_list->cpus, &aggr_map)) { if (perf_env__build_socket_map(env, evsel_list->cpus, &stat_config.aggr_map)) {
perror("cannot build socket map"); perror("cannot build socket map");
return -1; return -1;
} }
aggr_get_id = perf_stat__get_socket_file; stat_config.aggr_get_id = perf_stat__get_socket_file;
break; break;
case AGGR_CORE: case AGGR_CORE:
if (perf_env__build_core_map(env, evsel_list->cpus, &aggr_map)) { if (perf_env__build_core_map(env, evsel_list->cpus, &stat_config.aggr_map)) {
perror("cannot build core map"); perror("cannot build core map");
return -1; return -1;
} }
aggr_get_id = perf_stat__get_core_file; stat_config.aggr_get_id = perf_stat__get_core_file;
break; break;
case AGGR_NONE: case AGGR_NONE:
case AGGR_GLOBAL: case AGGR_GLOBAL:

6
tools/perf/util/stat.h
View File

@ -90,6 +90,9 @@ struct runtime_stat {
struct rblist value_list; struct rblist value_list;
}; };
typedef int (*aggr_get_id_t)(struct perf_stat_config *config,
struct cpu_map *m, int cpu);
struct perf_stat_config { struct perf_stat_config {
enum aggr_mode aggr_mode; enum aggr_mode aggr_mode;
bool scale; bool scale;
@ -115,6 +118,9 @@ struct perf_stat_config {
const char *csv_sep; const char *csv_sep;
struct stats *walltime_nsecs_stats; struct stats *walltime_nsecs_stats;
struct rusage ru_data; struct rusage ru_data;
struct cpu_map *aggr_map;
aggr_get_id_t aggr_get_id;
struct cpu_map *cpus_aggr_map;
}; };
void update_stats(struct stats *stats, u64 val); void update_stats(struct stats *stats, u64 val);