with proper interpolation

Author: vchuravy

src/KernelAbstractions.jl

@@ -50,7 +50,7 @@ synchronize(backend)
 ```
 """
 macro kernel(expr)
-    return __kernel(expr, #=generate_cpu=# true, #=force_inbounds=# false, #=unsafe_indices=# false, #=generated=# false)
+    return __kernel(__module__, expr, #=generate_cpu=# true, #=force_inbounds=# false, #=unsafe_indices=# false, #=generated=# false)
 end
 
 """
@@ -69,7 +69,7 @@ This allows for two different configurations:
 """
 macro kernel(ex...)
     if length(ex) == 1
-        return __kernel(ex[1], true, false, false, false)
+        return __kernel(__module__, ex[1], true, false, false, false)
     else
         generate_cpu = true
         unsafe_indices = false
@@ -99,7 +99,7 @@ macro kernel(ex...)
                 )
             end
         end
-        return __kernel(ex[end], generate_cpu, force_inbounds, unsafe_indices, generated)
+        return __kernel(__module__, ex[end], generate_cpu, force_inbounds, unsafe_indices, generated)
     end
 end
 

src/macros.jl

@@ -10,7 +10,7 @@ function find_return(stmt)
 end
 
 # XXX: Proper errors
-function __kernel(expr, generate_cpu = true, force_inbounds = false, unsafe_indices = false, generated = false)
+function __kernel(__module__, expr, generate_cpu = true, force_inbounds = false, unsafe_indices = false, generated = false)
     def = splitdef(expr)
     name = def[:name]
     args = def[:args]
@@ -42,7 +42,9 @@ function __kernel(expr, generate_cpu = true, force_inbounds = false, unsafe_indi
         def_cpu[:name] = cpu_name
         transform_cpu!(def_cpu, constargs, force_inbounds)
         if generated
-            def_cpu[:body] = Expr(:if, Expr(:generated), Expr(:copyast, QuoteNode(def_cpu[:body])), Expr(:meta, :generated_only))
+            # Use macroexpand to perform the annoying work of interpolating `$` exprs
+            body = macroexpand(__module__, Expr(:quote, def_cpu[:body]), recursive = false)
+            def_cpu[:body] = Expr(:if, Expr(:generated), body, Expr(:meta, :generated_only))
         end
         cpu_function = combinedef(def_cpu)
     end
@@ -51,7 +53,9 @@ function __kernel(expr, generate_cpu = true, force_inbounds = false, unsafe_indi
     def_gpu[:name] = gpu_name = Symbol(:gpu_, name)
     transform_gpu!(def_gpu, constargs, force_inbounds, unsafe_indices)
     if generated
-        def_gpu[:body] = Expr(:if, Expr(:generated), Expr(:copyast, QuoteNode(def_gpu[:body])), Expr(:meta, :generated_only))
+        # Use macroexpand to perform the annoying work of interpolating `$` exprs
+        body = macroexpand(__module__, Expr(:quote, def_gpu[:body]), recursive = false)
+        def_gpu[:body] = Expr(:if, Expr(:generated), body, Expr(:meta, :generated_only))
     end
     gpu_function = combinedef(def_gpu)