llvmPackages_12: build from monorepo source by sternenseemann · Pull Request #348568 · NixOS/nixpkgs

sternenseemann · 2024-10-14T16:41:23Z

As mentioned in #305146, keeping LLVM 12 is a source of pain because it
is the only version to be built from individual release tarball instead
of the LLVM monorepo. This change makes LLVM 12 start from the monorepo
as well, simplifying all common LLVM expressions in the process.
No more LLVM 12 specific default.nix!

Additionally, some additional, simple cleanups are included that just rebuild LLVM 12.
Consequently, this PR is best reviewed commit by commit.
The common default.nix's patch logic can further be simplified by a separate change
that rebuilds all LLVM versions.

This change is not breaking and could be included in 24.11 (or backported if we miss
the window) which seems wise. I've tested LLVM 12 on x86_64-linux and aarch64-linux.
I've also tested GHC 8.10.7 (which uses LLVM 12) on aarch64-linux.

Things done

Add a 👍 reaction to pull requests you find important.

RossComputerGuy · 2024-10-14T16:43:01Z

pkgs/development/compilers/llvm/12/default.nix is gone 🎉

pkgs/development/compilers/llvm/common/llvm/default.nix has conflicts.

sternenseemann · 2024-10-14T17:03:55Z

I'm going to re-test everything, now that everything is rebased on staging, just to be sure.

RossComputerGuy · 2024-10-14T17:57:59Z

lldb in LLVM 12 failed to resolve the cpu_subtype_arm64e_replacement patch.

sternenseemann · 2024-10-15T11:45:58Z

x86_64-linux builds fine, but aarch64-darwin doesn't. It appears that it is already broken in some way before this change. Is anyone aware of any details?

sternenseemann · 2024-10-15T15:45:47Z

@reckenrode Any ideas about the followng error (staging, aarch64-darwin, llvmPackages_12.libcxx)?

-- Check for working CXX compiler: /nix/store/7qfjlhi98568y1ff5xy93607dgn3lfw8-clang-wrapper-12.0.1/bin/clang++
-- Check for working CXX compiler: /nix/store/7qfjlhi98568y1ff5xy93607dgn3lfw8-clang-wrapper-12.0.1/bin/clang++ - broken
CMake Error at /nix/store/xl246ny58q2xm0w7srsjkkd1j3f7hakg-cmake-3.30.4/share/cmake-3.30/Modules/CMakeTestCXXCompiler.cmake:73 (message):
  The C++ compiler

    "/nix/store/7qfjlhi98568y1ff5xy93607dgn3lfw8-clang-wrapper-12.0.1/bin/clang++"

  is not able to compile a simple test program.

  It fails with the following output:

    Change Dir: '/tmp/nix-build-libcxx-12.0.1.drv-0/libcxx-src-12.0.1/runtimes/build/CMakeFiles/CMakeScratch/TryCompile-Ul4rVU'
    
    Run Build Command(s): /nix/store/6qaz2a5vrp8bv8wyjcyfkmssxdcbdc2d-ninja-1.12.1/bin/ninja -v cmTC_70287
    [1/2] /nix/store/7qfjlhi98568y1ff5xy93607dgn3lfw8-clang-wrapper-12.0.1/bin/clang++   -isysroot /nix/store/9qf26qdqy34chms1vx44w2cm7mjg46nh-apple-sdk-11.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -MD -MT CMakeFiles/cmTC_70287.dir/testCXXCompiler.cxx.o -MF CMakeFiles/cmTC_70287.dir/testCXXCompiler.cxx.o.d -o CMakeFiles/cmTC_70287.dir/testCXXCompiler.cxx.o -c /tmp/nix-build-libcxx-12.0.1.drv-0/libcxx-src-12.0.1/runtimes/build/CMakeFiles/CMakeScratch/TryCompile-Ul4rVU/testCXXCompiler.cxx
    [2/2] : && /nix/store/7qfjlhi98568y1ff5xy93607dgn3lfw8-clang-wrapper-12.0.1/bin/clang++ -isysroot /nix/store/9qf26qdqy34chms1vx44w2cm7mjg46nh-apple-sdk-11.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -Wl,-search_paths_first -Wl,-headerpad_max_install_names  CMakeFiles/cmTC_70287.dir/testCXXCompiler.cxx.o -o cmTC_70287   && :
    FAILED: cmTC_70287 
    : && /nix/store/7qfjlhi98568y1ff5xy93607dgn3lfw8-clang-wrapper-12.0.1/bin/clang++ -isysroot /nix/store/9qf26qdqy34chms1vx44w2cm7mjg46nh-apple-sdk-11.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk -Wl,-search_paths_first -Wl,-headerpad_max_install_names  CMakeFiles/cmTC_70287.dir/testCXXCompiler.cxx.o -o cmTC_70287   && :
    ld: library not found for -lc++
    clang-12: error: linker command failed with exit code 1 (use -v to see invocation)
    ninja: build stopped: subcommand failed.
    
    

  

  CMake will not be able to correctly generate this project.
