diff options
| author | 16-Bit-Dog <67922228+16-Bit-Dog@users.noreply.github.com> | 2025-10-10 13:09:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-10 17:09:24 +0000 |
| commit | 1e0908bd7107dfbdac912b693c3ab9bd6e1dc8b3 (patch) | |
| tree | cc39d2e18abc954fb76f9a54b11a8d492685c6e2 /source/slang/core.meta.slang | |
| parent | b4023f715885ada9a2777ea3b0d6d9739860b39b (diff) | |
Addition of `Load`/`Store` coherent operations (#8395)
Fixes: https://github.com/shader-slang/slang/issues/7634
Duplicate of PR https://github.com/shader-slang/slang/pull/8052
Primary Changes:
* Added `storeCoherent` and `loadCoherent` for coherent load/store via
pointers. This is backed by `IRMemoryScopeAttr` which is an `IRAttr`
attached to `IRLoad` and `IRStore`
* Logic in `source\slang\slang-emit-spirv.cpp` for load/store emitting
has been reworked to be less messy and more maintainable
* Add to `hlsl.meta.slang` coop vector and coop matrix coherent
load/store operations
Secondary Changes:
* Added a missing load/store test for coop matrix:
`tests\cooperative-matrix\load-store-pointer.slang`
---------
Co-authored-by: ArielG-NV <aglasroth@nvidia.com>
Co-authored-by: ArielG-NV <159081215+ArielG-NV@users.noreply.github.com>
Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
Co-authored-by: Nathan V. Morrical <natemorrical@gmail.com>
Diffstat (limited to 'source/slang/core.meta.slang')
| -rw-r--r-- | source/slang/core.meta.slang | 43 |
1 files changed, 40 insertions, 3 deletions
diff --git a/source/slang/core.meta.slang b/source/slang/core.meta.slang index 5ffab1f9c..9b55dc35a 100644 --- a/source/slang/core.meta.slang +++ b/source/slang/core.meta.slang @@ -1368,19 +1368,20 @@ struct Ptr< __intrinsic_op($(kIROp_GetOffsetPtr)) [nonmutating] + [__NoSideEffect] ref; } }; //@hidden: __intrinsic_op($(kIROp_AlignedAttr)) -void __align_attr(int alignment); +internal int __align_attr(int alignment); __intrinsic_op($(kIROp_Load)) -T __load_aligned<T, U>(T* ptr, U alignmentAttr); +internal T __load_aligned<T>(T* ptr, int alignmentAttr); __intrinsic_op($(kIROp_Store)) -void __store_aligned<T, U>(T* ptr, T value, U alignmentAttr); +internal void __store_aligned<T>(T* ptr, T value, int alignmentAttr); //@public: @@ -1413,6 +1414,42 @@ void storeAligned<int alignment, T>(T* ptr, T value) __store_aligned(ptr, value, __align_attr(alignment)); } +//@hidden: +__intrinsic_op($(kIROp_MemoryScopeAttr)) +internal int __memoryscope_attr(MemoryScope scope); + +__intrinsic_op($(kIROp_Load)) +internal T __load_coherent<T, Access access, AddressSpace addrSpace>(Ptr<T, access, addrSpace> ptr, int alignmentAttr, int memoryScopeAttr); + +__intrinsic_op($(kIROp_Store)) +internal void __store_coherent<T, AddressSpace addrSpace>(Ptr<T, Access::ReadWrite, addrSpace> ptr, T value, int alignmentAttr, int memoryScopeAttr); + +/// Store a value coherently to a memoryscope. +/// Tighter memory scopes may be faster to operate on. +/// @param ptr The pointer to store value to. +/// @param value The value to store. +/// +[require(SPV_KHR_vulkan_memory_model)] +[ForceInline] +__generic<int alignment, MemoryScope scope, T, AddressSpace addrSpace> +void storeCoherent(Ptr<T, Access::ReadWrite, addrSpace> ptr, T value) +{ + __store_coherent<T, addrSpace>(ptr, value, __align_attr(alignment), __memoryscope_attr(scope)); +} + +/// Load a value coherently to a memoryscope. +/// Tighter memory scopes may be faster to operate on. +/// @param ptr The pointer to load from. +/// +[require(SPV_KHR_vulkan_memory_model)] +[ForceInline] +[__NoSideEffect] +__generic<int alignment, MemoryScope scope, T, Access access, AddressSpace addrSpace> +T loadCoherent(Ptr<T, access, addrSpace> ptr) +{ + return __load_coherent<T, access, addrSpace>(ptr, __align_attr(alignment), __memoryscope_attr(scope)); +} + ${{{ StringBuilder ptrTypeParameterListBuilder; ptrTypeParameterListBuilder << "T, Access access, AddressSpace addrSpace"; |
