diff options
| author | ArielG-NV <159081215+ArielG-NV@users.noreply.github.com> | 2025-08-29 15:52:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-29 22:52:34 +0000 |
| commit | 7758625d3fea67e55e98e7e4103d56c9918365be (patch) | |
| tree | 2ed40aeb4d16262866e5540dad1a519951b5f772 /tests/spirv | |
| parent | 450ef7934c1adfdf4a3a3c72967de3c5798a020d (diff) | |
[CBP] Pointer frontend changes + groupshared pointer support (#7848)
Resolves #7628
Resolves: #8197
Primary Goals:
1. Add `Access` to pointer
2. AddressSpace::GroupShared support for pointers (SPIR-V)
3. Add `__getAddress()` to replace `&`
* `&` is not updated to `require(cpu)` since slangpy uses `&`. This
means we must: (1) merge PR; (2) replace `&` with `__getAddress()`; (3)
add `require(cpu)` to `&`
Changes:
* Added to `Ptr` the `Access` generic argument & logic (for
`Access::Read`).
* Moved the generic argument `AddressSpace` from `Ptr` to the end of the
type.
* Added pointer casting support between any `Ptr` as long as the
`AddressSpace` is the same
* Disallow globallycoherent T* and coherent T*
* Disallow const T*, T const*, and const T*
* Fixed .natvis display of `ConstantValue` `ValOperandNode`
* Support generic resolution of type-casted integers
* Added `VariablePointer` emitting for spirv + other minor logic needed
for groupshared pointers
Breaking Changes:
* Anyone using the `AddressSpace` of `Ptr` will now have to account for
the `Access` argument
* we disallow various syntax paired with `Ptr` and `T*`
---------
Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
Diffstat (limited to 'tests/spirv')
| -rw-r--r-- | tests/spirv/pointer-from-user-guide.slang | 2 | ||||
| -rw-r--r-- | tests/spirv/pointer.slang | 4 | ||||
| -rw-r--r-- | tests/spirv/ptr-vector-member.slang | 20 |
3 files changed, 12 insertions, 14 deletions
diff --git a/tests/spirv/pointer-from-user-guide.slang b/tests/spirv/pointer-from-user-guide.slang index 662579c2b..115530b2b 100644 --- a/tests/spirv/pointer-from-user-guide.slang +++ b/tests/spirv/pointer-from-user-guide.slang @@ -15,7 +15,7 @@ float test(MyType* pObj) { //SPV: OpTypePointer MyType* pNext = pObj + 1; - MyType* pNext2 = &pNext[1]; + MyType* pNext2 = __getAddress(pNext[1]); return pNext.a + pNext->a + (*pNext2).a + pNext2[0].a; } diff --git a/tests/spirv/pointer.slang b/tests/spirv/pointer.slang index affc52e1b..f3b086e6a 100644 --- a/tests/spirv/pointer.slang +++ b/tests/spirv/pointer.slang @@ -28,12 +28,12 @@ void funcWithInOutParam(inout PP p) // CHECK: OpEntryPoint -StructuredBuffer<Data> buffer; +uniform Data* buffer; RWStructuredBuffer<int> output; void main(int id : SV_DispatchThreadID) { output[0] = buffer[0].pNext.data; - let pData = &(buffer[0].pNext->data); // operator -> is also allowed on pointer types. + let pData = __getAddress(buffer[0].pNext->data); // operator -> is also allowed on pointer types. // CHECK: OpPtrAccessChain int* pData1 = pData + 1; *pData1 = 3; diff --git a/tests/spirv/ptr-vector-member.slang b/tests/spirv/ptr-vector-member.slang index 0683d8838..6e493b4c7 100644 --- a/tests/spirv/ptr-vector-member.slang +++ b/tests/spirv/ptr-vector-member.slang @@ -1,19 +1,17 @@ -//TEST:SIMPLE(filecheck=CHECK): -target spirv +//DISABLE_TEST:SIMPLE(filecheck=SPIRV):-stage compute -entry computeMain -target spirv +//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -output-using-type -emit-spirv-directly -// CHECK: %[[PTR:[0-9a-zA-Z_]+]] = OpAccessChain %_ptr_PhysicalStorageBuffer_uint %16 %int_0 -// CHECK: %{{.*}} = OpAtomicIAdd %uint %[[PTR]] %uint_1 %uint_0 %uint_1 +// SPIRV: OpEntryPoint +// SPIRV-NOT: error -struct Push2 -{ - uint4 * value; -}; - -[[vk::push_constant]] Push2 push2; +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer +uniform int4* output; [shader("compute")] [numthreads(1, 1, 1)] -void main() +void computeMain() { - uint * v = &push2.value[0].x; + // CHECK: 1 + int* v = __getAddress(output[0].x); InterlockedAdd(*v, 1); }
\ No newline at end of file |
