-
Notifications
You must be signed in to change notification settings - Fork 14.9k
Add Nix recipe for collecting linker reproducers. #145789
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add Nix recipe for collecting linker reproducers. #145789
Conversation
Created using spr 1.3.6-beta.1 [skip ci]
Created using spr 1.3.6-beta.1
@llvm/pr-subscribers-lld Author: Peter Collingbourne (pcc) ChangesAs proposed in: This is a Nix recipe for collecting reproducers for benchmarking purposes It may be used in conjunction with the script lld/utils/run_benchmark.py Full diff: https://github.com/llvm/llvm-project/pull/145789.diff 2 Files Affected:
diff --git a/lld/utils/speed-test-reproducers/collect.nix b/lld/utils/speed-test-reproducers/collect.nix
new file mode 100644
index 0000000000000..b3e2d38bf7187
--- /dev/null
+++ b/lld/utils/speed-test-reproducers/collect.nix
@@ -0,0 +1,157 @@
+#===-----------------------------------------------------------------------===//
+#
+# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+#
+#===----------------------------------------------------------------------===//
+#
+# This is a Nix recipe for collecting reproducers for benchmarking purposes in a
+# reproducible way. It works by injecting a linker wrapper that embeds a
+# reproducer tarball into a non-allocated section of every linked object, which
+# generally causes them to be smuggled out of the build tree in a section of the
+# final binaries. In principle, this technique should let us collect reproducers
+# from any project packaged by Nix without project-specific knowledge, but as
+# you can see below, many interesting ones need a few hacks.
+#
+# If you have Nix installed, you can build the reproducers with the following
+# command:
+#
+# TMPDIR=/var/tmp nix-build -j6 --log-format bar collect.nix
+#
+# This will result in building several large projects including Chromium and
+# Firefox, which will take some time, and it will also build most of the
+# dependencies for non-native targets. Eventually you will get a result
+# directory containing all the reproducers.
+#
+# The following projects have been tested successfully:
+# - chrome (native only, cross builds fail building the qtbase dependency)
+# - firefox (all targets)
+# - linux-kernel (all targets, requires patched nixpkgs)
+# - ladybird (native only, same problem as chromium)
+# - llvm (all targets)
+
+{
+ nixpkgsDir ? fetchTarball "https://github.com/NixOS/nixpkgs/archive/992f916556fcfaa94451ebc7fc6e396134bbf5b1.tar.gz",
+ nixpkgs ? import nixpkgsDir,
+}:
+let
+ reproducerPkgs =
+ crossSystem:
+ let
+ pkgs = nixpkgs { inherit crossSystem; };
+ # Wraps the given stdenv and lld package into a variant that collects
+ # the reproducer and builds with debug info.
+ reproducerCollectingStdenv =
+ stdenv: lld:
+ let
+ bintools = stdenv.cc.bintools.override {
+ extraBuildCommands = ''
+ wrap ${stdenv.cc.targetPrefix}nix-wrap-lld ${nixpkgsDir}/pkgs/build-support/bintools-wrapper/ld-wrapper.sh ${lld}/bin/ld.lld
+ export lz4=${pkgs.lib.getBin pkgs.buildPackages.lz4}/bin/lz4
+ substituteAll ${./ld-wrapper.sh} $out/bin/${stdenv.cc.targetPrefix}ld
+ chmod +x $out/bin/${stdenv.cc.targetPrefix}ld
+ substituteAll ${./ld-wrapper.sh} $out/bin/${stdenv.cc.targetPrefix}ld.lld
+ chmod +x $out/bin/${stdenv.cc.targetPrefix}ld.lld
+ '';
+ };
+ in
+ pkgs.withCFlags [ "-g1" ] (stdenv.override (old: {
+ allowedRequisites = null;
+ cc = stdenv.cc.override { inherit bintools; };
+ }));
+ withReproducerCollectingStdenv = pkg: pkg.override {
+ stdenv = reproducerCollectingStdenv pkgs.stdenv pkgs.buildPackages.lld;
+ };
+ withReproducerCollectingClangStdenv = pkg: pkg.override {
+ clangStdenv = reproducerCollectingStdenv pkgs.clangStdenv pkgs.buildPackages.lld;
+ };
+ in
+ {
+ # For benchmarking the linker we want to disable LTO as otherwise we would
+ # just be benchmarking the LLVM optimizer. Also, we generally want the
+ # package to use the regular stdenv in order to simplify wrapping it.
+ # Firefox normally uses the rustc stdenv but uses the regular one if
+ # LTO is disabled so we kill two birds with one stone by disabling it.
+ # Chromium uses the rustc stdenv unconditionally so we need the stuff
+ # below to make sure that it finds our wrapped stdenv.
+ chrome =
+ (pkgs.chromium.override {
+ newScope =
+ extra:
+ pkgs.newScope (
+ extra
+ // {
+ pkgsBuildBuild = {
+ pkg-config = pkgs.pkgsBuildBuild.pkg-config;
+ rustc = {
+ llvmPackages = rec {
+ stdenv = reproducerCollectingStdenv pkgs.pkgsBuildBuild.rustc.llvmPackages.stdenv pkgs.pkgsBuildBuild.rustc.llvmPackages.lld;
+ bintools = stdenv.cc.bintools;
+ };
+ };
+ };
+ }
+ );
+ pkgs = {
+ rustc = {
+ llvmPackages = {
+ stdenv = reproducerCollectingStdenv pkgs.rustc.llvmPackages.stdenv pkgs.rustc.llvmPackages.lld;
+ };
+ };
+ };
+ }).browser.overrideAttrs
+ (old: {
+ configurePhase =
+ old.configurePhase
+ + ''
+ echo use_thin_lto = false >> out/Release/args.gn
+ echo is_cfi = false >> out/Release/args.gn
+ '';
+ });
+ firefox = (withReproducerCollectingStdenv pkgs.firefox-unwrapped).override {
+ ltoSupport = false;
+ pgoSupport = false;
+ };
+ # Won't work until https://github.com/NixOS/nixpkgs/pull/390631 lands.
+ # Can replace above line with
+ # nixpkgsDir ? fetchTarball "https://github.com/NixOS/nixpkgs/archive/fbc5923fb30c7e1957a729f19f22968083fb473f.tar.gz",
+ # for testing with that PR.
+ linux-kernel = (withReproducerCollectingStdenv pkgs.linux_latest).dev;
+ ladybird = withReproducerCollectingStdenv pkgs.ladybird;
+ llvm = withReproducerCollectingStdenv pkgs.llvm;
+ webkitgtk = withReproducerCollectingClangStdenv pkgs.webkitgtk;
+ hello = withReproducerCollectingStdenv pkgs.hello;
+ };
+ targets = {
+ x86_64 = reproducerPkgs { config = "x86_64-unknown-linux-gnu"; };
+ aarch64 = reproducerPkgs { config = "aarch64-unknown-linux-gnu"; };
+ riscv64 = reproducerPkgs { config = "riscv64-unknown-linux-gnu"; };
+ };
+ nativePkgs = nixpkgs { };
+in
+derivation {
+ name = "lld-speed-test";
+ system = builtins.currentSystem;
+ builder = "${nativePkgs.bash}/bin/bash";
+ args = [
+ "-c"
+ ''
+ extract_reproducer() {
+ ${nativePkgs.coreutils}/bin/mkdir -p $out/$2
+ ${nativePkgs.llvm}/bin/llvm-objcopy -O binary --only-section=.lld_repro --set-section-flags .lld_repro=alloc $1 - | ${nativePkgs.gnutar}/bin/tar x -I ${nativePkgs.lib.getBin nativePkgs.buildPackages.lz4}/bin/lz4 --strip-components=1 -C $out/$2
+ }
+
+ extract_reproducer ${targets.aarch64.hello}/bin/hello hello-arm64
+ extract_reproducer ${targets.x86_64.hello}/bin/hello hello-x64
+ extract_reproducer ${targets.aarch64.chrome}/libexec/chromium/chromium chrome
+ extract_reproducer ${targets.aarch64.ladybird}/lib/liblagom-web.so ladybird
+ extract_reproducer ${targets.aarch64.firefox}/lib/firefox/libxul.so firefox-arm64
+ extract_reproducer ${targets.x86_64.firefox}/lib/firefox/libxul.so firefox-x64
+ extract_reproducer ${targets.riscv64.firefox}/lib/firefox/libxul.so firefox-riscv64
+ extract_reproducer ${nativePkgs.lib.getLib targets.aarch64.llvm}/lib/libLLVM.so llvm-arm64
+ extract_reproducer ${nativePkgs.lib.getLib targets.x86_64.llvm}/lib/libLLVM.so llvm-x64
+ extract_reproducer ${nativePkgs.lib.getLib targets.riscv64.llvm}/lib/libLLVM.so llvm-riscv64
+ ''
+ ];
+}
diff --git a/lld/utils/speed-test-reproducers/ld-wrapper.sh b/lld/utils/speed-test-reproducers/ld-wrapper.sh
new file mode 100755
index 0000000000000..8a19d7e2d87eb
--- /dev/null
+++ b/lld/utils/speed-test-reproducers/ld-wrapper.sh
@@ -0,0 +1,50 @@
+#! @shell@
+
+source @out@/nix-support/utils.bash
+
+expandResponseParams "$@"
+
+output="a.out"
+should_add_repro=true
+newparams=()
+for arg in "${params[@]}"; do
+ case "$arg" in
+ -r|--version)
+ should_add_repro=false
+ ;;
+ *)
+ ;;
+ esac
+ case "$prev" in
+ -o)
+ output="$arg"
+ newparams+=("$arg")
+ ;;
+ *)
+ if [ -e "$arg.nolldrepro" ]; then
+ newparams+=("$arg.nolldrepro")
+ else
+ newparams+=("$arg")
+ fi
+ ;;
+ esac
+ prev="$arg"
+done
+
+export LLD_REPRODUCE="$output.repro.tar"
+if @targetPrefix@nix-wrap-lld "${newparams[@]}"; then
+ if $should_add_repro; then
+ @lz4@ -c "$LLD_REPRODUCE" > "$LLD_REPRODUCE.lz4"
+ mv "$output" "$output.nolldrepro"
+ @targetPrefix@objcopy --add-section ".lld_repro=$LLD_REPRODUCE.lz4" "$output.nolldrepro" "$output"
+ rm -f "$LLD_REPRODUCE.lz4"
+ fi
+ exitcode=0
+else
+ # Some Nix packages don't link with lld so just use bfd instead.
+ @[email protected] "${newparams[@]}"
+ exitcode=$?
+fi
+
+rm -f "$LLD_REPRODUCE"
+exit $exitcode
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I think I travelled in June and July and the whole summer went by and I missed this.
I don't know the Nix package configuration language. It seems kind of janky, but it seems worth parking this benchmarking utility in the LLD utils repository. I think sharing these utility scripts is valuable. Even if they bitrot quickly, they are recipes that show what can be done in the future. (rsp_bisect.py, reduce_clang_crash.py, and others like them)
in | ||
derivation { | ||
name = "lld-speed-test"; | ||
system = builtins.currentSystem; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please make this an option in the attrs argument. You can have it be system ? builtins.currentSystem
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
nixpkgsDir ? fetchTarball "https://github.com/NixOS/nixpkgs/archive/992f916556fcfaa94451ebc7fc6e396134bbf5b1.tar.gz", | ||
nixpkgs ? import nixpkgsDir, | ||
}: | ||
let | ||
reproducerPkgs = | ||
crossSystem: | ||
let | ||
pkgs = nixpkgs { inherit crossSystem; }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm skeptic doing it this way, let's have nixpkgs
be an input but we don't import it in the arguments. The current structure isn't typical for non-Flake based nix scripts.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
let | ||
bintools = stdenv.cc.bintools.override { | ||
extraBuildCommands = '' | ||
wrap ${stdenv.cc.targetPrefix}nix-wrap-lld ${nixpkgsDir}/pkgs/build-support/bintools-wrapper/ld-wrapper.sh ${lld}/bin/ld.lld |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
wrap ${stdenv.cc.targetPrefix}nix-wrap-lld ${nixpkgsDir}/pkgs/build-support/bintools-wrapper/ld-wrapper.sh ${lld}/bin/ld.lld | |
wrap ${stdenv.cc.targetPrefix}nix-wrap-lld ${pkgs.path}/pkgs/build-support/bintools-wrapper/ld-wrapper.sh ${lld}/bin/ld.lld |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
# Won't work until https://github.com/NixOS/nixpkgs/pull/390631 lands. | ||
# Can replace above line with | ||
# nixpkgsDir ? fetchTarball "https://github.com/NixOS/nixpkgs/archive/fbc5923fb30c7e1957a729f19f22968083fb473f.tar.gz", | ||
# for testing with that PR. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The fix has landed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the heads up. I tried updating to the latest nixos-unstable hash above and adding the kernel back below, but it couldn't collect a reproducer. I think the issue is that with the new fix the derivation calls the linker directly instead of the wrapper.
Also, there were some build regressions with the latest nixos-unstable hash (sent fixes: NixOS/nixpkgs#450106 NixOS/nixpkgs#450107) so for now I kept the hash as is.
aarch64 = reproducerPkgs { config = "aarch64-unknown-linux-gnu"; }; | ||
riscv64 = reproducerPkgs { config = "riscv64-unknown-linux-gnu"; }; | ||
}; | ||
nativePkgs = nixpkgs { }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's just call this pkgs
and the other pkgsCross
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
}; | ||
nativePkgs = nixpkgs { }; | ||
in | ||
derivation { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not pkgs.runCommand
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mostly because I wasn't aware of it. Done
extract_reproducer ${targets.aarch64.hello}/bin/hello hello-arm64 | ||
extract_reproducer ${targets.x86_64.hello}/bin/hello hello-x64 | ||
extract_reproducer ${targets.aarch64.chrome}/libexec/chromium/chromium chrome | ||
extract_reproducer ${targets.aarch64.ladybird}/lib/liblagom-web.so ladybird | ||
extract_reproducer ${targets.aarch64.firefox}/lib/firefox/libxul.so firefox-arm64 | ||
extract_reproducer ${targets.x86_64.firefox}/lib/firefox/libxul.so firefox-x64 | ||
extract_reproducer ${targets.riscv64.firefox}/lib/firefox/libxul.so firefox-riscv64 | ||
extract_reproducer ${nativePkgs.lib.getLib targets.aarch64.llvm}/lib/libLLVM.so llvm-arm64 | ||
extract_reproducer ${nativePkgs.lib.getLib targets.x86_64.llvm}/lib/libLLVM.so llvm-x64 | ||
extract_reproducer ${nativePkgs.lib.getLib targets.riscv64.llvm}/lib/libLLVM.so llvm-riscv64 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this can be done automatically with attr-set mapping and lib.getExe
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like that would only work for hello
. Most of these are either libraries or internal binaries, rather than the main binary.
Created using spr 1.3.6-beta.1 [skip ci]
Created using spr 1.3.6-beta.1
As proposed in: https://discourse.llvm.org/t/improving-the-reproducibility-of-linker-benchmarking/86057 This is a Nix recipe for collecting reproducers for benchmarking purposes in a reproducible way. It works by injecting a linker wrapper that embeds a reproducer tarball into a non-allocated section of every linked object, which generally causes them to be smuggled out of the build tree in a section of the final binaries. It may be used in conjunction with the script lld/utils/run_benchmark.py to measure the relative performance of linker changes or compare the performance of different linkers.
As proposed in: https://discourse.llvm.org/t/improving-the-reproducibility-of-linker-benchmarking/86057 This is a Nix recipe for collecting reproducers for benchmarking purposes in a reproducible way. It works by injecting a linker wrapper that embeds a reproducer tarball into a non-allocated section of every linked object, which generally causes them to be smuggled out of the build tree in a section of the final binaries. It may be used in conjunction with the script lld/utils/run_benchmark.py to measure the relative performance of linker changes or compare the performance of different linkers.
As proposed in:
https://discourse.llvm.org/t/improving-the-reproducibility-of-linker-benchmarking/86057
This is a Nix recipe for collecting reproducers for benchmarking purposes
in a reproducible way. It works by injecting a linker wrapper that embeds
a reproducer tarball into a non-allocated section of every linked object,
which generally causes them to be smuggled out of the build tree in a
section of the final binaries.
It may be used in conjunction with the script lld/utils/run_benchmark.py
to measure the relative performance of linker changes or compare
the performance of different linkers.