From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754761AbbKHH2r (ORCPT ); Sun, 8 Nov 2015 02:28:47 -0500 Received: from terminus.zytor.com ([198.137.202.10]:45926 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752691AbbKHH2o (ORCPT ); Sun, 8 Nov 2015 02:28:44 -0500 Date: Sat, 7 Nov 2015 23:28:31 -0800 From: tip-bot for Andi Kleen Message-ID: Cc: acme@redhat.com, jolsa@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, ak@linux.intel.com, hpa@zytor.com Reply-To: mingo@kernel.org, ak@linux.intel.com, hpa@zytor.com, acme@redhat.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de In-Reply-To: <1446515428-7450-2-git-send-email-andi@firstfloor.org> References: <1446515428-7450-2-git-send-email-andi@firstfloor.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf stat: Move sw clock metrics printout to stat-shadow Git-Commit-ID: 4579ecc8b3e0c611b5c8f6ca7f7b07d1412d8a7b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4579ecc8b3e0c611b5c8f6ca7f7b07d1412d8a7b Gitweb: http://git.kernel.org/tip/4579ecc8b3e0c611b5c8f6ca7f7b07d1412d8a7b Author: Andi Kleen AuthorDate: Mon, 2 Nov 2015 17:50:20 -0800 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 4 Nov 2015 15:11:41 -0300 perf stat: Move sw clock metrics printout to stat-shadow The sw clock metrics printing was missed in the earlier move to stat-shadow of all the other metric printouts. Move it too. v2: Fix metrics printing in this version to make bisect safe. Signed-off-by: Andi Kleen Acked-by: Jiri Olsa Link: http://lkml.kernel.org/r/1446515428-7450-2-git-send-email-andi@firstfloor.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-stat.c | 8 +++----- tools/perf/util/stat-shadow.c | 5 +++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 2f438f7..8a78895 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -493,6 +493,7 @@ static void nsec_printout(int id, int nr, struct perf_evsel *evsel, double avg) double msecs = avg / 1e6; const char *fmt_v, *fmt_n; char name[25]; + int cpu = cpu_map__id_to_cpu(id); fmt_v = csv_output ? "%.6f%s" : "%18.6f%s"; fmt_n = csv_output ? "%s" : "%-25s"; @@ -517,11 +518,8 @@ static void nsec_printout(int id, int nr, struct perf_evsel *evsel, double avg) 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, " "); + perf_stat__print_shadow_stats(output, evsel, avg, cpu, + stat_config.aggr_mode); } 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..6ac0314 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -413,6 +413,11 @@ 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)) { + if ((ratio = avg_stats(&walltime_nsecs_stats)) != 0) + fprintf(out, " # %8.3f CPUs utilized ", avg / ratio); + else + fprintf(out, " "); } else if (runtime_nsecs_stats[cpu].n != 0) { char unit = 'M';