Re: [PATCH 12/12] perf mem record: Use the IBS swfilt filter when available

[Arnaldo Carvalho de Melo <acme@kernel.org>]

On Fri, Sep 18, 2026 at 09:05:34AM +0530, Ravi Bangoria wrote:
> > It's a bit unfortunate we hardcode "swfilt" here.  Probably better to
> > have it in the mem-events array and add it to the name format
> > dynamically.  But as it's only needed for IBS, I think it's ok for now.
> 
> Something like this? (Untested):

Seems ok, I'm trying to use it now, ok?

- Arnaldo
 
> diff --git a/tools/perf/arch/x86/util/mem-events.c b/tools/perf/arch/x86/util/mem-events.c
> index b38f519020ff..816c73d75bc4 100644
> --- a/tools/perf/arch/x86/util/mem-events.c
> +++ b/tools/perf/arch/x86/util/mem-events.c
> @@ -27,8 +27,20 @@ struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX] = {
>  	E("mem-ldst",	"%s//",		NULL,	false,	0),
>  };
>  
> +struct perf_mem_event perf_mem_events_amd_swfilt[PERF_MEM_EVENTS__MAX] = {
> +	E(NULL,		NULL,		NULL,	false,	0),
> +	E(NULL,		NULL,		NULL,	false,	0),
> +	E("mem-ldst",	"%s/swfilt=1/",	NULL,	false,	0),
> +};
> +
>  struct perf_mem_event perf_mem_events_amd_ldlat[PERF_MEM_EVENTS__MAX] = {
>  	E(NULL,		NULL,		NULL,	false,	0),
>  	E(NULL,		NULL,		NULL,	false,	0),
>  	E("mem-ldst",	"%s/ldlat=%u/",	NULL,	true,	0),
>  };
> +
> +struct perf_mem_event perf_mem_events_amd_ldlat_swfilt[PERF_MEM_EVENTS__MAX] = {
> +	E(NULL,		NULL,				NULL,	false,	0),
> +	E(NULL,		NULL,				NULL,	false,	0),
> +	E("mem-ldst",	"%s/ldlat=%u,swfilt=1/",	NULL,	true,	0),
> +};
> diff --git a/tools/perf/arch/x86/util/mem-events.h b/tools/perf/arch/x86/util/mem-events.h
> index 11e09a256f5b..f707de380370 100644
> --- a/tools/perf/arch/x86/util/mem-events.h
> +++ b/tools/perf/arch/x86/util/mem-events.h
> @@ -6,6 +6,8 @@ extern struct perf_mem_event perf_mem_events_intel[PERF_MEM_EVENTS__MAX];
>  extern struct perf_mem_event perf_mem_events_intel_aux[PERF_MEM_EVENTS__MAX];
>  
>  extern struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX];
> +extern struct perf_mem_event perf_mem_events_amd_swfilt[PERF_MEM_EVENTS__MAX];
>  extern struct perf_mem_event perf_mem_events_amd_ldlat[PERF_MEM_EVENTS__MAX];
> +extern struct perf_mem_event perf_mem_events_amd_ldlat_swfilt[PERF_MEM_EVENTS__MAX];
>  
>  #endif /* _X86_MEM_EVENTS_H */
> diff --git a/tools/perf/arch/x86/util/pmu.c b/tools/perf/arch/x86/util/pmu.c
> index 2c24ef3140da..fd4491fda117 100644
> --- a/tools/perf/arch/x86/util/pmu.c
> +++ b/tools/perf/arch/x86/util/pmu.c
> @@ -333,6 +333,7 @@ static void uncore_cha_imc_adjust_cpumask_for_snc(struct perf_pmu *pmu, bool cha
>  void perf_pmu__arch_init(struct perf_pmu *pmu)
>  {
>  	struct perf_pmu_caps *ldlat_cap;
> +	bool swfilt_format;
>  
>  	if (!strcmp(pmu->name, INTEL_PT_PMU_NAME)) {
>  		pmu->auxtrace = true;
> @@ -348,7 +349,10 @@ void perf_pmu__arch_init(struct perf_pmu *pmu)
>  		if (strcmp(pmu->name, "ibs_op"))
>  			return;
>  
> -		pmu->mem_events = perf_mem_events_amd;
> +		swfilt_format = perf_pmu__has_format(pmu, "swfilt");
> +		pmu->mem_events = swfilt_format ?
> +				  perf_mem_events_amd_swfilt :
> +				  perf_mem_events_amd;
>  
>  		if (!perf_pmu__caps_parse(pmu))
>  			return;
> @@ -358,7 +362,9 @@ void perf_pmu__arch_init(struct perf_pmu *pmu)
>  			return;
>  
>  		perf_mem_events__loads_ldlat = 0;
> -		pmu->mem_events = perf_mem_events_amd_ldlat;
> +		pmu->mem_events = swfilt_format ?
> +				  perf_mem_events_amd_ldlat_swfilt :
> +				  perf_mem_events_amd_ldlat;
>  	} else {
>  		if (pmu->is_core) {
>  			if (perf_pmu__have_event(pmu, "mem-loads-aux"))
> 
> ---
> 
> Thanks,
> Ravi