Merge pull request #572 from Devsh-Graphics-Programming/merge_kpentaris_hlsl

Merged `glsl_compat`, `spirv_intrinsics` and `subgroup` files from ht…

Author: devshgraphicsprogramming

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

@@ -0,0 +1,70 @@
+// 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_GLSL_COMPAT_CORE_INCLUDED_
+#define _NBL_BUILTIN_HLSL_GLSL_COMPAT_CORE_INCLUDED_
+
+#include "nbl/builtin/hlsl/cpp_compat.hlsl"
+#include "nbl/builtin/hlsl/spirv_intrinsics/core.hlsl"
+
+namespace nbl 
+{
+namespace hlsl
+{
+namespace glsl
+{
+
+template<typename T>
+T atomicAdd(NBL_REF_ARG(T) ptr, T value)
+{
+    return spirv::atomicAdd<T>(ptr, 1, 0, value);
+}
+template<typename T>
+T atomicAnd(NBL_REF_ARG(T) ptr, T value)
+{
+    return spirv::atomicAnd<T>(ptr, 1, 0, value);
+}
+template<typename T>
+T atomicOr(NBL_REF_ARG(T) ptr, T value)
+{
+    return spirv::atomicOr<T>(ptr, 1, 0, value);
+}
+template<typename T>
+T atomicXor(NBL_REF_ARG(T) ptr, T value)
+{
+    return spirv::atomicXor<T>(ptr, 1, 0, value);
+}
+template<typename T>
+T atomicMin(NBL_REF_ARG(T) ptr, T value)
+{
+    return spirv::atomicMin<T>(ptr, 1, 0, value);
+}
+template<typename T>
+T atomicMax(NBL_REF_ARG(T) ptr, T value)
+{
+    return spirv::atomicMax<T>(ptr, 1, 0, value);
+}
+template<typename T>
+T atomicExchange(NBL_REF_ARG(T) ptr, T value)
+{
+    return spirv::atomicExchange<T>(ptr, 1, 0, value);
+}
+template<typename T>
+T atomicCompSwap(NBL_REF_ARG(T) ptr, T comparator, T value)
+{
+    return spirv::atomicCompSwap<T>(ptr, 1, 0, 0, value, comparator);
+}
+
+void barrier() {
+    spirv::controlBarrier(2, 2, 0x8 | 0x100);
+}
+
+void memoryBarrierShared() {
+    spirv::memoryBarrier(1, 0x8 | 0x100);
+}
+
+}
+}
+}
+
+#endif

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

@@ -0,0 +1,111 @@
+// 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_GLSL_COMPAT_SUBGROUP_ARITHMETIC_INCLUDED_
+#define _NBL_BUILTIN_HLSL_GLSL_COMPAT_SUBGROUP_ARITHMETIC_INCLUDED_
+
+#include "nbl/builtin/hlsl/spirv_intrinsics/arithmetic.hlsl"
+
+namespace nbl
+{
+namespace hlsl
+{
+namespace glsl
+{
+    
+template<typename T>
+T subgroupAdd(T value) {
+    return spirv::groupAdd(3, 0, value);
+}
+template<typename T>
+T subgroupInclusiveAdd(T value) {
+    return spirv::groupAdd(3, 1, value);
+}
+template<typename T>
+T subgroupExclusiveAdd(T value) {
+    return spirv::groupAdd(3, 2, value);
+}
+
+template<typename T>
+T subgroupMul(T value) {
+    return spirv::groupMul(3, 0, value);
+}
+template<typename T>
+T subgroupInclusiveMul(T value) {
+    return spirv::groupMul(3, 1, value);
+}
+template<typename T>
+T subgroupExclusiveMul(T value) {
+    return spirv::groupMul(3, 2, value);
+}
+
+template<typename T>
+T subgroupAnd(T value) {
+    return spirv::groupBitwiseAnd(3, 0, value);
+}
+template<typename T>
+T subgroupInclusiveAnd(T value) {
+    return spirv::groupBitwiseAnd(3, 1, value);
+}
+template<typename T>
+T subgroupExclusiveAnd(T value) {
+    return spirv::groupBitwiseAnd(3, 2, value);
+}
+
+template<typename T>
+T subgroupOr(T value) {
+    return spirv::groupBitwiseOr(3, 0, value);
+}
+template<typename T>
+T subgroupInclusiveOr(T value) {
+    return spirv::groupBitwiseOr(3, 1, value);
+}
+template<typename T>
+T subgroupExclusiveOr(T value) {
+    return spirv::groupBitwiseOr(3, 2, value);
+}
+
+template<typename T>
+T subgroupXor(T value) {
+    return spirv::groupBitwiseXor(3, 0, value);
+}
+template<typename T>
+T subgroupInclusiveXor(T value) {
+    return spirv::groupBitwiseXor(3, 1, value);
+}
+template<typename T>
+T subgroupExclusiveXor(T value) {
+    return spirv::groupBitwiseXor(3, 2, value);
+}
+
+template<typename T>
+T subgroupMin(T value) {
+    return spirv::groupBitwiseMin(3, 0, value);
+}
+template<typename T>
+T subgroupInclusiveMin(T value) {
+    return spirv::groupBitwiseMin(3, 1, value);
+}
+template<typename T>
+T subgroupExclusiveMin(T value) {
+    return spirv::groupBitwiseMin(3, 2, value);
+}
+
+template<typename T>
+T subgroupMax(T value) {
+    return spirv::groupBitwiseMax(3, 0, value);
+}
+template<typename T>
+T subgroupInclusiveMax(T value) {
+    return spirv::groupBitwiseMax(3, 1, value);
+}
+template<typename T>
+T subgroupExclusiveMax(T value) {
+    return spirv::groupBitwiseMax(3, 2, value);
+}
+
+}
+}
+}
+
+#endif

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

