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 /source/slang/slang-ast-builder.cpp | |
| 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 'source/slang/slang-ast-builder.cpp')
| -rw-r--r-- | source/slang/slang-ast-builder.cpp | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/source/slang/slang-ast-builder.cpp b/source/slang/slang-ast-builder.cpp index a71abf570..5da4e9521 100644 --- a/source/slang/slang-ast-builder.cpp +++ b/source/slang/slang-ast-builder.cpp @@ -461,9 +461,17 @@ Type* ASTBuilder::getSpecializedBuiltinType(ArrayView<Val*> genericArgs, const c return rsType; } -PtrType* ASTBuilder::getPtrType(Type* valueType, AddressSpace addrSpace) +PtrType* ASTBuilder::getPtrType(Type* valueType, Val* accessQualifier, Val* addrSpace) { - return dynamicCast<PtrType>(getPtrType(valueType, addrSpace, "PtrType")); + return dynamicCast<PtrType>(getPtrType(valueType, accessQualifier, addrSpace, "PtrType")); +} + +PtrType* ASTBuilder::getPtrType( + Type* valueType, + AccessQualifier accessQualifier, + AddressSpace addrSpace) +{ + return dynamicCast<PtrType>(getPtrType(valueType, accessQualifier, addrSpace, "PtrType")); } Type* ASTBuilder::getDefaultLayoutType() @@ -489,11 +497,6 @@ Type* ASTBuilder::getScalarLayoutType() return getSpecializedBuiltinType({}, "ScalarDataLayoutType"); } -Type* ASTBuilder::getCLayoutType() -{ - return getSpecializedBuiltinType({}, "CDataLayoutType"); -} - // Construct the type `Out<valueType>` OutType* ASTBuilder::getOutType(Type* valueType) { @@ -505,9 +508,9 @@ InOutType* ASTBuilder::getInOutType(Type* valueType) return dynamicCast<InOutType>(getPtrType(valueType, "InOutType")); } -RefType* ASTBuilder::getRefType(Type* valueType, AddressSpace addrSpace) +RefType* ASTBuilder::getRefType(Type* valueType) { - return dynamicCast<RefType>(getPtrType(valueType, addrSpace, "RefType")); + return dynamicCast<RefType>(getPtrType(valueType, "RefType")); } ConstRefType* ASTBuilder::getConstRefType(Type* valueType) @@ -528,13 +531,27 @@ PtrTypeBase* ASTBuilder::getPtrType(Type* valueType, char const* ptrTypeName) PtrTypeBase* ASTBuilder::getPtrType( Type* valueType, - AddressSpace addrSpace, + Val* accessQualifier, + Val* addrSpace, char const* ptrTypeName) { - Val* args[] = {valueType, getIntVal(getUInt64Type(), (IntegerLiteralValue)addrSpace)}; + Val* args[] = {valueType, accessQualifier, addrSpace}; return as<PtrTypeBase>(getSpecializedBuiltinType(makeArrayView(args), ptrTypeName)); } +PtrTypeBase* ASTBuilder::getPtrType( + Type* valueType, + AccessQualifier accessQualifier, + AddressSpace addrSpace, + char const* ptrTypeName) +{ + return as<PtrTypeBase>(getPtrType( + valueType, + getIntVal(getBuiltinType(BaseType::AccessQualifier), (IntegerLiteralValue)accessQualifier), + getIntVal(getBuiltinType(BaseType::AddressSpace), (IntegerLiteralValue)addrSpace), + ptrTypeName)); +} + ArrayExpressionType* ASTBuilder::getArrayType(Type* elementType, IntVal* elementCount) { if (!elementCount) |
