Support for LLVM 15 and opaque pointers (#326)

Co-authored-by: Tim Besard <[email protected]>
maleadt · Mar 22, 2023 · 1205905 · 1205905
1 parent ba3d82d
commit 1205905
Show file tree

Hide file tree

Showing 31 changed files with 6,892 additions and 972 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -67,7 +67,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: ['release-1.7', 'release-1.8', 'release-1.9', 'master']
+        branch: ['release-1.7', 'release-1.8', 'release-1.9', 'master', 'vc/upgrade_llvm15']
         os: [ubuntu-latest, macOS-latest]
         arch: [x64]
     steps:

diff --git a/COVERAGE.md b/COVERAGE.md
@@ -5,7 +5,7 @@ LLVM API coverage
 
 Find functions in `lib` not mentioned in this document:
 ```
-for f in $(grep -ohR "function \w*" lib | cut -d ' ' -f 2) 
+for f in $(grep -ohR "function \w*" lib | cut -d ' ' -f 2)
 do
     grep -q $f COVERAGE.md || echo $f
 done
@@ -585,7 +585,7 @@ Function parameters:
 - [ ] LLVMRemoveAttribute
 - [ ] LLVMGetAttribute
 - [ ] LLVMSetParamAlignment
-    
+
 
 ### Metadata
 

diff --git a/deps/LLVMExtra/include/LLVMExtra.h b/deps/LLVMExtra/include/LLVMExtra.h
@@ -51,6 +51,7 @@ LLVMCreateFunctionPass2(const char *Name, LLVMPassCallback Callback, void *Data)
 // Various missing functions
 unsigned int LLVMGetDebugMDVersion(void);
 
+LLVMContextRef LLVMGetBuilderContext(LLVMBuilderRef B);
 LLVMContextRef LLVMGetValueContext(LLVMValueRef V);
 void LLVMAddTargetLibraryInfoByTriple(const char *T, LLVMPassManagerRef PM);
 void LLVMAddInternalizePassWithExportList(
@@ -82,6 +83,8 @@ void LLVMExtraGetNamedMetadataOperands2(LLVMNamedMDNodeRef NMD, LLVMMetadataRef
 
 void LLVMExtraAddNamedMetadataOperand2(LLVMNamedMDNodeRef NMD, LLVMMetadataRef Val);
 
+LLVMTypeRef LLVMGetFunctionType(LLVMValueRef Fn);
+
 #if LLVM_VERSION_MAJOR >= 12
 void LLVMAddCFGSimplificationPass2(LLVMPassManagerRef PM,
                                    int BonusInstThreshold,
@@ -158,7 +161,7 @@ LLVMValueRef LLVMMetadataAsValue2(LLVMContextRef C, LLVMMetadataRef Metadata);
 void LLVMReplaceAllMetadataUsesWith(LLVMValueRef Old, LLVMValueRef New);
 void LLVMReplaceMDNodeOperandWith(LLVMMetadataRef MD, unsigned I, LLVMMetadataRef New);
 
-#if LLVM_VERSION_MAJOR >= 12
+#if LLVM_VERSION_MAJOR >= 13
 LLVMBool LLVMContextSupportsTypedPointers(LLVMContextRef C);
 #endif
 

diff --git a/deps/LLVMExtra/lib/llvm-api.cpp b/deps/LLVMExtra/lib/llvm-api.cpp
@@ -203,6 +203,11 @@ LLVMContextRef LLVMGetValueContext(LLVMValueRef V)
     return wrap(&unwrap(V)->getContext());
 }
 
+LLVMContextRef LLVMGetBuilderContext(LLVMBuilderRef B)
+{
+    return wrap(&unwrap(B)->getContext());
+}
+
 void LLVMAddTargetLibraryInfoByTriple(const char *T, LLVMPassManagerRef PM)
 {
     unwrap(PM)->add(new TargetLibraryInfoWrapperPass(Triple(T)));
@@ -551,7 +556,7 @@ void LLVMReplaceMDNodeOperandWith(LLVMMetadataRef MD, unsigned I, LLVMMetadataRe
     unwrap<MDNode>(MD)->replaceOperandWith(I, unwrap(New));
 }
 
-#if LLVM_VERSION_MAJOR > 12
+#if LLVM_VERSION_MAJOR >= 13
 LLVMBool LLVMContextSupportsTypedPointers(LLVMContextRef C) {
   return unwrap(C)->supportsTypedPointers();
 }
@@ -561,3 +566,9 @@ LLVMValueRef LLVMConstDataArray(LLVMTypeRef ElementTy, const void *Data, unsigne
     StringRef S((const char *)Data, NumElements * unwrap(ElementTy)->getPrimitiveSizeInBits() / 8);
     return wrap(ConstantDataArray::getRaw(S, NumElements, unwrap(ElementTy)));
 }
+
+LLVMTypeRef  LLVMGetFunctionType(LLVMValueRef Fn) {
+    auto Ftype = unwrap<Function>(Fn)->getFunctionType();
+    return wrap(Ftype);
+}
+
diff --git a/examples/Kaleidoscope/codegen.jl b/examples/Kaleidoscope/codegen.jl
@@ -43,7 +43,7 @@ end
 function codegen(cg::CodeGen, expr::VariableExprAST)
     V = get(current_scope(cg), expr.name, nothing)
     V == nothing && error("did not find variable $(expr.name)")
-    return LLVM.load!(cg.builder, V, expr.name)
+    return LLVM.load!(cg.builder, LLVM.DoubleType(cg.ctx), V, expr.name)
 end
 
 function codegen(cg::CodeGen, expr::BinaryExprAST)
@@ -94,8 +94,8 @@ function codegen(cg::CodeGen, expr::CallExprAST)
     for v in expr.args
         push!(args, codegen(cg, v))
     end
-
-    return LLVM.call!(cg.builder, func, args, "calltmp")
+    ft = LLVM.function_type(func)
+    return LLVM.call!(cg.builder, ft, func, args, "calltmp")
 end
 
 function codegen(cg::CodeGen, expr::PrototypeAST)
@@ -190,7 +190,7 @@ function codegen(cg::CodeGen, expr::ForExprAST)
         step = codegen(cg, expr.step)
         endd = codegen(cg, expr.endd)
 
-        curvar = LLVM.load!(cg.builder, alloc, expr.varname)
+        curvar = LLVM.load!(cg.builder, LLVM.DoubleType(cg.ctx), alloc, expr.varname)
         nextvar = LLVM.fadd!(cg.builder, curvar, step, "nextvar")
         LLVM.store!(cg.builder, nextvar, alloc)
 

diff --git a/examples/constrained.jl b/examples/constrained.jl
@@ -43,12 +43,12 @@ meta(::Type{FPExceptStrict}) = "fpexcept.strict"
         mod = LLVM.parent(llvm_f)
         intrinsic = Intrinsic("llvm.experimental.constrained.$(func(F))")
         intrinsic_fun = LLVM.Function(mod, intrinsic, [typ])
-
+        ftype = LLVM.FunctionType(intrinsic,[typ])
         # generate IR
         @dispose builder=Builder(ctx) begin
             entry = BasicBlock(llvm_f, "entry"; ctx)
             position!(builder, entry)
-            val = call!(builder, intrinsic_fun,
+            val = call!(builder, ftype, intrinsic_fun,
                         [parameters(llvm_f)..., Value(mround; ctx), Value(mfpexcept; ctx)])
             ret!(builder, val)
         end

diff --git a/examples/generated.jl b/examples/generated.jl
@@ -27,8 +27,8 @@ end
 
             ptr = inttoptr!(builder, parameters(llvmf)[1], T_ptr)
 
-            ptr = gep!(builder, ptr, [parameters(llvmf)[2]])
-            val = load!(builder, ptr)
+            ptr = gep!(builder, eltyp, ptr, [parameters(llvmf)[2]])
+            val = load!(builder, eltyp, ptr)
             ret!(builder, val)
         end
 

diff --git a/lib/13/libLLVM_h.jl b/lib/13/libLLVM_h.jl
@@ -4746,8 +4746,8 @@ function LLVMBuildCall(arg1, Fn, Args, NumArgs, Name)
     ccall((:LLVMBuildCall, libllvm), LLVMValueRef, (LLVMBuilderRef, LLVMValueRef, Ptr{LLVMValueRef}, Cuint, Cstring), arg1, Fn, Args, NumArgs, Name)
 end
 
-function LLVMBuildCall2(arg1, arg2, Fn, Args, NumArgs, Name)
-    ccall((:LLVMBuildCall2, libllvm), LLVMValueRef, (LLVMBuilderRef, LLVMTypeRef, LLVMValueRef, Ptr{LLVMValueRef}, Cuint, Cstring), arg1, arg2, Fn, Args, NumArgs, Name)
+function LLVMBuildCall2(arg1, Ty, Fn, Args, NumArgs, Name)
+    ccall((:LLVMBuildCall2, libllvm), LLVMValueRef, (LLVMBuilderRef, LLVMTypeRef, LLVMValueRef, Ptr{LLVMValueRef}, Cuint, Cstring), arg1, Ty, Fn, Args, NumArgs, Name)
 end
 
 function LLVMBuildSelect(arg1, If, Then, Else, Name)