On 22/10/2020 15:58, Leo Yan wrote:
Hi,
> 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>
> ---
> tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c | 11 ++++++-----
> tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h | 8 ++++++++
> 2 files changed, 14 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 023bcc9be3cc..6eebd30f3d78 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_CNT_PKT_HDR_EXTENDED_INDEX(buf[0], buf[1]);
> else
> - packet->index = buf[0] & 0x7;
> + packet->index = SPE_CNT_PKT_HDR_SHORT_INDEX(buf[0]);
>
> return arm_spe_get_payload(buf, len, ext_hdr, packet);
> }
> @@ -307,17 +308,17 @@ static int arm_spe_pkt_desc_counter(const struct
> arm_spe_pkt *packet,
> return ret;
>
> switch (packet->index) {
> - case 0:
> + case SPE_CNT_PKT_HDR_INDEX_TOTAL_LAT:
> ret = arm_spe_pkt_snprintf(&buf, &blen, "TOT");
> if (ret < 0)
> return ret;
> break;
> - case 1:
> + case SPE_CNT_PKT_HDR_INDEX_ISSUE_LAT:
> ret = arm_spe_pkt_snprintf(&buf, &blen, "ISSUE");
> if (ret < 0)
> return ret;
> break;
> - case 2:
> + case SPE_CNT_PKT_HDR_INDEX_TRANS_LAT:
> ret = arm_spe_pkt_snprintf(&buf, &blen, "XLAT");
> 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 8808f2d0b6e4..8a291f451ef8 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
> @@ -84,6 +84,14 @@ 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_SHORT_INDEX(h) ((h) & GENMASK_ULL(2,
> 0))
> +#define SPE_CNT_PKT_HDR_EXTENDED_INDEX(h0, h1) (((h0) & GENMASK_ULL(1,
> 0)) << 3 | \
> +
> SPE_ADDR_PKT_HDR_SHORT_INDEX(h1))
I would still like to see this merged with the SPE_ADDR_PKT_HDR_*_INDEX
definition in patch 10/20.
Otherwise this patch is fine.
Cheers,
Andre
> +#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,
>
