|
@@ -848,7 +848,7 @@ static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg)
|
|
|
}
|
|
|
|
|
|
static void printout(int id, int nr, struct perf_evsel *counter, double uval,
|
|
|
- char *prefix)
|
|
|
+ char *prefix, u64 run, u64 ena, double noise)
|
|
|
{
|
|
|
struct perf_stat_output_ctx out;
|
|
|
struct outstate os = {
|
|
@@ -860,6 +860,30 @@ static void printout(int id, int nr, struct perf_evsel *counter, double uval,
|
|
|
|
|
|
nl = new_line_std;
|
|
|
|
|
|
+ if (run == 0 || ena == 0) {
|
|
|
+ aggr_printout(counter, id, nr);
|
|
|
+
|
|
|
+ fprintf(stat_config.output, "%*s%s",
|
|
|
+ csv_output ? 0 : 18,
|
|
|
+ counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED,
|
|
|
+ csv_sep);
|
|
|
+
|
|
|
+ fprintf(stat_config.output, "%-*s%s",
|
|
|
+ csv_output ? 0 : unit_width,
|
|
|
+ counter->unit, csv_sep);
|
|
|
+
|
|
|
+ fprintf(stat_config.output, "%*s",
|
|
|
+ csv_output ? 0 : -25,
|
|
|
+ perf_evsel__name(counter));
|
|
|
+
|
|
|
+ if (counter->cgrp)
|
|
|
+ fprintf(stat_config.output, "%s%s",
|
|
|
+ csv_sep, counter->cgrp->name);
|
|
|
+
|
|
|
+ print_running(run, ena);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
if (nsec_counter(counter))
|
|
|
nsec_printout(id, nr, counter, uval);
|
|
|
else
|
|
@@ -874,6 +898,9 @@ static void printout(int id, int nr, struct perf_evsel *counter, double uval,
|
|
|
stat_config.aggr_mode == AGGR_GLOBAL ? 0 :
|
|
|
cpu_map__id_to_cpu(id),
|
|
|
&out);
|
|
|
+
|
|
|
+ print_noise(counter, noise);
|
|
|
+ print_running(run, ena);
|
|
|
}
|
|
|
|
|
|
static void print_aggr(char *prefix)
|
|
@@ -904,36 +931,8 @@ static void print_aggr(char *prefix)
|
|
|
if (prefix)
|
|
|
fprintf(output, "%s", prefix);
|
|
|
|
|
|
- if (run == 0 || ena == 0) {
|
|
|
- aggr_printout(counter, id, nr);
|
|
|
-
|
|
|
- fprintf(output, "%*s%s",
|
|
|
- csv_output ? 0 : 18,
|
|
|
- counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED,
|
|
|
- csv_sep);
|
|
|
-
|
|
|
- fprintf(output, "%-*s%s",
|
|
|
- csv_output ? 0 : unit_width,
|
|
|
- counter->unit, csv_sep);
|
|
|
-
|
|
|
- fprintf(output, "%*s",
|
|
|
- csv_output ? 0 : -25,
|
|
|
- perf_evsel__name(counter));
|
|
|
-
|
|
|
- if (counter->cgrp)
|
|
|
- fprintf(output, "%s%s",
|
|
|
- csv_sep, counter->cgrp->name);
|
|
|
-
|
|
|
- print_running(run, ena);
|
|
|
- fputc('\n', output);
|
|
|
- continue;
|
|
|
- }
|
|
|
uval = val * counter->scale;
|
|
|
- printout(id, nr, counter, uval, prefix);
|
|
|
- if (!csv_output)
|
|
|
- print_noise(counter, 1.0);
|
|
|
-
|
|
|
- print_running(run, ena);
|
|
|
+ printout(id, nr, counter, uval, prefix, run, ena, 1.0);
|
|
|
fputc('\n', output);
|
|
|
}
|
|
|
}
|
|
@@ -960,12 +959,7 @@ static void print_aggr_thread(struct perf_evsel *counter, char *prefix)
|
|
|
fprintf(output, "%s", prefix);
|
|
|
|
|
|
uval = val * counter->scale;
|
|
|
- printout(thread, 0, counter, uval, prefix);
|
|
|
-
|
|
|
- if (!csv_output)
|
|
|
- print_noise(counter, 1.0);
|
|
|
-
|
|
|
- print_running(run, ena);
|
|
|
+ printout(thread, 0, counter, uval, prefix, run, ena, 1.0);
|
|
|
fputc('\n', output);
|
|
|
}
|
|
|
}
|
|
@@ -979,7 +973,6 @@ static void print_counter_aggr(struct perf_evsel *counter, char *prefix)
|
|
|
FILE *output = stat_config.output;
|
|
|
struct perf_stat_evsel *ps = counter->priv;
|
|
|
double avg = avg_stats(&ps->res_stats[0]);
|
|
|
- int scaled = counter->counts->scaled;
|
|
|
double uval;
|
|
|
double avg_enabled, avg_running;
|
|
|
|
|
@@ -989,32 +982,8 @@ static void print_counter_aggr(struct perf_evsel *counter, char *prefix)
|
|
|
if (prefix)
|
|
|
fprintf(output, "%s", prefix);
|
|
|
|
|
|
- if (scaled == -1 || !counter->supported) {
|
|
|
- fprintf(output, "%*s%s",
|
|
|
- csv_output ? 0 : 18,
|
|
|
- counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED,
|
|
|
- csv_sep);
|
|
|
- fprintf(output, "%-*s%s",
|
|
|
- csv_output ? 0 : unit_width,
|
|
|
- counter->unit, csv_sep);
|
|
|
- fprintf(output, "%*s",
|
|
|
- csv_output ? 0 : -25,
|
|
|
- perf_evsel__name(counter));
|
|
|
-
|
|
|
- if (counter->cgrp)
|
|
|
- fprintf(output, "%s%s", csv_sep, counter->cgrp->name);
|
|
|
-
|
|
|
- print_running(avg_running, avg_enabled);
|
|
|
- fputc('\n', output);
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
uval = avg * counter->scale;
|
|
|
- printout(-1, 0, counter, uval, prefix);
|
|
|
-
|
|
|
- print_noise(counter, avg);
|
|
|
-
|
|
|
- print_running(avg_running, avg_enabled);
|
|
|
+ printout(-1, 0, counter, uval, prefix, avg_running, avg_enabled, avg);
|
|
|
fprintf(output, "\n");
|
|
|
}
|
|
|
|
|
@@ -1037,36 +1006,8 @@ static void print_counter(struct perf_evsel *counter, char *prefix)
|
|
|
if (prefix)
|
|
|
fprintf(output, "%s", prefix);
|
|
|
|
|
|
- if (run == 0 || ena == 0) {
|
|
|
- fprintf(output, "CPU%*d%s%*s%s",
|
|
|
- csv_output ? 0 : -4,
|
|
|
- perf_evsel__cpus(counter)->map[cpu], csv_sep,
|
|
|
- csv_output ? 0 : 18,
|
|
|
- counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED,
|
|
|
- csv_sep);
|
|
|
-
|
|
|
- fprintf(output, "%-*s%s",
|
|
|
- csv_output ? 0 : unit_width,
|
|
|
- counter->unit, csv_sep);
|
|
|
-
|
|
|
- fprintf(output, "%*s",
|
|
|
- csv_output ? 0 : -25,
|
|
|
- perf_evsel__name(counter));
|
|
|
-
|
|
|
- if (counter->cgrp)
|
|
|
- fprintf(output, "%s%s",
|
|
|
- csv_sep, counter->cgrp->name);
|
|
|
-
|
|
|
- print_running(run, ena);
|
|
|
- fputc('\n', output);
|
|
|
- continue;
|
|
|
- }
|
|
|
-
|
|
|
uval = val * counter->scale;
|
|
|
- printout(cpu, 0, counter, uval, prefix);
|
|
|
- if (!csv_output)
|
|
|
- print_noise(counter, 1.0);
|
|
|
- print_running(run, ena);
|
|
|
+ printout(cpu, 0, counter, uval, prefix, run, ena, 1.0);
|
|
|
|
|
|
fputc('\n', output);
|
|
|
}
|