Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230426070050.1315519-1-irogers@google.com> <20230426070050.1315519-9-irogers@google.com>
 <05b7b1cf-0b77-0e0f-8d02-1c26016fa7d8@linux.intel.com>
In-Reply-To: <05b7b1cf-0b77-0e0f-8d02-1c26016fa7d8@linux.intel.com>
From:   Ian Rogers <irogers@google.com>
Date:   Thu, 27 Apr 2023 13:23:50 -0700
Message-ID: <CAP-5=fVOY_Mq8gC236ThApJ7G7ZfjRuY4RJGGMixOqMkaRWxnQ@mail.gmail.com>
Subject: Re: [PATCH v1 08/40] perf test: Test more sysfs events
To:     "Liang, Kan" <kan.liang@linux.intel.com>
Cc:     Arnaldo Carvalho de Melo <acme@kernel.org>,
        Ahmad Yasin <ahmad.yasin@intel.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Stephane Eranian <eranian@google.com>,
        Andi Kleen <ak@linux.intel.com>,
        Perry Taylor <perry.taylor@intel.com>,
        Samantha Alt <samantha.alt@intel.com>,
        Caleb Biggers <caleb.biggers@intel.com>,
        Weilin Wang <weilin.wang@intel.com>,
        Edward Baker <edward.baker@intel.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Jiri Olsa <jolsa@kernel.org>,
        Namhyung Kim <namhyung@kernel.org>,
        Adrian Hunter <adrian.hunter@intel.com>,
        Florian Fischer <florian.fischer@muhq.space>,
        Rob Herring <robh@kernel.org>,
        Zhengjun Xing <zhengjun.xing@linux.intel.com>,
        John Garry <john.g.garry@oracle.com>,
        Kajol Jain <kjain@linux.ibm.com>,
        Sumanth Korikkar <sumanthk@linux.ibm.com>,
        Thomas Richter <tmricht@linux.ibm.com>,
        Tiezhu Yang <yangtiezhu@loongson.cn>,
        Ravi Bangoria <ravi.bangoria@amd.com>,
        Leo Yan <leo.yan@linaro.org>,
        Yang Jihong <yangjihong1@huawei.com>,
        James Clark <james.clark@arm.com>,
        Suzuki Poulouse <suzuki.poulose@arm.com>,
        Kang Minchul <tegongkang@gmail.com>,
        Athira Rajeev <atrajeev@linux.vnet.ibm.com>,
        linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Thu, Apr 27, 2023 at 12:39=E2=80=AFPM Liang, Kan <kan.liang@linux.intel.=
com> wrote:
>
>
>
> On 2023-04-26 3:00 a.m., Ian Rogers wrote:
> > Parse events for all PMUs, and not just cpu, in test "Parsing of all
> > PMU events from sysfs".
> >
> > Signed-off-by: Ian Rogers <irogers@google.com>
>
> Run the test on Cascade Lake and Alder Lake. It looks good.
>
> Tested-by: Kan Liang <kan.liang@linux.intel.com>

Arnaldo found an issue (strchr with an uninitialized value) that I
have a fix for in v2 of this. The bug got introduced by trying to
separate out the hybrid from the not hybrid changes.

Thanks,
Ian

