Re: [PATCH v4 2/2] perf arm-spe: Add support for SPE Data Source packet on AmpereOne

Arnaldo Carvalho de Melo
2024-12-09T15:28:11Z

On Fri, Nov 08, 2024 at 02:51:38PM +0000, Leo Yan wrote:
> On Fri, Nov 08, 2024 at 01:09:11AM +0000, Ilkka Koskinen wrote:
> >
> > Decode SPE Data Source packets on AmpereOne. The field is IMPDEF.
> >
> > Signed-off-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>
>
> Reviewed-by: Leo Yan <leo.yan@arm.com>

Thanks, applied to perf-tools-next,

- Arnaldo

> > ---
> > .../util/arm-spe-decoder/arm-spe-decoder.h | 9 ++++
> > tools/perf/util/arm-spe.c | 44 +++++++++++++++++++
> > 2 files changed, 53 insertions(+)
> >
> > 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 358c611eeddb..4bcd627e859f 100644
> > --- a/tools/perf/util/arm-spe-decoder/arm-spe-decoder.h
> > +++ b/tools/perf/util/arm-spe-decoder/arm-spe-decoder.h
> > @@ -67,6 +67,15 @@ enum arm_spe_common_data_source {
> > ARM_SPE_COMMON_DS_DRAM = 0xe,
> > };
> >
> > +enum arm_spe_ampereone_data_source {
> > + ARM_SPE_AMPEREONE_LOCAL_CHIP_CACHE_OR_DEVICE = 0x0,
> > + ARM_SPE_AMPEREONE_SLC = 0x3,
> > + ARM_SPE_AMPEREONE_REMOTE_CHIP_CACHE = 0x5,
> > + ARM_SPE_AMPEREONE_DDR = 0x7,
> > + ARM_SPE_AMPEREONE_L1D = 0x8,
> > + ARM_SPE_AMPEREONE_L2D = 0x9,
> > +};
> > +
> > struct arm_spe_record {
> > enum arm_spe_sample_type type;
> > int err;
> > diff --git a/tools/perf/util/arm-spe.c b/tools/perf/util/arm-spe.c
> > index dfb0c07cb7fe..df84933b673d 100644
> > --- a/tools/perf/util/arm-spe.c
> > +++ b/tools/perf/util/arm-spe.c
> > @@ -455,8 +455,14 @@ static const struct midr_range common_ds_encoding_cpus[] = {
> > {},
> > };
> >
> > +static const struct midr_range ampereone_ds_encoding_cpus[] = {
> > + MIDR_ALL_VERSIONS(MIDR_AMPERE1A),
> > + {},
> > +};
> > +
> > static const struct data_source_handle data_source_handles[] = {
> > DS(common_ds_encoding_cpus, data_source_common),
> > + DS(ampereone_ds_encoding_cpus, data_source_ampereone),
> > };
> >
> > static void arm_spe__sample_flags(struct arm_spe_queue *speq)
> > @@ -548,6 +554,44 @@ static void arm_spe__synth_data_source_common(const struct arm_spe_record *recor
> > }
> > }
> >
> > +/*
> > + * Source is IMPDEF. Here we convert the source code used on AmpereOne cores
> > + * to the common (Neoverse, Cortex) to avoid duplicating the decoding code.
> > + */
> > +static void arm_spe__synth_data_source_ampereone(const struct arm_spe_record *record,
> > + union perf_mem_data_src *data_src)
> > +{
> > + struct arm_spe_record common_record;
> > +
> > + switch (record->source) {
> > + case ARM_SPE_AMPEREONE_LOCAL_CHIP_CACHE_OR_DEVICE:
> > + common_record.source = ARM_SPE_COMMON_DS_PEER_CORE;
> > + break;
> > + case ARM_SPE_AMPEREONE_SLC:
> > + common_record.source = ARM_SPE_COMMON_DS_SYS_CACHE;
> > + break;
> > + case ARM_SPE_AMPEREONE_REMOTE_CHIP_CACHE:
> > + common_record.source = ARM_SPE_COMMON_DS_REMOTE;
> > + break;
> > + case ARM_SPE_AMPEREONE_DDR:
> > + common_record.source = ARM_SPE_COMMON_DS_DRAM;
> > + break;
> > + case ARM_SPE_AMPEREONE_L1D:
> > + common_record.source = ARM_SPE_COMMON_DS_L1D;
> > + break;
> > + case ARM_SPE_AMPEREONE_L2D:
> > + common_record.source = ARM_SPE_COMMON_DS_L2;
> > + break;
> > + default:
> > + pr_warning_once("AmpereOne: Unknown data source (0x%x)\n",
> > + record->source);
> > + return;
> > + }
> > +
> > + common_record.op = record->op;
> > + arm_spe__synth_data_source_common(&common_record, data_src);
> > +}
> > +
> > static void arm_spe__synth_memory_level(const struct arm_spe_record *record,
> > union perf_mem_data_src *data_src)
> > {
> > --
> > 2.47.0
> >
> >