Re: [PATCH v3 14/20] perf arm-spe: Refactor event type handling

[André Przywara]

On 22/10/2020 15:58, Leo Yan wrote:

Hi,

> Move the enums of event types to arm-spe-pkt-decoder.h, thus function
> arm_spe_pkt_desc() can them for bitmasks.
> 
> Suggested-by: Andre Przywara <andre.przywara@xxxxxxx>
> Signed-off-by: Leo Yan <leo.yan@xxxxxxxxxx>

The move is fine, and I checked the bitmasks as well.

Reviewed-by: Andre Przywara <andre.przywara@xxxxxxx>

Cheers,
Andre

> ---
>  .../util/arm-spe-decoder/arm-spe-decoder.h    | 17 --------------
>  .../arm-spe-decoder/arm-spe-pkt-decoder.c     | 22 +++++++++----------
>  .../arm-spe-decoder/arm-spe-pkt-decoder.h     | 18 +++++++++++++++
>  3 files changed, 29 insertions(+), 28 deletions(-)
> 
> diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-decoder.h b/tools/perf/util/arm-spe-decoder/arm-spe-decoder.h
> index a5111a8d4360..24727b8ca7ff 100644
> --- a/tools/perf/util/arm-spe-decoder/arm-spe-decoder.h
> +++ b/tools/perf/util/arm-spe-decoder/arm-spe-decoder.h
> @@ -13,23 +13,6 @@
>  
>  #include "arm-spe-pkt-decoder.h"
>  
> -enum arm_spe_events {
> -	EV_EXCEPTION_GEN	= 0,
> -	EV_RETIRED		= 1,
> -	EV_L1D_ACCESS		= 2,
> -	EV_L1D_REFILL		= 3,
> -	EV_TLB_ACCESS		= 4,
> -	EV_TLB_WALK		= 5,
> -	EV_NOT_TAKEN		= 6,
> -	EV_MISPRED		= 7,
> -	EV_LLC_ACCESS		= 8,
> -	EV_LLC_MISS		= 9,
> -	EV_REMOTE_ACCESS	= 10,
> -	EV_ALIGNMENT		= 11,
> -	EV_PARTIAL_PREDICATE	= 17,
> -	EV_EMPTY_PREDICATE	= 18,
> -};
> -
>  enum arm_spe_sample_type {
>  	ARM_SPE_L1D_ACCESS	= 1 << 0,
>  	ARM_SPE_L1D_MISS	= 1 << 1,
> 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 8a6b50f32a52..58a1390b7a43 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
> @@ -277,58 +277,58 @@ static int arm_spe_pkt_desc_event(const struct arm_spe_pkt *packet,
>  	if (ret < 0)
>  		return ret;
>  
> -	if (payload & 0x1) {
> +	if (payload & BIT(EV_EXCEPTION_GEN)) {
>  		ret = arm_spe_pkt_snprintf(&buf, &blen, " EXCEPTION-GEN");
>  		if (ret < 0)
>  			return ret;
>  	}
> -	if (payload & 0x2) {
> +	if (payload & BIT(EV_RETIRED)) {
>  		ret = arm_spe_pkt_snprintf(&buf, &blen, " RETIRED");
>  		if (ret < 0)
>  			return ret;
>  	}
> -	if (payload & 0x4) {
> +	if (payload & BIT(EV_L1D_ACCESS)) {
>  		ret = arm_spe_pkt_snprintf(&buf, &blen, " L1D-ACCESS");
>  		if (ret < 0)
>  			return ret;
>  	}
> -	if (payload & 0x8) {
> +	if (payload & BIT(EV_L1D_REFILL)) {
>  		ret = arm_spe_pkt_snprintf(&buf, &blen, " L1D-REFILL");
>  		if (ret < 0)
>  			return ret;
>  	}
> -	if (payload & 0x10) {
> +	if (payload & BIT(EV_TLB_ACCESS)) {
>  		ret = arm_spe_pkt_snprintf(&buf, &blen, " TLB-ACCESS");
>  		if (ret < 0)
>  			return ret;
>  	}
> -	if (payload & 0x20) {
> +	if (payload & BIT(EV_TLB_WALK)) {
>  		ret = arm_spe_pkt_snprintf(&buf, &blen, " TLB-REFILL");
>  		if (ret < 0)
>  			return ret;
>  	}
> -	if (payload & 0x40) {
> +	if (payload & BIT(EV_NOT_TAKEN)) {
>  		ret = arm_spe_pkt_snprintf(&buf, &blen, " NOT-TAKEN");
>  		if (ret < 0)
>  			return ret;
>  	}
> -	if (payload & 0x80) {
> +	if (payload & BIT(EV_MISPRED)) {
>  		ret = arm_spe_pkt_snprintf(&buf, &blen, " MISPRED");
>  		if (ret < 0)
>  			return ret;
>  	}
>  	if (packet->index > 1) {
> -		if (payload & 0x100) {
> +		if (payload & BIT(EV_LLC_ACCESS)) {
>  			ret = arm_spe_pkt_snprintf(&buf, &blen, " LLC-ACCESS");
>  			if (ret < 0)
>  				return ret;
>  		}
> -		if (payload & 0x200) {
> +		if (payload & BIT(EV_LLC_MISS)) {
>  			ret = arm_spe_pkt_snprintf(&buf, &blen, " LLC-REFILL");
>  			if (ret < 0)
>  				return ret;
>  		}
> -		if (payload & 0x400) {
> +		if (payload & BIT(EV_REMOTE_ACCESS)) {
>  			ret = arm_spe_pkt_snprintf(&buf, &blen, " REMOTE-ACCESS");
>  			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 8a291f451ef8..12c344454cf1 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
> @@ -92,6 +92,24 @@ struct arm_spe_pkt {
>  #define SPE_CNT_PKT_HDR_INDEX_ISSUE_LAT		0x1
>  #define SPE_CNT_PKT_HDR_INDEX_TRANS_LAT		0x2
>  
> +/* Event packet payload */
> +enum arm_spe_events {
> +	EV_EXCEPTION_GEN	= 0,
> +	EV_RETIRED		= 1,
> +	EV_L1D_ACCESS		= 2,
> +	EV_L1D_REFILL		= 3,
> +	EV_TLB_ACCESS		= 4,
> +	EV_TLB_WALK		= 5,
> +	EV_NOT_TAKEN		= 6,
> +	EV_MISPRED		= 7,
> +	EV_LLC_ACCESS		= 8,
> +	EV_LLC_MISS		= 9,
> +	EV_REMOTE_ACCESS	= 10,
> +	EV_ALIGNMENT		= 11,
> +	EV_PARTIAL_PREDICATE	= 17,
> +	EV_EMPTY_PREDICATE	= 18,
> +};
> +
>  const char *arm_spe_pkt_name(enum arm_spe_pkt_type);
>  
>  int arm_spe_get_packet(const unsigned char *buf, size_t len,
>