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>,
Wei Li <liwei391@huawei.com>, James Clark <james.clark@arm.com>,
Andre Przywara <andre.przywara@arm.com>,
Al Grant <Al.Grant@arm.com>, Dave Martin <Dave.Martin@arm.com>,
linux-kernel@vger.kernel.org
Cc: Leo Yan <leo.yan@linaro.org>
Subject: [PATCH v3 16/20] perf arm-spe: Add new function arm_spe_pkt_desc_op_type()
Date: Thu, 22 Oct 2020 15:58:12 +0100 [thread overview]
Message-ID: <20201022145816.14069-17-leo.yan@linaro.org> (raw)
In-Reply-To: <20201022145816.14069-1-leo.yan@linaro.org>
The operation type packet is complex and contains subclass; the parsing
flow causes deep indentation; for more readable, this patch introduces
a new function arm_spe_pkt_desc_op_type() which is used for operation
type parsing.
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
.../arm-spe-decoder/arm-spe-pkt-decoder.c | 122 ++++++++++--------
1 file changed, 66 insertions(+), 56 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 2cb019999016..19d05d9734ab 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
@@ -336,6 +336,70 @@ static int arm_spe_pkt_desc_event(const struct arm_spe_pkt *packet,
return buf_len - blen;
}
+static int arm_spe_pkt_desc_op_type(const struct arm_spe_pkt *packet,
+ char *buf, size_t buf_len)
+{
+ int ret, idx = packet->index;
+ unsigned long long payload = packet->payload;
+ size_t blen = buf_len;
+
+ switch (idx) {
+ case 0:
+ return arm_spe_pkt_snprintf(&buf, &blen,
+ payload & 0x1 ? "COND-SELECT" : "INSN-OTHER");
+ case 1:
+ ret = arm_spe_pkt_snprintf(&buf, &blen,
+ payload & 0x1 ? "ST" : "LD");
+ if (ret < 0)
+ return ret;
+
+ if (payload & 0x2) {
+ if (payload & 0x4) {
+ ret = arm_spe_pkt_snprintf(&buf, &blen, " AT");
+ if (ret < 0)
+ return ret;
+ }
+ if (payload & 0x8) {
+ ret = arm_spe_pkt_snprintf(&buf, &blen, " EXCL");
+ if (ret < 0)
+ return ret;
+ }
+ if (payload & 0x10) {
+ ret = arm_spe_pkt_snprintf(&buf, &blen, " AR");
+ if (ret < 0)
+ return ret;
+ }
+ } else if (payload & 0x4) {
+ ret = arm_spe_pkt_snprintf(&buf, &blen, " SIMD-FP");
+ if (ret < 0)
+ return ret;
+ }
+
+ return buf_len - blen;
+
+ case 2:
+ ret = arm_spe_pkt_snprintf(&buf, &blen, "B");
+ if (ret < 0)
+ return ret;
+
+ if (payload & 0x1) {
+ ret = arm_spe_pkt_snprintf(&buf, &blen, " COND");
+ if (ret < 0)
+ return ret;
+ }
+ if (payload & 0x2) {
+ ret = arm_spe_pkt_snprintf(&buf, &blen, " IND");
+ if (ret < 0)
+ return ret;
+ }
+
+ return buf_len - blen;
+
+ default:
+ return 0;
+ }
+}
+
static int arm_spe_pkt_desc_addr(const struct arm_spe_pkt *packet,
char *buf, size_t buf_len)
{
@@ -403,7 +467,7 @@ static int arm_spe_pkt_desc_counter(const struct arm_spe_pkt *packet,
int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf,
size_t buf_len)
{
- int ret, idx = packet->index;
+ int idx = packet->index;
unsigned long long payload = packet->payload;
const char *name = arm_spe_pkt_name(packet->type);
size_t blen = buf_len;
@@ -416,61 +480,7 @@ int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf,
case ARM_SPE_EVENTS:
return arm_spe_pkt_desc_event(packet, buf, buf_len);
case ARM_SPE_OP_TYPE:
- switch (idx) {
- case 0:
- return arm_spe_pkt_snprintf(&buf, &blen,
- payload & 0x1 ? "COND-SELECT" : "INSN-OTHER");
- case 1:
- ret = arm_spe_pkt_snprintf(&buf, &blen,
- payload & 0x1 ? "ST" : "LD");
- if (ret < 0)
- return ret;
-
- if (payload & 0x2) {
- if (payload & 0x4) {
- ret = arm_spe_pkt_snprintf(&buf, &blen, " AT");
- if (ret < 0)
- return ret;
- }
- if (payload & 0x8) {
- ret = arm_spe_pkt_snprintf(&buf, &blen, " EXCL");
- if (ret < 0)
- return ret;
- }
- if (payload & 0x10) {
- ret = arm_spe_pkt_snprintf(&buf, &blen, " AR");
- if (ret < 0)
- return ret;
- }
- } else if (payload & 0x4) {
- ret = arm_spe_pkt_snprintf(&buf, &blen, " SIMD-FP");
- if (ret < 0)
- return ret;
- }
-
- return buf_len - blen;
-
- case 2:
- ret = arm_spe_pkt_snprintf(&buf, &blen, "B");
- if (ret < 0)
- return ret;
-
- if (payload & 0x1) {
- ret = arm_spe_pkt_snprintf(&buf, &blen, " COND");
- if (ret < 0)
- return ret;
- }
- if (payload & 0x2) {
- ret = arm_spe_pkt_snprintf(&buf, &blen, " IND");
- if (ret < 0)
- return ret;
- }
-
- return buf_len - blen;
-
- default:
- return 0;
- }
+ return arm_spe_pkt_desc_op_type(packet, buf, buf_len);
case ARM_SPE_DATA_SOURCE:
case ARM_SPE_TIMESTAMP:
return arm_spe_pkt_snprintf(&buf, &blen, "%s %lld", name, payload);
--
2.17.1
next prev parent reply other threads:[~2020-10-22 14:59 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-22 14:57 [PATCH v3 00/20] perf arm-spe: Refactor decoding & dumping flow Leo Yan
2020-10-22 14:57 ` [PATCH v3 01/20] perf arm-spe: Include bitops.h for BIT() macro Leo Yan
2020-10-22 14:57 ` [PATCH v3 02/20] perf arm-spe: Fix a typo in comment Leo Yan
2020-10-22 14:57 ` [PATCH v3 03/20] perf arm-spe: Refactor payload size calculation Leo Yan
2020-10-23 17:08 ` André Przywara
2020-10-26 1:41 ` Leo Yan
2020-10-22 14:58 ` [PATCH v3 04/20] perf arm-spe: Refactor arm_spe_get_events() Leo Yan
2020-10-23 17:09 ` André Przywara
2020-10-22 14:58 ` [PATCH v3 05/20] perf arm-spe: Fix packet length handling Leo Yan
2020-10-22 14:58 ` [PATCH v3 06/20] perf arm-spe: Refactor printing string to buffer Leo Yan
2020-10-22 14:58 ` [PATCH v3 07/20] perf arm-spe: Refactor packet header parsing Leo Yan
2020-10-23 17:09 ` André Przywara
2020-10-22 14:58 ` [PATCH v3 08/20] perf arm-spe: Add new function arm_spe_pkt_desc_addr() Leo Yan
2020-10-23 17:09 ` André Przywara
2020-10-22 14:58 ` [PATCH v3 09/20] perf arm-spe: Refactor address packet handling Leo Yan
2020-10-23 17:53 ` André Przywara
2020-10-26 6:30 ` Leo Yan
2020-10-22 14:58 ` [PATCH v3 10/20] perf arm-spe: Refactor context " Leo Yan
2020-10-22 14:58 ` [PATCH v3 11/20] perf arm-spe: Add new function arm_spe_pkt_desc_counter() Leo Yan
2020-10-23 17:10 ` André Przywara
2020-10-22 14:58 ` [PATCH v3 12/20] perf arm-spe: Refactor counter packet handling Leo Yan
2020-10-24 0:31 ` André Przywara
2020-10-22 14:58 ` [PATCH v3 13/20] perf arm-spe: Add new function arm_spe_pkt_desc_event() Leo Yan
2020-10-24 0:32 ` André Przywara
2020-10-22 14:58 ` [PATCH v3 14/20] perf arm-spe: Refactor event type handling Leo Yan
2020-10-24 0:32 ` André Przywara
2020-10-22 14:58 ` [PATCH v3 15/20] perf arm-spe: Remove size condition checking for events Leo Yan
2020-10-23 17:10 ` André Przywara
2020-10-22 14:58 ` Leo Yan [this message]
2020-10-23 17:10 ` [PATCH v3 16/20] perf arm-spe: Add new function arm_spe_pkt_desc_op_type() André Przywara
2020-10-22 14:58 ` [PATCH v3 17/20] perf arm-spe: Refactor operation packet handling Leo Yan
2020-10-26 18:17 ` André Przywara
2020-10-22 14:58 ` [PATCH v3 18/20] perf arm-spe: Add more sub classes for operation packet Leo Yan
2020-10-24 0:32 ` André Przywara
2020-10-22 14:58 ` [PATCH v3 19/20] perf arm_spe: Decode memory tagging properties Leo Yan
2020-10-24 0:32 ` André Przywara
2020-10-22 14:58 ` [PATCH v3 20/20] perf arm-spe: Add support for ARMv8.3-SPE Leo Yan
2020-10-26 18:17 ` André Przywara
2020-10-27 3:13 ` 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=20201022145816.14069-17-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).