Tuple swizzling, concat, comparison and `countof`. (#4856)

* Tuple swizzling and element access.

* Update proposal status.

* Cleanup.

* Fix merrge error.

* Address review.

4 files changed, 125 insertions, 0 deletions

diff --git a/tests/language-feature/tuple/tuple-basic.slang b/tests/language-feature/tuple/tuple-basic.slang
new file mode 100644
index 000000000..113c066be
--- /dev/null
+++ b/tests/language-feature/tuple/tuple-basic.slang
@@ -0,0 +1,25 @@
+// Test tuple swizzling and element access.
+
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-shaderobj
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-dx12 -use-dxil -shaderobj
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -shaderobj
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -shaderobj
+
+//TEST_INPUT:ubuffer(data=[1 2 3 4], stride=4):out,name=outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+void store(inout Tuple<int, float, uint> t)
+{
+    t._1_2 = Tuple<float, uint>(3.0, 4);
+}
+
+[numthreads(1, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    var t = Tuple<int, float, uint>(1, 2.0, 3u);
+    store(t);
+    let y = t._1_2_0;
+
+    // CHECK: 4
+    outputBuffer[0] = y._1;
+}
diff --git a/tests/language-feature/tuple/tuple-compare.slang b/tests/language-feature/tuple/tuple-compare.slang
new file mode 100644
index 000000000..b4d0e7833
--- /dev/null
+++ b/tests/language-feature/tuple/tuple-compare.slang
@@ -0,0 +1,44 @@
+// Test tuple comparison.
+
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-shaderobj -output-using-type
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-dx12 -use-dxil -shaderobj -output-using-type
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -shaderobj -output-using-type
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -shaderobj -output-using-type
+
+//TEST_INPUT:ubuffer(data=[1 2 3 4], stride=4):out,name=outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+[numthreads(1, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    var t = makeTuple(1, 2, 2.0);
+    var u = makeTuple(1, 3, 2.0);
+
+    // CHECK: 1
+    if (t._0_2 == u._0_2 && t != u)
+        outputBuffer[0] = 1;
+
+    int result = 1;
+    if (t < t) result = 0;
+    if (!(t <= t)) result = 0;
+    if (t != t) result = 0;
+    if (t > t) result = 0;
+    if (!(t >= t)) result = 0;
+
+    if (!(t < u)) result = 0;
+    if (!(t <= u)) result = 0;
+    if (!(t != u)) result = 0;
+    if (t == u) result = 0;
+    if (t > u) result = 0;
+    if (t >= u) result = 0;
+
+    if (!(u > t)) result = 0;
+    if (!(u >= t)) result = 0;
+    if (!(u != t)) result = 0;
+    if (u == t) result = 0;
+    if (u < t) result = 0;
+    if (u <= t) result = 0;
+
+    // CHECK: 1
+    outputBuffer[1] = result;
+}
diff --git a/tests/language-feature/tuple/tuple-concat.slang b/tests/language-feature/tuple/tuple-concat.slang
new file mode 100644
index 000000000..93765380d
--- /dev/null
+++ b/tests/language-feature/tuple/tuple-concat.slang
@@ -0,0 +1,36 @@
+// Test tuple swizzling and element access.
+
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-shaderobj -output-using-type
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-dx12 -use-dxil -shaderobj -output-using-type
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -shaderobj -output-using-type
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -shaderobj -output-using-type
+
+//TEST_INPUT:ubuffer(data=[1 2 3 4], stride=4):out,name=outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+struct GetCount<let N : int>
+{
+    static const int value = N;
+}
+
+int getCount<each T>(Tuple<T> t)
+{
+    return GetCount<countof(T)>.value;
+}
+
+[numthreads(1, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    var t = makeTuple(1, 2.0);
+    var u = makeTuple(3u, 4.0);
+    var r = concat(t, u);
+
+    // CHECK: 4
+    outputBuffer[0] = (int)r._3_2._0;
+
+    // CHECK: 2
+    outputBuffer[1] = (int)r._1;
+
+    // CHECK: 8
+    outputBuffer[2] = countof(r) + getCount(r);
+}
diff --git a/tests/language-feature/tuple/tuple-parameter.slang b/tests/language-feature/tuple/tuple-parameter.slang
new file mode 100644
index 000000000..788b2cc31
--- /dev/null
+++ b/tests/language-feature/tuple/tuple-parameter.slang
@@ -0,0 +1,20 @@
+// Test using tuples in shader parameters.
+
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-shaderobj
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-dx12 -use-dxil -shaderobj
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -shaderobj
+
+//TEST_INPUT:ubuffer(data=[1 2 3 4], stride=4):out,name=outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+//TEST_INPUT: set g_texture = new Tuple<Texture2D, SamplerState>{Texture2D(size=4, content=one), Sampler}
+ConstantBuffer<Tuple<Texture2D, SamplerState>> g_texture;
+//TEST_INPUT: set g_texture2 = new Tuple<Texture2D, SamplerState>{Texture2D(size=4, content=one), Sampler}
+ConstantBuffer<Tuple<Texture2D, SamplerState>> g_texture2;
+
+[numthreads(1, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    // CHECK: 4
+    outputBuffer[0] = (int)g_texture2._0.SampleLevel(g_texture._1, float2(0.0), 0).x;
+}