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

Fix subgroup support for ray tracing

Browse Source 
Closes #1735

GlslangToSpv.cpp
- minor formatting cleanup

BaseTypes.h
- minor formatting cleanup
- add subgroup builtins to GetBuiltInVariableString
  (was resulting in "unknown built-in variable" messages in test output)

Initialize.cpp
- better naming and re-use of strings for subgroup builtin variable declarations
- define subgroup builtin variables in ray-tracing shaders

intermOut.cpp
- add handling of the EOpSubgroupParition* variables
  (was resulting in "ERROR: Bad aggregation op" messages in test output)

Update test results.
This commit is contained in:
Daniel Koch
2019-05-27 16:46:31 -04:00
parent c3e60ad9b6
commit 593a4e0aa5
45 changed files with 2237 additions and 3886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
Test/baseResults/glsl.460.subgroup.mesh.out
View File

@@ -108,15 +108,15 @@ ERROR: node is still EOpNull!
0:3 Function Parameters:
0:3 'f4' ( in 4-component vector of float)
0:? Sequence
0:6 'gl_SubgroupSize' ( in uint unknown built-in variable)
0:7 'gl_SubgroupInvocationID' ( in uint unknown built-in variable)
0:6 'gl_SubgroupSize' ( in uint SubgroupSize)
0:7 'gl_SubgroupInvocationID' ( in uint SubgroupInvocationID)
0:8 subgroupBarrier ( global void)
0:9 subgroupMemoryBarrier ( global void)
0:10 subgroupMemoryBarrierBuffer ( global void)
0:11 subgroupMemoryBarrierImage ( global void)
0:12 subgroupElect ( global bool)
0:13 'gl_NumSubgroups' ( in uint unknown built-in variable)
0:14 'gl_SubgroupID' ( in uint unknown built-in variable)
0:13 'gl_NumSubgroups' ( in uint NumSubgroups)
0:14 'gl_SubgroupID' ( in uint SubgroupID)
0:15 subgroupMemoryBarrierShared ( global void)
0:17 subgroupAll ( global bool)
0:17 Constant:
@@ -126,11 +126,11 @@ ERROR: node is still EOpNull!
0:18 false (const bool)
0:19 subgroupAllEqual ( global bool)
0:19 'f4' ( in 4-component vector of float)
0:21 'gl_SubgroupEqMask' ( in 4-component vector of uint unknown built-in variable)
0:22 'gl_SubgroupGeMask' ( in 4-component vector of uint unknown built-in variable)
0:23 'gl_SubgroupGtMask' ( in 4-component vector of uint unknown built-in variable)
0:24 'gl_SubgroupLeMask' ( in 4-component vector of uint unknown built-in variable)
0:25 'gl_SubgroupLtMask' ( in 4-component vector of uint unknown built-in variable)
0:21 'gl_SubgroupEqMask' ( in 4-component vector of uint SubgroupEqMask)
0:22 'gl_SubgroupGeMask' ( in 4-component vector of uint SubgroupGeMask)
0:23 'gl_SubgroupGtMask' ( in 4-component vector of uint SubgroupGtMask)
0:24 'gl_SubgroupLeMask' ( in 4-component vector of uint SubgroupLeMask)
0:25 'gl_SubgroupLtMask' ( in 4-component vector of uint SubgroupLtMask)
0:26 subgroupBroadcast ( global 4-component vector of float)
0:26 'f4' ( in 4-component vector of float)
0:26 Constant:
@@ -266,88 +266,67 @@ ERROR: node is still EOpNull!
0:77 'parti' ( temp 4-component vector of uint)
0:77 subgroupPartitionNV ( global 4-component vector of uint)
0:77 'f4' ( in 4-component vector of float)
0:78 ERROR: Bad aggregation op
( global 4-component vector of float)
0:78 subgroupPartitionedAddNV ( global 4-component vector of float)
0:78 'f4' ( in 4-component vector of float)
0:78 'parti' ( temp 4-component vector of uint)
0:79 ERROR: Bad aggregation op
( global 4-component vector of float)
0:79 subgroupPartitionedMulNV ( global 4-component vector of float)
0:79 'f4' ( in 4-component vector of float)
0:79 'parti' ( temp 4-component vector of uint)
0:80 ERROR: Bad aggregation op
( global 4-component vector of float)
0:80 subgroupPartitionedMinNV ( global 4-component vector of float)
0:80 'f4' ( in 4-component vector of float)
0:80 'parti' ( temp 4-component vector of uint)
0:81 ERROR: Bad aggregation op
( global 4-component vector of float)
0:81 subgroupPartitionedMaxNV ( global 4-component vector of float)
0:81 'f4' ( in 4-component vector of float)
0:81 'parti' ( temp 4-component vector of uint)
0:82 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:82 subgroupPartitionedAndNV ( global 4-component vector of uint)
0:82 'ballot' ( temp 4-component vector of uint)
0:82 'parti' ( temp 4-component vector of uint)
0:83 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:83 subgroupPartitionedOrNV ( global 4-component vector of uint)
0:83 'ballot' ( temp 4-component vector of uint)
0:83 'parti' ( temp 4-component vector of uint)
0:84 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:84 subgroupPartitionedXorNV ( global 4-component vector of uint)
0:84 'ballot' ( temp 4-component vector of uint)
0:84 'parti' ( temp 4-component vector of uint)
0:85 ERROR: Bad aggregation op
( global 4-component vector of float)
0:85 subgroupPartitionedInclusiveAddNV ( global 4-component vector of float)
0:85 'f4' ( in 4-component vector of float)
0:85 'parti' ( temp 4-component vector of uint)
0:86 ERROR: Bad aggregation op
( global 4-component vector of float)
0:86 subgroupPartitionedInclusiveMulNV ( global 4-component vector of float)
0:86 'f4' ( in 4-component vector of float)
0:86 'parti' ( temp 4-component vector of uint)
0:87 ERROR: Bad aggregation op
( global 4-component vector of float)
0:87 subgroupPartitionedInclusiveMinNV ( global 4-component vector of float)
0:87 'f4' ( in 4-component vector of float)
0:87 'parti' ( temp 4-component vector of uint)
0:88 ERROR: Bad aggregation op
( global 4-component vector of float)
0:88 subgroupPartitionedInclusiveMaxNV ( global 4-component vector of float)
0:88 'f4' ( in 4-component vector of float)
0:88 'parti' ( temp 4-component vector of uint)
0:89 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:89 subgroupPartitionedInclusiveAndNV ( global 4-component vector of uint)
0:89 'ballot' ( temp 4-component vector of uint)
0:89 'parti' ( temp 4-component vector of uint)
0:90 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:90 subgroupPartitionedInclusiveOrNV ( global 4-component vector of uint)
0:90 'ballot' ( temp 4-component vector of uint)
0:90 'parti' ( temp 4-component vector of uint)
0:91 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:91 subgroupPartitionedInclusiveXorNV ( global 4-component vector of uint)
0:91 'ballot' ( temp 4-component vector of uint)
0:91 'parti' ( temp 4-component vector of uint)
0:92 ERROR: Bad aggregation op
( global 4-component vector of float)
0:92 subgroupPartitionedExclusiveAddNV ( global 4-component vector of float)
0:92 'f4' ( in 4-component vector of float)
0:92 'parti' ( temp 4-component vector of uint)
0:93 ERROR: Bad aggregation op
( global 4-component vector of float)
0:93 subgroupPartitionedExclusiveMulNV ( global 4-component vector of float)
0:93 'f4' ( in 4-component vector of float)
0:93 'parti' ( temp 4-component vector of uint)
0:94 ERROR: Bad aggregation op
( global 4-component vector of float)
0:94 subgroupPartitionedExclusiveMinNV ( global 4-component vector of float)
0:94 'f4' ( in 4-component vector of float)
0:94 'parti' ( temp 4-component vector of uint)
0:95 ERROR: Bad aggregation op
( global 4-component vector of float)
0:95 subgroupPartitionedExclusiveMaxNV ( global 4-component vector of float)
0:95 'f4' ( in 4-component vector of float)
0:95 'parti' ( temp 4-component vector of uint)
0:96 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:96 subgroupPartitionedExclusiveAndNV ( global 4-component vector of uint)
0:96 'ballot' ( temp 4-component vector of uint)
0:96 'parti' ( temp 4-component vector of uint)
0:97 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:97 subgroupPartitionedExclusiveOrNV ( global 4-component vector of uint)
0:97 'ballot' ( temp 4-component vector of uint)
0:97 'parti' ( temp 4-component vector of uint)
0:98 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:98 subgroupPartitionedExclusiveXorNV ( global 4-component vector of uint)
0:98 'ballot' ( temp 4-component vector of uint)
0:98 'parti' ( temp 4-component vector of uint)
0:100 Branch: Return with expression
@@ -645,25 +624,25 @@ ERROR: node is still EOpNull!
0:167 Function Definition: basic_works( ( global void)
0:167 Function Parameters:
0:169 Sequence
0:169 'gl_SubgroupSize' ( in uint unknown built-in variable)
0:170 'gl_SubgroupInvocationID' ( in uint unknown built-in variable)
0:169 'gl_SubgroupSize' ( in uint SubgroupSize)
0:170 'gl_SubgroupInvocationID' ( in uint SubgroupInvocationID)
0:171 subgroupBarrier ( global void)
0:172 subgroupMemoryBarrier ( global void)
0:173 subgroupMemoryBarrierBuffer ( global void)
0:174 subgroupMemoryBarrierImage ( global void)
0:175 subgroupElect ( global bool)
0:176 'gl_NumSubgroups' ( in uint unknown built-in variable)
0:177 'gl_SubgroupID' ( in uint unknown built-in variable)
0:176 'gl_NumSubgroups' ( in uint NumSubgroups)
0:177 'gl_SubgroupID' ( in uint SubgroupID)
0:178 subgroupMemoryBarrierShared ( global void)
0:182 Function Definition: ballot_works(vf4; ( global void)
0:182 Function Parameters:
0:182 'f4' ( in 4-component vector of float)
0:183 Sequence
0:183 'gl_SubgroupEqMask' ( in 4-component vector of uint unknown built-in variable)
0:184 'gl_SubgroupGeMask' ( in 4-component vector of uint unknown built-in variable)
0:185 'gl_SubgroupGtMask' ( in 4-component vector of uint unknown built-in variable)
0:186 'gl_SubgroupLeMask' ( in 4-component vector of uint unknown built-in variable)
0:187 'gl_SubgroupLtMask' ( in 4-component vector of uint unknown built-in variable)
0:183 'gl_SubgroupEqMask' ( in 4-component vector of uint SubgroupEqMask)
0:184 'gl_SubgroupGeMask' ( in 4-component vector of uint SubgroupGeMask)
0:185 'gl_SubgroupGtMask' ( in 4-component vector of uint SubgroupGtMask)
0:186 'gl_SubgroupLeMask' ( in 4-component vector of uint SubgroupLeMask)
0:187 'gl_SubgroupLtMask' ( in 4-component vector of uint SubgroupLtMask)
0:188 subgroupBroadcast ( global 4-component vector of float)
0:188 'f4' ( in 4-component vector of float)
0:188 Constant:
@@ -845,88 +824,67 @@ ERROR: node is still EOpNull!
0:271 0 (const uint)
0:271 0 (const uint)
0:271 0 (const uint)
0:272 ERROR: Bad aggregation op
( global 4-component vector of float)
0:272 subgroupPartitionedAddNV ( global 4-component vector of float)
0:272 'f4' ( in 4-component vector of float)
0:272 'parti' ( temp 4-component vector of uint)
0:273 ERROR: Bad aggregation op
( global 4-component vector of float)
0:273 subgroupPartitionedMulNV ( global 4-component vector of float)
0:273 'f4' ( in 4-component vector of float)
0:273 'parti' ( temp 4-component vector of uint)
0:274 ERROR: Bad aggregation op
( global 4-component vector of float)
0:274 subgroupPartitionedMinNV ( global 4-component vector of float)
0:274 'f4' ( in 4-component vector of float)
0:274 'parti' ( temp 4-component vector of uint)
0:275 ERROR: Bad aggregation op
( global 4-component vector of float)
0:275 subgroupPartitionedMaxNV ( global 4-component vector of float)
0:275 'f4' ( in 4-component vector of float)
0:275 'parti' ( temp 4-component vector of uint)
0:276 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:276 subgroupPartitionedAndNV ( global 4-component vector of uint)
0:276 'ballot' ( temp 4-component vector of uint)
0:276 'parti' ( temp 4-component vector of uint)
0:277 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:277 subgroupPartitionedOrNV ( global 4-component vector of uint)
0:277 'ballot' ( temp 4-component vector of uint)
0:277 'parti' ( temp 4-component vector of uint)
0:278 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:278 subgroupPartitionedXorNV ( global 4-component vector of uint)
0:278 'ballot' ( temp 4-component vector of uint)
0:278 'parti' ( temp 4-component vector of uint)
0:279 ERROR: Bad aggregation op
( global 4-component vector of float)
0:279 subgroupPartitionedInclusiveAddNV ( global 4-component vector of float)
0:279 'f4' ( in 4-component vector of float)
0:279 'parti' ( temp 4-component vector of uint)
0:280 ERROR: Bad aggregation op
( global 4-component vector of float)
0:280 subgroupPartitionedInclusiveMulNV ( global 4-component vector of float)
0:280 'f4' ( in 4-component vector of float)
0:280 'parti' ( temp 4-component vector of uint)
0:281 ERROR: Bad aggregation op
( global 4-component vector of float)
0:281 subgroupPartitionedInclusiveMinNV ( global 4-component vector of float)
0:281 'f4' ( in 4-component vector of float)
0:281 'parti' ( temp 4-component vector of uint)
0:282 ERROR: Bad aggregation op
( global 4-component vector of float)
0:282 subgroupPartitionedInclusiveMaxNV ( global 4-component vector of float)
0:282 'f4' ( in 4-component vector of float)
0:282 'parti' ( temp 4-component vector of uint)
0:283 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:283 subgroupPartitionedInclusiveAndNV ( global 4-component vector of uint)
0:283 'ballot' ( temp 4-component vector of uint)
0:283 'parti' ( temp 4-component vector of uint)
0:284 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:284 subgroupPartitionedInclusiveOrNV ( global 4-component vector of uint)
0:284 'ballot' ( temp 4-component vector of uint)
0:284 'parti' ( temp 4-component vector of uint)
0:285 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:285 subgroupPartitionedInclusiveXorNV ( global 4-component vector of uint)
0:285 'ballot' ( temp 4-component vector of uint)
0:285 'parti' ( temp 4-component vector of uint)
0:286 ERROR: Bad aggregation op
( global 4-component vector of float)
0:286 subgroupPartitionedExclusiveAddNV ( global 4-component vector of float)
0:286 'f4' ( in 4-component vector of float)
0:286 'parti' ( temp 4-component vector of uint)
0:287 ERROR: Bad aggregation op
( global 4-component vector of float)
0:287 subgroupPartitionedExclusiveMulNV ( global 4-component vector of float)
0:287 'f4' ( in 4-component vector of float)
0:287 'parti' ( temp 4-component vector of uint)
0:288 ERROR: Bad aggregation op
( global 4-component vector of float)
0:288 subgroupPartitionedExclusiveMinNV ( global 4-component vector of float)
0:288 'f4' ( in 4-component vector of float)
0:288 'parti' ( temp 4-component vector of uint)
0:289 ERROR: Bad aggregation op
( global 4-component vector of float)
0:289 subgroupPartitionedExclusiveMaxNV ( global 4-component vector of float)
0:289 'f4' ( in 4-component vector of float)
0:289 'parti' ( temp 4-component vector of uint)
0:290 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:290 subgroupPartitionedExclusiveAndNV ( global 4-component vector of uint)
0:290 'ballot' ( temp 4-component vector of uint)
0:290 'parti' ( temp 4-component vector of uint)
0:291 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:291 subgroupPartitionedExclusiveOrNV ( global 4-component vector of uint)
0:291 'ballot' ( temp 4-component vector of uint)
0:291 'parti' ( temp 4-component vector of uint)
0:292 ERROR: Bad aggregation op
( global 4-component vector of uint)
0:292 subgroupPartitionedExclusiveXorNV ( global 4-component vector of uint)
0:292 'ballot' ( temp 4-component vector of uint)
0:292 'parti' ( temp 4-component vector of uint)
0:? Linker Objects