diff options
| author | Julius Ikkala <julius.ikkala@gmail.com> | 2025-01-14 20:32:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-14 10:32:29 -0800 |
| commit | cbdc7e1219e472fd74f7f559d7e417f233e7df39 (patch) | |
| tree | e051b90e317a875e264c2c8d951668bf0b7d3ad0 /source/slang/slang-lower-to-ir.cpp | |
| parent | 971996b397711016d47fe961890d7001338c6f23 (diff) | |
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 <yonghe@outlook.com>
Diffstat (limited to 'source/slang/slang-lower-to-ir.cpp')
| -rw-r--r-- | source/slang/slang-lower-to-ir.cpp | 46 |
1 files changed, 40 insertions, 6 deletions
diff --git a/source/slang/slang-lower-to-ir.cpp b/source/slang/slang-lower-to-ir.cpp index e82fc03fd..086345719 100644 --- a/source/slang/slang-lower-to-ir.cpp +++ b/source/slang/slang-lower-to-ir.cpp @@ -7625,12 +7625,29 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo> { verifyComputeDerivativeGroupModifier = true; getAllEntryPointsNoOverride(entryPoints); + + LoweredValInfo extents[3]; + + for (int i = 0; i < 3; ++i) + { + extents[i] = layoutLocalSizeAttr->specConstExtents[i] + ? emitDeclRef( + context, + layoutLocalSizeAttr->specConstExtents[i], + lowerType( + context, + getType( + context->astBuilder, + layoutLocalSizeAttr->specConstExtents[i]))) + : lowerVal(context, layoutLocalSizeAttr->extents[i]); + } + for (auto d : entryPoints) as<IRNumThreadsDecoration>(getBuilder()->addNumThreadsDecoration( d, - getSimpleVal(context, lowerVal(context, layoutLocalSizeAttr->x)), - getSimpleVal(context, lowerVal(context, layoutLocalSizeAttr->y)), - getSimpleVal(context, lowerVal(context, layoutLocalSizeAttr->z)))); + getSimpleVal(context, extents[0]), + getSimpleVal(context, extents[1]), + getSimpleVal(context, extents[2]))); } else if (as<GLSLLayoutDerivativeGroupQuadAttribute>(modifier)) { @@ -10336,11 +10353,28 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo> } else if (auto numThreadsAttr = as<NumThreadsAttribute>(modifier)) { + LoweredValInfo extents[3]; + + for (int i = 0; i < 3; ++i) + { + extents[i] = numThreadsAttr->specConstExtents[i] + ? emitDeclRef( + context, + numThreadsAttr->specConstExtents[i], + lowerType( + context, + getType( + context->astBuilder, + numThreadsAttr->specConstExtents[i]))) + : lowerVal(context, numThreadsAttr->extents[i]); + } + numThreadsDecor = as<IRNumThreadsDecoration>(getBuilder()->addNumThreadsDecoration( irFunc, - getSimpleVal(context, lowerVal(context, numThreadsAttr->x)), - getSimpleVal(context, lowerVal(context, numThreadsAttr->y)), - getSimpleVal(context, lowerVal(context, numThreadsAttr->z)))); + getSimpleVal(context, extents[0]), + getSimpleVal(context, extents[1]), + getSimpleVal(context, extents[2]))); + numThreadsDecor->sourceLoc = numThreadsAttr->loc; } else if (auto waveSizeAttr = as<WaveSizeAttribute>(modifier)) { |