Forbid divergent execution of work-group barriers

src/KernelAbstractions.jl

@@ -297,6 +297,9 @@ end
 After a `@synchronize` statement all read and writes to global and local memory
 from each thread in the workgroup are visible in from all other threads in the
 workgroup.
+
+!!! note
+    `@synchronize()` must be encountered by all workitems of a work-group executing the kernel or by none at all.
 """
 macro synchronize()
     return quote
@@ -314,10 +317,15 @@ workgroup. `cond` is not allowed to have any visible sideffects.
 # Platform differences
   - `GPU`: This synchronization will only occur if the `cond` evaluates.
   - `CPU`: This synchronization will always occur.
+
+!!! warn
+    This variant of the `@synchronize` macro violates the requirement that `@synchronize` must be encountered
+    by all workitems of a work-group executing the kernel or by none at all.
+    Since v`0.9.34` this version of the macro is deprecated and lowers to `@synchronize()`
 """
 macro synchronize(cond)
     return quote
-        $(esc(cond)) && $__synchronize()
+        $__synchronize()
     end
 end
 

src/macros.jl

@@ -58,22 +58,105 @@ function transform_gpu!(def, constargs, force_inbounds)
         end
     end
     pushfirst!(def[:args], :__ctx__)
-    body = def[:body]
+    new_stmts = Expr[]
+    body = MacroTools.flatten(def[:body])
+    stmts = body.args
+    push!(new_stmts, Expr(:aliasscope))
+    push!(new_stmts, :(__active_lane__ = $__validindex(__ctx__)))
     if force_inbounds
-        body = quote
-            @inbounds $(body)
-        end
+        push!(new_stmts, Expr(:inbounds, true))
     end
-    body = quote
-        if $__validindex(__ctx__)
-            $(body)
-        end
-        return nothing
+    append!(new_stmts, split(emit_gpu, body.args))
+    if force_inbounds
+        push!(new_stmts, Expr(:inbounds, :pop))
     end
+    push!(new_stmts, Expr(:popaliasscope))
+    push!(new_stmts, :(return nothing))
     def[:body] = Expr(
         :let,
         Expr(:block, let_constargs...),
-        body,
+        Expr(:block, new_stmts...),
     )
     return
 end
+
+struct WorkgroupLoop
+    stmts::Vector{Any}
+    terminated_in_sync::Bool
+end
+
+is_sync(expr) = @capture(expr, @synchronize() | @synchronize(a_))
+
+function is_scope_construct(expr::Expr)
+    return expr.head === :block # ||
+    # expr.head === :let
+end
+
+function find_sync(stmt)
+    result = false
+    postwalk(stmt) do expr
+        result |= is_sync(expr)
+        expr
+    end
+    return result
+end
+
+# TODO proper handling of LineInfo
+function split(emit, stmts)
+    # 1. Split the code into blocks separated by `@synchronize`
+
+    current = Any[]
+    new_stmts = Any[]
+    for stmt in stmts
+        has_sync = find_sync(stmt)
+        if has_sync
+            loop = WorkgroupLoop(current, is_sync(stmt))
+            push!(new_stmts, emit(loop))
+            current = Any[]
+            is_sync(stmt) && continue
+
+            # Recurse into scope constructs
+            # TODO: This currently implements hard scoping
+            #       probably need to implemet soft scoping
+            #       by not deepcopying the environment.
+            recurse(x) = x
+            function recurse(expr::Expr)
+                expr = unblock(expr)
+                if is_scope_construct(expr) && any(find_sync, expr.args)
+                    new_args = unblock(split(emit, expr.args))
+                    return Expr(expr.head, new_args...)
+                else
+                    return Expr(expr.head, map(recurse, expr.args)...)
+                end
+            end
+            push!(new_stmts, recurse(stmt))
+            continue
+        end
+
+        push!(current, stmt)
+    end
+
+    # everything since the last `@synchronize`
+    if !isempty(current)
+        loop = WorkgroupLoop(current, false)
+        push!(new_stmts, emit(loop))
+    end
+    return new_stmts
+end
+
+function emit_gpu(loop)
+    stmts = Any[]
+
+    body = Expr(:block, loop.stmts...)
+    loopexpr = quote
+        if __active_lane__
+            $(unblock(body))
+        end
+    end
+    push!(stmts, loopexpr)
+    if loop.terminated_in_sync
+        push!(stmts, :($__synchronize()))
+    end
+
+    return unblock(Expr(:block, stmts...))
+end