Skip to content

Commit acd00a6

Browse files
s-perrons-perron
committed
[HLSL] Use hlsl_device address space for getpointer.
We add the hlsl_device address space to represent the device memory space as defined in section 1.7.1.3 of the [HLSL spec](https://microsoft.github.io/hlsl-specs/specs/hlsl.pdf). Fixes #127075
1 parent 8f66fb7 commit acd00a6

25 files changed

+168
-102
lines changed

‎clang/include/clang/Basic/AddressSpaces.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ enum class LangAS : unsigned {
5959
// HLSL specific address spaces.
6060
hlsl_groupshared,
6161
hlsl_constant,
62+
hlsl_device,
6263

6364
// Wasm specific address spaces.
6465
wasm_funcref,

‎clang/lib/AST/Type.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ bool Qualifiers::isTargetAddressSpaceSupersetOf(LangAS A, LangAS B,
9494
(A == LangAS::Default &&
9595
(B == LangAS::cuda_constant || B == LangAS::cuda_device ||
9696
B == LangAS::cuda_shared)) ||
97+
// In HLSL, the this pointer for member functions is in the default
98+
// address space. This causes problem if the structure is in
99+
// hlsl_device. We want to allow casting from hlsl_device to default
100+
// until a proper solution for that issue is found.
101+
(A == LangAS::Default && B == LangAS::hlsl_device) ||
97102
// Conversions from target specific address spaces may be legal
98103
// depending on the target information.
99104
Ctx.getTargetInfo().isAddressSpaceSupersetOf(A, B);

‎clang/lib/AST/TypePrinter.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2579,6 +2579,8 @@ std::string Qualifiers::getAddrSpaceAsString(LangAS AS) {
25792579
return "groupshared";
25802580
case LangAS::hlsl_constant:
25812581
return "hlsl_constant";
2582+
case LangAS::hlsl_device:
2583+
return "hlsl_device";
25822584
case LangAS::wasm_funcref:
25832585
return "__funcref";
25842586
default:

‎clang/lib/Basic/Targets/AArch64.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ static const unsigned ARM64AddrSpaceMap[] = {
4545
static_cast<unsigned>(AArch64AddrSpace::ptr64),
4646
0, // hlsl_groupshared
4747
0, // hlsl_constant
48+
0, // hlsl_device
4849
// Wasm address space values for this target are dummy values,
4950
// as it is only enabled for Wasm targets.
5051
20, // wasm_funcref

‎clang/lib/Basic/Targets/AMDGPU.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ const LangASMap AMDGPUTargetInfo::AMDGPUDefIsGenMap = {
6060
llvm::AMDGPUAS::FLAT_ADDRESS, // ptr64
6161
llvm::AMDGPUAS::FLAT_ADDRESS, // hlsl_groupshared
6262
llvm::AMDGPUAS::CONSTANT_ADDRESS, // hlsl_constant
63+
llvm::AMDGPUAS::GLOBAL_ADDRESS, // hlsl_device
6364
};
6465

6566
const LangASMap AMDGPUTargetInfo::AMDGPUDefIsPrivMap = {
@@ -85,6 +86,7 @@ const LangASMap AMDGPUTargetInfo::AMDGPUDefIsPrivMap = {
8586
llvm::AMDGPUAS::FLAT_ADDRESS, // ptr64
8687
llvm::AMDGPUAS::FLAT_ADDRESS, // hlsl_groupshared
8788
llvm::AMDGPUAS::CONSTANT_ADDRESS, // hlsl_constant
89+
llvm::AMDGPUAS::GLOBAL_ADDRESS, // hlsl_device
8890
};
8991
} // namespace targets
9092
} // namespace clang

‎clang/lib/Basic/Targets/DirectX.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ static const unsigned DirectXAddrSpaceMap[] = {
4343
0, // ptr64
4444
3, // hlsl_groupshared
4545
2, // hlsl_constant
46+
1, // hlsl_device
4647
// Wasm address space values for this target are dummy values,
4748
// as it is only enabled for Wasm targets.
4849
20, // wasm_funcref

‎clang/lib/Basic/Targets/NVPTX.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ static const unsigned NVPTXAddrSpaceMap[] = {
4747
0, // ptr64
4848
0, // hlsl_groupshared
4949
0, // hlsl_constant
50+
0, // hlsl_device
5051
// Wasm address space values for this target are dummy values,
5152
// as it is only enabled for Wasm targets.
5253
20, // wasm_funcref

‎clang/lib/Basic/Targets/SPIR.h

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,17 @@ static const unsigned SPIRDefIsPrivMap[] = {
3838
0, // cuda_constant
3939
0, // cuda_shared
4040
// SYCL address space values for this map are dummy
41-
0, // sycl_global
42-
0, // sycl_global_device
43-
0, // sycl_global_host
44-
0, // sycl_local
45-
0, // sycl_private
46-
0, // ptr32_sptr
47-
0, // ptr32_uptr
48-
0, // ptr64
49-
0, // hlsl_groupshared
50-
2, // hlsl_constant
41+
0, // sycl_global
42+
0, // sycl_global_device
43+
0, // sycl_global_host
44+
0, // sycl_local
45+
0, // sycl_private
46+
0, // ptr32_sptr
47+
0, // ptr32_uptr
48+
0, // ptr64
49+
0, // hlsl_groupshared
50+
2, // hlsl_constant
51+
11, // hlsl_device
5152
// Wasm address space values for this target are dummy values,
5253
// as it is only enabled for Wasm targets.
5354
20, // wasm_funcref
@@ -70,18 +71,19 @@ static const unsigned SPIRDefIsGenMap[] = {
7071
// cuda_constant pointer can be casted to default/"flat" pointer, but in
7172
// SPIR-V casts between constant and generic pointers are not allowed. For
7273
// this reason cuda_constant is mapped to SPIR-V CrossWorkgroup.
73-
1, // cuda_constant
74-
3, // cuda_shared
75-
1, // sycl_global
76-
5, // sycl_global_device
77-
6, // sycl_global_host
78-
3, // sycl_local
79-
0, // sycl_private
80-
0, // ptr32_sptr
81-
0, // ptr32_uptr
82-
0, // ptr64
83-
0, // hlsl_groupshared
84-
0, // hlsl_constant
74+
1, // cuda_constant
75+
3, // cuda_shared
76+
1, // sycl_global
77+
5, // sycl_global_device
78+
6, // sycl_global_host
79+
3, // sycl_local
80+
0, // sycl_private
81+
0, // ptr32_sptr
82+
0, // ptr32_uptr
83+
0, // ptr64
84+
0, // hlsl_groupshared
85+
2, // hlsl_constant
86+
11, // hlsl_device
8587
// Wasm address space values for this target are dummy values,
8688
// as it is only enabled for Wasm targets.
8789
20, // wasm_funcref

‎clang/lib/Basic/Targets/SystemZ.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ static const unsigned ZOSAddressMap[] = {
4343
0, // ptr64
4444
0, // hlsl_groupshared
4545
0, // hlsl_constant
46+
0, // hlsl_device
4647
0 // wasm_funcref
4748
};
4849

‎clang/lib/Basic/Targets/TCE.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ static const unsigned TCEOpenCLAddrSpaceMap[] = {
5252
0, // ptr64
5353
0, // hlsl_groupshared
5454
0, // hlsl_constant
55+
0, // hlsl_device
5556
// Wasm address space values for this target are dummy values,
5657
// as it is only enabled for Wasm targets.
5758
20, // wasm_funcref

‎clang/lib/Basic/Targets/WebAssembly.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ static const unsigned WebAssemblyAddrSpaceMap[] = {
4343
0, // ptr64
4444
0, // hlsl_groupshared
4545
0, // hlsl_constant
46+
0, // hlsl_device
4647
20, // wasm_funcref
4748
};
4849

‎clang/lib/Basic/Targets/X86.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ static const unsigned X86AddrSpaceMap[] = {
4747
272, // ptr64
4848
0, // hlsl_groupshared
4949
0, // hlsl_constant
50+
0, // hlsl_device
5051
// Wasm address space values for this target are dummy values,
5152
// as it is only enabled for Wasm targets.
5253
20, // wasm_funcref

‎clang/lib/CodeGen/CGBuiltin.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19573,9 +19573,7 @@ Value *CodeGenFunction::EmitHLSLBuiltinExpr(unsigned BuiltinID,
1957319573
Value *HandleOp = EmitScalarExpr(E->getArg(0));
1957419574
Value *IndexOp = EmitScalarExpr(E->getArg(1));
1957519575

19576-
// TODO: Map to an hlsl_device address space.
19577-
llvm::Type *RetTy = llvm::PointerType::getUnqual(getLLVMContext());
19578-
19576+
llvm::Type *RetTy = ConvertType(E->getType());
1957919577
return Builder.CreateIntrinsic(
1958019578
RetTy, CGM.getHLSLRuntime().getCreateResourceGetPointerIntrinsic(),
1958119579
ArrayRef<Value *>{HandleOp, IndexOp});

‎clang/lib/Sema/HLSLExternalSemaSource.cpp

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -711,13 +711,14 @@ BuiltinTypeDeclBuilder::addHandleAccessFunction(DeclarationName &Name,
711711
using PH = BuiltinTypeMethodBuilder::PlaceHolder;
712712

713713
QualType ElemTy = getHandleElementType();
714-
// TODO: Map to an hlsl_device address space.
715-
QualType ElemPtrTy = AST.getPointerType(ElemTy);
716-
QualType ReturnTy = ElemTy;
714+
QualType AddrSpaceElemTy =
715+
AST.getAddrSpaceQualType(ElemTy, LangAS::hlsl_device);
716+
QualType ElemPtrTy = AST.getPointerType(AddrSpaceElemTy);
717+
// QualType ReturnTy = (IsRef ? AST.getLValueReferenceType(ElemTy) : ElemTy);
718+
QualType ReturnTy =
719+
(IsRef ? AST.getLValueReferenceType(AddrSpaceElemTy) : ElemTy);
717720
if (IsConst)
718721
ReturnTy.addConst();
719-
if (IsRef)
720-
ReturnTy = AST.getLValueReferenceType(ReturnTy);
721722

722723
return BuiltinTypeMethodBuilder(*this, Name, ReturnTy, IsConst)
723724
.addParam("Index", AST.UnsignedIntTy)
@@ -731,12 +732,15 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addAppendMethod() {
731732
using PH = BuiltinTypeMethodBuilder::PlaceHolder;
732733
ASTContext &AST = SemaRef.getASTContext();
733734
QualType ElemTy = getHandleElementType();
735+
QualType AddrSpaceElemTy =
736+
AST.getAddrSpaceQualType(ElemTy, LangAS::hlsl_device);
734737
return BuiltinTypeMethodBuilder(*this, "Append", AST.VoidTy)
735738
.addParam("value", ElemTy)
736739
.callBuiltin("__builtin_hlsl_buffer_update_counter", AST.UnsignedIntTy,
737740
PH::Handle, getConstantIntExpr(1))
738741
.callBuiltin("__builtin_hlsl_resource_getpointer",
739-
AST.getPointerType(ElemTy), PH::Handle, PH::LastStmt)
742+
AST.getPointerType(AddrSpaceElemTy), PH::Handle,
743+
PH::LastStmt)
740744
.dereference(PH::LastStmt)
741745
.assign(PH::LastStmt, PH::_0)
742746
.finalizeMethod();
@@ -746,11 +750,14 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addConsumeMethod() {
746750
using PH = BuiltinTypeMethodBuilder::PlaceHolder;
747751
ASTContext &AST = SemaRef.getASTContext();
748752
QualType ElemTy = getHandleElementType();
753+
QualType AddrSpaceElemTy =
754+
AST.getAddrSpaceQualType(ElemTy, LangAS::hlsl_device);
749755
return BuiltinTypeMethodBuilder(*this, "Consume", ElemTy)
750756
.callBuiltin("__builtin_hlsl_buffer_update_counter", AST.UnsignedIntTy,
751757
PH::Handle, getConstantIntExpr(-1))
752758
.callBuiltin("__builtin_hlsl_resource_getpointer",
753-
AST.getPointerType(ElemTy), PH::Handle, PH::LastStmt)
759+
AST.getPointerType(AddrSpaceElemTy), PH::Handle,
760+
PH::LastStmt)
754761
.dereference(PH::LastStmt)
755762
.finalizeMethod();
756763
}

‎clang/lib/Sema/SemaHLSL.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2378,8 +2378,10 @@ bool SemaHLSL::CheckBuiltinFunctionCall(unsigned BuiltinID, CallExpr *TheCall) {
23782378
auto *ResourceTy =
23792379
TheCall->getArg(0)->getType()->castAs<HLSLAttributedResourceType>();
23802380
QualType ContainedTy = ResourceTy->getContainedType();
2381-
// TODO: Map to an hlsl_device address space.
2382-
TheCall->setType(getASTContext().getPointerType(ContainedTy));
2381+
auto returnType =
2382+
SemaRef.Context.getAddrSpaceQualType(ContainedTy, LangAS::hlsl_device);
2383+
returnType = SemaRef.Context.getPointerType(returnType);
2384+
TheCall->setType(returnType);
23832385
TheCall->setValueKind(VK_LValue);
23842386

23852387
break;

‎clang/test/AST/HLSL/OutArgExpr.hlsl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,21 @@ void zero(out int Z) { Z = 0; }
3030
// AST-NEXT: ImplicitCastExpr {{.*}} 'void (*)(inout int)' <FunctionToPointerDecay>
3131
// AST-NEXT: DeclRefExpr {{.*}} 'void (inout int)' lvalue Function
3232
// AST-NEXT: HLSLOutArgExpr {{.*}} 'int' lvalue inout
33-
// AST-NEXT: OpaqueValueExpr [[LVOpV:0x[0-9a-fA-F]+]] {{.*}} 'float' lvalue
34-
// AST-NEXT: CXXOperatorCallExpr {{.*}} 'float' lvalue '[]'
35-
// AST-NEXT: ImplicitCastExpr {{.*}} 'float &(*)(unsigned int)' <FunctionToPointerDecay>
36-
// AST-NEXT: DeclRefExpr {{.*}} 'float &(unsigned int)' lvalue CXXMethod {{.*}} 'operator[]' 'float &(unsigned int)'
33+
// AST-NEXT: OpaqueValueExpr [[LVOpV:0x[0-9a-fA-F]+]] {{.*}} 'hlsl_device float' lvalue
34+
// AST-NEXT: CXXOperatorCallExpr {{.*}} 'hlsl_device float' lvalue '[]'
35+
// AST-NEXT: ImplicitCastExpr {{.*}} 'hlsl_device float &(*)(unsigned int)' <FunctionToPointerDecay>
36+
// AST-NEXT: DeclRefExpr {{.*}} 'hlsl_device float &(unsigned int)' lvalue CXXMethod {{.*}} 'operator[]' 'hlsl_device float &(unsigned int)'
3737
// AST-NEXT: DeclRefExpr {{.*}} 'RWBuffer<float>':'hlsl::RWBuffer<float>' lvalue Var {{.*}} 'Buf' 'RWBuffer<float>':'hlsl::RWBuffer<float>'
3838
// AST-NEXT: ImplicitCastExpr {{.*}} 'uint':'unsigned int' <LValueToRValue>
3939
// AST-NEXT: DeclRefExpr {{.*}} 'uint':'unsigned int' lvalue ParmVar {{.*}} 'GI' 'uint':'unsigned int'
4040

4141
// AST-NEXT: OpaqueValueExpr [[TmpOpV:0x[0-9a-fA-F]+]] {{.*}} 'int' lvalue
4242
// AST-NEXT: ImplicitCastExpr {{.*}} 'int' <FloatingToIntegral>
4343
// AST-NEXT: ImplicitCastExpr {{.*}} 'float' <LValueToRValue>
44-
// AST-NEXT: OpaqueValueExpr [[LVOpV]] <col:15, col:21> 'float' lvalue
44+
// AST-NEXT: OpaqueValueExpr [[LVOpV]] <col:15, col:21> 'hlsl_device float' lvalue
4545

46-
// AST: BinaryOperator {{.*}} 'float' lvalue '='
47-
// AST-NEXT: OpaqueValueExpr [[LVOpV]] {{.*}} 'float' lvalue
46+
// AST: BinaryOperator {{.*}} 'hlsl_device float' lvalue '='
47+
// AST-NEXT: OpaqueValueExpr [[LVOpV]] {{.*}} 'hlsl_device float' lvalue
4848
// AST: ImplicitCastExpr {{.*}} 'float' <IntegralToFloating>
4949
// AST-NEXT: ImplicitCastExpr {{.*}} 'int' <LValueToRValue>
5050
// AST-NEXT: OpaqueValueExpr [[TmpOpV]] {{.*}} 'int' lvalue

‎clang/test/AST/HLSL/StructuredBuffers-AST.hlsl

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@ RESOURCE<float> Buffer;
8989
// CHECK-SAME{LITERAL}: [[hlsl::raw_buffer]]
9090
// CHECK-SAME{LITERAL}: [[hlsl::contained_type(element_type)]]
9191

92-
// CHECK-SUBSCRIPT: CXXMethodDecl {{.*}} operator[] 'const element_type &(unsigned int) const'
92+
// CHECK-SUBSCRIPT: CXXMethodDecl {{.*}} operator[] 'hlsl_device element_type &const (unsigned int) const'
9393
// CHECK-SUBSCRIPT-NEXT: ParmVarDecl {{.*}} Index 'unsigned int'
9494
// CHECK-SUBSCRIPT-NEXT: CompoundStmt
9595
// CHECK-SUBSCRIPT-NEXT: ReturnStmt
96-
// CHECK-SUBSCRIPT-NEXT: UnaryOperator {{.*}} 'element_type' prefix '*' cannot overflow
97-
// CHECK-SUBSCRIPT-NEXT: CallExpr {{.*}} 'element_type *'
96+
// CHECK-SUBSCRIPT-NEXT: UnaryOperator {{.*}} 'hlsl_device element_type' prefix '*' cannot overflow
97+
// CHECK-SUBSCRIPT-NEXT: CallExpr {{.*}} 'hlsl_device element_type *'
9898
// CHECK-SUBSCRIPT-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_getpointer' 'void (...) noexcept'
9999
// CHECK-SUBSCRIPT-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
100100
// CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::resource_class(
@@ -105,12 +105,12 @@ RESOURCE<float> Buffer;
105105
// CHECK-SUBSCRIPT-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
106106
// CHECK-SUBSCRIPT-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
107107

108-
// CHECK-SUBSCRIPT-NEXT: CXXMethodDecl {{.*}} operator[] 'element_type &(unsigned int)'
108+
// CHECK-SUBSCRIPT-NEXT: CXXMethodDecl {{.*}} operator[] 'hlsl_device element_type &(unsigned int)'
109109
// CHECK-SUBSCRIPT-NEXT: ParmVarDecl {{.*}} Index 'unsigned int'
110110
// CHECK-SUBSCRIPT-NEXT: CompoundStmt
111111
// CHECK-SUBSCRIPT-NEXT: ReturnStmt
112-
// CHECK-SUBSCRIPT-NEXT: UnaryOperator {{.*}} 'element_type' prefix '*' cannot overflow
113-
// CHECK-SUBSCRIPT-NEXT: CallExpr {{.*}} 'element_type *'
112+
// CHECK-SUBSCRIPT-NEXT: UnaryOperator {{.*}} 'hlsl_device element_type' prefix '*' cannot overflow
113+
// CHECK-SUBSCRIPT-NEXT: CallExpr {{.*}} 'hlsl_device element_type *'
114114
// CHECK-SUBSCRIPT-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_getpointer' 'void (...) noexcept'
115115
// CHECK-SUBSCRIPT-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
116116
// CHECK-SUBSCRIPT-SAME{LITERAL}: [[hlsl::resource_class(
@@ -121,15 +121,15 @@ RESOURCE<float> Buffer;
121121
// CHECK-SUBSCRIPT-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'Index' 'unsigned int'
122122
// CHECK-SUBSCRIPT-NEXT: AlwaysInlineAttr {{.*}} Implicit always_inline
123123

124-
// CHECK-NOSUBSCRIPT-NOT: CXXMethodDecl {{.*}} operator[] 'const element_type &(unsigned int) const'
125-
// CHECK-NOSUBSCRIPT-NOT: CXXMethodDecl {{.*}} operator[] 'element_type &(unsigned int)'
124+
// CHECK-NOSUBSCRIPT-NOT: CXXMethodDecl {{.*}} operator[] 'hlsl_device element_type &const (unsigned int) const'
125+
// CHECK-NOSUBSCRIPT-NOT: CXXMethodDecl {{.*}} operator[] 'hlsl_device element_type &(unsigned int)'
126126

127127
// CHECK-LOAD: CXXMethodDecl {{.*}} Load 'element_type (unsigned int)'
128128
// CHECK-LOAD-NEXT: ParmVarDecl {{.*}} Index 'unsigned int'
129129
// CHECK-LOAD-NEXT: CompoundStmt
130130
// CHECK-LOAD-NEXT: ReturnStmt
131-
// CHECK-LOAD-NEXT: UnaryOperator {{.*}} 'element_type' prefix '*' cannot overflow
132-
// CHECK-LOAD-NEXT: CallExpr {{.*}} 'element_type *'
131+
// CHECK-LOAD-NEXT: UnaryOperator {{.*}} 'hlsl_device element_type' prefix '*' cannot overflow
132+
// CHECK-LOAD-NEXT: CallExpr {{.*}} 'hlsl_device element_type *'
133133
// CHECK-LOAD-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_getpointer' 'void (...) noexcept'
134134
// CHECK-LOAD-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
135135
// CHECK-LOAD-SAME{LITERAL}: [[hlsl::resource_class(
@@ -168,9 +168,9 @@ RESOURCE<float> Buffer;
168168
// CHECK-APPEND: CXXMethodDecl {{.*}} Append 'void (element_type)'
169169
// CHECK-APPEND-NEXT: ParmVarDecl {{.*}} value 'element_type'
170170
// CHECK-APPEND-NEXT: CompoundStmt
171-
// CHECK-APPEND-NEXT: BinaryOperator {{.*}} 'element_type' '='
172-
// CHECK-APPEND-NEXT: UnaryOperator {{.*}} 'element_type' prefix '*' cannot overflow
173-
// CHECK-APPEND-NEXT: CallExpr {{.*}} 'element_type *'
171+
// CHECK-APPEND-NEXT: BinaryOperator {{.*}} 'hlsl_device element_type' '='
172+
// CHECK-APPEND-NEXT: UnaryOperator {{.*}} 'hlsl_device element_type' prefix '*' cannot overflow
173+
// CHECK-APPEND-NEXT: CallExpr {{.*}} 'hlsl_device element_type *'
174174
// CHECK-APPEND-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_getpointer' 'void (...) noexcept'
175175
// CHECK-APPEND-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
176176
// CHECK-APPEND-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]
@@ -190,8 +190,8 @@ RESOURCE<float> Buffer;
190190
// CHECK-CONSUME: CXXMethodDecl {{.*}} Consume 'element_type ()'
191191
// CHECK-CONSUME-NEXT: CompoundStmt
192192
// CHECK-CONSUME-NEXT: ReturnStmt
193-
// CHECK-CONSUME-NEXT: UnaryOperator {{.*}} 'element_type' prefix '*' cannot overflow
194-
// CHECK-CONSUME-NEXT: CallExpr {{.*}} 'element_type *'
193+
// CHECK-CONSUME-NEXT: UnaryOperator {{.*}} 'hlsl_device element_type' prefix '*' cannot overflow
194+
// CHECK-CONSUME-NEXT: CallExpr {{.*}} 'hlsl_device element_type *'
195195
// CHECK-CONSUME-NEXT: DeclRefExpr {{.*}} '<builtin fn type>' Function {{.*}} '__builtin_hlsl_resource_getpointer' 'void (...) noexcept'
196196
// CHECK-CONSUME-NEXT: MemberExpr {{.*}} '__hlsl_resource_t
197197
// CHECK-CONSUME-SAME{LITERAL}: [[hlsl::resource_class(UAV)]]

0 commit comments

Comments
 (0)