perf arm-spe: Support previous branch target (PBT) address

When FEAT_SPE_PBT is implemented, the previous branch target address
(named as PBT) before the sampled operation, will be recorded.

This commit first introduces a 'prev_br_tgt' field in the record for
saving the PBT address in the decoder.

If the current operation is a branch instruction, by combining with PBT,
it can create a chain with two consecutive branches.  As the branch
stack stores branches in descending order, meaning a newer branch is
stored in a lower entry in the stack.  Arm SPE stores the latest branch
in the first entry of branch stack, and the previous branch coming from
PBT is stored into the second entry.

Otherwise, if current operation is not a branch, the last branch will be
saved for PBT only.  PBT lacks associated information such as branch
source address, branch type, and events.  The branch entry fills zeros
for the corresponding fields and only set its target address.

After:

  perf script -f --itrace=bl -F flags,addr,brstack
  jcc                   ffff800080187914 0xffff8000801878fc/0xffff800080187914/P/-/-/1/COND/-  0x0/0xffff8000801878f8/-/-/-/0//-
  jcc                   ffff8000802d12d8 0xffff8000802d12f8/0xffff8000802d12d8/P/-/-/1/COND/-  0x0/0xffff8000802d12ec/-/-/-/0//-
  jcc                   ffff8000813fe200 0xffff8000813fe20c/0xffff8000813fe200/P/-/-/1/COND/-  0x0/0xffff8000813fe200/-/-/-/0//-
  jcc                   ffff8000813fe200 0xffff8000813fe20c/0xffff8000813fe200/P/-/-/1/COND/-  0x0/0xffff8000813fe200/-/-/-/0//-
  jmp                   ffff800081410980 0xffff800081419108/0xffff800081410980/P/-/-/1//-  0x0/0xffff800081419104/-/-/-/0//-
  return                ffff80008036e064 0xffff80008141ba84/0xffff80008036e064/P/-/-/1/RET/-  0x0/0xffff80008141ba60/-/-/-/0//-
  jcc                   ffff8000803d54f0 0xffff8000803d54e8/0xffff8000803d54f0/P/-/-/1/COND/-  0x0/0xffff8000803d54e0/-/-/-/0//-
  jmp                   ffff80008015e468 0xffff8000803d46dc/0xffff80008015e468/P/-/-/1//-  0x0/0xffff8000803d46c8/-/-/-/0//-
  jmp                   ffff8000806e2d50 0xffff80008040f710/0xffff8000806e2d50/P/-/-/1//-  0x0/0xffff80008040f6e8/-/-/-/0//-
  jcc                   ffff800080721704 0xffff8000807216b4/0xffff800080721704/P/-/-/1/COND/-  0x0/0xffff8000807216ac/-/-/-/0//-

