From cbdc7e1219e472fd74f7f559d7e417f233e7df39 Mon Sep 17 00:00:00 2001 From: Julius Ikkala Date: Tue, 14 Jan 2025 20:32:29 +0200 Subject: Implement specialization constant support in numthreads / local_size (#5963) * Allow using specialization constants in numthreads attribute * Add support for GLSL local_size_x_id syntax * Fix overeager specialization constant parsing * Add diagnostics for specialization constant numthreads * Remove unused variable * Fix local_size_x_id not finding existing specialization constant * Allow materializeGetWorkGroupSize to reference specialization constants * Use SpvOpExecutionModeId for modes that require it * Cleanup specialization constant numthreads code * Add tests for specialization constant work group sizes * Fix implicit Slang::Int -> int32_t cast * Fix querying thread group size in reflection API --------- Co-authored-by: Yong He --- tests/spirv/spec-constant-numthreads.slang | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 tests/spirv/spec-constant-numthreads.slang (limited to 'tests/spirv') diff --git a/tests/spirv/spec-constant-numthreads.slang b/tests/spirv/spec-constant-numthreads.slang new file mode 100644 index 000000000..5c133219c --- /dev/null +++ b/tests/spirv/spec-constant-numthreads.slang @@ -0,0 +1,35 @@ +//TEST:SIMPLE(filecheck=GLSL): -target glsl -allow-glsl +//TEST:SIMPLE(filecheck=GLSL): -target glsl +//TEST:SIMPLE(filecheck=CHECK): -target spirv -allow-glsl +//TEST:SIMPLE(filecheck=CHECK): -target spirv + +// CHECK-DAG: OpExecutionModeId %computeMain1 LocalSizeId %[[C0:[0-9A-Za-z_]+]] %[[C1:[0-9A-Za-z_]+]] %[[C2:[0-9A-Za-z_]+]] +// CHECK-DAG: OpDecorate %[[C0]] SpecId 1 +// CHECK-DAG: OpDecorate %[[C1]] SpecId 0 +// CHECK-DAG: %[[C2]] = OpConstant %int 4 +// CHECK-DAG: OpStore %{{.*}} %[[C0]] +// CHECK-DAG: OpStore %{{.*}} %[[C1]] +// CHECK-DAG: OpStore %{{.*}} %[[C2]] + +// GLSL-DAG: layout(constant_id = 1) +// GLSL-DAG: int constValue0_0 = 0; +// GLSL-DAG: layout(constant_id = 0) +// GLSL-DAG: int constValue1_0 = 0; +// GLSL-DAG: layout(local_size_x_id = 1, local_size_y_id = 0, local_size_z = 4) in; + +[vk::specialization_constant] +const int constValue0 = 0; + +[vk::constant_id(0)] +const int constValue1 = 0; + +RWStructuredBuffer outputBuffer; + +[numthreads(constValue0, constValue1, 4)] +void computeMain1() +{ + int3 size = WorkgroupSize(); + outputBuffer[0] = size.x; + outputBuffer[1] = size.y; + outputBuffer[2] = size.z; +} -- cgit v1.2.3