Commit bb65acdc authored by Kan Liang's avatar Kan Liang Committed by Namhyung Kim
Browse files

perf mem: Add mem_events into the supported perf_pmu 



With the mem_events, perf doesn't need to read sysfs for each PMU to
find the mem-events-supported PMU. The patch also makes it possible to
clean up the related __weak functions later.

The patch is only to add the mem_events into the perf_pmu for all ARCHs.
It will be used in the later cleanup patches.

Reviewed-by: default avatarIan Rogers <irogers@google.com>
Reviewed-by: default avatarKajol Jain <kjain@linux.ibm.com>
Tested-by: default avatarRavi Bangoria <ravi.bangoria@amd.com>
Tested-by: default avatarLeo Yan <leo.yan@linaro.org>
Tested-by: default avatarKajol Jain <kjain@linux.ibm.com>
Suggested-by: default avatarLeo Yan <leo.yan@linaro.org>
Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Cc: will@kernel.org
Cc: mike.leach@linaro.org
Cc: renyu.zj@linux.alibaba.com
Cc: yuhaixin.yhx@linux.alibaba.com
Cc: tmricht@linux.ibm.com
Cc: atrajeev@linux.vnet.ibm.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: john.g.garry@oracle.com
Link: https://lore.kernel.org/r/20240123185036.3461837-2-kan.liang@linux.intel.com


Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent 68f87f24

tools/perf/arch/arm/util/pmu.c

+3 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "hisi-ptt.h"

#include "../../../util/pmu.h"

#include "../../../util/cs-etm.h"

#include "../../arm64/util/mem-events.h"



void perf_pmu__arch_init(struct perf_pmu *pmu __maybe_unused)

{
@@ -26,6 +27,8 @@ void perf_pmu__arch_init(struct perf_pmu *pmu __maybe_unused) 
		pmu->selectable = true;

		pmu->is_uncore = false;

		pmu->perf_event_attr_init_default = arm_spe_pmu_default_config;

		if (!strcmp(pmu->name, "arm_spe_0"))

			pmu->mem_events = perf_mem_events_arm;

	} else if (strstarts(pmu->name, HISI_PTT_PMU_NAME)) {

		pmu->selectable = true;

#endif

tools/perf/arch/arm64/util/mem-events.c

+4 −3
Original line number Diff line number Diff line 
// 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) { .tag = t, .name = n, .sysfs_name = s }



static struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX] = {

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"),
@@ -17,7 +18,7 @@ struct perf_mem_event *perf_mem_events__ptr(int i) 
	if (i >= PERF_MEM_EVENTS__MAX)

		return NULL;



	return &perf_mem_events[i];

	return &perf_mem_events_arm[i];

}



const char *perf_mem_events__name(int i, const char *pmu_name __maybe_unused)

tools/perf/arch/arm64/util/mem-events.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ARM64_MEM_EVENTS_H

#define _ARM64_MEM_EVENTS_H



extern struct perf_mem_event perf_mem_events_arm[PERF_MEM_EVENTS__MAX];



#endif /* _ARM64_MEM_EVENTS_H */

tools/perf/arch/x86/util/mem-events.c

+2 −2
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ static char mem_stores_name[100]; 


#define E(t, n, s) { .tag = t, .name = n, .sysfs_name = s }



static struct perf_mem_event perf_mem_events_intel[PERF_MEM_EVENTS__MAX] = {

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),

};



static struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX] = {

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"),

tools/perf/arch/x86/util/mem-events.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _X86_MEM_EVENTS_H

#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_amd[PERF_MEM_EVENTS__MAX];



#endif /* _X86_MEM_EVENTS_H */