Adapt to LLVM 16 #51591

vchuravy · 2023-10-04T20:07:47Z

I love C++ so much...

starts the slog towards upgrading us to LLVM 16 and C++17.

Make.inc

Robert-j7 · 2023-10-05T08:43:12Z

One general question, why not just skip LLVM 16 and go straight to LLVM 17?

giordano · 2023-10-05T09:14:52Z

One general question, why not just skip LLVM 16 and go straight to LLVM 17?

"just" and "straight" are easier said than done: we started the effort to build llvm 16 5 months ago, and that's not even fully done yet.

vchuravy · 2023-10-05T19:25:27Z

One general question, why not just skip LLVM 16 and go straight to LLVM 17?

Are you volunteering to do that work? LLVM updates are tedious, fraught with risk and while it might be nice to skip an entire version you end up with more work and less ability to find out when something broke, because you can't bisect the middle.

If anyone wants to get involve getting the LLVM 16 build into Yggdrasil and looking at LLVM 17 in Yggdrasil would be a major contribution.

vchuravy · 2023-10-05T20:14:03Z

Okay two remaining source files...

make[1]: *** [/home/vchuravy/src/julia/src/Makefile:240: pipeline.dbg.obj] Error 1
make[1]: *** [/home/vchuravy/src/julia/src/Makefile:240: jitlayers.dbg.obj] Error 1

The pipeline failures are:

/home/vchuravy/src/julia/src/pipeline.cpp: In function 'void buildEarlySimplificationPipeline(llvm::ModulePassManager&, llvm::PassBuilder*, llvm::OptimizationLevel, const OptimizationOptions&)':
/home/vchuravy/src/julia/src/pipeline.cpp:345:33: error: use of deleted function 'llvm::PassManager<llvm::Module>::PassManager(const llvm::PassManager<llvm::Module>&)'
  345 |     invokePipelineStartCallbacks(MPM, PB, O);
      |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~

Which makes me think that we are missing one of @pchintalapudi patches from LLVM 15.

vchuravy · 2023-10-06T18:11:12Z

Okay @pchintalapudi this is probably ready for a first review.

definitly didn't do the memory attribute transition correctly since:

Attribute 'readnone' does not apply to functions!
  %10 = call nonnull ptr @julia.pointer_from_objref(ptr addrspace(11) %9) #3
Attribute 'readnone' does not apply to functions!
  %33 = call nonnull ptr @julia.pointer_from_objref(ptr addrspace(11) %32) #3
Attribute 'readnone' does not apply to functions!

vchuravy · 2023-10-06T18:12:26Z

cat deps/llvm.version
# -*- makefile -*-

## jll artifact
LLVM_JLL_NAME := libLLVM
LLVM_ASSERT_JLL_VER := 15.0.7+8
## source build
# Version number of LLVM
LLVM_VER := 16.0.6
# Git branch name in `LLVM_GIT_URL` repository
LLVM_BRANCH=julia-16.0.6-0
# Git ref in `LLVM_GIT_URL` repository
LLVM_SHA1=julia-16.0.6-0

## Following options are used to automatically fetch patchset from Julia's fork.  This is
## useful if you want to build an external LLVM while still applying Julia's patches.
# Set to 1 if you want to automatically apply Julia's patches to a different fork of LLVM.
LLVM_APPLY_JULIA_PATCHES := 0
# GitHub repository to use for fetching the Julia patches to apply to LLVM source code.
LLVM_JULIA_DIFF_GITHUB_REPO := https://github.com/llvm/llvm-project
# Base GitHub ref for generating the diff.
LLVM_BASE_REF := llvm:llvmorg-16.0.6
# Julia fork's GitHub ref for generating the diff.
LLVM_JULIA_REF := JuliaLang:julia-16.0.6-0

with

cat Make.user
USE_BINARYBUILDER_LLVM:=0
DEPS_GIT=1

FORCE_ASSERTIONS=1
LLVM_ASSERTIONS=1

LLVM_DEBUG=2
override JULIA_BUILD_MODE=debug

pchintalapudi · 2023-10-07T14:47:05Z

src/jitlayers.h

