disambiguate spirv_intrinsics header names and show how to exchange one literal for an enum

Author: devshgraphicsprogramming

include/nbl/builtin/hlsl/glsl_compat/subgroup_arithmetic.hlsl

@@ -4,7 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_GLSL_COMPAT_SUBGROUP_ARITHMETIC_INCLUDED_
 #define _NBL_BUILTIN_HLSL_GLSL_COMPAT_SUBGROUP_ARITHMETIC_INCLUDED_
 
-#include "nbl/builtin/hlsl/spirv_intrinsics/arithmetic.hlsl"
+#include "nbl/builtin/hlsl/spirv_intrinsics/subgroup/arithmetic.hlsl"
 
 namespace nbl
 {

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

@@ -4,7 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_GLSL_COMPAT_SUBGROUP_BALLOT_INCLUDED_
 #define _NBL_BUILTIN_HLSL_GLSL_COMPAT_SUBGROUP_BALLOT_INCLUDED_
 
-#include "nbl/builtin/hlsl/spirv_intrinsics/ballot.hlsl"
+#include "nbl/builtin/hlsl/spirv_intrinsics/subgroup_ballot.hlsl"
 
 namespace nbl 
 {

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

@@ -4,7 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_GLSL_COMPAT_SUBGROUP_BASIC_INCLUDED_
 #define _NBL_BUILTIN_HLSL_GLSL_COMPAT_SUBGROUP_BASIC_INCLUDED_
 
-#include "nbl/builtin/hlsl/spirv_intrinsics/core.hlsl"
+#include "nbl/builtin/hlsl/spirv_intrinsics/subgroup_basic.hlsl"
 
 namespace nbl 
 {

include/nbl/builtin/hlsl/glsl_compat/subgroup_shuffle.hlsl

@@ -4,7 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_GLSL_COMPAT_SUBGROUP_SHUFFLE_INCLUDED_
 #define _NBL_BUILTIN_HLSL_GLSL_COMPAT_SUBGROUP_SHUFFLE_INCLUDED_
 
-#include "nbl/builtin/hlsl/spirv_intrinsics/shuffle.hlsl"
+#include "nbl/builtin/hlsl/spirv_intrinsics/subgroup_shuffle.hlsl"
 
 namespace nbl 
 {

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

@@ -4,20 +4,22 @@
 #ifndef _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_CORE_INCLUDED_
 #define _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_CORE_INCLUDED_
 
+
+#include "spirv/1.2/spirv.hpp"
+
+
 namespace nbl 
 {
 namespace hlsl
 {
 namespace spirv
 {
-[[vk::ext_instruction(/* OpGroupNonUniformElect */ 333)]]
-bool subgroupElect(uint executionScope);
 
 #pragma region ATOMICS
 template<typename T>
 T atomicAdd([[vk::ext_reference]] T ptr, uint memoryScope, uint memorySemantics, T value);
 template<>
-[[vk::ext_instruction(/* OpAtomicIAdd */ 234)]]
+[[vk::ext_instruction(spv::OpAtomicIAdd)]]
 int atomicAdd([[vk::ext_reference]] int ptr, uint memoryScope, uint memorySemantics, int value);
 template<>
 [[vk::ext_instruction(/* OpAtomicIAdd */ 234)]]

include/nbl/builtin/hlsl/spirv_intrinsics/arithmetic.hlsl renamed to include/nbl/builtin/hlsl/spirv_intrinsics/subgroup_arithmetic.hlsl

@@ -1,8 +1,8 @@
 // Copyright (C) 2023 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
-#ifndef _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_ARITHMETIC_INCLUDED_
-#define _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_ARITHMETIC_INCLUDED_
+#ifndef _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_SUBGROUP_ARITHMETIC_INCLUDED_
+#define _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_SUBGROUP_ARITHMETIC_INCLUDED_
 
 // For all WaveMultiPrefix* ops, an example can be found here https://github.com/microsoft/DirectXShaderCompiler/blob/4e5440e1ee1f30d1164f90445611328293de08fa/tools/clang/test/HLSLFileCheck/hlsl/intrinsics/wave/prefix/sm_6_5_wave.hlsl
 // However, we prefer to implement them with SPIRV intrinsics to avoid DXC changes in the compiler's emitted code

include/nbl/builtin/hlsl/spirv_intrinsics/ballot.hlsl renamed to include/nbl/builtin/hlsl/spirv_intrinsics/subgroup_ballot.hlsl

@@ -1,8 +1,12 @@
 // Copyright (C) 2023 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
-#ifndef _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_BALLOT_INCLUDED_
-#define _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_BALLOT_INCLUDED_
+#ifndef _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_SUBGROUP_BALLOT_INCLUDED_
+#define _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_SUBGROUP_BALLOT_INCLUDED_
+
+
+#include "nbl/builtin/hlsl/spirv_intrinsics/core.hlsl"
+
 
 namespace nbl 
 {

include/nbl/builtin/hlsl/spirv_intrinsics/subgroup_basic.hlsl

@@ -0,0 +1,25 @@
+// Copyright (C) 2023 - DevSH Graphics Programming Sp. z O.O.
+// This file is part of the "Nabla Engine".
+// For conditions of distribution and use, see copyright notice in nabla.h
+#ifndef _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_SUBGROUP_BASIC_INCLUDED_
+#define _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_SUBGROUP_BASIC_INCLUDED_
+
+
+#include "nbl/builtin/hlsl/spirv_intrinsics/core.hlsl"
+
+
+namespace nbl 
+{
+namespace hlsl
+{
+namespace spirv
+{
+
+[[vk::ext_instruction(/* OpGroupNonUniformElect */ 333)]]
+bool subgroupElect(uint executionScope);
+
+}
+}
+}
+
+#endif

include/nbl/builtin/hlsl/spirv_intrinsics/shuffle.hlsl renamed to include/nbl/builtin/hlsl/spirv_intrinsics/subgroup_shuffle.hlsl

@@ -1,8 +1,12 @@
 // Copyright (C) 2023 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
-#ifndef _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_SHUFFLE_INCLUDED_
-#define _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_SHUFFLE_INCLUDED_
+#ifndef _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_SUBGROUP_SHUFFLE_INCLUDED_
+#define _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_SUBGROUP_SHUFFLE_INCLUDED_
+
+
+#include "nbl/builtin/hlsl/spirv_intrinsics/core.hlsl"
+
 
 namespace nbl 
 {

src/nbl/builtin/CMakeLists.txt

@@ -261,6 +261,8 @@ LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/cpp_compat/intrinsics.h")
 
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/bit.hlsl")
 
+# TODO: add `glsl_compat`, `spirv_intrinsics` and `subgroup` contents
+
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/math/quadrature/gauss_legendre/gauss_legendre.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/math/quadrature/gauss_legendre/impl.hlsl")