From: Leo Yan <leo.yan@linaro.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Andre Przywara <andre.przywara@arm.com>,
Dave Martin <Dave.Martin@arm.com>, Wei Li <liwei391@huawei.com>,
James Clark <james.clark@arm.com>, Al Grant <Al.Grant@arm.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Subject: [PATCH v5 14/21] perf arm-spe: Add new function arm_spe_pkt_desc_event()
Date: Thu, 29 Oct 2020 15:19:20 +0800 [thread overview]
Message-ID: <20201029071927.9308-15-leo.yan@linaro.org> (raw)
In-Reply-To: <20201029071927.9308-1-leo.yan@linaro.org>
This patch moves out the event packet parsing from arm_spe_pkt_desc()
to the new function arm_spe_pkt_desc_event().
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
---
.../arm-spe-decoder/arm-spe-pkt-decoder.c | 66 +++++++++++--------
1 file changed, 38 insertions(+), 28 deletions(-)
diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
index bc4b5a5a528b..6e4896327e56 100644
--- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
+++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c
@@ -269,6 +269,43 @@ static int arm_spe_pkt_snprintf(int *err, char **buf_p, size_t *blen,
return ret;
}
+static int arm_spe_pkt_desc_event(const struct arm_spe_pkt *packet,
+ char *buf, size_t buf_len)
+{
+ u64 payload = packet->payload;
+ size_t blen = buf_len;
+ int err = 0;
+
+ arm_spe_pkt_snprintf(&err, &buf, &blen, "EV");
+
+ if (payload & 0x1)
+ arm_spe_pkt_snprintf(&err, &buf, &blen, " EXCEPTION-GEN");
+ if (payload & 0x2)
+ arm_spe_pkt_snprintf(&err, &buf, &blen, " RETIRED");
+ if (payload & 0x4)
+ arm_spe_pkt_snprintf(&err, &buf, &blen, " L1D-ACCESS");
+ if (payload & 0x8)
+ arm_spe_pkt_snprintf(&err, &buf, &blen, " L1D-REFILL");
+ if (payload & 0x10)
+ arm_spe_pkt_snprintf(&err, &buf, &blen, " TLB-ACCESS");
+ if (payload & 0x20)
+ arm_spe_pkt_snprintf(&err, &buf, &blen, " TLB-REFILL");
+ if (payload & 0x40)
+ arm_spe_pkt_snprintf(&err, &buf, &blen, " NOT-TAKEN");
+ if (payload & 0x80)
+ arm_spe_pkt_snprintf(&err, &buf, &blen, " MISPRED");
+ if (packet->index > 1) {
+ if (payload & 0x100)
+ arm_spe_pkt_snprintf(&err, &buf, &blen, " LLC-ACCESS");
+ if (payload & 0x200)
+ arm_spe_pkt_snprintf(&err, &buf, &blen, " LLC-REFILL");
+ if (payload & 0x400)
+ arm_spe_pkt_snprintf(&err, &buf, &blen, " REMOTE-ACCESS");
+ }
+
+ return err ?: (int)(buf_len - blen);
+}
+
static int arm_spe_pkt_desc_addr(const struct arm_spe_pkt *packet,
char *buf, size_t buf_len)
{
@@ -341,34 +378,7 @@ int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf,
case ARM_SPE_END:
return arm_spe_pkt_snprintf(&err, &buf, &blen, "%s", name);
case ARM_SPE_EVENTS:
- arm_spe_pkt_snprintf(&err, &buf, &blen, "EV");
-
- if (payload & 0x1)
- arm_spe_pkt_snprintf(&err, &buf, &blen, " EXCEPTION-GEN");
- if (payload & 0x2)
- arm_spe_pkt_snprintf(&err, &buf, &blen, " RETIRED");
- if (payload & 0x4)
- arm_spe_pkt_snprintf(&err, &buf, &blen, " L1D-ACCESS");
- if (payload & 0x8)
- arm_spe_pkt_snprintf(&err, &buf, &blen, " L1D-REFILL");
- if (payload & 0x10)
- arm_spe_pkt_snprintf(&err, &buf, &blen, " TLB-ACCESS");
- if (payload & 0x20)
- arm_spe_pkt_snprintf(&err, &buf, &blen, " TLB-REFILL");
- if (payload & 0x40)
- arm_spe_pkt_snprintf(&err, &buf, &blen, " NOT-TAKEN");
- if (payload & 0x80)
- arm_spe_pkt_snprintf(&err, &buf, &blen, " MISPRED");
- if (idx > 1) {
- if (payload & 0x100)
- arm_spe_pkt_snprintf(&err, &buf, &blen, " LLC-ACCESS");
- if (payload & 0x200)
- arm_spe_pkt_snprintf(&err, &buf, &blen, " LLC-REFILL");
- if (payload & 0x400)
- arm_spe_pkt_snprintf(&err, &buf, &blen, " REMOTE-ACCESS");
- }
- return err ?: (int)(buf_len - blen);
-
+ return arm_spe_pkt_desc_event(packet, buf, buf_len);
case ARM_SPE_OP_TYPE:
switch (idx) {
case 0:
--
2.17.1
next prev parent reply other threads:[~2020-10-29 7:22 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 7:19 [PATCH v5 00/21] perf arm-spe: Refactor decoding & dumping flow Leo Yan
2020-10-29 7:19 ` [PATCH v5 01/21] perf arm-spe: Include bitops.h for BIT() macro Leo Yan
2020-10-29 7:19 ` [PATCH v5 02/21] perf arm-spe: Fix a typo in comment Leo Yan
2020-10-29 7:19 ` [PATCH v5 03/21] perf arm-spe: Refactor payload size calculation Leo Yan
2020-10-29 7:19 ` [PATCH v5 04/21] perf arm-spe: Refactor arm_spe_get_events() Leo Yan
2020-10-29 7:19 ` [PATCH v5 05/21] perf arm-spe: Fix packet length handling Leo Yan
2020-10-29 7:19 ` [PATCH v5 06/21] perf arm-spe: Refactor printing string to buffer Leo Yan
2020-10-29 10:23 ` André Przywara
2020-10-29 10:51 ` Leo Yan
2020-10-29 10:54 ` André Przywara
2020-10-29 11:06 ` Leo Yan
2020-10-29 7:19 ` [PATCH v5 07/21] perf arm-spe: Refactor packet header parsing Leo Yan
2020-10-29 7:19 ` [PATCH v5 08/21] perf arm-spe: Add new function arm_spe_pkt_desc_addr() Leo Yan
2020-10-29 7:19 ` [PATCH v5 09/21] perf arm-spe: Refactor address packet handling Leo Yan
2020-10-29 7:19 ` [PATCH v5 10/21] perf arm_spe: Fixup top byte for data virtual address Leo Yan
2020-10-29 12:01 ` Andre Przywara
2020-10-29 7:19 ` [PATCH v5 11/21] perf arm-spe: Refactor context packet handling Leo Yan
2020-10-29 7:19 ` [PATCH v5 12/21] perf arm-spe: Add new function arm_spe_pkt_desc_counter() Leo Yan
2020-10-29 7:19 ` [PATCH v5 13/21] perf arm-spe: Refactor counter packet handling Leo Yan
2020-10-29 7:19 ` Leo Yan [this message]
2020-10-29 7:19 ` [PATCH v5 15/21] perf arm-spe: Refactor event type handling Leo Yan
2020-10-29 7:19 ` [PATCH v5 16/21] perf arm-spe: Remove size condition checking for events Leo Yan
2020-10-29 7:19 ` [PATCH v5 17/21] perf arm-spe: Add new function arm_spe_pkt_desc_op_type() Leo Yan
2020-10-29 7:19 ` [PATCH v5 18/21] perf arm-spe: Refactor operation packet handling Leo Yan
2020-10-29 7:19 ` [PATCH v5 19/21] perf arm-spe: Add more sub classes for operation packet Leo Yan
2020-10-29 7:19 ` [PATCH v5 20/21] perf arm_spe: Decode memory tagging properties Leo Yan
2020-10-29 7:19 ` [PATCH v5 21/21] perf arm-spe: Add support for ARMv8.3-SPE Leo Yan
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=20201029071927.9308-15-leo.yan@linaro.org \
--to=leo.yan@linaro.org \
--cc=Al.Grant@arm.com \
--cc=Dave.Martin@arm.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=andre.przywara@arm.com \
--cc=james.clark@arm.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=liwei391@huawei.com \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.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).