mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement SPV_KHR_subgroup_vote

Browse Source 
doc.cpp: Add capabilities, scope to the opcodes. Add opcode and
capability strings.
GLSL.ext.KHR.h: Add extension
string.
GlslangToSpv.cpp: Fix handling of opcodes to generate
appropriate SPIR-V.
spirv.hpp: Add capability and opcode
enums.
spv.shaderGroupVote.comp.out: Update SPIR-V output for test
shader.
This commit is contained in:
Ashwin Kolhe 2017-01-18 14:16:49 -08:00
parent 33dadd1287
commit c720f3e639
5 changed files with 50 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SPIRV/GLSL.ext.KHR.h
View File

@ -32,5 +32,5 @@ static const char* const E_SPV_KHR_shader_ballot = "SPV_KHR_shade
// SPV_KHR_shader_draw_parameters // SPV_KHR_shader_draw_parameters
static const char* const E_SPV_KHR_shader_draw_parameters = "SPV_KHR_shader_draw_parameters"; static const char* const E_SPV_KHR_shader_draw_parameters = "SPV_KHR_shader_draw_parameters";
static const char* const E_SPV_KHR_subgroup_vote = "SPV_KHR_subgroup_vote";
#endif // #ifndef GLSLextKHR_H #endif // #ifndef GLSLextKHR_H

19
SPIRV/GlslangToSpv.cpp
View File

