cleanup

Author: vchuravy

Project.toml

@@ -33,13 +33,13 @@ Adapt = "4"
 CEnum = "0.4, 0.5"
 ExprTools = "0.1"
 GPUArrays = "11.2.1"
-GPUCompiler = "1.5"
+GPUCompiler = "1.6"
 GPUToolbox = "0.1, 0.2"
 KernelAbstractions = "0.9.1"
 LLVM = "6, 7, 8, 9"
 NEO_jll = "=24.26.30049"
 Preferences = "1"
-SPIRVIntrinsics = "0.2"
+SPIRVIntrinsics = "0.4"
 SPIRV_LLVM_Translator_jll = "20"
 SpecialFunctions = "1.3, 2"
 StaticArrays = "1"
@@ -49,7 +49,3 @@ oneAPI_Support_jll = "0.8"
 
 [extras]
 libigc_jll = "94295238-5935-5bd7-bb0f-b00942e9bdd5"
-
-[sources]
-GPUCompiler = {url="https://github.com/JuliaGPU/GPUCompiler.jl", rev="vc/mtv"}
-SPIRVIntrinsics = {url="https://github.com/JuliaGPU/OpenCL.jl", rev="vc/mtv", subdir="lib/intrinsics"}

src/compiler/compilation.jl

@@ -6,7 +6,7 @@ const oneAPICompilerJob = CompilerJob{SPIRVCompilerTarget,oneAPICompilerParams}
 
 GPUCompiler.runtime_module(::oneAPICompilerJob) = oneAPI
 
-GPUCompiler.method_table_view(job::oneAPICompilerJob) = GPUCompiler.StackedMethodTable(job.world, method_table, spirv_method_table)
+GPUCompiler.method_table_view(job::oneAPICompilerJob) = GPUCompiler.StackedMethodTable(job.world, method_table, SPIRVIntrinsics.method_table)
 
 # filter out OpenCL built-ins
 # TODO: eagerly lower these using the translator API

src/oneAPI.jl

@@ -26,38 +26,12 @@ using .oneL0
 functional() = oneL0.functional[]
 
 
-## device overrides
-
-# local method table for device functions
-Base.Experimental.@MethodTable(method_table)
-
-macro device_override(ex)
-    esc(quote
-        Base.Experimental.@overlay($method_table, $ex)
-    end)
-end
-
-macro device_function(ex)
-    ex = macroexpand(__module__, ex)
-    def = ExprTools.splitdef(ex)
-
-    # generate a function that errors
-    def[:body] = quote
-        error("This function is not intended for use on the CPU")
-    end
-
-    esc(quote
-        $(ExprTools.combinedef(def))
-        @device_override $ex
-    end)
-end
-
 # device functionality
 import SPIRVIntrinsics
 SPIRVIntrinsics.@import_all
 SPIRVIntrinsics.@reexport_public
-
-const spirv_method_table = SPIRVIntrinsics.method_table
+# local method table for device functions
+Base.Experimental.@MethodTable(method_table)
 
 include("device/runtime.jl")
 include("device/array.jl")

src/oneAPIKernels.jl

@@ -1,7 +1,7 @@
 module oneAPIKernels
 
 using ..oneAPI
-using ..oneAPI: @device_override
+using ..oneAPI: @device_override, method_table
 
 import KernelAbstractions as KA