| Message ID | 20250217195908.176207-7-leo.yan@arm.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | perf script: Refactor branch flags for Arm SPE | expand |
On 17/02/2025 7:59 pm, Leo Yan wrote: > The ARM_SPE_OP_LD and ARM_SPE_OP_ST operations are secondary operation > type, they are overlapping with other second level's operation types > belonging to SVE and branch operations. As a result, a non load-store > operation can be parsed for data source and memory sample. > > To fix the issue, this commit introduces a is_ldst_op() macro for > checking LDST operation, and apply the checking when synthesize data > source and memory samples. > > Fixes: a89dbc9b988f ("perf arm-spe: Set sample's data source field") > Signed-off-by: Leo Yan <leo.yan@arm.com> > --- > tools/perf/util/arm-spe.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/tools/perf/util/arm-spe.c b/tools/perf/util/arm-spe.c > index 251d214adf7f..0e8e05c87fd7 100644 > --- a/tools/perf/util/arm-spe.c > +++ b/tools/perf/util/arm-spe.c > @@ -37,6 +37,8 @@ > #include "../../arch/arm64/include/asm/cputype.h" > #define MAX_TIMESTAMP (~0ULL) > > +#define is_ldst_op(op) (!!((op) & ARM_SPE_OP_LDST)) > + > struct arm_spe { > struct auxtrace auxtrace; > struct auxtrace_queues queues; > @@ -681,6 +683,10 @@ static u64 arm_spe__synth_data_source(struct arm_spe_queue *speq, > { > union perf_mem_data_src data_src = { .mem_op = PERF_MEM_OP_NA }; > > + /* Only synthesize data source for LDST operations */ > + if (!is_ldst_op(record->op)) > + return 0; > + > if (record->op & ARM_SPE_OP_LD) > data_src.mem_op = PERF_MEM_OP_LOAD; > else if (record->op & ARM_SPE_OP_ST) > @@ -779,7 +785,7 @@ static int arm_spe_sample(struct arm_spe_queue *speq) > * When data_src is zero it means the record is not a memory operation, > * skip to synthesize memory sample for this case. > */ > - if (spe->sample_memory && data_src) { > + if (spe->sample_memory && is_ldst_op(record->op)) { > err = arm_spe__synth_mem_sample(speq, spe->memory_id, data_src); > if (err) > return err; Reviewed-by: James Clark <james.clark@linaro.org>
diff --git a/tools/perf/util/arm-spe.c b/tools/perf/util/arm-spe.c index 251d214adf7f..0e8e05c87fd7 100644 --- a/tools/perf/util/arm-spe.c +++ b/tools/perf/util/arm-spe.c @@ -37,6 +37,8 @@ #include "../../arch/arm64/include/asm/cputype.h" #define MAX_TIMESTAMP (~0ULL) +#define is_ldst_op(op) (!!((op) & ARM_SPE_OP_LDST)) + struct arm_spe { struct auxtrace auxtrace; struct auxtrace_queues queues; @@ -681,6 +683,10 @@ static u64 arm_spe__synth_data_source(struct arm_spe_queue *speq, { union perf_mem_data_src data_src = { .mem_op = PERF_MEM_OP_NA }; + /* Only synthesize data source for LDST operations */ + if (!is_ldst_op(record->op)) + return 0; + if (record->op & ARM_SPE_OP_LD) data_src.mem_op = PERF_MEM_OP_LOAD; else if (record->op & ARM_SPE_OP_ST) @@ -779,7 +785,7 @@ static int arm_spe_sample(struct arm_spe_queue *speq) * When data_src is zero it means the record is not a memory operation, * skip to synthesize memory sample for this case. */ - if (spe->sample_memory && data_src) { + if (spe->sample_memory && is_ldst_op(record->op)) { err = arm_spe__synth_mem_sample(speq, spe->memory_id, data_src); if (err) return err;
The ARM_SPE_OP_LD and ARM_SPE_OP_ST operations are secondary operation type, they are overlapping with other second level's operation types belonging to SVE and branch operations. As a result, a non load-store operation can be parsed for data source and memory sample. To fix the issue, this commit introduces a is_ldst_op() macro for checking LDST operation, and apply the checking when synthesize data source and memory samples. Fixes: a89dbc9b988f ("perf arm-spe: Set sample's data source field") Signed-off-by: Leo Yan <leo.yan@arm.com> --- tools/perf/util/arm-spe.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)