From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Paul Mackerras <paulus@samba.org>,
David Ahern <dsahern@gmail.com>,
Namhyung Kim <namhyung@kernel.org>,
Ingo Molnar <mingo@kernel.org>, Andi Kleen <ak@linux.intel.com>,
Stephane Eranian <eranian@google.com>
Subject: [PATCH 7/9] perf stat: Add output file argument to print_shadow_stats function
Date: Tue, 2 Jun 2015 01:00:01 +0200 [thread overview]
Message-ID: <1433199603-20082-8-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1433199603-20082-1-git-send-email-jolsa@kernel.org>
As preparation for moving shadow counters code into its own object.
Link: http://lkml.kernel.org/n/tip-uhx2opot7qtd3xdq9pvx4z8v@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/builtin-stat.c | 112 +++++++++++++++++++++++-----------------------
1 file changed, 56 insertions(+), 56 deletions(-)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index bdcfb29715bb..2e8f24ebc776 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -901,7 +901,7 @@ static const char *get_ratio_color(enum grc_type type, double ratio)
return color;
}
-static void print_stalled_cycles_frontend(int cpu,
+static void print_stalled_cycles_frontend(FILE *out, int cpu,
struct perf_evsel *evsel
__maybe_unused, double avg)
{
@@ -916,12 +916,12 @@ static void print_stalled_cycles_frontend(int cpu,
color = get_ratio_color(GRC_STALLED_CYCLES_FE, ratio);
- fprintf(output, " # ");
- color_fprintf(output, color, "%6.2f%%", ratio);
- fprintf(output, " frontend cycles idle ");
+ fprintf(out, " # ");
+ color_fprintf(out, color, "%6.2f%%", ratio);
+ fprintf(out, " frontend cycles idle ");
}
-static void print_stalled_cycles_backend(int cpu,
+static void print_stalled_cycles_backend(FILE *out, int cpu,
struct perf_evsel *evsel
__maybe_unused, double avg)
{
@@ -936,12 +936,12 @@ static void print_stalled_cycles_backend(int cpu,
color = get_ratio_color(GRC_STALLED_CYCLES_BE, ratio);
- fprintf(output, " # ");
- color_fprintf(output, color, "%6.2f%%", ratio);
- fprintf(output, " backend cycles idle ");
+ fprintf(out, " # ");
+ color_fprintf(out, color, "%6.2f%%", ratio);
+ fprintf(out, " backend cycles idle ");
}
-static void print_branch_misses(int cpu,
+static void print_branch_misses(FILE *out, int cpu,
struct perf_evsel *evsel __maybe_unused,
double avg)
{
@@ -956,12 +956,12 @@ static void print_branch_misses(int cpu,
color = get_ratio_color(GRC_CACHE_MISSES, ratio);
- fprintf(output, " # ");
- color_fprintf(output, color, "%6.2f%%", ratio);
- fprintf(output, " of all branches ");
+ fprintf(out, " # ");
+ color_fprintf(out, color, "%6.2f%%", ratio);
+ fprintf(out, " of all branches ");
}
-static void print_l1_dcache_misses(int cpu,
+static void print_l1_dcache_misses(FILE *out, int cpu,
struct perf_evsel *evsel __maybe_unused,
double avg)
{
@@ -976,12 +976,12 @@ static void print_l1_dcache_misses(int cpu,
color = get_ratio_color(GRC_CACHE_MISSES, ratio);
- fprintf(output, " # ");
- color_fprintf(output, color, "%6.2f%%", ratio);
- fprintf(output, " of all L1-dcache hits ");
+ fprintf(out, " # ");
+ color_fprintf(out, color, "%6.2f%%", ratio);
+ fprintf(out, " of all L1-dcache hits ");
}
-static void print_l1_icache_misses(int cpu,
+static void print_l1_icache_misses(FILE *out, int cpu,
struct perf_evsel *evsel __maybe_unused,
double avg)
{
@@ -996,12 +996,12 @@ static void print_l1_icache_misses(int cpu,
color = get_ratio_color(GRC_CACHE_MISSES, ratio);
- fprintf(output, " # ");
- color_fprintf(output, color, "%6.2f%%", ratio);
- fprintf(output, " of all L1-icache hits ");
+ fprintf(out, " # ");
+ color_fprintf(out, color, "%6.2f%%", ratio);
+ fprintf(out, " of all L1-icache hits ");
}
-static void print_dtlb_cache_misses(int cpu,
+static void print_dtlb_cache_misses(FILE *out, int cpu,
struct perf_evsel *evsel __maybe_unused,
double avg)
{
@@ -1016,12 +1016,12 @@ static void print_dtlb_cache_misses(int cpu,
color = get_ratio_color(GRC_CACHE_MISSES, ratio);
- fprintf(output, " # ");
- color_fprintf(output, color, "%6.2f%%", ratio);
- fprintf(output, " of all dTLB cache hits ");
+ fprintf(out, " # ");
+ color_fprintf(out, color, "%6.2f%%", ratio);
+ fprintf(out, " of all dTLB cache hits ");
}
-static void print_itlb_cache_misses(int cpu,
+static void print_itlb_cache_misses(FILE *out, int cpu,
struct perf_evsel *evsel __maybe_unused,
double avg)
{
@@ -1036,12 +1036,12 @@ static void print_itlb_cache_misses(int cpu,
color = get_ratio_color(GRC_CACHE_MISSES, ratio);
- fprintf(output, " # ");
- color_fprintf(output, color, "%6.2f%%", ratio);
- fprintf(output, " of all iTLB cache hits ");
+ fprintf(out, " # ");
+ color_fprintf(out, color, "%6.2f%%", ratio);
+ fprintf(out, " of all iTLB cache hits ");
}
-static void print_ll_cache_misses(int cpu,
+static void print_ll_cache_misses(FILE *out, int cpu,
struct perf_evsel *evsel __maybe_unused,
double avg)
{
@@ -1056,12 +1056,12 @@ static void print_ll_cache_misses(int cpu,
color = get_ratio_color(GRC_CACHE_MISSES, ratio);
- fprintf(output, " # ");
- color_fprintf(output, color, "%6.2f%%", ratio);
- fprintf(output, " of all LL-cache hits ");
+ fprintf(out, " # ");
+ color_fprintf(out, color, "%6.2f%%", ratio);
+ fprintf(out, " of all LL-cache hits ");
}
-static void print_shadow_stats(struct perf_evsel *evsel, double avg, int cpu)
+static void print_shadow_stats(FILE *out, struct perf_evsel *evsel, double avg, int cpu)
{
double total, ratio = 0.0, total2;
int ctx = evsel_context(evsel);
@@ -1070,59 +1070,59 @@ static void print_shadow_stats(struct perf_evsel *evsel, double avg, int cpu)
total = avg_stats(&runtime_cycles_stats[ctx][cpu]);
if (total) {
ratio = avg / total;
- fprintf(output, " # %5.2f insns per cycle ", ratio);
+ fprintf(out, " # %5.2f insns per cycle ", ratio);
} else {
- fprintf(output, " ");
+ fprintf(out, " ");
}
total = avg_stats(&runtime_stalled_cycles_front_stats[ctx][cpu]);
total = max(total, avg_stats(&runtime_stalled_cycles_back_stats[ctx][cpu]));
if (total && avg) {
ratio = total / avg;
- fprintf(output, "\n");
+ fprintf(out, "\n");
if (aggr_mode == AGGR_NONE)
- fprintf(output, " ");
- fprintf(output, " # %5.2f stalled cycles per insn", ratio);
+ fprintf(out, " ");
+ fprintf(out, " # %5.2f stalled cycles per insn", ratio);
}
} else if (perf_evsel__match(evsel, HARDWARE, HW_BRANCH_MISSES) &&
runtime_branches_stats[ctx][cpu].n != 0) {
- print_branch_misses(cpu, evsel, avg);
+ print_branch_misses(out, cpu, evsel, avg);
} else if (
evsel->attr.type == PERF_TYPE_HW_CACHE &&
evsel->attr.config == ( PERF_COUNT_HW_CACHE_L1D |
((PERF_COUNT_HW_CACHE_OP_READ) << 8) |
((PERF_COUNT_HW_CACHE_RESULT_MISS) << 16)) &&
runtime_l1_dcache_stats[ctx][cpu].n != 0) {
- print_l1_dcache_misses(cpu, evsel, avg);
+ print_l1_dcache_misses(out, cpu, evsel, avg);
} else if (
evsel->attr.type == PERF_TYPE_HW_CACHE &&
evsel->attr.config == ( PERF_COUNT_HW_CACHE_L1I |
((PERF_COUNT_HW_CACHE_OP_READ) << 8) |
((PERF_COUNT_HW_CACHE_RESULT_MISS) << 16)) &&
runtime_l1_icache_stats[ctx][cpu].n != 0) {
- print_l1_icache_misses(cpu, evsel, avg);
+ print_l1_icache_misses(out, cpu, evsel, avg);
} else if (
evsel->attr.type == PERF_TYPE_HW_CACHE &&
evsel->attr.config == ( PERF_COUNT_HW_CACHE_DTLB |
((PERF_COUNT_HW_CACHE_OP_READ) << 8) |
((PERF_COUNT_HW_CACHE_RESULT_MISS) << 16)) &&
runtime_dtlb_cache_stats[ctx][cpu].n != 0) {
- print_dtlb_cache_misses(cpu, evsel, avg);
+ print_dtlb_cache_misses(out, cpu, evsel, avg);
} else if (
evsel->attr.type == PERF_TYPE_HW_CACHE &&
evsel->attr.config == ( PERF_COUNT_HW_CACHE_ITLB |
((PERF_COUNT_HW_CACHE_OP_READ) << 8) |
((PERF_COUNT_HW_CACHE_RESULT_MISS) << 16)) &&
runtime_itlb_cache_stats[ctx][cpu].n != 0) {
- print_itlb_cache_misses(cpu, evsel, avg);
+ print_itlb_cache_misses(out, cpu, evsel, avg);
} else if (
evsel->attr.type == PERF_TYPE_HW_CACHE &&
evsel->attr.config == ( PERF_COUNT_HW_CACHE_LL |
((PERF_COUNT_HW_CACHE_OP_READ) << 8) |
((PERF_COUNT_HW_CACHE_RESULT_MISS) << 16)) &&
runtime_ll_cache_stats[ctx][cpu].n != 0) {
- print_ll_cache_misses(cpu, evsel, avg);
+ print_ll_cache_misses(out, cpu, evsel, avg);
} else if (perf_evsel__match(evsel, HARDWARE, HW_CACHE_MISSES) &&
runtime_cacherefs_stats[ctx][cpu].n != 0) {
total = avg_stats(&runtime_cacherefs_stats[ctx][cpu]);
@@ -1130,25 +1130,25 @@ static void print_shadow_stats(struct perf_evsel *evsel, double avg, int cpu)
if (total)
ratio = avg * 100 / total;
- fprintf(output, " # %8.3f %% of all cache refs ", ratio);
+ fprintf(out, " # %8.3f %% of all cache refs ", ratio);
} else if (perf_evsel__match(evsel, HARDWARE, HW_STALLED_CYCLES_FRONTEND)) {
- print_stalled_cycles_frontend(cpu, evsel, avg);
+ print_stalled_cycles_frontend(out, cpu, evsel, avg);
} else if (perf_evsel__match(evsel, HARDWARE, HW_STALLED_CYCLES_BACKEND)) {
- print_stalled_cycles_backend(cpu, evsel, avg);
+ print_stalled_cycles_backend(out, cpu, evsel, avg);
} else if (perf_evsel__match(evsel, HARDWARE, HW_CPU_CYCLES)) {
total = avg_stats(&runtime_nsecs_stats[cpu]);
if (total) {
ratio = avg / total;
- fprintf(output, " # %8.3f GHz ", ratio);
+ fprintf(out, " # %8.3f GHz ", ratio);
} else {
- fprintf(output, " ");
+ fprintf(out, " ");
}
} else if (perf_evsel__is(evsel, CYCLES_IN_TX)) {
total = avg_stats(&runtime_cycles_stats[ctx][cpu]);
if (total) {
- fprintf(output,
+ fprintf(out,
" # %5.2f%% transactional cycles ",
100.0 * (avg / total));
}
@@ -1158,7 +1158,7 @@ static void print_shadow_stats(struct perf_evsel *evsel, double avg, int cpu)
if (total2 < avg)
total2 = avg;
if (total) {
- fprintf(output,
+ fprintf(out,
" # %5.2f%% aborted cycles ",
100.0 * ((total2-avg) / total));
}
@@ -1170,7 +1170,7 @@ static void print_shadow_stats(struct perf_evsel *evsel, double avg, int cpu)
if (total)
ratio = total / avg;
- fprintf(output, " # %8.0f cycles / transaction ", ratio);
+ fprintf(out, " # %8.0f cycles / transaction ", ratio);
} else if (perf_evsel__is(evsel, ELISION_START) &&
avg > 0 &&
runtime_cycles_in_tx_stats[ctx][cpu].n != 0) {
@@ -1179,7 +1179,7 @@ static void print_shadow_stats(struct perf_evsel *evsel, double avg, int cpu)
if (total)
ratio = total / avg;
- fprintf(output, " # %8.0f cycles / elision ", ratio);
+ fprintf(out, " # %8.0f cycles / elision ", ratio);
} else if (runtime_nsecs_stats[cpu].n != 0) {
char unit = 'M';
@@ -1192,9 +1192,9 @@ static void print_shadow_stats(struct perf_evsel *evsel, double avg, int cpu)
unit = 'K';
}
- fprintf(output, " # %8.3f %c/sec ", ratio, unit);
+ fprintf(out, " # %8.3f %c/sec ", ratio, unit);
} else {
- fprintf(output, " ");
+ fprintf(out, " ");
}
}
@@ -1233,7 +1233,7 @@ static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg)
if (csv_output || interval)
return;
- print_shadow_stats(evsel, avg, cpu);
+ print_shadow_stats(output, evsel, avg, cpu);
}
static void print_aggr(char *prefix)
--
1.9.3
next prev parent reply other threads:[~2015-06-01 23:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-01 22:59 [PATCH 0/9] perf stat: Separate shadow counters code Jiri Olsa
2015-06-01 22:59 ` [PATCH 1/9] perf tools: Add nameid value into evsel object Jiri Olsa
2015-06-02 18:10 ` Arnaldo Carvalho de Melo
2015-06-02 18:46 ` Jiri Olsa
2015-06-02 19:59 ` Arnaldo Carvalho de Melo
2015-06-01 22:59 ` [PATCH 2/9] perf stat: Replace transaction event check with nameid Jiri Olsa
2015-06-01 22:59 ` [PATCH 3/9] perf stat: Remove setup_events function Jiri Olsa
2015-06-01 22:59 ` [PATCH 4/9] perf stat: Remove transaction_run from shadow update/print code Jiri Olsa
2015-06-01 22:59 ` [PATCH 5/9] perf stat: Introduce reset_shadow_stats function Jiri Olsa
2015-06-01 23:00 ` [PATCH 6/9] perf stat: Introduce print_shadow_stats function Jiri Olsa
2015-06-01 23:00 ` Jiri Olsa [this message]
2015-06-01 23:00 ` [PATCH 8/9] perf stat: Add aggr_mode argument to " Jiri Olsa
2015-06-01 23:00 ` [PATCH 9/9] perf stat: Move shadow stat counters into separate object Jiri Olsa
-- strict thread matches above, loose matches on Subject: below --
2015-06-03 14:25 [PATCHv2 0/9] perf stat: Separate shadow counters code Jiri Olsa
2015-06-03 14:25 ` [PATCH 7/9] perf stat: Add output file argument to print_shadow_stats function Jiri Olsa
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=1433199603-20082-8-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.