hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

perf stat: Factor out callback for collecting event values 

To be used in next patch to support automatic summing of alias events.

v2: Move check for bad results to next patch
v3: Remove trivial addition.
v4: Use perf_evsel__cpus instead of evsel->cpus

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/20170320201711.14142-2-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Andi Kleen 2017-03-20 13:16:59 -07:00 committed by Arnaldo Carvalho de Melo
parent ed7b339fb5
commit fbe51fba82
1 changed files with 80 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1182,11 +1182,46 @@ static void aggr_update_shadow(void)
} }
} }
static void collect_data(struct perf_evsel *counter,
void (*cb)(struct perf_evsel *counter, void *data,
bool first),
void *data)
{
cb(counter, data, true);
}
struct aggr_data {
u64 ena, run, val;
int id;
int nr;
int cpu;
};
static void aggr_cb(struct perf_evsel *counter, void *data, bool first)
{
struct aggr_data *ad = data;
int cpu, s2;
for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) {
struct perf_counts_values *counts;
s2 = aggr_get_id(perf_evsel__cpus(counter), cpu);
if (s2 != ad->id)
continue;
if (first)
ad->nr++;
counts = perf_counts(counter->counts, cpu, 0);
ad->val += counts->val;
ad->ena += counts->ena;
ad->run += counts->run;
}
}
static void print_aggr(char *prefix) static void print_aggr(char *prefix)
{ {
FILE *output = stat_config.output; FILE *output = stat_config.output;
struct perf_evsel *counter; struct perf_evsel *counter;
int cpu, s, s2, id, nr; int s, id, nr;
double uval; double uval;
u64 ena, run, val; u64 ena, run, val;
bool first; bool first;
@ -1201,23 +1236,20 @@ static void print_aggr(char *prefix)
* 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 < aggr_map->nr; s++) {
struct aggr_data ad;
if (prefix && metric_only) if (prefix && metric_only)
fprintf(output, "%s", prefix); fprintf(output, "%s", prefix);
id = aggr_map->map[s]; ad.id = id = aggr_map->map[s];
first = true; first = true;
evlist__for_each_entry(evsel_list, counter) { evlist__for_each_entry(evsel_list, counter) {
val = ena = run = 0; ad.val = ad.ena = ad.run = 0;
nr = 0; ad.nr = 0;
for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) { collect_data(counter, aggr_cb, &ad);
s2 = aggr_get_id(perf_evsel__cpus(counter), cpu); nr = ad.nr;
if (s2 != id) ena = ad.ena;
continue; run = ad.run;
val += perf_counts(counter->counts, cpu, 0)->val; val = ad.val;
ena += perf_counts(counter->counts, cpu, 0)->ena;
run += perf_counts(counter->counts, cpu, 0)->run;
nr++;
}
if (first && metric_only) { if (first && metric_only) {
first = false; first = false;
aggr_printout(counter, id, nr); aggr_printout(counter, id, nr);
@ -1261,6 +1293,21 @@ static void print_aggr_thread(struct perf_evsel *counter, char *prefix)
} }
} }
struct caggr_data {
double avg, avg_enabled, avg_running;
};
static void counter_aggr_cb(struct perf_evsel *counter, void *data,
bool first __maybe_unused)
{
struct caggr_data *cd = data;
struct perf_stat_evsel *ps = counter->priv;
cd->avg += avg_stats(&ps->res_stats[0]);
cd->avg_enabled += avg_stats(&ps->res_stats[1]);
cd->avg_running += avg_stats(&ps->res_stats[2]);
}
/* /*
* Print out the results of a single counter: * Print out the results of a single counter:
* aggregated counts in system-wide mode * aggregated counts in system-wide mode
@ -1268,23 +1315,30 @@ static void print_aggr_thread(struct perf_evsel *counter, char *prefix)
static void print_counter_aggr(struct perf_evsel *counter, char *prefix) static void print_counter_aggr(struct perf_evsel *counter, char *prefix)
{ {
FILE *output = stat_config.output; FILE *output = stat_config.output;
struct perf_stat_evsel *ps = counter->priv;
double avg = avg_stats(&ps->res_stats[0]);
double uval; double uval;
double avg_enabled, avg_running; struct caggr_data cd = { .avg = 0.0 };
avg_enabled = avg_stats(&ps->res_stats[1]); collect_data(counter, counter_aggr_cb, &cd);
avg_running = avg_stats(&ps->res_stats[2]);
if (prefix && !metric_only) if (prefix && !metric_only)
fprintf(output, "%s", prefix); fprintf(output, "%s", prefix);
uval = avg * counter->scale; uval = cd.avg * counter->scale;
printout(-1, 0, counter, uval, prefix, avg_running, avg_enabled, avg); printout(-1, 0, counter, uval, prefix, cd.avg_running, cd.avg_enabled, cd.avg);
if (!metric_only) if (!metric_only)
fprintf(output, "\n"); fprintf(output, "\n");
} }
static void counter_cb(struct perf_evsel *counter, void *data,
bool first __maybe_unused)
{
struct aggr_data *ad = data;
ad->val += perf_counts(counter->counts, ad->cpu, 0)->val;
ad->ena += perf_counts(counter->counts, ad->cpu, 0)->ena;
ad->run += perf_counts(counter->counts, ad->cpu, 0)->run;
}
/* /*
* Print out the results of a single counter: * Print out the results of a single counter:
* does not use aggregated count in system-wide * does not use aggregated count in system-wide
@ -1297,9 +1351,12 @@ static void print_counter(struct perf_evsel *counter, char *prefix)
int cpu; int cpu;
for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) { for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) {
val = perf_counts(counter->counts, cpu, 0)->val; struct aggr_data ad = { .cpu = cpu };
ena = perf_counts(counter->counts, cpu, 0)->ena;
run = perf_counts(counter->counts, cpu, 0)->run; collect_data(counter, counter_cb, &ad);
val = ad.val;
ena = ad.ena;
run = ad.run;
if (prefix) if (prefix)
fprintf(output, "%s", prefix); fprintf(output, "%s", prefix);