Call Stack (most recent call first):
  CMakeLists.txt:3 (project)

Interestingly, before my PR, compilation fails later, in compiler-rt-libc. That error is also a mystery to me.

reckenrode · 2024-10-15T16:09:53Z

Interestingly, before my PR, compilation fails later, in compiler-rt-libc. That error is also a mystery to me.

Darwin needed to use buildLlvmPackages.clangWithLibcAndBasicRtAndLibcxx, which it wasn’t before in the separate derivation. It does in the common one.

Any ideas about the followng error (staging, aarch64-darwin, llvmPackages_12.libcxx)?

Its test for a working C++ compiler appears to be trying to link libc++ even though libcxx is building with buildLlvmPackages.clangWithLibcAndBasicRt, which does not have libc++. Before the derivations were unified, libcxx on Darwin was built with a standard stdenv that has libc++.

Does it build if you deaddine "-DCMAKE_CXX_COMPILER_WORKS=ON" to cmakeFlags on Darwin for libcxx-12?

emilazy · 2024-11-08T22:07:31Z

OK. I believe we haven’t yet done an eval with the haskell-updates merge on staging-next anyway, so as long as this is rebased soon I think it should be fine to land directly in staging-next for 24.11. (Though I’m double checking in the Staging room to make sure I’m reading Hydra right.)

We just need to make sure the attribute evaluates so we can cleanly access `meta.broken` for those versions.

As mentioned in NixOS#305146, keeping LLVM 12 is a source of pain because it is the only version to be built from individual release tarball instead of the LLVM monorepo. This commit makes LLVM 12 start from the monorepo as well, simplifying all common LLVM expressions in the process. With NixOS#347887, some quirks in the expressions for LLVM <14 were ironed out, so building LLVM through from the monorepo is quite simple now. - Most expressions only required minor changes, mostly removing the special casing for `sourceRoot`. - The patch lists from llvm/12/default.nix were ported to common/default.nix. This only required a few extra conditionals which could be reduced via a rebuild also involving other LLVM versions. Outstanding tasks of little urgency have been noted in TODO comments. I have verified that the patch lists stay the same for all packages except LLVM where merely the order changes. An extra set of eyes is appreciated, of course. - clang: The expression was reworked to use the same symlink location for clang-tools-extra for all versions including LLVM 12. This required adjusting the ad hoc patching of the clangd cmake files slightly. - libunwind: We no longer need to make the libcxx sources available manually. We can rely on the monorepo source instead. - lld: We no longer need to make the libunwind sources available manually. - llvm: We no longer need to make the polly sources available manually - On Darwin, we need to bypass CMake's C++ compiler for libcxx and libunwind now. It isn't a 100% clear why, probably because we've started to use Darwin's bootstrapStdenv for libcxx in the common expression compared to LLVM 12 on master [1]. The reordering of flags for wasm causes a rebuild for some packages like firefox, but this should be tolerable on staging. [1]: https://github.com/NixOS/nixpkgs/blob/665ebfb253caba7b85c2affefe2a92b305def4e6/pkgs/development/compilers/llvm/12/default.nix#L392-L430

