Use new inline SPIR-V builtin syntax from DXC

Author: devshgraphicsprogramming

examples_tests

@@ -60,12 +60,14 @@ T atomicCompSwap(NBL_REF_ARG(T) ptr, T comparator, T value)
  * For Compute Shaders
  */
 
-// TODO (Future): Its annoying we have to forward declare those, but accessing gl_NumSubgroups and other gl_* values is not yet possible due to https://github.com/microsoft/DirectXShaderCompiler/issues/4217
-// also https://github.com/microsoft/DirectXShaderCompiler/issues/5280
-uint32_t gl_LocalInvocationIndex();
+// TODO: Extemely annoying that HLSL doesn't have referencies, so we can't transparently alias the variables as `const&` :(
+uint32_t3 gl_NumWorkGroups() {return spirv::NumWorkGroups;}
+// TODO: DXC BUG prevents us from defining this!
 uint32_t3 gl_WorkGroupSize();
-uint32_t3 gl_GlobalInvocationID();
-uint32_t3 gl_WorkGroupID();
+uint32_t3 gl_WorkGroupID() {return spirv::WorkgroupId;}
+uint32_t3 gl_LocalInvocationID() {return spirv::LocalInvocationId;}
+uint32_t3 gl_GlobalInvocationID() {return spirv::GlobalInvocationId;}
+uint32_t gl_LocalInvocationIndex() {return spirv::LocalInvocationIndex;}
 
 void barrier() {
     spirv::controlBarrier(spv::ScopeWorkgroup, spv::ScopeWorkgroup, spv::MemorySemanticsAcquireReleaseMask | spv::MemorySemanticsWorkgroupMemoryMask);

include/nbl/builtin/hlsl/glsl_compat/core.hlsl

@@ -14,38 +14,12 @@ namespace hlsl
 namespace glsl
 {
 
-uint32_t4 gl_SubgroupEqMask()
-{
-    const uint32_t comp = gl_SubgroupInvocationID()>>5;
-    uint32_t4 retval = uint32_t4(0,0,0,0);
-    retval[comp] = 0x1u<<(gl_SubgroupInvocationID()&31u);
-    return retval;
-}
-
-uint32_t4 gl_SubgroupGeMask()
-{
-    const uint32_t FullBits = 0xffffffffu;
-    const uint32_t comp = gl_SubgroupInvocationID()>>5;
-    uint32_t4 retval = uint32_t4(comp>0 ? 0u:FullBits,comp>1 ? 0u:FullBits,comp>2 ? 0u:FullBits,0u);
-    retval[comp] = FullBits<<(gl_SubgroupInvocationID()&31u);
-    return retval;
-}
-
-uint32_t4 gl_SubgroupGtMask()
-{
-    uint32_t4 retval = gl_SubgroupGeMask();
-    const uint32_t comp = gl_SubgroupInvocationID()>>5;
-    retval[comp] = 0xfffffffeu<<(gl_SubgroupInvocationID()&31u);
-    return retval;
-}
-
-uint32_t4 gl_SubgroupLeMask() {
-    return ~gl_SubgroupGtMask();
-}
-
-uint32_t4 gl_SubgroupLtMask() {
-    return ~gl_SubgroupGeMask();
-}
+// TODO: Extemely annoying that HLSL doesn't have referencies, so we can't transparently alias the variables as `const&` :(
+uint32_t4 gl_SubgroupEqMask() {return spirv::BuiltInSubgroupEqMask;}
+uint32_t4 gl_SubgroupGeMask() {return spirv::BuiltInSubgroupGeMask;}
+uint32_t4 gl_SubgroupGtMask() {return spirv::BuiltInSubgroupGtMask;}
+uint32_t4 gl_SubgroupLeMask()  {return spirv::BuiltInSubgroupLeMask;}
+uint32_t4 gl_SubgroupLtMask()  {return spirv::BuiltInSubgroupLtMask;}
 
 template<typename T>
 T subgroupBroadcastFirst(T value)

include/nbl/builtin/hlsl/glsl_compat/subgroup_ballot.hlsl

@@ -13,25 +13,15 @@ namespace hlsl
 {
 namespace glsl
 {
-
 #ifdef __HLSL_VERSION
-uint32_t gl_SubgroupSize() {
-    return WaveGetLaneCount();
-}
-
-uint32_t gl_SubgroupSizeLog2() {
-    return firstbithigh(gl_SubgroupSize());
-}
-
-uint32_t gl_SubgroupInvocationID() {
-    return WaveGetLaneIndex();
-}
+// TODO: Extemely annoying that HLSL doesn't have referencies, so we can't transparently alias the variables as `const&` :(
+uint32_t gl_SubgroupSize() {return spirv::SubgroupSize;}
+uint32_t gl_SubgroupSizeLog2() {return firstbithigh(spirv::SubgroupSize);}
+uint32_t gl_SubgroupInvocationID() {return spirv::SubgroupLocalInvocationId;}
 
 // only available in compute
-uint32_t gl_SubgroupID() {
-    // TODO (PentaKon): This is not always correct (subgroup IDs aren't always aligned with invocation index per the spec)
-    return gl_LocalInvocationIndex() >> gl_SubgroupSizeLog2();
-}
+uint32_t gl_NumSubgroups() {return spirv::NumSubgroups;}
+uint32_t gl_SubgroupID() {return spirv::SubgroupId;}
 
 bool subgroupElect() {
     return spirv::subgroupElect(spv::ScopeSubgroup);
@@ -57,7 +47,6 @@ void subgroupMemoryBarrierImage() {
     spirv::memoryBarrier(spv::ScopeSubgroup, spv::MemorySemanticsAcquireReleaseMask | spv::MemorySemanticsImageMemoryMask);
 }
 #endif
-
 }
 }
 }

include/nbl/builtin/hlsl/glsl_compat/subgroup_basic.hlsl

@@ -29,7 +29,7 @@
 #define NBL_ARG_125(a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13,a14,a15,a16,a17,a18,a19,a20,a21,a22,a23,a24,a25,a26,a27,a28,a29,a30,a31,a32,a33,a34,a35,a36,a37,a38,a39,a40,a41,a42,a43,a44,a45,a46,a47,a48,a49,a50,a51,a52,a53,a54,a55,a56,a57,a58,a59,a60,a61,a62,a63,a64,a65,a66,a67,a68,a69,a70,a71,a72,a73,a74,a75,a76,a77,a78,a79,a80,a81,a82,a83,a84,a85,a86,a87,a88,a89,a90,a91,a92,a93,a94,a95,a96,a97,a98,a99,a100,a101,a102,a103,a104,a105,a106,a107,a108,a109,a110,a111,a112,a113,a114,a115,a116,a117,a118,a119,a120,a121,a122,a123,a124,a125, ... ) a125
 #define NBL_VA_ARGS_COUNT( ... ) NBL_EVAL(NBL_ARG_125(__VA_ARGS__,125,124,123,122,121,120,119,118,117,116,115,114,113,112,111,110,109,108,107,106,105,104,103,102,101,100,99,98,97,96,95,94,93,92,91,90,89,88,87,86,85,84,83,82,81,80,79,78,77,76,75,74,73,72,71,70,69,68,67,66,65,64,63,62,61,60,59,58,57,56,55,54,53,52,51,50,49,48,47,46,45,44,43,42,41,40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0))
 
-//
+// TODO: Use BOOST_PP!
 #define NBL_FOREACH_0(WHAT)
 #define NBL_FOREACH_1(WHAT, X) NBL_EVAL(WHAT(X))
 #define NBL_FOREACH_2(WHAT, X, ...) NBL_EVAL(WHAT(X)NBL_FOREACH_1(WHAT, __VA_ARGS__))

include/nbl/builtin/hlsl/macros.h

@@ -18,6 +18,22 @@ namespace hlsl
 #ifdef __HLSL_VERSION
 namespace spirv
 {
+[[vk::ext_builtin_input(spv::BuiltInHelperInvocation)]]
+static const bool HelperInvocation;
+
+[[vk::ext_builtin_input(spv::BuiltInNumWorkgroups)]]
+static const uint32_t3 NumWorkGroups;
+// TODO: Doesn't work, find out why and file issue on DXC!
+//[[vk::ext_builtin_input(spv::BuiltInWorkgroupSize)]]
+//static const uint32_t3 WorkgroupSize;
+[[vk::ext_builtin_input(spv::BuiltInWorkgroupId)]]
+static const uint32_t3 WorkgroupId;
+[[vk::ext_builtin_input(spv::BuiltInLocalInvocationId)]]
+static const uint32_t3 LocalInvocationId;
+[[vk::ext_builtin_input(spv::BuiltInGlobalInvocationId)]]
+static const uint32_t3 GlobalInvocationId;
+[[vk::ext_builtin_input(spv::BuiltInLocalInvocationIndex)]]
+static const uint32_t LocalInvocationIndex;
 
 template<typename T>
 T atomicAdd([[vk::ext_reference]] T ptr, uint32_t memoryScope, uint32_t memorySemantics, T value);

include/nbl/builtin/hlsl/spirv_intrinsics/core.hlsl

@@ -15,6 +15,17 @@ namespace hlsl
 {
 namespace spirv
 {
+[[vk::ext_builtin_input(spv::BuiltInSubgroupEqMask)]]
+static const uint32_t4 BuiltInSubgroupEqMask;
+[[vk::ext_builtin_input(spv::BuiltInSubgroupGeMask)]]
+static const uint32_t4 BuiltInSubgroupGeMask;
+[[vk::ext_builtin_input(spv::BuiltInSubgroupGtMask)]]
+static const uint32_t4 BuiltInSubgroupGtMask;
+[[vk::ext_builtin_input(spv::BuiltInSubgroupLeMask)]]
+static const uint32_t4 BuiltInSubgroupLeMask;
+[[vk::ext_builtin_input(spv::BuiltInSubgroupLtMask)]]
+static const uint32_t4 BuiltInSubgroupLtMask;
+
 template<typename T>
 [[vk::ext_capability( spv::CapabilityGroupNonUniformBallot )]]
 [[vk::ext_instruction( spv::OpGroupNonUniformBroadcastFirst )]]

include/nbl/builtin/hlsl/spirv_intrinsics/subgroup_ballot.hlsl

@@ -14,10 +14,17 @@ namespace hlsl
 {
 namespace spirv
 {
+[[vk::ext_builtin_input(spv::BuiltInSubgroupSize)]]
+static const uint32_t SubgroupSize;
+[[vk::ext_builtin_input(spv::BuiltInNumSubgroups)]]
+static const uint32_t NumSubgroups;
+[[vk::ext_builtin_input(spv::BuiltInSubgroupId)]]
+static const uint32_t SubgroupId;
+[[vk::ext_builtin_input(spv::BuiltInSubgroupLocalInvocationId)]]
+static const uint32_t SubgroupLocalInvocationId;
 
 [[vk::ext_instruction( spv::OpGroupNonUniformElect )]]
 bool subgroupElect(uint32_t executionScope);
-
 }
 }
 }