More fixes for reverse-mode on complicated loops (#2675)

* Multiple fixes to get various loop tests to pass.

* Create reverse-nested-loop.slang

* Fix for variables becoming inaccessible during cfg normalization

* Removed comments and moved break-branch-normalization to eliminateMultiLevelBreaks

* Fix.

* Override liveness tests

6 files changed, 151 insertions, 0 deletions

diff --git a/tests/autodiff/reverse-continue-loop.slang b/tests/autodiff/reverse-continue-loop.slang
new file mode 100644
index 000000000..0f9502673
--- /dev/null
+++ b/tests/autodiff/reverse-continue-loop.slang
@@ -0,0 +1,43 @@
+//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj -output-using-type
+//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type
+//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -output-using-type -shaderobj
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0 0], stride=4):out,name=outputBuffer
+RWStructuredBuffer<float> outputBuffer;
+
+typedef DifferentialPair<float> dpfloat;
+typedef float.Differential dfloat;
+
+[BackwardDifferentiable]
+float test_loop_with_continue(float y)
+{
+    float t = y;
+
+    for (int i = 0; i < 3; i++)
+    {
+        if (t > 4.0)
+            continue;
+
+        t = t * t;
+    }
+
+    return t;
+}
+
+[numthreads(1, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    {
+        dpfloat dpa = dpfloat(2.0, 0.0);
+
+        __bwd_diff(test_loop_with_continue)(dpa, 1.0f);
+        outputBuffer[0] = dpa.d; // Expect: 32.0
+    }
+
+    {
+        dpfloat dpa = dpfloat(0.4, 0.0);
+
+        __bwd_diff(test_loop_with_continue)(dpa, 1.0f);
+        outputBuffer[1] = dpa.d; // Expect: 0.0131072
+    }
+}
diff --git a/tests/autodiff/reverse-continue-loop.slang.expected.txt b/tests/autodiff/reverse-continue-loop.slang.expected.txt
new file mode 100644
index 000000000..17dbb061d
--- /dev/null
+++ b/tests/autodiff/reverse-continue-loop.slang.expected.txt
@@ -0,0 +1,6 @@
+type: float
+32.000000
+0.013107
+0.000000
+0.000000
+0.000000
diff --git a/tests/autodiff/reverse-hybrid-control-flow.slang b/tests/autodiff/reverse-hybrid-control-flow.slang
new file mode 100644
index 000000000..9379df4cf
--- /dev/null
+++ b/tests/autodiff/reverse-hybrid-control-flow.slang
@@ -0,0 +1,47 @@
+//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj -output-using-type
+//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type
+//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -output-using-type -shaderobj
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0 0], stride=4):out,name=outputBuffer
+RWStructuredBuffer<float> outputBuffer;
+
+typedef DifferentialPair<float> dpfloat;
+typedef float.Differential dfloat;
+
+[BackwardDifferentiable]
+float test_simple_loop(float y)
+{
+    float t = y;
+
+    if (y > 0.5)
+    {
+        for (int i = 0; i < 3; i++)
+        {
+            t = t * t;
+        }
+    }
+    else
+    {
+        t = t * 10.f;
+    }
+
+    return t;
+}
+
+[numthreads(1, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    {
+        dpfloat dpa = dpfloat(1.0, 0.0);
+
+        __bwd_diff(test_simple_loop)(dpa, 1.0f);
+        outputBuffer[0] = dpa.d; // Expect: 8.0
+    }
+
+    {
+        dpfloat dpa = dpfloat(0.4, 0.0);
+
+        __bwd_diff(test_simple_loop)(dpa, 1.0f);
+        outputBuffer[1] = dpa.d; // Expect: 10.0
+    }
+}
diff --git a/tests/autodiff/reverse-hybrid-control-flow.slang.expected.txt b/tests/autodiff/reverse-hybrid-control-flow.slang.expected.txt
new file mode 100644
index 000000000..3cb76c394
--- /dev/null
+++ b/tests/autodiff/reverse-hybrid-control-flow.slang.expected.txt
@@ -0,0 +1,6 @@
+type: float
+8.000000
+10.000000
+0.000000
+0.000000
+0.000000
diff --git a/tests/autodiff/reverse-nested-loop.slang b/tests/autodiff/reverse-nested-loop.slang
new file mode 100644
index 000000000..08cde5230
--- /dev/null
+++ b/tests/autodiff/reverse-nested-loop.slang
@@ -0,0 +1,43 @@
+//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj -output-using-type
+//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type
+//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute -output-using-type -shaderobj
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0 0], stride=4):out,name=outputBuffer
+RWStructuredBuffer<float> outputBuffer;
+
+typedef DifferentialPair<float> dpfloat;
+typedef float.Differential dfloat;
+
+[BackwardDifferentiable]
+float test_simple_nested_loop(float y)
+{
+    float t = y;
+
+    for (int i = 0; i < 2; i++)
+    {
+        for (int j = 0; j < 2; j++)
+        {
+            t = t * (i + j + 1);
+        }
+    }
+    
+    return t;
+}
+
+[numthreads(1, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    {
+        dpfloat dpa = dpfloat(1.0, 0.0);
+
+        __bwd_diff(test_simple_nested_loop)(dpa, 1.0f);
+        outputBuffer[0] = dpa.d; // Expect: 12.0 * 1
+    }
+
+    {
+        dpfloat dpa = dpfloat(1.0, 0.0);
+
+        __bwd_diff(test_simple_nested_loop)(dpa, 0.4f);
+        outputBuffer[1] = dpa.d; // Expect: 12 * 0.4 = 4.8
+    }
+}
diff --git a/tests/autodiff/reverse-nested-loop.slang.expected.txt b/tests/autodiff/reverse-nested-loop.slang.expected.txt
new file mode 100644
index 000000000..59c14cf1d
--- /dev/null
+++ b/tests/autodiff/reverse-nested-loop.slang.expected.txt
@@ -0,0 +1,6 @@
+type: float
+12.000000
+4.800000
+0.000000
+0.000000
+0.000000