Messages in this thread | | | Date | Sat, 31 Jul 2021 15:30:37 +0800 | From | Leo Yan <> | Subject | Re: [PATCH 6/6] perf cs-etm: Print the decoder name |
| |
On Wed, Jul 21, 2021 at 10:07:05AM +0100, James Clark wrote: > Use the real name of the decoder instead of hard-coding "ETM" to avoid > confusion when the trace is ETE. This also now distinguishes between > ETMv3 and ETMv4. > > Signed-off-by: James Clark <james.clark@arm.com> > --- > tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 17 +++++++++++------ > tools/perf/util/cs-etm-decoder/cs-etm-decoder.h | 1 + > tools/perf/util/cs-etm.c | 4 ++-- > 3 files changed, 14 insertions(+), 8 deletions(-) > > 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 37bc9d6a7677..177c08f5be8d 100644 > --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > @@ -37,6 +37,7 @@ struct cs_etm_decoder { > dcd_tree_handle_t dcd_tree; > cs_etm_mem_cb_type mem_access; > ocsd_datapath_resp_t prev_return; > + const char *decoder_name; > }; > > static u32 > @@ -614,7 +615,6 @@ cs_etm_decoder__create_etm_decoder(struct cs_etm_decoder_params *d_params, > struct cs_etm_trace_params *t_params, > struct cs_etm_decoder *decoder) > { > - const char *decoder_name; > ocsd_etmv3_cfg config_etmv3; > ocsd_etmv4_cfg trace_config_etmv4; > ocsd_ete_cfg trace_config_ete; > @@ -625,19 +625,19 @@ cs_etm_decoder__create_etm_decoder(struct cs_etm_decoder_params *d_params, > case CS_ETM_PROTO_ETMV3: > case CS_ETM_PROTO_PTM: > cs_etm_decoder__gen_etmv3_config(t_params, &config_etmv3); > - decoder_name = (t_params->protocol == CS_ETM_PROTO_ETMV3) ? > + decoder->decoder_name = (t_params->protocol == CS_ETM_PROTO_ETMV3) ? > OCSD_BUILTIN_DCD_ETMV3 : > OCSD_BUILTIN_DCD_PTM; > trace_config = &config_etmv3; > break; > case CS_ETM_PROTO_ETMV4i: > cs_etm_decoder__gen_etmv4_config(t_params, &trace_config_etmv4); > - decoder_name = OCSD_BUILTIN_DCD_ETMV4I; > + decoder->decoder_name = OCSD_BUILTIN_DCD_ETMV4I; > trace_config = &trace_config_etmv4; > break; > case CS_ETM_PROTO_ETE: > cs_etm_decoder__gen_ete_config(t_params, &trace_config_ete); > - decoder_name = OCSD_BUILTIN_DCD_ETE; > + decoder->decoder_name = OCSD_BUILTIN_DCD_ETE; > trace_config = &trace_config_ete; > break; > default: > @@ -646,7 +646,7 @@ cs_etm_decoder__create_etm_decoder(struct cs_etm_decoder_params *d_params, > > if (d_params->operation == CS_ETM_OPERATION_DECODE) { > if (ocsd_dt_create_decoder(decoder->dcd_tree, > - decoder_name, > + decoder->decoder_name, > OCSD_CREATE_FLG_FULL_DECODER, > trace_config, &csid)) > return -1; > @@ -658,7 +658,7 @@ cs_etm_decoder__create_etm_decoder(struct cs_etm_decoder_params *d_params, > > return 0; > } else if (d_params->operation == CS_ETM_OPERATION_PRINT) { > - if (ocsd_dt_create_decoder(decoder->dcd_tree, decoder_name, > + if (ocsd_dt_create_decoder(decoder->dcd_tree, decoder->decoder_name, > OCSD_CREATE_FLG_PACKET_PROC, > trace_config, &csid)) > return -1; > @@ -790,3 +790,8 @@ void cs_etm_decoder__free(struct cs_etm_decoder *decoder) > decoder->dcd_tree = NULL; > free(decoder); > } > + > +const char *cs_etm_decoder__get_name(struct cs_etm_decoder *decoder) > +{ > + return decoder->decoder_name; > +}
Maybe can consider to place this function into the header file with "static inline" specifier.
Either way, this patch looks good to me:
Reviewed-by: Leo Yan <leo.yan@linaro.org>
> diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h > index 9137796fe3c5..fbd6786baf99 100644 > --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h > +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.h > @@ -99,5 +99,6 @@ int cs_etm_decoder__get_packet(struct cs_etm_packet_queue *packet_queue, > struct cs_etm_packet *packet); > > int cs_etm_decoder__reset(struct cs_etm_decoder *decoder); > +const char *cs_etm_decoder__get_name(struct cs_etm_decoder *decoder); > > #endif /* INCLUDE__CS_ETM_DECODER_H__ */ > diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c > index 870073bce670..bb7957afd9cb 100644 > --- a/tools/perf/util/cs-etm.c > +++ b/tools/perf/util/cs-etm.c > @@ -564,8 +564,8 @@ static void cs_etm__dump_event(struct cs_etm_queue *etmq, > > fprintf(stdout, "\n"); > color_fprintf(stdout, color, > - ". ... CoreSight ETM Trace data: size %zu bytes\n", > - buffer->size); > + ". ... CoreSight %s Trace data: size %zu bytes\n", > + cs_etm_decoder__get_name(etmq->decoder), buffer->size); > > do { > size_t consumed; > -- > 2.28.0 >
| |