> Thanks,
> Kan
> > ---
> >  tools/perf/tests/parse-events.c | 103 +++++++++++++++++---------------
> >  1 file changed, 55 insertions(+), 48 deletions(-)
> >
> > diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-e=
vents.c
> > index 8068cfd89b84..385bbbc4a409 100644
> > --- a/tools/perf/tests/parse-events.c
> > +++ b/tools/perf/tests/parse-events.c
> > @@ -7,6 +7,7 @@
> >  #include "debug.h"
> >  #include "pmu.h"
> >  #include "pmu-hybrid.h"
> > +#include "pmus.h"
> >  #include <dirent.h>
> >  #include <errno.h>
> >  #include "fncache.h"
> > @@ -2225,49 +2226,24 @@ static int test_pmu(void)
> >
> >  static int test__pmu_events(struct test_suite *test __maybe_unused, in=
t subtest __maybe_unused)
> >  {
> > -     struct stat st;
> > -     char path[PATH_MAX];
> > -     struct dirent *ent;
> > -     DIR *dir;
> > -     int ret;
> > -
> > -     if (!test_pmu())
> > -             return TEST_SKIP;
> > -
> > -     snprintf(path, PATH_MAX, "%s/bus/event_source/devices/cpu/events/=
",
> > -              sysfs__mountpoint());
> > -
> > -     ret =3D stat(path, &st);
> > -     if (ret) {
> > -             pr_debug("omitting PMU cpu events tests: %s\n", path);
> > -             return TEST_OK;
> > -     }
> > +     struct perf_pmu *pmu;
> > +     int ret =3D TEST_OK;
> >
> > -     dir =3D opendir(path);
> > -     if (!dir) {
> > -             pr_debug("can't open pmu event dir: %s\n", path);
> > -             return TEST_FAIL;
> > -     }
> > +     perf_pmus__for_each_pmu(pmu) {
> > +             struct stat st;
> > +             char path[PATH_MAX];
> > +             struct dirent *ent;
> > +             DIR *dir;
> > +             int err;
> >
> > -     ret =3D TEST_OK;
> > -     while ((ent =3D readdir(dir))) {
> > -             struct evlist_test e =3D { .name =3D NULL, };
> > -             char name[2 * NAME_MAX + 1 + 12 + 3];
> > -             int test_ret;
> > +             snprintf(path, PATH_MAX, "%s/bus/event_source/devices/%s/=
events/",
> > +                     sysfs__mountpoint(), pmu->name);
> >
> > -             /* Names containing . are special and cannot be used dire=
ctly */
> > -             if (strchr(ent->d_name, '.'))
> > +             err =3D stat(path, &st);
> > +             if (err) {
> > +                     pr_debug("skipping PMU %s events tests: %s\n", pm=
u->name, path);
> > +                     ret =3D combine_test_results(ret, TEST_SKIP);
> >                       continue;
> > -
> > -             snprintf(name, sizeof(name), "cpu/event=3D%s/u", ent->d_n=
ame);
> > -
> > -             e.name  =3D name;
> > -             e.check =3D test__checkevent_pmu_events;
> > -
> > -             test_ret =3D test_event(&e);
> > -             if (test_ret !=3D TEST_OK) {
> > -                     pr_debug("Test PMU event failed for '%s'", name);
> > -                     ret =3D combine_test_results(ret, test_ret);
> >               }
> >               /*
> >                * Names containing '-' are recognized as prefixes and su=
ffixes
> > @@ -2282,17 +2258,48 @@ static int test__pmu_events(struct test_suite *=
test __maybe_unused, int subtest
> >               if (strchr(ent->d_name, '-'))
> >                       continue;
> >
> > -             snprintf(name, sizeof(name), "%s:u,cpu/event=3D%s/u", ent=
->d_name, ent->d_name);
> > -             e.name  =3D name;
> > -             e.check =3D test__checkevent_pmu_events_mix;
> > -             test_ret =3D test_event(&e);
> > -             if (test_ret !=3D TEST_OK) {
> > -                     pr_debug("Test PMU event failed for '%s'", name);
> > -                     ret =3D combine_test_results(ret, test_ret);
> > +             dir =3D opendir(path);
> > +             if (!dir) {
> > +                     pr_debug("can't open pmu event dir: %s\n", path);
> > +                     ret =3D combine_test_results(ret, TEST_SKIP);
> > +                     continue;
> >               }
> > -     }
> >
> > -     closedir(dir);
> > +             while ((ent =3D readdir(dir))) {
> > +                     struct evlist_test e =3D { .name =3D NULL, };
> > +                     char name[2 * NAME_MAX + 1 + 12 + 3];
> > +                     int test_ret;
> > +
> > +                     /* Names containing . are special and cannot be u=
sed directly */
> > +                     if (strchr(ent->d_name, '.'))
> > +                             continue;
> > +
> > +                     snprintf(name, sizeof(name), "%s/event=3D%s/u", p=
mu->name, ent->d_name);
> > +
> > +                     e.name  =3D name;
> > +                     e.check =3D test__checkevent_pmu_events;
> > +
> > +                     test_ret =3D test_event(&e);
> > +                     if (test_ret !=3D TEST_OK) {
> > +                             pr_debug("Test PMU event failed for '%s'"=
, name);
> > +                             ret =3D combine_test_results(ret, test_re=
t);
> > +                     }
> > +
> > +                     if (!is_pmu_core(pmu->name))
> > +                             continue;
> > +
> > +                     snprintf(name, sizeof(name), "%s:u,%s/event=3D%s/=
u", ent->d_name, pmu->name, ent->d_name);
> > +                     e.name  =3D name;
> > +                     e.check =3D test__checkevent_pmu_events_mix;
> > +                     test_ret =3D test_event(&e);
> > +                     if (test_ret !=3D TEST_OK) {
> > +                             pr_debug("Test PMU event failed for '%s'"=
, name);
> > +                             ret =3D combine_test_results(ret, test_re=
t);
> > +                     }
> > +             }
> > +
> > +             closedir(dir);
> > +     }
> >       return ret;
> >  }
> >