Merged with default.

1 files changed, 7 insertions, 1 deletions

diff --git a/Source/GPUVerify/VariableDualiser.cs b/Source/GPUVerify/VariableDualiser.cs
index 7f637734..63720c13 100644
--- a/Source/GPUVerify/VariableDualiser.cs
+++ b/Source/GPUVerify/VariableDualiser.cs
@@ -36,6 +36,11 @@ namespace GPUVerify
                 return new IdentifierExpr(node.tok, new Constant(node.tok, DualiseTypedIdent(node.Decl)));

             }

 

+            if (CommandLineOptions.InterGroupRaceChecking && GPUVerifier.IsGroupIdConstant(node.Decl))

+            {

+                return new IdentifierExpr(node.tok, new Constant(node.tok, DualiseTypedIdent(node.Decl)));

+            }

+

             return node;

         }

 

@@ -52,7 +57,8 @@ namespace GPUVerify
 

         public override Variable VisitVariable(Variable node)

         {

-            if (!(node is Constant) || GPUVerifier.IsThreadLocalIdConstant(node))

+            if (!(node is Constant) || GPUVerifier.IsThreadLocalIdConstant(node) ||

+                (CommandLineOptions.InterGroupRaceChecking && GPUVerifier.IsGroupIdConstant(node)))

             {

                 node.TypedIdent = DualiseTypedIdent(node);

                 node.Name = node.Name + "$" + id;