[V3,3/7] perf mem: Clean up perf_mem_events__name()

  From: Kan Liang <kan.liang@linux.intel.com>

Introduce a generic perf_mem_events__name(). Remove the ARCH-specific
one.

The mem_load events may have a different format. Add ldlat and aux_event
in the struct perf_mem_event to indicate the format and the extra aux
event.

Add perf_mem_events_intel_aux[] to support the extra mem_load_aux event.

Rename perf_mem_events__name to perf_pmu__mem_events_name.

Reviewed-by: Ian Rogers <irogers@google.com>
Tested-by: Ravi Bangoria <ravi.bangoria@amd.com>
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
---
 tools/perf/arch/arm64/util/mem-events.c   | 26 ++-------
 tools/perf/arch/powerpc/util/mem-events.c | 13 ++---
 tools/perf/arch/powerpc/util/mem-events.h |  7 +++
 tools/perf/arch/powerpc/util/pmu.c        | 11 ++++
 tools/perf/arch/x86/util/mem-events.c     | 70 +++++------------------
 tools/perf/arch/x86/util/mem-events.h     |  1 +
 tools/perf/arch/x86/util/pmu.c            |  8 ++-
 tools/perf/util/mem-events.c              | 60 +++++++++++++------
 tools/perf/util/mem-events.h              |  3 +-
 9 files changed, 93 insertions(+), 106 deletions(-)
 create mode 100644 tools/perf/arch/powerpc/util/mem-events.h
 create mode 100644 tools/perf/arch/powerpc/util/pmu.c
  

Hi Kan,
  With this patch perf mem is failing in powerpc with below error:

[command]# ./perf mem record ls
event syntax error: '../mem-loads,ldlat=30/P'
                                  \___ Bad event or PMU

Unable to find PMU or event on a PMU of 'cpu'

Initial error:
event syntax error: '../mem-loads,ldlat=30/P'
                                  \___ unknown term 'ldlat' for pmu 'cpu'

This issue is happening as powerpc doesn't support ldlat parameter. And
this patch missing build of pmu.c file.

I am able to fix build and ldlat issue with below changes:

diff --git a/tools/perf/arch/powerpc/util/Build
b/tools/perf/arch/powerpc/util/Build
index 9889245c555c..1d323f3a3322 100644
--- a/tools/perf/arch/powerpc/util/Build
+++ b/tools/perf/arch/powerpc/util/Build
@@ -2,6 +2,7 @@ perf-y += header.o
 perf-$(CONFIG_LIBTRACEEVENT) += kvm-stat.o
 perf-y += perf_regs.o
 perf-y += mem-events.o
+perf-y += pmu.o
 perf-y += sym-handling.o
 perf-y += evsel.o
 perf-y += event.o
diff --git a/tools/perf/arch/powerpc/util/mem-events.c
b/tools/perf/arch/powerpc/util/mem-events.c
index b7883e38950f..9140cdb1bbfb 100644
--- a/tools/perf/arch/powerpc/util/mem-events.c
+++ b/tools/perf/arch/powerpc/util/mem-events.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
-#include "map_symbol.h"
+#include "util/map_symbol.h"
+#include "util/mem-events.h"
 #include "mem-events.h"

 #define E(t, n, s, l, a) { .tag = t, .name = n, .sysfs_name = s, .ldlat
= l, .aux_event = a }
diff --git a/tools/perf/arch/powerpc/util/pmu.c
b/tools/perf/arch/powerpc/util/pmu.c
index 168173f88ddb..554675deef7b 100644
--- a/tools/perf/arch/powerpc/util/pmu.c
+++ b/tools/perf/arch/powerpc/util/pmu.c
@@ -3,6 +3,7 @@
 #include <string.h>

 #include "../../../util/pmu.h"
