From: James Clark <james.clark@arm.com> To: mathieu.poirier@linaro.org, leo.yan@linaro.org, coresight@lists.linaro.org, linux-perf-users@vger.kernel.org, mike.leach@linaro.org Cc: acme@kernel.org, suzuki.poulose@arm.com, James Clark <james.clark@arm.com>, John Garry <john.garry@huawei.com>, Will Deacon <will@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/9] perf cs-etm: Refactor initialisation of decoder params. Date: Fri, 6 Aug 2021 14:41:01 +0100 [thread overview] Message-ID: <20210806134109.1182235-2-james.clark@arm.com> (raw) In-Reply-To: <20210806134109.1182235-1-james.clark@arm.com> The initialisation of the decoder params is duplicated between creation of the packet printer and packet decoder. Put them both into one function so that future changes only need to be made in one place. Reviewed-by: Leo Yan <leo.yan@linaro.org> Signed-off-by: James Clark <james.clark@arm.com> --- .../perf/util/cs-etm-decoder/cs-etm-decoder.c | 99 +++++-------------- 1 file changed, 25 insertions(+), 74 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 84cca3fc05a5..187c038caa19 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c @@ -227,55 +227,6 @@ cs_etm_decoder__init_raw_frame_logging( } #endif -static int cs_etm_decoder__create_packet_printer(struct cs_etm_decoder *decoder, - const char *decoder_name, - void *trace_config) -{ - u8 csid; - - if (ocsd_dt_create_decoder(decoder->dcd_tree, decoder_name, - OCSD_CREATE_FLG_PACKET_PROC, - trace_config, &csid)) - return -1; - - if (ocsd_dt_set_pkt_protocol_printer(decoder->dcd_tree, csid, 0)) - return -1; - - return 0; -} - -static int -cs_etm_decoder__create_etm_packet_printer(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; - void *trace_config; - - switch (t_params->protocol) { - 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) ? - 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; - trace_config = &trace_config_etmv4; - break; - default: - return -1; - } - - return cs_etm_decoder__create_packet_printer(decoder, - decoder_name, - trace_config); -} - static ocsd_datapath_resp_t cs_etm_decoder__do_soft_timestamp(struct cs_etm_queue *etmq, struct cs_etm_packet_queue *packet_queue, @@ -632,9 +583,10 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer( return resp; } -static int cs_etm_decoder__create_etm_packet_decoder( - struct cs_etm_trace_params *t_params, - struct cs_etm_decoder *decoder) +static int +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; @@ -660,31 +612,30 @@ static int cs_etm_decoder__create_etm_packet_decoder( return -1; } - if (ocsd_dt_create_decoder(decoder->dcd_tree, - decoder_name, - OCSD_CREATE_FLG_FULL_DECODER, - trace_config, &csid)) - return -1; + if (d_params->operation == CS_ETM_OPERATION_DECODE) { + if (ocsd_dt_create_decoder(decoder->dcd_tree, + decoder_name, + OCSD_CREATE_FLG_FULL_DECODER, + trace_config, &csid)) + return -1; - if (ocsd_dt_set_gen_elem_outfn(decoder->dcd_tree, - cs_etm_decoder__gen_trace_elem_printer, - decoder)) - return -1; + if (ocsd_dt_set_gen_elem_outfn(decoder->dcd_tree, + cs_etm_decoder__gen_trace_elem_printer, + decoder)) + return -1; - return 0; -} + return 0; + } else if (d_params->operation == CS_ETM_OPERATION_PRINT) { + if (ocsd_dt_create_decoder(decoder->dcd_tree, decoder_name, + OCSD_CREATE_FLG_PACKET_PROC, + trace_config, &csid)) + return -1; -static int -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) -{ - if (d_params->operation == CS_ETM_OPERATION_PRINT) - return cs_etm_decoder__create_etm_packet_printer(t_params, - decoder); - else if (d_params->operation == CS_ETM_OPERATION_DECODE) - return cs_etm_decoder__create_etm_packet_decoder(t_params, - decoder); + if (ocsd_dt_set_pkt_protocol_printer(decoder->dcd_tree, csid, 0)) + return -1; + + return 0; + } return -1; } -- 2.28.0
WARNING: multiple messages have this Message-ID (diff)
From: James Clark <james.clark@arm.com> To: mathieu.poirier@linaro.org, leo.yan@linaro.org, coresight@lists.linaro.org, linux-perf-users@vger.kernel.org, mike.leach@linaro.org Cc: acme@kernel.org, suzuki.poulose@arm.com, James Clark <james.clark@arm.com>, John Garry <john.garry@huawei.com>, Will Deacon <will@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/9] perf cs-etm: Refactor initialisation of decoder params. Date: Fri, 6 Aug 2021 14:41:01 +0100 [thread overview] Message-ID: <20210806134109.1182235-2-james.clark@arm.com> (raw) In-Reply-To: <20210806134109.1182235-1-james.clark@arm.com> The initialisation of the decoder params is duplicated between creation of the packet printer and packet decoder. Put them both into one function so that future changes only need to be made in one place. Reviewed-by: Leo Yan <leo.yan@linaro.org> Signed-off-by: James Clark <james.clark@arm.com> --- .../perf/util/cs-etm-decoder/cs-etm-decoder.c | 99 +++++-------------- 1 file changed, 25 insertions(+), 74 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 84cca3fc05a5..187c038caa19 100644 --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c @@ -227,55 +227,6 @@ cs_etm_decoder__init_raw_frame_logging( } #endif -static int cs_etm_decoder__create_packet_printer(struct cs_etm_decoder *decoder, - const char *decoder_name, - void *trace_config) -{ - u8 csid; - - if (ocsd_dt_create_decoder(decoder->dcd_tree, decoder_name, - OCSD_CREATE_FLG_PACKET_PROC, - trace_config, &csid)) - return -1; - - if (ocsd_dt_set_pkt_protocol_printer(decoder->dcd_tree, csid, 0)) - return -1; - - return 0; -} - -static int -cs_etm_decoder__create_etm_packet_printer(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; - void *trace_config; - - switch (t_params->protocol) { - 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) ? - 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; - trace_config = &trace_config_etmv4; - break; - default: - return -1; - } - - return cs_etm_decoder__create_packet_printer(decoder, - decoder_name, - trace_config); -} - static ocsd_datapath_resp_t cs_etm_decoder__do_soft_timestamp(struct cs_etm_queue *etmq, struct cs_etm_packet_queue *packet_queue, @@ -632,9 +583,10 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer( return resp; } -static int cs_etm_decoder__create_etm_packet_decoder( - struct cs_etm_trace_params *t_params, - struct cs_etm_decoder *decoder) +static int +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; @@ -660,31 +612,30 @@ static int cs_etm_decoder__create_etm_packet_decoder( return -1; } - if (ocsd_dt_create_decoder(decoder->dcd_tree, - decoder_name, - OCSD_CREATE_FLG_FULL_DECODER, - trace_config, &csid)) - return -1; + if (d_params->operation == CS_ETM_OPERATION_DECODE) { + if (ocsd_dt_create_decoder(decoder->dcd_tree, + decoder_name, + OCSD_CREATE_FLG_FULL_DECODER, + trace_config, &csid)) + return -1; - if (ocsd_dt_set_gen_elem_outfn(decoder->dcd_tree, - cs_etm_decoder__gen_trace_elem_printer, - decoder)) - return -1; + if (ocsd_dt_set_gen_elem_outfn(decoder->dcd_tree, + cs_etm_decoder__gen_trace_elem_printer, + decoder)) + return -1; - return 0; -} + return 0; + } else if (d_params->operation == CS_ETM_OPERATION_PRINT) { + if (ocsd_dt_create_decoder(decoder->dcd_tree, decoder_name, + OCSD_CREATE_FLG_PACKET_PROC, + trace_config, &csid)) + return -1; -static int -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) -{ - if (d_params->operation == CS_ETM_OPERATION_PRINT) - return cs_etm_decoder__create_etm_packet_printer(t_params, - decoder); - else if (d_params->operation == CS_ETM_OPERATION_DECODE) - return cs_etm_decoder__create_etm_packet_decoder(t_params, - decoder); + if (ocsd_dt_set_pkt_protocol_printer(decoder->dcd_tree, csid, 0)) + return -1; + + return 0; + } return -1; } -- 2.28.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-08-06 13:41 UTC|newest] Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-06 13:41 [PATCH v2 0/9] Support ETE decoding James Clark 2021-08-06 13:41 ` James Clark 2021-08-06 13:41 ` James Clark [this message] 2021-08-06 13:41 ` [PATCH v2 1/9] perf cs-etm: Refactor initialisation of decoder params James Clark 2021-09-03 8:52 ` Suzuki K Poulose 2021-09-03 8:52 ` Suzuki K Poulose 2021-09-03 11:05 ` Arnaldo Carvalho de Melo 2021-09-03 11:05 ` Arnaldo Carvalho de Melo 2021-09-05 21:24 ` Mike Leach 2021-09-05 21:24 ` Mike Leach 2021-08-06 13:41 ` [PATCH v2 2/9] perf cs-etm: Initialise architecture based on TRCIDR1 James Clark 2021-08-06 13:41 ` James Clark 2021-08-24 6:53 ` Leo Yan 2021-08-24 6:53 ` Leo Yan 2021-09-03 8:55 ` Suzuki K Poulose 2021-09-03 8:55 ` Suzuki K Poulose 2021-09-03 11:07 ` Arnaldo Carvalho de Melo 2021-09-03 11:07 ` Arnaldo Carvalho de Melo 2021-09-05 21:24 ` Mike Leach 2021-09-05 21:24 ` Mike Leach 2021-08-06 13:41 ` [PATCH v2 3/9] perf cs-etm: Refactor out ETMv4 header saving James Clark 2021-08-06 13:41 ` James Clark 2021-08-24 6:58 ` Leo Yan 2021-08-24 6:58 ` Leo Yan 2021-09-03 8:56 ` Suzuki K Poulose 2021-09-03 8:56 ` Suzuki K Poulose 2021-09-05 21:24 ` Mike Leach 2021-09-05 21:24 ` Mike Leach 2021-08-06 13:41 ` [PATCH v2 4/9] perf cs-etm: Save TRCDEVARCH register James Clark 2021-08-06 13:41 ` James Clark 2021-08-24 7:14 ` Leo Yan 2021-08-24 7:14 ` Leo Yan 2021-09-03 9:08 ` Suzuki K Poulose 2021-09-03 9:08 ` Suzuki K Poulose 2021-09-03 11:15 ` Arnaldo Carvalho de Melo 2021-09-03 11:15 ` Arnaldo Carvalho de Melo 2021-09-05 21:24 ` Mike Leach 2021-09-05 21:24 ` Mike Leach 2021-08-06 13:41 ` [PATCH v2 5/9] perf cs-etm: Fix typo James Clark 2021-08-06 13:41 ` James Clark 2021-08-24 7:15 ` Leo Yan 2021-08-24 7:15 ` Leo Yan 2021-09-03 9:09 ` Suzuki K Poulose 2021-09-03 9:09 ` Suzuki K Poulose 2021-09-05 21:24 ` Mike Leach 2021-09-05 21:24 ` Mike Leach 2021-08-06 13:41 ` [PATCH v2 6/9] perf cs-etm: Update OpenCSD decoder for ETE James Clark 2021-08-06 13:41 ` James Clark 2021-09-03 9:10 ` Suzuki K Poulose 2021-09-03 9:10 ` Suzuki K Poulose 2021-09-03 11:16 ` Arnaldo Carvalho de Melo 2021-09-03 11:16 ` Arnaldo Carvalho de Melo 2021-09-05 21:24 ` Mike Leach 2021-09-05 21:24 ` Mike Leach 2021-08-06 13:41 ` [PATCH v2 7/9] perf cs-etm: Create ETE decoder James Clark 2021-08-06 13:41 ` James Clark 2021-08-24 8:33 ` Leo Yan 2021-08-24 8:33 ` Leo Yan 2021-08-25 10:13 ` James Clark 2021-08-25 10:13 ` James Clark 2021-09-03 9:15 ` Suzuki K Poulose 2021-09-03 9:15 ` Suzuki K Poulose 2021-09-03 11:16 ` Arnaldo Carvalho de Melo 2021-09-03 11:16 ` Arnaldo Carvalho de Melo 2021-09-05 21:24 ` Mike Leach 2021-09-05 21:24 ` Mike Leach 2021-08-06 13:41 ` [PATCH v2 8/9] perf cs-etm: Print the decoder name James Clark 2021-08-06 13:41 ` James Clark 2021-09-03 9:17 ` Suzuki K Poulose 2021-09-03 9:17 ` Suzuki K Poulose 2021-09-03 11:18 ` Arnaldo Carvalho de Melo 2021-09-03 11:18 ` Arnaldo Carvalho de Melo 2021-09-03 11:52 ` Arnaldo Carvalho de Melo 2021-09-03 11:52 ` Arnaldo Carvalho de Melo 2021-09-05 21:24 ` Mike Leach 2021-09-05 21:24 ` Mike Leach 2021-08-06 13:41 ` [PATCH v2 9/9] perf cs-etm: Show a warning for an unknown magic number James Clark 2021-08-06 13:41 ` James Clark 2021-08-24 8:36 ` Leo Yan 2021-08-24 8:36 ` Leo Yan 2021-09-01 15:54 ` Arnaldo Carvalho de Melo 2021-09-01 15:54 ` Arnaldo Carvalho de Melo 2021-09-01 16:07 ` Arnaldo Carvalho de Melo 2021-09-01 16:07 ` Arnaldo Carvalho de Melo 2021-09-01 16:16 ` Arnaldo Carvalho de Melo 2021-09-01 16:16 ` Arnaldo Carvalho de Melo 2021-09-01 16:25 ` Arnaldo Carvalho de Melo 2021-09-01 16:25 ` Arnaldo Carvalho de Melo 2021-09-01 16:49 ` Arnaldo Carvalho de Melo 2021-09-01 16:49 ` Arnaldo Carvalho de Melo 2021-09-02 7:53 ` Leo Yan 2021-09-02 7:53 ` Leo Yan 2021-09-02 17:48 ` Mathieu Poirier 2021-09-02 17:48 ` Mathieu Poirier 2021-09-02 18:19 ` Arnaldo Carvalho de Melo 2021-09-02 18:19 ` Arnaldo Carvalho de Melo 2021-09-02 19:22 ` Mathieu Poirier 2021-09-02 19:22 ` Mathieu Poirier 2021-09-05 21:24 ` Mike Leach 2021-09-05 21:24 ` Mike Leach 2021-08-24 8:47 ` [PATCH v2 0/9] Support ETE decoding Leo Yan 2021-08-24 8:47 ` Leo Yan 2021-08-25 10:14 ` James Clark 2021-08-25 10:14 ` James Clark
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210806134109.1182235-2-james.clark@arm.com \ --to=james.clark@arm.com \ --cc=acme@kernel.org \ --cc=alexander.shishkin@linux.intel.com \ --cc=coresight@lists.linaro.org \ --cc=john.garry@huawei.com \ --cc=jolsa@redhat.com \ --cc=leo.yan@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-perf-users@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mathieu.poirier@linaro.org \ --cc=mike.leach@linaro.org \ --cc=namhyung@kernel.org \ --cc=suzuki.poulose@arm.com \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.