Adapt to changes in GPUCompiler v1.3

Author: giordano

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.34"
+version = "0.13.35"
 
 [deps]
 CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
@@ -41,7 +41,7 @@ ChainRulesCore = "1"
 EnzymeCore = "0.8.8"
 Enzyme_jll = "0.0.173"
 GPUArraysCore = "0.1.6, 0.2"
-GPUCompiler = "0.21, 0.22, 0.23, 0.24, 0.25, 0.26, 0.27, 1"
+GPUCompiler = "1.3"
 LLVM = "6.1, 7, 8, 9"
 LogExpFunctions = "0.3"
 ObjectFile = "0.4"

src/compiler.jl

@@ -379,10 +379,10 @@ function nested_codegen!(
 
     target = DefaultCompilerTarget()
     params = PrimalCompilerParams(mode)
-    job = CompilerJob(funcspec, CompilerConfig(target, params; kernel = false), world)
+    job = CompilerJob(funcspec, CompilerConfig(target, params; kernel = false, libraries=true, toplevel=true, optimize=false, cleanup=false, only_entry=false, validate=false), world)
 
     GPUCompiler.prepare_job!(job)
-    otherMod, meta = GPUCompiler.emit_llvm(job; libraries=true, toplevel=true, optimize=false, cleanup=false, only_entry=false, validate=false)
+    otherMod, meta = GPUCompiler.emit_llvm(job)
 
     prepare_llvm(otherMod, job, meta)
 
@@ -3477,9 +3477,20 @@ function GPUCompiler.codegen(
     if parent_job === nothing
         primal_target = DefaultCompilerTarget()
         primal_params = PrimalCompilerParams(mode)
+        config2 = CompilerConfig(
+            primal_target,
+            primal_params;
+            kernel = false,
+            libraries=true,
+            toplevel=toplevel,
+            optimize=false,
+            cleanup=false,
+            only_entry=false,
+            validate=false
+        )
         primal_job = CompilerJob(
             primal,
-            CompilerConfig(primal_target, primal_params; kernel = false),
+            config2,
             job.world,
         )
     else
@@ -3490,12 +3501,18 @@ function GPUCompiler.codegen(
             parent_job.config.entry_abi,
             parent_job.config.name,
             parent_job.config.always_inline,
+            libraries=true,
+            toplevel=toplevel,
+            optimize=false,
+            cleanup=false,
+            only_entry=false,
+            validate=false,
         )
         primal_job = CompilerJob(primal, config2, job.world) # TODO EnzymeInterp params, etc
     end
 
     GPUCompiler.prepare_job!(primal_job)
-    mod, meta = GPUCompiler.emit_llvm(primal_job; libraries=true, toplevel=toplevel, optimize=false, cleanup=false, only_entry=false, validate=false)
+    mod, meta = GPUCompiler.emit_llvm(primal_job)
     edges = Any[]
     mod_to_edges[mod] = edges
 

src/sugar.jl

@@ -19,10 +19,10 @@ end
         target = Compiler.DefaultCompilerTarget()
         params = Compiler.PrimalCompilerParams(API.DEM_ForwardMode)
         mi = my_methodinstance(nothing, fn, Tuple{T, Int})
-        job = GPUCompiler.CompilerJob(mi, GPUCompiler.CompilerConfig(target, params; kernel = false))
+        job = GPUCompiler.CompilerJob(mi, GPUCompiler.CompilerConfig(target, params; kernel = false, libraries=true, toplevel=true, optimize=false, cleanup=false, only_entry=false, validate=false))
 
         GPUCompiler.prepare_job!(job)
-        mod, meta = GPUCompiler.emit_llvm(job; libraries=true, toplevel=true, optimize=false, cleanup=false, only_entry=false, validate=false)
+        mod, meta = GPUCompiler.emit_llvm(job)
 
         copysetfn = meta.entry
         blk = first(LLVM.blocks(copysetfn))