Skip to content

Commit 67ca255

Browse files
spallspall
committed
fix tests cases broken by changes
1 parent 3231a7b commit 67ca255

File tree

3 files changed

+16
-23
lines changed

3 files changed

+16
-23
lines changed

‎clang/test/CodeGenHLSL/ArrayAssignable.hlsl

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,16 @@ void arr_assign6() {
100100
}
101101

102102
// CHECK-LABEL: define void {{.*}}arr_assign7
103-
// CHECK: [[Arr3:%.*]] = alloca [2 x [2 x i32]], align 4
104-
// CHECK-NEXT: [[Arr4:%.*]] = alloca [2 x [2 x i32]], align 4
105-
// CHECK-NEXT: [[Tmp:%.*]] = alloca [2 x i32], align 4
103+
// CHECK: [[Arr:%.*]] = alloca [2 x [2 x i32]], align 4
104+
// CHECK-NEXT: [[Arr2:%.*]] = alloca [2 x [2 x i32]], align 4
106105
// CHECK-NOT: alloca
107-
// CHECK-NEXT: call void @llvm.memcpy.p0.p0.i32(ptr align 4 [[Arr3]], ptr align 4 {{@.*}}, i32 16, i1 false)
108-
// CHECK-NEXT: call void @llvm.memcpy.p0.p0.i32(ptr align 4 [[Arr4]], ptr align 4 {{@.*}}, i32 16, i1 false)
109-
// CHECK-NEXT: store i32 6, ptr [[Tmp]], align 4
110-
// CHECK-NEXT: [[AIE:%.*]] = getelementptr inbounds i32, ptr [[Tmp]], i32 1
111-
// CHECK-NEXT: store i32 6, ptr [[AIE]], align 4
112-
// CHECK-NEXT: call void @llvm.memcpy.p0.p0.i32(ptr align 4 [[Arr3]], ptr align 4 [[Arr4]], i32 16, i1 false)
113-
// CHECK-NEXT: [[Idx:%.*]] = getelementptr inbounds [2 x [2 x i32]], ptr [[Arr3]], i32 0, i32 0
114-
// CHECK-NEXT: call void @llvm.memcpy.p0.p0.i32(ptr align 4 [[Idx]], ptr align 4 [[Tmp]], i32 8, i1 false)
106+
// CHECK-NEXT: call void @llvm.memcpy.p0.p0.i32(ptr align 4 [[Arr]], ptr align 4 {{@.*}}, i32 16, i1 false)
107+
// CHECK-NEXT: call void @llvm.memcpy.p0.p0.i32(ptr align 4 [[Arr2]], ptr align 4 {{@.*}}, i32 16, i1 false)
108+
// CHECK-NEXT: call void @llvm.memcpy.p0.p0.i32(ptr align 4 [[Arr]], ptr align 4 [[Arr2]], i32 16, i1 false)
109+
// CHECK-NEXT: [[Idx:%.*]] = getelementptr inbounds [2 x [2 x i32]], ptr [[Arr]], i32 0, i32 0
110+
// CHECK-NEXT: store i32 6, ptr [[Idx]], align 4
111+
// CHECK-NEXT: [[Idx2:%.*]] = getelementptr inbounds i32, ptr %arrayidx, i32 1
112+
// CHECK-NEXT: store i32 6, ptr [[Idx2]], align 4
115113
// CHECK-NEXT: ret void
116114
void arr_assign7() {
117115
int Arr[2][2] = {{0, 1}, {2, 3}};

‎clang/test/CodeGenHLSL/ArrayTemporary.hlsl

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,8 @@ void call3() {
4646
}
4747

4848
// CHECK-LABEL: define void {{.*}}call4{{.*}}(ptr
49-
// CHECK-SAME: noundef byval([2 x [2 x float]]) align 4 [[Arr:%.*]])
5049
// CHECK: [[Tmp:%.*]] = alloca [2 x [2 x float]]
51-
// CHECK: call void @llvm.memcpy.p0.p0.i32(ptr align 4 [[Tmp]], ptr align 4 [[Arr]], i32 16, i1 false)
50+
// CHECK: store ptr {{.*}}, ptr [[Tmp]], align 4
5251
// CHECK: call void {{.*}}fn3{{.*}}(ptr noundef byval([2 x [2 x float]]) align 4 [[Tmp]])
5352

5453
void call4(float Arr[2][2]) {
@@ -67,12 +66,12 @@ void call4(float Arr[2][2]) {
6766
// CHECK: [[Tmp1:%.*]] = alloca [2 x float]
6867
// CHECK: [[Tmp2:%.*]] = alloca [4 x float]
6968
// CHECK: [[Tmp3:%.*]] = alloca [3 x i32]
70-
// CHECK: call void @llvm.memcpy.p0.p0.i32(ptr align 4 [[Tmp1]], ptr align 4 [[FA2]], i32 8, i1 false)
71-
// CHECK: call void @_Z11template_fnIA2_fEvT_(ptr noundef byval([2 x float]) align 4 [[Tmp1]])
72-
// CHECK: call void @llvm.memcpy.p0.p0.i32(ptr align 4 [[Tmp2]], ptr align 4 [[FA4]], i32 16, i1 false)
73-
// CHECK: call void @_Z11template_fnIA4_fEvT_(ptr noundef byval([4 x float]) align 4 [[Tmp2]])
74-
// CHECK: call void @llvm.memcpy.p0.p0.i32(ptr align 4 [[Tmp3]], ptr align 4 [[IA3]], i32 12, i1 false)
75-
// CHECK: call void @_Z11template_fnIA3_iEvT_(ptr noundef byval([3 x i32]) align 4 [[Tmp3]])
69+
// CHECK: store ptr {{.*}}, ptr [[Tmp1]], align 4
70+
// CHECK: call void @"??$template_fn@$$BY01M@@YAXY01M@Z"(ptr noundef byval([2 x float]) align 4 [[Tmp1]])
71+
// CHECK: store ptr {{.*}}, ptr [[Tmp2]], align 4
72+
// CHECK: call void @"??$template_fn@$$BY03M@@YAXY03M@Z"(ptr noundef byval([4 x float]) align 4 [[Tmp2]])
73+
// CHECK: store ptr {{.*}}, ptr [[Tmp3]], align 4
74+
// CHECK: call void @"??$template_fn@$$BY02H@@YAXY02H@Z"(ptr noundef byval([3 x i32]) align 4 [[Tmp3]])
7675

7776
template<typename T>
7877
void template_fn(T Val) {}
@@ -83,7 +82,6 @@ void template_call(float FA2[2], float FA4[4], int IA3[3]) {
8382
template_fn(IA3);
8483
}
8584

86-
8785
// Verify that Array parameter element access correctly codegens.
8886
// CHECK-LABEL: define void {{.*}}element_access{{.*}}(ptr
8987
// CHECK-SAME: noundef byval([2 x float]) align 4 [[FA2:%[0-9A-Z]+]]

‎clang/test/SemaHLSL/ArrayTemporary.hlsl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,14 @@ void template_fn(T Val) {}
7575
// CHECK: CallExpr {{.*}} 'void'
7676
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'void (*)(float[2])' <FunctionToPointerDecay>
7777
// CHECK-NEXT: DeclRefExpr {{.*}} 'void (float[2])' lvalue Function {{.*}} 'template_fn' 'void (float[2])' (FunctionTemplate {{.*}} 'template_fn')
78-
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'float[2]' <LValueToRValue>
7978
// CHECK-NEXT: DeclRefExpr {{.*}} 'float[2]' lvalue ParmVar {{.*}} 'FA2' 'float[2]'
8079
// CHECK-NEXT: CallExpr {{.*}} 'void'
8180
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'void (*)(float[4])' <FunctionToPointerDecay>
8281
// CHECK-NEXT: DeclRefExpr {{.*}} 'void (float[4])' lvalue Function {{.*}} 'template_fn' 'void (float[4])' (FunctionTemplate {{.*}} 'template_fn')
83-
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'float[4]' <LValueToRValue>
8482
// CHECK-NEXT: DeclRefExpr {{.*}} 'float[4]' lvalue ParmVar {{.*}} 'FA4' 'float[4]'
8583
// CHECK-NEXT: CallExpr {{.*}} 'void'
8684
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'void (*)(int[3])' <FunctionToPointerDecay>
8785
// CHECK-NEXT: DeclRefExpr {{.*}} 'void (int[3])' lvalue Function {{.*}} 'template_fn' 'void (int[3])' (FunctionTemplate {{.*}} 'template_fn')
88-
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int[3]' <LValueToRValue>
8986
// CHECK-NEXT: DeclRefExpr {{.*}} 'int[3]' lvalue ParmVar {{.*}} 'IA3' 'int[3]'
9087

9188
void call(float FA2[2], float FA4[4], int IA3[3]) {

0 commit comments

Comments
 (0)