Re: [PATCH] perf tools: Update OpenCSD to v1.0.0

[Mathieu Poirier]

On Fri, Jan 08, 2021 at 04:27:52PM +0200, James Clark wrote:
> Replace the OCSD_INSTR switch statement with an if to
> fix compilation error about unhandled values and avoid
> this issue again in the future.
> 
> Add new OCSD_GEN_TRC_ELEM_SYNC_MARKER and
> OCSD_GEN_TRC_ELEM_MEMTRANS enum values to fix unhandled
> value compilation error. Currently they are ignored.
> 
> Increase the minimum version number to v1.0.0 now
> that new enum values are used that are only present
> in this version.
> 
> Signed-off-by: James Clark <james.clark@xxxxxxx>
> Cc: John Garry <john.garry@xxxxxxxxxx>
> Cc: Will Deacon <will@xxxxxxxxxx>
> Cc: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
> Cc: Leo Yan <leo.yan@xxxxxxxxxx>
> Cc: Suzuki K Poulose <suzuki.poulose@xxxxxxx>
> Cc: Mike Leach <mike.leach@xxxxxxxxxx>
> Cc: Al Grant <al.grant@xxxxxxx>
> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxxxxx>
> Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> Cc: Mark Rutland <mark.rutland@xxxxxxx>
> Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
> Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
> Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
> ---
>  tools/build/feature/test-libopencsd.c           |  4 ++--
>  tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 15 ++++-----------
>  2 files changed, 6 insertions(+), 13 deletions(-)
> 
> diff --git a/tools/build/feature/test-libopencsd.c b/tools/build/feature/test-libopencsd.c
> index 1547bc2c0950..52c790b0317b 100644
> --- a/tools/build/feature/test-libopencsd.c
> +++ b/tools/build/feature/test-libopencsd.c
> @@ -4,9 +4,9 @@
>  /*
>   * Check OpenCSD library version is sufficient to provide required features
>   */
> -#define OCSD_MIN_VER ((0 << 16) | (14 << 8) | (0))
> +#define OCSD_MIN_VER ((1 << 16) | (0 << 8) | (0))
>  #if !defined(OCSD_VER_NUM) || (OCSD_VER_NUM < OCSD_MIN_VER)
> -#error "OpenCSD >= 0.14.0 is required"
> +#error "OpenCSD >= 1.0.0 is required"
>  #endif
>  
>  int main(void)
> diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
> index cd007cc9c283..3f4bc4050477 100644
> --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
> +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
> @@ -419,19 +419,10 @@ cs_etm_decoder__buffer_range(struct cs_etm_queue *etmq,
>  	packet->last_instr_subtype = elem->last_i_subtype;
>  	packet->last_instr_cond = elem->last_instr_cond;
>  
> -	switch (elem->last_i_type) {
> -	case OCSD_INSTR_BR:
> -	case OCSD_INSTR_BR_INDIRECT:
> +	if (elem->last_i_type == OCSD_INSTR_BR || elem->last_i_type == OCSD_INSTR_BR_INDIRECT)
>  		packet->last_instr_taken_branch = elem->last_instr_exec;
> -		break;
> -	case OCSD_INSTR_ISB:
> -	case OCSD_INSTR_DSB_DMB:
> -	case OCSD_INSTR_WFI_WFE:
> -	case OCSD_INSTR_OTHER:
> -	default:
> +	else
>  		packet->last_instr_taken_branch = false;
> -		break;
> -	}
>  
>  	packet->last_instr_size = elem->last_instr_sz;
>  
> @@ -572,6 +563,8 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer(
>  	case OCSD_GEN_TRC_ELEM_EVENT:
>  	case OCSD_GEN_TRC_ELEM_SWTRACE:
>  	case OCSD_GEN_TRC_ELEM_CUSTOM:
> +	case OCSD_GEN_TRC_ELEM_SYNC_MARKER:
> +	case OCSD_GEN_TRC_ELEM_MEMTRANS:
>  	default:
>  		break;

Reviewed-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>

Arnaldo please consider.

Thanks,
Mathieu

>  	}
> -- 
> 2.28.0
>