All LLVM versions < 12 have been removed, so this patch can live in the versioned directory, simplifying the patch list in the process.

Seems like the patch we've written for LLVM 13 and above also works for LLVM 12 which seems a little more robust.

sternenseemann · 2024-11-08T22:45:29Z

Rebased, but currently untested. I'd at least want to look at ofborg's rebuild overview before merging.

Ericson2314 · 2024-11-08T22:58:23Z

Glad this is happening! :)

emilazy · 2024-11-09T06:07:18Z

Builds on the community builders, only 220 rebuilds outside of aarch64-linux, and those look as expected for being downstream of Haskell packages that we just merged a huge rebuild of anyway. Going to merge this into -next.

emilazy · 2024-11-09T06:11:52Z

Realized that actually the haskell-updates had already hit staging-next and that the revert/unrevert dance was just because it hit the trunk job a few days later. So I’m going to merge this into staging for 25.05 after all and we can backport it after branch‐off.

sternenseemann · 2024-11-09T11:35:56Z

I had a failure in llvmPackages_12.compiler-rt on aarch64-darwin about a symlink failing to be created because it already existed, but I can't reproduce it. I suppose there's a race condition in the build system.

github-actions · 2024-11-17T07:42:22Z

Successfully created backport PR for staging-24.11:

[Backport staging-24.11] llvmPackages_12: build from monorepo source #356654

paparodeo · 2024-11-17T21:18:25Z

I had a failure in llvmPackages_12.compiler-rt on aarch64-darwin about a symlink failing to be created because it already existed, but I can't reproduce it. I suppose there's a race condition in the build system.

llvm/llvm-project@b31080c looks like it fixes the race

pwaller · 2024-12-20T12:40:05Z

pkgs/development/compilers/llvm/common/clang/default.nix

+      (cd tools && ln -s ../../clang-tools-extra extra)
+    '' + lib.optionalString (lib.versionOlder release_version "13") ''
+      substituteInPlace tools/extra/clangd/quality/CompletionModel.cmake \
+        --replace ' ''${CMAKE_SOURCE_DIR}/../clang-tools-extra' ' ''${CMAKE_SOURCE_DIR}/tools/extra'


@sternenseemann

#356120 (--replace-fail) broke this one on clang 12 (staging 03ed65c).

The path tools/extra doesn't exist; the only reference to it I could find is in the deleted diff hunk which appears after this one. I take it you somehow separated out clang-tools-extra from this derivation and therefore it is vestigial and can be removed. Correct?

Oh no, wait, I see (cd tools && ln -s ../../clang-tools-extra extra) retained in this diff which I missed. Hmm.

Found it, it's vestigial because the patch which removed CMAKE_SOURCE_DIR was removed in 12.0.1:
llvm/llvm-project@3be5dbb

Can't comment much more, I've just tried to preserve all the parts of the phases in the original LLVM 12 expressions. They may have been unnecessarily copied from earlier versions, yes.

Fix for llvm 12: #367056

…l.cmake Fix up NixOS#356120 for clang 12. The failing replacement target was removed between llvm 12.0.0 and 12.0.1. Ref: NixOS#348568 (comment) Ref: llvm/llvm-project@3be5dbb Signed-off-by: Peter Waller <[email protected]>

…l.cmake Fix up #356120 for clang 12. The failing replacement target was removed between llvm 12.0.0 and 12.0.1. Ref: #348568 (comment) Ref: llvm/llvm-project@3be5dbb Signed-off-by: Peter Waller <[email protected]>

sternenseemann requested a review from a team October 14, 2024 16:41

github-actions bot added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label Oct 14, 2024

nix-owners bot requested review from RossComputerGuy and alyssais October 14, 2024 16:42

sternenseemann mentioned this pull request Oct 14, 2024

Legacy LLVM Version Removal #305146

Open

sternenseemann force-pushed the llvm-12-monorepo branch 2 times, most recently from dda8d8a to a475c8b Compare October 14, 2024 17:02

sternenseemann force-pushed the llvm-12-monorepo branch from a475c8b to 628e484 Compare October 14, 2024 21:37

