From: tip-bot for Andi Kleen <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:perf/urgent] perf stat: Move sw clock metrics printout to stat-shadow
Date: Sat, 7 Nov 2015 23:28:31 -0800 [thread overview]
Message-ID: <tip-4579ecc8b3e0c611b5c8f6ca7f7b07d1412d8a7b@git.kernel.org> (raw)
In-Reply-To: <1446515428-7450-2-git-send-email-andi@firstfloor.org>
Commit-ID: 4579ecc8b3e0c611b5c8f6ca7f7b07d1412d8a7b
Gitweb: http://git.kernel.org/tip/4579ecc8b3e0c611b5c8f6ca7f7b07d1412d8a7b
Author: Andi Kleen <ak@linux.intel.com>
AuthorDate: Mon, 2 Nov 2015 17:50:20 -0800
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
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 <ak@linux.intel.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/1446515428-7450-2-git-send-email-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
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';
next prev parent reply other threads:[~2015-11-08 7:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-03 1:50 perf, tools: Refactor and support interval and CSV metrics v6 Andi Kleen
2015-11-03 1:50 ` [PATCH 1/9] perf, tools, stat: Move sw clock metrics printout to stat-shadow Andi Kleen
2015-11-04 8:15 ` Jiri Olsa
2015-11-08 7:28 ` tip-bot for Andi Kleen [this message]
2015-11-03 1:50 ` [PATCH 2/9] tools, perf, stat: Use common printout faction to avoid duplicated code Andi Kleen
2015-11-04 8:15 ` Jiri Olsa
2015-11-08 7:28 ` [tip:perf/urgent] perf stat: Use common printout function " tip-bot for Andi Kleen
2015-11-03 1:50 ` [PATCH 3/9] perf, tools, stat: Abstract stat metrics printing Andi Kleen
2015-11-04 8:34 ` Jiri Olsa
2015-11-04 8:42 ` Jiri Olsa
2015-11-05 2:43 ` Andi Kleen
2015-11-05 6:52 ` Jiri Olsa
2015-11-05 15:20 ` Andi Kleen
2015-11-03 1:50 ` [PATCH 4/9] perf, tools, stat: Add support for metrics in interval mode Andi Kleen
2015-11-03 1:50 ` [PATCH 5/9] perf, tools, stat: Move noise/running printing into printout Andi Kleen
2015-11-04 8:48 ` Jiri Olsa
2015-11-03 1:50 ` [PATCH 6/9] perf, tools, stat: Implement CSV metrics output Andi Kleen
2015-11-03 1:50 ` [PATCH 7/9] perf, tools, stat: Move non counting counter printing to printout Andi Kleen
2015-11-03 1:50 ` [PATCH 8/9] perf, tools: Support metrics in --per-core/socket mode Andi Kleen
2015-11-03 1:50 ` [PATCH 9/9] perf, tools, stat: Document CSV format in manpage Andi Kleen
2015-11-03 7:46 ` perf, tools: Refactor and support interval and CSV metrics v6 Jiri Olsa
2015-11-05 2:43 ` Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-4579ecc8b3e0c611b5c8f6ca7f7b07d1412d8a7b@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=ak@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).