llvmPackages_15: init at `15.0.7` by rrbutani · Pull Request #194634 · NixOS/nixpkgs

rrbutani · 2022-10-05T18:33:31Z

Note
Further work is being tracked in #213033

Description of changes

The commit messages in this PR have more details but at a high level this PR contains a few different kinds of changes:

introduces llvmPackages_15
switching to using clang from this package set to bootstrap libcxx, sidestepping some of the issues we've seen with older LLVM package sets
switches to ninja where possible
re-enables Polly by default
enables the LLVM tests on macOS (x86_64 and aarch64)
miscellaneous fixes (lldb, manpages) and updates (LLVM license, dropping some flags we don't need anymore)
mostly mechanical changes to make it easier to override the monorepo source used in the package set (the last two commits)

TODOs:

Checks:

llvmPackages_15.*
passthru tests
test cross / use as a cross compiler with this script
- only focusing on this passing eval successfully for now
  - i.e.:
    - nix path-info --file ./test.nix --derivation
    - nix path-info --file ./test.nix --derivation --arg systems '[ "aarch64-darwin" "x86_64-darwin" ]' --arg testStdenvPackages '[]'
- and checking that the following don't regress:
  - pkgsCross.x86_64-freebsd.boost (with llvmPackages = llvmPackages_15)
    - i.e. nix build --expr '(import ./. { system = "x86_64-linux"; overlays = [(f: p: { llvmPackages = f.llvmPackages_15; })]; }).pkgsCross.x86_64-freebsd.boost'
    - this is currently broken in libcxx
rdeps with nixpkgs-review
- not applicable since we're not bumping llvmPackages_latest

Closes #191132.

Things done

pkgs/development/compilers/llvm/15/libcxx/default.nix

pkgs/development/compilers/llvm/15/llvm/default.nix

pkgs/development/compilers/llvm/15/default.nix

rrbutani · 2022-10-07T20:49:20Z

With ab9d3df, libcxx-abi (and the rest of llvmPackages_15) builds fine on aarch64-linux as well as x86_64-linux. Darwin is now hitting an unrelated issue in compiler-rt; I'll tackle that next.

After that:

lldb-manpages llvmPackages_15: init at 15.0.7 #194634 (comment)
the skipped LLVM lit tests llvmPackages_15: init at 15.0.7 #194634 (comment)

rrbutani · 2022-10-07T21:57:18Z

Fixed one compiler-rt build issue, hit another one.

compiler-rt's build now attempts to detect whether the ld used automatically does codesigning, based on version. Our cctools ld is too old for this but postLinkSignHook handles codesigning for us, regardless.

Unfortunately there doesn't seem to be a way to communicate this to the compiler-rt build machinery. In the interest of avoiding making another patch, I tried to add sigtool to the derivation and just let the compiler-rt build sign some dylibs twice but unfortunately compiler-rt's build uses --sign instead of -s which the sigtool in nixpkgs has not been updated to support.

I opened a PR for this (#194994) but given that sigtool has many transitive deps and that that PR is likely to trigger many rebuilds I think it's probably faster to just add a compiler-rt patch.

rrbutani · 2022-10-07T22:19:13Z

With 974ea1c this now builds on aarch64-darwin.

Testing x86_64-darwin now; hopefully it Just Works 🤞.

Update: lldb fails to build on x86_64-darwin; it's failing on #include <bsm/audit_session.h> and CPU_SUBTYPE_ARM64E not being present in mach/machine.h 😕

`<bsm/audit_session.h>`

This isn't an issue on aarch64-darwin because we use a newer SDK there:

nixpkgs/pkgs/top-level/darwin-packages.nix

Line 45 in 4a1fb3a

    
           apple_sdk = if stdenv.hostPlatform.isAarch64 then apple_sdk_11_0 else apple_sdk_10_12;

This is the change in upstream causing the issue: llvm/llvm-project@b945b62

lldb appears to only use AU_SESSION_FLAG_HAS_GRAPHIC_ACCESS from audit_session.h which, worst case, would be easy to stub or patch out.

Fortunately, this header is available in the macOS 10.12 SDK (i.e. nixpkgs.darwin.apple_sdk.sdk.dev). Is it okay for me to depend on this header? This was the only precedent in nixpkgs I could find:

nixpkgs/pkgs/development/libraries/webkitgtk/default.nix

Line 168 in 299ec2c

    
                 install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h

`CPU_SUBTYPE_ARM64E`

For CPU_SUBTYPE_ARM64E I am not sure why we're just hitting this issue now; it appears to have been added in LLVM 13? llvm/llvm-project@479b672

Edit: oh, of course; lldb is marked as broken for LLVM 13 and 14:

nixpkgs/pkgs/development/compilers/llvm/13/lldb/default.nix

Line 105 in 88a2353

broken = stdenv.isDarwin;

nixpkgs/pkgs/development/compilers/llvm/14/lldb/default.nix

Line 119 in 299ec2c

    
           broken = stdenv.isDarwin; # error: use of undeclared identifier 'CPU_SUBTYPE_ARM64E'

It's not marked as broken in llvmPackages_git but I'm willing to bet that has the same issue.

Fixed in 040efed and opened #195013 to fix lldb 14 and lldb 13 on macOS x86_64.

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

see this thread for context: NixOS#194634 (comment) Co-authored-by: misuzu <bakalolka@gmail.com>

…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

Context: NixOS#194634 (comment)

the tests still don't all pass so `doCheck` is still disabled

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

rrbutani · 2023-01-27T22:24:57Z

Apologies for the delay, again.

I couldn't reproduce #193636 (the test case in #151879 passes and I don't see the extra header dirs on macOS or Linux) so I think this PR is pretty much ready.

I'm waiting on builds to finish for:

aarch64-linux
aarch64-darwin
x86_64-linux
x86_64-darwin
i686-linux
armv7l-linux
- building on a Pi so this will take me a while; if anyone has access to a machine capable of running 32-bit ARM code (like the nix community aarch64 build box) and is willing to test building the package set it'd be much appreciated!

Additionally, I'm testing that:

the packages in this script eval (cross compiling LLVM + using LLVM as a cross-compiler)
- with the exception of using LLVM as a cross-compiler on darwin which runs into infinite recursion issues that I haven't been able to get to the bottom of
- i.e.:
  - nix path-info --file ./test.nix --derivation
  - nix path-info --file ./test.nix --derivation --arg systems '[ "aarch64-darwin" "x86_64-darwin" ]' --arg testStdenvPackages '[]'
pkgsCross.x86_64-freebsd.boost builds from an x86_64-linux host where llvmPackages has been overridden to point to llvmPackages_15
- this builds as of llvmPackages: use libcxxrt on FreeBSD #211230 and I want to make sure I replicated those changes correctly
- i.e. nix build --expr '(import ./. { system = "x86_64-linux"; overlays = [(f: p: { llvmPackages = f.llvmPackages_15; })]; }).pkgsCross.x86_64-freebsd.boost'
- this is currently stuck, http://anoncvs.netbsd.org seems to be down?
  - trying: anoncvs.fr.NetBSD.org
  - nevermind, this was just firewall/proxy stuff
- this is currently broken in libcxx; investigating..
pkgsStatic.llvmPackages_15 on x86_64-linux
- about half of this is currently broken..

I've opened a tracking issue for the follow-up work to this PR: #213033; I'll fill in that issue and open a (draft, contingent on this PR getting merged) follow-up PR bumping llvmPackages_latest on staging later today.

msm-code · 2023-01-27T22:33:31Z

@rrbutani

Is there a reason for this pull request to be a draft?

It is a bit complicated, complex and it still does not compile all tier-1 architectures.

I believe this PR is ready to be reviewed. Can you remove the draft status? I understand that it's not 100% completed, but it's close enough (I believe, based on my undestanding of this thread).

Personally I really want this PR to be merged (in my case because of Zig), and I know many people IRL that feel similar. Since almost all issues are resolved, I believe it shouldn't be a draft (for example, #209536 is not a draft).

wegank · 2023-01-27T22:44:25Z

@rrbutani

Is there a reason for this pull request to be a draft?

It is a bit complicated, complex and it still does not compile all tier-1 architectures.

I believe this PR is ready to be reviewed. Can you remove the draft status? I understand that it's not 100% completed, but it's close enough (I believe, based on my undestanding of this thread).

Personally I really want this PR to be merged (in my case because of Zig), and I know many people IRL that feel similar. Since almost all issues are resolved, I believe it shouldn't be a draft (for example, #209536 is not a draft).

For Zig, I think we need assistance from the darwin maintainers, since (last time I tried) I ran into errors in rrbutani's #191152, and even applying the fix there didn't help (?).

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

…s overridable args this makes it easier for users to use their own LLVM in nixpkgs

LunNova · 2023-01-28T02:15:22Z

Result of nixpkgs-review pr 194634 run on x86_64-linux 1

25 packages built:

clang-tools_15
clang_15 (llvmPackages_15.clang ,llvmPackages_15.libstdcxxClang)
lld_15 (llvmPackages_15.lld)
lldb_15 (llvmPackages_15.lldb)
llvmPackages_15.bintools
llvmPackages_15.bintools-unwrapped
llvmPackages_15.bintoolsNoLibc
llvmPackages_15.clang-manpages
llvmPackages_15.libclang (llvmPackages_15.clang-unwrapped)
llvmPackages_15.clangNoCompilerRt
llvmPackages_15.clangNoCompilerRtWithLibc
llvmPackages_15.clangNoLibc
llvmPackages_15.clangNoLibcxx
llvmPackages_15.clangUseLLVM
llvmPackages_15.compiler-rt (llvmPackages_15.compiler-rt-libc ,llvmPackages_15.compiler-rt-no-libc)
llvmPackages_15.libcxx
llvmPackages_15.libcxxClang
llvmPackages_15.libcxxStdenv
llvmPackages_15.libcxxabi
llvm_15 (llvmPackages_15.llvm)
llvmPackages_15.libunwind
llvmPackages_15.lldb-manpages
llvmPackages_15.llvm-manpages
llvmPackages_15.openmp
llvmPackages_15.stdenv

strager · 2023-01-28T06:42:15Z

wegank said:

I think I'll merge it if Zig builds on my (slow) aarch64-linux machine.

I built the following packages on my Linux AArch64 machine. They all built successfully at commit d231d18 + my two Zig patches (#210324):

30 packages built:
cargo-lambda
cargo-zigbuild
clang-tools_15
clang_15
clipbuzz
lld_15
lldb_15
llvmPackages_15.bintools
llvmPackages_15.bintools-unwrapped
llvmPackages_15.bintoolsNoLibc
llvmPackages_15.clang-manpages
llvmPackages_15.libclang
llvmPackages_15.clangNoCompilerRt
llvmPackages_15.clangNoCompilerRtWithLibc
llvmPackages_15.clangNoLibc
llvmPackages_15.clangNoLibcxx
llvmPackages_15.clangUseLLVM
llvmPackages_15.compiler-rt
llvmPackages_15.libcxx
llvmPackages_15.libcxxClang
llvmPackages_15.libcxxStdenv
llvmPackages_15.libcxxabi
llvmPackages_15.llvm
llvmPackages_15.libunwind
llvmPackages_15.lldb-manpages
llvmPackages_15.llvm-manpages
llvmPackages_15.openmp
llvmPackages_15.stdenv
zig
zig_0_9

Linux ubuntu-linux-22-04-desktop 5.15.0-41-generic #44-Ubuntu SMP Thu Jun 23 11:20:13 UTC 2022 aarch64 GNU/Linux

wegank · 2023-01-28T06:53:59Z

Also built Zig 0.10.1 on top of f80ac84 with the two PRs applied:

$ nix-build -A zig
/nix/store/g9kixfg3cy0nxpv19z8b4i8dbn8zbsxb-zig-0.10.1

@rrbutani Thank you for your hard work!

github-actions · 2023-01-28T06:55:48Z

Successfully created backport PR for release-22.11:

[Backport release-22.11] llvmPackages_15: init at 15.0.7 #213092

ofborg bot added the 8.has: package (new) This PR adds a new package label Oct 5, 2022

ofborg bot requested review from 7c6f434c, dtzWill, lovek323 and primeos October 5, 2022 18:45

rrbutani force-pushed the feature/llvm-15 branch from c11356f to 30373c3 Compare October 5, 2022 18:55

zowoq mentioned this pull request Oct 6, 2022

llvmPackages_15: init at 15.0.2 #194781

Closed

13 tasks

lovesegfault reviewed Oct 7, 2022

View reviewed changes

pkgs/development/compilers/llvm/15/libcxx/default.nix Outdated Show resolved Hide resolved

lovesegfault reviewed Oct 7, 2022

View reviewed changes

pkgs/development/compilers/llvm/15/llvm/default.nix Outdated Show resolved Hide resolved

lovesegfault reviewed Oct 7, 2022

View reviewed changes

pkgs/development/compilers/llvm/15/default.nix Outdated Show resolved Hide resolved

lovesegfault reviewed Oct 7, 2022

View reviewed changes

pkgs/development/compilers/llvm/15/default.nix Outdated Show resolved Hide resolved

rrbutani force-pushed the feature/llvm-15 branch 2 times, most recently from 79aa175 to 8484b4d Compare October 7, 2022 20:39

rrbutani force-pushed the feature/llvm-15 branch from 8484b4d to 123aa5e Compare October 7, 2022 20:43

rrbutani mentioned this pull request Oct 7, 2022

sigtool: 0.1.2 → 0.1.3 #194994

Closed

13 tasks

rrbutani force-pushed the feature/llvm-15 branch from 123aa5e to d0c37e4 Compare October 7, 2022 22:17

rrbutani and others added 7 commits January 27, 2023 13:29

llvmPackages_15.llvm: disable some RISC-V ZBP tests on arm32

5e5ed7d

see this thread for context: NixOS#194634 (comment) Co-authored-by: misuzu <bakalolka@gmail.com>

llvmPackages_15.clang: drop the C++ std version -DCMAKE_CXX_FLAG

404ef6b

Context: NixOS#194634 (comment)

llvmPackages_15.openmp: add a missing darwin check dependency

8f16b4b

the tests still don't all pass so `doCheck` is still disabled

llvmPackages_15: misc fixes, notes

f8cbbdd

rrbutani mentioned this pull request Jan 27, 2023

Tracking Issue for llvmPackages_15 changes #213033

Closed

48 tasks

rrbutani added 2 commits January 27, 2023 14:51

llvmPackages_15: expose the release information and monorepo source a…

d231d18

…s overridable args this makes it easier for users to use their own LLVM in nixpkgs

wegank approved these changes Jan 28, 2023

View reviewed changes

LunNova approved these changes Jan 28, 2023

View reviewed changes

github-actions bot mentioned this pull request Jan 28, 2023

[Backport release-22.11] llvmPackages_15: init at 15.0.7 #213092

Merged

1 task

strager mentioned this pull request Jan 28, 2023

zig: 0.9.1 -> 0.10.1 #210324

Merged

13 tasks

rrbutani mentioned this pull request Jan 28, 2023

llvmPackages_latest: 14 -> 15 #213202

Closed

13 tasks

primeos mentioned this pull request Jan 31, 2023

Chromium maintenance #213862

Closed

alyssais mentioned this pull request Feb 23, 2023

clang_15: add nostdlibinc flag #217825

Merged

12 tasks

rrbutani mentioned this pull request Feb 23, 2023

llvmPackages_git.compiler-rt: fix build #217844

Merged

12 tasks

rrbutani mentioned this pull request Mar 22, 2023

llvmPackages_git.llvm: run the tests on macOS #222220

Merged

12 tasks

ghost mentioned this pull request Apr 17, 2023

clang_15: fix build!=(host==target) cross compilation #226551

Merged

12 tasks

Artturin mentioned this pull request Nov 25, 2023

llvmPackages_git: remove #269994

Closed

13 tasks

ghost mentioned this pull request Jan 5, 2024

llvmPackages_{15,16,17,git}.libcxx: use LIBCXX_CXX_ABI=libcxxabi link flags on darwin #278945

Merged

13 tasks

rrbutani mentioned this pull request May 6, 2024

Request for a Zulip account for governance discussion NixOS/foundation#143

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

llvmPackages_15: init at `15.0.7`#194634

llvmPackages_15: init at `15.0.7`#194634
wegank merged 30 commits intoNixOS:masterfrom
rrbutani:feature/llvm-15

rrbutani commented Oct 5, 2022 •

edited by alyssais

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rrbutani commented Oct 7, 2022 •

edited

Loading

Uh oh!

rrbutani commented Oct 7, 2022

Uh oh!

rrbutani commented Oct 7, 2022 •

edited

Loading

Uh oh!

rrbutani commented Jan 27, 2023 •

edited

Loading

Uh oh!

msm-code commented Jan 27, 2023 •

edited

Loading

Uh oh!

wegank commented Jan 27, 2023

Uh oh!

LunNova commented Jan 28, 2023

Uh oh!

strager commented Jan 28, 2023

Uh oh!

wegank commented Jan 28, 2023 •

edited

Loading

Uh oh!

github-actions bot commented Jan 28, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Uh oh!

Conversation

rrbutani commented Oct 5, 2022 • edited by alyssais Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of changes

Things done

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rrbutani commented Oct 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rrbutani commented Oct 7, 2022

Uh oh!

rrbutani commented Oct 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

<bsm/audit_session.h>

CPU_SUBTYPE_ARM64E

Uh oh!

rrbutani commented Jan 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

msm-code commented Jan 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wegank commented Jan 27, 2023

Uh oh!

LunNova commented Jan 28, 2023

Uh oh!

strager commented Jan 28, 2023

Uh oh!

wegank commented Jan 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Jan 28, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

rrbutani commented Oct 5, 2022 •

edited by alyssais

Loading

rrbutani commented Oct 7, 2022 •

edited

Loading

rrbutani commented Oct 7, 2022 •

edited

Loading

`<bsm/audit_session.h>`

`CPU_SUBTYPE_ARM64E`

rrbutani commented Jan 27, 2023 •

edited

Loading

msm-code commented Jan 27, 2023 •

edited

Loading

wegank commented Jan 28, 2023 •

edited

Loading