Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
MIME-Version: 1.0
References: <20231206201324.184059-1-kan.liang@linux.intel.com> <20231206201324.184059-5-kan.liang@linux.intel.com>
In-Reply-To: <20231206201324.184059-5-kan.liang@linux.intel.com>
From:   Ian Rogers <irogers@google.com>
Date:   Wed, 6 Dec 2023 13:08:34 -0800
Message-ID: <CAP-5=fUDiDWT3oEqS5NmVn-muhC+P=g5rW2aEyAgAQLS=UYxQw@mail.gmail.com>
Subject: Re: [PATCH 4/6] perf mem: Clean up perf_mem_event__supported()
To:     kan.liang@linux.intel.com
Cc:     acme@kernel.org, peterz@infradead.org, mingo@redhat.com,
        namhyung@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com,
        john.g.garry@oracle.com, will@kernel.org, james.clark@arm.com,
        mike.leach@linaro.org, leo.yan@linaro.org,
        yuhaixin.yhx@linux.alibaba.com, renyu.zj@linux.alibaba.com,
        tmricht@linux.ibm.com, ravi.bangoria@amd.com,
        linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Wed, Dec 6, 2023 at 12:13=E2=80=AFPM <kan.liang@linux.intel.com> wrote:
>
> From: Kan Liang <kan.liang@linux.intel.com>
>
> 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.
>
> Signed-off-by: Kan Liang <kan.liang@linux.intel.com>

Reviewed-by: Ian Rogers <irogers@google.com>

Thanks,
Ian

