This patch defines macros for counter packet header, and uses macro to replace hard code values for packet parsing.
Signed-off-by: Leo Yan <[email protected]> --- .../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
