Skip to content

Commit c50a8d8

Browse files
author
Alexander Batashev
authored
[SYCL][NFC] Fix ABI tests in post-commit (#1859)
Post-commit machines have GCC 9 pre-installed. The newer libstdc++ changes field names while preserving data structure layout. Update tests to be aware of these differences.
1 parent d196ca5 commit c50a8d8

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

‎sycl/test/abi/layout_handler.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,63 +25,63 @@ void foo() {
2525
// CHECK-NEXT: 16 | struct std::_Vector_base<class std::vector<char, class std::allocator<char> >, class std::allocator<class std::vector<char, class std::allocator<char> > > >::_Vector_impl _M_impl
2626
// CHECK-NEXT: 16 | class std::allocator<class std::vector<char, class std::allocator<char> > > (base) (empty)
2727
// CHECK-NEXT: 16 | class __gnu_cxx::new_allocator<class std::vector<char, class std::allocator<char> > > (base) (empty)
28-
// CHECK-NEXT: 16 | std::_Vector_base<class std::vector<char, class std::allocator<char> >, class std::allocator<class std::vector<char, class std::allocator<char> > > >::pointer _M_start
28+
// CHECK: 16 | std::_Vector_base<class std::vector<char, class std::allocator<char> >, class std::allocator<class std::vector<char, class std::allocator<char> > > >::pointer _M_start
2929
// CHECK-NEXT: 24 | std::_Vector_base<class std::vector<char, class std::allocator<char> >, class std::allocator<class std::vector<char, class std::allocator<char> > > >::pointer _M_finish
3030
// CHECK-NEXT: 32 | std::_Vector_base<class std::vector<char, class std::allocator<char> >, class std::allocator<class std::vector<char, class std::allocator<char> > > >::pointer _M_end_of_storage
3131
// CHECK-NEXT: 40 | class std::vector<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost> > > MAccStorage
3232
// CHECK-NEXT: 40 | struct std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost> > > (base)
3333
// CHECK-NEXT: 40 | struct std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost> > >::_Vector_impl _M_impl
3434
// CHECK-NEXT: 40 | class std::allocator<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost> > (base) (empty)
3535
// CHECK-NEXT: 40 | class __gnu_cxx::new_allocator<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost> > (base) (empty)
36-
// CHECK-NEXT: 40 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost> > >::pointer _M_start
36+
// CHECK: 40 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost> > >::pointer _M_start
3737
// CHECK-NEXT: 48 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost> > >::pointer _M_finish
3838
// CHECK-NEXT: 56 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::AccessorImplHost> > >::pointer _M_end_of_storage
3939
// CHECK-NEXT: 64 | class std::vector<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost> > > MLocalAccStorage
4040
// CHECK-NEXT: 64 | struct std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost> > > (base)
4141
// CHECK-NEXT: 64 | struct std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost> > >::_Vector_impl _M_impl
4242
// CHECK-NEXT: 64 | class std::allocator<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost> > (base) (empty)
4343
// CHECK-NEXT: 64 | class __gnu_cxx::new_allocator<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost> > (base) (empty)
44-
// CHECK-NEXT: 64 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost> > >::pointer _M_start
44+
// CHECK: 64 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost> > >::pointer _M_start
4545
// CHECK-NEXT: 72 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost> > >::pointer _M_finish
4646
// CHECK-NEXT: 80 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::LocalAccessorImplHost> > >::pointer _M_end_of_storage
4747
// CHECK-NEXT: 88 | class std::vector<class std::shared_ptr<class cl::sycl::detail::stream_impl>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::stream_impl> > > MStreamStorage
4848
// CHECK-NEXT: 88 | struct std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::stream_impl>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::stream_impl> > > (base)
4949
// CHECK-NEXT: 88 | struct std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::stream_impl>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::stream_impl> > >::_Vector_impl _M_impl
5050
// CHECK-NEXT: 88 | class std::allocator<class std::shared_ptr<class cl::sycl::detail::stream_impl> > (base) (empty)
5151
// CHECK-NEXT: 88 | class __gnu_cxx::new_allocator<class std::shared_ptr<class cl::sycl::detail::stream_impl> > (base) (empty)
52-
// CHECK-NEXT: 88 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::stream_impl>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::stream_impl> > >::pointer _M_start
52+
// CHECK: 88 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::stream_impl>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::stream_impl> > >::pointer _M_start
5353
// CHECK-NEXT: 96 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::stream_impl>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::stream_impl> > >::pointer _M_finish
5454
// CHECK-NEXT: 104 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::stream_impl>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::stream_impl> > >::pointer _M_end_of_storage
5555
// CHECK-NEXT: 112 | class std::vector<class std::shared_ptr<const void>, class std::allocator<class std::shared_ptr<const void> > > MSharedPtrStorage
5656
// CHECK-NEXT: 112 | struct std::_Vector_base<class std::shared_ptr<const void>, class std::allocator<class std::shared_ptr<const void> > > (base)
5757
// CHECK-NEXT: 112 | struct std::_Vector_base<class std::shared_ptr<const void>, class std::allocator<class std::shared_ptr<const void> > >::_Vector_impl _M_impl
5858
// CHECK-NEXT: 112 | class std::allocator<class std::shared_ptr<const void> > (base) (empty)
5959
// CHECK-NEXT: 112 | class __gnu_cxx::new_allocator<class std::shared_ptr<const void> > (base) (empty)
60-
// CHECK-NEXT: 112 | std::_Vector_base<class std::shared_ptr<const void>, class std::allocator<class std::shared_ptr<const void> > >::pointer _M_start
60+
// CHECK: 112 | std::_Vector_base<class std::shared_ptr<const void>, class std::allocator<class std::shared_ptr<const void> > >::pointer _M_start
6161
// CHECK-NEXT: 120 | std::_Vector_base<class std::shared_ptr<const void>, class std::allocator<class std::shared_ptr<const void> > >::pointer _M_finish
6262
// CHECK-NEXT: 128 | std::_Vector_base<class std::shared_ptr<const void>, class std::allocator<class std::shared_ptr<const void> > >::pointer _M_end_of_storage
6363
// CHECK-NEXT: 136 | class std::vector<class cl::sycl::detail::ArgDesc, class std::allocator<class cl::sycl::detail::ArgDesc> > MArgs
6464
// CHECK-NEXT: 136 | struct std::_Vector_base<class cl::sycl::detail::ArgDesc, class std::allocator<class cl::sycl::detail::ArgDesc> > (base)
6565
// CHECK-NEXT: 136 | struct std::_Vector_base<class cl::sycl::detail::ArgDesc, class std::allocator<class cl::sycl::detail::ArgDesc> >::_Vector_impl _M_impl
6666
// CHECK-NEXT: 136 | class std::allocator<class cl::sycl::detail::ArgDesc> (base) (empty)
6767
// CHECK-NEXT: 136 | class __gnu_cxx::new_allocator<class cl::sycl::detail::ArgDesc> (base) (empty)
68-
// CHECK-NEXT: 136 | std::_Vector_base<class cl::sycl::detail::ArgDesc, class std::allocator<class cl::sycl::detail::ArgDesc> >::pointer _M_start
68+
// CHECK: 136 | std::_Vector_base<class cl::sycl::detail::ArgDesc, class std::allocator<class cl::sycl::detail::ArgDesc> >::pointer _M_start
6969
// CHECK-NEXT: 144 | std::_Vector_base<class cl::sycl::detail::ArgDesc, class std::allocator<class cl::sycl::detail::ArgDesc> >::pointer _M_finish
7070
// CHECK-NEXT: 152 | std::_Vector_base<class cl::sycl::detail::ArgDesc, class std::allocator<class cl::sycl::detail::ArgDesc> >::pointer _M_end_of_storage
7171
// CHECK-NEXT: 160 | class std::vector<class cl::sycl::detail::ArgDesc, class std::allocator<class cl::sycl::detail::ArgDesc> > MAssociatedAccesors
7272
// CHECK-NEXT: 160 | struct std::_Vector_base<class cl::sycl::detail::ArgDesc, class std::allocator<class cl::sycl::detail::ArgDesc> > (base)
7373
// CHECK-NEXT: 160 | struct std::_Vector_base<class cl::sycl::detail::ArgDesc, class std::allocator<class cl::sycl::detail::ArgDesc> >::_Vector_impl _M_impl
7474
// CHECK-NEXT: 160 | class std::allocator<class cl::sycl::detail::ArgDesc> (base) (empty)
7575
// CHECK-NEXT: 160 | class __gnu_cxx::new_allocator<class cl::sycl::detail::ArgDesc> (base) (empty)
76-
// CHECK-NEXT: 160 | std::_Vector_base<class cl::sycl::detail::ArgDesc, class std::allocator<class cl::sycl::detail::ArgDesc> >::pointer _M_start
76+
// CHECK: 160 | std::_Vector_base<class cl::sycl::detail::ArgDesc, class std::allocator<class cl::sycl::detail::ArgDesc> >::pointer _M_start
7777
// CHECK-NEXT: 168 | std::_Vector_base<class cl::sycl::detail::ArgDesc, class std::allocator<class cl::sycl::detail::ArgDesc> >::pointer _M_finish
7878
// CHECK-NEXT: 176 | std::_Vector_base<class cl::sycl::detail::ArgDesc, class std::allocator<class cl::sycl::detail::ArgDesc> >::pointer _M_end_of_storage
7979
// CHECK-NEXT: 184 | class std::vector<class cl::sycl::detail::AccessorImplHost *, class std::allocator<class cl::sycl::detail::AccessorImplHost *> > MRequirements
8080
// CHECK-NEXT: 184 | struct std::_Vector_base<class cl::sycl::detail::AccessorImplHost *, class std::allocator<class cl::sycl::detail::AccessorImplHost *> > (base)
8181
// CHECK-NEXT: 184 | struct std::_Vector_base<class cl::sycl::detail::AccessorImplHost *, class std::allocator<class cl::sycl::detail::AccessorImplHost *> >::_Vector_impl _M_impl
8282
// CHECK-NEXT: 184 | class std::allocator<class cl::sycl::detail::AccessorImplHost *> (base) (empty)
8383
// CHECK-NEXT: 184 | class __gnu_cxx::new_allocator<class cl::sycl::detail::AccessorImplHost *> (base) (empty)
84-
// CHECK-NEXT: 184 | std::_Vector_base<class cl::sycl::detail::AccessorImplHost *, class std::allocator<class cl::sycl::detail::AccessorImplHost *> >::pointer _M_start
84+
// CHECK: 184 | std::_Vector_base<class cl::sycl::detail::AccessorImplHost *, class std::allocator<class cl::sycl::detail::AccessorImplHost *> >::pointer _M_start
8585
// CHECK-NEXT: 192 | std::_Vector_base<class cl::sycl::detail::AccessorImplHost *, class std::allocator<class cl::sycl::detail::AccessorImplHost *> >::pointer _M_finish
8686
// CHECK-NEXT: 200 | std::_Vector_base<class cl::sycl::detail::AccessorImplHost *, class std::allocator<class cl::sycl::detail::AccessorImplHost *> >::pointer _M_end_of_storage
8787
// CHECK-NEXT: 208 | class cl::sycl::detail::NDRDescT MNDRDesc
@@ -98,7 +98,7 @@ void foo() {
9898
// CHECK-NEXT: 280 | class cl::sycl::detail::array<3> (base)
9999
// CHECK-NEXT: 280 | size_t [3] common_array
100100
// CHECK-NEXT: 304 | size_t Dims
101-
// CHECK-NEXT: 312 | class std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> > MKernelName
101+
// CHECK-NEXT: 312 | class std::__cxx11::basic_string<char{{.*}}> MKernelName
102102
// CHECK-NEXT: 312 | struct std::__cxx11::basic_string<char, struct std::char_traits<char>, class std::allocator<char> >::_Alloc_hider _M_dataplus
103103
// CHECK-NEXT: 312 | class std::allocator<char> (base) (empty)
104104
// CHECK-NEXT: 312 | class __gnu_cxx::new_allocator<char> (base) (empty)
@@ -122,11 +122,11 @@ void foo() {
122122
// CHECK-NEXT: 392 | struct std::_Vector_base<char, class std::allocator<char> >::_Vector_impl _M_impl
123123
// CHECK-NEXT: 392 | class std::allocator<char> (base) (empty)
124124
// CHECK-NEXT: 392 | class __gnu_cxx::new_allocator<char> (base) (empty)
125-
// CHECK-NEXT: 392 | std::_Vector_base<char, class std::allocator<char> >::pointer _M_start
125+
// CHECK: 392 | std::_Vector_base<char, class std::allocator<char> >::pointer _M_start
126126
// CHECK-NEXT: 400 | std::_Vector_base<char, class std::allocator<char> >::pointer _M_finish
127127
// CHECK-NEXT: 408 | std::_Vector_base<char, class std::allocator<char> >::pointer _M_end_of_storage
128128
// CHECK-NEXT: 416 | class std::unique_ptr<class cl::sycl::detail::HostKernelBase, struct std::default_delete<class cl::sycl::detail::HostKernelBase> > MHostKernel
129-
// CHECK-NEXT: 416 | class std::__uniq_ptr_impl<class cl::sycl::detail::HostKernelBase, struct std::default_delete<class cl::sycl::detail::HostKernelBase> > _M_t
129+
// CHECK: 416 | class std::__uniq_ptr_impl<class cl::sycl::detail::HostKernelBase, struct std::default_delete<class cl::sycl::detail::HostKernelBase> >
130130
// CHECK-NEXT: 416 | class std::tuple<class cl::sycl::detail::HostKernelBase *, struct std::default_delete<class cl::sycl::detail::HostKernelBase> > _M_t
131131
// CHECK-NEXT: 416 | struct std::_Tuple_impl<0, class cl::sycl::detail::HostKernelBase *, struct std::default_delete<class cl::sycl::detail::HostKernelBase> > (base)
132132
// CHECK-NEXT: 416 | struct std::_Tuple_impl<1, struct std::default_delete<class cl::sycl::detail::HostKernelBase> > (base) (empty)
@@ -135,7 +135,7 @@ void foo() {
135135
// CHECK-NEXT: 416 | struct std::_Head_base<0, class cl::sycl::detail::HostKernelBase *, false> (base)
136136
// CHECK-NEXT: 416 | class cl::sycl::detail::HostKernelBase * _M_head_impl
137137
// CHECK-NEXT: 424 | class std::unique_ptr<class cl::sycl::detail::HostTask, struct std::default_delete<class cl::sycl::detail::HostTask> > MHostTask
138-
// CHECK-NEXT: 424 | class std::__uniq_ptr_impl<class cl::sycl::detail::HostTask, struct std::default_delete<class cl::sycl::detail::HostTask> > _M_t
138+
// CHECK: 424 | class std::__uniq_ptr_impl<class cl::sycl::detail::HostTask, struct std::default_delete<class cl::sycl::detail::HostTask> >
139139
// CHECK-NEXT: 424 | class std::tuple<class cl::sycl::detail::HostTask *, struct std::default_delete<class cl::sycl::detail::HostTask> > _M_t
140140
// CHECK-NEXT: 424 | struct std::_Tuple_impl<0, class cl::sycl::detail::HostTask *, struct std::default_delete<class cl::sycl::detail::HostTask> > (base)
141141
// CHECK-NEXT: 424 | struct std::_Tuple_impl<1, struct std::default_delete<class cl::sycl::detail::HostTask> > (base) (empty)
@@ -145,7 +145,7 @@ void foo() {
145145
// CHECK-NEXT: 424 | class cl::sycl::detail::HostTask * _M_head_impl
146146
// CHECK-NEXT: 432 | detail::OSModuleHandle MOSModuleHandle
147147
// CHECK-NEXT: 440 | class std::unique_ptr<class cl::sycl::detail::InteropTask, struct std::default_delete<class cl::sycl::detail::InteropTask> > MInteropTask
148-
// CHECK-NEXT: 440 | class std::__uniq_ptr_impl<class cl::sycl::detail::InteropTask, struct std::default_delete<class cl::sycl::detail::InteropTask> > _M_t
148+
// CHECK: 440 | class std::__uniq_ptr_impl<class cl::sycl::detail::InteropTask, struct std::default_delete<class cl::sycl::detail::InteropTask> >
149149
// CHECK-NEXT: 440 | class std::tuple<class cl::sycl::detail::InteropTask *, struct std::default_delete<class cl::sycl::detail::InteropTask> > _M_t
150150
// CHECK-NEXT: 440 | struct std::_Tuple_impl<0, class cl::sycl::detail::InteropTask *, struct std::default_delete<class cl::sycl::detail::InteropTask> > (base)
151151
// CHECK-NEXT: 440 | struct std::_Tuple_impl<1, struct std::default_delete<class cl::sycl::detail::InteropTask> > (base) (empty)
@@ -158,7 +158,7 @@ void foo() {
158158
// CHECK-NEXT: 448 | struct std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::event_impl>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::event_impl> > >::_Vector_impl _M_impl
159159
// CHECK-NEXT: 448 | class std::allocator<class std::shared_ptr<class cl::sycl::detail::event_impl> > (base) (empty)
160160
// CHECK-NEXT: 448 | class __gnu_cxx::new_allocator<class std::shared_ptr<class cl::sycl::detail::event_impl> > (base) (empty)
161-
// CHECK-NEXT: 448 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::event_impl>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::event_impl> > >::pointer _M_start
161+
// CHECK: 448 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::event_impl>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::event_impl> > >::pointer _M_start
162162
// CHECK-NEXT: 456 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::event_impl>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::event_impl> > >::pointer _M_finish
163163
// CHECK-NEXT: 464 | std::_Vector_base<class std::shared_ptr<class cl::sycl::detail::event_impl>, class std::allocator<class std::shared_ptr<class cl::sycl::detail::event_impl> > >::pointer _M_end_of_storage
164164
// CHECK-NEXT: 472 | _Bool MIsHost

0 commit comments

Comments
 (0)