Skip to content

Commit a218faf

Browse files
wooyoungqcomwooyoungqcom
committed
GLSL_EXT_split_barrier / SPV_EXT_split_barrier
1 parent 9e3f544 commit a218faf

29 files changed

Lines changed: 655 additions & 1 deletion

‎SPIRV/GLSL.ext.EXT.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,6 @@ static const char* const E_SPV_EXT_shader_64bit_indexing = "SPV_EXT_shader_64bit
4646
static const char* const E_SPV_EXT_shader_invocation_reorder = "SPV_EXT_shader_invocation_reorder";
4747
static const char* const E_SPV_EXT_long_vector = "SPV_EXT_long_vector";
4848
static const char* const E_SPV_EXT_ocp_microscaling_types = "SPV_EXT_ocp_microscaling_types";
49+
static const char* const E_SPV_EXT_split_barrier = "SPV_EXT_split_barrier";
4950

5051
#endif // #ifndef GLSLextEXT_H

‎SPIRV/GlslangToSpv.cpp‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3873,6 +3873,8 @@ bool TGlslangToSpvTraverser::visitAggregate(glslang::TVisit visit, glslang::TInt
38733873
case glslang::EOpEmitVertex:
38743874
case glslang::EOpEndPrimitive:
38753875
case glslang::EOpBarrier:
3876+
case glslang::EOpControlBarrierArriveEXT:
3877+
case glslang::EOpControlBarrierWaitEXT:
38763878
case glslang::EOpMemoryBarrier:
38773879
case glslang::EOpMemoryBarrierAtomicCounter:
38783880
case glslang::EOpMemoryBarrierBuffer:
@@ -10888,6 +10890,26 @@ spv::Id TGlslangToSpvTraverser::createMiscOperation(glslang::TOperator op, spv::
1088810890
return 0;
1088910891
}
1089010892
break;
10893+
case glslang::EOpControlBarrierArriveEXT:
10894+
case glslang::EOpControlBarrierWaitEXT:
10895+
{
10896+
builder.addExtension(spv::E_SPV_EXT_split_barrier);
10897+
builder.addCapability(spv::Capability::SplitBarrierEXT);
10898+
// This is for the extended controlBarrierArrive/Wait functions, with four operands.
10899+
// The unextended controlBarrierArrive/controlBarrierWait() go through createNoArgOperation.
10900+
assert(operands.size() == 4);
10901+
auto const executionScope = (spv::Scope)builder.getConstantScalar(operands[0]);
10902+
auto const memoryScope = (spv::Scope)builder.getConstantScalar(operands[1]);
10903+
auto const semantics = (spv::MemorySemanticsMask)(builder.getConstantScalar(operands[2]) | builder.getConstantScalar(operands[3]));
10904+
builder.createSplitControlBarrier((op == glslang::EOpControlBarrierArriveEXT ? spv::Op::OpControlBarrierArriveEXT
10905+
: spv::Op::OpControlBarrierWaitEXT),
10906+
executionScope, memoryScope, semantics);
10907+
if (anySet(semantics, spv::MemorySemanticsMask::OutputMemoryKHR)) {
10908+
builder.addCapability(spv::Capability::VulkanMemoryModelKHR);
10909+
}
10910+
return 0;
10911+
}
10912+
break;
1089110913
case glslang::EOpMemoryBarrier:
1089210914
{
1089310915
// This is for the extended memoryBarrier function, with three operands.
@@ -11706,6 +11728,26 @@ spv::Id TGlslangToSpvTraverser::createNoArgOperation(glslang::TOperator op, spv:
1170611728
spv::MemorySemanticsMask::AcquireRelease);
1170711729
}
1170811730
return 0;
11731+
case glslang::EOpControlBarrierArriveEXT:
11732+
builder.addExtension(spv::E_SPV_EXT_split_barrier);
11733+
builder.addCapability(spv::Capability::SplitBarrierEXT);
11734+
if (glslangIntermediate->usingVulkanMemoryModel()) {
11735+
builder.addCapability(spv::Capability::VulkanMemoryModelKHR);
11736+
}
11737+
builder.createSplitControlBarrier(spv::Op::OpControlBarrierArriveEXT, spv::Scope::Workgroup, spv::Scope::Workgroup,
11738+
spv::MemorySemanticsMask::WorkgroupMemory |
11739+
spv::MemorySemanticsMask::Release);
11740+
return 0;
11741+
case glslang::EOpControlBarrierWaitEXT:
11742+
builder.addExtension(spv::E_SPV_EXT_split_barrier);
11743+
builder.addCapability(spv::Capability::SplitBarrierEXT);
11744+
if (glslangIntermediate->usingVulkanMemoryModel()) {
11745+
builder.addCapability(spv::Capability::VulkanMemoryModelKHR);
11746+
}
11747+
builder.createSplitControlBarrier(spv::Op::OpControlBarrierWaitEXT, spv::Scope::Workgroup, spv::Scope::Workgroup,
11748+
spv::MemorySemanticsMask::WorkgroupMemory |
11749+
spv::MemorySemanticsMask::Acquire);
11750+
return 0;
1170911751
case glslang::EOpMemoryBarrier:
1171011752
builder.createMemoryBarrier(memoryBarrierScope, spv::MemorySemanticsAllMemory |
1171111753
spv::MemorySemanticsMask::AcquireRelease);

‎SPIRV/SpvBuilder.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3577,6 +3577,16 @@ void Builder::createControlBarrier(Scope execution, Scope memory, MemorySemantic
35773577
addInstruction(std::unique_ptr<Instruction>(op));
35783578
}
35793579

3580+
void Builder::createSplitControlBarrier(Op opcode, Scope execution, Scope memory, MemorySemanticsMask semantics)
3581+
{
3582+
Instruction* op = new Instruction(opcode);
3583+
op->reserveOperands(3);
3584+
op->addIdOperand(makeUintConstant(execution));
3585+
op->addIdOperand(makeUintConstant(memory));
3586+
op->addIdOperand(makeUintConstant(semantics));
3587+
addInstruction(std::unique_ptr<Instruction>(op));
3588+
}
3589+
35803590
void Builder::createMemoryBarrier(Scope executionScope, MemorySemanticsMask memorySemantics)
35813591
{
35823592
Instruction* op = new Instruction(Op::OpMemoryBarrier);

‎SPIRV/SpvBuilder.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -608,6 +608,7 @@ class Builder {
608608
void createNoResultOp(Op, const std::vector<Id>& operands);
609609
void createNoResultOp(Op, const std::vector<IdImmediate>& operands);
610610
void createControlBarrier(Scope execution, Scope memory, MemorySemanticsMask);
611+
void createSplitControlBarrier(Op op, Scope execution, Scope memory, MemorySemanticsMask memorySem);
611612
void createMemoryBarrier(Scope executionScope, MemorySemanticsMask memorySemantics);
612613
Id createUnaryOp(Op, Id typeId, Id operand);
613614
Id createBinOp(Op, Id typeId, Id operand1, Id operand2);

‎SPIRV/doc.cpp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,6 +1169,7 @@ const char* CapabilityString(int info)
11691169

11701170
case (int)Capability::Shader64BitIndexingEXT: return "CapabilityShader64BitIndexingEXT";
11711171
case (int)Capability::LongVectorEXT: return "LongVectorEXT";
1172+
case (int)Capability::SplitBarrierEXT: return "SplitBarrierEXT";
11721173

11731174
case (int)Capability::Float4EXT: return "Float4EXT";
11741175
case (int)Capability::Float6EXT: return "Float6EXT";
@@ -1810,6 +1811,8 @@ const char* OpcodeString(int op)
18101811
case (int)Op::OpHitObjectGetIntersectionTriangleVertexPositionsEXT: return "OpHitObjectGetIntersectionTriangleVertexPositionsEXT";
18111812

18121813
case (int)Op::OpBitcastExtractEXT: return "OpBitcastExtractEXT";
1814+
case (int)Op::OpControlBarrierArriveEXT: return "OpControlBarrierArriveEXT";
1815+
case (int)Op::OpControlBarrierWaitEXT: return "OpControlBarrierWaitEXT";
18131816

18141817
default:
18151818
return "Bad";
@@ -1899,6 +1902,8 @@ void Parameterize()
18991902
InstructionDesc[enumCast(Op::OpEmitStreamVertex)].setResultAndType(false, false);
19001903
InstructionDesc[enumCast(Op::OpEndStreamPrimitive)].setResultAndType(false, false);
19011904
InstructionDesc[enumCast(Op::OpControlBarrier)].setResultAndType(false, false);
1905+
InstructionDesc[enumCast(Op::OpControlBarrierArriveEXT)].setResultAndType(false, false);
1906+
InstructionDesc[enumCast(Op::OpControlBarrierWaitEXT)].setResultAndType(false, false);
19021907
InstructionDesc[enumCast(Op::OpMemoryBarrier)].setResultAndType(false, false);
19031908
InstructionDesc[enumCast(Op::OpAtomicStore)].setResultAndType(false, false);
19041909
InstructionDesc[enumCast(Op::OpLoopMerge)].setResultAndType(false, false);
@@ -4175,6 +4180,14 @@ void Parameterize()
41754180

41764181
InstructionDesc[enumCast(Op::OpBitcastExtractEXT)].operands.push(OperandId, "'Base'");
41774182
InstructionDesc[enumCast(Op::OpBitcastExtractEXT)].operands.push(OperandId, "'Offset'");
4183+
4184+
InstructionDesc[enumCast(Op::OpControlBarrierArriveEXT)].operands.push(OperandScope, "'Execution'");
4185+
InstructionDesc[enumCast(Op::OpControlBarrierArriveEXT)].operands.push(OperandScope, "'Memory'");
4186+
InstructionDesc[enumCast(Op::OpControlBarrierArriveEXT)].operands.push(OperandMemorySemantics, "'Semantics'");
4187+
4188+
InstructionDesc[enumCast(Op::OpControlBarrierWaitEXT)].operands.push(OperandScope, "'Execution'");
4189+
InstructionDesc[enumCast(Op::OpControlBarrierWaitEXT)].operands.push(OperandScope, "'Memory'");
4190+
InstructionDesc[enumCast(Op::OpControlBarrierWaitEXT)].operands.push(OperandMemorySemantics, "'Semantics'");
41784191
});
41794192
}
41804193

0 commit comments

Comments
 (0)