Skip to content

Commit e7b6de3

Browse files
csyonghecsyonghe
authored
[SPIRV] Support globallycoherent and [vk::index()]. (shader-slang#3488)
* [SPIRV] Support `globallycoherent` modifier. * Fix. * Disable executable cooperative vector tests. * Update expected failure. * [SPIRV] Emit varying output index decoration. * Add test. * Update tests. * Fix test. * Emit `SpvExecutionModeEarlyFragmentTests`. * Lower `StructuredBuffer<bool>`. * Support globallycoherent on ByteAddressBuffer. --------- Co-authored-by: Yong He <yhe@nvidia.com>
1 parent dd57306 commit e7b6de3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+315
-138
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ tools/gfx-unit-test/test-tmp-*
5252

5353
# Intermediate source files generated during build process
5454
/source/slang/slang-generated-*.h
55-
/source/slang/slang-lookup-capability-defs.cpp
55+
/source/slang/slang-lookup-*.cpp
5656
/source/slang/*.meta.slang.h
5757
prelude/*.h.cpp
5858
/source/slang/cpp.hint

‎source/slang/slang-check-modifier.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -1033,9 +1033,12 @@ namespace Slang
10331033
case ASTNodeType::RayPayloadAccessSemantic:
10341034
case ASTNodeType::RayPayloadReadSemantic:
10351035
case ASTNodeType::RayPayloadWriteSemantic:
1036-
case ASTNodeType::GloballyCoherentModifier:
10371036
return (as<VarDeclBase>(decl) && isGlobalDecl(decl)) || as<ParamDecl>(decl) || as<GLSLInterfaceBlockDecl>(decl);
10381037

1038+
case ASTNodeType::GloballyCoherentModifier:
1039+
case ASTNodeType::HLSLVolatileModifier:
1040+
return as<VarDecl>(decl) && (isGlobalDecl(decl) || as<StructDecl>(getParentDecl(decl)) || as<GLSLInterfaceBlockDecl>(decl));
1041+
10391042
// Allowed only on parameters, struct fields and global variables.
10401043
case ASTNodeType::InterpolationModeModifier:
10411044
case ASTNodeType::HLSLNoInterpolationModifier:
@@ -1090,7 +1093,6 @@ namespace Slang
10901093
case ASTNodeType::HLSLColumnMajorLayoutModifier:
10911094
case ASTNodeType::GLSLRowMajorLayoutModifier:
10921095
case ASTNodeType::HLSLEffectSharedModifier:
1093-
case ASTNodeType::HLSLVolatileModifier:
10941096
return as<VarDeclBase>(decl) || as<GLSLInterfaceBlockDecl>(decl);
10951097

10961098
case ASTNodeType::GLSLPrecisionModifier:

‎source/slang/slang-emit-glsl.cpp

+10-3
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ void GLSLSourceEmitter::_emitGLSLStructuredBuffer(IRGlobalParam* varDecl, IRHLSL
179179
m_writer->emit(space);
180180
}
181181
}
182-
182+
183183
m_writer->emit(") ");
184184

185185
/*
@@ -194,7 +194,10 @@ void GLSLSourceEmitter::_emitGLSLStructuredBuffer(IRGlobalParam* varDecl, IRHLSL
194194
HLSLAppendStructuredBufferType - Write
195195
HLSLConsumeStructuredBufferType - TODO (JS): Its possible that this can be readonly, but we currently don't support on GLSL
196196
*/
197-
197+
if (varDecl->findDecoration<IRGloballyCoherentDecoration>())
198+
{
199+
m_writer->emit("coherent ");
200+
}
198201
if (as<IRHLSLStructuredBufferType>(structuredBufferType))
199202
{
200203
m_writer->emit("readonly ");
@@ -264,9 +267,13 @@ void GLSLSourceEmitter::_emitGLSLByteAddressBuffer(IRGlobalParam* varDecl, IRByt
264267
m_writer->emit(space);
265268
}
266269
}
267-
268270
m_writer->emit(") ");
269271

272+
if (varDecl->findDecoration<IRGloballyCoherentDecoration>())
273+
{
274+
m_writer->emit("coherent ");
275+
}
276+
270277
/*
271278
If the output type is a buffer, and we can determine it is only readonly we can prefix before
272279
buffer with 'readonly'

‎source/slang/slang-emit-spirv.cpp

+69-26
Original file line numberDiff line numberDiff line change
@@ -1836,6 +1836,14 @@ struct SPIRVEmitContext
18361836
varInst,
18371837
SpvLiteralInteger::from32(int32_t(index))
18381838
);
1839+
if (space != 0)
1840+
{
1841+
emitOpDecorateIndex(
1842+
getSection(SpvLogicalSectionID::Annotations),
1843+
nullptr,
1844+
varInst,
1845+
SpvLiteralInteger::from32(int32_t(space)));
1846+
}
18391847
break;
18401848
case LayoutResourceKind::VaryingOutput:
18411849
emitOpDecorateLocation(
@@ -1844,6 +1852,14 @@ struct SPIRVEmitContext
18441852
varInst,
18451853
SpvLiteralInteger::from32(int32_t(index))
18461854
);
1855+
if (space != 0)
1856+
{
1857+
emitOpDecorateIndex(
1858+
getSection(SpvLogicalSectionID::Annotations),
1859+
nullptr,
1860+
varInst,
1861+
SpvLiteralInteger::from32(int32_t(space)));
1862+
}
18471863
break;
18481864

18491865
case LayoutResourceKind::SpecializationConstant:
@@ -1988,6 +2004,7 @@ struct SPIRVEmitContext
19882004
if(layout)
19892005
emitVarLayout(globalVar, varInst, layout);
19902006
maybeEmitName(varInst, globalVar);
2007+
emitDecorations(globalVar, getID(varInst));
19912008
return varInst;
19922009
}
19932010

@@ -2743,10 +2760,6 @@ struct SPIRVEmitContext
27432760
default:
27442761
break;
27452762
}
2746-
if (entryPointDecor->getProfile().getStage() == Stage::Fragment)
2747-
{
2748-
maybeEmitEntryPointDepthReplacingExecutionMode(entryPoint, referencedBuiltinIRVars);
2749-
}
27502763
}
27512764
// Add remaining builtin variables that does not have a corresponding IR global var/param.
27522765
// These variables could be added from SPIRV ASM blocks.
@@ -2769,7 +2782,19 @@ struct SPIRVEmitContext
27692782
{
27702783
case Stage::Fragment:
27712784
//OpExecutionMode %main OriginUpperLeft
2772-
emitInst(getSection(SpvLogicalSectionID::ExecutionModes), nullptr, SpvOpExecutionMode, dstID, SpvExecutionModeOriginUpperLeft);
2785+
emitOpExecutionMode(getSection(SpvLogicalSectionID::ExecutionModes), nullptr, dstID, SpvExecutionModeOriginUpperLeft);
2786+
maybeEmitEntryPointDepthReplacingExecutionMode(entryPoint, referencedBuiltinIRVars);
2787+
for (auto decor : entryPoint->getDecorations())
2788+
{
2789+
switch (decor->getOp())
2790+
{
2791+
case kIROp_EarlyDepthStencilDecoration:
2792+
emitOpExecutionMode(getSection(SpvLogicalSectionID::ExecutionModes), nullptr, dstID, SpvExecutionModeEarlyFragmentTests);
2793+
break;
2794+
default:
2795+
break;
2796+
}
2797+
}
27732798
break;
27742799
case Stage::Geometry:
27752800
requireSPIRVCapability(SpvCapabilityGeometry);
@@ -2787,7 +2812,6 @@ struct SPIRVEmitContext
27872812
}
27882813
}
27892814
break;
2790-
27912815
// > OpExecutionMode
27922816

27932817
// [3.6. Execution Mode]: LocalSize
@@ -2937,6 +2961,12 @@ struct SPIRVEmitContext
29372961
dstID,
29382962
SpvLiteralInteger::from32(int32_t(getIntVal(decoration->getOperand(0)))));
29392963
break;
2964+
case kIROp_GloballyCoherentDecoration:
2965+
emitOpDecorate(getSection(SpvLogicalSectionID::Annotations),
2966+
decoration,
2967+
dstID,
2968+
SpvDecorationCoherent);
2969+
break;
29402970
// ...
29412971
}
29422972

@@ -3007,14 +3037,40 @@ struct SPIRVEmitContext
30073037
int32_t id = 0;
30083038
for (auto field : structType->getFields())
30093039
{
3010-
if (auto fieldNameDecor = field->getKey()->findDecoration<IRNameHintDecoration>())
3040+
for (auto decor : field->getKey()->getDecorations())
30113041
{
3012-
emitOpMemberName(
3013-
getSection(SpvLogicalSectionID::DebugNames),
3014-
nullptr,
3015-
spvStructID,
3016-
id,
3017-
fieldNameDecor->getName());
3042+
if (auto fieldNameDecor = as<IRNameHintDecoration>(decor))
3043+
{
3044+
emitOpMemberName(
3045+
getSection(SpvLogicalSectionID::DebugNames),
3046+
nullptr,
3047+
spvStructID,
3048+
id,
3049+
fieldNameDecor->getName());
3050+
}
3051+
else if (as<IRGloballyCoherentDecoration>(decor))
3052+
{
3053+
emitOpMemberDecorate(
3054+
getSection(SpvLogicalSectionID::Annotations),
3055+
decor,
3056+
spvStructID,
3057+
SpvLiteralInteger::from32(id),
3058+
SpvDecorationCoherent
3059+
);
3060+
}
3061+
else if (auto semanticDecor = field->getKey()->findDecoration<IRSemanticDecoration>())
3062+
{
3063+
if (shouldEmitSPIRVReflectionInfo())
3064+
{
3065+
emitOpMemberDecorateString(
3066+
getSection(SpvLogicalSectionID::Annotations),
3067+
nullptr,
3068+
spvStructID,
3069+
SpvLiteralInteger::from32(id),
3070+
SpvDecorationUserSemantic,
3071+
semanticDecor->getSemanticName());
3072+
}
3073+
}
30183074
}
30193075

30203076
IRIntegerValue offset = 0;
@@ -3090,19 +3146,6 @@ struct SPIRVEmitContext
30903146
SpvLiteralInteger::from32(id),
30913147
SpvLiteralInteger::from32((int32_t)matrixStride));
30923148
}
3093-
if (shouldEmitSPIRVReflectionInfo())
3094-
{
3095-
if (auto semanticDecor = field->getKey()->findDecoration<IRSemanticDecoration>())
3096-
{
3097-
emitOpMemberDecorateString(
3098-
getSection(SpvLogicalSectionID::Annotations),
3099-
nullptr,
3100-
spvStructID,
3101-
SpvLiteralInteger::from32(id),
3102-
SpvDecorationUserSemantic,
3103-
semanticDecor->getSemanticName());
3104-
}
3105-
}
31063149
id++;
31073150
}
31083151
}

‎source/slang/slang-ir-byte-address-legalize.cpp

+16-1
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,21 @@ struct ByteAddressBufferLegalizationContext
717717
return structuredBufferParam;
718718
}
719719

720+
void cloneBufferDecorations(IRBuilder& builder, IRInst* dest, IRInst* src)
721+
{
722+
for (auto decoration : src->getDecorations())
723+
{
724+
switch (decoration->getOp())
725+
{
726+
case kIROp_GloballyCoherentDecoration:
727+
builder.addDecoration(dest, decoration->getOp());
728+
break;
729+
default:
730+
break;
731+
}
732+
}
733+
}
734+
720735
IRGlobalParam* createEquivalentStructuredBufferParam(IRType* elementType, IRGlobalParam* byteAddressBufferParam)
721736
{
722737
// When we need to create a new structured buffer to stand in for
@@ -751,7 +766,7 @@ struct ByteAddressBufferLegalizationContext
751766
{
752767
paramBuilder.addLayoutDecoration(structuredBufferParam, layoutDecoration->getLayout());
753768
}
754-
769+
cloneBufferDecorations(paramBuilder, structuredBufferParam, byteAddressBufferParam);
755770
return structuredBufferParam;
756771
}
757772

0 commit comments

Comments
 (0)