Merge branch 'main' into gd/maxchunk

Author: gdalle

Project.toml

@@ -1,7 +1,7 @@
 name = "Enzyme"
 uuid = "7da242da-08ed-463a-9acd-ee780be4f1d9"
 authors = ["William Moses <wmoses@mit.edu>", "Valentin Churavy <vchuravy@mit.edu>"]
-version = "0.13.104"
+version = "0.13.105"
 
 [deps]
 CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"

src/compiler.jl

@@ -4804,6 +4804,7 @@ function no_type_setting(@nospecialize(specTypes::Type{<:Tuple}); world = nothin
 end
 
 const DumpPreCheck = Ref(false)
+const DumpPostCheck = Ref(false)
 const DumpPreOpt = Ref(false)
 
 function GPUCompiler.compile_unhooked(output::Symbol, job::CompilerJob{<:EnzymeTarget})
@@ -4883,6 +4884,9 @@ function GPUCompiler.compile_unhooked(output::Symbol, job::CompilerJob{<:EnzymeT
     end
     interp = GPUCompiler.get_interpreter(job)
     check_ir(interp, job, mod)
+    if DumpPostCheck[]
+        API.EnzymeDumpModuleRef(mod.ref)
+    end
 
     disableFallback = String[]
 

src/compiler/validation.jl

@@ -786,8 +786,8 @@ function check_ir!(interp, @nospecialize(job::CompilerJob), errors::Vector{IRErr
             fname = ops[2]
 
             if isa(flib, LLVM.LoadInst)
-                op, _ = get_base_and_offset(operands(flib)[1]; offsetAllowed=false, inttoptr=true)
-                
+                op, off = get_base_and_offset(operands(flib)[1]; inttoptr=true)
+            
                 if isa(op, LLVM.LoadInst)
                     pop, _ = get_base_and_offset(operands(op)[1]; offsetAllowed=false, inttoptr=true)
 
@@ -796,7 +796,7 @@ function check_ir!(interp, @nospecialize(job::CompilerJob), errors::Vector{IRErr
 
                         rep = zop
                         PT = value_type(rep)
-                        if isa(PT, LLVM.PointerType)
+                        if isa(PT, LLVM.PointerType) 
                             rep = LLVM.const_inttoptr(rep, LLVM.PointerType(eltype(PT)))
                             rep = LLVM.const_addrspacecast(rep, PT)
                             replace_uses!(pop, rep)
@@ -808,7 +808,10 @@ function check_ir!(interp, @nospecialize(job::CompilerJob), errors::Vector{IRErr
                 end
 
                 if isa(op, ConstantInt)
-                    rep = reinterpret(Ptr{Cvoid}, convert(Csize_t, op) + 8)
+	    	    @static if VERSION < v"1.12"
+			off += 8
+		    end
+                    rep = reinterpret(Ptr{Cvoid}, convert(Csize_t, op) + off)
                     ld = unsafe_load(convert(Ptr{Ptr{Cvoid}}, rep))
                     flib = Base.unsafe_pointer_to_objref(ld)
                 end
@@ -830,8 +833,8 @@ function check_ir!(interp, @nospecialize(job::CompilerJob), errors::Vector{IRErr
                fname = String(map(Base.Fix1(convert, UInt8), collect(fname)[1:(end-1)]))
             end
 
-            if !isa(fname, String) || !isa(flib, String)
-                return
+	    if !isa(fname, String) || !isa(flib, String)
+		return
             end
 
             found, replaceWith = try_import_llvmbc(mod, flib, fname, imported)
@@ -882,7 +885,7 @@ function check_ir!(interp, @nospecialize(job::CompilerJob), errors::Vector{IRErr
                             fname,
                         )
                     end
-                catch
+                catch e
                     nothing
                 end