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 --- source/slang/slang-emit-c-like.cpp | 40 +++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) (limited to 'source/slang/slang-emit-c-like.cpp') diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp index 7b51495e2..d3a9359ff 100644 --- a/source/slang/slang-emit-c-like.cpp +++ b/source/slang/slang-emit-c-like.cpp @@ -295,14 +295,48 @@ void CLikeSourceEmitter::emitSimpleType(IRType* type) } -/* static */ IRNumThreadsDecoration* CLikeSourceEmitter::getComputeThreadGroupSize( +IRNumThreadsDecoration* CLikeSourceEmitter::getComputeThreadGroupSize( IRFunc* func, Int outNumThreads[kThreadGroupAxisCount]) +{ + Int specializationConstantIds[kThreadGroupAxisCount]; + IRNumThreadsDecoration* decor = + getComputeThreadGroupSize(func, outNumThreads, specializationConstantIds); + + for (auto id : specializationConstantIds) + { + if (id >= 0) + { + getSink()->diagnose(decor, Diagnostics::unsupportedSpecializationConstantForNumThreads); + break; + } + } + return decor; +} + +/* static */ IRNumThreadsDecoration* CLikeSourceEmitter::getComputeThreadGroupSize( + IRFunc* func, + Int outNumThreads[kThreadGroupAxisCount], + Int outSpecializationConstantIds[kThreadGroupAxisCount]) { IRNumThreadsDecoration* decor = func->findDecoration(); - for (int i = 0; i < 3; ++i) + for (int i = 0; i < kThreadGroupAxisCount; ++i) { - outNumThreads[i] = decor ? Int(getIntVal(decor->getOperand(i))) : 1; + if (!decor) + { + outNumThreads[i] = 1; + outSpecializationConstantIds[i] = -1; + } + else if (auto specConst = as(decor->getOperand(i))) + { + outNumThreads[i] = 1; + outSpecializationConstantIds[i] = getSpecializationConstantId(specConst); + } + else + { + outNumThreads[i] = Int(getIntVal(decor->getOperand(i))); + outSpecializationConstantIds[i] = -1; + } } return decor; } -- cgit v1.2.3