AuroraMiddleware/glslang
1
0
Fork 0
mirror of https://github.com/KhronosGroup/glslang synced 2024-11-08 19:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix interactions between 'volatile' and the Vulkan memory model

Browse Source 
Last year we changed 'volatile' to also act as 'coherent', but when I
resolved the memory model changes against that change I missed handling
volatile in a couple places that we check for coherent. There was also
a place in post-processing that acted as if the volatile memory access
flag has a literal number associated with it, when it doesn't.
This commit is contained in:
Jeff Bolz 2019-03-05 14:40:07 -06:00
parent 9390154c55
commit 38cbad15ca
6 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
SPIRV/GlslangToSpv.cpp
View File

@ -565,14 +565,15 @@ spv::Builder::AccessChain::CoherentFlags TGlslangToSpvTraverser::TranslateCohere
flags.workgroupcoherent = type.getQualifier().workgroupcoherent || flags.workgroupcoherent = type.getQualifier().workgroupcoherent ||
type.getQualifier().storage == glslang::EvqShared; type.getQualifier().storage == glslang::EvqShared;
flags.subgroupcoherent = type.getQualifier().subgroupcoherent; flags.subgroupcoherent = type.getQualifier().subgroupcoherent;
flags.volatil = type.getQualifier().volatil;
// *coherent variables are implicitly nonprivate in GLSL // *coherent variables are implicitly nonprivate in GLSL
flags.nonprivate = type.getQualifier().nonprivate || flags.nonprivate = type.getQualifier().nonprivate ||
flags.subgroupcoherent || flags.subgroupcoherent ||
flags.workgroupcoherent || flags.workgroupcoherent ||
flags.queuefamilycoherent || flags.queuefamilycoherent ||
flags.devicecoherent || flags.devicecoherent ||
flags.coherent; flags.coherent ||
flags.volatil = type.getQualifier().volatil; flags.volatil;
flags.isImage = type.getBasicType() == glslang::EbtSampler; flags.isImage = type.getBasicType() == glslang::EbtSampler;
return flags; return flags;
} }
@ -580,7 +581,7 @@ spv::Builder::AccessChain::CoherentFlags TGlslangToSpvTraverser::TranslateCohere
spv::Scope TGlslangToSpvTraverser::TranslateMemoryScope(const spv::Builder::AccessChain::CoherentFlags &coherentFlags) spv::Scope TGlslangToSpvTraverser::TranslateMemoryScope(const spv::Builder::AccessChain::CoherentFlags &coherentFlags)
{ {
spv::Scope scope; spv::Scope scope;
if (coherentFlags.coherent) { if (coherentFlags.volatil || coherentFlags.coherent) {
// coherent defaults to Device scope in the old model, QueueFamilyKHR scope in the new model // coherent defaults to Device scope in the old model, QueueFamilyKHR scope in the new model
scope = glslangIntermediate->usingVulkanMemoryModel() ? spv::ScopeQueueFamilyKHR : spv::ScopeDevice; scope = glslangIntermediate->usingVulkanMemoryModel() ? spv::ScopeQueueFamilyKHR : spv::ScopeDevice;
} else if (coherentFlags.devicecoherent) { } else if (coherentFlags.devicecoherent) {

2
SPIRV/SpvPostProcess.cpp Executable file → Normal file
View File

@ -260,8 +260,6 @@ void Builder::postProcess(Instruction& inst)
assert(memoryAccess & MemoryAccessAlignedMask); assert(memoryAccess & MemoryAccessAlignedMask);
// Compute the index of the alignment operand. // Compute the index of the alignment operand.
int alignmentIdx = 2; int alignmentIdx = 2;
if (memoryAccess & MemoryAccessVolatileMask)
alignmentIdx++;
if (inst.getOpCode() == OpStore) if (inst.getOpCode() == OpStore)
alignmentIdx++; alignmentIdx++;
// Merge new and old (mis)alignment // Merge new and old (mis)alignment

12
Test/baseResults/spv.bufferhandle10.frag.out
View File

@ -1,7 +1,7 @@
spv.bufferhandle10.frag spv.bufferhandle10.frag
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80007 // Generated by (magic number): 80007
// Id's are bound by 34 // Id's are bound by 40
Capability Shader Capability Shader
Capability CapabilityVulkanMemoryModelKHR Capability CapabilityVulkanMemoryModelKHR
@ -24,6 +24,7 @@ spv.bufferhandle10.frag
Name 12 "t" Name 12 "t"
Name 19 "i" Name 19 "i"
Name 28 "b" Name 28 "b"
Name 34 "b2"
MemberDecorate 7(t2) 0 Offset 0 MemberDecorate 7(t2) 0 Offset 0
Decorate 7(t2) Block Decorate 7(t2) Block
Decorate 9 ArrayStride 4 Decorate 9 ArrayStride 4
@ -34,6 +35,7 @@ spv.bufferhandle10.frag
Decorate 19(i) Flat Decorate 19(i) Flat
Decorate 19(i) Location 0 Decorate 19(i) Location 0
Decorate 28(b) DecorationAliasedPointerEXT Decorate 28(b) DecorationAliasedPointerEXT
Decorate 34(b2) DecorationAliasedPointerEXT
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
TypeForwardPointer 6 PhysicalStorageBufferEXT TypeForwardPointer 6 PhysicalStorageBufferEXT
@ -55,9 +57,11 @@ spv.bufferhandle10.frag
25: 8(int) Constant 0 25: 8(int) Constant 0
27: TypePointer Function 6(ptr) 27: TypePointer Function 6(ptr)
32: 8(int) Constant 2 32: 8(int) Constant 2
38: 8(int) Constant 3
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
28(b): 27(ptr) Variable Function 28(b): 27(ptr) Variable Function
34(b2): 27(ptr) Variable Function
16: 15(ptr) AccessChain 12(t) 14 16: 15(ptr) AccessChain 12(t) 14
17: 6(ptr) Load 16 17: 6(ptr) Load 16
20: 8(int) Load 19(i) 20: 8(int) Load 19(i)
@ -69,5 +73,11 @@ spv.bufferhandle10.frag
31: 6(ptr) Load 28(b) 31: 6(ptr) Load 28(b)
33: 21(ptr) AccessChain 31 14 14 33: 21(ptr) AccessChain 31 14 14
Store 33 32 Aligned MakePointerAvailableKHR NonPrivatePointerKHR 4 24 Store 33 32 Aligned MakePointerAvailableKHR NonPrivatePointerKHR 4 24
35: 15(ptr) AccessChain 12(t) 14
36: 6(ptr) Load 35
Store 34(b2) 36 Volatile
37: 6(ptr) Load 34(b2) Volatile
39: 21(ptr) AccessChain 37 14 14
Store 39 38 Volatile Aligned MakePointerAvailableKHR NonPrivatePointerKHR 4 24
Return Return
FunctionEnd FunctionEnd

23
Test/baseResults/spv.memoryScopeSemantics.comp.out
View File

@ -1,7 +1,7 @@
spv.memoryScopeSemantics.comp spv.memoryScopeSemantics.comp
// Module Version 10300 // Module Version 10300
// Generated by (magic number): 80007 // Generated by (magic number): 80007
// Id's are bound by 143 // Id's are bound by 148
Capability Shader Capability Shader
Capability Int64 Capability Int64
@ -43,6 +43,9 @@ spv.memoryScopeSemantics.comp
Name 122 "samp" Name 122 "samp"
Name 133 "atomu64" Name 133 "atomu64"
Name 138 "atomi64" Name 138 "atomi64"
Name 143 "BufferL"
MemberName 143(BufferL) 0 "x"
Name 145 "bufferl"
Decorate 36(imagei) DescriptorSet 0 Decorate 36(imagei) DescriptorSet 0
Decorate 36(imagei) Binding 1 Decorate 36(imagei) Binding 1
Decorate 45(imageu) DescriptorSet 0 Decorate 45(imageu) DescriptorSet 0
@ -69,6 +72,10 @@ spv.memoryScopeSemantics.comp
Decorate 110(imagej) Binding 5 Decorate 110(imagej) Binding 5
Decorate 122(samp) DescriptorSet 0 Decorate 122(samp) DescriptorSet 0
Decorate 122(samp) Binding 6 Decorate 122(samp) Binding 6
MemberDecorate 143(BufferL) 0 Offset 0
Decorate 143(BufferL) Block
Decorate 145(bufferl) DescriptorSet 0
Decorate 145(bufferl) Binding 8
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeInt 32 1 6: TypeInt 32 1
@ -152,6 +159,9 @@ spv.memoryScopeSemantics.comp
137: TypePointer Workgroup 136(int64_t) 137: TypePointer Workgroup 136(int64_t)
138(atomi64): 137(ptr) Variable Workgroup 138(atomi64): 137(ptr) Variable Workgroup
139:136(int64_t) Constant 10 0 139:136(int64_t) Constant 10 0
143(BufferL): TypeStruct 15(int)
144: TypePointer StorageBuffer 143(BufferL)
145(bufferl): 144(ptr) Variable StorageBuffer
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
8(origi): 7(ptr) Variable Function 8(origi): 7(ptr) Variable Function
@ -204,18 +214,18 @@ spv.memoryScopeSemantics.comp
81: 15(int) Load 80 MakePointerVisibleKHR NonPrivatePointerKHR 16 81: 15(int) Load 80 MakePointerVisibleKHR NonPrivatePointerKHR 16
Store 72(y) 81 Store 72(y) 81
88: 68(ptr) AccessChain 87(bufferj) 38 38 38 12 88: 68(ptr) AccessChain 87(bufferj) 38 38 38 12
89: 15(int) Load 88 Volatile MakePointerVisibleKHR NonPrivatePointerKHR 46 89: 15(int) Load 88 Volatile MakePointerVisibleKHR NonPrivatePointerKHR 16
Store 72(y) 89 Store 72(y) 89
90: 15(int) Load 72(y) 90: 15(int) Load 72(y)
91: 68(ptr) AccessChain 79(bufferi) 38 91: 68(ptr) AccessChain 79(bufferi) 38
Store 91 90 MakePointerAvailableKHR NonPrivatePointerKHR 16 Store 91 90 MakePointerAvailableKHR NonPrivatePointerKHR 16
92: 15(int) Load 72(y) 92: 15(int) Load 72(y)
93: 68(ptr) AccessChain 87(bufferj) 38 38 38 12 93: 68(ptr) AccessChain 87(bufferj) 38 38 38 12
Store 93 92 Volatile MakePointerAvailableKHR NonPrivatePointerKHR 46 Store 93 92 Volatile MakePointerAvailableKHR NonPrivatePointerKHR 16
95: 94(ptr) AccessChain 87(bufferj) 12 38 95: 94(ptr) AccessChain 87(bufferj) 12 38
96: 83(A) Load 95 Volatile MakePointerVisibleKHR NonPrivatePointerKHR 46 96: 83(A) Load 95 Volatile MakePointerVisibleKHR NonPrivatePointerKHR 16
97: 94(ptr) AccessChain 87(bufferj) 38 38 97: 94(ptr) AccessChain 87(bufferj) 38 38
Store 97 96 Volatile MakePointerAvailableKHR NonPrivatePointerKHR 46 Store 97 96 Volatile MakePointerAvailableKHR NonPrivatePointerKHR 16
102: 101(ptr) AccessChain 100(bufferk) 38 102: 101(ptr) AccessChain 100(bufferk) 38
103: 15(int) Load 102 NonPrivatePointerKHR 103: 15(int) Load 102 NonPrivatePointerKHR
104: 68(ptr) AccessChain 79(bufferi) 38 104: 68(ptr) AccessChain 79(bufferi) 38
@ -236,5 +246,8 @@ spv.memoryScopeSemantics.comp
140:131(int64_t) Load 133(atomu64) MakePointerVisibleKHR NonPrivatePointerKHR 26 140:131(int64_t) Load 133(atomu64) MakePointerVisibleKHR NonPrivatePointerKHR 26
141:136(int64_t) Bitcast 140 141:136(int64_t) Bitcast 140
142:136(int64_t) AtomicCompareExchange 138(atomi64) 12 63 63 141 139 142:136(int64_t) AtomicCompareExchange 138(atomi64) 12 63 63 141 139
146: 68(ptr) AccessChain 145(bufferl) 38
147: 15(int) Load 146 Volatile MakePointerVisibleKHR NonPrivatePointerKHR 16
Store 72(y) 147
Return Return
FunctionEnd FunctionEnd

2
Test/spv.bufferhandle10.frag
View File

@ -20,4 +20,6 @@ void main() {
coherent blockType b = t.f; coherent blockType b = t.f;
b.x[0] = 2; b.x[0] = 2;
volatile blockType b2 = t.f;
b2.x[0] = 3;
} }

3
Test/spv.memoryScopeSemantics.comp
View File

@ -18,6 +18,7 @@ layout (binding = 6) nonprivate uniform sampler2D samp[2];
layout (binding = 7) nonprivate uniform BufferK { uint x; } bufferk; layout (binding = 7) nonprivate uniform BufferK { uint x; } bufferk;
shared uint64_t atomu64; shared uint64_t atomu64;
shared int64_t atomi64; shared int64_t atomi64;
layout (binding = 8) volatile buffer BufferL { uint x; } bufferl;
void main() void main()
@ -57,5 +58,7 @@ void main()
atomu64 = atomicMax(atomu64, uint64_t(7), gl_ScopeDevice, 0, 0); atomu64 = atomicMax(atomu64, uint64_t(7), gl_ScopeDevice, 0, 0);
atomicCompSwap(atomi64, int64_t(10), int64_t(atomu64), gl_ScopeDevice, gl_StorageSemanticsBuffer | gl_StorageSemanticsShared, gl_SemanticsAcquire, gl_StorageSemanticsBuffer | gl_StorageSemanticsShared, gl_SemanticsAcquire); atomicCompSwap(atomi64, int64_t(10), int64_t(atomu64), gl_ScopeDevice, gl_StorageSemanticsBuffer | gl_StorageSemanticsShared, gl_SemanticsAcquire, gl_StorageSemanticsBuffer | gl_StorageSemanticsShared, gl_SemanticsAcquire);
y = bufferl.x;
} }