@@ -98,7 +102,9 @@ struct OptimizationOptions {

 struct NewPM {
    std::unique_ptr<TargetMachine> TM;
+#if JL_LLVM_VERSION < 160000
    StandardInstrumentations SI;


Removing all of StandardInstrumentations is not an option since we rely on print-before and print-after for testing, if upstream won't go back and remove the LLVMContext argument in the constructor then we need to create our own standardinstrumentations class that behaves the way we want it to.

https://reviews.llvm.org/D137149 we can either try to copy the code and maintain our own copies of it, or move this state hidden behind the same ThreadSafeContext as controls the LLVMContext. I think I prefer the latter

That would mean creating a pass pipeline per module, certainly doable but we should measure the cost that has.

Just per context

src/codegen.cpp

src/ccall.cpp

src/codegen.cpp

src/llvm-late-gc-lowering.cpp

vtjnash · 2023-10-10T19:36:44Z

src/pipeline.cpp

@@ -351,7 +350,12 @@ static void buildEarlySimplificationPipeline(ModulePassManager &MPM, PassBuilder
        FPM.addPass(DCEPass());
        FPM.addPass(SimplifyCFGPass(basicSimplifyCFGOptions()));
        if (O.getSpeedupLevel() >= 1) {
+#if JL_LLVM_VERSION >= 160000
+            // TODO check the LLVM 15 default.
+            FPM.addPass(SROAPass(SROAOptions::PreserveCFG));


The current default is SROAOptions::ModifyCFG, the old default was PreserveCFG

https://github.com/llvm/llvm-project/blob/97b989b27496d5aeadb3b90cbb9305ddcd9e35d2/llvm/include/llvm/Transforms/Scalar.h#L66

https://github.com/llvm/llvm-project/blob/97b989b27496d5aeadb3b90cbb9305ddcd9e35d2/llvm/lib/Passes/PassBuilder.cpp#L1023-L1024

ModifyCFG was added in llvm/llvm-project@4f7e5d2#diff-2b09f41dec5c9d1fbe844989c38f6bb7db588799b97b4bed7ad173ce7f348280R1119 for llvm-16

Thanks for digging that up. So we should use PreserveCFG late in the pipeline and ModifyCFG early on.

vtjnash · 2023-10-10T19:50:55Z

src/jitlayers.h

@@ -98,7 +102,9 @@ struct OptimizationOptions {

 struct NewPM {
    std::unique_ptr<TargetMachine> TM;
+#if JL_LLVM_VERSION < 160000
    StandardInstrumentations SI;


https://reviews.llvm.org/D137149 we can either try to copy the code and maintain our own copies of it, or move this state hidden behind the same ThreadSafeContext as controls the LLVMContext. I think I prefer the latter

src/llvm-codegen-shared.h

vchuravy · 2023-10-26T20:09:59Z

This should be NFC for now so let's land this.

Co-authored-by: Gabriel Baraldi <baraldigabriel@gmail.com> Co-authored-by: Prem Chintalapudi <prem.chintalapudi@gmail.com> Co-authored-by: Jameson Nash <vtjnash@gmail.com>

IanButterworth · 2023-10-28T12:10:28Z

Build is failing

vchuravy · 2023-10-28T15:58:56Z

Build is failing

Stupid rebase mistakes.

vchuravy requested review from aviks, gbaraldi and pchintalapudi October 4, 2023 20:07

brenhinkeller added the llvm For issues that relate to LLVM label Oct 5, 2023

giordano changed the title ~~Adopt to LLVM 16~~ Adapt to LLVM 16 Oct 5, 2023

giordano reviewed Oct 5, 2023

View reviewed changes

Make.inc Outdated Show resolved Hide resolved

pchintalapudi reviewed Oct 7, 2023

View reviewed changes

vchuravy removed the request for review from aviks October 7, 2023 17:25

vtjnash reviewed Oct 10, 2023

View reviewed changes

src/llvm-late-gc-lowering.cpp Outdated Show resolved Hide resolved

vtjnash reviewed Oct 10, 2023

View reviewed changes

src/llvm-late-gc-lowering.cpp Outdated Show resolved Hide resolved

vtjnash reviewed Oct 10, 2023

View reviewed changes

vchuravy commented Oct 16, 2023

View reviewed changes

src/llvm-codegen-shared.h Outdated Show resolved Hide resolved

gbaraldi force-pushed the vc/llvm16 branch from 28382c7 to c69ecf5 Compare October 17, 2023 15:10

vchuravy marked this pull request as ready for review October 20, 2023 14:25

vchuravy force-pushed the vc/llvm16 branch from a1dd3e9 to e44859d Compare October 26, 2023 20:08

vchuravy added the merge me PR is reviewed. Merge when all tests are passing label Oct 26, 2023

Adopt to LLVM 16

946b6a1

Co-authored-by: Gabriel Baraldi <baraldigabriel@gmail.com> Co-authored-by: Prem Chintalapudi <prem.chintalapudi@gmail.com> Co-authored-by: Jameson Nash <vtjnash@gmail.com>

vchuravy force-pushed the vc/llvm16 branch from e44859d to 946b6a1 Compare October 27, 2023 16:14

IanButterworth removed the merge me PR is reviewed. Merge when all tests are passing label Oct 28, 2023

fixup! Adopt to LLVM 16

0be7837

vchuravy merged commit 81abb6d into master Oct 28, 2023
7 checks passed

vchuravy deleted the vc/llvm16 branch October 28, 2023 21:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adapt to LLVM 16 #51591

Adapt to LLVM 16 #51591

vchuravy commented Oct 4, 2023

Robert-j7 commented Oct 5, 2023

giordano commented Oct 5, 2023

vchuravy commented Oct 5, 2023

vchuravy commented Oct 5, 2023 •

edited

vchuravy commented Oct 6, 2023

vchuravy commented Oct 6, 2023

pchintalapudi Oct 7, 2023

vtjnash Oct 10, 2023

vchuravy Oct 10, 2023

vtjnash Oct 12, 2023

vtjnash Oct 10, 2023

vchuravy Oct 10, 2023

vtjnash Oct 10, 2023

vchuravy commented Oct 26, 2023

IanButterworth commented Oct 28, 2023

vchuravy commented Oct 28, 2023

Adapt to LLVM 16 #51591

Adapt to LLVM 16 #51591

Conversation

vchuravy commented Oct 4, 2023

Robert-j7 commented Oct 5, 2023

giordano commented Oct 5, 2023

vchuravy commented Oct 5, 2023

vchuravy commented Oct 5, 2023 • edited

vchuravy commented Oct 6, 2023

vchuravy commented Oct 6, 2023

pchintalapudi Oct 7, 2023

Choose a reason for hiding this comment

vtjnash Oct 10, 2023

Choose a reason for hiding this comment

vchuravy Oct 10, 2023

Choose a reason for hiding this comment

vtjnash Oct 12, 2023

Choose a reason for hiding this comment

vtjnash Oct 10, 2023

Choose a reason for hiding this comment

vchuravy Oct 10, 2023

Choose a reason for hiding this comment

vtjnash Oct 10, 2023

Choose a reason for hiding this comment

vchuravy commented Oct 26, 2023

IanButterworth commented Oct 28, 2023

vchuravy commented Oct 28, 2023

vchuravy commented Oct 5, 2023 •

edited