7 files changed, 177 insertions, 4 deletions
diff --git a/tests/compute/constexpr.slang b/tests/compute/constexpr.slang
new file mode 100644
index 000000000..c3f9b6a89
--- /dev/null
+++ b/tests/compute/constexpr.slang
@@ -0,0 +1,111 @@
+// constexpr.slang
+//TEST(compute):COMPARE_COMPUTE_EX:-slang -gcompute
+//DISABLED://TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -gcompute
+//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
+
+// Note: Vulkan version of this test is disabled pending adding
+// support for rendering tests to the harness.
+
+Texture2D tex;
+SamplerState samp;
+RWStructuredBuffer<float> outputBuffer;
+
+cbuffer Uniforms
+{
+	float4x4 modelViewProjection;
+}
+
+struct AssembledVertex
+{
+	float3	position;
+	float3	color;
+    float2  uv;
+};
+
+struct CoarseVertex
+{
+	float3	color;
+    float2  uv;
+};
+
+struct Fragment
+{
+	float4 color;
+};
+
+
+// Vertex  Shader
+
+struct VertexStageInput
+{
+	AssembledVertex assembledVertex	: A;
+};
+
+struct VertexStageOutput
+{
+	CoarseVertex	coarseVertex	: CoarseVertex;
+	float4			sv_position		: SV_Position;
+};
+
+VertexStageOutput vertexMain(VertexStageInput input)
+{
+	VertexStageOutput output;
+
+	float3 position = input.assembledVertex.position;
+	float3 color	= input.assembledVertex.color;
+
+	output.coarseVertex.color = color;
+	output.sv_position = mul(modelViewProjection, float4(position, 1.0));
+    output.coarseVertex.uv = input.assembledVertex.uv;
+	return output;
+}
+
+// Fragment Shader
+
+struct FragmentStageInput
+{
+	CoarseVertex	coarseVertex	: CoarseVertex;
+};
+
+struct FragmentStageOutput
+{
+	Fragment fragment	: SV_Target;
+};
+
+FragmentStageOutput fragmentMain(FragmentStageInput input)
+{
+	// The texel offset argument to `Texture2D.Sample` is
+	// required to be `constexpr`. This test is going to
+	// check that we correctly propagate this constraint
+	// backward to the value `a`.
+	//
+	// Because the HLSL compiler(s) already do this kind
+	// of propagation, the only real way to test this
+	// will be to target Vulkan, where the standard
+	// GLSL compiler gives an error message rather than
+	// infer `const`-ness.
+
+	uint a = 0;
+	constexpr uint b = 1;
+
+	uint2 ab = uint2(a,b);
+
+	FragmentStageOutput output;
+
+	float3 color = input.coarseVertex.color;
+    float2 uv = input.coarseVertex.uv;
+	output.fragment.color = float4(color, 1.0);
+
+	float4 val = float4(color, 1.0);
+	val = val - 16*tex.Sample(samp, uv, ab);
+
+	outputBuffer[0] = 1;
+
+	if(val.x < 0)
+		discard;
+
+	outputBuffer[1] = 1;
+	return output;
+}
+\ No newline at end of file
diff --git a/tests/compute/constexpr.slang.1.expected.txt b/tests/compute/constexpr.slang.1.expected.txt
new file mode 100644
index 000000000..e0e43c4e8
--- /dev/null
+++ b/tests/compute/constexpr.slang.1.expected.txt
@@ -0,0 +1,2 @@
+3F800000
+0
diff --git a/tests/compute/constexpr.slang.expected.txt b/tests/compute/constexpr.slang.expected.txt
new file mode 100644
index 000000000..e0e43c4e8
--- /dev/null
+++ b/tests/compute/constexpr.slang.expected.txt
@@ -0,0 +1,2 @@
+3F800000
+0
diff --git a/tests/diagnostics/constexpr-error.slang b/tests/diagnostics/constexpr-error.slang
new file mode 100644
index 000000000..6006450a1
--- /dev/null
+++ b/tests/diagnostics/constexpr-error.slang
@@ -0,0 +1,45 @@
+//TEST:SIMPLE:
+
+// Failure to pass compile-time-constant data
+// where it is expected.
+//
+// In this case, the place where compile-time-constant
+// data is expected is the texel offset parameter to
+// the `Texture2D.Sample` operation.
+
+Texture2D t;
+SamplerState s;
+
+cbuffer U
+{
+	float2 uv;
+	uint2 offset;
+};
+
+float4 main() : SV_Target
+{
+    float4 result = 0.0f;
+
+    // Okay, immediate constant
+    result += t.Sample(s, uv, uint2(0,0));
+
+    // Error: data passed through cbuffer isn't compile-time constant
+    result += t.Sample(s, uv, offset);
+
+    // Error: data computed via conditional isn't compile-time cosntant
+    uint ii = 0;
+    if(uv.x > 0.0f)
+    {
+    	ii = 1;
+    }
+    result += t.Sample(s, uv, uint2(ii));
+
+    // Error: data computed in loop isn't compile-time constant
+    // (and loop isn't unroll-able)
+    for(uint jj = 0; jj < uv.y; jj++)
+    {
+    	result += t.Sample(s, uv, uint2(jj));
+    }
+
+    return result;
+}
+\ No newline at end of file
diff --git a/tests/diagnostics/constexpr-error.slang.expected b/tests/diagnostics/constexpr-error.slang.expected
new file mode 100644
index 000000000..c0b5e94d3
--- /dev/null
+++ b/tests/diagnostics/constexpr-error.slang.expected
@@ -0,0 +1,8 @@
+result code = -1
+standard error = {
+tests/diagnostics/constexpr-error.slang(27): error 40006: expected a compile-time constant
+tests/diagnostics/constexpr-error.slang(35): error 40006: expected a compile-time constant
+tests/diagnostics/constexpr-error.slang(41): error 40006: expected a compile-time constant
+}
+standard output = {
+}
diff --git a/tests/hlsl/dxsdk/VarianceShadows11/2DQuadShaders.hlsl b/tests/hlsl/dxsdk/VarianceShadows11/2DQuadShaders.hlsl
index 1804c3d3c..3b41d92b3 100644
--- a/tests/hlsl/dxsdk/VarianceShadows11/2DQuadShaders.hlsl
+++ b/tests/hlsl/dxsdk/VarianceShadows11/2DQuadShaders.hlsl
@@ -1,4 +1,9 @@
-//TEST:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile vs_4_0 -entry VSMain -profile ps_4_0 -entry PSBlurX -entry PSBlurY
+//TEST_DISABLED:COMPARE_HLSL:-no-mangle -target dxbc-assembly -profile vs_4_0 -entry VSMain -profile ps_4_0 -entry PSBlurX -entry PSBlurY
+
+//SLANG: This test has been disabled because its semantic correctness
+//around use of compile-time-constant expressions relies on processing
+//the `[unroll]` attribute, and we don't yet support that.
+
 //--------------------------------------------------------------------------------------
 // File: Skinning10.fx
 //
diff --git a/tests/ir/loop.slang.expected b/tests/ir/loop.slang.expected
index 10c091e07..0ff22c2b5 100644
--- a/tests/ir/loop.slang.expected
+++ b/tests/ir/loop.slang.expected
@@ -19,12 +19,12 @@ block %1(
 	let  %6	: StructuredBuffer<vector<float,4>>	= load(@_SV05input)
 	let  %7	: vector<float,4>	= bufferLoad(%6, %2)
 	store(%5, %7)
-	let  %8	: uint	= construct(1)
+	let  %8	: @ConstExpr uint	= construct(1)
 	loop(%9, %10, %11, %8)
 
 block %9(
 		param %12	: uint):
-	let  %13	: uint	= construct(64)
+	let  %13	: @ConstExpr uint	= construct(64)
 	let  %14	: bool	= cmpLT(%12, %13)
 	ifElse(%14, %15, %10, %15)
 
@@ -40,7 +40,7 @@ block %15:
 	unconditionalBranch(%11)
 
 block %11:
-	let  %22	: uint	= construct(1)
+	let  %22	: @ConstExpr uint	= construct(1)
 	let  %23	: uint	= shl(%12, %22)
 	unconditionalBranch(%9, %23)