| Message ID | 20240123185036.3461837-8-kan.liang@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Clean up perf mem | expand |
On Tue, Jan 23, 2024 at 10:51 AM <kan.liang@linux.intel.com> wrote: > > From: Kan Liang <kan.liang@linux.intel.com> > > 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 <leo.yan@linaro.org> > Signed-off-by: Kan Liang <kan.liang@linux.intel.com> Reviewed-by: Ian Rogers <irogers@google.com> Thanks, Ian > --- > 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(-) > > diff --git a/tools/perf/arch/x86/util/pmu.c b/tools/perf/arch/x86/util/pmu.c > index 0f49ff13cfe2..c3d89d6ba1bf 100644 > --- a/tools/perf/arch/x86/util/pmu.c > +++ b/tools/perf/arch/x86/util/pmu.c > @@ -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(); > -} > diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c > index 3bcb903b6b38..16b40f5d43db 100644 > --- a/tools/perf/builtin-c2c.c > +++ b/tools/perf/builtin-c2c.c > @@ -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) > diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c > index 1d92e309c97c..5b851e64e4a1 100644 > --- a/tools/perf/builtin-mem.c > +++ b/tools/perf/builtin-mem.c > @@ -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; > diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c > index a20611b4fb1b..637cbd4a7bfb 100644 > --- a/tools/perf/util/mem-events.c > +++ b/tools/perf/util/mem-events.c > @@ -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; > diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h > index c97cd3caa766..15d5f0320d27 100644 > --- a/tools/perf/util/mem-events.h > +++ b/tools/perf/util/mem-events.h > @@ -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); > diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c > index ce4931461741..16505071d362 100644 > --- a/tools/perf/util/pmus.c > +++ b/tools/perf/util/pmus.c > @@ -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. */ > diff --git a/tools/perf/util/pmus.h b/tools/perf/util/pmus.h > index 4c67153ac257..94d2a08d894b 100644 > --- a/tools/perf/util/pmus.h > +++ b/tools/perf/util/pmus.h > @@ -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 >
diff --git a/tools/perf/arch/x86/util/pmu.c b/tools/perf/arch/x86/util/pmu.c index 0f49ff13cfe2..c3d89d6ba1bf 100644 --- a/tools/perf/arch/x86/util/pmu.c +++ b/tools/perf/arch/x86/util/pmu.c @@ -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(); -} diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index 3bcb903b6b38..16b40f5d43db 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -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) diff --git a/tools/perf/builtin-mem.c b/tools/perf/builtin-mem.c index 1d92e309c97c..5b851e64e4a1 100644 --- a/tools/perf/builtin-mem.c +++ b/tools/perf/builtin-mem.c @@ -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; diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c index a20611b4fb1b..637cbd4a7bfb 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -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; diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h index c97cd3caa766..15d5f0320d27 100644 --- a/tools/perf/util/mem-events.h +++ b/tools/perf/util/mem-events.h @@ -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); diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c index ce4931461741..16505071d362 100644 --- a/tools/perf/util/pmus.c +++ b/tools/perf/util/pmus.c @@ -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. */ diff --git a/tools/perf/util/pmus.h b/tools/perf/util/pmus.h index 4c67153ac257..94d2a08d894b 100644 --- a/tools/perf/util/pmus.h +++ b/tools/perf/util/pmus.h @@ -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);