-
-
Notifications
You must be signed in to change notification settings - Fork 14.1k
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
llvmPackages_15: init at 15.0.7
#194634
llvmPackages_15: init at 15.0.7
#194634
Commits on Jan 27, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 201ef33 - Browse repository at this point
Copy the full SHA 201ef33View commit details -
llvmPackages_15: apply some patches from
llvmPackages_14
See NixOS#194634 for details. PRs: - NixOS#191372 - NixOS#190936 - NixOS#82131 - NixOS#199844 - NixOS#197674 - NixOS#184408 - NixOS#193004
Configuration menu - View commit details
-
Copy full SHA for 81ef82a - Browse repository at this point
Copy the full SHA 81ef82aView commit details -
llvmPackages_15: apply some patches from
llvmPackages_14
, part 2See NixOS#194634 (comment) for details. PRs: - NixOS#211401 - NixOS#211161 - NixOS#206742 - NixOS#211687
Configuration menu - View commit details
-
Copy full SHA for 9bd9267 - Browse repository at this point
Copy the full SHA 9bd9267View commit details -
llvmPackages_15: updates for LLVM 15
None of the patches required any touch-up; the only change of note is: - due to changes in the libc++/libc++abi build (https://reviews.llvm.org/D120719 and https://reviews.llvm.org/D131037) we have to add an extra build option to the libc++ header only build that sidesteps bits of the libc++ build config that assume libc++-abi is present in the build: https://github.com/llvm/llvm-project/blob/4f827318e3e8ccab4ff131e06234caa827e91e4e/libcxx/src/CMakeLists.txt#L255-L256 Rather than maintaining a precise set of build options that let us dodge referencing libc++-abi variables in the libc++ header only build, we set `LIBCXX_CXX_ABI` to `none`, as suggested by @lovesegfault. More discussion about this here: NixOS#194634 (comment) Co-authored-by: Bernardo Meurer <bernardo@meurer.org>
Configuration menu - View commit details
-
Copy full SHA for bc4dbee - Browse repository at this point
Copy the full SHA bc4dbeeView commit details -
llvmPackages_15.compiler_rt: apply NixOS#196909 to LLVM 15
`llvmPackages_15` originates from `llvmPackages_git` which does not include this change
Configuration menu - View commit details
-
Copy full SHA for 3b6d98d - Browse repository at this point
Copy the full SHA 3b6d98dView commit details -
llvmPackages_15: apply NixOS#211230 to llvmPackages_15
See the comments here for context: NixOS#194634 (comment) Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 4fabcf4 - Browse repository at this point
Copy the full SHA 4fabcf4View commit details -
llvmPackages_15.libcxx: use clang 15 instead of the stdenv's compiler
libc++ has switched to using `__attribute__((using_if_exists))` to handle incomplete libc implementations; see: llvm/llvm-project@a9c9183 These essentially require a modern C++ compiler (clang gained support in LLVM 13: llvm/llvm-project@369c648, gcc appears to not have support yet: https://gcc.gnu.org/bugzilla//show_bug.cgi?id=105584). Previously this was not an issue for us (despite the transition happening around LLVM 13) but something about the changes to the libc++/libc++-abi build has made it so that on platforms with incomplete libc impls (i.e. Darwin is missing `quick_exit`/`at_quick_exit`) we error during the `libcxx-abi` build when the stdenv's (older, not supporting `using_if_exists`) compiler tries to import libc symbols that aren't present. The libc++ docs suggest we use a modern compiler to build libc++ anyways (https://releases.llvm.org/15.0.0/projects/libcxx/docs/index.html#platform-and-compiler-support) so this commit uses stdenv's containing the package set's clang to build libcxx/libcxx-abi. This is similar to how libc++ bootstrapping builds (https://releases.llvm.org/15.0.0/projects/libcxx/docs/BuildingLibcxx.html#bootstrapping-build) work.
Configuration menu - View commit details
-
Copy full SHA for ca59a20 - Browse repository at this point
Copy the full SHA ca59a20View commit details -
Configuration menu - View commit details
-
Copy full SHA for 501a9e1 - Browse repository at this point
Copy the full SHA 501a9e1View commit details -
llvmPackages_15.compiler-rt: fixes for Darwin
this introduces a codesigning related patch that we can drop once NixOS#195107 goes through see: NixOS#194634 (comment)
Configuration menu - View commit details
-
Copy full SHA for 00839fe - Browse repository at this point
Copy the full SHA 00839feView commit details -
Configuration menu - View commit details
-
Copy full SHA for 09b8886 - Browse repository at this point
Copy the full SHA 09b8886View commit details -
llvmPackages_15.compiler-rt: update the armv7l patch
see the discussion here for context: NixOS#194634 (comment)
Configuration menu - View commit details
-
Copy full SHA for f91fad4 - Browse repository at this point
Copy the full SHA f91fad4View commit details -
llvmPackages_15.compiler-rt: gate the
libxcrypt
dep on `plat.libc =……= "glibc"` This restores this check to what it originally was in NixOS#196909 (see: NixOS#196909 (comment)) and lets `compiler-rt` eval successfully when trying to compile the `llvmPackages_15` set for mingw targets (i.e. a platform that *is* GNU but does *not* use glibc). --- It's not clear to me what the `haveLibc` check is doing here (platforms that seem to use glibc like `x86_64-linux` and have `plat.libc == "glibc"` have `haveLibc = false` because `stdenv.cc.libc` is `null`).
Configuration menu - View commit details
-
Copy full SHA for d729907 - Browse repository at this point
Copy the full SHA d729907View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1d3ca42 - Browse repository at this point
Copy the full SHA 1d3ca42View commit details -
llvmPackages_15.lldb: fix the build on
i686
as detailed within, adding `asm/ptrace.h` leads to `asm/ptrace-abi.h` being included which defines preprocessor symbols that clash with identifiers used in the LLVM headers (`FS` and `CS` only defined on i686)
Configuration menu - View commit details
-
Copy full SHA for b4ee532 - Browse repository at this point
Copy the full SHA b4ee532View commit details -
Configuration menu - View commit details
-
Copy full SHA for 19d1571 - Browse repository at this point
Copy the full SHA 19d1571View commit details -
Configuration menu - View commit details
-
Copy full SHA for 912056c - Browse repository at this point
Copy the full SHA 912056cView commit details -
llvmPackages_15: expand the
NIX_BUILD_CORES
arg passed to lit at co……nfigure time this previously worked because, when using Make, this variable was expanded at build time
Configuration menu - View commit details
-
Copy full SHA for 4d3857d - Browse repository at this point
Copy the full SHA 4d3857dView commit details -
llvmPackages_15.llvm: enable polly by default
this comment has a more complete history: NixOS#194634 (comment) in short: polly was disabled in the llvm 11 -> llvm 12 copy, mostly by accident most of the Polly install dirs patch has been upstreamed; one change remains
Configuration menu - View commit details
-
Copy full SHA for 2a58596 - Browse repository at this point
Copy the full SHA 2a58596View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6d0c876 - Browse repository at this point
Copy the full SHA 6d0c876View commit details -
llvmPackages_15.llvm: run the tests on macOS
there are a few parts to this: - adding darwin specific check deps - working around referencing LLVM dylibs during the checkPhase in a way that supports darwin + previously we just set `$LD_LIBRARY_PATH` and/or made some strategic symlinks + now we have LLVM's `lit` config set the appropriate env vars as needed (as is done for other LLVM subprojects) + in retrospect switching to `installCheckPhase` might have been the better move.. - patching `lit` to deal with `$DYLD_LIBRARY_PATH` being purged for new "protected" processes more details within.
Configuration menu - View commit details
-
Copy full SHA for c7231c0 - Browse repository at this point
Copy the full SHA c7231c0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0ee5251 - Browse repository at this point
Copy the full SHA 0ee5251View commit details -
llvmPackages_15.llvm: fix the tests on
x86_64-darwin
Details within but ultimately there isn't a satisfying resolution for any of the three test failures we were seeing and all three deserve further exploration. For the `sw_vers` macOS version issue in particular, it's possible to observe the nixpkgs provided `CoreFoundation` vs system `CoreFoundation` for `x86_64` and `aarch64` like so (on a host running macOS `13.0.1`): ```console $ nix-shell -p darwin.DarwinTools --system aarch64-darwin --command "sw_vers" ProductName: macOS ProductVersion: 13.0.1 BuildVersion: 22A400 $ nix-shell -p darwin.DarwinTools --system x86_64-darwin --command "sw_vers" ProductName: Mac OS X ProductVersion: 10.16 BuildVersion: 22A400 ``` Where `/System/Library/CoreServices/SystemVersion.plist` has: ```console $ cat /System/Library/CoreServices/SystemVersion.plist | grep ProductVersion -A 1 <key>ProductVersion</key> <string>13.0.1</string> ``` Further: ```console $ nix-shell -p darwin.DarwinTools --system aarch64-darwin --command 'otool -L $(which sw_vers)' /nix/store/nb2q33ak2zif49ndcpc6m823z0vhmy8y-DarwinTools-1/bin/sw_vers: /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (compatibility version 150.0.0, current version 1770.255.0) /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.60.1) $ nix-shell -p darwin.DarwinTools --system x86_64-darwin --command 'otool -L $(which sw_vers)' /nix/store/88v4kjvgwl71byfpvd0baviiq7l5appc-DarwinTools-1/bin/sw_vers: @rpath/CoreFoundation.framework/Versions/A/CoreFoundation (compatibility version 150.0.0, current version 1454.90.0) /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1238.60.2) ``` For the `x86_64` `sw_vers` binary we can see rpath: ```console $ nix-shell -p darwin.DarwinTools --system x86_64-darwin --command 'otool -l $(which sw_vers)' | grep LC_RPATH -A 2 -B 1 Load command 13 cmd LC_RPATH cmdsize 120 path /nix/store/zvr4wypbgskhhw9cawfn7mmxfa75nh8f-swift-corefoundation-unstable-2018-09-14/Library/Frameworks (offset 12) ``` And we can confirm that the nixpkgs provided `CoreFoundation` is what ultimately gets loaded: ```console $ nix-shell -p darwin.DarwinTools --system x86_64-darwin --command 'DYLD_PRINT_LIBRARIES=1 sw_vers' dyld[16215]: <no uuid> /nix/store/88v4kjvgwl71byfpvd0baviiq7l5appc-DarwinTools-1/bin/sw_vers dyld[16215]: <no uuid> /nix/store/zvr4wypbgskhhw9cawfn7mmxfa75nh8f-swift-corefoundation-unstable-2018-09-14/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation dyld[16215]: <no uuid> /nix/store/xd2a4xh8kdwq0j67hzgw720npdw5hzkk-ICU-66108/lib/libicucore.A.dylib <snipped> ``` ```bash nix-diff \ $(nix path-info nixpkgs#legacyPackages.aarch64-darwin.darwin.DarwinTools --derivation) \ $(nix path-info nixpkgs#legacyPackages.x86_64-darwin.darwin.DarwinTools --derivation) ``` doesn't show any _obvious_ discrepancies
Configuration menu - View commit details
-
Copy full SHA for eafb8fb - Browse repository at this point
Copy the full SHA eafb8fbView commit details -
llvmPackages_15.llvm: disable some RISC-V ZBP tests on arm32
see this thread for context: NixOS#194634 (comment) Co-authored-by: misuzu <bakalolka@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 5e5ed7d - Browse repository at this point
Copy the full SHA 5e5ed7dView commit details -
llvmPackages_15.llvm: specify some deps explicitly to fix cross-compi…
…lation The two scenarios described within where splicing doesn't handle selecting the right package for us are observable in the following (nix repl session): ``` > np = import <nixpkgs> { system = "x86_64-linux"; crossSystem = { config = "aarch64-linux"; }; } > np.__splicedPackages.hello ? __spliced true > np.__splicedPackages.python3Packages.psutil ? __spliced true > np.__splicedPackages.python3.pkgs.psutil ? __spliced false > (np.__splicedPackages.python3.withPackages (ps: with ps; [psutil])) ? __spliced false ``` See: NixOS#211340
Configuration menu - View commit details
-
Copy full SHA for 3436075 - Browse repository at this point
Copy the full SHA 3436075View commit details -
Configuration menu - View commit details
-
Copy full SHA for 404ef6b - Browse repository at this point
Copy the full SHA 404ef6bView commit details -
llvmPackages_15.openmp: add a missing darwin check dependency
the tests still don't all pass so `doCheck` is still disabled
Configuration menu - View commit details
-
Copy full SHA for 8f16b4b - Browse repository at this point
Copy the full SHA 8f16b4bView commit details -
Configuration menu - View commit details
-
Copy full SHA for f8cbbdd - Browse repository at this point
Copy the full SHA f8cbbddView commit details -
llvmPackages_15: update licenses
Context: NixOS#194634 (comment) All the subprojects seem to be uniformly licensed under NCSA and the LLVM license now (with the exception of openmp which has an additional Intel license that doesn't seem to be in SPDX?); see: - https://github.com/llvm/llvm-project/blob/llvmorg-15.0.7/compiler-rt/LICENSE.TXT - https://github.com/llvm/llvm-project/blob/llvmorg-15.0.7/libcxx/LICENSE.TXT - https://github.com/llvm/llvm-project/blob/llvmorg-15.0.7/libcxxabi/LICENSE.TXT - https://github.com/llvm/llvm-project/blob/llvmorg-15.0.7/openmp/LICENSE.TXT
Configuration menu - View commit details
-
Copy full SHA for 386aba3 - Browse repository at this point
Copy the full SHA 386aba3View commit details -
llvmPackages_15.llvm: add checks for the LLVM version
this is in preparation for the next commit which exposes the release information and monorepo source as overridable args (which makes it easier for users to use their own LLVM in nixpkgs) this commit only adds a check in the `llvm` package's postConfigure that makes sure the LLVM source provided matches the version we were given; the actual machinery (functionally just a cosmetic change; causes no rebuilds) is in the next commit
Configuration menu - View commit details
-
Copy full SHA for 8afa321 - Browse repository at this point
Copy the full SHA 8afa321View commit details -
llvmPackages_15: expose the release information and monorepo source a…
…s overridable args this makes it easier for users to use their own LLVM in nixpkgs
Configuration menu - View commit details
-
Copy full SHA for d231d18 - Browse repository at this point
Copy the full SHA d231d18View commit details