Fix Phi simplification bug. (#2710)

* Fix Phi simplification bug.

* Fix up.

* Fix.

* Fix.

* Fix.

* Fix.

* Fix.

* Fix test.

* Fix test.

---------

Co-authored-by: Yong He <yhe@nvidia.com>

2 files changed, 16 insertions, 10 deletions

diff --git a/tests/pipeline/ray-tracing/trace-ray-inline.slang.glsl b/tests/pipeline/ray-tracing/trace-ray-inline.slang.glsl
index 1c2bc8090..166d19537 100644
--- a/tests/pipeline/ray-tracing/trace-ray-inline.slang.glsl
+++ b/tests/pipeline/ray-tracing/trace-ray-inline.slang.glsl
@@ -68,13 +68,12 @@ void myMiss_0(inout MyRayPayload_0 payload_4)
 layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
 void main()
 {
-    MyProceduralHitAttrs_0 committedProceduralAttrs_0;
-
     rayQueryEXT query_0;
 
     MyRayPayload_0 payload_5;
     payload_5.value_1 = -1;
     rayQueryInitializeEXT((query_0), (myAccelerationStructure_0), (C_0._data.rayFlags_0 | 512), (C_0._data.instanceMask_0), (C_0._data.origin_0), (C_0._data.tMin_0), (C_0._data.direction_0), (C_0._data.tMax_0));
+    MyProceduralHitAttrs_0 committedProceduralAttrs_0;
     for(;;)
     {
         bool _S2 = rayQueryProceedEXT(query_0);
@@ -83,6 +82,7 @@ void main()
             break;
         }
         uint _S3 = (rayQueryGetIntersectionTypeEXT((query_0), false));
+        MyProceduralHitAttrs_0 committedProceduralAttrs_1;
         switch(_S3)
         {
         case 1U:
@@ -102,16 +102,16 @@ void main()
                         {
                             rayQueryTerminateEXT(query_0);
                         }
-                        committedProceduralAttrs_0 = _S6;
+                        committedProceduralAttrs_1 = _S6;
                     }
                     else
                     {
-                        committedProceduralAttrs_0 = committedProceduralAttrs_0;
+                        committedProceduralAttrs_1 = committedProceduralAttrs_0;
                     }
                 }
                 else
                 {
-                    committedProceduralAttrs_0 = committedProceduralAttrs_0;
+                    committedProceduralAttrs_1 = committedProceduralAttrs_0;
                 }
                 break;
             }
@@ -126,13 +126,16 @@ void main()
                         rayQueryTerminateEXT(query_0);
                     }
                 }
+                committedProceduralAttrs_1 = committedProceduralAttrs_0;
                 break;
             }
         default:
             {
+                committedProceduralAttrs_1 = committedProceduralAttrs_0;
                 break;
             }
         }
+        committedProceduralAttrs_0 = committedProceduralAttrs_1;
     }
     uint _S8 = (rayQueryGetIntersectionTypeEXT((query_0), true));
     switch(_S8)
diff --git a/tests/pipeline/ray-tracing/trace-ray-inline.slang.hlsl b/tests/pipeline/ray-tracing/trace-ray-inline.slang.hlsl
index b0c798b2d..a85415065 100644
--- a/tests/pipeline/ray-tracing/trace-ray-inline.slang.hlsl
+++ b/tests/pipeline/ray-tracing/trace-ray-inline.slang.hlsl
@@ -67,14 +67,13 @@ void myMiss_0(inout MyRayPayload_0 payload_4)
 [shader("compute")][numthreads(1, 1, 1)]
 void main(uint3 tid_0 : SV_DISPATCHTHREADID)
 {
-    MyProceduralHitAttrs_0 committedProceduralAttrs_0;
-
     RayQuery<int(512) > query_0;
 
     MyRayPayload_0 payload_5;
     payload_5.value_1 = int(-1);
     RayDesc ray_0 = { C_0.origin_0, C_0.tMin_0, C_0.direction_0, C_0.tMax_0 };
     query_0.TraceRayInline(myAccelerationStructure_0, C_0.rayFlags_0, C_0.instanceMask_0, ray_0);
+    MyProceduralHitAttrs_0 committedProceduralAttrs_0;
     for(;;)
     {
         bool _S1 = query_0.Proceed();
@@ -83,6 +82,7 @@ void main(uint3 tid_0 : SV_DISPATCHTHREADID)
             break;
         }
         uint _S2 = query_0.CandidateType();
+        MyProceduralHitAttrs_0 committedProceduralAttrs_1;
         switch(_S2)
         {
         case 1U:
@@ -102,16 +102,16 @@ void main(uint3 tid_0 : SV_DISPATCHTHREADID)
                         {
                             query_0.Abort();
                         }
-                        committedProceduralAttrs_0 = _S5;
+                        committedProceduralAttrs_1 = _S5;
                     }
                     else
                     {
-                        committedProceduralAttrs_0 = committedProceduralAttrs_0;
+                        committedProceduralAttrs_1 = committedProceduralAttrs_0;
                     }
                 }
                 else
                 {
-                    committedProceduralAttrs_0 = committedProceduralAttrs_0;
+                    committedProceduralAttrs_1 = committedProceduralAttrs_0;
                 }
                 break;
             }
@@ -126,13 +126,16 @@ void main(uint3 tid_0 : SV_DISPATCHTHREADID)
                         query_0.Abort();
                     }
                 }
+                committedProceduralAttrs_1 = committedProceduralAttrs_0;
                 break;
             }
         default:
             {
+                committedProceduralAttrs_1 = committedProceduralAttrs_0;
                 break;
             }
         }
+        committedProceduralAttrs_0 = committedProceduralAttrs_1;
     }
     uint _S7 = query_0.CommittedStatus();
     switch(_S7)