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

perf arm-spe: Add new function arm_spe_pkt_desc_event() 



This patch moves out the event packet parsing from arm_spe_pkt_desc()
to the new function arm_spe_pkt_desc_event().

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-10-leo.yan@linaro.org


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

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

+37 −26
Original line number Diff line number Diff line
@@ -287,6 +287,42 @@ static int arm_spe_pkt_out_string(int *err, char **buf_p, size_t *blen, 
	return ret;

}



static int arm_spe_pkt_desc_event(const struct arm_spe_pkt *packet,

				  char *buf, size_t buf_len)

{

	u64 payload = packet->payload;

	int err = 0;



	arm_spe_pkt_out_string(&err, &buf, &buf_len, "EV");



	if (payload & 0x1)

		arm_spe_pkt_out_string(&err, &buf, &buf_len, " EXCEPTION-GEN");

	if (payload & 0x2)

		arm_spe_pkt_out_string(&err, &buf, &buf_len, " RETIRED");

	if (payload & 0x4)

		arm_spe_pkt_out_string(&err, &buf, &buf_len, " L1D-ACCESS");

	if (payload & 0x8)

		arm_spe_pkt_out_string(&err, &buf, &buf_len, " L1D-REFILL");

	if (payload & 0x10)

		arm_spe_pkt_out_string(&err, &buf, &buf_len, " TLB-ACCESS");

	if (payload & 0x20)

		arm_spe_pkt_out_string(&err, &buf, &buf_len, " TLB-REFILL");

	if (payload & 0x40)

		arm_spe_pkt_out_string(&err, &buf, &buf_len, " NOT-TAKEN");

	if (payload & 0x80)

		arm_spe_pkt_out_string(&err, &buf, &buf_len, " MISPRED");

	if (packet->index > 1) {

		if (payload & 0x100)

			arm_spe_pkt_out_string(&err, &buf, &buf_len, " LLC-ACCESS");

		if (payload & 0x200)

			arm_spe_pkt_out_string(&err, &buf, &buf_len, " LLC-REFILL");

		if (payload & 0x400)

			arm_spe_pkt_out_string(&err, &buf, &buf_len, " REMOTE-ACCESS");

	}



	return err;

}



static int arm_spe_pkt_desc_addr(const struct arm_spe_pkt *packet,

				 char *buf, size_t buf_len)

{
@@ -367,32 +403,7 @@ int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf, 
		arm_spe_pkt_out_string(&err, &buf, &blen, "%s", name);

		break;

	case ARM_SPE_EVENTS:

		arm_spe_pkt_out_string(&err, &buf, &blen, "EV");



		if (payload & 0x1)

			arm_spe_pkt_out_string(&err, &buf, &blen, " EXCEPTION-GEN");

		if (payload & 0x2)

			arm_spe_pkt_out_string(&err, &buf, &blen, " RETIRED");

		if (payload & 0x4)

			arm_spe_pkt_out_string(&err, &buf, &blen, " L1D-ACCESS");

		if (payload & 0x8)

			arm_spe_pkt_out_string(&err, &buf, &blen, " L1D-REFILL");

		if (payload & 0x10)

			arm_spe_pkt_out_string(&err, &buf, &blen, " TLB-ACCESS");

		if (payload & 0x20)

			arm_spe_pkt_out_string(&err, &buf, &blen, " TLB-REFILL");

		if (payload & 0x40)

			arm_spe_pkt_out_string(&err, &buf, &blen, " NOT-TAKEN");

		if (payload & 0x80)

			arm_spe_pkt_out_string(&err, &buf, &blen, " MISPRED");

		if (idx > 1) {

			if (payload & 0x100)

				arm_spe_pkt_out_string(&err, &buf, &blen, " LLC-ACCESS");

			if (payload & 0x200)

				arm_spe_pkt_out_string(&err, &buf, &blen, " LLC-REFILL");

			if (payload & 0x400)

				arm_spe_pkt_out_string(&err, &buf, &blen, " REMOTE-ACCESS");

		}

		err = arm_spe_pkt_desc_event(packet, buf, buf_len);

		break;

	case ARM_SPE_OP_TYPE:

		switch (idx) {