From: Leo Yan <leo.yan@linaro.org> To: Arnaldo Carvalho de Melo <acme@kernel.org>, Andre Przywara <andre.przywara@arm.com>, Dave Martin <Dave.Martin@arm.com>, James Clark <james.clark@arm.com>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>, Al Grant <Al.Grant@arm.com>, Wei Li <liwei391@huawei.com>, John Garry <john.garry@huawei.com>, Will Deacon <will@kernel.org>, Mathieu Poirier <mathieu.poirier@linaro.org>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan <leo.yan@linaro.org> Subject: [PATCH v9 08/16] perf arm-spe: Refactor counter packet handling Date: Thu, 19 Nov 2020 23:24:33 +0800 [thread overview] Message-ID: <20201119152441.6972-9-leo.yan@linaro.org> (raw) In-Reply-To: <20201119152441.6972-1-leo.yan@linaro.org> This patch defines macros for counter packet header, and uses macros to replace hard code values in functions arm_spe_get_counter() and arm_spe_pkt_desc(). In the function arm_spe_get_counter(), adds a new line for more readable. Signed-off-by: Leo Yan <leo.yan@linaro.org> Reviewed-by: Andre Przywara <andre.przywara@arm.com> --- tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c | 11 ++++++----- tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h | 5 +++++ 2 files changed, 11 insertions(+), 5 deletions(-) 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 397ade5ffdeb..52f4339b1f0c 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 @@ -152,10 +152,11 @@ static int arm_spe_get_counter(const unsigned char *buf, size_t len, const unsigned char ext_hdr, struct arm_spe_pkt *packet) { packet->type = ARM_SPE_COUNTER; + if (ext_hdr) - packet->index = ((buf[0] & 0x3) << 3) | (buf[1] & 0x7); + packet->index = SPE_HDR_EXTENDED_INDEX(buf[0], buf[1]); else - packet->index = buf[0] & 0x7; + packet->index = SPE_HDR_SHORT_INDEX(buf[0]); return arm_spe_get_payload(buf, len, ext_hdr, packet); } @@ -333,13 +334,13 @@ static int arm_spe_pkt_desc_counter(const struct arm_spe_pkt *packet, (unsigned short)payload); switch (packet->index) { - case 0: + case SPE_CNT_PKT_HDR_INDEX_TOTAL_LAT: arm_spe_pkt_out_string(&err, &buf, &buf_len, "TOT"); break; - case 1: + case SPE_CNT_PKT_HDR_INDEX_ISSUE_LAT: arm_spe_pkt_out_string(&err, &buf, &buf_len, "ISSUE"); break; - case 2: + case SPE_CNT_PKT_HDR_INDEX_TRANS_LAT: arm_spe_pkt_out_string(&err, &buf, &buf_len, "XLAT"); break; default: 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 9bc876bffd35..7d8e34e35f05 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 @@ -82,6 +82,11 @@ struct arm_spe_pkt { /* Context packet header */ #define SPE_CTX_PKT_HDR_INDEX(h) ((h) & GENMASK_ULL(1, 0)) +/* Counter packet header */ +#define SPE_CNT_PKT_HDR_INDEX_TOTAL_LAT 0x0 +#define SPE_CNT_PKT_HDR_INDEX_ISSUE_LAT 0x1 +#define SPE_CNT_PKT_HDR_INDEX_TRANS_LAT 0x2 + const char *arm_spe_pkt_name(enum arm_spe_pkt_type); int arm_spe_get_packet(const unsigned char *buf, size_t len, -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Leo Yan <leo.yan@linaro.org> To: Arnaldo Carvalho de Melo <acme@kernel.org>, Andre Przywara <andre.przywara@arm.com>, Dave Martin <Dave.Martin@arm.com>, James Clark <james.clark@arm.com>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>, Al Grant <Al.Grant@arm.com>, Wei Li <liwei391@huawei.com>, John Garry <john.garry@huawei.com>, Will Deacon <will@kernel.org>, Mathieu Poirier <mathieu.poirier@linaro.org>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan <leo.yan@linaro.org> Subject: [PATCH v9 08/16] perf arm-spe: Refactor counter packet handling Date: Thu, 19 Nov 2020 23:24:33 +0800 [thread overview] Message-ID: <20201119152441.6972-9-leo.yan@linaro.org> (raw) In-Reply-To: <20201119152441.6972-1-leo.yan@linaro.org> This patch defines macros for counter packet header, and uses macros to replace hard code values in functions arm_spe_get_counter() and arm_spe_pkt_desc(). In the function arm_spe_get_counter(), adds a new line for more readable. Signed-off-by: Leo Yan <leo.yan@linaro.org> Reviewed-by: Andre Przywara <andre.przywara@arm.com> --- tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c | 11 ++++++----- tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h | 5 +++++ 2 files changed, 11 insertions(+), 5 deletions(-) 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 397ade5ffdeb..52f4339b1f0c 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 @@ -152,10 +152,11 @@ static int arm_spe_get_counter(const unsigned char *buf, size_t len, const unsigned char ext_hdr, struct arm_spe_pkt *packet) { packet->type = ARM_SPE_COUNTER; + if (ext_hdr) - packet->index = ((buf[0] & 0x3) << 3) | (buf[1] & 0x7); + packet->index = SPE_HDR_EXTENDED_INDEX(buf[0], buf[1]); else - packet->index = buf[0] & 0x7; + packet->index = SPE_HDR_SHORT_INDEX(buf[0]); return arm_spe_get_payload(buf, len, ext_hdr, packet); } @@ -333,13 +334,13 @@ static int arm_spe_pkt_desc_counter(const struct arm_spe_pkt *packet, (unsigned short)payload); switch (packet->index) { - case 0: + case SPE_CNT_PKT_HDR_INDEX_TOTAL_LAT: arm_spe_pkt_out_string(&err, &buf, &buf_len, "TOT"); break; - case 1: + case SPE_CNT_PKT_HDR_INDEX_ISSUE_LAT: arm_spe_pkt_out_string(&err, &buf, &buf_len, "ISSUE"); break; - case 2: + case SPE_CNT_PKT_HDR_INDEX_TRANS_LAT: arm_spe_pkt_out_string(&err, &buf, &buf_len, "XLAT"); break; default: 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 9bc876bffd35..7d8e34e35f05 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 @@ -82,6 +82,11 @@ struct arm_spe_pkt { /* Context packet header */ #define SPE_CTX_PKT_HDR_INDEX(h) ((h) & GENMASK_ULL(1, 0)) +/* Counter packet header */ +#define SPE_CNT_PKT_HDR_INDEX_TOTAL_LAT 0x0 +#define SPE_CNT_PKT_HDR_INDEX_ISSUE_LAT 0x1 +#define SPE_CNT_PKT_HDR_INDEX_TRANS_LAT 0x2 + const char *arm_spe_pkt_name(enum arm_spe_pkt_type); int arm_spe_get_packet(const unsigned char *buf, size_t len, -- 2.17.1 _______________________________________________ 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:[~2020-11-19 15:25 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-19 15:24 [PATCH v9 00/16] perf arm-spe: Refactor decoding & dumping flow Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-19 15:24 ` [PATCH v9 01/16] perf arm-spe: Refactor printing string to buffer Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-26 12:11 ` Arnaldo Carvalho de Melo 2020-11-26 12:11 ` Arnaldo Carvalho de Melo 2020-11-26 14:31 ` Leo Yan 2020-11-26 14:31 ` Leo Yan 2020-11-19 15:24 ` [PATCH v9 02/16] perf arm-spe: Refactor packet header parsing Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-19 15:24 ` [PATCH v9 03/16] perf arm-spe: Add new function arm_spe_pkt_desc_addr() Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-19 15:24 ` [PATCH v9 04/16] perf arm-spe: Refactor address packet handling Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-19 15:24 ` [PATCH v9 05/16] perf arm_spe: Fixup top byte for data virtual address Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-19 15:24 ` [PATCH v9 06/16] perf arm-spe: Refactor context packet handling Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-19 15:24 ` [PATCH v9 07/16] perf arm-spe: Add new function arm_spe_pkt_desc_counter() Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-19 15:24 ` Leo Yan [this message] 2020-11-19 15:24 ` [PATCH v9 08/16] perf arm-spe: Refactor counter packet handling Leo Yan 2020-11-19 15:24 ` [PATCH v9 09/16] perf arm-spe: Add new function arm_spe_pkt_desc_event() Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-19 15:24 ` [PATCH v9 10/16] perf arm-spe: Refactor event type handling Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-19 15:24 ` [PATCH v9 11/16] perf arm-spe: Remove size condition checking for events Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-19 15:24 ` [PATCH v9 12/16] perf arm-spe: Add new function arm_spe_pkt_desc_op_type() Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-19 15:24 ` [PATCH v9 13/16] perf arm-spe: Refactor operation packet handling Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-19 15:24 ` [PATCH v9 14/16] perf arm-spe: Add more sub classes for operation packet Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-19 15:24 ` [PATCH v9 15/16] perf arm_spe: Decode memory tagging properties Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-19 15:24 ` [PATCH v9 16/16] perf arm-spe: Add support for ARMv8.3-SPE Leo Yan 2020-11-19 15:24 ` Leo Yan 2020-11-25 14:17 ` [PATCH v9 00/16] perf arm-spe: Refactor decoding & dumping flow Will Deacon 2020-11-25 14:17 ` Will Deacon 2020-11-26 12:10 ` Arnaldo Carvalho de Melo 2020-11-26 12:10 ` Arnaldo Carvalho de Melo 2020-11-26 14:30 ` Leo Yan 2020-11-26 14:30 ` Leo Yan
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=20201119152441.6972-9-leo.yan@linaro.org \ --to=leo.yan@linaro.org \ --cc=Al.Grant@arm.com \ --cc=Dave.Martin@arm.com \ --cc=acme@kernel.org \ --cc=alexander.shishkin@linux.intel.com \ --cc=andre.przywara@arm.com \ --cc=james.clark@arm.com \ --cc=john.garry@huawei.com \ --cc=jolsa@redhat.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=liwei391@huawei.com \ --cc=mark.rutland@arm.com \ --cc=mathieu.poirier@linaro.org \ --cc=mingo@redhat.com \ --cc=namhyung@kernel.org \ --cc=peterz@infradead.org \ --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.