From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, eranian@google.com, mingo@kernel.org,
linux-kernel@vger.kernel.org, Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 8/8] perf, tools: Add --metric-only support for -A
Date: Sat, 30 Jan 2016 09:06:56 -0800 [thread overview]
Message-ID: <1454173616-17710-9-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1454173616-17710-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Add metric only support for -A too. This requires a new print
function that prints the metrics in the right order.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/builtin-stat.c | 48 +++++++++++++++++++++++++++++++++++++++--------
1 file changed, 40 insertions(+), 8 deletions(-)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 7909129..91ca8af 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1238,10 +1238,43 @@ static void print_counter(struct perf_evsel *counter, char *prefix)
}
}
+static void print_no_aggr_metric(char *prefix)
+{
+ int cpu;
+ int nrcpus = 0;
+ struct perf_evsel *counter;
+ u64 ena, run, val;
+ double uval;
+
+ evlist__for_each(evsel_list, counter) {
+ nrcpus = perf_evsel__nr_cpus(counter);
+ break;
+ }
+ for (cpu = 0; cpu < nrcpus; cpu++) {
+ bool first = true;
+
+ if (prefix)
+ fputs(prefix, stat_config.output);
+ evlist__for_each(evsel_list, counter) {
+ if (first) {
+ aggr_printout(counter, cpu, 0);
+ first = false;
+ }
+ val = perf_counts(counter->counts, cpu, 0)->val;
+ ena = perf_counts(counter->counts, cpu, 0)->ena;
+ run = perf_counts(counter->counts, cpu, 0)->run;
+
+ uval = val * counter->scale;
+ printout(cpu, 0, counter, uval, prefix, run, ena, 1.0);
+ }
+ fputc('\n', stat_config.output);
+ }
+}
+
static int aggr_header_lens[] = {
[AGGR_CORE] = 18,
[AGGR_SOCKET] = 12,
- [AGGR_NONE] = 15,
+ [AGGR_NONE] = 6,
[AGGR_THREAD] = 24,
[AGGR_GLOBAL] = 0,
};
@@ -1396,8 +1429,12 @@ static void print_counters(struct timespec *ts, int argc, const char **argv)
fputc('\n', stat_config.output);
break;
case AGGR_NONE:
- evlist__for_each(evsel_list, counter)
- print_counter(counter, prefix);
+ if (metric_only)
+ print_no_aggr_metric(prefix);
+ else {
+ evlist__for_each(evsel_list, counter)
+ print_counter(counter, prefix);
+ }
break;
case AGGR_UNSET:
default:
@@ -2146,11 +2183,6 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused)
goto out;
}
- if (metric_only && stat_config.aggr_mode == AGGR_NONE) {
- fprintf(stderr, "--metric-only is not supported with -A\n");
- goto out;
- }
-
if (metric_only && run_count > 1) {
fprintf(stderr, "--metric-only is not supported with -r\n");
goto out;
--
2.4.3
next prev parent reply other threads:[~2016-01-30 17:08 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-30 17:06 perf, tools: Refactor and support interval and CSV metrics Andi Kleen
2016-01-30 17:06 ` [PATCH 1/8] perf, tools, stat: Abstract stat metrics printing Andi Kleen
2016-02-16 19:33 ` Arnaldo Carvalho de Melo
2016-02-17 12:09 ` [tip:perf/core] perf " tip-bot for Andi Kleen
2016-01-30 17:06 ` [PATCH 2/8] perf, tools, stat: Add support for metrics in interval mode Andi Kleen
2016-02-16 19:57 ` Arnaldo Carvalho de Melo
2016-02-17 12:09 ` [tip:perf/core] perf " tip-bot for Andi Kleen
2016-01-30 17:06 ` [PATCH 3/8] perf, tools, stat: Move noise/running printing into printout Andi Kleen
2016-02-16 20:02 ` Arnaldo Carvalho de Melo
2016-02-17 19:27 ` Andi Kleen
2016-02-17 12:10 ` [tip:perf/core] perf stat: Move noise/ running " tip-bot for Andi Kleen
2016-01-30 17:06 ` [PATCH 4/8] perf, tools, stat: Implement CSV metrics output Andi Kleen
2016-02-02 9:50 ` Jiri Olsa
2016-02-02 14:02 ` Andi Kleen
2016-01-30 17:06 ` [PATCH 5/8] perf, tools, stat: Support metrics in --per-core/socket mode Andi Kleen
2016-01-30 17:06 ` [PATCH 6/8] perf, tools, stat: Document CSV format in manpage Andi Kleen
2016-01-30 17:06 ` [PATCH 7/8] perf, tools, stat: Implement --metric-only mode Andi Kleen
2016-01-30 17:06 ` Andi Kleen [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-01-27 0:42 perf, tools: Refactor and support interval and CSV metrics Andi Kleen
2016-01-27 0:42 ` [PATCH 8/8] perf, tools: Add --metric-only support for -A 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=1454173616-17710-9-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=eranian@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
/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).