Use stacked method tables (#325)

Co-authored-by: Tim Besard <tim.besard@gmail.com>

Author: vchuravy

Project.toml

@@ -22,7 +22,7 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 [compat]
 Adapt = "4"
 GPUArrays = "11.2.1"
-GPUCompiler = "1.2"
+GPUCompiler = "1.6"
 KernelAbstractions = "0.9.2"
 LLVM = "9.1"
 LinearAlgebra = "1"
@@ -31,7 +31,7 @@ Preferences = "1"
 Printf = "1"
 Random = "1"
 Reexport = "1"
-SPIRVIntrinsics = "0.3"
+SPIRVIntrinsics = "0.4"
 SPIRV_LLVM_Backend_jll = "20"
 SPIRV_Tools_jll = "2025.1"
 StaticArrays = "1"

lib/intrinsics/Project.toml

@@ -1,7 +1,7 @@
 name = "SPIRVIntrinsics"
 uuid = "71d1d633-e7e8-4a92-83a1-de8814b09ba8"
 authors = ["Tim Besard <tim.besard@gmail.com>"]
-version = "0.3.0"
+version = "0.4.0"
 
 [deps]
 ExprTools = "e2ba6199-217a-4e67-a87a-7c52f15ade04"

lib/intrinsics/src/SPIRVIntrinsics.jl

@@ -32,6 +32,8 @@ macro import_all()
         # bring all the names of this module in scope
         name in (:SPIRVIntrinsics, :eval, :include) && continue
         startswith(string(name), "#") && continue
+        string(name) == "method_table" && continue
+        # XXX: use `export` or `@public` to denote names to re-export
         push!(code.args, :(using .SPIRVIntrinsics: $name))
     end
 

lib/intrinsics/src/utils.jl

@@ -85,7 +85,7 @@ Base.Experimental.@MethodTable(method_table)
 
 macro device_override(ex)
     esc(quote
-        Base.Experimental.@overlay($method_table, $ex)
+        Base.Experimental.@overlay(method_table, $ex)
     end)
 end
 

src/OpenCL.jl

@@ -20,6 +20,7 @@ export cl
 import SPIRVIntrinsics
 SPIRVIntrinsics.@import_all
 SPIRVIntrinsics.@reexport_public
+Base.Experimental.@MethodTable(method_table)
 include("device/runtime.jl")
 include("device/array.jl")
 include("device/quirks.jl")

src/OpenCLKernels.jl

@@ -1,7 +1,7 @@
 module OpenCLKernels
 
 using ..OpenCL
-using ..OpenCL: @device_override, SPIRVIntrinsics
+using ..OpenCL: @device_override, SPIRVIntrinsics, method_table
 
 import KernelAbstractions as KA
 

src/compiler/compilation.jl

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