Migrate render-test away from deprecated compile request API (#6514)

aleino-nv · web-flow · commit f4d5372d3354 · 2025-03-12T13:44:57.000+02:00
* Add a simple interface parameter test Since there's no documentation, it's nice to have a simple test case in order to experiment with this feature of the testing framework. * Add shader entry point attributes to tests * Fix specialization arguments for tests - Add some missing arguments - Rremove one extraneous argument. * Stop using deprecated compile request in render-test Use a session object instead of the deprecated compile request object. This closes issue #4760.
diff --git a/tests/bugs/texture2d-gather.hlsl b/tests/bugs/texture2d-gather.hlsl
@@ -31,6 +31,7 @@ struct VertexStageOutput
 	float4			position		: SV_Position;
 };
 
+[shader("vertex")]
 VertexStageOutput vertexMain(VertexStageInput input) 
 {
     VertexStageOutput output;
@@ -41,7 +42,7 @@ VertexStageOutput vertexMain(VertexStageInput input)
     return output;
 }
 
-// Fragment Shader
+[shader("fragment")]
 float4 fragmentMain(VertexStageOutput input) : SV_Target
 {
     return g_texture.GatherRed(g_sampler, input.color.xy);
diff --git a/tests/compute/compile-time-loop.slang b/tests/compute/compile-time-loop.slang
@@ -45,6 +45,7 @@ struct VertexStageOutput
 	float4			sv_position		: SV_Position;
 };
 
+[shader("vertex")]
 VertexStageOutput vertexMain(VertexStageInput input)
 {
 	VertexStageOutput output;
@@ -70,6 +71,7 @@ struct FragmentStageOutput
 	Fragment fragment	: SV_Target;
 };
 
+[shader("fragment")]
 FragmentStageOutput fragmentMain(FragmentStageInput input)
 {
 	FragmentStageOutput output;
diff --git a/tests/compute/constexpr.slang b/tests/compute/constexpr.slang
@@ -52,6 +52,7 @@ struct VertexStageOutput
 	float4			sv_position		: SV_Position;
 };
 
+[shader("vertex")]
 VertexStageOutput vertexMain(VertexStageInput input)
 {
 	VertexStageOutput output;
@@ -77,6 +78,7 @@ struct FragmentStageOutput
 	Fragment fragment	: SV_Target;
 };
 
+[shader("fragment")]
 FragmentStageOutput fragmentMain(FragmentStageInput input)
 {
 	// The texel offset argument to `Texture2D.Sample` is
diff --git a/tests/compute/discard-stmt.slang b/tests/compute/discard-stmt.slang
@@ -46,6 +46,7 @@ struct VertexStageOutput
 	float4			sv_position		: SV_Position;
 };
 
+[shader("vertex")]
 VertexStageOutput vertexMain(VertexStageInput input)
 {
 	VertexStageOutput output;
@@ -71,6 +72,7 @@ struct FragmentStageOutput
 	Fragment fragment	: SV_Target;
 };
 
+[shader("fragment")]
 FragmentStageOutput fragmentMain(FragmentStageInput input)
 {
 	FragmentStageOutput output;
diff --git a/tests/compute/dynamic-dispatch-bindless-texture.slang b/tests/compute/dynamic-dispatch-bindless-texture.slang
@@ -25,7 +25,6 @@ void computeMain(int3       dispatchThreadID : SV_DispatchThreadID)
     gOutputBuffer[tid] = uint(trunc(outputVal));
 }
 
-//TEST_INPUT: globalExistentialType __Dynamic
 
 // Type must be marked `public` to ensure it is visible in the generated DLL.
 export struct MyImpl : IInterface
diff --git a/tests/compute/interface-shader-param.slang b/tests/compute/interface-shader-param.slang
@@ -84,6 +84,7 @@ RWStructuredBuffer<int> gOutputBuffer;
 // Now we'll define a global shader parameter for the
 // random number generation strategy.
 //
+//TEST_INPUT: globalSpecializationArg MyStrategy
 //TEST_INPUT:set gStrategy = new MyStrategy{}
 uniform IRandomNumberGenerationStrategy gStrategy;
 
