[DONOTMERGE] Switch llvm source build to v20

Makefile

@@ -1,4 +1,6 @@
 JULIAHOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+$(shell $(JULIAHOME)/contrib/download_cmake.sh > /dev/null 2>&1)
+$(shell echo "override USE_BINARYBUILDER_LLVM = 0" >> $(JULIAHOME)/Make.user)
 include $(JULIAHOME)/Make.inc
 # import LLVM_SHARED_LIB_NAME
 include $(JULIAHOME)/deps/llvm-ver.make

deps/checksums/llvm-d95ac947448f0eb0de729d80c575607334871f3f.tar.gz/md5

@@ -0,0 +1 @@
+30914338b68e3f8e8a1a87d29fbe3052

deps/checksums/llvm-d95ac947448f0eb0de729d80c575607334871f3f.tar.gz/sha512

@@ -0,0 +1 @@
+77072c614f4f74efbbb7e74ad144796f66670b0b535c37033e5e21acabf9430fc0c409f8c7b1b99c6993f68c8a012a2f3f4c764dc24f635dd26944cdda5cfb26

deps/llvm.mk

@@ -60,6 +60,10 @@ ifeq ($(BUILD_LLD), 1)
 LLVM_ENABLE_PROJECTS := $(LLVM_ENABLE_PROJECTS);lld
 endif
 
+# Remove ; if it's the first character
+ifneq ($(LLVM_ENABLE_RUNTIMES),)
+	LLVM_ENABLE_RUNTIMES := $(patsubst ;%,%,$(LLVM_ENABLE_RUNTIMES))
+endif
 
 LLVM_LIB_FILE := libLLVMCodeGen.a
 
@@ -69,7 +73,7 @@ LLVM_EXPERIMENTAL_TARGETS :=
 
 LLVM_CFLAGS :=
 LLVM_CXXFLAGS :=
-LLVM_CPPFLAGS :=
+LLVM_CPPFLAGS := "$(build_prefix)/lib/libz.$(SHLIB_EXT)" # Hacky way to force linking against the correct zlib
 LLVM_LDFLAGS :=
 LLVM_CMAKE :=
 

deps/llvm.version

@@ -5,11 +5,11 @@ LLVM_JLL_NAME := libLLVM
 LLVM_ASSERT_JLL_VER := 19.1.7+1
 ## source build
 # Version number of LLVM
-LLVM_VER := 19.1.7
+LLVM_VER := 20.1.0
 # Git branch name in `LLVM_GIT_URL` repository
-LLVM_BRANCH=julia-19.1.7-1
+LLVM_BRANCH=d95ac947448f0eb0de729d80c575607334871f3f
 # Git ref in `LLVM_GIT_URL` repository
-LLVM_SHA1=julia-19.1.7-1
+LLVM_SHA1=d95ac947448f0eb0de729d80c575607334871f3f
 
 ## 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.

src/codegen.cpp

@@ -5824,7 +5824,7 @@ static void emit_phinode_assign(jl_codectx_t &ctx, ssize_t idx, jl_value_t *r)
             unsigned nb = jl_datatype_size(phiType);
             dest = emit_static_alloca(ctx, nb, align);
             phi = cast<AllocaInst>(dest->clone());
-            phi->insertBefore(dest);
+            phi->insertBefore(dest->getIterator());
             ctx.builder.CreateMemCpy(phi, align, dest, align, nb, false);
             ctx.builder.CreateLifetimeEnd(dest);
         }

src/jitlayers.cpp

@@ -15,7 +15,8 @@
 #include <llvm/ExecutionEngine/Orc/DebugObjectManagerPlugin.h>
 #include <llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h>
 #if JL_LLVM_VERSION >= 200000
-#include "llvm/ExecutionEngine/Orc/AbsoluteSymbols.h"
+#include <llvm/ExecutionEngine/Orc/AbsoluteSymbols.h>
+#include <llvm/ExecutionEngine/Orc/EHFrameRegistrationPlugin.h>
 #endif
 #if JL_LLVM_VERSION >= 180000
 #include <llvm/ExecutionEngine/Orc/Debugging/DebugInfoSupport.h>

src/llvm-julia-licm.cpp

