When uniformity analysis is disabled, no procedures (even the kernel entry

point) will be regarded as uniform.  This simplification avoids various edge
cases.

1 files changed, 5 insertions, 3 deletions

diff --git a/Source/GPUVerify/GPUVerifier.cs b/Source/GPUVerify/GPUVerifier.cs
index 5afabe80..868bcaa1 100644
--- a/Source/GPUVerify/GPUVerifier.cs
+++ b/Source/GPUVerify/GPUVerifier.cs
@@ -475,8 +475,10 @@ namespace GPUVerify
 
         private void DoUniformityAnalysis()
         {
-            var entryPoints = new HashSet<Implementation>();
-            entryPoints.Add(KernelImplementation);
+            var entryPoints = new HashSet<Implementation>();

+            if (CommandLineOptions.DoUniformityAnalysis) {

+              entryPoints.Add(KernelImplementation);

+            }
 
             var nonUniformVars = new Variable[] { _X, _Y, _Z, _GROUP_X, _GROUP_Y, _GROUP_Z };
 
@@ -1910,7 +1912,7 @@ namespace GPUVerify
             {
                 if (CommandLineOptions.SmartPredication)
                 {
-                    SmartBlockPredicator.Predicate(Program, proc => proc != KernelProcedure, uniformityAnalyser);
+                    SmartBlockPredicator.Predicate(Program, proc => true, uniformityAnalyser);
                 }
                 else
                 {