@@ -93,6 +94,7 @@ uniform IRandomNumberGenerationStrategy gStrategy;
 //
 [numthreads(4, 1, 1)]
 void computeMain(
+//TEST_INPUT: entryPointSpecializationArg MyModifier
 //TEST_INPUT:set modifier = new MyModifier{}
     uniform IModifier   modifier,
             int3       dispatchThreadID : SV_DispatchThreadID)
diff --git a/tests/compute/simple-interface-parameter.slang b/tests/compute/simple-interface-parameter.slang
@@ -0,0 +1,27 @@
+//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
+
+interface IGetter
+{
+    int get(int x);
+}
+
+//TEST_INPUT:set gOutputBuffer = out ubuffer(data=[0 0 0 0], stride=4)
+RWStructuredBuffer<int> gOutputBuffer;
+
+//TEST_INPUT: globalSpecializationArg MyGetter
+//TEST_INPUT: set gGetter = new MyGetter{}
+uniform IGetter gGetter;
+
+[numthreads(4, 1, 1)]
+void computeMain(int3 dispatchThreadID : SV_DispatchThreadID)
+{
+    gOutputBuffer[dispatchThreadID.x] = gGetter.get(dispatchThreadID.x);
+}
+
+struct MyGetter : IGetter
+{
+    int get(int x)
+    {
+        return x + 1;
+    }
+}
diff --git a/tests/compute/simple-interface-parameter.slang.expected.txt b/tests/compute/simple-interface-parameter.slang.expected.txt
@@ -0,0 +1,4 @@
+1
+2
+3
+4
diff --git a/tests/compute/texture-sampling-no-1d-arrays.slang b/tests/compute/texture-sampling-no-1d-arrays.slang
@@ -60,6 +60,7 @@ struct VertexStageOutput
 	float4			sv_position		: SV_Position;
 };
 
+[shader("vertex")]
 VertexStageOutput vertexMain(VertexStageInput input)
 {
 	VertexStageOutput output;
@@ -85,6 +86,7 @@ struct FragmentStageOutput
 	Fragment fragment	: SV_Target;
 };
 
+[shader("fragment")]
 FragmentStageOutput fragmentMain(FragmentStageInput input)
 {
 	FragmentStageOutput output;
diff --git a/tests/glsl-intrinsic/shader-invocation-group/shader-invocation-group.slang b/tests/glsl-intrinsic/shader-invocation-group/shader-invocation-group.slang
@@ -34,6 +34,8 @@ bool testAllInvocationsEqual()
         && allInvocationsEqual(gl_GlobalInvocationID.x == 0) == false
         ;
 }
