Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1217921 > unrolled thread

[PATCH 1/9] perf, tools, stat: Move sw clock metrics printout to stat-shadow

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 1/9] perf, tools, stat: Move sw clock metrics printout to stat-shadow Andi Kleen <andi@firstfloor.org> - 2015-09-03 01:40 +0200
    Re: [PATCH 1/9] perf, tools, stat: Move sw clock metrics printout to  stat-shadow Jiri Olsa <jolsa@redhat.com> - 2015-09-04 10:30 +0200

#1217921 — [PATCH 1/9] perf, tools, stat: Move sw clock metrics printout to stat-shadow

From: Andi Kleen <ak@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 <ak@linux.intel.com>
---
 tools/perf/builtin-stat.c     | 9 ---------
 tools/perf/util/stat-shadow.c | 3 +++
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index a96fb5c..77e5781 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -510,15 +510,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..625ab3b 100644
--- a/tools/perf/util/stat-shadow.c
+++ b/tools/perf/util/stat-shadow.c
@@ -413,6 +413,9 @@ 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(out, " # %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 majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1218759 — Re: [PATCH 1/9] perf, tools, stat: Move sw clock metrics printout to stat-shadow

On Wed, Sep 02, 2015 at 04:35:46PM -0700, Andi Kleen wrote:
> From: Andi Kleen <ak@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 <ak@linux.intel.com>
> ---
>  tools/perf/builtin-stat.c     | 9 ---------
>  tools/perf/util/stat-shadow.c | 3 +++
>  2 files changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
> index a96fb5c..77e5781 100644
> --- a/tools/perf/builtin-stat.c
> +++ b/tools/perf/builtin-stat.c
> @@ -510,15 +510,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..625ab3b 100644
> --- a/tools/perf/util/stat-shadow.c
> +++ b/tools/perf/util/stat-shadow.c
> @@ -413,6 +413,9 @@ 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(out, " # %8.3f CPUs utilized          ", avg / ratio);

perf_stat__print_shadow_stats is at this point called only from
abs_printout, while this is nsec_printout.. but it's all factored
later, so I believe this is ok for now

Acked-by: Jiri Olsa <jolsa@kernel.org>

thanks,
jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web