+#include "mem-events.h"

 void perf_pmu__arch_init(struct perf_pmu *pmu)
 {

Thanks,
Kajol Jain


On 12/14/23 01:21, kan.liang@linux.intel.com wrote:
> From: Kan Liang <kan.liang@linux.intel.com>
> 
> Introduce a generic perf_mem_events__name(). Remove the ARCH-specific
> one.
> 
> The mem_load events may have a different format. Add ldlat and aux_event
> in the struct perf_mem_event to indicate the format and the extra aux
> event.
> 
> Add perf_mem_events_intel_aux[] to support the extra mem_load_aux event.
> 
> Rename perf_mem_events__name to perf_pmu__mem_events_name.
> 
> Reviewed-by: Ian Rogers <irogers@google.com>
> Tested-by: Ravi Bangoria <ravi.bangoria@amd.com>
> Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
> ---
>  tools/perf/arch/arm64/util/mem-events.c   | 26 ++-------
>  tools/perf/arch/powerpc/util/mem-events.c | 13 ++---
>  tools/perf/arch/powerpc/util/mem-events.h |  7 +++
>  tools/perf/arch/powerpc/util/pmu.c        | 11 ++++
>  tools/perf/arch/x86/util/mem-events.c     | 70 +++++------------------
>  tools/perf/arch/x86/util/mem-events.h     |  1 +
>  tools/perf/arch/x86/util/pmu.c            |  8 ++-
>  tools/perf/util/mem-events.c              | 60 +++++++++++++------
>  tools/perf/util/mem-events.h              |  3 +-
>  9 files changed, 93 insertions(+), 106 deletions(-)
>  create mode 100644 tools/perf/arch/powerpc/util/mem-events.h
>  create mode 100644 tools/perf/arch/powerpc/util/pmu.c
> 
> diff --git a/tools/perf/arch/arm64/util/mem-events.c b/tools/perf/arch/arm64/util/mem-events.c
> index d3e69a520c2b..96460c46640a 100644
> --- a/tools/perf/arch/arm64/util/mem-events.c
> +++ b/tools/perf/arch/arm64/util/mem-events.c
> @@ -3,28 +3,10 @@
>  #include "util/mem-events.h"
>  #include "mem-events.h"
>  
> -#define E(t, n, s) { .tag = t, .name = n, .sysfs_name = s }
> +#define E(t, n, s, l, a) { .tag = t, .name = n, .sysfs_name = s, .ldlat = l, .aux_event = a }
>  
>  struct perf_mem_event perf_mem_events_arm[PERF_MEM_EVENTS__MAX] = {
> -	E("spe-load",	"arm_spe_0/ts_enable=1,pa_enable=1,load_filter=1,store_filter=0,min_latency=%u/",	"arm_spe_0"),
> -	E("spe-store",	"arm_spe_0/ts_enable=1,pa_enable=1,load_filter=0,store_filter=1/",			"arm_spe_0"),
> -	E("spe-ldst",	"arm_spe_0/ts_enable=1,pa_enable=1,load_filter=1,store_filter=1,min_latency=%u/",	"arm_spe_0"),
> +	E("spe-load",	"%s/ts_enable=1,pa_enable=1,load_filter=1,store_filter=0,min_latency=%u/",	"arm_spe_0",	true,	0),
> +	E("spe-store",	"%s/ts_enable=1,pa_enable=1,load_filter=0,store_filter=1/",			"arm_spe_0",	false,	0),
> +	E("spe-ldst",	"%s/ts_enable=1,pa_enable=1,load_filter=1,store_filter=1,min_latency=%u/",	"arm_spe_0",	true,	0),
>  };
> -
> -static char mem_ev_name[100];
> -
> -const char *perf_mem_events__name(int i, const char *pmu_name __maybe_unused)
> -{
> -	struct perf_mem_event *e = &perf_mem_events_arm[i];
> -
> -	if (i >= PERF_MEM_EVENTS__MAX)
> -		return NULL;
> -
> -	if (i == PERF_MEM_EVENTS__LOAD || i == PERF_MEM_EVENTS__LOAD_STORE)
> -		scnprintf(mem_ev_name, sizeof(mem_ev_name),
> -			  e->name, perf_mem_events__loads_ldlat);
> -	else /* PERF_MEM_EVENTS__STORE */
> -		scnprintf(mem_ev_name, sizeof(mem_ev_name), e->name);
> -
> -	return mem_ev_name;
> -}
> diff --git a/tools/perf/arch/powerpc/util/mem-events.c b/tools/perf/arch/powerpc/util/mem-events.c
> index 78b986e5268d..b7883e38950f 100644
> --- a/tools/perf/arch/powerpc/util/mem-events.c
> +++ b/tools/perf/arch/powerpc/util/mem-events.c
> @@ -2,11 +2,10 @@
>  #include "map_symbol.h"
>  #include "mem-events.h"
>  
> -/* PowerPC does not support 'ldlat' parameter. */
> -const char *perf_mem_events__name(int i, const char *pmu_name __maybe_unused)
> -{
> -	if (i == PERF_MEM_EVENTS__LOAD)
> -		return "cpu/mem-loads/";
> +#define E(t, n, s, l, a) { .tag = t, .name = n, .sysfs_name = s, .ldlat = l, .aux_event = a }
>  
> -	return "cpu/mem-stores/";
> -}
> +struct perf_mem_event perf_mem_events_power[PERF_MEM_EVENTS__MAX] = {
> +	E("ldlat-loads",	"%s/mem-loads/",	"cpu/events/mem-loads",		false,	0),
> +	E("ldlat-stores",	"%s/mem-stores/",	"cpu/events/mem-stores",	false,	0),
> +	E(NULL,			NULL,			NULL,				false,	0),
> +};
> diff --git a/tools/perf/arch/powerpc/util/mem-events.h b/tools/perf/arch/powerpc/util/mem-events.h
> new file mode 100644
> index 000000000000..6acc3d1b6873
> --- /dev/null
> +++ b/tools/perf/arch/powerpc/util/mem-events.h
> @@ -0,0 +1,7 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +#ifndef _POWER_MEM_EVENTS_H
> +#define _POWER_MEM_EVENTS_H
> +
> +extern struct perf_mem_event perf_mem_events_power[PERF_MEM_EVENTS__MAX];
> +
> +#endif /* _POWER_MEM_EVENTS_H */
> diff --git a/tools/perf/arch/powerpc/util/pmu.c b/tools/perf/arch/powerpc/util/pmu.c
> new file mode 100644
> index 000000000000..168173f88ddb
> --- /dev/null
> +++ b/tools/perf/arch/powerpc/util/pmu.c
> @@ -0,0 +1,11 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +#include <string.h>
> +
> +#include "../../../util/pmu.h"
> +
> +void perf_pmu__arch_init(struct perf_pmu *pmu)
> +{
> +	if (pmu->is_core)
> +		pmu->mem_events = perf_mem_events_power;
> +}
> diff --git a/tools/perf/arch/x86/util/mem-events.c b/tools/perf/arch/x86/util/mem-events.c
> index 5fb41d50118d..f0e66a0151a0 100644
> --- a/tools/perf/arch/x86/util/mem-events.c
> +++ b/tools/perf/arch/x86/util/mem-events.c
> @@ -7,25 +7,26 @@
>  #include "linux/string.h"
>  #include "env.h"
>  
> -static char mem_loads_name[100];
> -static bool mem_loads_name__init;
> -static char mem_stores_name[100];
> -
>  #define MEM_LOADS_AUX		0x8203
> -#define MEM_LOADS_AUX_NAME     "{%s/mem-loads-aux/,%s/mem-loads,ldlat=%u/}:P"
>  
> -#define E(t, n, s) { .tag = t, .name = n, .sysfs_name = s }
> +#define E(t, n, s, l, a) { .tag = t, .name = n, .sysfs_name = s, .ldlat = l, .aux_event = a }
>  
>  struct perf_mem_event perf_mem_events_intel[PERF_MEM_EVENTS__MAX] = {
> -	E("ldlat-loads",	"%s/mem-loads,ldlat=%u/P",	"%s/events/mem-loads"),
> -	E("ldlat-stores",	"%s/mem-stores/P",		"%s/events/mem-stores"),
> -	E(NULL,			NULL,				NULL),
> +	E("ldlat-loads",	"%s/mem-loads,ldlat=%u/P",	"%s/events/mem-loads",	true,	0),
> +	E("ldlat-stores",	"%s/mem-stores/P",		"%s/events/mem-stores",	false,	0),
> +	E(NULL,			NULL,				NULL,			false,	0),
> +};
> +
> +struct perf_mem_event perf_mem_events_intel_aux[PERF_MEM_EVENTS__MAX] = {
> +	E("ldlat-loads",	"{%s/mem-loads-aux/,%s/mem-loads,ldlat=%u/}:P",	"%s/events/mem-loads",	true,	MEM_LOADS_AUX),
> +	E("ldlat-stores",	"%s/mem-stores/P",		"%s/events/mem-stores",	false,	0),
> +	E(NULL,			NULL,				NULL,			false,	0),
>  };
>  
>  struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX] = {
> -	E(NULL,		NULL,		NULL),
> -	E(NULL,		NULL,		NULL),
> -	E("mem-ldst",	"ibs_op//",	"ibs_op"),
> +	E(NULL,		NULL,		NULL,		false,	0),
> +	E(NULL,		NULL,		NULL,		false,	0),
> +	E("mem-ldst",	"%s//",		"ibs_op",	false,	0),
>  };
>  
>  bool is_mem_loads_aux_event(struct evsel *leader)
> @@ -40,48 +41,3 @@ bool is_mem_loads_aux_event(struct evsel *leader)
>  
>  	return leader->core.attr.config == MEM_LOADS_AUX;
>  }
> -
> -const char *perf_mem_events__name(int i, const char *pmu_name)
> -{
> -	struct perf_mem_event *e;
> -
> -	if (x86__is_amd_cpu())
> -		e = &perf_mem_events_amd[i];
> -	else
> -		e = &perf_mem_events_intel[i];
> -
> -	if (!e)
> -		return NULL;
> -
> -	if (i == PERF_MEM_EVENTS__LOAD) {
> -		if (mem_loads_name__init && !pmu_name)
> -			return mem_loads_name;
> -
> -		if (!pmu_name) {
> -			mem_loads_name__init = true;
> -			pmu_name = "cpu";
> -		}
> -
> -		if (perf_pmus__have_event(pmu_name, "mem-loads-aux")) {
> -			scnprintf(mem_loads_name, sizeof(mem_loads_name),
> -				  MEM_LOADS_AUX_NAME, pmu_name, pmu_name,
> -				  perf_mem_events__loads_ldlat);
> -		} else {
> -			scnprintf(mem_loads_name, sizeof(mem_loads_name),
> -				  e->name, pmu_name,
> -				  perf_mem_events__loads_ldlat);
> -		}
> -		return mem_loads_name;
> -	}
> -
> -	if (i == PERF_MEM_EVENTS__STORE) {
> -		if (!pmu_name)
> -			pmu_name = "cpu";
> -
> -		scnprintf(mem_stores_name, sizeof(mem_stores_name),
> -			  e->name, pmu_name);
> -		return mem_stores_name;
> -	}
> -
> -	return e->name;
> -}
> diff --git a/tools/perf/arch/x86/util/mem-events.h b/tools/perf/arch/x86/util/mem-events.h
> index 3959e427f482..f55c8d3b7d59 100644
> --- a/tools/perf/arch/x86/util/mem-events.h
> +++ b/tools/perf/arch/x86/util/mem-events.h
> @@ -3,6 +3,7 @@
>  #define _X86_MEM_EVENTS_H
>  
>  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];
>  
> diff --git a/tools/perf/arch/x86/util/pmu.c b/tools/perf/arch/x86/util/pmu.c
> index cd22e80e5657..0f49ff13cfe2 100644
> --- a/tools/perf/arch/x86/util/pmu.c
> +++ b/tools/perf/arch/x86/util/pmu.c
> @@ -35,8 +35,12 @@ void perf_pmu__arch_init(struct perf_pmu *pmu __maybe_unused)
>  	if (x86__is_amd_cpu()) {
>  		if (!strcmp(pmu->name, "ibs_op"))
>  			pmu->mem_events = perf_mem_events_amd;
> -	} else if (pmu->is_core)
> -		pmu->mem_events = perf_mem_events_intel;
> +	} else if (pmu->is_core) {
> +		if (perf_pmu__have_event(pmu, "mem-loads-aux"))
> +			pmu->mem_events = perf_mem_events_intel_aux;
> +		else
> +			pmu->mem_events = perf_mem_events_intel;
> +	}
>  }
>  
>  int perf_pmus__num_mem_pmus(void)
> diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
> index 27a33dc44964..51e53e33df03 100644
> --- a/tools/perf/util/mem-events.c
> +++ b/tools/perf/util/mem-events.c
> @@ -17,17 +17,17 @@
>  
>  unsigned int perf_mem_events__loads_ldlat = 30;
>  
> -#define E(t, n, s) { .tag = t, .name = n, .sysfs_name = s }
> +#define E(t, n, s, l, a) { .tag = t, .name = n, .sysfs_name = s, .ldlat = l, .aux_event = a }
>  
>  struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX] = {
> -	E("ldlat-loads",	"cpu/mem-loads,ldlat=%u/P",	"cpu/events/mem-loads"),
> -	E("ldlat-stores",	"cpu/mem-stores/P",		"cpu/events/mem-stores"),
> -	E(NULL,			NULL,				NULL),
> +	E("ldlat-loads",	"%s/mem-loads,ldlat=%u/P",	"cpu/events/mem-loads",		true,	0),
> +	E("ldlat-stores",	"%s/mem-stores/P",		"cpu/events/mem-stores",	false,	0),
> +	E(NULL,			NULL,				NULL,				false,	0),
>  };
>  #undef E
>  
>  static char mem_loads_name[100];
> -static bool mem_loads_name__init;
> +static char mem_stores_name[100];
>  
>  struct perf_mem_event *perf_pmu__mem_events_ptr(struct perf_pmu *pmu, int i)
>  {
> @@ -62,23 +62,49 @@ struct perf_pmu *perf_mem_events_find_pmu(void)
>  	return perf_pmus__scan_mem(NULL);
>  }
>  
> -const char * __weak perf_mem_events__name(int i, const char *pmu_name  __maybe_unused)
> +static const char *perf_pmu__mem_events_name(int i, struct perf_pmu *pmu)
>  {
> -	struct perf_mem_event *e = &perf_mem_events[i];
> +	struct perf_mem_event *e;
>  
> +	if (i >= PERF_MEM_EVENTS__MAX || !pmu)
> +		return NULL;
> +
> +	e = &pmu->mem_events[i];
>  	if (!e)
>  		return NULL;
>  
> -	if (i == PERF_MEM_EVENTS__LOAD) {
> -		if (!mem_loads_name__init) {
> -			mem_loads_name__init = true;
> -			scnprintf(mem_loads_name, sizeof(mem_loads_name),
> -				  e->name, perf_mem_events__loads_ldlat);
> +	if (i == PERF_MEM_EVENTS__LOAD || i == PERF_MEM_EVENTS__LOAD_STORE) {
> +		if (e->ldlat) {
> +			if (!e->aux_event) {
> +				/* ARM and Most of Intel */
> +				scnprintf(mem_loads_name, sizeof(mem_loads_name),
> +					  e->name, pmu->name,
> +					  perf_mem_events__loads_ldlat);
> +			} else {
> +				/* Intel with mem-loads-aux event */
> +				scnprintf(mem_loads_name, sizeof(mem_loads_name),
> +					  e->name, pmu->name, pmu->name,
> +					  perf_mem_events__loads_ldlat);
> +			}
> +		} else {
> +			if (!e->aux_event) {
> +				/* AMD and POWER */
> +				scnprintf(mem_loads_name, sizeof(mem_loads_name),
> +					  e->name, pmu->name);
> +			} else
> +				return NULL;
>  		}
> +
>  		return mem_loads_name;
>  	}
>  
> -	return e->name;
> +	if (i == PERF_MEM_EVENTS__STORE) {
> +		scnprintf(mem_stores_name, sizeof(mem_stores_name),
> +			  e->name, pmu->name);
> +		return mem_stores_name;
> +	}
> +
> +	return NULL;
>  }
>  
>  __weak bool is_mem_loads_aux_event(struct evsel *leader __maybe_unused)
> @@ -175,7 +201,7 @@ void perf_pmu__mem_events_list(struct perf_pmu *pmu)
>  			e->tag ? 13 : 0,
>  			e->tag ? : "",
>  			e->tag && verbose > 0 ? 25 : 0,
> -			e->tag && verbose > 0 ? perf_mem_events__name(j, NULL) : "",
> +			e->tag && verbose > 0 ? perf_pmu__mem_events_name(j, pmu) : "",
>  			e->supported ? ": available\n" : "");
>  	}
>  }
> @@ -198,15 +224,15 @@ int perf_mem_events__record_args(const char **rec_argv, int *argv_nr,
>  
>  			if (!e->supported) {
>  				pr_err("failed: event '%s' not supported\n",
> -					perf_mem_events__name(j, pmu->name));
> +					perf_pmu__mem_events_name(j, pmu));
>  				return -1;
>  			}
>  
>  			if (perf_pmus__num_mem_pmus() == 1) {
>  				rec_argv[i++] = "-e";
> -				rec_argv[i++] = perf_mem_events__name(j, NULL);
> +				rec_argv[i++] = perf_pmu__mem_events_name(j, pmu);
>  			} else {
> -				const char *s = perf_mem_events__name(j, pmu->name);
> +				const char *s = perf_pmu__mem_events_name(j, pmu);
>  
>  				if (!perf_mem_event__supported(mnt, pmu, e))
>  					continue;
> diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h
> index 0ad301a2e424..79d342768d12 100644
> --- a/tools/perf/util/mem-events.h
> +++ b/tools/perf/util/mem-events.h
> @@ -14,6 +14,8 @@
>  struct perf_mem_event {
>  	bool		record;
>  	bool		supported;
> +	bool		ldlat;
> +	u32		aux_event;
>  	const char	*tag;
>  	const char	*name;
>  	const char	*sysfs_name;
> @@ -39,7 +41,6 @@ extern struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX];
>  int perf_pmu__mem_events_parse(struct perf_pmu *pmu, const char *str);
>  int perf_pmu__mem_events_init(struct perf_pmu *pmu);
>  
> -const char *perf_mem_events__name(int i, const char *pmu_name);
>  struct perf_mem_event *perf_pmu__mem_events_ptr(struct perf_pmu *pmu, int i);
>  struct perf_pmu *perf_mem_events_find_pmu(void);
>  bool is_mem_loads_aux_event(struct evsel *leader);