perf arm-spe: Use ARM_SPE_OP_BRANCH_ERET when synthesizing branches

Instead of checking the type for just branch misses, we can instead
check for the OP_BRANCH_ERET and synthesise branches as well as
branch misses.

Signed-off-by: Graham Woodward <graham.woodward@arm.com>
Reviewed-by: James Clark <james.clark@linaro.org>
Tested-by: Leo Yan <leo.yan@arm.com>
Cc: nd@arm.com
Cc: mike.leach@linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20241025143009.25419-3-graham.woodward@arm.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/util/arm-spe.c b/tools/perf/util/arm-spe.c
index 49b76380736009c928ca3a6f0d499aeee3466965..e60e21d247355ea3f84845da21749dbdde6f7f74 100644 (file)
--- a/tools/perf/util/arm-spe.c
+++ b/tools/perf/util/arm-spe.c
@@ -68,7 +68,7 @@ struct arm_spe {
        u64                             llc_access_id;
        u64                             tlb_miss_id;
        u64                             tlb_access_id;
-       u64                             branch_miss_id;
+       u64                             branch_id;
        u64                             remote_access_id;
        u64                             memory_id;
        u64                             instructions_id;
@@ -672,8 +672,8 @@ static int arm_spe_sample(struct arm_spe_queue *speq)
                }
        }
 
-       if (spe->sample_branch && (record->type & ARM_SPE_BRANCH_MISS)) {
-               err = arm_spe__synth_branch_sample(speq, spe->branch_miss_id);
+       if (spe->sample_branch && (record->op & ARM_SPE_OP_BRANCH_ERET)) {
+               err = arm_spe__synth_branch_sample(speq, spe->branch_id);
                if (err)
                        return err;
        }
@@ -1385,12 +1385,12 @@ arm_spe_synth_events(struct arm_spe *spe, struct perf_session *session)
        if (spe->synth_opts.branches) {
                spe->sample_branch = true;
 
-               /* Branch miss */
+               /* Branch */
                err = perf_session__deliver_synth_attr_event(session, &attr, id);
                if (err)
                        return err;
-               spe->branch_miss_id = id;
-               arm_spe_set_event_name(evlist, id, "branch-miss");
+               spe->branch_id = id;
+               arm_spe_set_event_name(evlist, id, "branch");
                id += 1;
        }