perf arm-spe: Add raw decoding for SPEv1.2 previous branch address
PATCH 1/1 perf arm-spe: Add raw decoding for SPEv1.2 previous branch address
Arm SPEv1.2 adds a new optional address packet type: previous branch target. The recorded address is the target virtual address of the most recently taken branch in program order.
Add support for decoding the address packet in raw dumps.
--- tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c | 4 +++- tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)
tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c +3 -1
@@ -422,16 +422,18 @@ static int arm_spe_pkt_desc_addr(const struct arm_spe_pkt *packet,int ch, pat;u64 payload = packet->payload;int err =0 ; +static const char *idx_name[] = {"PC" ,"TGT" ,"VA" ,"PA" ,"LBR" };switch (idx) {case SPE_ADDR_PKT_HDR_INDEX_INS :case SPE_ADDR_PKT_HDR_INDEX_BRANCH : +case SPE_ADDR_PKT_HDR_INDEX_PREV_BRANCH : ns = !!SPE_ADDR_PKT_GET_NS (payload); el =SPE_ADDR_PKT_GET_EL (payload); payload =SPE_ADDR_PKT_ADDR_GET_BYTES_0_6 (payload);arm_spe_pkt_out_string (&err, &buf, &buf_len,"%s 0x%llx el%d ns=%d" , - (idx ==1 ) ?"TGT" :"PC" , payload, el, ns); + idx_name[idx], payload, el, ns);break ;case SPE_ADDR_PKT_HDR_INDEX_DATA_VIRT : arm_spe_pkt_out_string(&err, &buf, &buf_len,
tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h +1 -0
@@ -65,6 +65,7 @@ struct arm_spe_pkt {#define SPE_ADDR_PKT_HDR_INDEX_BRANCH 0x1#define SPE_ADDR_PKT_HDR_INDEX_DATA_VIRT 0x2#define SPE_ADDR_PKT_HDR_INDEX_DATA_PHYS 0x3 +#define SPE_ADDR_PKT_HDR_INDEX_PREV_BRANCH 0x4/* Address packet payload */ #define SPE_ADDR_PKT_ADDR_BYTE7_SHIFT 56
Signature · 1 line
2.39.0
Quoted 17 lines · Rob Herring
Arm SPEv1.2 adds a new optional address packet type: previous branch target. The recorded address is the target virtual address of the most recently taken branch in program order.
Add support for decoding the address packet in raw dumps.
Signed-off-by Rob Herring <[email protected]>--- tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c | 4 +++- tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c +0
-0
tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c static int arm_spe_pkt_desc_addr(const struct arm_spe_pkt *packet, · line 425
Quoted 4 lines
tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c +1
-0@@ -422,16 +422,18 @@ static int arm_spe_pkt_desc_addr(const struct arm_spe_pkt *packet,int ch, pat;u64 payload = packet->payload;int err =0 ; +static const char *idx_name[] = {"PC" ,"TGT" ,"VA" ,"PA" ,"LBR" };
I know you use the "LBR" which is a naming convention from X86 arch, Armv8 ARM defines the name "PBT", so "PBT" would be easier for us to match code with architecture specification.
"LBR" is also fine for me, it's up to you if you want to update for this:
Quoted 29 lines
tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c +2
-1switch (idx) {case SPE_ADDR_PKT_HDR_INDEX_INS :case SPE_ADDR_PKT_HDR_INDEX_BRANCH : +case SPE_ADDR_PKT_HDR_INDEX_PREV_BRANCH : ns = !!SPE_ADDR_PKT_GET_NS (payload); el =SPE_ADDR_PKT_GET_EL (payload); payload =SPE_ADDR_PKT_ADDR_GET_BYTES_0_6 (payload);arm_spe_pkt_out_string (&err, &buf, &buf_len,"%s 0x%llx el%d ns=%d" , - (idx ==1 ) ?"TGT" :"PC" , payload, el, ns); + idx_name[idx], payload, el, ns);break ;case SPE_ADDR_PKT_HDR_INDEX_DATA_VIRT : arm_spe_pkt_out_string(&err, &buf, &buf_len,tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h +1
-0@@ -65,6 +65,7 @@ struct arm_spe_pkt {#define SPE_ADDR_PKT_HDR_INDEX_BRANCH 0x1#define SPE_ADDR_PKT_HDR_INDEX_DATA_VIRT 0x2#define SPE_ADDR_PKT_HDR_INDEX_DATA_PHYS 0x3 +#define SPE_ADDR_PKT_HDR_INDEX_PREV_BRANCH 0x4/* Address packet payload */ #define SPE_ADDR_PKT_ADDR_BYTE7_SHIFT 56Signature · 1 line
2.39.0
Arnaldo Carvalho de Melo
maintainerEm Mon, Jan 30, 2023 at 10:09:46AM +0800, Leo Yan escreveu:
Quoted 27 lines · Rob Herring
Quoted 17 lines
Arm SPEv1.2 adds a new optional address packet type: previous branch target. The recorded address is the target virtual address of the most recently taken branch in program order.
Add support for decoding the address packet in raw dumps.
Signed-off-by Rob Herring <[email protected]>--- tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c | 4 +++- tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c +0
-0tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c static int arm_spe_pkt_desc_addr(const struct arm_spe_pkt *packet, · line 425
Quoted 4 lines
tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c +1
-0@@ -422,16 +422,18 @@ static int arm_spe_pkt_desc_addr(const struct arm_spe_pkt *packet,int ch, pat;u64 payload = packet->payload;int err =0 ; +static const char *idx_name[] = {"PC" ,"TGT" ,"VA" ,"PA" ,"LBR" };I know you use the "LBR" which is a naming convention from X86 arch, Armv8 ARM defines the name "PBT", so "PBT" would be easier for us to match code with architecture specification.
Quoted 2 lines
"LBR" is also fine for me, it's up to you if you want to update for this:
Waiting for a response to this.
- Arnaldo
Quoted 32 lines
Reviewed-by Leo Yan <[email protected]>Quoted 29 lines
tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c +2
-1switch (idx) {case SPE_ADDR_PKT_HDR_INDEX_INS :case SPE_ADDR_PKT_HDR_INDEX_BRANCH : +case SPE_ADDR_PKT_HDR_INDEX_PREV_BRANCH : ns = !!SPE_ADDR_PKT_GET_NS (payload); el =SPE_ADDR_PKT_GET_EL (payload); payload =SPE_ADDR_PKT_ADDR_GET_BYTES_0_6 (payload);arm_spe_pkt_out_string (&err, &buf, &buf_len,"%s 0x%llx el%d ns=%d" , - (idx ==1 ) ?"TGT" :"PC" , payload, el, ns); + idx_name[idx], payload, el, ns);break ;case SPE_ADDR_PKT_HDR_INDEX_DATA_VIRT : arm_spe_pkt_out_string(&err, &buf, &buf_len,tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.h +1
-0@@ -65,6 +65,7 @@ struct arm_spe_pkt {#define SPE_ADDR_PKT_HDR_INDEX_BRANCH 0x1#define SPE_ADDR_PKT_HDR_INDEX_DATA_VIRT 0x2#define SPE_ADDR_PKT_HDR_INDEX_DATA_PHYS 0x3 +#define SPE_ADDR_PKT_HDR_INDEX_PREV_BRANCH 0x4/* Address packet payload */ #define SPE_ADDR_PKT_ADDR_BYTE7_SHIFT 56Signature · 1 line
2.39.0
Signature · 1 line
- Arnaldo