Liveness fixes and improvements (#2270)

* #include an absolute path didn't work - because paths were taken to always be relative.

* Use TerminatedUnownedStringSlice for literals in output C++.

* Remove Escape/Unescape functions used in slang-token-reader.cpp
Add target type of 'host-cpp' etc to map to the target types.

* Fix some corner cases around string encoding.

* Added unit test for string escaping.
Fixed some assorted escaping bugs.

* Updated test output.

* Added decode test.

* Stop using hex output, to get around 'greedy' aspect. Use octal instead.

* Added HostHostCallable
Small changes to use ArtifactDesc/Info instead of large switches.

* Fix C++ emit to handle arbitrary function export.

* Add options handling for callable without an output being specified.

* Can compile with COM interface. Added example using com interface.

* Use the IR Ptr type instead of hack in C++ emit for interfaces.

* Fix issue with outputting the COM call when ptr is used.

* Fix crash issue on compilation failure.

* Add support for __global.

* Added `ActualGlobalRate`
Added special handling around globals and COM interfaces.
Tested out in cpu-com-example.

* Fix typo in NodeBase.

* Support for accessing globals by name working.

* Bounds checking for C++
Improved bounds checks for CUDA.

* Check that actual global initialization is working.

* Fix typo.

* Refactor the com replacement such that it doesn't need a cache or do anything special with GlobalVar.

* Fix typo in CUDA prelude.

* Remove context.
Only create replacement if needed.

* Split out COM host-callable into a unit-test.

* host-callable com testing on C++and llvm.

* Comment around the COM ptr replacement.

* WIP Zero bound test.

* Disable com test on vs 32 bit.
Fix C++ prelude

* Disable 32 bit targets testing com host-callable.

* For now disable zero index test.

* Enable bounds checking for CPU/CUDA.

* Small fixes.
Disable CUDA zero index bound fix.

* Add test result for bound check.

* Work around for index wrapping issue.

* Added Fixed array test.

* Only enable prelude asserts via SLANG_PRELUDE_ENABLE_ASSERT (unless defined by the user)

* Small fix around instCount.

* Improve liveness loop handing and tests.

* Improve liveness comment.

* More conservative loop handling.

* Make liveness deterministic to make testing work.

* Added 'span tidy'
Added some more tests.

* Simplify span simplification, because could collapse inappropriate spans.

* Updated liveness with simple loop tracking.

* Update test results.

* Small tidy up.

* Update comments in liveness tests.

* Improve liveness comments.

* Loop handling without needing LoopInfo tracking.

* Improve liveness comments.

* Small fix around removing uninteresting spans.
Improve naming.

14 files changed, 837 insertions, 224 deletions

diff --git a/tests/experimental/liveness/liveness-2.slang b/tests/experimental/liveness/liveness-2.slang
new file mode 100644
index 000000000..9d4ab275d
--- /dev/null
+++ b/tests/experimental/liveness/liveness-2.slang
@@ -0,0 +1,27 @@
+//TEST:SIMPLE:-target glsl -entry computeMain -profile cs_6_3 -track-liveness -line-directive-mode none 
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+// Test loop handling.
+
+int calcThing(int offset)
+{
+    int idx[3];
+    
+    for (int i = 0; i < 3; ++i)
+    {
+        idx[i] = offset + i;
+    }
+    
+    // Now read back
+    return idx[0] + idx[1] + idx[2];
+}
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{    
+    int index = dispatchThreadID.x;
+
+    outputBuffer[index] = calcThing(index);
+}
diff --git a/tests/experimental/liveness/liveness-2.slang.expected b/tests/experimental/liveness/liveness-2.slang.expected
new file mode 100644
index 000000000..c742fa1fc
--- /dev/null
+++ b/tests/experimental/liveness/liveness-2.slang.expected
@@ -0,0 +1,60 @@
+result code = 0
+standard error = {
+}
+standard output = {
+#version 450
+#extension GL_EXT_spirv_intrinsics : require
+layout(row_major) uniform;
+layout(row_major) buffer;
+spirv_instruction(id = 256)
+void livenessStart_0(spirv_by_reference int  _0[3], spirv_literal int _1);
+
+spirv_instruction(id = 256)
+void livenessStart_1(spirv_by_reference int _0, spirv_literal int _1);
+
+spirv_instruction(id = 257)
+void livenessEnd_0(spirv_by_reference int _0, spirv_literal int _1);
+
+spirv_instruction(id = 257)
+void livenessEnd_1(spirv_by_reference int  _0[3], spirv_literal int _1);
+
+int calcThing_0(int offset_0)
+{
+    int  idx_0[3];
+    livenessStart_0(idx_0, 0);
+    int i_0;
+    livenessStart_1(i_0, 0);
+    i_0 = 0;
+    for(;;)
+    {
+        if(i_0 < 3)
+        {
+        }
+        else
+        {
+            break;
+        }
+        idx_0[i_0] = offset_0 + i_0;
+        i_0 = i_0 + 1;
+    }
+    livenessEnd_0(i_0, 0);
+    int _S1 = idx_0[0] + idx_0[1];
+    int _S2 = idx_0[2];
+    livenessEnd_1(idx_0, 0);
+    return _S1 + _S2;
+}
+
+layout(std430, binding = 0) buffer _S3 {
+    int _data[];
+} outputBuffer_0;
+layout(local_size_x = 4, local_size_y = 1, local_size_z = 1) in;
+void main()
+{
+    int index_0 = int(gl_GlobalInvocationID.x);
+    uint _S4 = uint(index_0);
+    int _S5 = calcThing_0(index_0);
+    ((outputBuffer_0)._data[(_S4)]) = _S5;
+    return;
+}
+
+}
diff --git a/tests/experimental/liveness/liveness-3.slang b/tests/experimental/liveness/liveness-3.slang
new file mode 100644
index 000000000..1d289aa68
--- /dev/null
+++ b/tests/experimental/liveness/liveness-3.slang
@@ -0,0 +1,49 @@
+//TEST:SIMPLE:-target glsl -entry computeMain -profile cs_6_3 -track-liveness -line-directive-mode none 
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+// Test loop handling, with more complex structure
+
+int calcThing(int offset)
+{
+    int total = 0;
+    int another[2] = { 1, 2};
+    
+    for (int k = 0; k < 20; ++k)
+    {
+        int idx[3] = {};
+        
+        for (int i = 0; i < 17; ++i)
+        {
+            int modRange = i % 3;
+     
+            another[i & 1] += modRange;
+     
+            if (i % 3)
+            {
+                offset += 1;
+            }
+            
+            idx[modRange] += offset + i;
+        }
+        
+        if ((k + 7) % 5 == 4)
+        {
+            return total;
+        }
+        
+        // Now read back
+        total += idx[0] + idx[1] + idx[2];
+    }
+    
+    return -total;
+}
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{    
+    int index = dispatchThreadID.x;
+
+    outputBuffer[index] = calcThing(index);
+}
diff --git a/tests/experimental/liveness/liveness-3.slang.expected b/tests/experimental/liveness/liveness-3.slang.expected
new file mode 100644
index 000000000..614fd1387
--- /dev/null
+++ b/tests/experimental/liveness/liveness-3.slang.expected
@@ -0,0 +1,144 @@
+result code = 0
+standard error = {
+}
+standard output = {
+#version 450
+#extension GL_EXT_spirv_intrinsics : require
+layout(row_major) uniform;
+layout(row_major) buffer;
+spirv_instruction(id = 256)
+void livenessStart_0(spirv_by_reference int  _0[2], spirv_literal int _1);
+
+spirv_instruction(id = 256)
+void livenessStart_1(spirv_by_reference int _0, spirv_literal int _1);
+
+spirv_instruction(id = 256)
+void livenessStart_2(spirv_by_reference int  _0[3], spirv_literal int _1);
+
+spirv_instruction(id = 257)
+void livenessEnd_0(spirv_by_reference int _0, spirv_literal int _1);
+
+spirv_instruction(id = 257)
+void livenessEnd_1(spirv_by_reference int  _0[3], spirv_literal int _1);
+
+spirv_instruction(id = 257)
+void livenessEnd_2(spirv_by_reference int  _0[2], spirv_literal int _1);
+
+int calcThing_0(int offset_0)
+{
+    int  another_0[2];
+    livenessStart_0(another_0, 0);
+    const int  _S1[2] = { 1, 2 };
+    another_0 = _S1;
+    int k_0;
+    int _S2;
+    int total_0;
+    livenessStart_1(k_0, 0);
+    k_0 = 0;
+    livenessStart_1(_S2, 0);
+    _S2 = offset_0;
+    livenessStart_1(total_0, 0);
+    total_0 = 0;
+    for(;;)
+    {
+        if(k_0 < 20)
+        {
+        }
+        else
+        {
+            break;
+        }
+        int  idx_0[3];
+        livenessStart_2(idx_0, 0);
+        const int  _S3[3] = { 0, 0, 0 };
+        idx_0 = _S3;
+        int _S4 = _S2;
+        int i_0;
+        int _S5;
+        livenessStart_1(i_0, 0);
+        i_0 = 0;
+        livenessStart_1(_S5, 0);
+        _S5 = _S4;
+        for(;;)
+        {
+            if(i_0 < 17)
+            {
+            }
+            else
+            {
+                break;
+            }
+            int modRange_0 = i_0 % 3;
+            another_0[i_0 & 1] = another_0[i_0 & 1] + modRange_0;
+            int _S6 = i_0 % 3;
+            int _S7;
+            if(bool(_S6))
+            {
+                int _S8 = _S5;
+                livenessEnd_0(_S5, 0);
+                int _S9 = _S8 + 1;
+                livenessStart_1(_S7, 0);
+                _S7 = _S9;
+            }
+            else
+            {
+                int _S10 = _S5;
+                livenessEnd_0(_S5, 0);
+                livenessStart_1(_S7, 0);
+                _S7 = _S10;
+            }
+            idx_0[modRange_0] = idx_0[modRange_0] + (_S7 + i_0);
+            i_0 = i_0 + 1;
+            livenessStart_1(_S5, 0);
+            int _S11 = _S7;
+            livenessEnd_0(_S7, 0);
+            _S5 = _S11;
+        }
+        livenessEnd_0(i_0, 0);
+        livenessEnd_0(_S2, 0);
+        int _S12 = (k_0 + 7) % 5;
+        if(_S12 == 4)
+        {
+            livenessEnd_0(_S5, 0);
+            livenessEnd_1(idx_0, 0);
+            livenessEnd_0(k_0, 0);
+            livenessEnd_2(another_0, 0);
+            return total_0;
+        }
+        int _S13 = idx_0[0] + idx_0[1];
+        int _S14 = idx_0[2];
+        livenessEnd_1(idx_0, 0);
+        int _S15 = _S13 + _S14;
+        int _S16 = total_0;
+        livenessEnd_0(total_0, 0);
+        int total_1 = _S16 + _S15;
+        k_0 = k_0 + 1;
+        livenessStart_1(_S2, 0);
+        int _S17 = _S5;
+        livenessEnd_0(_S5, 0);
+        _S2 = _S17;
+        livenessStart_1(total_0, 0);
+        total_0 = total_1;
+    }
+    livenessEnd_0(_S2, 0);
+    livenessEnd_0(k_0, 0);
+    livenessEnd_2(another_0, 0);
+    int _S18 = total_0;
+    livenessEnd_0(total_0, 0);
+    return - _S18;
+}
+
+layout(std430, binding = 0) buffer _S19 {
+    int _data[];
+} outputBuffer_0;
+layout(local_size_x = 4, local_size_y = 1, local_size_z = 1) in;
+void main()
+{
+    int index_0 = int(gl_GlobalInvocationID.x);
+    uint _S20 = uint(index_0);
+    int _S21 = calcThing_0(index_0);
+    ((outputBuffer_0)._data[(_S20)]) = _S21;
+    return;
+}
+
+}
diff --git a/tests/experimental/liveness/liveness-4.slang b/tests/experimental/liveness/liveness-4.slang
new file mode 100644
index 000000000..d18d127f6
--- /dev/null
+++ b/tests/experimental/liveness/liveness-4.slang
@@ -0,0 +1,35 @@
+//TEST:SIMPLE:-target glsl -entry computeMain -profile cs_6_3 -track-liveness -line-directive-mode none 
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+// Test loop handling, with more complex structure
+// Here to test anothers liveness.
+
+int calcThing(int offset)
+{
+    int another[2] = { 1, 2};
+    
+    for (int k = 0; k < 20; ++k)
+    {       
+        for (int i = 0; i < 17; ++i)
+        {
+            another[i & 1] += k + i;
+        }
+        
+        if ((k + 7) % 5 == 4)
+        {
+            return 1;
+        }
+    }
+    
+    return -2;
+}
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{    
+    int index = dispatchThreadID.x;
+
+    outputBuffer[index] = calcThing(index);
+}
diff --git a/tests/experimental/liveness/liveness-4.slang.expected b/tests/experimental/liveness/liveness-4.slang.expected
new file mode 100644
index 000000000..52c6ebb32
--- /dev/null
+++ b/tests/experimental/liveness/liveness-4.slang.expected
@@ -0,0 +1,82 @@
+result code = 0
+standard error = {
+}
+standard output = {
+#version 450
+#extension GL_EXT_spirv_intrinsics : require
+layout(row_major) uniform;
+layout(row_major) buffer;
+spirv_instruction(id = 256)
+void livenessStart_0(spirv_by_reference int  _0[2], spirv_literal int _1);
+
+spirv_instruction(id = 256)
+void livenessStart_1(spirv_by_reference int _0, spirv_literal int _1);
+
+spirv_instruction(id = 257)
+void livenessEnd_0(spirv_by_reference int _0, spirv_literal int _1);
+
+spirv_instruction(id = 257)
+void livenessEnd_1(spirv_by_reference int  _0[2], spirv_literal int _1);
+
+int calcThing_0(int offset_0)
+{
+    int  another_0[2];
+    livenessStart_0(another_0, 0);
+    const int  _S1[2] = { 1, 2 };
+    another_0 = _S1;
+    int k_0;
+    livenessStart_1(k_0, 0);
+    k_0 = 0;
+    for(;;)
+    {
+        if(k_0 < 20)
+        {
+        }
+        else
+        {
+            break;
+        }
+        int i_0;
+        livenessStart_1(i_0, 0);
+        i_0 = 0;
+        for(;;)
+        {
+            if(i_0 < 17)
+            {
+            }
+            else
+            {
+                break;
+            }
+            another_0[i_0 & 1] = another_0[i_0 & 1] + (k_0 + i_0);
+            i_0 = i_0 + 1;
+        }
+        livenessEnd_0(i_0, 0);
+        int _S2 = (k_0 + 7) % 5;
+        if(_S2 == 4)
+        {
+            livenessEnd_0(k_0, 0);
+            livenessEnd_1(another_0, 0);
+            return 1;
+        }
+        k_0 = k_0 + 1;
+    }
+    livenessEnd_0(k_0, 0);
+    livenessEnd_1(another_0, 0);
+    return -2;
+}
+
+layout(std430, binding = 0) buffer _S3 {
+    int _data[];
+} outputBuffer_0;
+layout(local_size_x = 4, local_size_y = 1, local_size_z = 1) in;
+void main()
+{
+    int index_0 = int(gl_GlobalInvocationID.x);
+    uint _S4 = uint(index_0);
+    int _S5 = calcThing_0(index_0);
+    ((outputBuffer_0)._data[(_S4)]) = _S5;
+    return;
+}
+
+}
diff --git a/tests/experimental/liveness/liveness-5.slang b/tests/experimental/liveness/liveness-5.slang
new file mode 100644
index 000000000..52370d61b
--- /dev/null
+++ b/tests/experimental/liveness/liveness-5.slang
@@ -0,0 +1,42 @@
+//TEST:SIMPLE:-target glsl -entry computeMain -profile cs_6_3 -track-liveness -line-directive-mode none 
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+// Test loop handling, with more complex structure
+
+int calcThing(int offset)
+{
+    int total = 0;
+    int another[2] = { 1, 2};
+    
+    for (int k = 0; k < 20; ++k)
+    {       
+        for (int i = 0; i < 17; ++i)
+        {
+            another[i & 1] += k + i;
+        }
+        
+        total += another[k & 1];
+        
+        if ((k + 7) % 5 == 4)
+        {
+            return 1;
+        }
+    }
+    
+    if (total > 4)
+    {
+        total = -total;
+    }
+    
+    return total;
+}
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{    
+    int index = dispatchThreadID.x;
+
+    outputBuffer[index] = calcThing(index);
+}
diff --git a/tests/experimental/liveness/liveness-5.slang.expected b/tests/experimental/liveness/liveness-5.slang.expected
new file mode 100644
index 000000000..ea6e37036
--- /dev/null
+++ b/tests/experimental/liveness/liveness-5.slang.expected
@@ -0,0 +1,107 @@
+result code = 0
+standard error = {
+}
+standard output = {
+#version 450
+#extension GL_EXT_spirv_intrinsics : require
+layout(row_major) uniform;
+layout(row_major) buffer;
+spirv_instruction(id = 256)
+void livenessStart_0(spirv_by_reference int  _0[2], spirv_literal int _1);
+
+spirv_instruction(id = 256)
+void livenessStart_1(spirv_by_reference int _0, spirv_literal int _1);
+
+spirv_instruction(id = 257)
+void livenessEnd_0(spirv_by_reference int _0, spirv_literal int _1);
+
+spirv_instruction(id = 257)
+void livenessEnd_1(spirv_by_reference int  _0[2], spirv_literal int _1);
+
+int calcThing_0(int offset_0)
+{
+    int  another_0[2];
+    livenessStart_0(another_0, 0);
+    const int  _S1[2] = { 1, 2 };
+    another_0 = _S1;
+    int k_0;
+    int total_0;
+    livenessStart_1(k_0, 0);
+    k_0 = 0;
+    livenessStart_1(total_0, 0);
+    total_0 = 0;
+    for(;;)
+    {
+        if(k_0 < 20)
+        {
+        }
+        else
+        {
+            break;
+        }
+        int i_0;
+        livenessStart_1(i_0, 0);
+        i_0 = 0;
+        for(;;)
+        {
+            if(i_0 < 17)
+            {
+            }
+            else
+            {
+                break;
+            }
+            another_0[i_0 & 1] = another_0[i_0 & 1] + (k_0 + i_0);
+            i_0 = i_0 + 1;
+        }
+        livenessEnd_0(i_0, 0);
+        int _S2 = another_0[k_0 & 1];
+        int _S3 = total_0;
+        livenessEnd_0(total_0, 0);
+        int total_1 = _S3 + _S2;
+        int _S4 = (k_0 + 7) % 5;
+        if(_S4 == 4)
+        {
+            livenessEnd_0(k_0, 0);
+            livenessEnd_1(another_0, 0);
+            return 1;
+        }
+        k_0 = k_0 + 1;
+        livenessStart_1(total_0, 0);
+        total_0 = total_1;
+    }
+    livenessEnd_0(k_0, 0);
+    livenessEnd_1(another_0, 0);
+    int total_2;
+    if(total_0 > 4)
+    {
+        int _S5 = total_0;
+        livenessEnd_0(total_0, 0);
+        int _S6 = - _S5;
+        livenessStart_1(total_2, 0);
+        total_2 = _S6;
+    }
+    else
+    {
+        int _S7 = total_0;
+        livenessEnd_0(total_0, 0);
+        livenessStart_1(total_2, 0);
+        total_2 = _S7;
+    }
+    return total_2;
+}
+
+layout(std430, binding = 0) buffer _S8 {
+    int _data[];
+} outputBuffer_0;
+layout(local_size_x = 4, local_size_y = 1, local_size_z = 1) in;
+void main()
+{
+    int index_0 = int(gl_GlobalInvocationID.x);
+    uint _S9 = uint(index_0);
+    int _S10 = calcThing_0(index_0);
+    ((outputBuffer_0)._data[(_S9)]) = _S10;
+    return;
+}
+
+}
diff --git a/tests/experimental/liveness/liveness-6.slang b/tests/experimental/liveness/liveness-6.slang
new file mode 100644
index 000000000..890b06fe5
--- /dev/null
+++ b/tests/experimental/liveness/liveness-6.slang
@@ -0,0 +1,47 @@
+//TEST:SIMPLE:-target glsl -entry computeMain -profile cs_6_3 -track-liveness -line-directive-mode none 
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+// Test loop handling, with more complex structure
+// More testing around liveness and loops.
+
+int calcThing(int offset)
+{
+    int total = 0;
+    int another[2] = { 1, 2};
+    
+    for (int k = 0; k < 20; ++k)
+    {       
+        int arr[2] = { 2, 3};
+
+        for (int i = 0; i < 17; ++i)
+        {
+            another[i & 1] += k + i;
+            arr[k & 1] += i;
+        }
+        
+        total += another[k & 1];
+        total += arr[k & 1];
+        
+        if ((k + 7) % 5 == 4)
+        {
+            return 1;
+        }
+    }
+    
+    if (total > 4)
+    {
+        total = -total;
+    }
+    
+    return total;
+}
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{    
+    int index = dispatchThreadID.x;
+
+    outputBuffer[index] = calcThing(index);
+}
diff --git a/tests/experimental/liveness/liveness-6.slang.expected b/tests/experimental/liveness/liveness-6.slang.expected
new file mode 100644
index 000000000..ac1894f95
--- /dev/null
+++ b/tests/experimental/liveness/liveness-6.slang.expected
@@ -0,0 +1,115 @@
+result code = 0
+standard error = {
+}
+standard output = {
+#version 450
+#extension GL_EXT_spirv_intrinsics : require
+layout(row_major) uniform;
+layout(row_major) buffer;
+spirv_instruction(id = 256)
+void livenessStart_0(spirv_by_reference int  _0[2], spirv_literal int _1);
+
+spirv_instruction(id = 256)
+void livenessStart_1(spirv_by_reference int _0, spirv_literal int _1);
+
+spirv_instruction(id = 257)
+void livenessEnd_0(spirv_by_reference int _0, spirv_literal int _1);
+
+spirv_instruction(id = 257)
+void livenessEnd_1(spirv_by_reference int  _0[2], spirv_literal int _1);
+
+int calcThing_0(int offset_0)
+{
+    int  another_0[2];
+    livenessStart_0(another_0, 0);
+    const int  _S1[2] = { 1, 2 };
+    another_0 = _S1;
+    int k_0;
+    int total_0;
+    livenessStart_1(k_0, 0);
+    k_0 = 0;
+    livenessStart_1(total_0, 0);
+    total_0 = 0;
+    for(;;)
+    {
+        if(k_0 < 20)
+        {
+        }
+        else
+        {
+            break;
+        }
+        int  arr_0[2];
+        livenessStart_0(arr_0, 0);
+        const int  _S2[2] = { 2, 3 };
+        arr_0 = _S2;
+        int i_0;
+        livenessStart_1(i_0, 0);
+        i_0 = 0;
+        for(;;)
+        {
+            if(i_0 < 17)
+            {
+            }
+            else
+            {
+                break;
+            }
+            another_0[i_0 & 1] = another_0[i_0 & 1] + (k_0 + i_0);
+            arr_0[k_0 & 1] = arr_0[k_0 & 1] + i_0;
+            i_0 = i_0 + 1;
+        }
+        livenessEnd_0(i_0, 0);
+        int _S3 = another_0[k_0 & 1];
+        int _S4 = total_0;
+        livenessEnd_0(total_0, 0);
+        int total_1 = _S4 + _S3;
+        int _S5 = arr_0[k_0 & 1];
+        livenessEnd_1(arr_0, 0);
+        int total_2 = total_1 + _S5;
+        int _S6 = (k_0 + 7) % 5;
+        if(_S6 == 4)
+        {
+            livenessEnd_0(k_0, 0);
+            livenessEnd_1(another_0, 0);
+            return 1;
+        }
+        k_0 = k_0 + 1;
+        livenessStart_1(total_0, 0);
+        total_0 = total_2;
+    }
+    livenessEnd_0(k_0, 0);
+    livenessEnd_1(another_0, 0);
+    int total_3;
+    if(total_0 > 4)
+    {
+        int _S7 = total_0;
+        livenessEnd_0(total_0, 0);
+        int _S8 = - _S7;
+        livenessStart_1(total_3, 0);
+        total_3 = _S8;
+    }
+    else
+    {
+        int _S9 = total_0;
+        livenessEnd_0(total_0, 0);
+        livenessStart_1(total_3, 0);
+        total_3 = _S9;
+    }
+    return total_3;
+}
+
+layout(std430, binding = 0) buffer _S10 {
+    int _data[];
+} outputBuffer_0;
+layout(local_size_x = 4, local_size_y = 1, local_size_z = 1) in;
+void main()
+{
+    int index_0 = int(gl_GlobalInvocationID.x);
+    uint _S11 = uint(index_0);
+    int _S12 = calcThing_0(index_0);
+    ((outputBuffer_0)._data[(_S11)]) = _S12;
+    return;
+}
+
+}
diff --git a/tests/experimental/liveness/liveness-7.slang b/tests/experimental/liveness/liveness-7.slang
new file mode 100644
index 000000000..0324f90b9
--- /dev/null
+++ b/tests/experimental/liveness/liveness-7.slang
@@ -0,0 +1,32 @@
+//TEST:SIMPLE:-target glsl -entry computeMain -profile cs_6_3 -track-liveness -line-directive-mode none
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+// Test loop handling, with more complex structure, and when code is unreachable
+// More testing around liveness and loops.
+
+int calcThing(int offset)
+{    
+    int arr[2] = { 2, 3};
+
+    for (int k = 0; k < 20; ++k)
+    {       
+        if ((k + offset) & 1)
+        {
+            return arr[0];
+        }
+        else
+        {
+            return arr[1];
+        }
+    }
+}
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{    
+    int index = dispatchThreadID.x;
+
+    outputBuffer[index] = calcThing(index);
+}
diff --git a/tests/experimental/liveness/liveness-7.slang.expected b/tests/experimental/liveness/liveness-7.slang.expected
new file mode 100644
index 000000000..5b0c5b58a
--- /dev/null
+++ b/tests/experimental/liveness/liveness-7.slang.expected
@@ -0,0 +1,66 @@
+result code = 0
+standard error = {
+}
+standard output = {
+#version 450
+#extension GL_EXT_spirv_intrinsics : require
+layout(row_major) uniform;
+layout(row_major) buffer;
+spirv_instruction(id = 256)
+void livenessStart_0(spirv_by_reference int _0, spirv_literal int _1);
+
+spirv_instruction(id = 257)
+void livenessEnd_0(spirv_by_reference int _0, spirv_literal int _1);
+
+spirv_instruction(id = 256)
+void livenessStart_1(spirv_by_reference int  _0[2], spirv_literal int _1);
+
+spirv_instruction(id = 257)
+void livenessEnd_1(spirv_by_reference int  _0[2], spirv_literal int _1);
+
+int calcThing_0(int offset_0)
+{
+    const int  _S1[2] = { 2, 3 };
+    int k_0;
+    int _S2;
+    int  arr_0[2];
+    livenessStart_0(k_0, 0);
+    livenessEnd_0(k_0, 0);
+    k_0 = 0;
+    livenessStart_0(_S2, 0);
+    _S2 = offset_0;
+    livenessStart_1(arr_0, 0);
+    arr_0 = _S1;
+    for(;;)
+    {
+        int _S3 = _S2;
+        livenessEnd_0(_S2, 0);
+        if(bool(0 + _S3 & 1))
+        {
+            int  _S4[2] = arr_0;
+            livenessEnd_1(arr_0, 0);
+            return _S4[0];
+        }
+        else
+        {
+            int  _S5[2] = arr_0;
+            livenessEnd_1(arr_0, 0);
+            return _S5[1];
+        }
+    }
+}
+
+layout(std430, binding = 0) buffer _S6 {
+    int _data[];
+} outputBuffer_0;
+layout(local_size_x = 4, local_size_y = 1, local_size_z = 1) in;
+void main()
+{
+    int index_0 = int(gl_GlobalInvocationID.x);
+    uint _S7 = uint(index_0);
+    int _S8 = calcThing_0(index_0);
+    ((outputBuffer_0)._data[(_S7)]) = _S8;
+    return;
+}
+
+}
diff --git a/tests/experimental/liveness/liveness.slang b/tests/experimental/liveness/liveness.slang
index 2e531244e..cf3d37a8f 100644
--- a/tests/experimental/liveness/liveness.slang
+++ b/tests/experimental/liveness/liveness.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE:-target glsl -entry computeMain -profile cs_6_3 -track-liveness
+//TEST:SIMPLE:-target glsl -entry computeMain -profile cs_6_3 -track-liveness -line-directive-mode none 
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/experimental/liveness/liveness.slang.expected b/tests/experimental/liveness/liveness.slang.expected
index 7301d88bf..c74206573 100644
--- a/tests/experimental/liveness/liveness.slang.expected
+++ b/tests/experimental/liveness/liveness.slang.expected
@@ -6,55 +6,29 @@ standard output = {
 #extension GL_EXT_spirv_intrinsics : require
 layout(row_major) uniform;
 layout(row_major) buffer;
-
-#line 85 0
 spirv_instruction(id = 256)
 void livenessStart_0(spirv_by_reference int _0, spirv_literal int _1);
 
-
-#line 85
 spirv_instruction(id = 256)
 void livenessStart_1(spirv_by_reference uint _0, spirv_literal int _1);
 
-
-#line 85
 spirv_instruction(id = 257)
 void livenessEnd_0(spirv_by_reference uint _0, spirv_literal int _1);
 
-
-#line 85
 spirv_instruction(id = 257)
 void livenessEnd_1(spirv_by_reference int _0, spirv_literal int _1);
 
-
-#line 24 1
 int someSlowFunc_0(int a_0)
 {
     uint _S1 = uint(a_0);
-
-#line 26
     int i_0;
-
-#line 26
     uint v_0;
-
-#line 26
     livenessStart_0(i_0, 0);
-
-#line 26
     i_0 = 0;
-
-#line 26
     livenessStart_1(v_0, 0);
-
-#line 26
     v_0 = _S1;
-
-#line 26
     for(;;)
     {
-
-#line 27
         if(i_0 < a_0 * 20)
         {
         }
@@ -62,53 +36,18 @@ int someSlowFunc_0(int a_0)
         {
             break;
         }
-
-#line 29
         uint _S2 = v_0 >> 1;
-
-#line 29
         uint _S3 = v_0;
-
-#line 29
         livenessEnd_0(v_0, 0);
-
-#line 29
         uint _S4 = (_S2 | _S3 << 31) * uint(i_0);
-
-#line 27
-        int _S5 = i_0;
-
-#line 27
-        livenessEnd_1(i_0, 0);
-
-#line 27
-        int i_1 = _S5 + 1;
-
-#line 27
-        livenessStart_0(i_0, 0);
-
-#line 27
-        i_0 = i_1;
-
-#line 27
+        i_0 = i_0 + 1;
         livenessStart_1(v_0, 0);
-
-#line 27
         v_0 = _S4;
-
-#line 27
     }
-
-#line 27
     livenessEnd_1(i_0, 0);
-
-
-
     return int(v_0);
 }
 
-
-#line 6
 struct SomeStruct_0
 {
     int a_1;
@@ -116,239 +55,107 @@ struct SomeStruct_0
     int  c_0[100];
 };
 
-
-#line 17
 SomeStruct_0 makeSomeStruct_0()
 {
-    const int  _S6[100] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-
-#line 19
-    SomeStruct_0 s_0 = { 0, 0, _S6 };
+    const int  _S5[100] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+    SomeStruct_0 s_0 = { 0, 0, _S5 };
     return s_0;
 }
 
-
-#line 15
-layout(std430, binding = 1) buffer _S7 {
+layout(std430, binding = 1) buffer _S6 {
     int _data[];
 } anotherBuffer_0;
-
-#line 40
 int doThing_0(SomeStruct_0 s_1)
 {
     return s_1.x_0 * 2 + 1;
 }
 
-
-#line 34
 int somethingElse_0(inout SomeStruct_0 s_2)
 {
     s_2.x_0 = s_2.x_0 + 1;
     return s_2.x_0;
 }
 
-
-#line 4
-layout(std430, binding = 0) buffer _S8 {
+layout(std430, binding = 0) buffer _S7 {
     int _data[];
 } outputBuffer_0;
-
-#line 4
 spirv_instruction(id = 256)
 void livenessStart_2(spirv_by_reference SomeStruct_0 _0, spirv_literal int _1);
 
-
-#line 62
 spirv_instruction(id = 257)
 void livenessEnd_2(spirv_by_reference SomeStruct_0 _0, spirv_literal int _1);
 
-
-#line 46
 layout(local_size_x = 4, local_size_y = 1, local_size_z = 1) in;
 void main()
 {
-
-#line 48
     int index_0 = int(gl_GlobalInvocationID.x);
-
-#line 48
-    int i_2;
-
-#line 48
+    int i_1;
     int res_0;
-
-#line 48
-    livenessStart_0(i_2, 0);
-
-#line 48
-    i_2 = 0;
-
-#line 48
+    livenessStart_0(i_1, 0);
+    i_1 = 0;
     livenessStart_0(res_0, 0);
-
-#line 48
     res_0 = index_0;
-
-#line 48
     for(;;)
     {
-
-
-        if(i_2 < index_0)
+        if(i_1 < index_0)
         {
         }
         else
         {
             break;
         }
-
-#line 54
         int v_1 = someSlowFunc_0(index_0);
-
         SomeStruct_0 s_3;
-
-#line 56
         livenessStart_2(s_3, 0);
         SomeStruct_0 t_0;
-
-#line 57
         livenessStart_2(t_0, 0);
-
-#line 57
-        SomeStruct_0 _S9 = makeSomeStruct_0();
-
-#line 57
-        t_0 = _S9;
-        const int  _S10[100] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-
-#line 58
-        SomeStruct_0 u_0 = { 0, 0, _S10 };
-
-#line 58
+        SomeStruct_0 _S8 = makeSomeStruct_0();
+        t_0 = _S8;
+        const int  _S9[100] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+        SomeStruct_0 u_0 = { 0, 0, _S9 };
         SomeStruct_0 u_1;
-
         if(bool(v_1 & 256))
         {
             s_3.x_0 = ((anotherBuffer_0)._data[(uint(v_1 & 3))]);
             t_0.x_0 = ((anotherBuffer_0)._data[(uint(v_1 & 3))]);
-
-#line 63
             livenessStart_2(u_1, 0);
-
-#line 63
             u_1 = u_0;
-
-#line 63
         }
         else
         {
-
-
             SomeStruct_0 x_1;
-
-#line 68
             livenessStart_2(x_1, 0);
-
-#line 68
             x_1 = u_0;
             x_1.x_0 = ((anotherBuffer_0)._data[(uint(v_1 & 3))]) + 1;
-            SomeStruct_0 _S11 = x_1;
-
-#line 70
+            SomeStruct_0 _S10 = x_1;
             livenessEnd_2(x_1, 0);
-
-#line 70
             livenessStart_2(u_1, 0);
-
-#line 70
-            u_1 = _S11;
-
-#line 70
+            u_1 = _S10;
         }
-
-
-
         s_3.c_0[index_0 & 7] = s_3.c_0[index_0 & 7] + 1;
-
-        int _S12 = s_3.x_0 + t_0.x_0;
-
-#line 76
-        SomeStruct_0 _S13 = u_1;
-
-#line 76
+        int _S11 = s_3.x_0 + t_0.x_0;
+        SomeStruct_0 _S12 = u_1;
         livenessEnd_2(u_1, 0);
-
-#line 76
-        int _S14 = _S12 + _S13.x_0;
-
-#line 76
-        int _S15 = doThing_0(t_0);
-
-#line 76
-        int _S16 = _S14 + _S15;
-
-#line 76
-        int _S17 = somethingElse_0(t_0);
-
-#line 76
+        int _S13 = _S11 + _S12.x_0;
+        int _S14 = doThing_0(t_0);
+        int _S15 = _S13 + _S14;
+        int _S16 = somethingElse_0(t_0);
         livenessEnd_2(t_0, 0);
-
-#line 76
-        int _S18 = _S16 + _S17;
-
-#line 76
-        int _S19 = s_3.c_0[2];
-
-#line 76
+        int _S17 = _S15 + _S16;
+        int _S18 = s_3.c_0[2];
         livenessEnd_2(s_3, 0);
-
-#line 76
-        int _S20 = _S18 + _S19;
-
-#line 76
-        int _S21 = res_0;
-
-#line 76
+        int _S19 = _S17 + _S18;
+        int _S20 = res_0;
         livenessEnd_1(res_0, 0);
-
-#line 76
-        int res_1 = _S21 + _S20;
-
-#line 52
-        int _S22 = i_2;
-
-#line 52
-        livenessEnd_1(i_2, 0);
-
-#line 52
-        int i_3 = _S22 + 1;
-
-#line 52
-        livenessStart_0(i_2, 0);
-
-#line 52
-        i_2 = i_3;
-
-#line 52
+        int res_1 = _S20 + _S19;
+        i_1 = i_1 + 1;
         livenessStart_0(res_0, 0);
-
-#line 52
         res_0 = res_1;
-
-#line 52
     }
-
-#line 52
-    livenessEnd_1(i_2, 0);
-
-#line 52
-    int _S23 = res_0;
-
-#line 52
+    livenessEnd_1(i_1, 0);
+    int _S21 = res_0;
     livenessEnd_1(res_0, 0);
-
-#line 79
-    ((outputBuffer_0)._data[(uint(index_0))]) = _S23;
+    ((outputBuffer_0)._data[(uint(index_0))]) = _S21;
     return;
 }