Commit d158aa40 authored by Leo Yan's avatar Leo Yan Committed by Arnaldo Carvalho de Melo
Browse files

perf arm-spe: Refactor counter packet handling 



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: default avatarLeo Yan <leo.yan@linaro.org>
Reviewed-by: default avatarAndre Przywara <andre.przywara@arm.com>
Acked-by: default avatarWill Deacon <will@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Al Grant <Al.Grant@arm.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Dave Martin <Dave.Martin@arm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wei Li <liwei391@huawei.com>
Link: https://lore.kernel.org/r/20201119152441.6972-9-leo.yan@linaro.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c52cfe98

tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c

+6 −5
Original line number Diff line number Diff line
@@ -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:

tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h

+5 −0
Original line number Diff line number Diff line
@@ -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,