From: Ian Rogers <irogers@google.com>
To: "Bernhard M. Wiedemann" <bwiedemann@suse.de>,
Ben Hutchings <benh@debian.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] perf jevents: Sort list of input files
Date: Mon, 20 Mar 2023 13:48:38 -0700 [thread overview]
Message-ID: <CAP-5=fUGbT8=spY=e6NPJvf_+Ct6VksFzWM6Eybf=gst_J=Xmw@mail.gmail.com> (raw)
In-Reply-To: <20230320201841.1133-1-bwiedemann@suse.de>
On Mon, Mar 20, 2023 at 1:19 PM Bernhard M. Wiedemann
<bwiedemann@suse.de> wrote:
>
> Without this, pmu-events.c would be generated with variations in ordering
> depending on non-deterministic filesystem readdir order.
>
> I tested that pmu-events.c still has the same number of lines
> and that perf list output works.
>
> This patch was done while working on reproducible builds for openSUSE,
> but also solves issues in Debian [1] and other distributions.
>
> [1] https://tests.reproducible-builds.org/debian/rb-pkg/unstable/i386/linux.html
>
> Signed-off-by: Bernhard M. Wiedemann <bwiedemann@suse.de>
> CC: Ian Rogers <irogers@google.com>
> ---
> tools/perf/pmu-events/jevents.py | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
Thanks Bernhard,
I think this may already be addressed by sorting prior to output:
https://lore.kernel.org/r/20220812230949.683239-5-irogers@google.com
Could you confirm?
Thanks,
Ian
>
> diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py
> index 2bcd07ce609f..f06e1abac7c7 100755
> --- a/tools/perf/pmu-events/jevents.py
> +++ b/tools/perf/pmu-events/jevents.py
> @@ -381,10 +381,13 @@ def read_json_events(path: str, topic: str) -> Sequence[JsonEvent]:
>
> return events
>
> +def sorted_scandir(path: str) -> list[os.DirEntry]:
> + return sorted(os.scandir(path), key=lambda e: e.name)
> +
> def preprocess_arch_std_files(archpath: str) -> None:
> """Read in all architecture standard events."""
> global _arch_std_events
> - for item in os.scandir(archpath):
> + for item in sorted_scandir(archpath):
> if item.is_file() and item.name.endswith('.json'):
> for event in read_json_events(item.path, topic=''):
> if event.name:
> @@ -497,7 +500,7 @@ def preprocess_one_file(parents: Sequence[str], item: os.DirEntry) -> None:
> def process_one_file(parents: Sequence[str], item: os.DirEntry) -> None:
> """Process a JSON file during the main walk."""
> def is_leaf_dir(path: str) -> bool:
> - for item in os.scandir(path):
> + for item in sorted_scandir(path):
> if item.is_dir():
> return False
> return True
> @@ -889,7 +892,7 @@ def main() -> None:
> def ftw(path: str, parents: Sequence[str],
> action: Callable[[Sequence[str], os.DirEntry], None]) -> None:
> """Replicate the directory/file walking behavior of C's file tree walk."""
> - for item in os.scandir(path):
> + for item in sorted_scandir(path):
> if _args.model != 'all' and item.is_dir():
> # Check if the model matches one in _args.model.
> if len(parents) == _args.model.split(',')[0].count('/'):
> @@ -930,7 +933,7 @@ struct compact_pmu_event {
>
> """)
> archs = []
> - for item in os.scandir(_args.starting_dir):
> + for item in sorted_scandir(_args.starting_dir):
> if not item.is_dir():
> continue
> if item.name == _args.arch or _args.arch == 'all' or item.name == 'test':
> --
> 2.35.3
>
next prev parent reply other threads:[~2023-03-20 20:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-20 20:18 [PATCH] perf jevents: Sort list of input files Bernhard M. Wiedemann
2023-03-20 20:48 ` Ian Rogers [this message]
2023-03-20 21:30 ` Bernhard M. Wiedemann
2023-03-20 21:39 ` Ian Rogers
2023-03-20 22:24 ` Arnaldo Carvalho de Melo
2023-03-21 6:30 ` Bernhard M. Wiedemann
2023-03-21 12:38 ` Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAP-5=fUGbT8=spY=e6NPJvf_+Ct6VksFzWM6Eybf=gst_J=Xmw@mail.gmail.com' \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=benh@debian.org \
--cc=bwiedemann@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).