Re: [PATCH 1/7] perf, tools, stat: Move sw clock metrics printout to stat-shadow
On Fri, Aug 07, 2015 at 05:51:53PM -0700, Andi Kleen wrote: > From: Andi Kleen > > The sw clock metrics printing was missed in the earlier move to > stat-shadow of all the other metric printouts. Move it too. > > Signed-off-by: Andi Kleen > --- > tools/perf/builtin-stat.c | 9 - > tools/perf/util/stat-shadow.c | 4 > 2 files changed, 4 insertions(+), 9 deletions(-) > > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > index a054ddc..fac0c50 100644 > --- a/tools/perf/builtin-stat.c > +++ b/tools/perf/builtin-stat.c > @@ -509,15 +509,6 @@ static void nsec_printout(int id, int nr, struct > perf_evsel *evsel, double avg) > > if (evsel->cgrp) > fprintf(output, "%s%s", csv_sep, evsel->cgrp->name); > - > - if (csv_output || stat_config.interval) > - return; > - > - if (perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK)) > - fprintf(output, " # %8.3f CPUs utilized ", > - avg / avg_stats(_nsecs_stats)); > - else > - fprintf(output, " "); > } > > static void abs_printout(int id, int nr, struct perf_evsel *evsel, double > avg) > diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c > index 2a5d8d7..fc970db 100644 > --- a/tools/perf/util/stat-shadow.c > +++ b/tools/perf/util/stat-shadow.c > @@ -413,6 +413,10 @@ void perf_stat__print_shadow_stats(FILE *out, struct > perf_evsel *evsel, > ratio = total / avg; > > fprintf(out, " # %8.0f cycles / elision ", ratio); > + } else if (perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK) && > +(ratio = avg_stats(_nsecs_stats)) != 0) { > + fprintf(output, " # %8.3f CPUs utilized ", > + avg / ratio); s/output/out/ CC util/stat-shadow.o util/stat-shadow.c: In function ‘perf_stat__print_shadow_stats’: util/stat-shadow.c:418:11: error: ‘output’ undeclared (first use in this function) fprintf(output, " # %8.3f CPUs utilized ", jirka -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 1/7] perf, tools, stat: Move sw clock metrics printout to stat-shadow
On Fri, Aug 07, 2015 at 05:51:53PM -0700, Andi Kleen wrote: From: Andi Kleen a...@linux.intel.com The sw clock metrics printing was missed in the earlier move to stat-shadow of all the other metric printouts. Move it too. Signed-off-by: Andi Kleen a...@linux.intel.com --- tools/perf/builtin-stat.c | 9 - tools/perf/util/stat-shadow.c | 4 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index a054ddc..fac0c50 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -509,15 +509,6 @@ static void nsec_printout(int id, int nr, struct perf_evsel *evsel, double avg) if (evsel-cgrp) fprintf(output, %s%s, csv_sep, evsel-cgrp-name); - - if (csv_output || stat_config.interval) - return; - - if (perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK)) - fprintf(output, # %8.3f CPUs utilized , - avg / avg_stats(walltime_nsecs_stats)); - else - fprintf(output,); } static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg) diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index 2a5d8d7..fc970db 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -413,6 +413,10 @@ void perf_stat__print_shadow_stats(FILE *out, struct perf_evsel *evsel, ratio = total / avg; fprintf(out, # %8.0f cycles / elision , ratio); + } else if (perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK) +(ratio = avg_stats(walltime_nsecs_stats)) != 0) { + fprintf(output, # %8.3f CPUs utilized , + avg / ratio); s/output/out/ CC util/stat-shadow.o util/stat-shadow.c: In function ‘perf_stat__print_shadow_stats’: util/stat-shadow.c:418:11: error: ‘output’ undeclared (first use in this function) fprintf(output, # %8.3f CPUs utilized , jirka -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 1/7] perf, tools, stat: Move sw clock metrics printout to stat-shadow
From: Andi Kleen The sw clock metrics printing was missed in the earlier move to stat-shadow of all the other metric printouts. Move it too. Signed-off-by: Andi Kleen --- tools/perf/builtin-stat.c | 9 - tools/perf/util/stat-shadow.c | 4 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index a054ddc..fac0c50 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -509,15 +509,6 @@ static void nsec_printout(int id, int nr, struct perf_evsel *evsel, double avg) if (evsel->cgrp) fprintf(output, "%s%s", csv_sep, evsel->cgrp->name); - - if (csv_output || stat_config.interval) - return; - - if (perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK)) - fprintf(output, " # %8.3f CPUs utilized ", - avg / avg_stats(_nsecs_stats)); - else - fprintf(output, " "); } static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg) diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index 2a5d8d7..fc970db 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -413,6 +413,10 @@ void perf_stat__print_shadow_stats(FILE *out, struct perf_evsel *evsel, ratio = total / avg; fprintf(out, " # %8.0f cycles / elision ", ratio); + } else if (perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK) && + (ratio = avg_stats(_nsecs_stats)) != 0) { + fprintf(output, " # %8.3f CPUs utilized ", +avg / ratio); } else if (runtime_nsecs_stats[cpu].n != 0) { char unit = 'M'; -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 1/7] perf, tools, stat: Move sw clock metrics printout to stat-shadow
From: Andi Kleen a...@linux.intel.com The sw clock metrics printing was missed in the earlier move to stat-shadow of all the other metric printouts. Move it too. Signed-off-by: Andi Kleen a...@linux.intel.com --- tools/perf/builtin-stat.c | 9 - tools/perf/util/stat-shadow.c | 4 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index a054ddc..fac0c50 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -509,15 +509,6 @@ static void nsec_printout(int id, int nr, struct perf_evsel *evsel, double avg) if (evsel-cgrp) fprintf(output, %s%s, csv_sep, evsel-cgrp-name); - - if (csv_output || stat_config.interval) - return; - - if (perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK)) - fprintf(output, # %8.3f CPUs utilized , - avg / avg_stats(walltime_nsecs_stats)); - else - fprintf(output,); } static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg) diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index 2a5d8d7..fc970db 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -413,6 +413,10 @@ void perf_stat__print_shadow_stats(FILE *out, struct perf_evsel *evsel, ratio = total / avg; fprintf(out, # %8.0f cycles / elision , ratio); + } else if (perf_evsel__match(evsel, SOFTWARE, SW_TASK_CLOCK) + (ratio = avg_stats(walltime_nsecs_stats)) != 0) { + fprintf(output, # %8.3f CPUs utilized , +avg / ratio); } else if (runtime_nsecs_stats[cpu].n != 0) { char unit = 'M'; -- 2.4.3 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/