Skip to content

G
glslang
Commit d487d4d0 by John Kessenich
Options

Subgroups: Finish fixing GitLab issue 47.

parent 3c81ceda
Showing with 15 additions and 15 deletions
SPIRV/GlslangToSpv.cpp
...@@ -5942,7 +5942,8 @@ spv::Id TGlslangToSpvTraverser::createNoArgOperation(glslang::TOperator op, spv: ...@@ -5942,7 +5942,8 @@ spv::Id TGlslangToSpvTraverser::createNoArgOperation(glslang::TOperator op, spv:
spv::MemorySemanticsAcquireReleaseMask); spv::MemorySemanticsAcquireReleaseMask);
return 0; return 0;
case glslang::EOpSubgroupBarrier: case glslang::EOpSubgroupBarrier:
builder.createControlBarrier(spv::ScopeSubgroup, spv::ScopeDevice, spv::MemorySemanticsMaskNone); builder.createControlBarrier(spv::ScopeSubgroup, spv::ScopeSubgroup, spv::MemorySemanticsAllMemory |
spv::MemorySemanticsAcquireReleaseMask);
return spv::NoResult; return spv::NoResult;
case glslang::EOpSubgroupMemoryBarrier: case glslang::EOpSubgroupMemoryBarrier:
builder.createMemoryBarrier(spv::ScopeSubgroup, spv::MemorySemanticsAllMemory | builder.createMemoryBarrier(spv::ScopeSubgroup, spv::MemorySemanticsAllMemory |
......
Test/baseResults/spv.subgroupBasic.comp.out
spv.subgroupBasic.comp spv.subgroupBasic.comp
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80003 // Generated by (magic number): 80003
// Id's are bound by 41 // Id's are bound by 40
Capability Shader Capability Shader
Capability GroupNonUniform Capability GroupNonUniform
...@@ -32,7 +32,7 @@ spv.subgroupBasic.comp ...@@ -32,7 +32,7 @@ spv.subgroupBasic.comp
Decorate 20 RelaxedPrecision Decorate 20 RelaxedPrecision
Decorate 22(gl_NumSubgroups) BuiltIn NumSubgroups Decorate 22(gl_NumSubgroups) BuiltIn NumSubgroups
Decorate 25(gl_SubgroupID) BuiltIn SubgroupId Decorate 25(gl_SubgroupID) BuiltIn SubgroupId
Decorate 40 BuiltIn WorkgroupSize Decorate 39 BuiltIn WorkgroupSize
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeInt 32 1 6: TypeInt 32 1
...@@ -51,15 +51,14 @@ spv.subgroupBasic.comp ...@@ -51,15 +51,14 @@ spv.subgroupBasic.comp
25(gl_SubgroupID): 13(ptr) Variable Input 25(gl_SubgroupID): 13(ptr) Variable Input
27: TypeBool 27: TypeBool
28: 12(int) Constant 3 28: 12(int) Constant 3
32: 12(int) Constant 1 32: 12(int) Constant 3400
33: 12(int) Constant 0 33: 12(int) Constant 72
34: 12(int) Constant 3400 34: 12(int) Constant 264
35: 12(int) Constant 72 35: 12(int) Constant 2056
36: 12(int) Constant 264 36: TypeVector 12(int) 3
37: 12(int) Constant 2056 37: 12(int) Constant 8
38: TypeVector 12(int) 3 38: 12(int) Constant 1
39: 12(int) Constant 8 39: 36(ivec3) ConstantComposite 37 37 38
40: 38(ivec3) ConstantComposite 39 39 32
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
15: 12(int) Load 14(gl_SubgroupSize) 15: 12(int) Load 14(gl_SubgroupSize)
...@@ -76,10 +75,10 @@ spv.subgroupBasic.comp ...@@ -76,10 +75,10 @@ spv.subgroupBasic.comp
30: 6(int) Select 29 16 11 30: 6(int) Select 29 16 11
31: 17(ptr) AccessChain 10(data) 11 26 31: 17(ptr) AccessChain 10(data) 11 26
Store 31 30 Store 31 30
ControlBarrier 28 32 33 ControlBarrier 28 28 32
MemoryBarrier 28 32
MemoryBarrier 28 33
MemoryBarrier 28 34 MemoryBarrier 28 34
MemoryBarrier 28 35 MemoryBarrier 28 35
MemoryBarrier 28 36
MemoryBarrier 28 37
Return Return
FunctionEnd FunctionEnd
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment