From: Leo Yan <leo.yan@linaro.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Coresight ML <coresight@lists.linaro.org>,
Mike Leach <mike.leach@linaro.org>,
Robert Walker <robert.walker@arm.com>,
Al Grant <Al.Grant@arm.com>
Cc: Leo Yan <leo.yan@linaro.org>
Subject: [PATCH v1 4/4] perf cs-etm: Add support sample flags
Date: Sun, 28 Oct 2018 20:34:55 +0800 [thread overview]
Message-ID: <1540730095-6732-5-git-send-email-leo.yan@linaro.org> (raw)
In-Reply-To: <1540730095-6732-1-git-send-email-leo.yan@linaro.org>
We have prepared the flags in the packet structure, so need to copy
the related value into sample structure thus perf tool can facilitate
sample flags.
The PREV_PACKET contains the branch instruction flags and PACKET
actually contains the flags for next branch instruction. So this patch
is to set sample flags with 'etmq->prev_packet->flags'.
This patch includes two fixing up: if there has TRACE_ON packet in the
middle of instruction packets, the TRACE_ON packet indicates the trace
is discontinuous, so append the flag PERF_IP_FLAG_TRACE_END to the
previous packet; if the coming packet is exception packet or exception
return packet, also update the previous packet for exception specific
flags.
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
tools/perf/util/cs-etm.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
index 00a95d7..7e36dcf 100644
--- a/tools/perf/util/cs-etm.c
+++ b/tools/perf/util/cs-etm.c
@@ -655,7 +655,7 @@ static int cs_etm__synth_instruction_sample(struct cs_etm_queue *etmq,
sample.stream_id = etmq->etm->instructions_id;
sample.period = period;
sample.cpu = etmq->packet->cpu;
- sample.flags = 0;
+ sample.flags = etmq->prev_packet->flags;
sample.insn_len = 1;
sample.cpumode = event->header.misc;
@@ -711,7 +711,7 @@ static int cs_etm__synth_branch_sample(struct cs_etm_queue *etmq)
sample.stream_id = etmq->etm->branches_id;
sample.period = 1;
sample.cpu = etmq->packet->cpu;
- sample.flags = 0;
+ sample.flags = etmq->prev_packet->flags;
sample.cpumode = PERF_RECORD_MISC_USER;
/*
@@ -945,9 +945,13 @@ static int cs_etm__exception(struct cs_etm_queue *etmq)
* The exception packet includes the dummy address values, so don't
* swap PACKET with PREV_PACKET. This keeps PREV_PACKET to be useful
* for generating instruction and branch samples.
+ *
+ * Also update flags so can tell perf it is exception related.
*/
- if (etmq->prev_packet->sample_type == CS_ETM_RANGE)
+ if (etmq->prev_packet->sample_type == CS_ETM_RANGE) {
etmq->prev_packet->last_instr_taken_branch = true;
+ etmq->prev_packet->flags = etmq->packet->flags;
+ }
return 0;
}
@@ -965,6 +969,14 @@ static int cs_etm__flush(struct cs_etm_queue *etmq)
if (etmq->prev_packet->sample_type == CS_ETM_EMPTY)
goto swap_packet;
+ /*
+ * The start tracing packet is in the middle of instruction range
+ * packets, this means the trace is discontinuous; so need to set
+ * the previous packet flag to PERF_IP_FLAG_TRACE_END.
+ */
+ if (etmq->prev_packet->sample_type == CS_ETM_RANGE)
+ etmq->prev_packet->flags |= PERF_IP_FLAG_TRACE_END;
+
if (etmq->etm->synth_opts.last_branch &&
etmq->prev_packet->sample_type == CS_ETM_RANGE) {
/*
--
2.7.4
prev parent reply other threads:[~2018-10-28 12:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-28 12:34 [PATCH v1 0/4] perf cs-etm: Add support for sample flags Leo Yan
2018-10-28 12:34 ` [PATCH v1 1/4] perf cs-etm: Generate branch sample for exception packet Leo Yan
2018-10-28 12:34 ` [PATCH v1 2/4] perf cs-etm: Track exception number Leo Yan
2018-10-28 12:34 ` [PATCH v1 3/4] perf cs-etm: Set branch instruction flags in packet Leo Yan
2018-10-28 12:34 ` Leo Yan [this message]
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=1540730095-6732-5-git-send-email-leo.yan@linaro.org \
--to=leo.yan@linaro.org \
--cc=Al.Grant@arm.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=coresight@lists.linaro.org \
--cc=jolsa@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=mike.leach@linaro.org \
--cc=namhyung@kernel.org \
--cc=robert.walker@arm.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).