Reviewed-by: Ian Rogers <irogers@google.com>
Reviewed-by: James Clark <james.clark@linaro.org>
Signed-off-by: Leo Yan <leo.yan@arm.com>
Link: https://lore.kernel.org/r/20250304111240.3378214-13-leo.yan@arm.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-decoder.c b/tools/perf/util/arm-spe-decoder/arm-spe-decoder.c
index 52bd0a4ea96ddebbdbca607f6f6d2f4738b515ee..688fe6d7524416420a7c18d5f8a268492ce7c3b8 100644 (file)
--- a/tools/perf/util/arm-spe-decoder/arm-spe-decoder.c
+++ b/tools/perf/util/arm-spe-decoder/arm-spe-decoder.c
@@ -28,7 +28,8 @@ static u64 arm_spe_calc_ip(int index, u64 payload)
 
        /* Instruction virtual address or Branch target address */
        if (index == SPE_ADDR_PKT_HDR_INDEX_INS ||
-           index == SPE_ADDR_PKT_HDR_INDEX_BRANCH) {
+           index == SPE_ADDR_PKT_HDR_INDEX_BRANCH ||
+           index == SPE_ADDR_PKT_HDR_INDEX_PREV_BRANCH) {
                ns = SPE_ADDR_PKT_GET_NS(payload);
                el = SPE_ADDR_PKT_GET_EL(payload);
 
@@ -181,6 +182,8 @@ static int arm_spe_read_record(struct arm_spe_decoder *decoder)
                                decoder->record.virt_addr = ip;
                        else if (idx == SPE_ADDR_PKT_HDR_INDEX_DATA_PHYS)
                                decoder->record.phys_addr = ip;
+                       else if (idx == SPE_ADDR_PKT_HDR_INDEX_PREV_BRANCH)
+                               decoder->record.prev_br_tgt = ip;
                        break;
                case ARM_SPE_COUNTER:
                        if (idx == SPE_CNT_PKT_HDR_INDEX_TOTAL_LAT)

diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-decoder.h b/tools/perf/util/arm-spe-decoder/arm-spe-decoder.h
index 85b688a97436852f18f3cb4ac55178d67ea8942f..5d232188643b7440d02199cb5aaf0b920e1554a7 100644 (file)
--- a/tools/perf/util/arm-spe-decoder/arm-spe-decoder.h
+++ b/tools/perf/util/arm-spe-decoder/arm-spe-decoder.h
@@ -89,6 +89,7 @@ struct arm_spe_record {
        u32 latency;
        u64 from_ip;
        u64 to_ip;
+       u64 prev_br_tgt;
        u64 timestamp;
        u64 virt_addr;
        u64 phys_addr;

diff --git a/tools/perf/util/arm-spe.c b/tools/perf/util/arm-spe.c
index ed89b7dbc244a707d0be8db4b8f608843a13eb24..2a9775649cc2c170c173a3c0241e21c998582543 100644 (file)
--- a/tools/perf/util/arm-spe.c
+++ b/tools/perf/util/arm-spe.c
@@ -237,8 +237,9 @@ static struct arm_spe_queue *arm_spe__alloc_queue(struct arm_spe *spe,
        if (spe->synth_opts.last_branch) {
                size_t sz = sizeof(struct branch_stack);
 
-               /* Allocate one entry for TGT */
-               sz += sizeof(struct branch_entry);
+               /* Allocate up to two entries for PBT + TGT */
+               sz += sizeof(struct branch_entry) *
+                       min(spe->synth_opts.last_branch_sz, 2U);
                speq->last_branch = zalloc(sz);
                if (!speq->last_branch)
                        goto out_free;
@@ -362,68 +363,83 @@ static void arm_spe_prep_sample(struct arm_spe *spe,
 
 static void arm_spe__prep_branch_stack(struct arm_spe_queue *speq)
 {
+       struct arm_spe *spe = speq->spe;
        struct arm_spe_record *record = &speq->decoder->record;
        struct branch_stack *bstack = speq->last_branch;
        struct branch_flags *bs_flags;
+       unsigned int last_branch_sz = spe->synth_opts.last_branch_sz;
+       bool have_tgt = !!(speq->flags & PERF_IP_FLAG_BRANCH);
+       bool have_pbt = last_branch_sz >= (have_tgt + 1U) && record->prev_br_tgt;
        size_t sz = sizeof(struct branch_stack) +
-                   sizeof(struct branch_entry) /* TGT */;
+                   sizeof(struct branch_entry) * min(last_branch_sz, 2U) /* PBT + TGT */;
+       int i = 0;
 
        /* Clean up branch stack */
        memset(bstack, 0x0, sz);
 
-       if (!(speq->flags & PERF_IP_FLAG_BRANCH))
+       if (!have_tgt && !have_pbt)
                return;
 
-       bstack->entries[0].from = record->from_ip;
-       bstack->entries[0].to = record->to_ip;
+       if (have_tgt) {
+               bstack->entries[i].from = record->from_ip;
+               bstack->entries[i].to = record->to_ip;
 
-       bs_flags = &bstack->entries[0].flags;
-       bs_flags->value = 0;
+               bs_flags = &bstack->entries[i].flags;
+               bs_flags->value = 0;
 
-       if (record->op & ARM_SPE_OP_BR_CR_BL) {
-               if (record->op & ARM_SPE_OP_BR_COND)
-                       bs_flags->type |= PERF_BR_COND_CALL;
-               else
-                       bs_flags->type |= PERF_BR_CALL;
-       /*
-        * Indirect branch instruction without link (e.g. BR),
-        * take this case as function return.
-        */
-       } else if (record->op & ARM_SPE_OP_BR_CR_RET ||
-                  record->op & ARM_SPE_OP_BR_INDIRECT) {
-               if (record->op & ARM_SPE_OP_BR_COND)
-                       bs_flags->type |= PERF_BR_COND_RET;
-               else
-                       bs_flags->type |= PERF_BR_RET;
-       } else if (record->op & ARM_SPE_OP_BR_CR_NON_BL_RET) {
-               if (record->op & ARM_SPE_OP_BR_COND)
-                       bs_flags->type |= PERF_BR_COND;
-               else
-                       bs_flags->type |= PERF_BR_UNCOND;
-       } else {
-               if (record->op & ARM_SPE_OP_BR_COND)
-                       bs_flags->type |= PERF_BR_COND;
-               else
-                       bs_flags->type |= PERF_BR_UNKNOWN;
-       }
+               if (record->op & ARM_SPE_OP_BR_CR_BL) {
+                       if (record->op & ARM_SPE_OP_BR_COND)
+                               bs_flags->type |= PERF_BR_COND_CALL;
+                       else
+                               bs_flags->type |= PERF_BR_CALL;
+               /*
+                * Indirect branch instruction without link (e.g. BR),
+                * take this case as function return.
+                */
+               } else if (record->op & ARM_SPE_OP_BR_CR_RET ||
+                          record->op & ARM_SPE_OP_BR_INDIRECT) {
+                       if (record->op & ARM_SPE_OP_BR_COND)
+                               bs_flags->type |= PERF_BR_COND_RET;
+                       else
+                               bs_flags->type |= PERF_BR_RET;
+               } else if (record->op & ARM_SPE_OP_BR_CR_NON_BL_RET) {
+                       if (record->op & ARM_SPE_OP_BR_COND)
+                               bs_flags->type |= PERF_BR_COND;
+                       else
+                               bs_flags->type |= PERF_BR_UNCOND;
+               } else {
+                       if (record->op & ARM_SPE_OP_BR_COND)
+                               bs_flags->type |= PERF_BR_COND;
+                       else
+                               bs_flags->type |= PERF_BR_UNKNOWN;
+               }
 
-       if (record->type & ARM_SPE_BRANCH_MISS) {
-               bs_flags->mispred = 1;
-               bs_flags->predicted = 0;
-       } else {
-               bs_flags->mispred = 0;
-               bs_flags->predicted = 1;
-       }
+               if (record->type & ARM_SPE_BRANCH_MISS) {
+                       bs_flags->mispred = 1;
+                       bs_flags->predicted = 0;
+               } else {
+                       bs_flags->mispred = 0;
+                       bs_flags->predicted = 1;
+               }
+
+               if (record->type & ARM_SPE_BRANCH_NOT_TAKEN)
+                       bs_flags->not_taken = 1;
 
-       if (record->type & ARM_SPE_BRANCH_NOT_TAKEN)
-               bs_flags->not_taken = 1;
+               if (record->type & ARM_SPE_IN_TXN)
+                       bs_flags->in_tx = 1;
 
-       if (record->type & ARM_SPE_IN_TXN)
-               bs_flags->in_tx = 1;
+               bs_flags->cycles = min(record->latency, 0xFFFFU);
+               i++;
+       }
 
-       bs_flags->cycles = min(record->latency, 0xFFFFU);
+       if (have_pbt) {
+               bs_flags = &bstack->entries[i].flags;
+               bs_flags->type |= PERF_BR_UNKNOWN;
+               bstack->entries[i].to = record->prev_br_tgt;
+               i++;
+       }
 
-       bstack->nr = 1;
+       bstack->nr = i;
        bstack->hw_idx = -1ULL;
 }
 
@@ -1584,8 +1600,8 @@ arm_spe_synth_events(struct arm_spe *spe, struct perf_session *session)
        }
 
        if (spe->synth_opts.last_branch) {
-               if (spe->synth_opts.last_branch_sz > 1)
-                       pr_debug("Arm SPE supports only one bstack entry (TGT).\n");
+               if (spe->synth_opts.last_branch_sz > 2)
+                       pr_debug("Arm SPE supports only two bstack entries (PBT+TGT).\n");
 
                attr.sample_type |= PERF_SAMPLE_BRANCH_STACK;
                /*