More 1.11 stuff (#2015)

* More 1.11 stuff * fixup
EnzymeAD · Oct 28, 2024 · ecd490c · ecd490c
1 parent cdee028
commit ecd490c
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 6 deletions.
diff --git a/src/compiler.jl b/src/compiler.jl
@@ -1615,8 +1615,8 @@ function julia_error(
                 legal2, obj = absint(cur)
 
                 # Only do so for the immediate operand/etc to a phi, since otherwise we will make multiple
-                if legal2 &&
-                   active_reg_inner(TT, (), world) == ActiveState &&
+                if legal2
+                   if active_reg_inner(TT, (), world) == ActiveState &&
                    isa(cur, LLVM.ConstantExpr) &&
                    cur == data2
                     if width == 1
@@ -1634,6 +1634,14 @@ function julia_error(
                         end
                         return shadowres
                     end
+                    end
+
+@static if VERSION < v"1.11-"
+else    
+                    if obj isa Memory && obj == typeof(obj).instance
+                        return make_batched(ncur, prevbb)
+                    end
+end
                 end
 
                 badval = if legal2
@@ -1652,10 +1660,8 @@ function julia_error(
             if isa(cur, LLVM.UndefValue)
                 return make_batched(ncur, prevbb)
             end
-            @static if LLVM.version() >= v"12"
-                if isa(cur, LLVM.PoisonValue)
-                    return make_batched(ncur, prevbb)
-                end
+            if isa(cur, LLVM.PoisonValue)
+                return make_batched(ncur, prevbb)
             end
             if isa(cur, LLVM.ConstantAggregateZero)
                 return make_batched(ncur, prevbb)
@@ -1794,6 +1800,18 @@ function julia_error(
                     return shadowres
                 end
             end
+
+            if isa(cur, LLVM.LoadInst) || isa(cur, LLVM.BitCastInst) || isa(cur, LLVM.AddrSpaceCastInst) || (isa(cur, LLVM.GetElementPtrInst) && all(x->isa(x, LLVM.ConstantInt), operands(cur)[2:end]))
+                lhs = make_replacement(operands(cur)[1], prevbb)
+                if illegal
+                    return ncur
+                end
+                if lhs == operands(ncur)[1]
+                    return make_batched(ncur, prevbb)
+                elseif width != 1 && isa(lhs, LLVM.InsertValueInst) && operands(lhs)[2] == operands(ncur)[1]
+                    return make_batched(ncur, prevbb)
+                end
+            end
 
             if isa(cur, LLVM.PHIInst)
                 Bphi = IRBuilder()
@@ -6322,6 +6340,14 @@ function GPUCompiler.codegen(
 
         func = mi.specTypes.parameters[1]
 
+@static if VERSION < v"1.11-"
+else
+        if func == typeof(Core.memoryref)
+            attributes = function_attributes(llvmfn)
+            push!(attributes, EnumAttribute("alwaysinline", 0))
+        end
+end
+
         meth = mi.def
         name = meth.name
         jlmod = meth.module

diff --git a/src/compiler/interpreter.jl b/src/compiler/interpreter.jl
@@ -111,6 +111,11 @@ end
 
 function is_alwaysinline_func(@nospecialize(TT))
     isa(TT, DataType) || return false
+    @static if VERSION ≥ v"1.11-"
+    if TT.parameters[1] == typeof(Core.memoryref)
+        return true
+    end
+    end
     return false
 end
 

diff --git a/test/abi.jl b/test/abi.jl
@@ -590,5 +590,23 @@ end
 
     Enzyme.autodiff(Forward, byrefs, BatchDuplicated([1.0], ([1.0], [1.0])), BatchDuplicated([1.0], ([1.0], [1.0]) ) )
 end
+
+function myunique0()
+    return Vector{Float64}(undef, 0)
+end
+@static if VERSION < v"1.11-"
+@testset "Forward mode array construct" begin
+    autodiff(Forward, myunique0, Duplicated)
+end
+else
+function myunique()
+    m = Memory{Float64}.instance
+    return Core.memoryref(m)
+end
+@testset "Forward mode array construct" begin
+    autodiff(Forward, myunique, Duplicated)
+    autodiff(Forward, myunique0, Duplicated)
+end
+end
 
 include("usermixed.jl")