Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
MIME-Version: 1.0
References: <20230920122349.418673-1-wyes.karny@amd.com>
In-Reply-To: <20230920122349.418673-1-wyes.karny@amd.com>
From:   Ian Rogers <irogers@google.com>
Date:   Wed, 20 Sep 2023 09:02:23 -0700
Message-ID: <CAP-5=fUe-972h3+Cwegb6u8ZOxo2k_jHQ3i5gNPoUq_TR_AWDQ@mail.gmail.com>
Subject: Re: [PATCH] perf pmu: Fix perf stat output with correct scale and unit
To:     Wyes Karny <wyes.karny@amd.com>
Cc:     peterz@infradead.org, mingo@redhat.com, acme@kernel.org,
        mark.rutland@arm.com, alexander.shishkin@linux.intel.com,
        jolsa@kernel.org, namhyung@kernel.org, adrian.hunter@intel.com,
        kan.liang@linux.intel.com, james.clark@arm.com,
        linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
        sandipan.das@amd.com, ravi.bangoria@amd.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Wed, Sep 20, 2023 at 5:24=E2=80=AFAM Wyes Karny <wyes.karny@amd.com> wro=
te:
>
> The perf_pmu__parse_* functions for the sysfs files of pmu event=E2=80=99=
s
> scale, unit, per-pkg and snapshot were updated in commit 7b723dbb96e8
> ("perf pmu: Be lazy about loading event info files from sysfs").
> However, the paths for these sysfs files were incorrect. This resulted
> in perf stat reporting values with wrong scaling and missing units. This
> is fixed by correcting the paths for these sysfs files.
>
> Before this fix:
>
>  $sudo perf stat -e power/energy-pkg/ -- sleep 2
>
>  Performance counter stats for 'system wide':
>
>    351,217,188,864      power/energy-pkg/
>
>           2.004127961 seconds time elapsed
>
> After this fix:
>
>  $sudo perf stat -e power/energy-pkg/ -- sleep 2
>
>  Performance counter stats for 'system wide':
>
>              80.58 Joules power/energy-pkg/
>
>              2.004009749 seconds time elapsed
>
> Fixes: 7b723dbb96e8 ("perf pmu: Be lazy about loading event info files fr=
om sysfs")
> Signed-off-by: Wyes Karny <wyes.karny@amd.com>

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

Thanks!
Ian

> ---
>  tools/perf/util/pmu.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index 0d81c059c91c..93feee29d054 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -295,7 +295,7 @@ static int perf_pmu__parse_scale(struct perf_pmu *pmu=
, struct perf_pmu_alias *al
>         len =3D perf_pmu__event_source_devices_scnprintf(path, sizeof(pat=
h));
>         if (!len)
>                 return 0;
> -       scnprintf(path + len, sizeof(path) - len, "%s/%s.scale", pmu->nam=
e, alias->name);
> +       scnprintf(path + len, sizeof(path) - len, "%s/events/%s.scale", p=
mu->name, alias->name);
>
>         fd =3D open(path, O_RDONLY);
>         if (fd =3D=3D -1)
> @@ -330,7 +330,7 @@ static int perf_pmu__parse_unit(struct perf_pmu *pmu,=
 struct perf_pmu_alias *ali
>         len =3D perf_pmu__event_source_devices_scnprintf(path, sizeof(pat=
h));
>         if (!len)
>                 return 0;
> -       scnprintf(path + len, sizeof(path) - len, "%s/%s.unit", pmu->name=
, alias->name);
> +       scnprintf(path + len, sizeof(path) - len, "%s/events/%s.unit", pm=
u->name, alias->name);
>
>         fd =3D open(path, O_RDONLY);
>         if (fd =3D=3D -1)
> @@ -364,7 +364,7 @@ perf_pmu__parse_per_pkg(struct perf_pmu *pmu, struct =
perf_pmu_alias *alias)
>         len =3D perf_pmu__event_source_devices_scnprintf(path, sizeof(pat=
h));
>         if (!len)
>                 return 0;
> -       scnprintf(path + len, sizeof(path) - len, "%s/%s.per-pkg", pmu->n=
ame, alias->name);
> +       scnprintf(path + len, sizeof(path) - len, "%s/events/%s.per-pkg",=
 pmu->name, alias->name);
>
>         fd =3D open(path, O_RDONLY);
>         if (fd =3D=3D -1)
> @@ -385,7 +385,7 @@ static int perf_pmu__parse_snapshot(struct perf_pmu *=
pmu, struct perf_pmu_alias
>         len =3D perf_pmu__event_source_devices_scnprintf(path, sizeof(pat=
h));
>         if (!len)
>                 return 0;
> -       scnprintf(path + len, sizeof(path) - len, "%s/%s.snapshot", pmu->=
name, alias->name);
> +       scnprintf(path + len, sizeof(path) - len, "%s/events/%s.snapshot"=
, pmu->name, alias->name);
>
>         fd =3D open(path, O_RDONLY);
>         if (fd =3D=3D -1)
> --
> 2.34.1
>