11 files changed, 44 insertions, 8 deletions
diff --git a/tests/bindings/multiple-parameter-blocks.slang b/tests/bindings/multiple-parameter-blocks.slang
index 0fdf7d429..093d2ea43 100644
--- a/tests/bindings/multiple-parameter-blocks.slang
+++ b/tests/bindings/multiple-parameter-blocks.slang
@@ -1,4 +1,4 @@
-//TEST:COMPARE_HLSL:-no-mangle -use-ir -target dxbc-assembly -profile ps_5_1 -entry main
+//TEST:COMPARE_HLSL:-no-mangle -use-ir -target dxbc-assembly -profile ps_5_1 -entry main -parameter-blocks-use-register-spaces
 
 // Confirm that Slang `ParameterBlock<T>` generates
 // parameter bindings like we expect.
diff --git a/tests/bindings/parameter-blocks.slang b/tests/bindings/parameter-blocks.slang
index cd916f144..38f99d105 100644
--- a/tests/bindings/parameter-blocks.slang
+++ b/tests/bindings/parameter-blocks.slang
@@ -1,4 +1,4 @@
-//TEST:COMPARE_HLSL:-no-mangle -use-ir -target dxbc-assembly -profile ps_5_1 -entry main
+//TEST:COMPARE_HLSL:-no-mangle -use-ir -target dxbc-assembly -profile ps_5_1 -entry main -parameter-blocks-use-register-spaces
 
 // Confirm that Slang `ParameterBlock<T>` generates
 // parameter bindings like we expect.
diff --git a/tests/compute/break-stmt.slang b/tests/compute/break-stmt.slang
index 02f5f9fa9..3f438da54 100644
--- a/tests/compute/break-stmt.slang
+++ b/tests/compute/break-stmt.slang
@@ -1,4 +1,4 @@
-//TEST(compute):COMPARE_COMPUTE:
+//TEST(compute):COMPARE_COMPUTE:-xslang -use-ir
 //TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):dxbinding(0),glbinding(0),out
 
 // Test that `break` from a loop works.
diff --git a/tests/compute/continue-stmt.slang b/tests/compute/continue-stmt.slang
index 9adb5a4a6..800511290 100644
--- a/tests/compute/continue-stmt.slang
+++ b/tests/compute/continue-stmt.slang
@@ -1,4 +1,4 @@
-//TEST(compute):COMPARE_COMPUTE:
+//TEST(compute):COMPARE_COMPUTE:-xslang -use-ir
 //TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):dxbinding(0),glbinding(0),out
 
 // Test that `break` from a loop works.
diff --git a/tests/compute/discard-stmt.slang b/tests/compute/discard-stmt.slang
index 18ffc39e2..5f861ed96 100644
--- a/tests/compute/discard-stmt.slang
+++ b/tests/compute/discard-stmt.slang
@@ -1,4 +1,4 @@
-//TEST(compute):COMPARE_RENDER_COMPUTE:
+//TEST(compute):COMPARE_RENDER_COMPUTE:-xslang -use-ir
 //TEST_INPUT: Texture2D(size=4, content = one) : dxbinding(0),glbinding(0)
 //TEST_INPUT: Sampler : dxbinding(0),glbinding(0)
 //TEST_INPUT: ubuffer(data=[0 0], stride=4):dxbinding(1),glbinding(0),out
diff --git a/tests/compute/parameter-block.slang b/tests/compute/parameter-block.slang
new file mode 100644
index 000000000..d10a1e9c2
--- /dev/null
+++ b/tests/compute/parameter-block.slang
@@ -0,0 +1,28 @@
+//TEST(compute):COMPARE_COMPUTE:-xslang -use-ir
+//TEST(compute):COMPARE_COMPUTE:
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out
+//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):dxbinding(1),glbinding(1)
+
+// Ensure that Slang `ParameterBlock` type is lowered
+// to HLSL in the fashion that we expect.
+
+struct P
+{
+	RWStructuredBuffer<int> buffer;
+};
+
+ParameterBlock<P> block0;
+ParameterBlock<P> block1;
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+	uint tid = dispatchThreadID.x;
+
+	int inVal = block1.buffer[tid];
+
+	int outVal = inVal;
+
+	block0.buffer[tid] = outVal;
+}
+\ No newline at end of file
diff --git a/tests/compute/parameter-block.slang.1.expected.txt b/tests/compute/parameter-block.slang.1.expected.txt
new file mode 100644
index 000000000..bc856dafa
--- /dev/null
+++ b/tests/compute/parameter-block.slang.1.expected.txt
@@ -0,0 +1,4 @@
+0
+1
+2
+3
diff --git a/tests/compute/parameter-block.slang.expected.txt b/tests/compute/parameter-block.slang.expected.txt
new file mode 100644
index 000000000..bc856dafa
--- /dev/null
+++ b/tests/compute/parameter-block.slang.expected.txt
@@ -0,0 +1,4 @@
+0
+1
+2
+3
diff --git a/tests/compute/select-expr.slang b/tests/compute/select-expr.slang
index d90708ab9..4d9abfd35 100644
--- a/tests/compute/select-expr.slang
+++ b/tests/compute/select-expr.slang
@@ -1,4 +1,4 @@
-//TEST(smoke,compute):COMPARE_COMPUTE:
+//TEST(smoke,compute):COMPARE_COMPUTE:-xslang -use-ir
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out
 
 
diff --git a/tests/compute/simple.slang b/tests/compute/simple.slang
index 8f53a79b2..b2f1417cf 100644
--- a/tests/compute/simple.slang
+++ b/tests/compute/simple.slang
@@ -1,4 +1,4 @@
-//TEST(smoke,compute):COMPARE_COMPUTE:
+//TEST(smoke,compute):COMPARE_COMPUTE:-xslang -use-ir
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(0),glbinding(0),out
 // This is a basic test for Slang compute shader.
 
diff --git a/tests/compute/textureSamplingTest.slang b/tests/compute/textureSamplingTest.slang
index 1aa267b89..b1255f6c5 100644
--- a/tests/compute/textureSamplingTest.slang
+++ b/tests/compute/textureSamplingTest.slang
@@ -1,4 +1,4 @@
-//TEST(compute):COMPARE_RENDER_COMPUTE:
+//TEST(compute):COMPARE_RENDER_COMPUTE:-xslang -use-ir
 //TEST_INPUT: Texture1D(size=4, content = one) : dxbinding(0),glbinding(0)
 //TEST_INPUT: Texture2D(size=4, content = one) : dxbinding(1),glbinding(1)
 //TEST_INPUT: Texture3D(size=4, content = one) : dxbinding(2),glbinding(2)