4 files changed, 255 insertions, 0 deletions
diff --git a/tests/compute/interface-shader-param2.slang b/tests/compute/interface-shader-param2.slang
new file mode 100644
index 000000000..039765084
--- /dev/null
+++ b/tests/compute/interface-shader-param2.slang
@@ -0,0 +1,103 @@
+// interface-shader-param2.slang
+
+// This test builds on `interface-shader-param.slang` by using
+// concrete types that have data within them, instead of
+// just empty types.
+
+//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
+//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12
+//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
+
+// A lot of the setup is the same as for `interface-shader-param`,
+// so look there if you want the comments.
+
+interface IRandomNumberGenerator
+{
+    [mutating]
+    int randomInt();
+}
+
+interface IRandomNumberGenerationStrategy
+{
+    associatedtype Generator : IRandomNumberGenerator;
+    Generator makeGenerator(int seed);
+}
+
+interface IModifier
+{
+    int modify(int val);
+}
+
+int test(
+    int                             seed,
+    IRandomNumberGenerationStrategy inStrategy,
+    IModifier                       modifier)
+{
+    let strategy = inStrategy;
+    var generator = strategy.makeGenerator(seed);
+    let unused = generator.randomInt();
+    let val = generator.randomInt();
+    let modifiedVal = modifier.modify(val);
+    return modifiedVal;
+}
+
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out
+RWStructuredBuffer<int> gOutputBuffer;
+
+//TEST_INPUT:cbuffer(data=[1 0 0 0], stride=4):dxbinding(0),glbinding(1)
+ConstantBuffer<IRandomNumberGenerationStrategy> gStrategy;
+
+[numthreads(4, 1, 1)]
+void computeMain(
+
+//TEST_INPUT:cbuffer(data=[8 0 0 0], stride=4):dxbinding(1),glbinding(2)
+    uniform IModifier   modifier,
+            uint3       dispatchThreadID : SV_DispatchThreadID)
+{
+    let tid = dispatchThreadID.x;
+
+    let inputVal : int = tid;
+    let outputVal = test(inputVal, gStrategy, modifier);
+
+    gOutputBuffer[tid] = outputVal;
+}
+
+// Okay, now we get to the part that is unique starting
+// in this test: we add data to the concrete types
+// that we will use as parameters.
+
+struct MyStrategy : IRandomNumberGenerationStrategy
+{
+    int globalSeed;
+
+    struct Generator : IRandomNumberGenerator
+    {
+        int state;
+
+        [mutating]
+        int randomInt()
+        {
+            return state++;
+        }
+    }
+
+    Generator makeGenerator(int seed)
+    {
+        Generator generator = { seed ^ globalSeed };
+        return generator;
+    }
+}
+
+struct MyModifier : IModifier
+{
+    int localModifier;
+
+    int modify(int val)
+    {
+        return val ^ localModifier;
+    }
+}
+
+//TEST_INPUT: globalExistentialType MyStrategy
+//TEST_INPUT: entryPointExistentialType MyModifier
diff --git a/tests/compute/interface-shader-param2.slang.expected.txt b/tests/compute/interface-shader-param2.slang.expected.txt
new file mode 100644
index 000000000..53b313e7f
--- /dev/null
+++ b/tests/compute/interface-shader-param2.slang.expected.txt
@@ -0,0 +1,4 @@
+A
+9
+C
+B
diff --git a/tests/compute/interface-shader-param3.slang b/tests/compute/interface-shader-param3.slang
new file mode 100644
index 000000000..3a9debaa0
--- /dev/null
+++ b/tests/compute/interface-shader-param3.slang
@@ -0,0 +1,144 @@
+// interface-shader-param3.slang
+
+// This test builds on `interface-shader-param2.slang` by putting
+// interface types at more complicated places in the overall layout.
+//
+
+// NOTE TO SELF:
+//
+// First issue is that the constant buffer layouts aren't being
+// computed correctly for `gStrategy` (even in the previous test),
+// so that it doesn't get a `b` register bound.
+//
+// Second issue is that the type legalization logic is now overzealous,
+// and moves the `modifier` member of the entry-point constant buffer
+// out to global scope, when it should allocate it inside the constant
+// buffer.
+//
+
+
+
+//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
+//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12
+//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
+
+// A lot of the setup is the same as for `interface-shader-param`,
+// so look there if you want the comments.
+
+interface IRandomNumberGenerator
+{
+    [mutating]
+    int randomInt();
+}
+
+interface IRandomNumberGenerationStrategy
+{
+    associatedtype Generator : IRandomNumberGenerator;
+    Generator makeGenerator(int seed);
+}
+
+interface IModifier
+{
+    int modify(int val);
+}
+
+int test(
+    int                             seed,
+    IRandomNumberGenerationStrategy inStrategy,
+    IModifier                       modifier)
+{
+    let strategy = inStrategy;
+    var generator = strategy.makeGenerator(seed);
+    let unused = generator.randomInt();
+    let val = generator.randomInt();
+    let modifiedVal = modifier.modify(val);
+    return modifiedVal;
+}
+
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out
+RWStructuredBuffer<int> gOutputBuffer;
+
+//TEST_INPUT:cbuffer(data=[1 0 0 0], stride=4):dxbinding(0),glbinding(1)
+ConstantBuffer<IRandomNumberGenerationStrategy> gStrategy;
+
+[numthreads(4, 1, 1)]
+void computeMain(
+
+// We will be declaring two different `uniform` parameters in the
+// entry-point parameter list, which will both get allocated to
+// the same constant buffer.
+//
+// The first parameter will use an interface type, while the second
+// will be plain-old-data.
+//
+    uniform IModifier   modifier,
+    uniform int         extra,
+//
+// The computed layout for the entry-point constant buffer will
+// always place the non-interface-type data first, so the first
+// four bytes of our buffer represent the `extra` field.
+//
+// After all the non-interface-type data is laid out, we lay out
+// the contents of extistential value slots in order, using the
+// ordinary constant buffer packing rules. Because the concrete
+// type we'll be plugging in for `modifier` is a `struct` type,
+// it will need to start on a 16-byte-aligned boundary.
+//
+// Here's the incantation to make the test runner fill in the constant buffer:
+//
+//TEST_INPUT:cbuffer(data=[256 0 0 0 16 0 0 0], stride=4):dxbinding(1),glbinding(2)
+//
+// So, the value `256` will be used for `extra` and the value `16`
+// will be written to the first four bytes of the concrete value
+// being used for `modifier`.
+
+            uint3       dispatchThreadID : SV_DispatchThreadID)
+{
+    let tid = dispatchThreadID.x;
+
+    let inputVal : int = tid;
+    let outputVal = test(inputVal, gStrategy, modifier)
+    	+ extra*extra;
+
+    gOutputBuffer[tid] = outputVal;
+}
+
+// Okay, now we get to the part that is unique starting
+// in this test: we add data to the concrete types
+// that we will use as parameters.
+
+struct MyStrategy : IRandomNumberGenerationStrategy
+{
+    int globalSeed;
+
+    struct Generator : IRandomNumberGenerator
+    {
+        int state;
+
+        [mutating]
+        int randomInt()
+        {
+            return state++;
+        }
+    }
+
+    Generator makeGenerator(int seed)
+    {
+        Generator generator = { seed ^ globalSeed };
+        return generator;
+    }
+}
+
+struct MyModifier : IModifier
+{
+    int localModifier;
+
+    int modify(int val)
+    {
+        return val * localModifier;
+    }
+}
+
+//TEST_INPUT: globalExistentialType MyStrategy
+//TEST_INPUT: entryPointExistentialType MyModifier
diff --git a/tests/compute/interface-shader-param3.slang.expected.txt b/tests/compute/interface-shader-param3.slang.expected.txt
new file mode 100644
index 000000000..0a0921254
--- /dev/null
+++ b/tests/compute/interface-shader-param3.slang.expected.txt
@@ -0,0 +1,4 @@
+10020
+10010
+10040
+10030