Merge #35

35: add a block syntax for uniform r=vchuravy a=vchuravy

bors r+

Co-authored-by: Valentin Churavy <v.churavy@gmail.com>

Author: bors[bot]

src/macros.jl

@@ -119,12 +119,16 @@ function split(stmts)
 
     loops = WorkgroupLoop[]
     for stmt in stmts.args
-        if isexpr(stmt, :macrocall) && stmt.args[1] === Symbol("@synchronize")
-            loop = WorkgroupLoop(deepcopy(indicies), current, allocations)
-            push!(loops, loop)
-            allocations = Any[]
-            current     = Any[]
-            continue
+        if isexpr(stmt, :macrocall)
+            if stmt.args[1] === Symbol("@synchronize")
+                loop = WorkgroupLoop(deepcopy(indicies), current, allocations)
+                push!(loops, loop)
+                allocations = Any[]
+                current     = Any[]
+                continue
+            elseif stmt.args[1] === Symbol("@uniform")
+                push!(allocations, stmt)
+            end
         elseif isexpr(stmt, :(=))
             rhs = stmt.args[2]
             if isexpr(rhs, :macrocall)

test/localmem.jl

@@ -8,12 +8,15 @@ end
 
 @kernel function localmem(A)
     N = @uniform prod(groupsize())
+    @uniform begin
+        N2 = prod(groupsize())
+    end
     I = @index(Global, Linear)
     i = @index(Local, Linear)
     lmem = @localmem Int (N,) # Ok iff groupsize is static 
     lmem[i] = i
     @synchronize
-    A[I] = lmem[N - i + 1]
+    A[I] = lmem[N2 - i + 1]
 end
 
 function harness(backend, ArrayT)