> ---
>  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              | 16 +++++++++-------
>  tools/perf/util/mem-events.h              |  2 +-
>  5 files changed, 28 insertions(+), 26 deletions(-)
>
> diff --git a/tools/perf/arch/arm64/util/mem-events.c b/tools/perf/arch/ar=
m64/util/mem-events.c
> index eb2ef84f0fc8..590dddd6b0ab 100644
> --- a/tools/perf/arch/arm64/util/mem-events.c
> +++ b/tools/perf/arch/arm64/util/mem-events.c
> @@ -2,10 +2,10 @@
>  #include "map_symbol.h"
>  #include "mem-events.h"
>
> -#define E(t, n, s, l, a) { .tag =3D t, .name =3D n, .sysfs_name =3D s, .=
ldlat =3D l, .aux_event =3D a }
> +#define E(t, n, s, l, a) { .tag =3D t, .name =3D n, .event_name =3D s, .=
ldlat =3D l, .aux_event =3D a }
>
>  struct perf_mem_event perf_mem_events_arm[PERF_MEM_EVENTS__MAX] =3D {
> -       E("spe-load",   "%s/ts_enable=3D1,pa_enable=3D1,load_filter=3D1,s=
tore_filter=3D0,min_latency=3D%u/",      "arm_spe_0",    true,   0),
> -       E("spe-store",  "%s/ts_enable=3D1,pa_enable=3D1,load_filter=3D0,s=
tore_filter=3D1/",                     "arm_spe_0",    false,  0),
> -       E("spe-ldst",   "%s/ts_enable=3D1,pa_enable=3D1,load_filter=3D1,s=
tore_filter=3D1,min_latency=3D%u/",      "arm_spe_0",    true,   0),
> +       E("spe-load",   "%s/ts_enable=3D1,pa_enable=3D1,load_filter=3D1,s=
tore_filter=3D0,min_latency=3D%u/",      NULL,   true,   0),
> +       E("spe-store",  "%s/ts_enable=3D1,pa_enable=3D1,load_filter=3D0,s=
tore_filter=3D1/",                     NULL,   false,  0),
> +       E("spe-ldst",   "%s/ts_enable=3D1,pa_enable=3D1,load_filter=3D1,s=
tore_filter=3D1,min_latency=3D%u/",      NULL,   true,   0),
>  };
> diff --git a/tools/perf/arch/powerpc/util/mem-events.c b/tools/perf/arch/=
powerpc/util/mem-events.c
> index b7883e38950f..72a6ac2b52f5 100644
> --- a/tools/perf/arch/powerpc/util/mem-events.c
> +++ b/tools/perf/arch/powerpc/util/mem-events.c
> @@ -2,10 +2,10 @@
>  #include "map_symbol.h"
>  #include "mem-events.h"
>
> -#define E(t, n, s, l, a) { .tag =3D t, .name =3D n, .sysfs_name =3D s, .=
ldlat =3D l, .aux_event =3D a }
> +#define E(t, n, s, l, a) { .tag =3D t, .name =3D n, .event_name =3D s, .=
ldlat =3D l, .aux_event =3D a }
>
>  struct perf_mem_event perf_mem_events_power[PERF_MEM_EVENTS__MAX] =3D {
> -       E("ldlat-loads",        "%s/mem-loads/",        "cpu/events/mem-l=
oads",         false,  0),
> -       E("ldlat-stores",       "%s/mem-stores/",       "cpu/events/mem-s=
tores",        false,  0),
> -       E(NULL,                 NULL,                   NULL,            =
               false,  0),
> +       E("ldlat-loads",        "%s/mem-loads/",        "mem-loads",    f=
alse,  0),
> +       E("ldlat-stores",       "%s/mem-stores/",       "mem-stores",   f=
alse,  0),
> +       E(NULL,                 NULL,                   NULL,           f=
alse,  0),
>  };
> diff --git a/tools/perf/arch/x86/util/mem-events.c b/tools/perf/arch/x86/=
util/mem-events.c
> index f0e66a0151a0..b776d849fc64 100644
> --- a/tools/perf/arch/x86/util/mem-events.c
> +++ b/tools/perf/arch/x86/util/mem-events.c
> @@ -9,24 +9,24 @@
>
>  #define MEM_LOADS_AUX          0x8203
>
> -#define E(t, n, s, l, a) { .tag =3D t, .name =3D n, .sysfs_name =3D s, .=
ldlat =3D l, .aux_event =3D a }
> +#define E(t, n, s, l, a) { .tag =3D t, .name =3D n, .event_name =3D s, .=
ldlat =3D l, .aux_event =3D a }
>
>  struct perf_mem_event perf_mem_events_intel[PERF_MEM_EVENTS__MAX] =3D {
> -       E("ldlat-loads",        "%s/mem-loads,ldlat=3D%u/P",      "%s/eve=
nts/mem-loads",  true,   0),
> -       E("ldlat-stores",       "%s/mem-stores/P",              "%s/event=
s/mem-stores", false,  0),
> -       E(NULL,                 NULL,                           NULL,    =
               false,  0),
> +       E("ldlat-loads",        "%s/mem-loads,ldlat=3D%u/P",      "mem-lo=
ads",    true,   0),
> +       E("ldlat-stores",       "%s/mem-stores/P",              "mem-stor=
es",   false,  0),
> +       E(NULL,                 NULL,                           NULL,    =
       false,  0),
>  };
>
>  struct perf_mem_event perf_mem_events_intel_aux[PERF_MEM_EVENTS__MAX] =
=3D {
> -       E("ldlat-loads",        "{%s/mem-loads-aux/,%s/mem-loads,ldlat=3D=
%u/}:P", "%s/events/mem-loads",  true,   MEM_LOADS_AUX),
> -       E("ldlat-stores",       "%s/mem-stores/P",              "%s/event=
s/mem-stores", false,  0),
> -       E(NULL,                 NULL,                           NULL,    =
               false,  0),
> +       E("ldlat-loads",        "{%s/mem-loads-aux/,%s/mem-loads,ldlat=3D=
%u/}:P", "mem-loads",    true,   MEM_LOADS_AUX),
> +       E("ldlat-stores",       "%s/mem-stores/P",              "mem-stor=
es",   false,  0),
> +       E(NULL,                 NULL,                           NULL,    =
       false,  0),
>  };
>
>  struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX] =3D {
> -       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)
> diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
> index 3a60cbcd6d8e..9ea9e9a868c4 100644
> --- a/tools/perf/util/mem-events.c
> +++ b/tools/perf/util/mem-events.c
> @@ -17,12 +17,12 @@
>
>  unsigned int perf_mem_events__loads_ldlat =3D 30;
>
> -#define E(t, n, s, l, a) { .tag =3D t, .name =3D n, .sysfs_name =3D s, .=
ldlat =3D l, .aux_event =3D a }
> +#define E(t, n, s, l, a) { .tag =3D t, .name =3D n, .event_name =3D s, .=
ldlat =3D l, .aux_event =3D a }
>
>  struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX] =3D {
> -       E("ldlat-loads",        "%s/mem-loads/,ldlat=3D%u/P",     "cpu/ev=
ents/mem-loads",         true,   0),
> -       E("ldlat-stores",       "%s/mem-stores/P",              "cpu/even=
ts/mem-stores",        false,  0),
> -       E(NULL,                 NULL,                           NULL,    =
                       false,  0),
> +       E("ldlat-loads",        "%s/mem-loads/,ldlat=3D%u/P",     "mem-lo=
ads",    true,   0),
> +       E("ldlat-stores",       "%s/mem-stores/P",              "mem-stor=
es",   false,  0),
> +       E(NULL,                 NULL,                           NULL,    =
       false,  0),
>  };
>  #undef E
>
> @@ -150,12 +150,14 @@ int perf_mem_events__parse(struct perf_pmu *pmu, co=
nst char *str)
>  static bool perf_mem_event__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->nam=
e);
> -       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->na=
me, e->event_name);
> +
>         return !stat(path, &st);
>  }
>
> diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h
> index d257cf67d6d9..d2875d731da8 100644
> --- a/tools/perf/util/mem-events.h
> +++ b/tools/perf/util/mem-events.h
> @@ -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 {
> --
> 2.35.1
>