Update to LLVM.jl v9.1. (#626)

Author: maleadt

.buildkite/pipeline.yml

@@ -135,7 +135,7 @@ steps:
 
       julia -e 'println("+++ :julia: Running tests")
                 using Pkg
-                Pkg.test("Enzyme"; coverage=true)'
+                Pkg.test("Enzyme"; coverage=true, julia_args=`--depwarn=no`)'
     agents:
       queue: "juliagpu"
     if: build.message !~ /\[skip tests\]/ && !build.pull_request.draft

Project.toml

@@ -20,7 +20,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 [compat]
 ExprTools = "0.1"
 InteractiveUtils = "1"
-LLVM = "9"
+LLVM = "9.1"
 Libdl = "1"
 Logging = "1"
 PrecompileTools = "1"

src/driver.jl

@@ -248,14 +248,14 @@ const __llvm_initialized = Ref(false)
                         end
                         replace_uses!(call, fptr)
                     end
-                    unsafe_delete!(LLVM.parent(call), call)
+                    erase!(call)
                 end
             end
         end
 
         # all deferred compilations should have been resolved
         @compiler_assert isempty(uses(dyn_marker)) job
-        unsafe_delete!(ir, dyn_marker)
+        erase!(dyn_marker)
     end
 
     if libraries

src/gcn.jl

@@ -82,19 +82,19 @@ function lower_throw_extra!(mod::LLVM.Module)
                     # remove the call
                     nargs = length(parameters(f))
                     call_args = arguments(call)
-                    unsafe_delete!(LLVM.parent(call), call)
+                    erase!(LLVM.parent(call), call)
 
                     # HACK: kill the exceptions' unused arguments
                     for arg in call_args
                         # peek through casts
                         if isa(arg, LLVM.AddrSpaceCastInst)
                             cast = arg
                             arg = first(operands(cast))
-                            isempty(uses(cast)) && unsafe_delete!(LLVM.parent(cast), cast)
+                            isempty(uses(cast)) && erase!(cast)
                         end
 
                         if isa(arg, LLVM.Instruction) && isempty(uses(arg))
-                            unsafe_delete!(LLVM.parent(arg), arg)
+                            erase!(arg)
                         end
                     end
 

src/irgen.jl

@@ -30,7 +30,7 @@ function irgen(@nospecialize(job::CompilerJob))
             # TODO: Do we need to remove these?
             if job.config.entry_abi === :specfunc
                 if startswith(LLVM.name(llvmf), "jfptr_")
-                    unsafe_delete!(mod, llvmf)
+                    erase!(llvmf)
                 end
             end
         end
@@ -39,7 +39,7 @@ function irgen(@nospecialize(job::CompilerJob))
         if Sys.iswindows() && "__julia_personality" in functions(mod)
             llvmf = functions(mod)["__julia_personality"]
             @compiler_assert isempty(uses(llvmf)) job
-            unsafe_delete!(mod, llvmf)
+            erase!(llvmf)
         end
     end
 
@@ -172,7 +172,7 @@ function lower_throw!(mod::LLVM.Module)
 
                 # remove the call
                 call_args = arguments(call)
-                unsafe_delete!(LLVM.parent(call), call)
+                erase!(call)
 
                 # HACK: kill the exceptions' unused arguments
                 #       this is needed for throwing objects with @nospecialize constructors.
@@ -181,11 +181,11 @@ function lower_throw!(mod::LLVM.Module)
                     if isa(arg, LLVM.AddrSpaceCastInst)
                         cast = arg
                         arg = first(operands(cast))
-                        isempty(uses(cast)) && unsafe_delete!(LLVM.parent(cast), cast)
+                        isempty(uses(cast)) && erase!(cast)
                     end
 
                     if isa(arg, LLVM.Instruction) && isempty(uses(arg))
-                        unsafe_delete!(LLVM.parent(arg), arg)
+                        erase!(arg)
                     end
                 end
 
@@ -477,7 +477,7 @@ function lower_byval(@nospecialize(job::CompilerJob), mod::LLVM.Module, f::LLVM.
     fn = LLVM.name(f)
     @assert isempty(uses(f))
     replace_metadata_uses!(f, new_f)
-    unsafe_delete!(mod, f)
+    erase!(f)
     LLVM.name!(new_f, fn)
 
     return new_f
@@ -644,7 +644,7 @@ function add_kernel_state!(mod::LLVM.Module)
             end
         end
         replace_metadata_uses!(f, workmap[f])
-        unsafe_delete!(mod, f)
+        erase!(f)
     end
 
     # update uses of the new function, modifying call sites to include the kernel state
@@ -678,7 +678,7 @@ function add_kernel_state!(mod::LLVM.Module)
 
                     replace_uses!(val, new_val)
                     @assert isempty(uses(val))
-                    unsafe_delete!(LLVM.parent(val), val)
+                    erase!(val)
                 elseif val isa LLVM.CallBase
                     # the function is being passed as an argument. to avoid having to
                     # rewrite the target function, instead case the rewritten function to
@@ -700,7 +700,7 @@ function add_kernel_state!(mod::LLVM.Module)
 
                     replace_uses!(val, new_val)
                     @assert isempty(uses(val))
-                    unsafe_delete!(LLVM.parent(val), val)
+                    erase!(val)
                 elseif val isa LLVM.StoreInst
                     # the function is being stored, which again we'll permit like before.
                 elseif val isa ConstantExpr
@@ -761,7 +761,7 @@ function lower_kernel_state!(fun::LLVM.Function)
                 replace_uses!(inst, state_arg)
 
                 @assert isempty(uses(inst))
-                unsafe_delete!(LLVM.parent(inst), inst)
+                erase!(inst)
 
                 changed = true
             end
@@ -781,7 +781,7 @@ function cleanup_kernel_state!(mod::LLVM.Module)
         intr = functions(mod)["julia.gpu.state_getter"]
         if isempty(uses(intr))
             # if we're not emitting a kernel, we can't resolve the intrinsic to an argument.
-            unsafe_delete!(mod, intr)
+            erase!(intr)
             changed = true
         end
     end

src/mcgen.jl

@@ -51,7 +51,7 @@ function resolve_cpu_references!(mod::LLVM.Module)
                     elseif isa(val, LLVM.LoadInst)
                         # resolve
                         replace_uses!(val, dereferenced)
-                        unsafe_delete!(LLVM.parent(val), val)
+                        erase!(val)
                         # FIXME: iterator invalidation?
                         changed = true
                     end

src/metal.jl

@@ -290,7 +290,7 @@ function add_address_spaces!(@nospecialize(job::CompilerJob), mod::LLVM.Module,
     fn = LLVM.name(f)
     @assert isempty(uses(f))
     replace_metadata_uses!(f, new_f)
-    unsafe_delete!(mod, f)
+    erase!(f)
     LLVM.name!(new_f, fn)
 
     # clean-up after this pass (which runs after optimization)
@@ -384,7 +384,7 @@ function pass_by_reference!(@nospecialize(job::CompilerJob), mod::LLVM.Module, f
     # NOTE: if we ever have legitimate uses of the old function, create a shim instead
     fn = LLVM.name(f)
     @assert isempty(uses(f))
-    unsafe_delete!(mod, f)
+    erase!(f)
     LLVM.name!(new_f, fn)
 
     return new_f
@@ -432,7 +432,7 @@ function argument_type_name(typ)
     elseif typ isa LLVM.IntegerType && width(typ) == 32
         "uint"
     elseif typ isa LLVM.VectorType
-         argument_type_name(eltype(typ)) * string(Int(size(typ)))
+         argument_type_name(eltype(typ)) * string(Int(length(typ)))
     else
         error("Cannot encode unknown type `$typ`")
     end
@@ -551,7 +551,7 @@ function add_input_arguments!(@nospecialize(job::CompilerJob), mod::LLVM.Module,
 
                     replace_uses!(val, new_val)
                     @assert isempty(uses(val))
-                    unsafe_delete!(LLVM.parent(val), val)
+                    erase!(val)
                 elseif val isa LLVM.ConstantExpr && opcode(val) == LLVM.API.LLVMBitCast
                     # XXX: why isn't this caught by the value materializer above?
                     target = operands(val)[1]
@@ -575,7 +575,7 @@ function add_input_arguments!(@nospecialize(job::CompilerJob), mod::LLVM.Module,
     for (f, new_f) in workmap
         rewrite_uses!(f, new_f)
         @assert isempty(uses(f))
-        unsafe_delete!(mod, f)
+        erase!(f)
     end
 
     # replace uses of the intrinsics with references to the input arguments
@@ -591,10 +591,10 @@ function add_input_arguments!(@nospecialize(job::CompilerJob), mod::LLVM.Module,
             end
 
             @assert isempty(uses(val))
-            unsafe_delete!(LLVM.parent(val), val)
+            erase!(val)
         end
         @assert isempty(uses(intr))
-        unsafe_delete!(mod, intr)
+        erase!(intr)
     end
 
     return
@@ -820,7 +820,7 @@ function lower_llvm_intrinsics!(@nospecialize(job::CompilerJob), fun::LLVM.Funct
             "llvm.assume"
         ])
         if intr in unsupported_intrinsics
-            unsafe_delete!(bb, call)
+            erase!(call)
             changed = true
         end
 
@@ -854,7 +854,7 @@ function lower_llvm_intrinsics!(@nospecialize(job::CompilerJob), fun::LLVM.Funct
                 elseif typ == LLVM.DoubleType()
                     "f64"
                 elseif typ isa LLVM.VectorType
-                    "v$(size(typ))$(type_suffix(eltype(typ)))"
+                    "v$(length(typ))$(type_suffix(eltype(typ)))"
                 else
                     error("Unsupported intrinsic type: $typ")
                 end
@@ -877,7 +877,7 @@ function lower_llvm_intrinsics!(@nospecialize(job::CompilerJob), fun::LLVM.Funct
 
                 new_value = call!(builder, call_ft, new_intr, arguments(call))
                 replace_uses!(call, new_value)
-                unsafe_delete!(bb, call)
+                erase!(call)
                 changed = true
             end
         end
@@ -915,7 +915,7 @@ function lower_llvm_intrinsics!(@nospecialize(job::CompilerJob), fun::LLVM.Funct
 
                 new_value = bitcast!(builder, new_value, typ)
                 replace_uses!(call, new_value)
-                unsafe_delete!(bb, call)
+                erase!(call)
                 changed = true
             end
         end
@@ -1032,7 +1032,7 @@ function lower_llvm_intrinsics!(@nospecialize(job::CompilerJob), fun::LLVM.Funct
 
                 new_value = call!(builder, call_ft, new_intr, arguments(call))
                 replace_uses!(call, new_value)
-                unsafe_delete!(bb, call)
+                erase!(call)
                 changed = true
             end
         end
@@ -1134,7 +1134,7 @@ function replace_unreachable!(@nospecialize(job::CompilerJob), f::LLVM.Function)
             br!(builder, return_block)
 
             # move the return
-            delete!(exit_block, ret)
+            remove!(ret)
             position!(builder, return_block)
             insert!(builder, ret)
         end
@@ -1159,13 +1159,13 @@ function replace_unreachable!(@nospecialize(job::CompilerJob), f::LLVM.Function)
             # remove preceding traps to avoid reconstructing unreachable control flow
             prev = previnst(unreachable)
             if isa(prev, LLVM.CallInst) && name(called_operand(prev)) == "llvm.trap"
-                unsafe_delete!(bb, prev)
+                erase!(prev)
             end
 
             # replace the unreachable with a branch to the return block
             position!(builder, unreachable)
             br!(builder, return_block)
-            unsafe_delete!(bb, unreachable)
+            erase!(unreachable)
 
             # patch up any phi nodes in the return block
             for inst in instructions(return_block)

src/optim.jl

@@ -324,10 +324,10 @@ function cpu_features!(mod::LLVM.Module)
         # remove the intrinsic and its uses
         for val in materialized
             @assert isempty(uses(val))
-            unsafe_delete!(LLVM.parent(val), val)
+            erase!(val)
         end
         @assert isempty(uses(f))
-        unsafe_delete!(mod, f)
+        erase!(f)
     end
 
     return changed
@@ -368,7 +368,7 @@ function lower_gc_frame!(fun::LLVM.Function)
                 replace_uses!(call, ptr)
             end
 
-            unsafe_delete!(LLVM.parent(call), call)
+            erase!(call)
 
             changed = true
         end
@@ -382,7 +382,7 @@ function lower_gc_frame!(fun::LLVM.Function)
 
         for use in uses(barrier)
             call = user(use)::LLVM.CallInst
-            unsafe_delete!(LLVM.parent(call), call)
+            erase!(call)
             changed = true
         end
 
@@ -412,7 +412,7 @@ function lower_ptls!(mod::LLVM.Module)
         for use in uses(ptls_getter)
             val = user(use)
             if isempty(uses(val))
-                unsafe_delete!(LLVM.parent(val), val)
+                erase!(val)
                 changed = true
             else
                 # the validator will detect this

src/ptx.jl

@@ -471,12 +471,12 @@ function nvvm_reflect!(fun::LLVM.Function)
     # remove the calls to the function
     for val in to_remove
         @assert isempty(uses(val))
-        unsafe_delete!(LLVM.parent(val), val)
+        erase!(val)
     end
 
     # maybe also delete the function
     if isempty(uses(reflect_function))
-        unsafe_delete!(mod, reflect_function)
+        erase!(reflect_function)
     end
 
     end

src/rtlib.jl

@@ -3,7 +3,7 @@
 link_library!(mod::LLVM.Module, lib::LLVM.Module) = link_library!(mod, [lib])
 function link_library!(mod::LLVM.Module, libs::Vector{LLVM.Module})
     # linking is destructive, so copy the libraries
-    libs = [LLVM.Module(lib) for lib in libs]
+    libs = [copy(lib) for lib in libs]
 
     for lib in libs
         link!(mod, lib)
@@ -34,7 +34,7 @@ function LLVM.call!(builder, rt::Runtime.RuntimeMethodInstance, args=LLVM.Value[
     if !isdeclaration(f) && (rt.name !== :gc_pool_alloc && rt.name !== :report_exception)
         # XXX: uses of the gc_pool_alloc intrinsic can be introduced _after_ the runtime
         #      is linked, as part of the lower_gc_frame! optimization pass.
-        # XXX: report_exception can also be used after the runtime is linked during 
+        # XXX: report_exception can also be used after the runtime is linked during
         #      CUDA/Enzyme nested compilation
         error("Calling an intrinsic function that clashes with an existing definition: ",
                string(ft), " ", rt.name)
@@ -89,7 +89,7 @@ function emit_function!(mod, config::CompilerConfig, f, method)
         decl = functions(mod)[name]
         @assert value_type(decl) == value_type(entry)
         replace_uses!(decl, entry)
-        unsafe_delete!(mod, decl)
+        erase!(decl)
     end
     LLVM.name!(entry, name)
 end