update for GPUCompiler by removing the deprecated API

Author: kylincaster

src/StaticCompiler.jl

@@ -452,9 +452,9 @@ function static_llvm_module(f, tt, name=fix_name(f); demangle=true, target::Stat
     if !demangle
         name = "julia_"*name
     end
-    job, kwargs = static_job(f, tt; name, target, kwargs...)
+    job, kwargs = static_job(f, tt; name, target, strip=true, only_entry=false, validate=false, libraries=false, kwargs...)
     m = GPUCompiler.JuliaContext() do context
-        m, _ = GPUCompiler.codegen(:llvm, job; strip=true, only_entry=false, validate=false, libraries=false)
+        m, _ = GPUCompiler.compile(:llvm, job; kwargs...)
         locate_pointers_and_runtime_calls(m)
         m
     end
@@ -469,17 +469,17 @@ function static_llvm_module(funcs::Union{Array,Tuple}; demangle=true, target::St
         if !demangle
             name_f = "julia_"*name_f
         end
-        job, kwargs = static_job(f, tt; name = name_f, target, kwargs...)
-        mod,_ = GPUCompiler.codegen(:llvm, job; strip=true, only_entry=false, validate=false, libraries=false)
+        job, kwargs = static_job(f, tt; name = name_f, target, strip=true, only_entry=false, validate=false, libraries=false, kwargs...)
+        mod,_ = GPUCompiler.compile(:llvm, job; kwargs...)
         if length(funcs) > 1
             for func in funcs[2:end]
                 f,tt = func
                 name_f = fix_name(f)
                 if !demangle
                     name_f = "julia_"*name_f
                 end
-                job, kwargs = static_job(f, tt; name = name_f, target, kwargs...)
-                tmod,_ = GPUCompiler.codegen(:llvm, job; strip=true, only_entry=false, validate=false, libraries=false)
+                job, kwargs = static_job(f, tt; name = name_f, target, strip=true, only_entry=false, validate=false, libraries=false, kwargs...)
+                tmod,_ = GPUCompiler.compile(:llvm, job; kwargs...)
                 link!(mod,tmod)
             end
         end

src/interpreter.jl

@@ -93,9 +93,9 @@ function Core.Compiler.InferenceState(result::InferenceResult, cache::Symbol, in
     mi = result.linfo
     src = custom_pass!(interp, result, mi, src)
     src === nothing && return @static if VERSION < v"1.11"
-        Core.Compiler.maybe_validate_code(result.linfo, src, "lowered")
-    else
         Core.Compiler.validate_code_in_debug_mode(result.linfo, src, "lowered")
+    else
+        Core.Compiler.maybe_validate_code(result.linfo, src, "lowered")
     end
     return InferenceState(result, src, cache, interp)
 end

src/target.jl

@@ -102,20 +102,6 @@ end
 GPUCompiler.method_table(@nospecialize(job::GPUCompiler.CompilerJob{<:StaticCompilerTarget})) = job.config.target.method_table
 
 
-function static_job(@nospecialize(func::Function), @nospecialize(types::Type);
-        name = fix_name(func),
-        kernel::Bool = false,
-        target::StaticTarget = StaticTarget(),
-        method_table=method_table,
-        kwargs...
-    )
-    source = methodinstance(typeof(func), Base.to_tuple_type(types))
-    tm = target.tm
-    gputarget = StaticCompilerTarget(LLVM.triple(tm), LLVM.cpu(tm), LLVM.features(tm), target.julia_runtime, method_table)
-    params = StaticCompilerParams()
-    config = GPUCompiler.CompilerConfig(gputarget, params, name = name, kernel = kernel)
-    StaticCompiler.CompilerJob(source, config), kwargs
-end
 function static_job(@nospecialize(func), @nospecialize(types);
     name = fix_name(func),
     kernel::Bool = false,
@@ -127,6 +113,11 @@ function static_job(@nospecialize(func), @nospecialize(types);
     tm = target.tm
     gputarget = StaticCompilerTarget(LLVM.triple(tm), LLVM.cpu(tm), LLVM.features(tm), target.julia_runtime, method_table)
     params = StaticCompilerParams()
-    config = GPUCompiler.CompilerConfig(gputarget, params, name = name, kernel = kernel)
-    StaticCompiler.CompilerJob(source, config), kwargs
+    @static if pkgversion(GPUCompiler) < v"1"
+        config = GPUCompiler.CompilerConfig(gputarget, params; name = name, kernel = kernel)
+        return StaticCompiler.CompilerJob(source, config), kwargs
+    else
+        config = GPUCompiler.CompilerConfig(gputarget, params; name = name, kernel = kernel, kwargs...)
+        return StaticCompiler.CompilerJob(source, config), Dict{}()
+    end
 end