Clean up perf mem
v4 cover Clean up perf mem
From: Kan Liang <[email protected]>
Changes since V3:
- Fix the powerPC building error (Kajol Jain)
- The s390 does not support perf mem. Remove the code. (Thomas)
- Add reviewed-by and tested-by from Kajol Jain for patch 1 and 2
- Add tested-by from Leo
Changes since V2:
- Fix the Arm64 building error (Leo)
- Add two new patches to clean up perf_mem_events__record_args() and perf_pmus__num_mem_pmus() (Leo)
Changes since V1:
- Fix strcmp of PMU name checking (Ravi)
- Fix "/," typo (Ian)
- Rename several functions with perf_pmu__mem_events prefix. (Ian)
- Fold the header removal patch into the patch where the cleanups made. (Arnaldo)
- Add reviewed-by and tested-by from Ian and Ravi
As discussed in the below thread, the patch set is to clean up perf mem.
https://lore.kernel.org/lkml/[email protected]/
Introduce generic functions perf_mem_events__ptr(), perf_mem_events__name() ,and is_mem_loads_aux_event() to replace the ARCH specific ones.
Simplify the perf_mem_event__supported().
Only keeps the ARCH-specific perf_mem_events array in the corresponding mem-events.c for each ARCH.
There is no functional change.
The patch set touches almost all the ARCHs, Intel, AMD, ARM, Power and etc. But I can only test it on two Intel platforms.
Please give it try, if you have machines with other ARCHs.
Here are the test results:
Intel hybrid machine:
$perf mem record -e list
ldlat-loads : available
ldlat-stores : available
$perf mem record -e ldlat-loads -v --ldlat 50
calling: record -e cpu_atom/mem-loads,ldlat=50/P -e cpu_core/mem-loads,ldlat=50/P
$perf mem record -v
calling: record -e cpu_atom/mem-loads,ldlat=30/P -e cpu_atom/mem-stores/P -e cpu_core/mem-loads,ldlat=30/P -e cpu_core/mem-stores/P
$perf mem record -t store -v
calling: record -e cpu_atom/mem-stores/P -e cpu_core/mem-stores/P
Intel SPR:
$perf mem record -e list
ldlat-loads : available
ldlat-stores : available
$perf mem record -e ldlat-loads -v --ldlat 50
calling: record -e {cpu/mem-loads-aux/,cpu/mem-loads,ldlat=50/}:P
$perf mem record -v
calling: record -e {cpu/mem-loads-aux/,cpu/mem-loads,ldlat=30/}:P -e cpu/mem-stores/P
$perf mem record -t store -v
calling: record -e cpu/mem-stores/P
Kan Liang (7):
perf mem: Add mem_events into the supported perf_pmu perf mem: Clean up perf_mem_events__ptr() perf mem: Clean up perf_mem_events__name() perf mem: Clean up perf_mem_event__supported() perf mem: Clean up is_mem_loads_aux_event() perf mem: Clean up perf_mem_events__record_args() perf mem: Clean up perf_pmus__num_mem_pmus()
tools/perf/arch/arm/util/pmu.c | 3 + tools/perf/arch/arm64/util/mem-events.c | 39 +--- tools/perf/arch/arm64/util/mem-events.h | 7 + tools/perf/arch/powerpc/util/Build | 1 + tools/perf/arch/powerpc/util/mem-events.c | 16 +- tools/perf/arch/powerpc/util/mem-events.h | 7 + tools/perf/arch/powerpc/util/pmu.c | 12 ++ tools/perf/arch/x86/util/mem-events.c | 99 ++-------- tools/perf/arch/x86/util/mem-events.h | 10 + tools/perf/arch/x86/util/pmu.c | 19 +- tools/perf/builtin-c2c.c | 45 ++--- tools/perf/builtin-mem.c | 48 ++--- tools/perf/util/mem-events.c | 217 +++++++++++++--------- tools/perf/util/mem-events.h | 19 +- tools/perf/util/pmu.c | 4 +- tools/perf/util/pmu.h | 7 + tools/perf/util/pmus.c | 6 - tools/perf/util/pmus.h | 1 - 18 files changed, 279 insertions(+), 281 deletions(-) create mode 100644 tools/perf/arch/arm64/util/mem-events.h create mode 100644 tools/perf/arch/powerpc/util/mem-events.h create mode 100644 tools/perf/arch/powerpc/util/pmu.c create mode 100644 tools/perf/arch/x86/util/mem-events.h
Signature · 1 line
2.35.1
PATCH v4 1/7 perf mem: Add mem_events into the supported perf_pmu
From: Kan Liang <[email protected]>
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.
--- tools/perf/arch/arm/util/pmu.c | 3 +++ tools/perf/arch/arm64/util/mem-events.c | 7 ++++--- tools/perf/arch/arm64/util/mem-events.h | 7 +++++++ tools/perf/arch/x86/util/mem-events.c | 4 ++-- tools/perf/arch/x86/util/mem-events.h | 9 +++++++++ tools/perf/arch/x86/util/pmu.c | 7 +++++++ tools/perf/util/mem-events.c | 2 +- tools/perf/util/mem-events.h | 1 + tools/perf/util/pmu.c | 4 +++- tools/perf/util/pmu.h | 7 +++++++ 10 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 tools/perf/arch/arm64/util/mem-events.h create mode 100644 tools/perf/arch/x86/util/mem-events.h
tools/perf/arch/arm/util/pmu.c +3 -0
@@ -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
@@ -1,10 +1,11 @@// 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 new file +7 -0
@@ -0,0 +1,7 @@ +/* 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
@@ -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 new file +9 -0
@@ -0,0 +1,9 @@ +/* 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 */
tools/perf/arch/x86/util/pmu.c +7 -0
@@ -15,6 +15,7 @@#include "../../../util/pmu.h" #include "../../../util/fncache.h" #include "../../../util/pmus.h" +#include "mem-events.h" #include "env.h" void perf_pmu__arch_init (struct perf_pmu *pmu__maybe_unused )
@@ -30,6 +31,12 @@ void perf_pmu__arch_init(struct perf_pmu *pmu __maybe_unused) pmu->selectable = true; }#endif + +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; }int perf_pmus__num_mem_pmus (void )
tools/perf/util/mem-events.c +1 -1
@@ -19,7 +19,7 @@ unsigned int perf_mem_events__loads_ldlat = 30;#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[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 ),
tools/perf/util/mem-events.h +1 -0
@@ -34,6 +34,7 @@ enum { };extern unsigned int perf_mem_events__loads_ldlat; +extern struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX ];int perf_mem_events__parse (const char *str);int perf_mem_events__init (void );
tools/perf/util/pmu.c +3 -1
@@ -986,8 +986,10 @@ static int pmu_max_precise(int dirfd, struct perf_pmu *pmu) }void __weak -perf_pmu__arch_init (struct perf_pmu *pmu__maybe_unused ) +perf_pmu__arch_init (struct perf_pmu *pmu) { +if (pmu->is_core) + pmu->mem_events = perf_mem_events; }struct perf_pmu *perf_pmu__lookup (struct list_head *pmus,int dirfd,const char *name)
tools/perf/util/pmu.h +7 -0
@@ -10,6 +10,8 @@#include <stdio.h> #include "parse-events.h" #include "pmu-events/pmu-events.h" +#include "map_symbol.h" +#include "mem-events.h" struct evsel_config_term ;struct perf_cpu_map ;
@@ -162,6 +164,11 @@ struct perf_pmu {*/ bool exclude_guest; } missing_features; + +/** +* @mem_events: List of the supported mem events +*/ +struct perf_mem_event *mem_events; };/** @perf_pmu__fake: A special global PMU used for testing. */
Signature · 1 line
2.35.1
PATCH v4 2/7 perf mem: Clean up perf_mem_events__ptr()
In reply to [email protected]From: Kan Liang <[email protected]>
The mem_events can be retrieved from the struct perf_pmu now. An ARCH specific perf_mem_events__ptr() is not required anymore. Remove all of them.
The Intel hybrid has multiple mem-events-supported PMUs. But they share the same mem_events. Other ARCHs only support one mem-events-supported PMU. In the configuration, it's good enough to only configure the mem_events for one PMU. Add perf_mem_events_find_pmu() which returns the first mem-events-supported PMU.
In the perf_mem_events__init(), the perf_pmus__scan() is not required anymore. It avoids checking the sysfs for every PMU on the system.
Make the perf_mem_events__record_args() more generic. Remove the perf_mem_events__print_unsupport_hybrid().
Since pmu is added as a new parameter, rename perf_mem_events__ptr() to perf_pmu__mem_events_ptr(). Several other functions also do a similar rename.
--- tools/perf/arch/arm64/util/mem-events.c | 10 +-- tools/perf/arch/x86/util/mem-events.c | 18 ++--- tools/perf/builtin-c2c.c | 28 +++++-- tools/perf/builtin-mem.c | 28 +++++-- tools/perf/util/mem-events.c | 103 ++++++++++++------------ tools/perf/util/mem-events.h | 9 ++- 6 files changed, 104 insertions(+), 92 deletions(-)
tools/perf/arch/arm64/util/mem-events.c +1 -9
@@ -13,17 +13,9 @@ struct perf_mem_event perf_mem_events_arm[PERF_MEM_EVENTS__MAX] = {static char mem_ev_name[100 ]; -struct perf_mem_event *perf_mem_events__ptr (int i) -{ -if (i >=PERF_MEM_EVENTS__MAX ) -return NULL ; - -return &perf_mem_events_arm[i]; -} -const char *perf_mem_events__name (int i,const char *pmu_name__maybe_unused ) { -struct perf_mem_event *e =perf_mem_events__ptr (i); +struct perf_mem_event *e = &perf_mem_events_arm[i];if (i >=PERF_MEM_EVENTS__MAX )return NULL ;
tools/perf/arch/x86/util/mem-events.c +6 -12
@@ -28,17 +28,6 @@ struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX] = { E("mem-ldst", "ibs_op//", "ibs_op"), }; -struct perf_mem_event *perf_mem_events__ptr (int i) -{ -if (i >=PERF_MEM_EVENTS__MAX ) -return NULL ; - -if (x86__is_amd_cpu ()) -return &perf_mem_events_amd[i]; - -return &perf_mem_events_intel[i]; -} -bool is_mem_loads_aux_event (struct evsel *leader) {struct perf_pmu *pmu =perf_pmus__find ("cpu" );
@@ -54,7 +43,12 @@ bool is_mem_loads_aux_event(struct evsel *leader)const char *perf_mem_events__name (int i,const char *pmu_name) { -struct perf_mem_event *e =perf_mem_events__ptr (i); +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 ;
tools/perf/builtin-c2c.c +21 -7
@@ -3215,12 +3215,19 @@ static int parse_record_events(const struct option *opt, const char *str, int unset __maybe_unused) { bool *event_set = (bool *) opt->value; +struct perf_pmu *pmu; + + pmu =perf_mem_events_find_pmu (); +if (!pmu) { +pr_err ("failed: there is no PMU that supports perf c2c\n" ); +exit (-1 ); + }if (!strcmp (str,"list" )) { -perf_mem_events__list (); +perf_pmu__mem_events_list (pmu);exit (0 ); } -if (perf_mem_events__parse (str)) +if (perf_pmu__mem_events_parse (pmu, str))exit (-1 ); *event_set = true;
@@ -3245,6 +3252,7 @@ static int perf_c2c__record(int argc, const char **argv)bool all_user = false, all_kernel = false;bool event_set = false;struct perf_mem_event *e; +struct perf_pmu *pmu;struct option options[] = { OPT_CALLBACK('e', "event", &event_set, "event", "event selector. Use 'perf c2c record -e list' to list available events",
@@ -3256,7 +3264,13 @@ static int perf_c2c__record(int argc, const char **argv) OPT_END() }; -if (perf_mem_events__init ()) { + pmu =perf_mem_events_find_pmu (); +if (!pmu) { +pr_err ("failed: no PMU supports the memory events\n" ); +return -1 ; + } + +if (perf_pmu__mem_events_init (pmu)) {pr_err ("failed: memory events not supported\n" );return -1 ; }
@@ -3280,7 +3294,7 @@ static int perf_c2c__record(int argc, const char **argv) rec_argv[i++] ="record" ;if (!event_set) { - e =perf_mem_events__ptr (PERF_MEM_EVENTS__LOAD_STORE ); + e =perf_pmu__mem_events_ptr (pmu,PERF_MEM_EVENTS__LOAD_STORE );/* * The load and store operations are required, use the event * PERF_MEM_EVENTS__LOAD_STORE if it is supported.
@@ -3289,15 +3303,15 @@ static int perf_c2c__record(int argc, const char **argv) e->record = true; rec_argv[i++] ="-W" ; }else { - e =perf_mem_events__ptr (PERF_MEM_EVENTS__LOAD ); + e =perf_pmu__mem_events_ptr (pmu,PERF_MEM_EVENTS__LOAD ); e->record = true; - e =perf_mem_events__ptr (PERF_MEM_EVENTS__STORE ); + e =perf_pmu__mem_events_ptr (pmu,PERF_MEM_EVENTS__STORE ); e->record = true; } } - e =perf_mem_events__ptr (PERF_MEM_EVENTS__LOAD ); + e =perf_pmu__mem_events_ptr (pmu,PERF_MEM_EVENTS__LOAD );if (e->record) rec_argv[i++] ="-W" ;
tools/perf/builtin-mem.c +21 -7
@@ -43,12 +43,19 @@ static int parse_record_events(const struct option *opt, const char *str, int unset __maybe_unused) {struct perf_mem *mem = *(struct perf_mem **)opt->value; +struct perf_pmu *pmu; + + pmu =perf_mem_events_find_pmu (); +if (!pmu) { +pr_err ("failed: there is no PMU that supports perf mem\n" ); +exit (-1 ); + }if (!strcmp (str,"list" )) { -perf_mem_events__list (); +perf_pmu__mem_events_list (pmu);exit (0 ); } -if (perf_mem_events__parse (str)) +if (perf_pmu__mem_events_parse (pmu, str))exit (-1 ); mem->operation =0 ;
@@ -72,6 +79,7 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem)int ret;bool all_user = false, all_kernel = false;struct perf_mem_event *e; +struct perf_pmu *pmu;struct option options[] = { OPT_CALLBACK('e', "event", &mem, "event", "event selector. use 'perf mem record -e list' to list available events",
@@ -84,7 +92,13 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem) OPT_END() }; -if (perf_mem_events__init ()) { + pmu =perf_mem_events_find_pmu (); +if (!pmu) { +pr_err ("failed: no PMU supports the memory events\n" ); +return -1 ; + } + +if (perf_pmu__mem_events_init (pmu)) {pr_err ("failed: memory events not supported\n" );return -1 ; }
@@ -113,7 +127,7 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem) rec_argv[i++] ="record" ; - e =perf_mem_events__ptr (PERF_MEM_EVENTS__LOAD_STORE ); + e =perf_pmu__mem_events_ptr (pmu,PERF_MEM_EVENTS__LOAD_STORE );/* * The load and store operations are required, use the event
@@ -126,17 +140,17 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem) rec_argv[i++] ="-W" ; }else {if (mem->operation &MEM_OPERATION_LOAD ) { - e =perf_mem_events__ptr (PERF_MEM_EVENTS__LOAD ); + e =perf_pmu__mem_events_ptr (pmu,PERF_MEM_EVENTS__LOAD ); e->record = true; }if (mem->operation &MEM_OPERATION_STORE ) { - e =perf_mem_events__ptr (PERF_MEM_EVENTS__STORE ); + e =perf_pmu__mem_events_ptr (pmu,PERF_MEM_EVENTS__STORE ); e->record = true; } } - e =perf_mem_events__ptr (PERF_MEM_EVENTS__LOAD ); + e =perf_pmu__mem_events_ptr (pmu,PERF_MEM_EVENTS__LOAD );if (e->record) rec_argv[i++] ="-W" ;
tools/perf/util/mem-events.c +50 -53
175 lines not on this page · raw message
tools/perf/util/mem-events.h +5 -4
@@ -36,14 +36,15 @@ enum {extern unsigned int perf_mem_events__loads_ldlat;extern struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX ]; -int perf_mem_events__parse (const char *str); -int perf_mem_events__init (void ); +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_mem_events__ptr (int i); +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); -void perf_mem_events__list (void ); +void perf_pmu__mem_events_list (struct perf_pmu *pmu);int perf_mem_events__record_args (const char **rec_argv,int *argv_nr,char **rec_tmp,int *tmp_nr);
Signature · 1 line
2.35.1
PATCH v4 3/7 perf mem: Clean up perf_mem_events__name()
In reply to [email protected]From: Kan Liang <[email protected]>
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.
--- tools/perf/arch/arm64/util/mem-events.c | 26 ++------- tools/perf/arch/powerpc/util/Build | 1 + tools/perf/arch/powerpc/util/mem-events.c | 16 +++--- tools/perf/arch/powerpc/util/mem-events.h | 7 +++ tools/perf/arch/powerpc/util/pmu.c | 12 ++++ 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 +- 10 files changed, 97 insertions(+), 107 deletions(-) create mode 100644 tools/perf/arch/powerpc/util/mem-events.h create mode 100644 tools/perf/arch/powerpc/util/pmu.c
tools/perf/arch/arm64/util/mem-events.c +4 -22
@@ -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; -}
tools/perf/arch/powerpc/util/Build +1 -0
@@ -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
tools/perf/arch/powerpc/util/mem-events.c +8 -8
@@ -1,12 +1,12 @@// SPDX-License-Identifier: GPL-2.0 -#include "map_symbol.h" +#include "util/map_symbol.h" +#include "util/mem-events.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 ), +};
tools/perf/arch/powerpc/util/mem-events.h new file +7 -0
@@ -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 */
tools/perf/arch/powerpc/util/pmu.c new file +12 -0
@@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <string.h> + +#include "../../../util/pmu.h" +#include "mem-events.h" + +void perf_pmu__arch_init (struct perf_pmu *pmu) +{ +if (pmu->is_core) + pmu->mem_events = perf_mem_events_power; +}
tools/perf/arch/x86/util/mem-events.c +13 -57
86 lines not on this page · raw message
tools/perf/arch/x86/util/mem-events.h +1 -0
@@ -3,6 +3,7 @@#define _X86_MEM_EVENTS_Hextern 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 ];
tools/perf/arch/x86/util/pmu.c +6 -2
@@ -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 )
tools/perf/util/mem-events.c +43 -17
105 lines not on this page · raw message
tools/perf/util/mem-events.h +2 -1
@@ -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);
Signature · 1 line
2.35.1
PATCH v4 4/7 perf mem: Clean up perf_mem_event__supported()
In reply to [email protected]From: Kan Liang <[email protected]>
For some ARCHs, e.g., ARM and AMD, to get the availability of the mem-events, perf checks the existence of a specific PMU. For the other ARCHs, e.g., Intel and Power, perf has to check the existence of some specific events.
The current perf only iterates the mem-events-supported PMUs. It's not required to check the existence of a specific PMU anymore.
Rename sysfs_name to event_name, which stores the specific mem-events. Perf only needs to check those events for the availability of the mem-events.
Rename perf_mem_event__supported to perf_pmu__mem_events_supported.
--- tools/perf/arch/arm64/util/mem-events.c | 8 ++++---- tools/perf/arch/powerpc/util/mem-events.c | 8 ++++---- tools/perf/arch/x86/util/mem-events.c | 20 ++++++++++---------- tools/perf/util/mem-events.c | 22 ++++++++++++---------- tools/perf/util/mem-events.h | 2 +- 5 files changed, 31 insertions(+), 29 deletions(-)
tools/perf/arch/arm64/util/mem-events.c +4 -4
@@ -3,10 +3,10 @@#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 } +#define E (t, n, s, l, a) { .tag = t, .name = n, .event_name = s, .ldlat = l, .aux_event = a }struct perf_mem_event perf_mem_events_arm[PERF_MEM_EVENTS__MAX ] = { -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 ), +E ("spe-load" ,"%s/ts_enable=1,pa_enable=1,load_filter=1,store_filter=0,min_latency=%u/" ,NULL , true,0 ), +E ("spe-store" ,"%s/ts_enable=1,pa_enable=1,load_filter=0,store_filter=1/" ,NULL , false,0 ), +E ("spe-ldst" ,"%s/ts_enable=1,pa_enable=1,load_filter=1,store_filter=1,min_latency=%u/" ,NULL , true,0 ), };
tools/perf/arch/powerpc/util/mem-events.c +4 -4
@@ -3,10 +3,10 @@#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 } +#define E (t, n, s, l, a) { .tag = t, .name = n, .event_name = s, .ldlat = l, .aux_event = a }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 ), +E ("ldlat-loads" ,"%s/mem-loads/" ,"mem-loads" , false,0 ), +E ("ldlat-stores" ,"%s/mem-stores/" ,"mem-stores" , false,0 ), +E (NULL ,NULL ,NULL , false,0 ), };
tools/perf/arch/x86/util/mem-events.c +10 -10
@@ -9,24 +9,24 @@#define MEM_LOADS_AUX 0x8203 -#define E (t, n, s, l, a) { .tag = t, .name = n, .sysfs_name = s, .ldlat = l, .aux_event = a } +#define E (t, n, s, l, a) { .tag = t, .name = n, .event_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" , true,0 ), -E ("ldlat-stores" ,"%s/mem-stores/P" ,"%s/events/mem-stores" , false,0 ), -E (NULL ,NULL ,NULL , false,0 ), +E ("ldlat-loads" ,"%s/mem-loads,ldlat=%u/P" ,"mem-loads" , true,0 ), +E ("ldlat-stores" ,"%s/mem-stores/P" ,"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 ), +E ("ldlat-loads" ,"{%s/mem-loads-aux/,%s/mem-loads,ldlat=%u/}:P" ,"mem-loads" , true,MEM_LOADS_AUX ), +E ("ldlat-stores" ,"%s/mem-stores/P" ,"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 , false,0 ), -E (NULL ,NULL ,NULL , false,0 ), -E ("mem-ldst" ,"%s//" ,"ibs_op" , false,0 ), +E (NULL ,NULL ,NULL , false,0 ), +E (NULL ,NULL ,NULL , false,0 ), +E ("mem-ldst" ,"%s//" ,NULL , false,0 ), };bool is_mem_loads_aux_event (struct evsel *leader)
tools/perf/util/mem-events.c +12 -10
@@ -17,12 +17,12 @@unsigned int perf_mem_events__loads_ldlat =30 ; -#define E (t, n, s, l, a) { .tag = t, .name = n, .sysfs_name = s, .ldlat = l, .aux_event = a } +#define E (t, n, s, l, a) { .tag = t, .name = n, .event_name = s, .ldlat = l, .aux_event = a }struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX ] = { -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 ), +E ("ldlat-loads" ,"%s/mem-loads,ldlat=%u/P" ,"mem-loads" , true,0 ), +E ("ldlat-stores" ,"%s/mem-stores/P" ,"mem-stores" , false,0 ), +E (NULL ,NULL ,NULL , false,0 ), };#undef E
@@ -151,15 +151,17 @@ int perf_pmu__mem_events_parse(struct perf_pmu *pmu, const char *str)return -1 ; } -static bool perf_mem_event__supported (const char *mnt,struct perf_pmu *pmu, +static bool perf_pmu__mem_events_supported (const char *mnt,struct perf_pmu *pmu,struct perf_mem_event *e) { -char sysfs_name[100 ];char path[PATH_MAX ];struct stat st; -scnprintf (sysfs_name,sizeof (sysfs_name), e->sysfs_name, pmu->name); -scnprintf (path,PATH_MAX ,"%s/devices/%s" , mnt, sysfs_name); +if (!e->event_name) +return true; + +scnprintf (path,PATH_MAX ,"%s/devices/%s/events/%s" , mnt, pmu->name, e->event_name); +return !stat (path, &st); }
@@ -182,7 +184,7 @@ int perf_pmu__mem_events_init(struct perf_pmu *pmu)if (!e->tag)continue ; - e->supported |=perf_mem_event__supported (mnt, pmu, e); + e->supported |=perf_pmu__mem_events_supported (mnt, pmu, e);if (e->supported) found = true; }
@@ -234,7 +236,7 @@ int perf_mem_events__record_args(const char **rec_argv, int *argv_nr, }else {const char *s =perf_pmu__mem_events_name (j, pmu); -if (!perf_mem_event__supported (mnt, pmu, e)) +if (!perf_pmu__mem_events_supported (mnt, pmu, e))continue ; rec_argv[i++] ="-e" ;
tools/perf/util/mem-events.h +1 -1
@@ -18,7 +18,7 @@ struct perf_mem_event {u32 aux_event;const char *tag;const char *name; -const char *sysfs_name; +const char *event_name; };struct mem_info {
Signature · 1 line
2.35.1
PATCH v4 5/7 perf mem: Clean up is_mem_loads_aux_event()
In reply to [email protected]From: Kan Liang <[email protected]>
The aux_event can be retrieved from the perf_pmu now. Implement a generic support.
--- tools/perf/arch/x86/util/mem-events.c | 23 ++++------------------- tools/perf/util/mem-events.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 21 deletions(-)
tools/perf/arch/x86/util/mem-events.c +4 -19
@@ -1,11 +1,9 @@// SPDX-License-Identifier: GPL-2.0 -#include "util/pmu.h" -#include "util/pmus.h" -#include "util/env.h" -#include "map_symbol.h" -#include "mem-events.h" #include "linux/string.h" -#include "env.h" +#include "util/map_symbol.h" +#include "util/mem-events.h" +#include "mem-events.h" +#define MEM_LOADS_AUX 0x8203
@@ -28,16 +26,3 @@ struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX] = {E (NULL ,NULL ,NULL , false,0 ), E("mem-ldst", "%s//", NULL, false, 0), }; - -bool is_mem_loads_aux_event (struct evsel *leader) -{ -struct perf_pmu *pmu =perf_pmus__find ("cpu" ); - -if (!pmu) - pmu =perf_pmus__find ("cpu_core" ); - -if (pmu && !perf_pmu__have_event (pmu,"mem-loads-aux" )) -return false; - -return leader->core.attr.config ==MEM_LOADS_AUX ; -}
tools/perf/util/mem-events.c +12 -2
@@ -107,9 +107,19 @@ static const char *perf_pmu__mem_events_name(int i, struct perf_pmu *pmu)return NULL ; } -__weak bool is_mem_loads_aux_event (struct evsel *leader__maybe_unused ) +bool is_mem_loads_aux_event (struct evsel *leader) { -return false; +struct perf_pmu *pmu = leader->pmu; +struct perf_mem_event *e; + +if (!pmu || !pmu->mem_events) +return false; + + e = &pmu->mem_events[PERF_MEM_EVENTS__LOAD ]; +if (!e->aux_event) +return false; + +return leader->core.attr.config == e->aux_event; }int perf_pmu__mem_events_parse (struct perf_pmu *pmu,const char *str)
Signature · 1 line
2.35.1
PATCH v4 6/7 perf mem: Clean up perf_mem_events__record_args()
In reply to [email protected]From: Kan Liang <[email protected]>
The current code iterates all memory PMUs. It doesn't matter if the system has only one memory PMU or multiple PMUs. The check of perf_pmus__num_mem_pmus() is not required anymore.
The rec_tmp is not used in c2c and mem. Removing them as well.
--- tools/perf/builtin-c2c.c | 15 ++------------- tools/perf/builtin-mem.c | 18 ++---------------- tools/perf/util/mem-events.c | 34 ++++++++++++---------------------- tools/perf/util/mem-events.h | 3 +-- 4 files changed, 17 insertions(+), 53 deletions(-)
tools/perf/builtin-c2c.c +2 -13
@@ -3245,9 +3245,8 @@ static const char * const *record_mem_usage = __usage_record;static int perf_c2c__record (int argc,const char **argv) { -int rec_argc, i =0 , j, rec_tmp_nr =0 ; +int rec_argc, i =0 , j;const char **rec_argv; -char **rec_tmp;int ret;bool all_user = false, all_kernel = false;bool event_set = false;
@@ -3285,12 +3284,6 @@ static int perf_c2c__record(int argc, const char **argv)if (!rec_argv)return -1 ; - rec_tmp =calloc (rec_argc +1 ,sizeof (char *)); -if (!rec_tmp) { -free (rec_argv); -return -1 ; - } - rec_argv[i++] ="record" ;if (!event_set) {
@@ -3319,7 +3312,7 @@ static int perf_c2c__record(int argc, const char **argv) rec_argv[i++] ="--phys-data" ; rec_argv[i++] ="--sample-cpu" ; - ret =perf_mem_events__record_args (rec_argv, &i, rec_tmp, &rec_tmp_nr); + ret =perf_mem_events__record_args (rec_argv, &i);if (ret) goto out;
@@ -3346,10 +3339,6 @@ static int perf_c2c__record(int argc, const char **argv) ret =cmd_record (i, rec_argv); out: -for (i =0 ; i < rec_tmp_nr; i++) -free (rec_tmp[i]); - -free (rec_tmp);free (rec_argv);return ret; }
tools/perf/builtin-mem.c +2 -16
@@ -72,10 +72,9 @@ static const char * const *record_mem_usage = __usage;static int __cmd_record (int argc,const char **argv,struct perf_mem *mem) { -int rec_argc, i =0 , j, tmp_nr =0 ; +int rec_argc, i =0 , j;int start, end;const char **rec_argv; -char **rec_tmp;int ret;bool all_user = false, all_kernel = false;struct perf_mem_event *e;
@@ -116,15 +115,6 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem)if (!rec_argv)return -1 ; -/* -* Save the allocated event name strings. -*/ - rec_tmp =calloc (rec_argc +1 ,sizeof (char *)); -if (!rec_tmp) { -free (rec_argv); -return -1 ; - } - rec_argv[i++] ="record" ; e =perf_pmu__mem_events_ptr (pmu,PERF_MEM_EVENTS__LOAD_STORE );
@@ -163,7 +153,7 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem) rec_argv[i++] ="--data-page-size" ; start = i; - ret =perf_mem_events__record_args (rec_argv, &i, rec_tmp, &tmp_nr); + ret =perf_mem_events__record_args (rec_argv, &i);if (ret) goto out; end = i;
@@ -193,10 +183,6 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem) ret =cmd_record (i, rec_argv); out: -for (i =0 ; i < tmp_nr; i++) -free (rec_tmp[i]); - -free (rec_tmp);free (rec_argv);return ret; }
tools/perf/util/mem-events.c +12 -22
@@ -218,14 +218,14 @@ void perf_pmu__mem_events_list(struct perf_pmu *pmu) } } -int perf_mem_events__record_args (const char **rec_argv,int *argv_nr, -char **rec_tmp,int *tmp_nr) +int perf_mem_events__record_args (const char **rec_argv,int *argv_nr) {const char *mnt =sysfs__mount ();struct perf_pmu *pmu =NULL ; -int i = *argv_nr, k =0 ;struct perf_mem_event *e; - +int i = *argv_nr; +const char *s; +char *copy;while ((pmu =perf_pmus__scan_mem (pmu)) !=NULL ) {for (int j =0 ; j <PERF_MEM_EVENTS__MAX ; j++) {
@@ -240,30 +240,20 @@ int perf_mem_events__record_args(const char **rec_argv, int *argv_nr,return -1 ; } -if (perf_pmus__num_mem_pmus () ==1 ) { - rec_argv[i++] ="-e" ; - rec_argv[i++] =perf_pmu__mem_events_name (j, pmu); - }else { -const char *s =perf_pmu__mem_events_name (j, pmu); - -if (!perf_pmu__mem_events_supported (mnt, pmu, e)) -continue ; + s =perf_pmu__mem_events_name (j, pmu); +if (!s || !perf_pmu__mem_events_supported (mnt, pmu, e)) +continue ; - rec_argv[i++] ="-e" ; -if (s) { -char *copy =strdup (s); -if (!copy) -return -1 ; + copy =strdup (s); +if (!copy) +return -1 ; - rec_argv[i++] = copy; - rec_tmp[k++] = copy; - } - } + rec_argv[i++] ="-e" ; + rec_argv[i++] = copy; } } *argv_nr = i; - *tmp_nr = k;return 0 ; }
tools/perf/util/mem-events.h +1 -2
@@ -46,8 +46,7 @@ struct perf_pmu *perf_mem_events_find_pmu(void);bool is_mem_loads_aux_event (struct evsel *leader);void perf_pmu__mem_events_list (struct perf_pmu *pmu); -int perf_mem_events__record_args (const char **rec_argv,int *argv_nr, -char **rec_tmp,int *tmp_nr); +int perf_mem_events__record_args (const char **rec_argv,int *argv_nr);int perf_mem__tlb_scnprintf (char *out,size_t sz,struct mem_info *mem_info);int perf_mem__lvl_scnprintf (char *out,size_t sz,struct mem_info *mem_info);
Signature · 1 line
2.35.1
Re: [PATCH V4 6/7] perf mem: Clean up perf_mem_events__record_args()
Quoted 7 lines · On Tue, Jan 23, 2024 at 10:51 AM <[email protected]> wrote:
From: Kan Liang <[email protected]>
The current code iterates all memory PMUs. It doesn't matter if the system has only one memory PMU or multiple PMUs. The check of
perf_pmus__num_mem_pmus()is not required anymore.
Quoted 5 lines
The
rec_tmpis not used in c2c and mem. Removing them as well.Suggested-by Leo Yan <[email protected]>Tested-by Leo Yan <[email protected]>Signed-off-by Kan Liang <[email protected]>
Thanks for the cleanup!
Ian
Quoted 186 lines
--- tools/perf/builtin-c2c.c | 15 ++------------- tools/perf/builtin-mem.c | 18 ++---------------- tools/perf/util/mem-events.c | 34 ++++++++++++---------------------- tools/perf/util/mem-events.h | 3 +-- 4 files changed, 17 insertions(+), 53 deletions(-)tools/perf/builtin-c2c.c +2
-13@@ -3245,9 +3245,8 @@ static const char * const *record_mem_usage = __usage_record;static int perf_c2c__record (int argc,const char **argv) { -int rec_argc, i =0 , j, rec_tmp_nr =0 ; +int rec_argc, i =0 , j;const char **rec_argv; -char **rec_tmp;int ret;bool all_user = false, all_kernel = false;bool event_set = false;@@ -3285,12 +3284,6 @@ static int perf_c2c__record(int argc, const char **argv)if (!rec_argv)return -1 ; - rec_tmp =calloc (rec_argc +1 ,sizeof (char *)); -if (!rec_tmp) { -free (rec_argv); -return -1 ; - } - rec_argv[i++] ="record" ;if (!event_set) {@@ -3319,7 +3312,7 @@ static int perf_c2c__record(int argc, const char **argv) rec_argv[i++] ="--phys-data" ; rec_argv[i++] ="--sample-cpu" ; - ret =perf_mem_events__record_args (rec_argv, &i, rec_tmp, &rec_tmp_nr); + ret =perf_mem_events__record_args (rec_argv, &i);if (ret) goto out;@@ -3346,10 +3339,6 @@ static int perf_c2c__record(int argc, const char **argv) ret =cmd_record (i, rec_argv); out: -for (i =0 ; i < rec_tmp_nr; i++) -free (rec_tmp[i]); - -free (rec_tmp);free (rec_argv);return ret; }tools/perf/builtin-mem.c +2
-16@@ -72,10 +72,9 @@ static const char * const *record_mem_usage = __usage;static int __cmd_record (int argc,const char **argv,struct perf_mem *mem) { -int rec_argc, i =0 , j, tmp_nr =0 ; +int rec_argc, i =0 , j;int start, end;const char **rec_argv; -char **rec_tmp;int ret;bool all_user = false, all_kernel = false;struct perf_mem_event *e;@@ -116,15 +115,6 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem)if (!rec_argv)return -1 ; -/* -* Save the allocated event name strings. -*/ - rec_tmp =calloc (rec_argc +1 ,sizeof (char *)); -if (!rec_tmp) { -free (rec_argv); -return -1 ; - } - rec_argv[i++] ="record" ; e =perf_pmu__mem_events_ptr (pmu,PERF_MEM_EVENTS__LOAD_STORE );@@ -163,7 +153,7 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem) rec_argv[i++] ="--data-page-size" ; start = i; - ret =perf_mem_events__record_args (rec_argv, &i, rec_tmp, &tmp_nr); + ret =perf_mem_events__record_args (rec_argv, &i);if (ret) goto out; end = i;@@ -193,10 +183,6 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem) ret =cmd_record (i, rec_argv); out: -for (i =0 ; i < tmp_nr; i++) -free (rec_tmp[i]); - -free (rec_tmp);free (rec_argv);return ret; }tools/perf/util/mem-events.c +12
-22@@ -218,14 +218,14 @@ void perf_pmu__mem_events_list(struct perf_pmu *pmu) } } -int perf_mem_events__record_args (const char **rec_argv,int *argv_nr, -char **rec_tmp,int *tmp_nr) +int perf_mem_events__record_args (const char **rec_argv,int *argv_nr) {const char *mnt =sysfs__mount ();struct perf_pmu *pmu =NULL ; -int i = *argv_nr, k =0 ;struct perf_mem_event *e; - +int i = *argv_nr; +const char *s; +char *copy;while ((pmu =perf_pmus__scan_mem (pmu)) !=NULL ) {for (int j =0 ; j <PERF_MEM_EVENTS__MAX ; j++) {@@ -240,30 +240,20 @@ int perf_mem_events__record_args(const char **rec_argv, int *argv_nr,return -1 ; } -if (perf_pmus__num_mem_pmus () ==1 ) { - rec_argv[i++] ="-e" ; - rec_argv[i++] =perf_pmu__mem_events_name (j, pmu); - }else { -const char *s =perf_pmu__mem_events_name (j, pmu); - -if (!perf_pmu__mem_events_supported (mnt, pmu, e)) -continue ; + s =perf_pmu__mem_events_name (j, pmu); +if (!s || !perf_pmu__mem_events_supported (mnt, pmu, e)) +continue ; - rec_argv[i++] ="-e" ; -if (s) { -char *copy =strdup (s); -if (!copy) -return -1 ; + copy =strdup (s); +if (!copy) +return -1 ; - rec_argv[i++] = copy; - rec_tmp[k++] = copy; - } - } + rec_argv[i++] ="-e" ; + rec_argv[i++] = copy; } } *argv_nr = i; - *tmp_nr = k;return 0 ; }tools/perf/util/mem-events.h +1
-3@@ -46,8 +46,7 @@ struct perf_pmu *perf_mem_events_find_pmu(void);bool is_mem_loads_aux_event (struct evsel *leader);void perf_pmu__mem_events_list (struct perf_pmu *pmu); -int perf_mem_events__record_args (const char **rec_argv,int *argv_nr, -char **rec_tmp,int *tmp_nr); +int perf_mem_events__record_args (const char **rec_argv,int *argv_nr);int perf_mem__tlb_scnprintf (char *out,size_t sz,struct mem_info *mem_info);int perf_mem__lvl_scnprintf (char *out,size_t sz,struct mem_info *mem_info); --2.35.1
PATCH v4 7/7 perf mem: Clean up perf_pmus__num_mem_pmus()
In reply to [email protected]From: Kan Liang <[email protected]>
The number of mem PMUs can be calculated by searching the perf_pmus__scan_mem().
Remove the ARCH specific perf_pmus__num_mem_pmus()
--- tools/perf/arch/x86/util/pmu.c | 10 ---------- tools/perf/builtin-c2c.c | 2 +- tools/perf/builtin-mem.c | 2 +- tools/perf/util/mem-events.c | 14 ++++++++++++++ tools/perf/util/mem-events.h | 1 + tools/perf/util/pmus.c | 6 ------ tools/perf/util/pmus.h | 1 - 7 files changed, 17 insertions(+), 19 deletions(-)
tools/perf/arch/x86/util/pmu.c +0 -10
@@ -42,13 +42,3 @@ void perf_pmu__arch_init(struct perf_pmu *pmu __maybe_unused) pmu->mem_events = perf_mem_events_intel; } } - -int perf_pmus__num_mem_pmus (void ) -{ -/* AMD uses IBS OP pmu and not a core PMU for perf mem/c2c */ -if (x86__is_amd_cpu ()) -return 1 ; - -/* Intel uses core pmus for perf mem/c2c */ -return perf_pmus__num_core_pmus (); -}
tools/perf/builtin-c2c.c +1 -1
@@ -3278,7 +3278,7 @@ static int perf_c2c__record(int argc, const char **argv) PARSE_OPT_KEEP_UNKNOWN);/* Max number of arguments multiplied by number of PMUs that can support them. */ - rec_argc = argc +11 *perf_pmus__num_mem_pmus (); + rec_argc = argc +11 * (perf_pmu__mem_events_num_mem_pmus (pmu) +1 ); rec_argv =calloc (rec_argc +1 ,sizeof (char *));if (!rec_argv)
tools/perf/builtin-mem.c +1 -1
@@ -106,7 +106,7 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem) PARSE_OPT_KEEP_UNKNOWN);/* Max number of arguments multiplied by number of PMUs that can support them. */ - rec_argc = argc +9 *perf_pmus__num_mem_pmus (); + rec_argc = argc +9 * (perf_pmu__mem_events_num_mem_pmus (pmu) +1 );if (mem->cpu_list) rec_argc +=2 ;
tools/perf/util/mem-events.c +14 -0
@@ -62,6 +62,20 @@ struct perf_pmu *perf_mem_events_find_pmu(void)return perf_pmus__scan_mem (NULL ); } +/** +* perf_pmu__mem_events_num_mem_pmus - Get the number of mem PMUs since the given pmu +* @pmu: Start pmu. If it's NULL, search the entire PMU list. +*/ +int perf_pmu__mem_events_num_mem_pmus (struct perf_pmu *pmu) +{ +int num =0 ; + +while ((pmu =perf_pmus__scan_mem (pmu)) !=NULL ) + num++; + +return num; +} +static const char *perf_pmu__mem_events_name (int i,struct perf_pmu *pmu) {struct perf_mem_event *e;
tools/perf/util/mem-events.h +1 -0
@@ -43,6 +43,7 @@ int perf_pmu__mem_events_init(struct perf_pmu *pmu);struct perf_mem_event *perf_pmu__mem_events_ptr (struct perf_pmu *pmu,int i);struct perf_pmu *perf_mem_events_find_pmu (void ); +int perf_pmu__mem_events_num_mem_pmus (struct perf_pmu *pmu);bool is_mem_loads_aux_event (struct evsel *leader);void perf_pmu__mem_events_list (struct perf_pmu *pmu);
tools/perf/util/pmus.c +0 -6
@@ -345,12 +345,6 @@ const struct perf_pmu *perf_pmus__pmu_for_pmu_filter(const char *str)return NULL ; } -int __weak perf_pmus__num_mem_pmus (void ) -{ -/* All core PMUs are for mem events. */ -return perf_pmus__num_core_pmus (); -} -/** Struct for ordering events as output in perf list. */ struct sevent {/** PMU for event. */
tools/perf/util/pmus.h +0 -1
@@ -17,7 +17,6 @@ struct perf_pmu *perf_pmus__scan_core(struct perf_pmu *pmu);const struct perf_pmu *perf_pmus__pmu_for_pmu_filter (const char *str); -int perf_pmus__num_mem_pmus (void );void perf_pmus__print_pmu_events (const struct print_callbacks *print_cb,void *print_state);bool perf_pmus__have_event (const char *pname,const char *name);int perf_pmus__num_core_pmus (void );
Signature · 1 line
2.35.1
Re: [PATCH V4 7/7] perf mem: Clean up perf_pmus__num_mem_pmus()
Quoted 10 lines · On Tue, Jan 23, 2024 at 10:51 AM <[email protected]> wrote:
From: Kan Liang <[email protected]>
The number of mem PMUs can be calculated by searching the
perf_pmus__scan_mem().Remove the ARCH specific
perf_pmus__num_mem_pmus()Tested-by Leo Yan <[email protected]>Signed-off-by Kan Liang <[email protected]>
Thanks,
Ian
Quoted 123 lines
--- tools/perf/arch/x86/util/pmu.c | 10 ---------- tools/perf/builtin-c2c.c | 2 +- tools/perf/builtin-mem.c | 2 +- tools/perf/util/mem-events.c | 14 ++++++++++++++ tools/perf/util/mem-events.h | 1 + tools/perf/util/pmus.c | 6 ------ tools/perf/util/pmus.h | 1 - 7 files changed, 17 insertions(+), 19 deletions(-)tools/perf/arch/x86/util/pmu.c +0
-10@@ -42,13 +42,3 @@ void perf_pmu__arch_init(struct perf_pmu *pmu __maybe_unused) pmu->mem_events = perf_mem_events_intel; } } - -int perf_pmus__num_mem_pmus (void ) -{ -/* AMD uses IBS OP pmu and not a core PMU for perf mem/c2c */ -if (x86__is_amd_cpu ()) -return 1 ; - -/* Intel uses core pmus for perf mem/c2c */ -return perf_pmus__num_core_pmus (); -}tools/perf/builtin-c2c.c +1
-1@@ -3278,7 +3278,7 @@ static int perf_c2c__record(int argc, const char **argv) PARSE_OPT_KEEP_UNKNOWN);/* Max number of arguments multiplied by number of PMUs that can support them. */ - rec_argc = argc +11 *perf_pmus__num_mem_pmus (); + rec_argc = argc +11 * (perf_pmu__mem_events_num_mem_pmus (pmu) +1 ); rec_argv =calloc (rec_argc +1 ,sizeof (char *));if (!rec_argv)tools/perf/builtin-mem.c +1
-1@@ -106,7 +106,7 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem) PARSE_OPT_KEEP_UNKNOWN);/* Max number of arguments multiplied by number of PMUs that can support them. */ - rec_argc = argc +9 *perf_pmus__num_mem_pmus (); + rec_argc = argc +9 * (perf_pmu__mem_events_num_mem_pmus (pmu) +1 );if (mem->cpu_list) rec_argc +=2 ;tools/perf/util/mem-events.c +14
-0@@ -62,6 +62,20 @@ struct perf_pmu *perf_mem_events_find_pmu(void)return perf_pmus__scan_mem (NULL ); } +/** +* perf_pmu__mem_events_num_mem_pmus - Get the number of mem PMUs since the given pmu +* @pmu: Start pmu. If it's NULL, search the entire PMU list. +*/ +int perf_pmu__mem_events_num_mem_pmus (struct perf_pmu *pmu) +{ +int num =0 ; + +while ((pmu =perf_pmus__scan_mem (pmu)) !=NULL ) + num++; + +return num; +} +static const char *perf_pmu__mem_events_name (int i,struct perf_pmu *pmu) {struct perf_mem_event *e;tools/perf/util/mem-events.h +1
-0@@ -43,6 +43,7 @@ int perf_pmu__mem_events_init(struct perf_pmu *pmu);struct perf_mem_event *perf_pmu__mem_events_ptr (struct perf_pmu *pmu,int i);struct perf_pmu *perf_mem_events_find_pmu (void ); +int perf_pmu__mem_events_num_mem_pmus (struct perf_pmu *pmu);bool is_mem_loads_aux_event (struct evsel *leader);void perf_pmu__mem_events_list (struct perf_pmu *pmu);tools/perf/util/pmus.c +0
-6@@ -345,12 +345,6 @@ const struct perf_pmu *perf_pmus__pmu_for_pmu_filter(const char *str)return NULL ; } -int __weak perf_pmus__num_mem_pmus (void ) -{ -/* All core PMUs are for mem events. */ -return perf_pmus__num_core_pmus (); -} -/** Struct for ordering events as output in perf list. */ struct sevent {/** PMU for event. */ tools/perf/util/pmus.h +0
-2@@ -17,7 +17,6 @@ struct perf_pmu *perf_pmus__scan_core(struct perf_pmu *pmu);const struct perf_pmu *perf_pmus__pmu_for_pmu_filter (const char *str); -int perf_pmus__num_mem_pmus (void );void perf_pmus__print_pmu_events (const struct print_callbacks *print_cb,void *print_state);bool perf_pmus__have_event (const char *pname,const char *name);int perf_pmus__num_core_pmus (void ); --2.35.1
Ian Rogers
reviewerQuoted 70 lines · On Tue, Jan 23, 2024 at 10:51 AM <[email protected]> wrote:
From: Kan Liang <[email protected]>
Changes since V3:
- Fix the powerPC building error (Kajol Jain)
- The s390 does not support perf mem. Remove the code. (Thomas)
- Add reviewed-by and tested-by from Kajol Jain for patch 1 and 2
- Add tested-by from LeoChanges since V2:
- Fix the Arm64 building error (Leo)
- Add two new patches to clean upperf_mem_events__record_args()andperf_pmus__num_mem_pmus()(Leo)Changes since V1:
- Fix strcmp of PMU name checking (Ravi)
- Fix "/," typo (Ian)
- Rename several functions withperf_pmu__mem_eventsprefix. (Ian)
- Fold the header removal patch into the patch where the cleanups made. (Arnaldo)
- Add reviewed-by and tested-by from Ian and RaviAs discussed in the below thread, the patch set is to clean up perf mem.
https://lore.kernel.org/lkml/[email protected]/Introduce generic functions
perf_mem_events__ptr(),perf_mem_events__name(),andis_mem_loads_aux_event()to replace the ARCH specific ones.
Simplify theperf_mem_event__supported().Only keeps the ARCH-specific
perf_mem_eventsarray in the correspondingmem-events.cfor each ARCH.There is no functional change.
The patch set touches almost all the ARCHs, Intel, AMD, ARM, Power and etc. But I can only test it on two Intel platforms.
Please give it try, if you have machines with other ARCHs.Here are the test results:
Intel hybrid machine:$perf mem record -e list
ldlat-loads : available
ldlat-stores : available$perf mem record -e ldlat-loads -v --ldlat 50
calling: record -e cpu_atom/mem-loads,ldlat=50/P -e cpu_core/mem-loads,ldlat=50/P$perf mem record -v
calling: record -e cpu_atom/mem-loads,ldlat=30/P -e cpu_atom/mem-stores/P -e cpu_core/mem-loads,ldlat=30/P -e cpu_core/mem-stores/P$perf mem record -t store -v
calling: record -e cpu_atom/mem-stores/P -e cpu_core/mem-stores/PIntel SPR:
$perf mem record -e list
ldlat-loads : available
ldlat-stores : available$perf mem record -e ldlat-loads -v --ldlat 50
calling: record -e {cpu/mem-loads-aux/,cpu/mem-loads,ldlat=50/}:P$perf mem record -v
calling: record -e {cpu/mem-loads-aux/,cpu/mem-loads,ldlat=30/}:P -e cpu/mem-stores/P$perf mem record -t store -v
calling: record -e cpu/mem-stores/P
Quoted 8 lines
Kan Liang (7):
perf mem: Addmem_eventsinto the supportedperf_pmuperf mem: Clean upperf_mem_events__ptr()perf mem: Clean upperf_mem_events__name()perf mem: Clean upperf_mem_event__supported()perf mem: Clean upis_mem_loads_aux_event()perf mem: Clean upperf_mem_events__record_args()perf mem: Clean upperf_pmus__num_mem_pmus()
I think this is ready to land in perf-tools-next, multiple Tested-by or Reviewed-by.
Thanks,
Ian
Quoted 27 lines
tools/perf/arch/arm/util/pmu.c | 3 + tools/perf/arch/arm64/util/mem-events.c | 39 +--- tools/perf/arch/arm64/util/mem-events.h | 7 + tools/perf/arch/powerpc/util/Build | 1 + tools/perf/arch/powerpc/util/mem-events.c | 16 +- tools/perf/arch/powerpc/util/mem-events.h | 7 + tools/perf/arch/powerpc/util/pmu.c | 12 ++ tools/perf/arch/x86/util/mem-events.c | 99 ++-------- tools/perf/arch/x86/util/mem-events.h | 10 + tools/perf/arch/x86/util/pmu.c | 19 +- tools/perf/builtin-c2c.c | 45 ++--- tools/perf/builtin-mem.c | 48 ++--- tools/perf/util/mem-events.c | 217 +++++++++++++--------- tools/perf/util/mem-events.h | 19 +- tools/perf/util/pmu.c | 4 +- tools/perf/util/pmu.h | 7 + tools/perf/util/pmus.c | 6 - tools/perf/util/pmus.h | 1 - 18 files changed, 279 insertions(+), 281 deletions(-) create mode 100644 tools/perf/arch/arm64/util/mem-events.h create mode 100644 tools/perf/arch/powerpc/util/mem-events.h create mode 100644 tools/perf/arch/powerpc/util/pmu.c create mode 100644 tools/perf/arch/x86/util/mem-events.h--
2.35.1
Namhyung Kim
maintainerQuoted 81 lines · Ian Rogers
Quoted 70 lines · On Tue, Jan 23, 2024 at 10:51 AM <[email protected]> wrote:
From: Kan Liang <[email protected]>
Changes since V3:
- Fix the powerPC building error (Kajol Jain)
- The s390 does not support perf mem. Remove the code. (Thomas)
- Add reviewed-by and tested-by from Kajol Jain for patch 1 and 2
- Add tested-by from LeoChanges since V2:
- Fix the Arm64 building error (Leo)
- Add two new patches to clean upperf_mem_events__record_args()andperf_pmus__num_mem_pmus()(Leo)Changes since V1:
- Fix strcmp of PMU name checking (Ravi)
- Fix "/," typo (Ian)
- Rename several functions withperf_pmu__mem_eventsprefix. (Ian)
- Fold the header removal patch into the patch where the cleanups made. (Arnaldo)
- Add reviewed-by and tested-by from Ian and RaviAs discussed in the below thread, the patch set is to clean up perf mem.
https://lore.kernel.org/lkml/[email protected]/Introduce generic functions
perf_mem_events__ptr(),perf_mem_events__name(),andis_mem_loads_aux_event()to replace the ARCH specific ones.
Simplify theperf_mem_event__supported().Only keeps the ARCH-specific
perf_mem_eventsarray in the correspondingmem-events.cfor each ARCH.There is no functional change.
The patch set touches almost all the ARCHs, Intel, AMD, ARM, Power and etc. But I can only test it on two Intel platforms.
Please give it try, if you have machines with other ARCHs.Here are the test results:
Intel hybrid machine:$perf mem record -e list
ldlat-loads : available
ldlat-stores : available$perf mem record -e ldlat-loads -v --ldlat 50
calling: record -e cpu_atom/mem-loads,ldlat=50/P -e cpu_core/mem-loads,ldlat=50/P$perf mem record -v
calling: record -e cpu_atom/mem-loads,ldlat=30/P -e cpu_atom/mem-stores/P -e cpu_core/mem-loads,ldlat=30/P -e cpu_core/mem-stores/P$perf mem record -t store -v
calling: record -e cpu_atom/mem-stores/P -e cpu_core/mem-stores/PIntel SPR:
$perf mem record -e list
ldlat-loads : available
ldlat-stores : available$perf mem record -e ldlat-loads -v --ldlat 50
calling: record -e {cpu/mem-loads-aux/,cpu/mem-loads,ldlat=50/}:P$perf mem record -v
calling: record -e {cpu/mem-loads-aux/,cpu/mem-loads,ldlat=30/}:P -e cpu/mem-stores/P$perf mem record -t store -v
calling: record -e cpu/mem-stores/PQuoted 8 lines
Kan Liang (7):
perf mem: Addmem_eventsinto the supportedperf_pmuperf mem: Clean upperf_mem_events__ptr()perf mem: Clean upperf_mem_events__name()perf mem: Clean upperf_mem_event__supported()perf mem: Clean upis_mem_loads_aux_event()perf mem: Clean upperf_mem_events__record_args()perf mem: Clean upperf_pmus__num_mem_pmus()
Quoted 2 lines
I think this is ready to land in perf-tools-next, multiple Tested-by or Reviewed-by.
Sure, queued for a local testing.
Thanks,
Namhyung
Quoted 83 lines · Namhyung Kim
Quoted 81 lines · Ian Rogers
Quoted 78 lines · On Tue, Jan 23, 2024 at 10:51 AM <[email protected]> wrote:
From: Kan Liang <[email protected]>
Changes since V3:
- Fix the powerPC building error (Kajol Jain)
- The s390 does not support perf mem. Remove the code. (Thomas)
- Add reviewed-by and tested-by from Kajol Jain for patch 1 and 2
- Add tested-by from LeoChanges since V2:
- Fix the Arm64 building error (Leo)
- Add two new patches to clean upperf_mem_events__record_args()andperf_pmus__num_mem_pmus()(Leo)Changes since V1:
- Fix strcmp of PMU name checking (Ravi)
- Fix "/," typo (Ian)
- Rename several functions withperf_pmu__mem_eventsprefix. (Ian)
- Fold the header removal patch into the patch where the cleanups made. (Arnaldo)
- Add reviewed-by and tested-by from Ian and RaviAs discussed in the below thread, the patch set is to clean up perf mem.
https://lore.kernel.org/lkml/[email protected]/Introduce generic functions
perf_mem_events__ptr(),perf_mem_events__name(),andis_mem_loads_aux_event()to replace the ARCH specific ones.
Simplify theperf_mem_event__supported().Only keeps the ARCH-specific
perf_mem_eventsarray in the correspondingmem-events.cfor each ARCH.There is no functional change.
The patch set touches almost all the ARCHs, Intel, AMD, ARM, Power and etc. But I can only test it on two Intel platforms.
Please give it try, if you have machines with other ARCHs.Here are the test results:
Intel hybrid machine:$perf mem record -e list
ldlat-loads : available
ldlat-stores : available$perf mem record -e ldlat-loads -v --ldlat 50
calling: record -e cpu_atom/mem-loads,ldlat=50/P -e cpu_core/mem-loads,ldlat=50/P$perf mem record -v
calling: record -e cpu_atom/mem-loads,ldlat=30/P -e cpu_atom/mem-stores/P -e cpu_core/mem-loads,ldlat=30/P -e cpu_core/mem-stores/P$perf mem record -t store -v
calling: record -e cpu_atom/mem-stores/P -e cpu_core/mem-stores/PIntel SPR:
$perf mem record -e list
ldlat-loads : available
ldlat-stores : available$perf mem record -e ldlat-loads -v --ldlat 50
calling: record -e {cpu/mem-loads-aux/,cpu/mem-loads,ldlat=50/}:P$perf mem record -v
calling: record -e {cpu/mem-loads-aux/,cpu/mem-loads,ldlat=30/}:P -e cpu/mem-stores/P$perf mem record -t store -v
calling: record -e cpu/mem-stores/PKan Liang (7):
perf mem: Addmem_eventsinto the supportedperf_pmuperf mem: Clean upperf_mem_events__ptr()perf mem: Clean upperf_mem_events__name()perf mem: Clean upperf_mem_event__supported()perf mem: Clean upis_mem_loads_aux_event()perf mem: Clean upperf_mem_events__record_args()perf mem: Clean upperf_pmus__num_mem_pmus()
Quoted 4 lines
Quoted 2 lines
I think this is ready to land in perf-tools-next, multiple Tested-by or Reviewed-by.
Sure, queued for a local testing.
Applied to perf-tools-next, thanks!
Namhyung