From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Clark Williams <williams@redhat.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Leo Yan <leo.yan@linaro.org>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Mike Leach <mike.leach@linaro.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Mark Rutland <mark.rutland@arm.com>,
Peter Zijlstra <peterz@infradead.org>,
Robert Walker <robert.walker@arm.com>,
Suzuki Poulouse <suzuki.poulose@arm.com>,
coresight ml <coresight@lists.linaro.org>,
linux-arm-kernel@lists.infradead.org,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 12/23] perf cs-etm: Optimize copying last branches
Date: Tue, 17 Mar 2020 18:32:48 -0300 [thread overview]
Message-ID: <20200317213259.15494-13-acme@kernel.org> (raw)
In-Reply-To: <20200317213259.15494-1-acme@kernel.org>
From: Leo Yan <leo.yan@linaro.org>
If an instruction range packet can generate multiple instruction
samples, these samples share the same last branches; it's not necessary
to copy the same last branches repeatedly for these samples within the
same packet.
This patch moves out the last branches copying from function
cs_etm__synth_instruction_sample(), and execute it prior to generating
instruction samples.
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Mike Leach <mike.leach@linaro.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Robert Walker <robert.walker@arm.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: coresight ml <coresight@lists.linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lore.kernel.org/lkml/20200219021811.20067-5-leo.yan@linaro.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/cs-etm.c | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
index 1ddcc67e13dd..87d9943177bc 100644
--- a/tools/perf/util/cs-etm.c
+++ b/tools/perf/util/cs-etm.c
@@ -1151,10 +1151,8 @@ static int cs_etm__synth_instruction_sample(struct cs_etm_queue *etmq,
cs_etm__copy_insn(etmq, tidq->trace_chan_id, tidq->packet, &sample);
- if (etm->synth_opts.last_branch) {
- cs_etm__copy_last_branch_rb(etmq, tidq);
+ if (etm->synth_opts.last_branch)
sample.branch_stack = tidq->last_branch;
- }
if (etm->synth_opts.inject) {
ret = cs_etm__inject_event(event, &sample,
@@ -1431,6 +1429,10 @@ static int cs_etm__sample(struct cs_etm_queue *etmq,
u64 offset = etm->instructions_sample_period - instrs_prev;
u64 addr;
+ /* Prepare last branches for instruction sample */
+ if (etm->synth_opts.last_branch)
+ cs_etm__copy_last_branch_rb(etmq, tidq);
+
while (tidq->period_instructions >=
etm->instructions_sample_period) {
/*
@@ -1508,6 +1510,11 @@ static int cs_etm__flush(struct cs_etm_queue *etmq,
if (etmq->etm->synth_opts.last_branch &&
tidq->prev_packet->sample_type == CS_ETM_RANGE) {
+ u64 addr;
+
+ /* Prepare last branches for instruction sample */
+ cs_etm__copy_last_branch_rb(etmq, tidq);
+
/*
* Generate a last branch event for the branches left in the
* circular buffer at the end of the trace.
@@ -1515,7 +1522,7 @@ static int cs_etm__flush(struct cs_etm_queue *etmq,
* Use the address of the end of the last reported execution
* range
*/
- u64 addr = cs_etm__last_executed_instr(tidq->prev_packet);
+ addr = cs_etm__last_executed_instr(tidq->prev_packet);
err = cs_etm__synth_instruction_sample(
etmq, tidq, addr,
@@ -1560,11 +1567,16 @@ static int cs_etm__end_block(struct cs_etm_queue *etmq,
*/
if (etmq->etm->synth_opts.last_branch &&
tidq->prev_packet->sample_type == CS_ETM_RANGE) {
+ u64 addr;
+
+ /* Prepare last branches for instruction sample */
+ cs_etm__copy_last_branch_rb(etmq, tidq);
+
/*
* Use the address of the end of the last reported execution
* range.
*/
- u64 addr = cs_etm__last_executed_instr(tidq->prev_packet);
+ addr = cs_etm__last_executed_instr(tidq->prev_packet);
err = cs_etm__synth_instruction_sample(
etmq, tidq, addr,
--
2.21.1
next prev parent reply other threads:[~2020-03-17 21:33 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-17 21:32 [GIT PULL] perf/core improvements and fixes Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 01/23] perf vendor events s390: Add new deflate counters for IBM z15 Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 02/23] perf jevents: Support metric constraint Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 03/23] perf metricgroup: Factor out metricgroup__add_metric_weak_group() Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 04/23] perf util: Factor out sysctl__nmi_watchdog_enabled() Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 05/23] perf metricgroup: Support metric constraint Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 06/23] perf vendor events intel: Add NO_NMI_WATCHDOG " Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 07/23] perf map: Fix off by one in strncpy() size argument Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 08/23] perf map: Use strstarts() to look for Android libraries Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 09/23] perf cs-etm: Swap packets for instruction samples Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 10/23] perf cs-etm: Continuously record last branch Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 11/23] perf cs-etm: Correct synthesizing instruction samples Arnaldo Carvalho de Melo
2020-03-17 21:32 ` Arnaldo Carvalho de Melo [this message]
2020-03-17 21:32 ` [PATCH 13/23] perf cs-etm: Fix unsigned variable comparison to zero Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 14/23] perf doc: Set man page date to last git commit Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 15/23] perf intel-pt: Rename intel-pt.txt and put it in man page format Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 16/23] perf intel-pt: Add Intel PT man page references Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 17/23] perf intel-pt: Update intel-pt.txt file with new location of the documentation Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 18/23] perf scripting perl: Add common_callchain to fix argument order Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 19/23] perf record: Fix binding of AIO user space buffers to nodes Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 20/23] perf test: Print if shell directory isn't present Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 21/23] perf tools: Give synthetic mmap events an inode generation Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 22/23] perf report: Fix no branch type statistics report issue Arnaldo Carvalho de Melo
2020-03-17 21:32 ` [PATCH 23/23] perf expr: Fix copy/paste mistake Arnaldo Carvalho de Melo
2020-03-19 14:03 ` [GIT PULL] perf/core improvements and fixes Ingo Molnar
2020-03-19 14:07 ` 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=20200317213259.15494-13-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=coresight@lists.linaro.org \
--cc=jolsa@kernel.org \
--cc=jolsa@redhat.com \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mike.leach@linaro.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=robert.walker@arm.com \
--cc=suzuki.poulose@arm.com \
--cc=tglx@linutronix.de \
--cc=williams@redhat.com \
/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).