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 4/9] perf stat: Remove transaction_run from shadow update/print code
Date: Tue, 2 Jun 2015 00:59:58 +0200 [thread overview]
Message-ID: <1433199603-20082-5-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1433199603-20082-1-git-send-email-jolsa@kernel.org>
It's no longer needed, because we use nameid to recognize
transaction events.
Keeping it only in stat code to initialize transaction events.
Link: http://lkml.kernel.org/n/tip-eo93tek7cjy8zqdvfd6f5a4x@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/builtin-stat.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 902d4a270021..793344620fcf 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -357,11 +357,11 @@ static void update_shadow_stats(struct perf_evsel *counter, u64 *count,
update_stats(&runtime_nsecs_stats[cpu], count[0]);
else if (perf_evsel__match(counter, HARDWARE, HW_CPU_CYCLES))
update_stats(&runtime_cycles_stats[ctx][cpu], count[0]);
- else if (transaction_run && perf_evsel__is(counter, CYCLES_IN_TX))
+ else if (perf_evsel__is(counter, CYCLES_IN_TX))
update_stats(&runtime_transaction_stats[ctx][cpu], count[0]);
- else if (transaction_run && perf_evsel__is(counter, TRANSACTION_START))
+ else if (perf_evsel__is(counter, TRANSACTION_START))
update_stats(&runtime_transaction_stats[ctx][cpu], count[0]);
- else if (transaction_run && perf_evsel__is(counter, ELISION_START))
+ else if (perf_evsel__is(counter, ELISION_START))
update_stats(&runtime_elision_stats[ctx][cpu], count[0]);
else if (perf_evsel__match(counter, HARDWARE, HW_STALLED_CYCLES_FRONTEND))
update_stats(&runtime_stalled_cycles_front_stats[ctx][cpu], count[0]);
@@ -1172,22 +1172,24 @@ static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg)
} else {
fprintf(output, " ");
}
- } else if (transaction_run && perf_evsel__is(evsel, CYCLES_IN_TX)) {
+ } else if (perf_evsel__is(evsel, CYCLES_IN_TX)) {
total = avg_stats(&runtime_cycles_stats[ctx][cpu]);
- if (total)
+ if (total) {
fprintf(output,
" # %5.2f%% transactional cycles ",
100.0 * (avg / total));
- } else if (transaction_run && perf_evsel__is(evsel, CYCLES_IN_TX_CP)) {
+ }
+ } else if (perf_evsel__is(evsel, CYCLES_IN_TX_CP)) {
total = avg_stats(&runtime_cycles_stats[ctx][cpu]);
total2 = avg_stats(&runtime_cycles_in_tx_stats[ctx][cpu]);
if (total2 < avg)
total2 = avg;
- if (total)
+ if (total) {
fprintf(output,
" # %5.2f%% aborted cycles ",
100.0 * ((total2-avg) / total));
- } else if (transaction_run && perf_evsel__is(evsel, TRANSACTION_START) &&
+ }
+ } else if (perf_evsel__is(evsel, TRANSACTION_START) &&
avg > 0 &&
runtime_cycles_in_tx_stats[ctx][cpu].n != 0) {
total = avg_stats(&runtime_cycles_in_tx_stats[ctx][cpu]);
@@ -1196,7 +1198,7 @@ static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg)
ratio = total / avg;
fprintf(output, " # %8.0f cycles / transaction ", ratio);
- } else if (transaction_run && perf_evsel__is(evsel, ELISION_START) &&
+ } else if (perf_evsel__is(evsel, ELISION_START) &&
avg > 0 &&
runtime_cycles_in_tx_stats[ctx][cpu].n != 0) {
total = avg_stats(&runtime_cycles_in_tx_stats[ctx][cpu]);
--
1.9.3
next prev parent reply other threads:[~2015-06-01 23:02 UTC|newest]
Thread overview: 17+ 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 ` Jiri Olsa [this message]
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 ` [PATCH 7/9] perf stat: Add output file argument to " Jiri Olsa
2015-06-01 23:00 ` [PATCH 8/9] perf stat: Add aggr_mode " 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 4/9] perf stat: Remove transaction_run from shadow update/print code Jiri Olsa
2015-06-03 15:10 ` Arnaldo Carvalho de Melo
2015-06-03 15:14 ` Jiri Olsa
2015-06-03 15:55 ` Arnaldo Carvalho de Melo
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-5-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox