Re: [PATCH] perf: cs-etm: Update decoder code for OpenCSD version 1.4

James Clark
2023-01-20T15:47:11Z

On 20/01/2023 15:37, Mike Leach wrote:
> OpenCSD version 1.4 is released with support for FEAT_ITE.
> This adds a new packet type, with associated output element ID in
> the packet type enum - OCSD_GEN_TRC_ELEM_INSTRUMENTATION.
>
> As we just ignore this packet in perf, add to the switch statement
> to avoid the "enum not handled in switch error", but conditionally
> so as not to break the perf build for older OpenCSD installations.
>
> Signed-off-by: Mike Leach <mike.leach@linaro.org>
> ---
> tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> 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 fa3aa9c0fb2e..48e7121880a9 100644
> --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
> +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c
> @@ -604,6 +604,9 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer(
> case OCSD_GEN_TRC_ELEM_CUSTOM:
> case OCSD_GEN_TRC_ELEM_SYNC_MARKER:
> case OCSD_GEN_TRC_ELEM_MEMTRANS:
> +#if (OCSD_VER_NUM >= 0x010400)
> + case OCSD_GEN_TRC_ELEM_INSTRUMENTATION:
> +#endif
> default:
> break;
> }

Checked the build with both old and new versions of OpenCSD and it's ok:

Reviewed-by: James Clark <james.clark@arm.com>