+
+[shader("compute")]
 void computeMain()
 {
     outputBuffer.data[0] = true
diff --git a/tests/glsl-intrinsic/shader-subgroup/shader-subgroup-arithmetic_Exclusive.slang b/tests/glsl-intrinsic/shader-subgroup/shader-subgroup-arithmetic_Exclusive.slang
@@ -183,6 +183,7 @@ bool testArithmetic() {
         ;
 }
 
+[shader("compute")]
 void computeMain()
 {
 
diff --git a/tests/glsl-intrinsic/shader-subgroup/shader-subgroup-arithmetic_Inclusive.slang b/tests/glsl-intrinsic/shader-subgroup/shader-subgroup-arithmetic_Inclusive.slang
@@ -183,6 +183,7 @@ bool testArithmetic() {
         ;
 }
 
+[shader("compute")]
 void computeMain()
 {
 
diff --git a/tests/glsl-intrinsic/shader-subgroup/shader-subgroup-arithmetic_None.slang b/tests/glsl-intrinsic/shader-subgroup/shader-subgroup-arithmetic_None.slang
@@ -182,6 +182,7 @@ bool testArithmetic() {
         ;
 }
 
+[shader("compute")]
 void computeMain()
 {
 
diff --git a/tests/glsl-intrinsic/shader-subgroup/shader-subgroup-ballot.slang b/tests/glsl-intrinsic/shader-subgroup/shader-subgroup-ballot.slang
@@ -139,6 +139,7 @@ bool testBallot() {
         ;
 }
 
+[shader("compute")]
 void computeMain()
 {
     outputBuffer.data[0] = true
diff --git a/tests/glsl-intrinsic/shader-subgroup/shader-subgroup-builtin-variables-2.slang b/tests/glsl-intrinsic/shader-subgroup/shader-subgroup-builtin-variables-2.slang
@@ -16,6 +16,7 @@ buffer MyBlockName2
 
 layout(local_size_x = 4) in;
 
+[shader("compute")]
 void computeMain(int3 dispatchThreadID : SV_DispatchThreadID)
 {
     // There may be some issues with structure padding for global context containing
diff --git a/tests/glsl-intrinsic/shader-subgroup/shader-subgroup-builtin-variables.slang b/tests/glsl-intrinsic/shader-subgroup/shader-subgroup-builtin-variables.slang
@@ -25,6 +25,7 @@ buffer MyBlockName2
 
 layout(local_size_x = 32) in;
 
+[shader("compute")]
 void computeMain()
 {
     if (gl_GlobalInvocationID.x == 3) {
diff --git a/tests/glsl-intrinsic/shader-subgroup/shader-subgroup-vote.slang b/tests/glsl-intrinsic/shader-subgroup/shader-subgroup-vote.slang
@@ -126,6 +126,7 @@ void _barrier()
 #endif
 }
 
+[shader("compute")]
 void computeMain()
 {
     //seperate tests since testing concurrency
diff --git a/tests/glsl/ssbo.slang b/tests/glsl/ssbo.slang
@@ -17,6 +17,7 @@ buffer MyBlockName2
 } outputBuffer;
 
 layout(local_size_x = 4) in;
+[shader("compute")]
 void computeMain()
 {
     outputBuffer.data[gl_GlobalInvocationID.x] = inputBuffer.data[gl_GlobalInvocationID.x];
diff --git a/tests/language-feature/shader-params/interface-shader-param-ordinary.slang b/tests/language-feature/shader-params/interface-shader-param-ordinary.slang
@@ -23,6 +23,7 @@ RWStructuredBuffer<int> gOutputBuffer;
 //TEST_INPUT:set delta = 65536
 uniform int delta;
 
+//TEST_INPUT: globalSpecializationArg MyModifier
 //TEST_INPUT:set gModifier = new MyModifier{ ubuffer(data=[4 3 2 1], stride=4), 3 } }
 uniform IModifier gModifier;
 
diff --git a/tests/pipeline/rasterization/mesh/task-groupshared.slang b/tests/pipeline/rasterization/mesh/task-groupshared.slang
@@ -32,6 +32,7 @@ struct MeshPayload
 groupshared MeshPayload p;
 
 [numthreads(1, 1, 1)]
+[shader("amplification")]
 void taskMain(in uint tig : SV_GroupIndex)
 {
     p.exponent = 3;
diff --git a/tests/pipeline/rasterization/mesh/task-simple.slang b/tests/pipeline/rasterization/mesh/task-simple.slang
@@ -35,6 +35,7 @@ struct MeshPayload
 };
 
 [numthreads(1, 1, 1)]
+[shader("amplification")]
 void taskMain(in uint tig : SV_GroupIndex)
 {
     MeshPayload p;
diff --git a/tests/render/cross-compile-entry-point.slang b/tests/render/cross-compile-entry-point.slang
@@ -50,6 +50,7 @@ struct VertexStageOutput
 	float4			sv_position		: SV_Position;
 };
 
+[shader("vertex")]
 VertexStageOutput vertexMain(VertexStageInput input)
 {
 	VertexStageOutput output;
@@ -76,6 +77,7 @@ struct FragmentStageOutput
 	Fragment fragment	: SV_Target;
 };
 
+[shader("fragment")]
 FragmentStageOutput fragmentMain(FragmentStageInput input)
 {
 	FragmentStageOutput output;
diff --git a/tests/render/cross-compile0.hlsl b/tests/render/cross-compile0.hlsl
@@ -45,6 +45,7 @@ struct VertexStageOutput
 	float4			sv_position		: SV_Position;
 };
 
+[shader("vertex")]
 VertexStageOutput vertexMain(VertexStageInput input)
 {
 	VertexStageOutput output;
@@ -71,6 +72,7 @@ struct FragmentStageOutput
 	Fragment fragment	: SV_Target;
 };
 
+[shader("fragment")]
 FragmentStageOutput fragmentMain(FragmentStageInput input)
 {
 	FragmentStageOutput output;
diff --git a/tests/render/imported-parameters.hlsl b/tests/render/imported-parameters.hlsl
@@ -38,6 +38,7 @@ struct VertexStageOutput
 	float4			sv_position		: SV_Position;
 };
 
+[shader("vertex")]
 VertexStageOutput vertexMain(VertexStageInput input)
 {
 	VertexStageOutput output;
@@ -64,6 +65,7 @@ struct FragmentStageOutput
 	Fragment fragment	: SV_Target;
 };
 
+[shader("fragment")]
 FragmentStageOutput fragmentMain(FragmentStageInput input)
 {
 	FragmentStageOutput output;
diff --git a/tests/render/multiple-stage-io-locations-without-user-semantics.slang b/tests/render/multiple-stage-io-locations-without-user-semantics.slang
@@ -31,6 +31,7 @@ struct VertexStageOutput
     float4 sv_position     : SV_Position;
 };
 
+[shader("vertex")]
 VertexStageOutput vertexMain(VertexStageInput input)
 {
     VertexStageOutput output;
@@ -58,6 +59,7 @@ struct FragmentStageOutput
     Fragment fragment : SV_Target;
 };
 
+[shader("fragment")]
 FragmentStageOutput fragmentMain(FragmentStageInput input)
 {
     FragmentStageOutput output;
diff --git a/tests/render/multiple-stage-io-locations.slang b/tests/render/multiple-stage-io-locations.slang
@@ -32,6 +32,7 @@ struct VertexStageOutput
     float4 sv_position     : SV_Position;
 };
 
+[shader("vertex")]
 VertexStageOutput vertexMain(VertexStageInput input)
 {
     VertexStageOutput output;
@@ -59,6 +60,7 @@ struct FragmentStageOutput
     Fragment fragment : SV_Target;
 };
 
+[shader("fragment")]
 FragmentStageOutput fragmentMain(FragmentStageInput input)
 {
     FragmentStageOutput output;
diff --git a/tests/render/nointerpolation.hlsl b/tests/render/nointerpolation.hlsl
@@ -41,6 +41,7 @@ struct VertexStageOutput
 	float4			sv_position		: SV_Position;
 };
 
+[shader("vertex")]
 VertexStageOutput vertexMain(VertexStageInput input)
 {
 	VertexStageOutput output;
@@ -66,6 +67,7 @@ struct FragmentStageOutput
 	Fragment fragment	: SV_Target;
 };
 
+[shader("fragment")]
 FragmentStageOutput fragmentMain(FragmentStageInput input)
 {
 	FragmentStageOutput output;
diff --git a/tests/render/render0.hlsl b/tests/render/render0.hlsl
@@ -38,6 +38,7 @@ struct VertexStageOutput
 	float4			sv_position		: SV_Position;
 };
 
+[shader("vertex")]
 VertexStageOutput vertexMain(VertexStageInput input)
 {
 	VertexStageOutput output;
@@ -63,6 +64,7 @@ struct FragmentStageOutput
 	Fragment fragment	: SV_Target;
 };
 
+[shader("fragment")]
 FragmentStageOutput fragmentMain(FragmentStageInput input)
 {
 	FragmentStageOutput output;
diff --git a/tools/render-test/slang-support.cpp b/tools/render-test/slang-support.cpp
diff --git a/tools/render-test/slang-support.h b/tools/render-test/slang-support.h

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ struct VertexStageOutput`
`31`	`31`	`float4 position : SV_Position;`
`32`	`32`	`};`
`33`	`33`
	`34`	`+[shader("vertex")]`
`34`	`35`	`VertexStageOutput vertexMain(VertexStageInput input)`
`35`	`36`	`{`
`36`	`37`	`VertexStageOutput output;`
`@@ -41,7 +42,7 @@ VertexStageOutput vertexMain(VertexStageInput input)`
`41`	`42`	`return output;`
`42`	`43`	`}`
`43`	`44`
`44`		`-// Fragment Shader`
	`45`	`+[shader("fragment")]`
`45`	`46`	`float4 fragmentMain(VertexStageOutput input) : SV_Target`
`46`	`47`	`{`
`47`	`48`	`return g_texture.GatherRed(g_sampler, input.color.xy);`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ struct VertexStageOutput`
`45`	`45`	`float4 sv_position : SV_Position;`
`46`	`46`	`};`
`47`	`47`
	`48`	`+[shader("vertex")]`
`48`	`49`	`VertexStageOutput vertexMain(VertexStageInput input)`
`49`	`50`	`{`
`50`	`51`	`VertexStageOutput output;`
`@@ -70,6 +71,7 @@ struct FragmentStageOutput`
`70`	`71`	`Fragment fragment : SV_Target;`
`71`	`72`	`};`
`72`	`73`
	`74`	`+[shader("fragment")]`
`73`	`75`	`FragmentStageOutput fragmentMain(FragmentStageInput input)`
`74`	`76`	`{`
`75`	`77`	`FragmentStageOutput output;`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ struct VertexStageOutput`
`52`	`52`	`float4 sv_position : SV_Position;`
`53`	`53`	`};`
`54`	`54`
	`55`	`+[shader("vertex")]`
`55`	`56`	`VertexStageOutput vertexMain(VertexStageInput input)`
`56`	`57`	`{`
`57`	`58`	`VertexStageOutput output;`
`@@ -77,6 +78,7 @@ struct FragmentStageOutput`
`77`	`78`	`Fragment fragment : SV_Target;`
`78`	`79`	`};`
`79`	`80`
	`81`	`+[shader("fragment")]`
`80`	`82`	`FragmentStageOutput fragmentMain(FragmentStageInput input)`
`81`	`83`	`{`
`82`	`84`	// The texel offset argument to `Texture2D.Sample` is
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ struct VertexStageOutput`
`46`	`46`	`float4 sv_position : SV_Position;`
`47`	`47`	`};`
`48`	`48`
	`49`	`+[shader("vertex")]`
`49`	`50`	`VertexStageOutput vertexMain(VertexStageInput input)`
`50`	`51`	`{`
`51`	`52`	`VertexStageOutput output;`
`@@ -71,6 +72,7 @@ struct FragmentStageOutput`
`71`	`72`	`Fragment fragment : SV_Target;`
`72`	`73`	`};`
`73`	`74`
	`75`	`+[shader("fragment")]`
`74`	`76`	`FragmentStageOutput fragmentMain(FragmentStageInput input)`
`75`	`77`	`{`
`76`	`78`	`FragmentStageOutput output;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ void computeMain(int3 dispatchThreadID : SV_DispatchThreadID)`
`25`	`25`	`gOutputBuffer[tid] = uint(trunc(outputVal));`
`26`	`26`	`}`
`27`	`27`
`28`		`-//TEST_INPUT: globalExistentialType __Dynamic`
`29`	`28`
`30`	`29`	// Type must be marked `public` to ensure it is visible in the generated DLL.
`31`	`30`	`export struct MyImpl : IInterface`
-Original file line number
+Diff line change
 +1
 +2
 +3
 +4
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ struct VertexStageOutput`
`60`	`60`	`float4 sv_position : SV_Position;`
`61`	`61`	`};`
`62`	`62`
	`63`	`+[shader("vertex")]`
`63`	`64`	`VertexStageOutput vertexMain(VertexStageInput input)`
`64`	`65`	`{`
`65`	`66`	`VertexStageOutput output;`
`@@ -85,6 +86,7 @@ struct FragmentStageOutput`
`85`	`86`	`Fragment fragment : SV_Target;`
`86`	`87`	`};`
`87`	`88`
	`89`	`+[shader("fragment")]`
`88`	`90`	`FragmentStageOutput fragmentMain(FragmentStageInput input)`
`89`	`91`	`{`
`90`	`92`	`FragmentStageOutput output;`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ bool testAllInvocationsEqual()`
`34`	`34`	`&& allInvocationsEqual(gl_GlobalInvocationID.x == 0) == false`
`35`	`35`	`;`
`36`	`36`	`}`
	`37`	`+`
	`38`	`+[shader("compute")]`
`37`	`39`	`void computeMain()`
`38`	`40`	`{`
`39`	`41`	`outputBuffer.data[0] = true`
Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,7 @@ bool testArithmetic() {`
`183`	`183`	`;`
`184`	`184`	`}`
`185`	`185`
	`186`	`+[shader("compute")]`
`186`	`187`	`void computeMain()`
`187`	`188`	`{`
`188`	`189`
Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,7 @@ bool testArithmetic() {`
`182`	`182`	`;`
`183`	`183`	`}`
`184`	`184`
	`185`	`+[shader("compute")]`
`185`	`186`	`void computeMain()`
`186`	`187`	`{`
`187`	`188`