linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	James Clark <james.clark@arm.com>,
	Dave Martin <Dave.Martin@arm.com>, Al Grant <Al.Grant@arm.com>,
	Wei Li <liwei391@huawei.com>,
	linux-kernel@vger.kernel.org
Cc: Leo Yan <leo.yan@linaro.org>
Subject: [PATCH v6 17/21] perf arm-spe: Add new function arm_spe_pkt_desc_op_type()
Date: Fri, 30 Oct 2020 10:57:20 +0800	[thread overview]
Message-ID: <20201030025724.19157-18-leo.yan@linaro.org> (raw)
In-Reply-To: <20201030025724.19157-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>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
---
 .../arm-spe-decoder/arm-spe-pkt-decoder.c     | 78 +++++++++++--------
 1 file changed, 44 insertions(+), 34 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 07934e1eedca..1616a88db9ba 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
@@ -308,6 +308,49 @@ static int arm_spe_pkt_desc_event(const struct arm_spe_pkt *packet,
 	return err ?: (int)(buf_len - blen);
 }
 
+static int arm_spe_pkt_desc_op_type(const struct arm_spe_pkt *packet,
+				    char *buf, size_t buf_len)
+{
+	u64 payload = packet->payload;
+	size_t blen = buf_len;
+	int err = 0;
+
+	switch (packet->index) {
+	case 0:
+		return arm_spe_pkt_snprintf(&err, &buf, &blen,
+				payload & 0x1 ? "COND-SELECT" : "INSN-OTHER");
+	case 1:
+		arm_spe_pkt_snprintf(&err, &buf, &blen,
+				     payload & 0x1 ? "ST" : "LD");
+
+		if (payload & 0x2) {
+			if (payload & 0x4)
+				arm_spe_pkt_snprintf(&err, &buf, &blen, " AT");
+			if (payload & 0x8)
+				arm_spe_pkt_snprintf(&err, &buf, &blen, " EXCL");
+			if (payload & 0x10)
+				arm_spe_pkt_snprintf(&err, &buf, &blen, " AR");
+		} else if (payload & 0x4) {
+			arm_spe_pkt_snprintf(&err, &buf, &blen, " SIMD-FP");
+		}
+
+		return err ?: (int)(buf_len - blen);
+
+	case 2:
+		arm_spe_pkt_snprintf(&err, &buf, &blen, "B");
+
+		if (payload & 0x1)
+			arm_spe_pkt_snprintf(&err, &buf, &blen, " COND");
+		if (payload & 0x2)
+			arm_spe_pkt_snprintf(&err, &buf, &blen, " IND");
+
+		return err ?: (int)(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)
 {
@@ -382,40 +425,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(&err, &buf, &blen,
-					payload & 0x1 ? "COND-SELECT" : "INSN-OTHER");
-		case 1:
-			arm_spe_pkt_snprintf(&err, &buf, &blen,
-					     payload & 0x1 ? "ST" : "LD");
-
-			if (payload & 0x2) {
-				if (payload & 0x4)
-					arm_spe_pkt_snprintf(&err, &buf, &blen, " AT");
-				if (payload & 0x8)
-					arm_spe_pkt_snprintf(&err, &buf, &blen, " EXCL");
-				if (payload & 0x10)
-					arm_spe_pkt_snprintf(&err, &buf, &blen, " AR");
-			} else if (payload & 0x4) {
-				arm_spe_pkt_snprintf(&err, &buf, &blen, " SIMD-FP");
-			}
-
-			return err ?: (int)(buf_len - blen);
-
-		case 2:
-			arm_spe_pkt_snprintf(&err, &buf, &blen, "B");
-
-			if (payload & 0x1)
-				arm_spe_pkt_snprintf(&err, &buf, &blen, " COND");
-			if (payload & 0x2)
-				arm_spe_pkt_snprintf(&err, &buf, &blen, " IND");
-
-			return err ?: (int)(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(&err, &buf, &blen, "%s %lld", name, payload);
-- 
2.17.1


  parent reply	other threads:[~2020-10-30  2:59 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-30  2:57 [PATCH v6 00/21] perf arm-spe: Refactor decoding & dumping flow Leo Yan
2020-10-30  2:57 ` [PATCH v6 01/21] perf arm-spe: Include bitops.h for BIT() macro Leo Yan
2020-10-30  2:57 ` [PATCH v6 02/21] perf arm-spe: Fix a typo in comment Leo Yan
2020-10-30  2:57 ` [PATCH v6 03/21] perf arm-spe: Refactor payload size calculation Leo Yan
2020-10-30  2:57 ` [PATCH v6 04/21] perf arm-spe: Refactor arm_spe_get_events() Leo Yan
2020-10-30  2:57 ` [PATCH v6 05/21] perf arm-spe: Fix packet length handling Leo Yan
2020-10-30  2:57 ` [PATCH v6 06/21] perf arm-spe: Refactor printing string to buffer Leo Yan
2020-11-02 15:50   ` André Przywara
2020-11-03  2:39     ` Leo Yan
2020-11-06  1:58     ` Leo Yan
2020-11-02 17:06   ` Dave Martin
2020-11-03  6:40     ` Leo Yan
2020-11-03 10:13       ` André Przywara
2020-11-03 12:13         ` Dave Martin
2020-11-04  8:29           ` Leo Yan
2020-10-30  2:57 ` [PATCH v6 07/21] perf arm-spe: Refactor packet header parsing Leo Yan
2020-10-30  2:57 ` [PATCH v6 08/21] perf arm-spe: Add new function arm_spe_pkt_desc_addr() Leo Yan
2020-10-30  2:57 ` [PATCH v6 09/21] perf arm-spe: Refactor address packet handling Leo Yan
2020-10-30  2:57 ` [PATCH v6 10/21] perf arm_spe: Fixup top byte for data virtual address Leo Yan
2020-10-30  2:57 ` [PATCH v6 11/21] perf arm-spe: Refactor context packet handling Leo Yan
2020-10-30  2:57 ` [PATCH v6 12/21] perf arm-spe: Add new function arm_spe_pkt_desc_counter() Leo Yan
2020-10-30  2:57 ` [PATCH v6 13/21] perf arm-spe: Refactor counter packet handling Leo Yan
2020-10-30  2:57 ` [PATCH v6 14/21] perf arm-spe: Add new function arm_spe_pkt_desc_event() Leo Yan
2020-10-30  2:57 ` [PATCH v6 15/21] perf arm-spe: Refactor event type handling Leo Yan
2020-10-30  2:57 ` [PATCH v6 16/21] perf arm-spe: Remove size condition checking for events Leo Yan
2020-10-30  2:57 ` Leo Yan [this message]
2020-10-30  2:57 ` [PATCH v6 18/21] perf arm-spe: Refactor operation packet handling Leo Yan
2020-10-30  2:57 ` [PATCH v6 19/21] perf arm-spe: Add more sub classes for operation packet Leo Yan
2020-10-30  2:57 ` [PATCH v6 20/21] perf arm_spe: Decode memory tagging properties Leo Yan
2020-11-02 16:25   ` Dave Martin
2020-11-03  6:51     ` Leo Yan
2020-11-03 12:14       ` Dave Martin
2020-10-30  2:57 ` [PATCH v6 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=20201030025724.19157-18-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).