[PATCH v5 13/21] perf arm-spe: Refactor counter packet handling

[Leo Yan]

This patch defines macros for counter packet header, and uses macros to
replace hard code values in functions arm_spe_get_counter() and
arm_spe_pkt_desc().

In the function arm_spe_get_counter(), adds a new line for more
readable.

Signed-off-by: Leo Yan <leo....@linaro.org>
Reviewed-by: Andre Przywara <andre.przyw...@arm.com>
---
 tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c | 11 ++++++-----
 tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h |  5 +++++
 2 files changed, 11 insertions(+), 5 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 4e2f7bbd9d35..bc4b5a5a528b 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
@@ -152,10 +152,11 @@ static int arm_spe_get_counter(const unsigned char *buf, 
size_t len,
                               const unsigned char ext_hdr, struct arm_spe_pkt 
*packet)
 {
        packet->type = ARM_SPE_COUNTER;
+
        if (ext_hdr)
-               packet->index = ((buf[0] & 0x3) << 3) | (buf[1] & 0x7);
+               packet->index = SPE_HDR_EXTENDED_INDEX(buf[0], buf[1]);
        else
-               packet->index = buf[0] & 0x7;
+               packet->index = SPE_HDR_SHORT_INDEX(buf[0]);
 
        return arm_spe_get_payload(buf, len, ext_hdr, packet);
 }
@@ -309,13 +310,13 @@ static int arm_spe_pkt_desc_counter(const struct 
arm_spe_pkt *packet,
                             (unsigned short)payload);
 
        switch (packet->index) {
-       case 0:
+       case SPE_CNT_PKT_HDR_INDEX_TOTAL_LAT:
                arm_spe_pkt_snprintf(&err, &buf, &blen, "TOT");
                break;
-       case 1:
+       case SPE_CNT_PKT_HDR_INDEX_ISSUE_LAT:
                arm_spe_pkt_snprintf(&err, &buf, &blen, "ISSUE");
                break;
-       case 2:
+       case SPE_CNT_PKT_HDR_INDEX_TRANS_LAT:
                arm_spe_pkt_snprintf(&err, &buf, &blen, "XLAT");
                break;
        default:
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 9bc876bffd35..7d8e34e35f05 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
@@ -82,6 +82,11 @@ struct arm_spe_pkt {
 /* Context packet header */
 #define SPE_CTX_PKT_HDR_INDEX(h)               ((h) & GENMASK_ULL(1, 0))
 
+/* Counter packet header */
+#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
+
 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