@ -4136,6 +4136,11 @@ spv::Id TGlslangToSpvTraverser::createInvocationsOperation(glslang::TOperator op
op == glslang::EOpReadInvocation) { op == glslang::EOpReadInvocation) {
builder.addExtension(spv::E_SPV_KHR_shader_ballot); builder.addExtension(spv::E_SPV_KHR_shader_ballot);
builder.addCapability(spv::CapabilitySubgroupBallotKHR); builder.addCapability(spv::CapabilitySubgroupBallotKHR);
} else if (op == glslang::EOpAnyInvocation ||
op == glslang::EOpAllInvocations ||
op == glslang::EOpAllInvocationsEqual) {
builder.addExtension(spv::E_SPV_KHR_subgroup_vote);
builder.addCapability(spv::CapabilitySubgroupVoteKHR);
} else { } else {
builder.addCapability(spv::CapabilityGroups); builder.addCapability(spv::CapabilityGroups);
#ifdef AMD_EXTENSIONS #ifdef AMD_EXTENSIONS
@ -4158,20 +4163,14 @@ spv::Id TGlslangToSpvTraverser::createInvocationsOperation(glslang::TOperator op
switch (op) { switch (op) {
case glslang::EOpAnyInvocation: case glslang::EOpAnyInvocation:
opCode = spv::OpGroupAny; opCode = spv::OpSubgroupAnyKHR;
break; break;
case glslang::EOpAllInvocations: case glslang::EOpAllInvocations:
opCode = spv::OpGroupAll; opCode = spv::OpSubgroupAllKHR;
break; break;
case glslang::EOpAllInvocationsEqual: case glslang::EOpAllInvocationsEqual:
{ opCode = spv::OpSubgroupAllEqualKHR;
spv::Id groupAll = builder.createOp(spv::OpGroupAll, typeId, spvGroupOperands); break;
spv::Id groupAny = builder.createOp(spv::OpGroupAny, typeId, spvGroupOperands);
return builder.createBinOp(spv::OpLogicalOr, typeId, groupAll,
builder.createUnaryOp(spv::OpLogicalNot, typeId, groupAny));
}
case glslang::EOpReadInvocation: case glslang::EOpReadInvocation:
opCode = spv::OpSubgroupReadInvocationKHR; opCode = spv::OpSubgroupReadInvocationKHR;
if (builder.isVectorType(typeId)) if (builder.isVectorType(typeId))

16
SPIRV/doc.cpp
View File

@ -819,6 +819,7 @@ const char* CapabilityString(int info)
case 4423: return "SubgroupBallotKHR"; case 4423: return "SubgroupBallotKHR";
case 4427: return "DrawParameters"; case 4427: return "DrawParameters";
case 4431: return "SubgroupVoteKHR";
#ifdef NV_EXTENSIONS #ifdef NV_EXTENSIONS
case 5251: return "GeometryShaderPassthroughNV"; case 5251: return "GeometryShaderPassthroughNV";
@ -1158,6 +1159,9 @@ const char* OpcodeString(int op)
case 4421: return "OpSubgroupBallotKHR"; case 4421: return "OpSubgroupBallotKHR";
case 4422: return "OpSubgroupFirstInvocationKHR"; case 4422: return "OpSubgroupFirstInvocationKHR";
case 4428: return "OpSubgroupAnyKHR";
case 4429: return "OpSubgroupAllKHR";
case 4430: return "OpSubgroupAllEqualKHR";
case 4432: return "OpSubgroupReadInvocationKHR"; case 4432: return "OpSubgroupReadInvocationKHR";
#ifdef AMD_EXTENSIONS #ifdef AMD_EXTENSIONS
@ -2771,6 +2775,18 @@ void Parameterize()
InstructionDesc[OpSubgroupFirstInvocationKHR].operands.push(OperandId, "'Value'"); InstructionDesc[OpSubgroupFirstInvocationKHR].operands.push(OperandId, "'Value'");
InstructionDesc[OpSubgroupAnyKHR].capabilities.push_back(CapabilitySubgroupVoteKHR);
InstructionDesc[OpSubgroupAnyKHR].operands.push(OperandScope, "'Execution'");
InstructionDesc[OpSubgroupAnyKHR].operands.push(OperandId, "'Predicate'");
InstructionDesc[OpSubgroupAllKHR].capabilities.push_back(CapabilitySubgroupVoteKHR);
InstructionDesc[OpSubgroupAllKHR].operands.push(OperandScope, "'Execution'");
InstructionDesc[OpSubgroupAllKHR].operands.push(OperandId, "'Predicate'");
InstructionDesc[OpSubgroupAllEqualKHR].capabilities.push_back(CapabilitySubgroupVoteKHR);
InstructionDesc[OpSubgroupAllEqualKHR].operands.push(OperandScope, "'Execution'");
InstructionDesc[OpSubgroupAllEqualKHR].operands.push(OperandId, "'Predicate'");
InstructionDesc[OpSubgroupReadInvocationKHR].capabilities.push_back(CapabilityGroups); InstructionDesc[OpSubgroupReadInvocationKHR].capabilities.push_back(CapabilityGroups);
InstructionDesc[OpSubgroupReadInvocationKHR].operands.push(OperandId, "'Value'"); InstructionDesc[OpSubgroupReadInvocationKHR].operands.push(OperandId, "'Value'");
InstructionDesc[OpSubgroupReadInvocationKHR].operands.push(OperandId, "'Index'"); InstructionDesc[OpSubgroupReadInvocationKHR].operands.push(OperandId, "'Index'");

4
SPIRV/spirv.hpp
View File

@ -605,6 +605,7 @@ enum Capability {
CapabilityMultiViewport = 57, CapabilityMultiViewport = 57,
CapabilitySubgroupBallotKHR = 4423, CapabilitySubgroupBallotKHR = 4423,
CapabilityDrawParameters = 4427, CapabilityDrawParameters = 4427,
CapabilitySubgroupVoteKHR = 4431,
CapabilityMax = 0x7fffffff, CapabilityMax = 0x7fffffff,
}; };
@ -906,6 +907,9 @@ enum Op {
OpSubgroupBallotKHR = 4421, OpSubgroupBallotKHR = 4421,
OpSubgroupFirstInvocationKHR = 4422, OpSubgroupFirstInvocationKHR = 4422,
OpSubgroupReadInvocationKHR = 4432, OpSubgroupReadInvocationKHR = 4432,
OpSubgroupAllKHR = 4428,
OpSubgroupAnyKHR = 4429,
OpSubgroupAllEqualKHR = 4430,
OpMax = 0x7fffffff, OpMax = 0x7fffffff,
}; };

43
Test/baseResults/spv.shaderGroupVote.comp.out
View File

@ -3,10 +3,11 @@ Warning, version 450 is not yet complete; most version-specific features are pre
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 37 // Id's are bound by 33
Capability Shader Capability Shader
Capability Groups Capability SubgroupVoteKHR
Extension "SPV_KHR_subgroup_vote"
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint GLCompute 4 "main" EntryPoint GLCompute 4 "main"
@ -22,7 +23,7 @@ Warning, version 450 is not yet complete; most version-specific features are pre
Decorate 10(Buffers) BufferBlock Decorate 10(Buffers) BufferBlock
Decorate 12 DescriptorSet 0 Decorate 12 DescriptorSet 0
Decorate 12 Binding 0 Decorate 12 Binding 0
Decorate 36 BuiltIn WorkgroupSize Decorate 32 BuiltIn WorkgroupSize
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeBool 6: TypeBool
@ -35,11 +36,10 @@ Warning, version 450 is not yet complete; most version-specific features are pre
14: 13(int) Constant 0 14: 13(int) Constant 0
15: TypePointer Uniform 9(int) 15: TypePointer Uniform 9(int)
18: 9(int) Constant 0 18: 9(int) Constant 0
21: 9(int) Constant 3 27: 9(int) Constant 1
31: 9(int) Constant 1 30: TypeVector 9(int) 3
34: TypeVector 9(int) 3 31: 9(int) Constant 4
35: 9(int) Constant 4 32: 30(ivec3) ConstantComposite 31 31 27
36: 34(ivec3) ConstantComposite 35 35 31
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
8(b1): 7(ptr) Variable Function 8(b1): 7(ptr) Variable Function
@ -48,20 +48,17 @@ Warning, version 450 is not yet complete; most version-specific features are pre
19: 6(bool) INotEqual 17 18 19: 6(bool) INotEqual 17 18
Store 8(b1) 19 Store 8(b1) 19
20: 6(bool) Load 8(b1) 20: 6(bool) Load 8(b1)
22: 6(bool) GroupAny 21 20 21: 6(bool) SubgroupAllKHR 20
Store 8(b1) 22 Store 8(b1) 21
23: 6(bool) Load 8(b1) 22: 6(bool) Load 8(b1)
24: 6(bool) GroupAll 21 23 23: 6(bool) SubgroupAnyKHR 22
Store 8(b1) 24 Store 8(b1) 23
25: 6(bool) Load 8(b1) 24: 6(bool) Load 8(b1)
26: 6(bool) GroupAll 21 25 25: 6(bool) SubgroupAllEqualKHR 24
27: 6(bool) GroupAny 21 25 Store 8(b1) 25
28: 6(bool) LogicalNot 27 26: 6(bool) Load 8(b1)
29: 6(bool) LogicalOr 26 28 28: 9(int) Select 26 27 18
Store 8(b1) 29 29: 15(ptr) AccessChain 12 14
30: 6(bool) Load 8(b1) Store 29 28
32: 9(int) Select 30 31 18
33: 15(ptr) AccessChain 12 14
Store 33 32
Return Return
FunctionEnd FunctionEnd