From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946584AbbHHAwJ (ORCPT ); Fri, 7 Aug 2015 20:52:09 -0400 Received: from mga03.intel.com ([134.134.136.65]:14206 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946491AbbHHAwH (ORCPT ); Fri, 7 Aug 2015 20:52:07 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,632,1432623600"; d="scan'208";a="779232831" From: Andi Kleen To: acme@kernel.org Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org, eranian@google.com, namhyung@kernel.org, Andi Kleen Subject: [PATCH 1/7] perf, tools, stat: Move sw clock metrics printout to stat-shadow Date: Fri, 7 Aug 2015 17:51:53 -0700 Message-Id: <1438995119-10531-2-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1438995119-10531-1-git-send-email-andi@firstfloor.org> References: <1438995119-10531-1-git-send-email-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(&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