Skip to content

Commit d924b28

Browse files
maarquitos14sys-ce-bb
maarquitos14
authored and
sys-ce-bb
committed
[sycl-web] Update expected output of multiple tests. (#11726)
Due to f9ead46, the desugared type is now only dumped when visibly different. This patch updates multiple tests to adjust the expected output according to this change.
1 parent cd9f442 commit d924b28

14 files changed

+120
-120
lines changed

‎clang/test/SemaSYCL/accessor_inheritance.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ int main() {
5252
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' lvalue ParmVar {{.*}} '_arg_A' 'int'
5353
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int' <LValueToRValue>
5454
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' lvalue ParmVar {{.*}} '_arg_B' 'int'
55-
// CHECK-NEXT: CXXConstructExpr {{.*}} 'sycl::accessor<char, 1, sycl::access::mode::read>':'sycl::accessor<char, 1, sycl::access::mode::read>' 'void () noexcept'
56-
// CHECK-NEXT: CXXConstructExpr {{.*}} 'sycl::accessor<char, 1, sycl::access::mode::read>':'sycl::accessor<char, 1, sycl::access::mode::read>' 'void () noexcept'
55+
// CHECK-NEXT: CXXConstructExpr {{.*}} 'sycl::accessor<char, 1, sycl::access::mode::read>' 'void () noexcept'
56+
// CHECK-NEXT: CXXConstructExpr {{.*}} 'sycl::accessor<char, 1, sycl::access::mode::read>' 'void () noexcept'
5757
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int' <LValueToRValue>
5858
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' lvalue ParmVar {{.*}} '_arg_C' 'int'
5959

‎clang/test/SemaSYCL/array-kernel-param.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -208,14 +208,14 @@ int main() {
208208

209209
// Check Kernel_TemplatedStructArray parameters
210210
// CHECK: FunctionDecl {{.*}}Kernel_TemplatedStructArray{{.*}} 'void (S<int>)'
211-
// CHECK-NEXT: ParmVarDecl {{.*}} used _arg_s 'S<int>':'S<int>'
211+
// CHECK-NEXT: ParmVarDecl {{.*}} used _arg_s 'S<int>'
212212
// CHECK-NEXT: CompoundStmt
213213
// CHECK-NEXT: DeclStmt
214214
// CHECK-NEXT: VarDecl {{.*}} used __SYCLKernel '(lambda at {{.*}}array-kernel-param.cpp{{.*}})' cinit
215215
// CHECK-NEXT: InitListExpr {{.*}} '(lambda at {{.*}}array-kernel-param.cpp{{.*}})'
216-
// CHECK-NEXT: CXXConstructExpr {{.*}} 'S<int>':'S<int>' 'void (const S<int> &) noexcept'
216+
// CHECK-NEXT: CXXConstructExpr {{.*}} 'S<int>' 'void (const S<int> &) noexcept'
217217
// CHECK-NEXT: ImplicitCastExpr
218-
// CHECK-NEXT: DeclRefExpr {{.*}} 'S<int>':'S<int>' lvalue ParmVar {{.*}} '_arg_s' 'S<int>':'S<int>'
218+
// CHECK-NEXT: DeclRefExpr {{.*}} 'S<int>' lvalue ParmVar {{.*}} '_arg_s' 'S<int>'
219219

220220
// Check Kernel_Array_2D parameters
221221
// CHECK: FunctionDecl {{.*}}Kernel_Array_2D{{.*}} 'void (__wrapper_class)'
@@ -262,7 +262,7 @@ int main() {
262262
// CHECK-NEXT: MemberExpr {{.*}} 'NonDecomposedStruct[2]' lvalue .
263263
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_NonDecompStructArray' '__wrapper_class'
264264
// CHECK-NEXT: CXXConstructExpr {{.*}}'NonDecomposedStruct' 'void (const NonDecomposedStruct &) noexcept'
265-
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const NonDecomposedStruct':'const NonDecomposedStruct' lvalue <NoOp>
265+
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const NonDecomposedStruct' lvalue <NoOp>
266266
// CHECK-NEXT: ArraySubscriptExpr {{.*}}'NonDecomposedStruct' lvalue
267267
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'NonDecomposedStruct *' <ArrayToPointerDecay>
268268
// CHECK-NEXT: OpaqueValueExpr {{.*}} 'NonDecomposedStruct[2]' lvalue
@@ -280,9 +280,9 @@ int main() {
280280
// CHECK-NEXT: InitListExpr
281281
// CHECK-NEXT: InitListExpr {{.*}} 'StructWithPointers[2]'
282282
// Initializer for StructWithPointersArray[0]
283-
// CHECK-NEXT: CXXConstructExpr {{.*}} 'StructWithPointers':'StructWithPointers' 'void (const StructWithPointers &) noexcept'
284-
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const StructWithPointers':'const StructWithPointers' lvalue <NoOp>
285-
// CHECK-NEXT: UnaryOperator {{.*}} 'StructWithPointers':'StructWithPointers' lvalue prefix '*' cannot overflow
283+
// CHECK-NEXT: CXXConstructExpr {{.*}} 'StructWithPointers' 'void (const StructWithPointers &) noexcept'
284+
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const StructWithPointers' lvalue <NoOp>
285+
// CHECK-NEXT: UnaryOperator {{.*}} 'StructWithPointers' lvalue prefix '*' cannot overflow
286286
// CHECK-NEXT: CXXReinterpretCastExpr {{.*}} 'StructWithPointers *' reinterpret_cast<StructWithPointers *> <BitCast>
287287
// CHECK-NEXT: UnaryOperator {{.*}} '__generated_StructWithPointers *' prefix '&' cannot overflow
288288
// CHECK-NEXT: ArraySubscriptExpr {{.*}} '__generated_StructWithPointers' lvalue
@@ -291,9 +291,9 @@ int main() {
291291
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_StructWithPointersArray'
292292
// CHECK-NEXT: IntegerLiteral {{.*}} 0
293293
// Initializer for StructWithPointersArray[1]
294-
// CHECK: CXXConstructExpr {{.*}} 'StructWithPointers':'StructWithPointers' 'void (const StructWithPointers &) noexcept'
295-
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const StructWithPointers':'const StructWithPointers' lvalue <NoOp>
296-
// CHECK-NEXT: UnaryOperator {{.*}} 'StructWithPointers':'StructWithPointers' lvalue prefix '*' cannot overflow
294+
// CHECK: CXXConstructExpr {{.*}} 'StructWithPointers' 'void (const StructWithPointers &) noexcept'
295+
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const StructWithPointers' lvalue <NoOp>
296+
// CHECK-NEXT: UnaryOperator {{.*}} 'StructWithPointers' lvalue prefix '*' cannot overflow
297297
// CHECK-NEXT: CXXReinterpretCastExpr {{.*}} 'StructWithPointers *' reinterpret_cast<StructWithPointers *> <BitCast>
298298
// CHECK-NEXT: UnaryOperator {{.*}} '__generated_StructWithPointers *' prefix '&' cannot overflow
299299
// CHECK-NEXT: ArraySubscriptExpr {{.*}} '__generated_StructWithPointers' lvalue

‎clang/test/SemaSYCL/basic-kernel-wrapper.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ int main() {
4040

4141
// CHECK: CXXMemberCallExpr {{.*}} 'void'
4242
// CHECK-NEXT: MemberExpr {{.*}} 'void ({{.*}}PtrType, range<1>, range<1>, id<1>)' lvalue .__init
43-
// CHECK-NEXT: MemberExpr {{.*}} 'sycl::accessor<int, 1, sycl::access::mode::read_write>':'sycl::accessor<int, 1, sycl::access::mode::read_write>' lvalue .
43+
// CHECK-NEXT: MemberExpr {{.*}} 'sycl::accessor<int, 1, sycl::access::mode::read_write>' lvalue .
4444
// CHECK-NEXT: DeclRefExpr {{.*}} '(lambda at {{.*}}basic-kernel-wrapper.cpp{{.*}})' lvalue Var
4545

4646
// CHECK-NEXT: ImplicitCastExpr {{.*}} <LValueToRValue>

‎clang/test/SemaSYCL/built-in-type-kernel-arg.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ int main() {
103103
// Check that lambda field of struct type is initialized
104104
// CHECK: VarDecl {{.*}}'(lambda at {{.*}}built-in-type-kernel-arg.cpp{{.*}})'
105105
// CHECK-NEXT: InitListExpr {{.*}}'(lambda at {{.*}}built-in-type-kernel-arg.cpp{{.*}})'
106-
// CHECK-NEXT: CXXConstructExpr {{.*}} 'test_struct':'test_struct' 'void (const test_struct &) noexcept'
107-
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const test_struct':'const test_struct' lvalue <NoOp>
108-
// CHECK-NEXT: UnaryOperator {{.*}} 'test_struct':'test_struct' lvalue prefix '*' cannot overflow
106+
// CHECK-NEXT: CXXConstructExpr {{.*}} 'test_struct' 'void (const test_struct &) noexcept'
107+
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const test_struct' lvalue <NoOp>
108+
// CHECK-NEXT: UnaryOperator {{.*}} 'test_struct' lvalue prefix '*' cannot overflow
109109
// CHECK-NEXT: CXXReinterpretCastExpr {{.*}} 'test_struct *' reinterpret_cast<test_struct *> <BitCast>
110110
// CHECK-NEXT: UnaryOperator {{.*}} '__generated_test_struct *' prefix '&' cannot overflow
111111
// CHECK-NEXT: DeclRefExpr {{.*}} '__generated_test_struct' lvalue ParmVar {{.*}} '_arg_s'
@@ -151,7 +151,7 @@ int main() {
151151
// CHECK: VarDecl {{.*}} used __SYCLKernel
152152
// CHECK: InitListExpr
153153
// CHECK: CXXConstructExpr {{.*}} 'Nested::TDS':'test_struct_simple' 'void (const test_struct_simple &) noexcept'
154-
// CHECK: ImplicitCastExpr {{.*}} 'const test_struct_simple':'const test_struct_simple' lvalue <NoOp>
154+
// CHECK: ImplicitCastExpr {{.*}} 'const test_struct_simple' lvalue <NoOp>
155155
// CHECK: UnaryOperator {{.*}} 'Nested::TDS':'test_struct_simple' lvalue prefix '*' cannot overflow
156156
// CHECK: CXXReinterpretCastExpr {{.*}} 'Nested::TDS *' reinterpret_cast<struct Nested::TDS *> <BitCast>
157157
// CHECK: UnaryOperator {{.*}} '__generated_test_struct_simple *' prefix '&' cannot overflow

‎clang/test/SemaSYCL/device_has_ast.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ queue q;
3333
// CHECK-NEXT: CompoundStmt
3434
// CHECK-NEXT: SYCLDeviceHasAttr
3535
// CHECK-NEXT: SubstNonTypeTemplateParmExpr {{.*}} 'sycl::aspect'
36-
// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}} referenced 'sycl::aspect':'sycl::aspect' depth 0 index 0 Aspect
36+
// CHECK-NEXT: NonTypeTemplateParmDecl {{.*}} referenced 'sycl::aspect' depth 0 index 0 Aspect
3737
// CHECK-NEXT: CStyleCastExpr {{.*}} 'sycl::aspect' <IntegralCast>
3838
// CHECK-NEXT: IntegerLiteral {{.*}} 'int' 0
3939
template <sycl::aspect Aspect>

‎clang/test/SemaSYCL/inheritance.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,16 @@ int main() {
6868

6969
// base is a simple class with no corresponding generated type. Therefore
7070
// copy from ParamVar
71-
// CHECK-NEXT: CXXConstructExpr {{.*}} 'base':'base' 'void (const base &) noexcept'
72-
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const base':'const base' lvalue <NoOp>
71+
// CHECK-NEXT: CXXConstructExpr {{.*}} 'base' 'void (const base &) noexcept'
72+
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const base' lvalue <NoOp>
7373
// CHECK-NEXT: DeclRefExpr {{.*}} lvalue ParmVar {{.*}} '_arg__base' 'base'
7474

7575
// second_base contains pointers and therefore the ParamVar is a new generated
7676
// type. Perform a copy of the corresponding kernel parameter via
7777
// reinterpret_cast.
78-
// CHECK-NEXT: CXXConstructExpr {{.*}} 'second_base':'second_base' 'void (const second_base &) noexcept'
79-
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const second_base':'const second_base' lvalue <NoOp>
80-
// CHECK-NEXT: UnaryOperator {{.*}} 'second_base':'second_base' lvalue prefix '*' cannot overflow
78+
// CHECK-NEXT: CXXConstructExpr {{.*}} 'second_base' 'void (const second_base &) noexcept'
79+
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'const second_base' lvalue <NoOp>
80+
// CHECK-NEXT: UnaryOperator {{.*}} 'second_base' lvalue prefix '*' cannot overflow
8181
// CHECK-NEXT: CXXReinterpretCastExpr {{.*}} 'second_base *' reinterpret_cast<second_base *> <BitCast>
8282
// CHECK-NEXT: UnaryOperator {{.*}} '__generated_second_base *' prefix '&' cannot overflow
8383
// CHECK-NEXT: DeclRefExpr {{.*}} '__generated_second_base' lvalue ParmVar {{.*}} '_arg__base' '__generated_second_base'
@@ -99,5 +99,5 @@ int main() {
9999
// CHECK: CXXMemberCallExpr
100100
// CHECK-NEXT: MemberExpr {{.*}} lvalue .__init
101101
// CHECK-NEXT: MemberExpr {{.*}} lvalue .AccField
102-
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'third_base':'third_base' lvalue <DerivedToBase (third_base)>
102+
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'third_base' lvalue <DerivedToBase (third_base)>
103103
// CHECK-NEXT: DeclRefExpr {{.*}} 'derived' lvalue Var {{.*}} 'derived' 'derived'

‎clang/test/SemaSYCL/kernel-handler.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ int main() {
5959
// Kernel body with clones
6060
// NONATIVESUPPORT-NEXT: ImplicitCastExpr {{.*}} 'const (lambda at {{.*}}kernel-handler.cpp{{.*}})' lvalue
6161
// NONATIVESUPPORT-NEXT: DeclRefExpr {{.*}} '(lambda at {{.*}}kernel-handler.cpp{{.*}})' lvalue Var {{.*}} '(lambda at {{.*}}kernel-handler.cpp{{.*}})'
62-
// NONATIVESUPPORT-NEXT: CXXConstructExpr {{.*}} 'sycl::kernel_handler':'sycl::kernel_handler' 'void (const kernel_handler &) noexcept'
62+
// NONATIVESUPPORT-NEXT: CXXConstructExpr {{.*}} 'sycl::kernel_handler' 'void (const kernel_handler &) noexcept'
6363
// NONATIVESUPPORT-NEXT: ImplicitCastExpr {{.*}} 'const kernel_handler':'const sycl::kernel_handler' lvalue
6464
// NONATIVESUPPORT-NEXT: DeclRefExpr {{.*}} 'kernel_handler':'sycl::kernel_handler' lvalue Var {{.*}} 'kh' 'kernel_handler':'sycl::kernel_handler'
6565

@@ -128,6 +128,6 @@ int main() {
128128
// Kernel body with clones
129129
// NATIVESUPPORT: ImplicitCastExpr {{.*}} 'const (lambda at {{.*}}kernel-handler.cpp{{.*}})' lvalue
130130
// NATIVESUPPORT-NEXT: DeclRefExpr {{.*}} '(lambda at {{.*}}kernel-handler.cpp{{.*}})' lvalue Var {{.*}} '(lambda at {{.*}}kernel-handler.cpp{{.*}})'
131-
// NATIVESUPPORT-NEXT: CXXConstructExpr {{.*}} 'sycl::kernel_handler':'sycl::kernel_handler' 'void (const kernel_handler &) noexcept'
131+
// NATIVESUPPORT-NEXT: CXXConstructExpr {{.*}} 'sycl::kernel_handler' 'void (const kernel_handler &) noexcept'
132132
// NATIVESUPPORT-NEXT: ImplicitCastExpr {{.*}} 'const kernel_handler':'const sycl::kernel_handler' lvalue
133133
// NATIVESUPPORT-NEXT: DeclRefExpr {{.*}} 'kernel_handler':'sycl::kernel_handler' lvalue Var {{.*}} 'kh' 'kernel_handler':'sycl::kernel_handler'

‎clang/test/SemaSYCL/parallel_for_wrapper_attr.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void invoke() {
3232
// CHECK-NEXT: ConstantExpr {{.*}} 'int'
3333
// CHECK-NEXT: value: Int 4
3434
// CHECK-NEXT: IntegerLiteral{{.*}}4{{$}}
35-
// CHECK: CXXOperatorCallExpr {{.*}} 'void':'void' '()'
35+
// CHECK: CXXOperatorCallExpr {{.*}} 'void' '()'
3636
// CHECK: IntelReqdSubGroupSizeAttr {{.*}}
3737
// CHECK-NEXT: ConstantExpr {{.*}} 'int'
3838
// CHECK-NEXT: value: Int 4
@@ -49,6 +49,6 @@ void invoke() {
4949
// CHECK-NEXT: ConstantExpr {{.*}} 'int'
5050
// CHECK-NEXT: value: Int 4
5151
// CHECK-NEXT: IntegerLiteral{{.*}}4{{$}}
52-
// CHECK: CXXOperatorCallExpr {{.*}} 'void':'void' '()'
52+
// CHECK: CXXOperatorCallExpr {{.*}} 'void' '()'
5353
// CHECK-NOT: IntelReqdSubGroupSizeAttr {{.*}}
5454
// CHECK: CXXConstructorDecl

‎clang/test/SemaSYCL/sampler.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ int main() {
2828
// Check that sampler field of the test kernel object is initialized using __init method
2929
// CHECK: CXXMemberCallExpr {{.*}} 'void'
3030
// CHECK-NEXT: MemberExpr {{.*}} 'void (__ocl_sampler_t)' lvalue .__init
31-
// CHECK-NEXT: MemberExpr {{.*}} 'sycl::sampler':'sycl::sampler' lvalue
31+
// CHECK-NEXT: MemberExpr {{.*}} 'sycl::sampler' lvalue
3232
// CHECK-NEXT: DeclRefExpr {{.*}} '(lambda at {{.*}}sampler.cpp{{.*}})' lvalue Var {{.*}} '(lambda at {{.*}}sampler.cpp{{.*}})'
3333
//
3434
// Check the parameters of __init method

0 commit comments

Comments
 (0)