From: Leo Yan <leo.yan@linaro.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>,
James Clark <james.clark@arm.com>, Will Deacon <will@kernel.org>,
Al Grant <Al.Grant@arm.com>,
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>,
Wei Li <liwei391@huawei.com>,
linux-kernel@vger.kernel.org,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Mike Leach <mike.leach@linaro.org>
Cc: Leo Yan <leo.yan@linaro.org>
Subject: [PATCH RESEND v1 08/13] perf arm-spe: Refactor counter packet handling
Date: Mon, 17 Aug 2020 15:53:43 +0100 [thread overview]
Message-ID: <20200817145348.14461-9-leo.yan@linaro.org> (raw)
In-Reply-To: <20200817145348.14461-1-leo.yan@linaro.org>
This patch defines macros for counter packet header, and uses macro to
replace hard code values for packet parsing.
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
.../arm-spe-decoder/arm-spe-pkt-decoder.c | 21 +++++++++++++------
.../arm-spe-decoder/arm-spe-pkt-decoder.h | 8 +++++++
2 files changed, 23 insertions(+), 6 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 ad8797f12d36..6cb14a2141c4 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
@@ -150,9 +150,10 @@ static int arm_spe_get_counter(const unsigned char *buf, size_t len,
{
packet->type = ARM_SPE_COUNTER;
if (ext_hdr)
- packet->index = ((buf[0] & 0x3) << 3) | (buf[1] & 0x7);
+ packet->index = (((buf[0] & SPE_CNT_PKT_HDR_EXT_INDEX_MASK) << 3) |
+ (buf[1] & SPE_CNT_PKT_HDR_INDEX_MASK));
else
- packet->index = buf[0] & 0x7;
+ packet->index = buf[0] & SPE_CNT_PKT_HDR_INDEX_MASK;
return arm_spe_get_payload(buf, len, ext_hdr, packet);
}
@@ -421,10 +422,18 @@ int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf,
buf += ret;
blen -= ret;
switch (idx) {
- case 0: ret = snprintf(buf, buf_len, "TOT"); break;
- case 1: ret = snprintf(buf, buf_len, "ISSUE"); break;
- case 2: ret = snprintf(buf, buf_len, "XLAT"); break;
- default: ret = 0;
+ case SPE_CNT_PKT_HDR_INDEX_TOTAL_LAT:
+ ret = snprintf(buf, buf_len, "TOT");
+ break;
+ case SPE_CNT_PKT_HDR_INDEX_ISSUE_LAT:
+ ret = snprintf(buf, buf_len, "ISSUE");
+ break;
+ case SPE_CNT_PKT_HDR_INDEX_TRANS_LAT:
+ ret = snprintf(buf, buf_len, "XLAT");
+ break;
+ default:
+ ret = 0;
+ break;
}
if (ret < 0)
return ret;
diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h
index db9f124fb1f4..ee2c1d5054e8 100644
--- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h
+++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h
@@ -85,6 +85,14 @@ struct arm_spe_pkt {
/* Context packet header */
#define SPE_CTX_PKT_HDR_INDEX_MASK (0x3)
+/* Counter packet header */
+#define SPE_CNT_PKT_HDR_INDEX_MASK (0x7)
+#define SPE_CNT_PKT_HDR_INDEX_TOTAL_LAT (0x0)
+#define SPE_CNT_PKT_HDR_INDEX_ISSUE_LAT (0x1)
+#define SPE_CNT_PKT_HDR_INDEX_TRANS_LAT (0x2)
+
+#define SPE_CNT_PKT_HDR_EXT_INDEX_MASK (0x3)
+
const char *arm_spe_pkt_name(enum arm_spe_pkt_type);
int arm_spe_get_packet(const unsigned char *buf, size_t len,
--
2.17.1
next prev parent reply other threads:[~2020-08-17 14:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-17 14:53 [PATCH RESEND v1 00/13] perf arm-spe: Refactor decoding & dumping flow Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 01/13] perf arm-spe: Include bitops.h for BIT() macro Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 02/13] perf arm-spe: Fix a typo in comment Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 03/13] perf arm-spe: Refactor payload length calculation Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 04/13] perf arm-spe: Fix packet length handling Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 05/13] perf arm-spe: Refactor packet header parsing Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 06/13] perf arm-spe: Refactor address packet handling Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 07/13] perf arm-spe: Refactor context " Leo Yan
2020-08-17 14:53 ` Leo Yan [this message]
2020-08-17 14:53 ` [PATCH RESEND v1 09/13] perf arm-spe: Refactor event type handling Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 10/13] perf arm-spe: Detect failure for snprintf() Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 11/13] perf arm-spe: Refactor operation packet handling Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 12/13] perf arm-spe: Add more sub classes for operation packet Leo Yan
2020-08-17 14:53 ` [PATCH RESEND v1 13/13] 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=20200817145348.14461-9-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=james.clark@arm.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=liwei391@huawei.com \
--cc=mark.rutland@arm.com \
--cc=mathieu.poirier@linaro.org \
--cc=mike.leach@linaro.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=will@kernel.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).