[llvm] [Uniformity] Avoid marking all PHIs as divergent in join blocks (PR #157808)

[Carl Ritson via llvm-commits]

================
@@ -172,9 +172,9 @@ X:
 ; CHECK: DIVERGENT: %div.merge.x =
 
 Y:
-  %div.merge.y = phi i32 [ 42, %X ], [ %b, %B ]
+  %merge.y = phi i32 [ 42, %X ], [ %b, %B ]
   ret void
-; CHECK: DIVERGENT: %div.merge.y =
+; CHECK-NOT: DIVERGENT: %merge.y =
----------------
perlfu wrote:

I've fixed this by reinstating my previous code which respected temporal divergence.

https://github.com/llvm/llvm-project/pull/157808