Device-wide chained scan with lookback #1086
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| #ifndef _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_DEVICE_ARITHMETIC_INCLUDED_ | ||
| #define _NBL_BUILTIN_HLSL_CONCEPTS_ACCESSORS_DEVICE_ARITHMETIC_INCLUDED_ | ||
|
|
||
| #include "nbl/builtin/hlsl/concepts/accessors/generic_shared_data.hlsl" | ||
|
|
||
| namespace nbl | ||
| { | ||
| namespace hlsl | ||
| { | ||
| namespace scan | ||
| { | ||
|
|
||
| template<typename T, typename V, typename I=uint32_t> | ||
| NBL_BOOL_CONCEPT ArithmeticSharedMemoryAccessor = concepts::accessors::GenericSharedMemoryAccessor<T,V,I>; | ||
|
|
||
| template<typename T, typename V, typename I=uint32_t> | ||
| NBL_BOOL_CONCEPT ArithmeticReadOnlyDataAccessor = concepts::accessors::GenericReadAccessor<T,V,I>; | ||
|
|
||
| template<typename T, typename V, typename I=uint32_t> | ||
| NBL_BOOL_CONCEPT ArithmeticDataAccessor = concepts::accessors::GenericDataAccessor<T,V,I>; | ||
|
|
||
| #define NBL_CONCEPT_NAME DeviceReductionsAccessor | ||
| #define NBL_CONCEPT_TPLT_PRM_KINDS (typename)(typename) | ||
| #define NBL_CONCEPT_TPLT_PRM_NAMES (T)(V) | ||
| #define NBL_CONCEPT_PARAM_0 (accessor, T) | ||
| #define NBL_CONCEPT_PARAM_1 (val, V) | ||
| #define NBL_CONCEPT_PARAM_2 (index, uint64_t) | ||
| NBL_CONCEPT_BEGIN(3) | ||
| #define accessor NBL_CONCEPT_PARAM_T NBL_CONCEPT_PARAM_0 | ||
| #define val NBL_CONCEPT_PARAM_T NBL_CONCEPT_PARAM_1 | ||
| #define index NBL_CONCEPT_PARAM_T NBL_CONCEPT_PARAM_2 | ||
| NBL_CONCEPT_END( | ||
| ((NBL_CONCEPT_REQ_TYPE_ALIAS_CONCEPT)(concepts::accessors::GenericDataAccessor, T, V, uint64_t)) | ||
| ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((accessor.atomicMax(index, val)), is_same_v, V)) | ||
| ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((accessor.atomicExchange(index, val)), is_same_v, V)) | ||
| ); | ||
| #undef val | ||
| #undef index | ||
| #undef accessor | ||
| #include <nbl/builtin/hlsl/concepts/__end.hlsl> | ||
|
|
||
|
Comment on lines
+22
to
+41
Member
There was a problem hiding this comment. shall we generalize more and hoist it out into a |
||
| // TODO: as counter, maybe just increment 1 always? | ||
|
There was a problem hiding this comment. nah don't bother |
||
| #define NBL_CONCEPT_NAME WorkgroupCounterAccessor | ||
| #define NBL_CONCEPT_TPLT_PRM_KINDS (typename) | ||
| #define NBL_CONCEPT_TPLT_PRM_NAMES (T) | ||
| #define NBL_CONCEPT_PARAM_0 (accessor, T) | ||
| #define NBL_CONCEPT_PARAM_1 (val, uint32_t) | ||
| #define NBL_CONCEPT_PARAM_2 (index, uint64_t) | ||
| NBL_CONCEPT_BEGIN(3) | ||
| #define accessor NBL_CONCEPT_PARAM_T NBL_CONCEPT_PARAM_0 | ||
| #define val NBL_CONCEPT_PARAM_T NBL_CONCEPT_PARAM_1 | ||
| #define index NBL_CONCEPT_PARAM_T NBL_CONCEPT_PARAM_2 | ||
| NBL_CONCEPT_END( | ||
| ((NBL_CONCEPT_REQ_EXPR_RET_TYPE)((accessor.atomicAdd(index, val)), is_same_v, uint32_t)) | ||
| ); | ||
| #undef val | ||
| #undef index | ||
| #undef accessor | ||
| #include <nbl/builtin/hlsl/concepts/__end.hlsl> | ||
|
Comment on lines
+43
to
+59
There was a problem hiding this comment. same could generalize to |
||
|
|
||
| } | ||
| } | ||
| } | ||
|
|
||
| #endif | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -116,16 +116,6 @@ enable_if_t<spirv::is_pointer_v<Ptr_T>, T> atomicXor(Ptr_T ptr, T value) | |
| { | ||
| return spirv::atomicXor<T, Ptr_T>(ptr, spv::ScopeDevice, spv::MemorySemanticsMaskNone, value); | ||
| } | ||
| template<typename T> | ||
| T atomicExchange(NBL_REF_ARG(T) ptr, T value) | ||
| { | ||
|
|
@@ -147,6 +137,100 @@ enable_if_t<spirv::is_pointer_v<Ptr_T>, T> atomicCompSwap(Ptr_T ptr, T comparato | |
| return spirv::atomicCompareExchange<T, Ptr_T>(ptr, spv::ScopeDevice, spv::MemorySemanticsMaskNone, spv::MemorySemanticsMaskNone, value, comparator); | ||
| } | ||
|
|
||
| namespace impl | ||
| { | ||
| template<typename T NBL_STRUCT_CONSTRAINABLE> | ||
| struct atomicMin; | ||
|
|
||
| template<typename T> | ||
| NBL_PARTIAL_REQ_TOP(concepts::SignedIntegral<T>) | ||
| struct atomicMin<T NBL_PARTIAL_REQ_BOT(concepts::SignedIntegral<T>) > | ||
| { | ||
| static T __call(NBL_REF_ARG(T) ptr, T value) | ||
| { | ||
| return spirv::atomicSMin<T>(ptr, spv::ScopeDevice, spv::MemorySemanticsMaskNone, value); | ||
| } | ||
|
|
||
| template<typename Ptr_T> // DXC Workaround | ||
|
Contributor
There was a problem hiding this comment. It's best to say exactly what dxc issue we're working around and be more detailed in the comments. in case they fix it and we can upgrade our code. I have a question though. Side note:
There was a problem hiding this comment.
Because in C++20 you need the requires clause on the top, but Thats the convention we already chose and if we were to change it we'd have to change a lot of other code as well. There was a problem hiding this comment.
you want to be forward compatible with C++20, because HLSL is going that way, also it keeps the code easy to port to CUDA and SYCL later on. There was a problem hiding this comment.
Yes @keptsecret please cite/link the DXC issue in the comments for stuff like that (git commit message too) |
||
| static T __call(Ptr_T ptr, T value) | ||
| { | ||
| return spirv::atomicSMin<T>(ptr, spv::ScopeDevice, spv::MemorySemanticsMaskNone, value); | ||
| } | ||
| }; | ||
|
|
||
| template<typename T> | ||
| NBL_PARTIAL_REQ_TOP(concepts::UnsignedIntegral<T>) | ||
| struct atomicMin<T NBL_PARTIAL_REQ_BOT(concepts::UnsignedIntegral<T>) > | ||
| { | ||
| static T __call(NBL_REF_ARG(T) ptr, T value) | ||
| { | ||
| return spirv::atomicUMin<T>(ptr, spv::ScopeDevice, spv::MemorySemanticsMaskNone, value); | ||
| } | ||
|
|
||
| template<typename Ptr_T> // DXC Workaround | ||
| static T __call(Ptr_T ptr, T value) | ||
| { | ||
| return spirv::atomicUMin<T>(ptr, spv::ScopeDevice, spv::MemorySemanticsMaskNone, value); | ||
| } | ||
| }; | ||
|
|
||
| template<typename T NBL_STRUCT_CONSTRAINABLE> | ||
| struct atomicMax; | ||
|
|
||
| template<typename T> | ||
| NBL_PARTIAL_REQ_TOP(concepts::SignedIntegral<T>) | ||
| struct atomicMax<T NBL_PARTIAL_REQ_BOT(concepts::SignedIntegral<T>) > | ||
| { | ||
| static T __call(NBL_REF_ARG(T) ptr, T value) | ||
| { | ||
| return spirv::atomicSMax<T>(ptr, spv::ScopeDevice, spv::MemorySemanticsMaskNone, value); | ||
| } | ||
|
|
||
| template<typename Ptr_T> // DXC Workaround | ||
| static T __call(Ptr_T ptr, T value) | ||
| { | ||
| return spirv::atomicSMax<T>(ptr, spv::ScopeDevice, spv::MemorySemanticsMaskNone, value); | ||
| } | ||
| }; | ||
|
|
||
| template<typename T> | ||
| NBL_PARTIAL_REQ_TOP(concepts::UnsignedIntegral<T>) | ||
| struct atomicMax<T NBL_PARTIAL_REQ_BOT(concepts::UnsignedIntegral<T>) > | ||
| { | ||
| static T __call(NBL_REF_ARG(T) ptr, T value) | ||
| { | ||
| return spirv::atomicUMax<T>(ptr, spv::ScopeDevice, spv::MemorySemanticsMaskNone, value); | ||
| } | ||
|
|
||
| template<typename Ptr_T> // DXC Workaround | ||
| static T __call(Ptr_T ptr, T value) | ||
| { | ||
| return spirv::atomicUMax<T>(ptr, spv::ScopeDevice, spv::MemorySemanticsMaskNone, value); | ||
| } | ||
| }; | ||
| } | ||
|
Comment on lines
+140
to
+211
There was a problem hiding this comment. we actually have a huge problem here and I think this is why I didn't pour that much effort into the GLSL compat functions
Ideally none of our code should be using the GLSL atomics because they're so bad and imprecise |
||
|
|
||
| template<typename T> | ||
| T atomicMin(NBL_REF_ARG(T) ptr, T value) | ||
| { | ||
| return impl::atomicMin<T>::__call(ptr, value); | ||
| } | ||
| template<typename T, typename Ptr_T> // DXC Workaround | ||
| enable_if_t<spirv::is_pointer_v<Ptr_T>, T> atomicMin(Ptr_T ptr, T value) | ||
| { | ||
| return impl::atomicMin<T>::template __call<Ptr_T>(ptr, value); | ||
| } | ||
| template<typename T> | ||
| T atomicMax(NBL_REF_ARG(T) ptr, T value) | ||
| { | ||
| return impl::atomicMax<T>::__call(ptr, value); | ||
| } | ||
| template<typename T, typename Ptr_T> // DXC Workaround | ||
| enable_if_t<spirv::is_pointer_v<Ptr_T>, T> atomicMax(Ptr_T ptr, T value) | ||
| { | ||
| return impl::atomicMax<T>::template __call<Ptr_T>(ptr, value); | ||
| } | ||
|
|
||
| /** | ||
| * GLSL extended math | ||
| */ | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why are we introducing new aliases?