Adapt to GPUCompiler.jl, and other small updates. (#250)

Author: maleadt

Manifest.toml

@@ -2,7 +2,7 @@
 
 julia_version = "1.8.5"
 manifest_format = "2.0"
-project_hash = "9206e977fd7a0d0123a23a6a0d71272cf3d18214"
+project_hash = "2b849e584a3386ec6e79f84d9924e491f668436f"
 
 [[deps.Adapt]]
 deps = ["LinearAlgebra", "Requires"]
@@ -79,9 +79,9 @@ version = "0.1.5"
 
 [[deps.GPUCompiler]]
 deps = ["ExprTools", "InteractiveUtils", "LLVM", "Libdl", "Logging", "Scratch", "TimerOutputs", "UUIDs"]
-git-tree-sha1 = "8de395b1243771bbb79ac832ec96c7def7a4586f"
+git-tree-sha1 = "8573c39f9c4e99720ab5ea44104efb3ed07a58b0"
 uuid = "61eb1bfa-7361-4325-ad38-22787b887f55"
-version = "0.22.0"
+version = "0.23.0"
 
 [[deps.InteractiveUtils]]
 deps = ["Markdown"]

Project.toml

@@ -28,7 +28,7 @@ Adapt = "3"
 CEnum = "0.4"
 ExprTools = "0.1"
 GPUArrays = "8.4"
-GPUCompiler = "0.20, 0.21, 0.22"
+GPUCompiler = "0.23"
 KernelAbstractions = "0.9.1"
 LLVM = "6"
 Metal_LLVM_Tools_jll = "~0.5"
@@ -44,3 +44,6 @@ SpecialFunctionsExt = "SpecialFunctions"
 
 [weakdeps]
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
+
+[extras]
+SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"

src/compiler/reflection.jl

@@ -153,9 +153,7 @@ end
 
 function disassemble(io::IO, path)
     disassembler = joinpath(only(readdir(artifact"applegpu"; join=true)), "disassemble.py")
-    python() do python_path
-        run(pipeline(`$python_path $disassembler $path`, stdout=io))
-    end
+    run(pipeline(`$(python()) $disassembler $path`, stdout=io))
     return
 end
 
@@ -230,10 +228,6 @@ function return_type(@nospecialize(func), @nospecialize(tt))
     config = compiler_config(current_device())
     job = CompilerJob(source, config)
     interp = GPUCompiler.get_interpreter(job)
-    if VERSION >= v"1.8-"
-        sig = Base.signature_type(func, tt)
-        Core.Compiler.return_type(interp, sig)
-    else
-        Core.Compiler.return_type(interp, func, tt)
-    end
+    sig = Base.signature_type(func, tt)
+    Core.Compiler.return_type(interp, sig)
 end

src/device/utils.jl

@@ -3,12 +3,8 @@ Base.Experimental.@MethodTable(method_table)
 
 macro device_override(ex)
     ex = macroexpand(__module__, ex)
-    if Meta.isexpr(ex, :call)
-        ex = eval(ex)
-        error()
-    end
     esc(quote
-        $GPUCompiler.@override($method_table, $ex)
+        Base.Experimental.@overlay($method_table, $ex)
     end)
 end
 

test/runtests.jl

@@ -42,7 +42,8 @@ do_quickfail, _ = extract_flag!(ARGS, "--quickfail")
 
 include("setup.jl")     # make sure everything is precompiled
 @info "System information:\n" * sprint(io->Metal.versioninfo(io))
-metallib_as_version = Metal.Metal_LLVM_Tools_jll.Metal_LLVM_Tools_jll.metallib_as() do metallib_as
+metallib_as_version = let
+    metallib_as = Metal.Metal_LLVM_Tools_jll.Metal_LLVM_Tools_jll.metallib_as()
     read(`$metallib_as --version`, String)
 end
 @info "Using Metal LLVM back-end from $(dirname(Metal.Metal_LLVM_Tools_jll.Metal_LLVM_Tools_jll.metallib_as_path)):\n" * metallib_as_version
@@ -354,11 +355,7 @@ for (testname, (resp,)) in results
     elseif isa(resp, Tuple{Int,Int})
         fake = Test.DefaultTestSet(testname)
         for i in 1:resp[1]
-            if VERSION >= v"1.7-"
-                Test.record(fake, Test.Pass(:test, nothing, nothing, nothing, nothing))
-            else
-                Test.record(fake, Test.Pass(:test, nothing, nothing, nothing))
-            end
+            Test.record(fake, Test.Pass(:test, nothing, nothing, nothing, nothing))
         end
         for i in 1:resp[2]
             Test.record(fake, Test.Broken(:test, nothing))
@@ -372,11 +369,7 @@ for (testname, (resp,)) in results
         println()
         fake = Test.DefaultTestSet(testname)
         for i in 1:resp.captured.ex.pass
-            if VERSION >= v"1.7-"
-                Test.record(fake, Test.Pass(:test, nothing, nothing, nothing, nothing))
-            else
-                Test.record(fake, Test.Pass(:test, nothing, nothing, nothing))
-            end
+            Test.record(fake, Test.Pass(:test, nothing, nothing, nothing, nothing))
         end
         for i in 1:resp.captured.ex.broken
             Test.record(fake, Test.Broken(:test, nothing))