Skip to content

Commit 4e44e01

Browse files
vmaksimovmaksimo
committed
Align tests with the community changes
This patch aligns our tests to 5f12f4f and e7f3e21. They introduced suppressing of AST for inlined namespace names and template arguments that match default template.
1 parent fa02785 commit 4e44e01

11 files changed

+334
-334
lines changed

‎clang/test/SemaSYCL/accessor_inheritance.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ int main() {
4242
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' lvalue ParmVar {{.*}} '_arg_A' 'int'
4343
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int' <LValueToRValue>
4444
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' lvalue ParmVar {{.*}} '_arg_B' 'int'
45-
// CHECK-NEXT: CXXConstructExpr {{.*}} 'cl::sycl::accessor<char, 1, cl::sycl::access::mode::read>':'cl::sycl::accessor<char, 1, cl::sycl::access::mode::read, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t, cl::sycl::ONEAPI::accessor_property_list<>>' 'void () noexcept'
46-
// CHECK-NEXT: CXXConstructExpr {{.*}} 'cl::sycl::accessor<char, 1, cl::sycl::access::mode::read>':'cl::sycl::accessor<char, 1, cl::sycl::access::mode::read, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t, cl::sycl::ONEAPI::accessor_property_list<>>' 'void () noexcept'
45+
// CHECK-NEXT: CXXConstructExpr {{.*}} 'cl::sycl::accessor<char, 1, cl::sycl::access::mode::read>':'cl::sycl::accessor<char, 1, cl::sycl::access::mode::read, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t>' 'void () noexcept'
46+
// CHECK-NEXT: CXXConstructExpr {{.*}} 'cl::sycl::accessor<char, 1, cl::sycl::access::mode::read>':'cl::sycl::accessor<char, 1, cl::sycl::access::mode::read, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t>' 'void () noexcept'
4747
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int' <LValueToRValue>
4848
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' lvalue ParmVar {{.*}} '_arg_C' 'int'
4949

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

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

4444
// CHECK: CXXMemberCallExpr {{.*}} 'void'
4545
// CHECK-NEXT: MemberExpr {{.*}} 'void ({{.*}}PtrType, range<1>, range<1>, id<1>)' lvalue .__init
46-
// CHECK-NEXT: MemberExpr {{.*}} 'cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write>':'cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t, cl::sycl::ONEAPI::accessor_property_list<>>' lvalue .
46+
// CHECK-NEXT: MemberExpr {{.*}} 'cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write>':'cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t>' lvalue .
4747
// CHECK-NEXT: DeclRefExpr {{.*}} '(lambda at {{.*}}basic-kernel-wrapper.cpp{{.*}})' lvalue Var
4848

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

‎clang/test/SemaSYCL/wrapped-accessor.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@ int main() {
3535
// argument
3636
// CHECK: VarDecl {{.*}}'(lambda at {{.*}}wrapped-accessor.cpp{{.*}})'
3737
// CHECK-NEXT: InitListExpr {{.*}}'(lambda at {{.*}}wrapped-accessor.cpp{{.*}})'
38-
// CHECK-NEXT: InitListExpr {{.*}}'AccWrapper<cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t, cl::sycl::ONEAPI::accessor_property_list<>>>'
39-
// CHECK-NEXT: CXXConstructExpr {{.*}}'cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t, cl::sycl::ONEAPI::accessor_property_list<>>':'cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t, cl::sycl::ONEAPI::accessor_property_list<>>' 'void () noexcept'
38+
// CHECK-NEXT: InitListExpr {{.*}}'AccWrapper<cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t>>'
39+
// CHECK-NEXT: CXXConstructExpr {{.*}}'cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t>':'cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t>' 'void () noexcept'
4040

4141
// Check that accessor field of the wrapper object is initialized using __init method
4242
// CHECK-NEXT: CXXMemberCallExpr {{.*}} 'void'
4343
// CHECK-NEXT: MemberExpr {{.*}} 'void ({{.*}}PtrType, range<1>, range<1>, id<1>)' lvalue .__init
44-
// CHECK-NEXT: MemberExpr {{.*}} 'cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t, cl::sycl::ONEAPI::accessor_property_list<>>':'cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t, cl::sycl::ONEAPI::accessor_property_list<>>' lvalue .accessor {{.*}}
45-
// CHECK-NEXT: MemberExpr {{.*}} 'AccWrapper<cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t, cl::sycl::ONEAPI::accessor_property_list<>>>':'AccWrapper<cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t, cl::sycl::ONEAPI::accessor_property_list<>>>' lvalue .
44+
// CHECK-NEXT: MemberExpr {{.*}} 'cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t>':'cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t>' lvalue .accessor {{.*}}
45+
// CHECK-NEXT: MemberExpr {{.*}} 'AccWrapper<cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t>>':'AccWrapper<cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t>>' lvalue .
4646
// CHECK-NEXT: DeclRefExpr {{.*}} '(lambda at {{.*}}wrapped-accessor.cpp{{.*}})' lvalue Var {{.*}} '(lambda at {{.*}}wrapped-accessor.cpp{{.*}})'
4747

4848
// Parameters of the _init method

‎sycl/test/abi/layout_accessors_device.cpp

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ using namespace cl::sycl;
1414
SYCL_EXTERNAL void hostAcc(accessor<int, 1, access::mode::read, access::target::global_buffer> Acc) {
1515
(void)Acc.get_size();
1616
}
17-
// CHECK: 0 | class cl::sycl::accessor<int, 1, cl::sycl::access::mode::read, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t, class cl::sycl::ONEAPI::accessor_property_list<> >
18-
// CHECK-NEXT: 0 | class cl::sycl::detail::accessor_common<int, 1, cl::sycl::access::mode::read, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t, class cl::sycl::ONEAPI::accessor_property_list<> > (base) (empty)
19-
// CHECK-NEXT: 0 | class cl::sycl::detail::AccessorImplDevice<1> impl
20-
// CHECK-NEXT: 0 | class cl::sycl::id<1> Offset
21-
// CHECK-NEXT: 0 | class cl::sycl::detail::array<1> (base)
17+
// CHECK: 0 | class sycl::accessor<int, 1, sycl::access::mode::read, sycl::access::target::global_buffer, sycl::access::placeholder::false_t>
18+
// CHECK-NEXT: 0 | class sycl::detail::accessor_common<int, 1, sycl::access::mode::read, sycl::access::target::global_buffer, sycl::access::placeholder::false_t> (base) (empty)
19+
// CHECK-NEXT: 0 | class sycl::detail::AccessorImplDevice<1> impl
20+
// CHECK-NEXT: 0 | class sycl::id<1> Offset
21+
// CHECK-NEXT: 0 | class sycl::detail::array<1> (base)
2222
// CHECK-NEXT: 0 | size_t [1] common_array
23-
// CHECK-NEXT: 8 | class cl::sycl::range<1> AccessRange
24-
// CHECK-NEXT: 8 | class cl::sycl::detail::array<1> (base)
23+
// CHECK-NEXT: 8 | class sycl::range<1> AccessRange
24+
// CHECK-NEXT: 8 | class sycl::detail::array<1> (base)
2525
// CHECK-NEXT: 8 | size_t [1] common_array
26-
// CHECK-NEXT: 16 | class cl::sycl::range<1> MemRange
27-
// CHECK-NEXT: 16 | class cl::sycl::detail::array<1> (base)
26+
// CHECK-NEXT: 16 | class sycl::range<1> MemRange
27+
// CHECK-NEXT: 16 | class sycl::detail::array<1> (base)
2828
// CHECK-NEXT: 16 | size_t [1] common_array
29-
// CHECK-NEXT: 24 | union cl::sycl::accessor<int, 1, cl::sycl::access::mode::read, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t, class cl::sycl::ONEAPI::accessor_property_list<> >
30-
// CHECK-NEXT: 24 | cl::sycl::accessor<int, 1, cl::sycl::access::mode::read, cl::sycl::access::target::global_buffer, cl::sycl::access::placeholder::false_t, class cl::sycl::ONEAPI::accessor_property_list<> >::ConcreteASPtrType MData
29+
// CHECK-NEXT: 24 | union sycl::accessor<int, 1, sycl::access::mode::read, sycl::access::target::global_buffer, sycl::access::placeholder::false_t>
30+
// CHECK-NEXT: 24 | sycl::accessor<int, 1, sycl::access::mode::read, sycl::access::target::global_buffer, sycl::access::placeholder::false_t>::ConcreteASPtrType MData
3131
// CHECK-NEXT: | [sizeof=32, dsize=32, align=8,
3232
// CHECK-NEXT: | nvsize=32, nvalign=8]
3333

@@ -38,19 +38,19 @@ SYCL_EXTERNAL void hostAcc(accessor<int, 1, access::mode::read, access::target::
3838
SYCL_EXTERNAL void hostAcc(accessor<int, 1, access::mode::read_write, access::target::local> Acc) {
3939
(void)Acc.get_size();
4040
}
41-
// CHECK: 0 | class cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::local, cl::sycl::access::placeholder::false_t, class cl::sycl::ONEAPI::accessor_property_list<> >
42-
// CHECK-NEXT: 0 | class cl::sycl::detail::accessor_common<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::local, cl::sycl::access::placeholder::false_t, class cl::sycl::ONEAPI::accessor_property_list<> > (base) (empty)
43-
// CHECK-NEXT: 0 | class cl::sycl::detail::LocalAccessorBaseDevice<1> impl
44-
// CHECK-NEXT: 0 | class cl::sycl::range<1> AccessRange
45-
// CHECK-NEXT: 0 | class cl::sycl::detail::array<1> (base)
41+
// CHECK: 0 | class sycl::accessor<int, 1, sycl::access::mode::read_write, sycl::access::target::local, sycl::access::placeholder::false_t>
42+
// CHECK-NEXT: 0 | class sycl::detail::accessor_common<int, 1, sycl::access::mode::read_write, sycl::access::target::local, sycl::access::placeholder::false_t> (base) (empty)
43+
// CHECK-NEXT: 0 | class sycl::detail::LocalAccessorBaseDevice<1> impl
44+
// CHECK-NEXT: 0 | class sycl::range<1> AccessRange
45+
// CHECK-NEXT: 0 | class sycl::detail::array<1> (base)
4646
// CHECK-NEXT: 0 | size_t [1] common_array
47-
// CHECK-NEXT: 8 | class cl::sycl::range<1> MemRange
48-
// CHECK-NEXT: 8 | class cl::sycl::detail::array<1> (base)
47+
// CHECK-NEXT: 8 | class sycl::range<1> MemRange
48+
// CHECK-NEXT: 8 | class sycl::detail::array<1> (base)
4949
// CHECK-NEXT: 8 | size_t [1] common_array
50-
// CHECK-NEXT: 16 | class cl::sycl::id<1> Offset
51-
// CHECK-NEXT: 16 | class cl::sycl::detail::array<1> (base)
50+
// CHECK-NEXT: 16 | class sycl::id<1> Offset
51+
// CHECK-NEXT: 16 | class sycl::detail::array<1> (base)
5252
// CHECK-NEXT: 16 | size_t [1] common_array
53-
// CHECK-NEXT: 24 | cl::sycl::accessor<int, 1, cl::sycl::access::mode::read_write, cl::sycl::access::target::local, cl::sycl::access::placeholder::false_t, class cl::sycl::ONEAPI::accessor_property_list<> >::ConcreteASPtrType MData
53+
// CHECK-NEXT: 24 | sycl::accessor<int, 1, sycl::access::mode::read_write, sycl::access::target::local, sycl::access::placeholder::false_t>::ConcreteASPtrType MData
5454
// CHECK-NEXT: | [sizeof=32, dsize=32, align=8,
5555
// CHECK-NEXT: | nvsize=32, nvalign=8]
5656

@@ -62,9 +62,9 @@ SYCL_EXTERNAL void hostAcc(accessor<int4, 1, access::mode::read, access::target:
6262
(void)Acc.get_count();
6363
}
6464

65-
// CHECK: 0 | class cl::sycl::accessor<class cl::sycl::vec<int, 4>, 1, cl::sycl::access::mode::read, cl::sycl::access::target::image, cl::sycl::access::placeholder::false_t, class cl::sycl::ONEAPI::accessor_property_list<> >
66-
// CHECK-NEXT: 0 | class cl::sycl::detail::image_accessor<class cl::sycl::vec<int, 4>, 1, cl::sycl::access::mode::read, cl::sycl::access::target::image, cl::sycl::access::placeholder::false_t> (base)
67-
// CHECK-NEXT: 0 | cl::sycl::detail::image_accessor<class cl::sycl::vec<int, 4>, 1, cl::sycl::access::mode::read, cl::sycl::access::target::image, cl::sycl::access::placeholder::false_t>::OCLImageTy MImageObj
65+
// CHECK: 0 | class sycl::accessor<class sycl::vec<int, 4>, 1, sycl::access::mode::read, sycl::access::target::image, sycl::access::placeholder::false_t>
66+
// CHECK-NEXT: 0 | class sycl::detail::image_accessor<class sycl::vec<int, 4>, 1, sycl::access::mode::read, sycl::access::target::image, sycl::access::placeholder::false_t> (base)
67+
// CHECK-NEXT: 0 | sycl::detail::image_accessor<class sycl::vec<int, 4>, 1, sycl::access::mode::read, sycl::access::target::image, sycl::access::placeholder::false_t>::OCLImageTy MImageObj
6868
// CHECK-NEXT: 8 | char [24] MPadding
6969
// CHECK-NEXT: | [sizeof=32, dsize=32, align=8,
7070
// CHECK-NEXT: | nvsize=32, nvalign=8]

0 commit comments

Comments
 (0)