Skip to content

Commit 2ff496b

Browse files
hekotahekota
committed
code review feedback - update comment, rename param
1 parent fb3d516 commit 2ff496b

8 files changed

+32
-32
lines changed

‎clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ BuiltinTypeDeclBuilder::addHandleConstructorFromImplicitBinding() {
681681
.addParam("spaceNo", AST.UnsignedIntTy)
682682
.addParam("range", AST.IntTy)
683683
.addParam("index", AST.UnsignedIntTy)
684-
.addParam("order_id", AST.UnsignedIntTy)
684+
.addParam("orderId", AST.UnsignedIntTy)
685685
.callBuiltin("__builtin_hlsl_resource_handlefromimplicitbinding",
686686
HandleType, PH::Handle, PH::_0, PH::_1, PH::_2, PH::_3)
687687
.assign(PH::Handle, PH::LastStmt)

‎clang/lib/Sema/SemaHLSL.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3342,7 +3342,7 @@ bool SemaHLSL::initGlobalResourceDecl(VarDecl *VD) {
33423342
return initVarDeclWithCtor(SemaRef, VD, Args);
33433343
}
33443344

3345-
// resource with explicit binding
3345+
// resource with implicit binding
33463346
IntegerLiteral *OrderId = IntegerLiteral::Create(
33473347
AST, llvm::APInt(UIntTySize, getNextImplicitBindingOrderID()),
33483348
AST.UnsignedIntTy, SourceLocation());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ RESOURCE Buffer;
8484
// CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
8585
// CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
8686
// CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
87-
// CHECK-NEXT: ParmVarDecl {{.*}} order_id 'unsigned int'
87+
// CHECK-NEXT: ParmVarDecl {{.*}} orderId 'unsigned int'
8888
// CHECK-NEXT: CompoundStmt {{.*}}
8989
// CHECK-NEXT: BinaryOperator {{.*}} '='
9090
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
@@ -97,7 +97,7 @@ RESOURCE Buffer;
9797
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
9898
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
9999
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index' 'unsigned int'
100-
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'order_id' 'unsigned int'
100+
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'orderId' 'unsigned int'
101101
// CHECK-NEXT: AlwaysInlineAttr
102102

103103
// CHECK-NOSUBSCRIPT-NOT: CXXMethodDecl {{.*}} operator[] 'const element_type &(unsigned int) const'

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ RESOURCE<float> Buffer;
131131
// CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
132132
// CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
133133
// CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
134-
// CHECK-NEXT: ParmVarDecl {{.*}} order_id 'unsigned int'
134+
// CHECK-NEXT: ParmVarDecl {{.*}} orderId 'unsigned int'
135135
// CHECK-NEXT: CompoundStmt {{.*}}
136136
// CHECK-NEXT: BinaryOperator {{.*}} '='
137137
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
@@ -144,7 +144,7 @@ RESOURCE<float> Buffer;
144144
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
145145
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
146146
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index' 'unsigned int'
147-
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'order_id' 'unsigned int'
147+
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'orderId' 'unsigned int'
148148
// CHECK-NEXT: AlwaysInlineAttr
149149

150150
// Subscript operators

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ RESOURCE<float> Buffer;
9898
// CHECK-NEXT: ParmVarDecl {{.*}} spaceNo 'unsigned int'
9999
// CHECK-NEXT: ParmVarDecl {{.*}} range 'int'
100100
// CHECK-NEXT: ParmVarDecl {{.*}} index 'unsigned int'
101-
// CHECK-NEXT: ParmVarDecl {{.*}} order_id 'unsigned int'
101+
// CHECK-NEXT: ParmVarDecl {{.*}} orderId 'unsigned int'
102102
// CHECK-NEXT: CompoundStmt {{.*}}
103103
// CHECK-NEXT: BinaryOperator {{.*}} '='
104104
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__handle
@@ -111,7 +111,7 @@ RESOURCE<float> Buffer;
111111
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'spaceNo' 'unsigned int'
112112
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' ParmVar {{.*}} 'range' 'int'
113113
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'index' 'unsigned int'
114-
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'order_id' 'unsigned int'
114+
// CHECK-NEXT: DeclRefExpr {{.*}} 'unsigned int' ParmVar {{.*}} 'orderId' 'unsigned int'
115115
// CHECK-NEXT: AlwaysInlineAttr
116116

117117
// Subsctript operators

‎clang/test/CodeGenHLSL/builtins/ByteAddressBuffers-constructors.hlsl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,23 +63,23 @@ export void foo() {
6363

6464
// Buf2 initialization part 2 - body of RWByteAddressBuffer C1 constructor with implicit binding that calls the C2 constructor
6565
// CHECK: define linkonce_odr void @_ZN4hlsl19RWByteAddressBufferC1Ejijj(ptr noundef nonnull align 4 dereferenceable(4) %this,
66-
// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %range, i32 noundef %index, i32 noundef %order_id)
66+
// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %range, i32 noundef %index, i32 noundef %orderId)
6767
// CHECK-NEXT: entry:
6868
// CHECK-NEXT: %this.addr = alloca ptr, align 4
6969
// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
7070
// CHECK-NEXT: %range.addr = alloca i32, align 4
7171
// CHECK-NEXT: %index.addr = alloca i32, align 4
72-
// CHECK-NEXT: %order_id.addr = alloca i32, align 4
72+
// CHECK-NEXT: %orderId.addr = alloca i32, align 4
7373
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
7474
// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
7575
// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
7676
// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
77-
// CHECK-NEXT: store i32 %order_id, ptr %order_id.addr, align 4
77+
// CHECK-NEXT: store i32 %orderId, ptr %orderId.addr, align 4
7878
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
7979
// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
8080
// CHECK-NEXT: %1 = load i32, ptr %range.addr, align 4
8181
// CHECK-NEXT: %2 = load i32, ptr %index.addr, align 4
82-
// CHECK-NEXT: %3 = load i32, ptr %order_id.addr, align 4
82+
// CHECK-NEXT: %3 = load i32, ptr %orderId.addr, align 4
8383
// CHECK-NEXT: call void @_ZN4hlsl19RWByteAddressBufferC2Ejijj(ptr noundef nonnull align 4 dereferenceable(4) %this1, i32 noundef %0, i32 noundef %1, i32 noundef %2, i32 noundef %3) #4
8484
// CHECK-NEXT: ret void
8585

@@ -129,23 +129,23 @@ export void foo() {
129129
// Buf2 initialization part 3 - body of RWByteAddressBuffer C2 constructor with implicit binding that initializes
130130
// handle with @llvm.dx.resource.handlefromimplicitbinding
131131
// CHECK: define linkonce_odr void @_ZN4hlsl19RWByteAddressBufferC2Ejijj(ptr noundef nonnull align 4 dereferenceable(4) %this,
132-
// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %range, i32 noundef %index, i32 noundef %order_id) unnamed_addr #1 align 2 {
132+
// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %range, i32 noundef %index, i32 noundef %orderId) unnamed_addr #1 align 2 {
133133
// CHECK-NEXT: entry:
134134
// CHECK-NEXT: %this.addr = alloca ptr, align 4
135135
// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
136136
// CHECK-NEXT: %range.addr = alloca i32, align 4
137137
// CHECK-NEXT: %index.addr = alloca i32, align 4
138-
// CHECK-NEXT: %order_id.addr = alloca i32, align 4
138+
// CHECK-NEXT: %orderId.addr = alloca i32, align 4
139139
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
140140
// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
141141
// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
142142
// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
143-
// CHECK-NEXT: store i32 %order_id, ptr %order_id.addr, align 4
143+
// CHECK-NEXT: store i32 %orderId, ptr %orderId.addr, align 4
144144
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
145145
// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
146146
// CHECK-NEXT: %1 = load i32, ptr %range.addr, align 4
147147
// CHECK-NEXT: %2 = load i32, ptr %index.addr, align 4
148-
// CHECK-NEXT: %3 = load i32, ptr %order_id.addr, align 4
148+
// CHECK-NEXT: %3 = load i32, ptr %orderId.addr, align 4
149149
// CHECK-NEXT: %4 = call target("dx.RawBuffer", i8, 1, 0) @llvm.dx.resource.handlefromimplicitbinding.tdx.RawBuffer_i8_1_0t(i32 %3, i32 %0, i32 %1, i32 %2, i1 false)
150150
// CHECK-NEXT: %__handle = getelementptr inbounds nuw %"class.hlsl::RWByteAddressBuffer", ptr %this1, i32 0, i32 0
151151
// CHECK-NEXT: store target("dx.RawBuffer", i8, 1, 0) %4, ptr %__handle, align 4

‎clang/test/CodeGenHLSL/builtins/RWBuffer-constructor.hlsl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,23 +63,23 @@ export void foo() {
6363

6464
// Buf2 initialization part 2 - body of RWBuffer<float> C1 constructor with implicit binding that calls the C2 constructor
6565
// CHECK: define linkonce_odr void @_ZN4hlsl8RWBufferIdEC1Ejijj(ptr noundef nonnull align 4 dereferenceable(4) %this,
66-
// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %range, i32 noundef %index, i32 noundef %order_id)
66+
// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %range, i32 noundef %index, i32 noundef %orderId)
6767
// CHECK-NEXT: entry:
6868
// CHECK-NEXT: %this.addr = alloca ptr, align 4
6969
// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
7070
// CHECK-NEXT: %range.addr = alloca i32, align 4
7171
// CHECK-NEXT: %index.addr = alloca i32, align 4
72-
// CHECK-NEXT: %order_id.addr = alloca i32, align 4
72+
// CHECK-NEXT: %orderId.addr = alloca i32, align 4
7373
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
7474
// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
7575
// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
7676
// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
77-
// CHECK-NEXT: store i32 %order_id, ptr %order_id.addr, align 4
77+
// CHECK-NEXT: store i32 %orderId, ptr %orderId.addr, align 4
7878
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
7979
// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
8080
// CHECK-NEXT: %1 = load i32, ptr %range.addr, align 4
8181
// CHECK-NEXT: %2 = load i32, ptr %index.addr, align 4
82-
// CHECK-NEXT: %3 = load i32, ptr %order_id.addr, align 4
82+
// CHECK-NEXT: %3 = load i32, ptr %orderId.addr, align 4
8383
// CHECK-NEXT: call void @_ZN4hlsl8RWBufferIdEC2Ejijj(ptr noundef nonnull align 4 dereferenceable(4) %this1, i32 noundef %0, i32 noundef %1, i32 noundef %2, i32 noundef %3) #4
8484
// CHECK-NEXT: ret void
8585

@@ -127,23 +127,23 @@ export void foo() {
127127
// Buf2 initialization part 3 - body of RWBuffer<float> C2 constructor with implicit binding that initializes
128128
// handle with @llvm.dx.resource.handlefromimplicitbinding
129129
// CHECK: define linkonce_odr void @_ZN4hlsl8RWBufferIdEC2Ejijj(ptr noundef nonnull align 4 dereferenceable(4) %this,
130-
// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %range, i32 noundef %index, i32 noundef %order_id) unnamed_addr #1 align 2 {
130+
// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %range, i32 noundef %index, i32 noundef %orderId) unnamed_addr #1 align 2 {
131131
// CHECK-NEXT: entry:
132132
// CHECK-NEXT: %this.addr = alloca ptr, align 4
133133
// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
134134
// CHECK-NEXT: %range.addr = alloca i32, align 4
135135
// CHECK-NEXT: %index.addr = alloca i32, align 4
136-
// CHECK-NEXT: %order_id.addr = alloca i32, align 4
136+
// CHECK-NEXT: %orderId.addr = alloca i32, align 4
137137
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
138138
// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
139139
// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
140140
// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
141-
// CHECK-NEXT: store i32 %order_id, ptr %order_id.addr, align 4
141+
// CHECK-NEXT: store i32 %orderId, ptr %orderId.addr, align 4
142142
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
143143
// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
144144
// CHECK-NEXT: %1 = load i32, ptr %range.addr, align 4
145145
// CHECK-NEXT: %2 = load i32, ptr %index.addr, align 4
146-
// CHECK-NEXT: %3 = load i32, ptr %order_id.addr, align 4
146+
// CHECK-NEXT: %3 = load i32, ptr %orderId.addr, align 4
147147
// CHECK-NEXT: %4 = call target("dx.TypedBuffer", double, 1, 0, 0) @llvm.dx.resource.handlefromimplicitbinding.tdx.TypedBuffer_f64_1_0_0t(i32 %3, i32 %0, i32 %1, i32 %2, i1 false)
148148
// CHECK-NEXT: %__handle = getelementptr inbounds nuw %"class.hlsl::RWBuffer.0", ptr %this1, i32 0, i32 0
149149
// CHECK-NEXT: store target("dx.TypedBuffer", double, 1, 0, 0) %4, ptr %__handle, align 4

‎clang/test/CodeGenHLSL/builtins/StructuredBuffers-constructors.hlsl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,23 @@ export void foo() {
6565

6666
// Buf2 initialization part 2 - body of RWStructuredBuffer<float> C1 constructor with implicit binding that calls the C2 constructor
6767
// CHECK: define linkonce_odr void @_ZN4hlsl18RWStructuredBufferIfEC1Ejijj(ptr noundef nonnull align 4 dereferenceable(4) %this,
68-
// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %range, i32 noundef %index, i32 noundef %order_id)
68+
// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %range, i32 noundef %index, i32 noundef %orderId)
6969
// CHECK-NEXT: entry:
7070
// CHECK-NEXT: %this.addr = alloca ptr, align 4
7171
// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
7272
// CHECK-NEXT: %range.addr = alloca i32, align 4
7373
// CHECK-NEXT: %index.addr = alloca i32, align 4
74-
// CHECK-NEXT: %order_id.addr = alloca i32, align 4
74+
// CHECK-NEXT: %orderId.addr = alloca i32, align 4
7575
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
7676
// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
7777
// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
7878
// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
79-
// CHECK-NEXT: store i32 %order_id, ptr %order_id.addr, align 4
79+
// CHECK-NEXT: store i32 %orderId, ptr %orderId.addr, align 4
8080
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
8181
// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
8282
// CHECK-NEXT: %1 = load i32, ptr %range.addr, align 4
8383
// CHECK-NEXT: %2 = load i32, ptr %index.addr, align 4
84-
// CHECK-NEXT: %3 = load i32, ptr %order_id.addr, align 4
84+
// CHECK-NEXT: %3 = load i32, ptr %orderId.addr, align 4
8585
// CHECK-NEXT: call void @_ZN4hlsl18RWStructuredBufferIfEC2Ejijj(ptr noundef nonnull align 4 dereferenceable(4) %this1, i32 noundef %0, i32 noundef %1, i32 noundef %2, i32 noundef %3) #4
8686
// CHECK-NEXT: ret void
8787

@@ -131,23 +131,23 @@ export void foo() {
131131
// Buf2 initialization part 3 - body of RWStructuredBuffer<float> C2 constructor with implicit binding that initializes
132132
// handle with @llvm.dx.resource.handlefromimplicitbinding
133133
// CHECK: define linkonce_odr void @_ZN4hlsl18RWStructuredBufferIfEC2Ejijj(ptr noundef nonnull align 4 dereferenceable(4) %this,
134-
// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %range, i32 noundef %index, i32 noundef %order_id) unnamed_addr #1 align 2 {
134+
// CHECK-SAME: i32 noundef %spaceNo, i32 noundef %range, i32 noundef %index, i32 noundef %orderId) unnamed_addr #1 align 2 {
135135
// CHECK-NEXT: entry:
136136
// CHECK-NEXT: %this.addr = alloca ptr, align 4
137137
// CHECK-NEXT: %spaceNo.addr = alloca i32, align 4
138138
// CHECK-NEXT: %range.addr = alloca i32, align 4
139139
// CHECK-NEXT: %index.addr = alloca i32, align 4
140-
// CHECK-NEXT: %order_id.addr = alloca i32, align 4
140+
// CHECK-NEXT: %orderId.addr = alloca i32, align 4
141141
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 4
142142
// CHECK-NEXT: store i32 %spaceNo, ptr %spaceNo.addr, align 4
143143
// CHECK-NEXT: store i32 %range, ptr %range.addr, align 4
144144
// CHECK-NEXT: store i32 %index, ptr %index.addr, align 4
145-
// CHECK-NEXT: store i32 %order_id, ptr %order_id.addr, align 4
145+
// CHECK-NEXT: store i32 %orderId, ptr %orderId.addr, align 4
146146
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 4
147147
// CHECK-NEXT: %0 = load i32, ptr %spaceNo.addr, align 4
148148
// CHECK-NEXT: %1 = load i32, ptr %range.addr, align 4
149149
// CHECK-NEXT: %2 = load i32, ptr %index.addr, align 4
150-
// CHECK-NEXT: %3 = load i32, ptr %order_id.addr, align 4
150+
// CHECK-NEXT: %3 = load i32, ptr %orderId.addr, align 4
151151
// CHECK-NEXT: %4 = call target("dx.RawBuffer", float, 1, 0) @llvm.dx.resource.handlefromimplicitbinding.tdx.RawBuffer_f32_1_0t(i32 %3, i32 %0, i32 %1, i32 %2, i1 false)
152152
// CHECK-NEXT: %__handle = getelementptr inbounds nuw %"class.hlsl::RWStructuredBuffer", ptr %this1, i32 0, i32 0
153153
// CHECK-NEXT: store target("dx.RawBuffer", float, 1, 0) %4, ptr %__handle, align 4

0 commit comments

Comments
 (0)