@@ -0,0 +1,32 @@
+// 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_GLSL_COMPAT_SUBGROUP_BALLOT_INCLUDED_
+#define _NBL_BUILTIN_HLSL_GLSL_COMPAT_SUBGROUP_BALLOT_INCLUDED_
+
+#include "nbl/builtin/hlsl/spirv_intrinsics/ballot.hlsl"
+
+namespace nbl 
+{
+namespace hlsl
+{
+namespace glsl
+{
+
+template<typename T>
+T subgroupBroadcastFirst(T value)
+{
+    return spirv::subgroupBroadcastFirst<T>(/* Subgroup Scope */ 3, value);
+}
+
+template<typename T>
+T subgroupBroadcast(T value, uint invocationId)
+{
+    return spirv::subgroupBroadcast<T>(/* Subgroup Scope */ 3, value, invocationId);
+}
+
+}
+}
+}
+
+#endif

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

@@ -0,0 +1,73 @@
+// 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_GLSL_COMPAT_SUBGROUP_BASIC_INCLUDED_
+#define _NBL_BUILTIN_HLSL_GLSL_COMPAT_SUBGROUP_BASIC_INCLUDED_
+
+#include "nbl/builtin/hlsl/spirv_intrinsics/core.hlsl"
+
+namespace nbl 
+{
+namespace hlsl
+{
+namespace glsl
+{
+
+// TODO (Future): Accessing gl_SubgroupSize and other gl_* values is not yet possible due to https://github.com/microsoft/DirectXShaderCompiler/issues/4217
+
+uint gl_SubgroupSize() {
+    return WaveGetLaneCount();
+}
+
+uint gl_SubgroupSizeLog2() {
+    return firstbithigh(gl_SubgroupSize());
+}
+
+uint gl_SubgroupInvocationID() {
+    return WaveGetLaneIndex();
+}
+
+uint 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();
+}
+
+uint4 gl_SubgroupEqMask() {
+    return uint4(0,0,0,1) << gl_SubgroupInvocationID();
+}
+
+uint4 gl_SubgroupGeMask() {
+    return uint4(0xffffffffu, 0xffffffffu, 0xffffffffu, 0xffffffffu) << gl_SubgroupInvocationID();
+}
+
+uint4 gl_SubgroupGtMask() {
+    return gl_SubgroupGeMask() << 1;
+}
+
+uint4 gl_SubgroupLeMask() {
+    return ~gl_SubgroupGtMask();
+}
+
+uint4 gl_SubgroupLtMask() {
+    return ~gl_SubgroupGeMask();
+}
+
+bool subgroupElect() {
+    return spirv::subgroupElect(/*subgroup execution scope*/ 3);
+}
+
+// Memory Semantics: AcquireRelease, UniformMemory, WorkgroupMemory, AtomicCounterMemory, ImageMemory
+void subgroupBarrier() {
+    // REVIEW-519: barrier with subgroup scope is not supported  so leave commented out for now 
+    //spirv::controlBarrier(3, 3, 0x800 | 0x400 | 0x100 | 0x40 | 0x8);
+}
+
+void subgroupMemoryBarrierShared() {
+    spirv::memoryBarrier(3, 0x800 | 0x400 | 0x100 | 0x40 | 0x8);
+}
+
+}
+}
+}
+
+#endif

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

@@ -0,0 +1,45 @@
+// 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_GLSL_COMPAT_SUBGROUP_SHUFFLE_INCLUDED_
+#define _NBL_BUILTIN_HLSL_GLSL_COMPAT_SUBGROUP_SHUFFLE_INCLUDED_
+
+#include "nbl/builtin/hlsl/spirv_intrinsics/shuffle.hlsl"
+
+namespace nbl 
+{
+namespace hlsl
+{
+namespace glsl
+{
+template<typename T>
+T subgroupShuffle(T value, uint invocationId)
+{
+    return spirv::groupShuffle<T>(3, value, invocationId);
+}
+
+template<typename T>
+T subgroupShuffleUp(T value, uint delta)
+{
+#ifdef NBL_GL_KHR_shader_subgroup_shuffle_relative
+    return spirv::groupShuffleUp<T>(3, value, delta);
+#else
+    return spirv::groupShuffle<T>(3, value, gl_SubgroupInvocationID() - delta);
+#endif
+}
+
+template<typename T>
+T subgroupShuffleDown(T value, uint delta)
+{
+#ifdef NBL_GL_KHR_shader_subgroup_shuffle_relative
+    return spirv::groupShuffleDown<T>(3, value, delta);
+#else
+    return spirv::groupShuffle<T>(3, value, gl_SubgroupInvocationID() + delta);
+#endif
+}
+
+}
+}
+}
+
+#endif