lkml.org 
[lkml]   [2023]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v3 24/35] perf mem: Avoid hybrid PMU list
    From
    Add perf_pmu__num_mem_pmus that scans/counts the number of PMUs for
    mem events. Switch perf_pmu__for_each_hybrid_pmu to iterating all PMUs
    and only handling is_core ones.

    Signed-off-by: Ian Rogers <irogers@google.com>
    ---
    tools/perf/builtin-c2c.c | 7 ++-----
    tools/perf/builtin-mem.c | 7 ++-----
    tools/perf/util/mem-events.c | 20 ++++++++++++++------
    tools/perf/util/pmu.c | 17 +++++++++++++++++
    tools/perf/util/pmu.h | 1 +
    5 files changed, 36 insertions(+), 16 deletions(-)

    diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c
    index 08455e26b606..2757ccc19c5e 100644
    --- a/tools/perf/builtin-c2c.c
    +++ b/tools/perf/builtin-c2c.c
    @@ -42,7 +42,6 @@
    #include "ui/ui.h"
    #include "ui/progress.h"
    #include "pmu.h"
    -#include "pmu-hybrid.h"
    #include "string2.h"
    #include "util/util.h"

    @@ -3259,10 +3258,8 @@ static int perf_c2c__record(int argc, const char **argv)
    argc = parse_options(argc, argv, options, record_mem_usage,
    PARSE_OPT_KEEP_UNKNOWN);

    - if (!perf_pmu__has_hybrid())
    - rec_argc = argc + 11; /* max number of arguments */
    - else
    - rec_argc = argc + 11 * perf_pmu__hybrid_pmu_num();
    + /* Max number of arguments multiplied by number of PMUs that can support them. */
    + rec_argc = argc + 11 * perf_pmu__num_mem_pmus();

    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 65465930ef8e..f4f1ff76d49d 100644
    --- a/tools/perf/builtin-mem.c
    +++ b/tools/perf/builtin-mem.c
    @@ -18,7 +18,6 @@
    #include "util/map.h"
    #include "util/symbol.h"
    #include "util/pmu.h"
    -#include "util/pmu-hybrid.h"
    #include "util/sample.h"
    #include "util/string2.h"
    #include "util/util.h"
    @@ -93,10 +92,8 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem)
    argc = parse_options(argc, argv, options, record_mem_usage,
    PARSE_OPT_KEEP_UNKNOWN);

    - if (!perf_pmu__has_hybrid())
    - rec_argc = argc + 9; /* max number of arguments */
    - else
    - rec_argc = argc + 9 * perf_pmu__hybrid_pmu_num();
    + /* Max number of arguments multiplied by number of PMUs that can support them. */
    + rec_argc = argc + 9 * perf_pmu__num_mem_pmus();

    if (mem->cpu_list)
    rec_argc += 2;
    diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
    index ed1ee4b05356..c9e422a38258 100644
    --- a/tools/perf/util/mem-events.c
    +++ b/tools/perf/util/mem-events.c
    @@ -13,7 +13,6 @@
    #include "debug.h"
    #include "symbol.h"
    #include "pmu.h"
    -#include "pmu-hybrid.h"

    unsigned int perf_mem_events__loads_ldlat = 30;

    @@ -120,7 +119,6 @@ int perf_mem_events__init(void)

    for (j = 0; j < PERF_MEM_EVENTS__MAX; j++) {
    struct perf_mem_event *e = perf_mem_events__ptr(j);
    - struct perf_pmu *pmu;
    char sysfs_name[100];

    /*
    @@ -135,7 +133,12 @@ int perf_mem_events__init(void)
    e->sysfs_name, "cpu");
    e->supported = perf_mem_event__supported(mnt, sysfs_name);
    } else {
    - perf_pmu__for_each_hybrid_pmu(pmu) {
    + struct perf_pmu *pmu = NULL;
    +
    + while ((pmu = perf_pmu__scan(pmu)) != NULL) {
    + if (!pmu->is_core)
    + continue;
    +
    scnprintf(sysfs_name, sizeof(sysfs_name),
    e->sysfs_name, pmu->name);
    e->supported |= perf_mem_event__supported(mnt, sysfs_name);
    @@ -170,9 +173,12 @@ static void perf_mem_events__print_unsupport_hybrid(struct perf_mem_event *e,
    {
    const char *mnt = sysfs__mount();
    char sysfs_name[100];
    - struct perf_pmu *pmu;
    + struct perf_pmu *pmu = NULL;
    +
    + while ((pmu = perf_pmu__scan(pmu)) != NULL) {
    + if (!pmu->is_core)
    + continue;

    - perf_pmu__for_each_hybrid_pmu(pmu) {
    scnprintf(sysfs_name, sizeof(sysfs_name), e->sysfs_name,
    pmu->name);
    if (!perf_mem_event__supported(mnt, sysfs_name)) {
    @@ -210,7 +216,9 @@ int perf_mem_events__record_args(const char **rec_argv, int *argv_nr,
    return -1;
    }

    - perf_pmu__for_each_hybrid_pmu(pmu) {
    + while ((pmu = perf_pmu__scan(pmu)) != NULL) {
    + if (!pmu->is_core)
    + continue;
    rec_argv[i++] = "-e";
    s = perf_mem_events__name(j, pmu->name);
    if (s) {
    diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
    index 821cdd79db48..12446f63d1b3 100644
    --- a/tools/perf/util/pmu.c
    +++ b/tools/perf/util/pmu.c
    @@ -1673,6 +1673,23 @@ bool perf_pmu__auto_merge_stats(const struct perf_pmu *pmu)
    return !is_pmu_hybrid(pmu->name);
    }

    +static bool perf_pmu__is_mem_pmu(const struct perf_pmu *pmu)
    +{
    + return pmu->is_core;
    +}
    +
    +int perf_pmu__num_mem_pmus(void)
    +{
    + struct perf_pmu *pmu = NULL;
    + int count = 0;
    +
    + while ((pmu = perf_pmu__scan(pmu)) != NULL) {
    + if (perf_pmu__is_mem_pmu(pmu))
    + count++;
    + }
    + return count;
    +}
    +
    static bool pmu_alias_is_duplicate(struct sevent *alias_a,
    struct sevent *alias_b)
    {
    diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
    index af10d137e2b5..5f5de7c20ab6 100644
    --- a/tools/perf/util/pmu.h
    +++ b/tools/perf/util/pmu.h
    @@ -231,6 +231,7 @@ bool is_pmu_hybrid(const char *name);
    bool perf_pmu__supports_legacy_cache(const struct perf_pmu *pmu);
    bool perf_pmu__supports_wildcard_numeric(const struct perf_pmu *pmu);
    bool perf_pmu__auto_merge_stats(const struct perf_pmu *pmu);
    +int perf_pmu__num_mem_pmus(void);
    void print_pmu_events(const struct print_callbacks *print_cb, void *print_state);
    bool pmu_have_event(const char *pname, const char *name);

    --
    2.40.1.698.g37aff9b760-goog
    \
     
     \ /
      Last update: 2023-05-25 00:21    [W:4.121 / U:0.212 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site