On 27/10/2020 03:09, Leo Yan wrote:
Hi,
> From: Wei Li <liwei...@huawei.com>
>
> This patch is to support Armv8.3 extension for SPE, it adds alignment
> field in the Events packet and it supports the Scalable Vector Extension
> (SVE) for Operation packet and Events packet with two additions:
>
> - The vector length for SVE operations in the Operation Type packet;
> - The incomplete predicate and empty predicate fields in the Events
> packet.
>
> Signed-off-by: Wei Li <liwei...@huawei.com>
> Signed-off-by: Leo Yan <leo....@linaro.org>
Looks correct, checked all bit patterns in the manual.
Reviewed-by: Andre Przywara <andre.przyw...@arm.com>
Cheers,
Andre
> ---
> .../arm-spe-decoder/arm-spe-pkt-decoder.c | 72 ++++++++++++++++++-
> .../arm-spe-decoder/arm-spe-pkt-decoder.h | 16 +++++
> 2 files changed, 86 insertions(+), 2 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 5195ec3b1ec4..40b12d6893f9 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
> @@ -332,6 +332,21 @@ static int arm_spe_pkt_desc_event(const struct
> arm_spe_pkt *packet,
> if (ret < 0)
> return ret;
> }
> + if (payload & BIT(EV_ALIGNMENT)) {
> + ret = arm_spe_pkt_snprintf(&buf, &blen, " ALIGNMENT");
> + if (ret < 0)
> + return ret;
> + }
> + if (payload & BIT(EV_PARTIAL_PREDICATE)) {
> + ret = arm_spe_pkt_snprintf(&buf, &blen, " SVE-PARTIAL-PRED");
> + if (ret < 0)
> + return ret;
> + }
> + if (payload & BIT(EV_EMPTY_PREDICATE)) {
> + ret = arm_spe_pkt_snprintf(&buf, &blen, " SVE-EMPTY-PRED");
> + if (ret < 0)
> + return ret;
> + }
>
> return buf_len - blen;
> }
> @@ -345,8 +360,42 @@ static int arm_spe_pkt_desc_op_type(const struct
> arm_spe_pkt *packet,
>
> switch (class) {
> case SPE_OP_PKT_HDR_CLASS_OTHER:
> - return arm_spe_pkt_snprintf(&buf, &blen,
> - payload & SPE_OP_PKT_COND ? "COND-SELECT" :
> "INSN-OTHER");
> + if (SPE_OP_PKT_IS_OTHER_SVE_OP(payload)) {
> +
> + ret = arm_spe_pkt_snprintf(&buf, &blen, "SVE-OTHER");
> + if (ret < 0)
> + return ret;
> +
> + /* SVE effective vector length */
> + ret = arm_spe_pkt_snprintf(&buf, &blen, " EVLEN %d",
> + SPE_OP_PKG_SVE_EVL(payload));
> + if (ret < 0)
> + return ret;
> +
> + if (payload & SPE_OP_PKT_SVE_FP) {
> + ret = arm_spe_pkt_snprintf(&buf, &blen, " FP");
> + if (ret < 0)
> + return ret;
> + }
> + if (payload & SPE_OP_PKT_SVE_PRED) {
> + ret = arm_spe_pkt_snprintf(&buf, &blen, "
> PRED");
> + if (ret < 0)
> + return ret;
> + }
> + } else {
> + ret = arm_spe_pkt_snprintf(&buf, &blen, "OTHER");
> + if (ret < 0)
> + return ret;
> +
> + ret = arm_spe_pkt_snprintf(&buf, &blen, " %s",
> + payload & SPE_OP_PKT_COND ?
> + "COND-SELECT" : "INSN-OTHER");
> + if (ret < 0)
> + return ret;
> + }
> +
> + return buf_len - blen;
> +
> case SPE_OP_PKT_HDR_CLASS_LD_ST_ATOMIC:
> ret = arm_spe_pkt_snprintf(&buf, &blen,
> payload & SPE_OP_PKT_ST ? "ST" :
> "LD");
> @@ -400,6 +449,25 @@ static int arm_spe_pkt_desc_op_type(const struct
> arm_spe_pkt *packet,
> break;
> }
>
> + if (SPE_OP_PKT_IS_LDST_SVE(payload)) {
> + /* SVE effective vector length */
> + ret = arm_spe_pkt_snprintf(&buf, &blen, " EVLEN %d",
> + SPE_OP_PKG_SVE_EVL(payload));
> + if (ret < 0)
> + return ret;
> +
> + if (payload & SPE_OP_PKT_SVE_PRED) {
> + ret = arm_spe_pkt_snprintf(&buf, &blen, "
> PRED");
> + if (ret < 0)
> + return ret;
> + }
> + if (payload & SPE_OP_PKT_SVE_SG) {
> + ret = arm_spe_pkt_snprintf(&buf, &blen, " SG");
> + if (ret < 0)
> + return ret;
> + }
> + }
> +
> return buf_len - blen;
>
> case SPE_OP_PKT_HDR_CLASS_BR_ERET:
> 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 1ad14885c2a1..9b970e7bf1e2 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
> @@ -113,6 +113,8 @@ enum arm_spe_events {
> #define SPE_OP_PKT_HDR_CLASS_LD_ST_ATOMIC 0x1
> #define SPE_OP_PKT_HDR_CLASS_BR_ERET 0x2
>
> +#define SPE_OP_PKT_IS_OTHER_SVE_OP(v) (((v) & (BIT(7) |
> BIT(3) | BIT(0))) == 0x8)
> +
> #define SPE_OP_PKT_COND BIT(0)
>
> #define SPE_OP_PKT_LDST_SUBCLASS_GET(v) ((v) & GENMASK_ULL(7,
> 1))
> @@ -128,6 +130,20 @@ enum arm_spe_events {
> #define SPE_OP_PKT_AT BIT(2)
> #define SPE_OP_PKT_ST BIT(0)
>
> +#define SPE_OP_PKT_IS_LDST_SVE(v) (((v) & (BIT(3) | BIT(1))) ==
> 0x8)
> +
> +#define SPE_OP_PKT_SVE_SG BIT(7)
> +/*
> + * SVE effective vector length (EVL) is stored in byte 0 bits [6:4];
> + * the length is rounded up to a power of two and use 32 as one step,
> + * so EVL calculation is:
> + *
> + * 32 * (2 ^ bits [6:4]) = 32 << (bits [6:4])
> + */
> +#define SPE_OP_PKG_SVE_EVL(v) (32 << (((v) &
> GENMASK_ULL(6, 4)) >> 4))
> +#define SPE_OP_PKT_SVE_PRED BIT(2)
> +#define SPE_OP_PKT_SVE_FP BIT(1)
> +
> #define SPE_OP_PKT_IS_INDIRECT_BRANCH(v) (((v) & GENMASK_ULL(7, 1)) ==
> 0x2)
>
> const char *arm_spe_pkt_name(enum arm_spe_pkt_type);
>