sternenseemann force-pushed the llvm-12-monorepo branch from 2909afd to 989ba37 Compare October 15, 2024 15:49

ofborg bot removed the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Oct 15, 2024

ofborg bot requested review from Ericson2314, dtzWill, lovek323 and rrbutani October 15, 2024 16:42

sternenseemann added 4 commits November 8, 2024 23:19

llvmPackages_{12,13}.lldb: don't try to find nonexistent patch

ce6c31c

We just need to make sure the attribute evaluates so we can cleanly access `meta.broken` for those versions.

llvmPackages_12.compiler-rt: move codesign patch into versioned dir

8408b91

All LLVM versions < 12 have been removed, so this patch can live in the versioned directory, simplifying the patch list in the process.

llvmPackages_12.clang: use nostdlibinc patch instead of sed command

3743784

Seems like the patch we've written for LLVM 13 and above also works for LLVM 12 which seems a little more robust.

sternenseemann force-pushed the llvm-12-monorepo branch from 8708697 to 3743784 Compare November 8, 2024 22:41

wegank removed the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 8, 2024

ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 9, 2024

emilazy changed the base branch from staging to staging-next November 9, 2024 06:07

emilazy changed the base branch from staging-next to staging November 9, 2024 06:10

emilazy merged commit 40a6c76 into NixOS:staging Nov 9, 2024

sternenseemann deleted the llvm-12-monorepo branch November 9, 2024 11:31

sternenseemann mentioned this pull request Nov 9, 2024

Take the bigger amount of rebuilds from supported linux arches NixOS/ofborg#369

Closed

emilazy added the backport staging-24.11 label Nov 17, 2024

github-actions bot mentioned this pull request Nov 17, 2024

[Backport staging-24.11] llvmPackages_12: build from monorepo source #356654

Merged

1 task

paparodeo mentioned this pull request Nov 17, 2024

llvmPackages_12.compiler-rt: fix build race aarch64-darwin #356814

Merged

13 tasks

This was referenced Nov 27, 2024

llvmPackages_12.compiler-rt: fix symlink conflict on darwin #320106

Open

Build failure: llvmPackages_12.compiler-rt (darwin) #359591

Closed

pwaller reviewed Dec 20, 2024

View reviewed changes

pwaller mentioned this pull request Dec 21, 2024

llvmPackages.clang: Drop failing substituteInPlace for CompletionModel.cmake #367056

Merged

13 tasks

sternenseemann mentioned this pull request Sep 7, 2025

llvmPackages_{12,13,14,15,16,17}: drop #440273

Merged

13 tasks

Uh oh!

Conversation

sternenseemann commented Oct 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Things done

Uh oh!

RossComputerGuy commented Oct 14, 2024

Uh oh!

sternenseemann commented Oct 14, 2024

Uh oh!

RossComputerGuy commented Oct 14, 2024

Uh oh!

sternenseemann commented Oct 15, 2024

Uh oh!

sternenseemann commented Oct 15, 2024

Uh oh!

reckenrode commented Oct 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

emilazy commented Nov 8, 2024

Uh oh!

sternenseemann commented Nov 8, 2024

Uh oh!

Ericson2314 commented Nov 8, 2024

Uh oh!

emilazy commented Nov 9, 2024

Uh oh!

emilazy commented Nov 9, 2024

Uh oh!

sternenseemann commented Nov 9, 2024

Uh oh!

github-actions bot commented Nov 17, 2024

Uh oh!

paparodeo commented Nov 17, 2024

Uh oh!

pwaller Dec 20, 2024

Choose a reason for hiding this comment

Uh oh!

pwaller Dec 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pwaller Dec 20, 2024

Choose a reason for hiding this comment

Uh oh!

sternenseemann Dec 21, 2024

Choose a reason for hiding this comment

Uh oh!

pwaller Dec 21, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

sternenseemann commented Oct 14, 2024 •

edited

Loading

reckenrode commented Oct 15, 2024 •

edited

Loading

pwaller Dec 20, 2024 •

edited

Loading