From 7758625d3fea67e55e98e7e4103d56c9918365be Mon Sep 17 00:00:00 2001 From: ArielG-NV <159081215+ArielG-NV@users.noreply.github.com> Date: Fri, 29 Aug 2025 15:52:34 -0700 Subject: [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> --- source/slang/slang-ast-builder.cpp | 39 +++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) (limited to 'source/slang/slang-ast-builder.cpp') 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 genericArgs, const c return rsType; } -PtrType* ASTBuilder::getPtrType(Type* valueType, AddressSpace addrSpace) +PtrType* ASTBuilder::getPtrType(Type* valueType, Val* accessQualifier, Val* addrSpace) { - return dynamicCast(getPtrType(valueType, addrSpace, "PtrType")); + return dynamicCast(getPtrType(valueType, accessQualifier, addrSpace, "PtrType")); +} + +PtrType* ASTBuilder::getPtrType( + Type* valueType, + AccessQualifier accessQualifier, + AddressSpace addrSpace) +{ + return dynamicCast(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` OutType* ASTBuilder::getOutType(Type* valueType) { @@ -505,9 +508,9 @@ InOutType* ASTBuilder::getInOutType(Type* valueType) return dynamicCast(getPtrType(valueType, "InOutType")); } -RefType* ASTBuilder::getRefType(Type* valueType, AddressSpace addrSpace) +RefType* ASTBuilder::getRefType(Type* valueType) { - return dynamicCast(getPtrType(valueType, addrSpace, "RefType")); + return dynamicCast(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(getSpecializedBuiltinType(makeArrayView(args), ptrTypeName)); } +PtrTypeBase* ASTBuilder::getPtrType( + Type* valueType, + AccessQualifier accessQualifier, + AddressSpace addrSpace, + char const* ptrTypeName) +{ + return as(getPtrType( + valueType, + getIntVal(getBuiltinType(BaseType::AccessQualifier), (IntegerLiteralValue)accessQualifier), + getIntVal(getBuiltinType(BaseType::AddressSpace), (IntegerLiteralValue)addrSpace), + ptrTypeName)); +} + ArrayExpressionType* ASTBuilder::getArrayType(Type* elementType, IntVal* elementCount) { if (!elementCount) -- cgit v1.2.3