@@ -59,7 +59,7 @@ static void moveInstructionBefore(Instruction &I, Instruction &Dest,
                                   MemorySSAUpdater &MSSAU,
                                   ScalarEvolution *SE,
                                   MemorySSA::InsertionPlace Place = MemorySSA::BeforeTerminator) {
-  I.moveBefore(&Dest);
+  I.moveBefore(Dest.getIterator());
   if (MSSAU.getMemorySSA())
     if (MemoryUseOrDef *OldMemAcc = cast_or_null<MemoryUseOrDef>(
             MSSAU.getMemorySSA()->getMemoryAccess(&I)))

src/llvm-late-gc-lowering.cpp

@@ -1,6 +1,8 @@
 // This file is a part of Julia. License is MIT: https://julialang.org/license
 
 #include "llvm-gc-interface-passes.h"
+#include "llvm/IR/Intrinsics.h"
+#include "llvm/Support/Casting.h"
 
 #define DEBUG_TYPE "late_lower_gcroot"
 
@@ -171,39 +173,54 @@ static std::pair<Value*,int> FindBaseValue(const State &S, Value *V, bool UseCac
             (void)LI;
             break;
         }
-        else if (auto II = dyn_cast<IntrinsicInst>(CurrentV)) {
+        else if (dyn_cast<IntrinsicInst>(CurrentV) != nullptr &&
+                (cast<IntrinsicInst>(CurrentV)->getIntrinsicID() == Intrinsic::masked_load ||
+                cast<IntrinsicInst>(CurrentV)->getIntrinsicID() == Intrinsic::masked_gather)) {
             // Some intrinsics behave like LoadInst followed by a SelectInst
             // This should never happen in a derived addrspace (since those cannot be stored to memory)
             // so we don't need to lift these operations, but we do need to check if it's loaded and continue walking the base pointer
-            if (II->getIntrinsicID() == Intrinsic::masked_load ||
-                II->getIntrinsicID() == Intrinsic::masked_gather) {
-                if (auto VTy = dyn_cast<VectorType>(II->getType())) {
-                    if (hasLoadedTy(VTy->getElementType())) {
-                        Value *Mask = II->getOperand(2);
-                        Value *Passthrough = II->getOperand(3);
-                        if (!isa<Constant>(Mask) || !cast<Constant>(Mask)->isAllOnesValue()) {
-                            assert(isa<UndefValue>(Passthrough) && "unimplemented");
-                            (void)Passthrough;
+            auto II = dyn_cast<IntrinsicInst>(CurrentV);
+            if (auto VTy = dyn_cast<VectorType>(II->getType())) {
+                if (hasLoadedTy(VTy->getElementType())) {
+                    Value *Mask = II->getOperand(2);
+                    Value *Passthrough = II->getOperand(3);
+                    if (!isa<Constant>(Mask) || !cast<Constant>(Mask)->isAllOnesValue()) {
+                        assert(isa<UndefValue>(Passthrough) && "unimplemented");
+                        (void)Passthrough;
+                    }
+                    CurrentV = II->getOperand(0);
+                    if (II->getIntrinsicID() == Intrinsic::masked_load) {
+                        fld_idx = -1;
+                        if (!isSpecialPtr(CurrentV->getType())) {
+                            CurrentV = ConstantPointerNull::get(PointerType::get(V->getContext(), 0));
                         }
-                        CurrentV = II->getOperand(0);
-                        if (II->getIntrinsicID() == Intrinsic::masked_load) {
-                            fld_idx = -1;
-                            if (!isSpecialPtr(CurrentV->getType())) {
+                    } else {
+                        if (auto VTy2 = dyn_cast<VectorType>(CurrentV->getType())) {
+                            if (!isSpecialPtr(VTy2->getElementType())) {
                                 CurrentV = ConstantPointerNull::get(PointerType::get(V->getContext(), 0));
-                            }
-                        } else {
-                            if (auto VTy2 = dyn_cast<VectorType>(CurrentV->getType())) {
-                                if (!isSpecialPtr(VTy2->getElementType())) {
-                                    CurrentV = ConstantPointerNull::get(PointerType::get(V->getContext(), 0));
-                                    fld_idx = -1;
-                                }
+                                fld_idx = -1;
                             }
                         }
-                        continue;
                     }
+                    continue;
+                }
+            }
+            // In general a load terminates a walk
+            break;
+        }
+        else if (dyn_cast<IntrinsicInst>(CurrentV) != nullptr && cast<IntrinsicInst>(CurrentV)->getIntrinsicID() == Intrinsic::vector_extract) {
+            auto II = dyn_cast<IntrinsicInst>(CurrentV);
+            if (auto VTy = dyn_cast<VectorType>(II->getType())) {
+                if (hasLoadedTy(VTy->getElementType())) {
+                    Value *Idx = II->getOperand(1);
+                    if (!isa<ConstantInt>(Idx)) {
+                        assert(isa<UndefValue>(Idx) && "unimplemented");
+                        (void)Idx;
+                    }
+                    CurrentV = II->getOperand(0);
+                    fld_idx = -1;
+                    continue;
                 }
-                // In general a load terminates a walk
-                break;
             }
         }
         else if (auto CI = dyn_cast<CallInst>(CurrentV)) {
@@ -530,6 +547,20 @@ SmallVector<int, 0> LateLowerGCFrame::NumberAllBase(State &S, Value *CurrentV) {
         Numbers = NumberAll(S, IEI->getOperand(0));
         int ElNumber = Number(S, IEI->getOperand(1));
         Numbers[idx] = ElNumber;
+    } else if (dyn_cast<IntrinsicInst>(CurrentV) != nullptr && dyn_cast<IntrinsicInst>(CurrentV)->getIntrinsicID() == Intrinsic::vector_insert) {
+        auto *VII = cast<IntrinsicInst>(CurrentV);
+        // Vector insert is a bit like a shuffle so use the same approach
+        SmallVector<int, 0> Numbers1 = NumberAll(S, VII->getOperand(0));
+        SmallVector<int, 0> Numbers2 = NumberAll(S, VII->getOperand(1));
+        unsigned first_idx = cast<ConstantInt>(VII->getOperand(2))->getZExtValue();
+        for (unsigned i = 0; i < Numbers1.size(); ++i) {
+            if (i < first_idx)
+                Numbers.push_back(Numbers1[i]);
+            else if (i - first_idx < Numbers2.size())
+                Numbers.push_back(Numbers2[i - first_idx]);
+            else
+                Numbers.push_back(Numbers1[i]);
+        }
     } else if (auto *IVI = dyn_cast<InsertValueInst>(CurrentV)) {
         Numbers = NumberAll(S, IVI->getAggregateOperand());
         auto Tracked = TrackCompositeType(IVI->getType());
@@ -1206,6 +1237,10 @@ State LateLowerGCFrame::LocalScan(Function &F) {
                             }
                         }
                     }
+                    if (II->getIntrinsicID() == Intrinsic::vector_extract || II->getIntrinsicID() == Intrinsic::vector_insert) {
+                        // These are not real defs
+                        continue;
+                    }
                 }
                 auto callee = CI->getCalledFunction();
                 if (callee && callee == typeof_func) {
@@ -2382,10 +2417,10 @@ void LateLowerGCFrame::PlaceGCFrameReset(State &S, unsigned R, unsigned MinColor
     auto slotAddress = CallInst::Create(
         getOrDeclare(jl_intrinsics::getGCFrameSlot),
         {GCFrame, ConstantInt::get(Type::getInt32Ty(InsertBefore->getContext()), Colors[R] + MinColorRoot)},
-        "gc_slot_addr_" + StringRef(std::to_string(Colors[R] + MinColorRoot)), InsertBefore);
+        "gc_slot_addr_" + StringRef(std::to_string(Colors[R] + MinColorRoot)), InsertBefore->getIterator());
     // Reset the slot to NULL.
     Value *Val = ConstantPointerNull::get(T_prjlvalue);
-    new StoreInst(Val, slotAddress, InsertBefore);
+    new StoreInst(Val, slotAddress, InsertBefore->getIterator());
 }
 
 void LateLowerGCFrame::PlaceGCFrameStores(State &S, unsigned MinColorRoot,
@@ -2438,7 +2473,7 @@ void LateLowerGCFrame::PlaceRootsAndUpdateCalls(ArrayRef<int> Colors, int PreAss
             getOrDeclare(jl_intrinsics::newGCFrame),
             {ConstantInt::get(T_int32, 0)},
             "gcframe");
-        gcframe->insertBefore(&*F->getEntryBlock().begin());
+        gcframe->insertBefore(F->getEntryBlock().begin());
 
         auto pushGcframe = CallInst::Create(
             getOrDeclare(jl_intrinsics::pushGCFrame),
@@ -2554,7 +2589,7 @@ void LateLowerGCFrame::PlaceRootsAndUpdateCalls(ArrayRef<int> Colors, int PreAss
                 auto popGcframe = CallInst::Create(
                     getOrDeclare(jl_intrinsics::popGCFrame),
                     {gcframe});
-                popGcframe->insertBefore(BB.getTerminator());
+                popGcframe->insertBefore(BB.getTerminator()->getIterator());
             }
         }
     }

src/llvm-propagate-addrspaces.cpp

@@ -289,7 +289,7 @@ bool propagateJuliaAddrspaces(Function &F) {
     PropagateJuliaAddrspacesVisitor visitor;
     visitor.visit(F);
     for (auto it : visitor.ToInsert)
-        it.first->insertBefore(it.second);
+        it.first->insertBefore(it.second->getIterator());
     for (Instruction *I : visitor.ToDelete)
         I->eraseFromParent();
     visitor.ToInsert.clear();

src/llvm-ptls.cpp

@@ -179,7 +179,7 @@ void LowerPTLS::fix_pgcstack_use(CallInst *pgcstack, Function *pgcstack_getter,
             adoptFunc->copyMetadata(pgcstack_getter, 0);
         }
         adopt->setCalledFunction(adoptFunc);
-        adopt->insertBefore(slowTerm);
+        adopt->insertBefore(slowTerm->getIterator());
         phi->addIncoming(adopt, slowTerm->getParent());
         // emit fast branch code
         builder.SetInsertPoint(fastTerm->getParent());
@@ -237,7 +237,7 @@ void LowerPTLS::fix_pgcstack_use(CallInst *pgcstack, Function *pgcstack_getter,
             builder.SetInsertPoint(pgcstack);
             auto phi = builder.CreatePHI(T_pppjlvalue, 2, "pgcstack");
             pgcstack->replaceAllUsesWith(phi);
-            pgcstack->moveBefore(slowTerm);
+            pgcstack->moveBefore(slowTerm->getIterator());
             // refresh the basic block in the builder
             builder.SetInsertPoint(pgcstack);
             auto getter = builder.CreateLoad(T_pgcstack_getter, pgcstack_func_slot);

test/llvmpasses/gcroots.ll

@@ -764,7 +764,7 @@ define i8 @gather_arrayptrs_alltrue() {
 ; OPAQUE: %gcframe = alloca ptr addrspace(10), i32 3
 
 
-; OPAQUE: %arrayptrs = call <2 x ptr addrspace(13)> @llvm.masked.gather.v2p13.v2p11(<2 x ptr addrspace(11)> %arrayptrptrs, i32 16, <2 x i1> <i1 true, i1 true>, <2 x ptr addrspace(13)> zeroinitializer)
+; OPAQUE: %arrayptrs = call <2 x ptr addrspace(13)> @llvm.masked.gather.v2p13.v2p11(<2 x ptr addrspace(11)> %arrayptrptrs, i32 16, <2 x i1> {{(<i1 true, i1 true>|splat \(i1 true\))}}, <2 x ptr addrspace(13)> zeroinitializer)
 ; OPAQUE: [[GEP0:%.*]] = getelementptr inbounds ptr addrspace(10), ptr %gcframe, i32 2
 ; OPAQUE: store ptr addrspace(10) %obj1, ptr [[GEP0]]
 ;

test/llvmpasses/image-codegen.jl

@@ -2,7 +2,7 @@
 # RUN: export JULIA_LLVM_ARGS="--print-before=loop-vectorize --print-module-scope"
 # RUN: rm -rf %t
 # RUN: mkdir %t
-# RUN: julia --image-codegen --startup-file=no %s 2> %t/output.txt
+# RUN: julia --image-codegen -t1,0 --startup-file=no %s 2> %t/output.txt
 # RUN: FileCheck %s < %t/output.txt
 
 # COM: checks that global variables compiled in imaging codegen

test/llvmpasses/late-lower-gc.ll

@@ -164,6 +164,21 @@ define {} addrspace(10)* @gclift_switch({} addrspace(13)* addrspace(10)* %input,
   ret {} addrspace(10)* %ret
 }
 
+; Shouldn't hang
+define void @vector_insert(<4 x {} addrspace(10)* > %0, <2 x {} addrspace(10)* > %1) {
+top:
+  %pgcstack = call {}*** @julia.get_pgcstack()
+  %2 = call <4 x {} addrspace(10)*> @llvm.vector.insert.v4p10.v2p10(<4 x {} addrspace(10)*> %0, <2 x {} addrspace(10)*> %1, i64 2)
+  ret void
+}
+
+define void @vector_extract(<4 x {} addrspace(10)* > %0, <2 x {} addrspace(10)* > %1) {
+top:
+  %pgcstack = call {}*** @julia.get_pgcstack()
+  %2 = call <2 x {} addrspace(10)*> @llvm.vector.extract.v2p10.v4p10(<4 x {} addrspace(10)* > %0, i64 2)
+  ret void
+}
+
 define void @decayar([2 x {} addrspace(10)* addrspace(11)*] %ar) {
   %v2 = call {}*** @julia.get_pgcstack()
   %e0 = extractvalue [2 x {} addrspace(10)* addrspace(11)*] %ar, 0