lkml.org 
[lkml]   [2020]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 09/14] perf arm-spe: Refactor counter packet handling
    Date
    This patch defines macros for counter packet header, and uses macro to
    replace hard code values for packet parsing.

    Signed-off-by: Leo Yan <leo.yan@linaro.org>
    ---
    .../util/arm-spe-decoder/arm-spe-pkt-decoder.c | 17 ++++++++++-------
    .../util/arm-spe-decoder/arm-spe-pkt-decoder.h | 9 +++++++++
    2 files changed, 19 insertions(+), 7 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 00a2cd1af422..ed0f4c74dfc5 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
    @@ -150,10 +150,13 @@ 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);
    - else
    - packet->index = buf[0] & 0x7;
    + if (ext_hdr) {
    + packet->index = (buf[1] & SPE_CNT_PKT_HDR_INDEX_MASK);
    + packet->index |= ((buf[0] & SPE_CNT_PKT_HDR_EXT_INDEX_MASK)
    + << SPE_CNT_PKT_HDR_EXT_INDEX_SHIFT);
    + } else {
    + packet->index = buf[0] & SPE_CNT_PKT_HDR_INDEX_MASK;
    + }

    return arm_spe_get_payload(buf, len, ext_hdr, packet);
    }
    @@ -431,17 +434,17 @@ int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf,
    return ret;

    switch (idx) {
    - case 0:
    + case SPE_CNT_PKT_HDR_INDEX_TOTAL_LAT:
    ret = arm_spe_pkt_snprintf(&buf, &blen, "TOT");
    if (ret < 0)
    return ret;
    break;
    - case 1:
    + case SPE_CNT_PKT_HDR_INDEX_ISSUE_LAT:
    ret = arm_spe_pkt_snprintf(&buf, &blen, "ISSUE");
    if (ret < 0)
    return ret;
    break;
    - case 2:
    + case SPE_CNT_PKT_HDR_INDEX_TRANS_LAT:
    ret = arm_spe_pkt_snprintf(&buf, &blen, "XLAT");
    if (ret < 0)
    return ret;
    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 62db4ff91832..18667a63f5ba 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
    @@ -89,6 +89,15 @@ struct arm_spe_pkt {
    /* Context packet header */
    #define SPE_CTX_PKT_HDR_INDEX_MASK GENMASK_ULL(1, 0)

    +/* Counter packet header */
    +#define SPE_CNT_PKT_HDR_INDEX_MASK GENMASK_ULL(2, 0)
    +#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)
    +
    +#define SPE_CNT_PKT_HDR_EXT_INDEX_MASK GENMASK_ULL(1, 0)
    +#define SPE_CNT_PKT_HDR_EXT_INDEX_SHIFT (3)
    +
    const char *arm_spe_pkt_name(enum arm_spe_pkt_type);

    int arm_spe_get_packet(const unsigned char *buf, size_t len,
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-09-29 15:42    [W:4.109 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site