Skip to content

Commit b3df18d

Browse files
againullagainull
authored
[SYCL][NFC] Relax checks in abi/layout_handler.cpp (#20761)
Relax checks to make sure that building/testing the project with more GCC/STL versions would pass. (similar to d962d3c) There is no need to check stl internals.
1 parent d2117df commit b3df18d

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

‎sycl/test/abi/layout_handler.cpp‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,25 @@ void foo() {
1414
// The order of field declarations and their types are important.
1515
// CHECK: 0 | class sycl::handler
1616
// CHECK-NEXT: 0 | class std::unique_ptr<class sycl::detail::handler_impl> implOwner
17-
// CHECK-NEXT: 0 | struct std::__uniq_ptr_data<class sycl::detail::handler_impl, struct std::default_delete<class sycl::detail::handler_impl> > _M_t
17+
// CHECK-NEXT: 0 | struct std::__uniq_ptr_data<class sycl::detail::handler_impl, struct std::default_delete<class sycl::detail::handler_impl> >
1818
// CHECK-NEXT: 0 | class std::__uniq_ptr_impl<class sycl::detail::handler_impl, struct std::default_delete<class sycl::detail::handler_impl> > (base)
19-
// CHECK-NEXT: 0 | class std::tuple<class sycl::detail::handler_impl *, struct std::default_delete<class sycl::detail::handler_impl> > _M_t
19+
// CHECK-NEXT: 0 | class std::tuple<class sycl::detail::handler_impl *, struct std::default_delete<class sycl::detail::handler_impl> >
2020
// CHECK-NEXT: 0 | struct std::_Tuple_impl<0, class sycl::detail::handler_impl *, struct std::default_delete<class sycl::detail::handler_impl> > (base)
2121
// CHECK-NEXT: 0 | struct std::_Tuple_impl<1, struct std::default_delete<class sycl::detail::handler_impl> > (base) (empty)
22-
// CHECK: 0 | struct std::_Head_base<1, struct std::default_delete<class sycl::detail::handler_impl> > (base) (empty)
23-
// CHECK-NEXT: 0 | struct std::default_delete<class sycl::detail::handler_impl> _M_head_impl (empty)
2422
// CHECK: 0 | struct std::_Head_base<0, class sycl::detail::handler_impl *> (base)
2523
// CHECK-NEXT: 0 | class sycl::detail::handler_impl * _M_head_impl
2624
// CHECK-NEXT: 8 | detail::handler_impl * impl
2725
// CHECK-NEXT: 16 | class std::vector<class std::shared_ptr<class sycl::detail::LocalAccessorImplHost> > MLocalAccStorage
2826
// CHECK-NEXT: 16 | struct std::_Vector_base<class std::shared_ptr<class sycl::detail::LocalAccessorImplHost>, class std::allocator<class std::shared_ptr<class sycl::detail::LocalAccessorImplHost> > > (base)
2927
// CHECK-NEXT: 16 | struct std::_Vector_base<class std::shared_ptr<class sycl::detail::LocalAccessorImplHost>, class std::allocator<class std::shared_ptr<class sycl::detail::LocalAccessorImplHost> > >::_Vector_impl _M_impl
3028
// CHECK-NEXT: 16 | class std::allocator<class std::shared_ptr<class sycl::detail::LocalAccessorImplHost> > (base) (empty)
31-
// CHECK-NEXT: 16 | class std::__new_allocator<class std::shared_ptr<class sycl::detail::LocalAccessorImplHost> > (base) (empty)
32-
// CHECK-NEXT: 16 | struct std::_Vector_base<class std::shared_ptr<class sycl::detail::LocalAccessorImplHost>, class std::allocator<class std::shared_ptr<class sycl::detail::LocalAccessorImplHost> > >::_Vector_impl_data (base)
3329
// CHECK: 16 | pointer _M_start
3430
// CHECK-NEXT: 24 | pointer _M_finish
3531
// CHECK-NEXT: 32 | pointer _M_end_of_storage
3632
// CHECK-NEXT: 40 | class std::vector<class std::shared_ptr<class sycl::detail::stream_impl> > MStreamStorage
3733
// CHECK-NEXT: 40 | struct std::_Vector_base<class std::shared_ptr<class sycl::detail::stream_impl>, class std::allocator<class std::shared_ptr<class sycl::detail::stream_impl> > > (base)
3834
// CHECK-NEXT: 40 | struct std::_Vector_base<class std::shared_ptr<class sycl::detail::stream_impl>, class std::allocator<class std::shared_ptr<class sycl::detail::stream_impl> > >::_Vector_impl _M_impl
3935
// CHECK-NEXT: 40 | class std::allocator<class std::shared_ptr<class sycl::detail::stream_impl> > (base) (empty)
40-
// CHECK-NEXT: 40 | class std::__new_allocator<class std::shared_ptr<class sycl::detail::stream_impl> > (base) (empty)
41-
// CHECK-NEXT: 40 | struct std::_Vector_base<class std::shared_ptr<class sycl::detail::stream_impl>, class std::allocator<class std::shared_ptr<class sycl::detail::stream_impl> > >::_Vector_impl_data (base)
4236
// CHECK: 40 | pointer _M_start
4337
// CHECK-NEXT: 48 | pointer _M_finish
4438
// CHECK-NEXT: 56 | pointer _M_end_of_storage
@@ -57,19 +51,15 @@ void foo() {
5751
// CHECK-NEXT: 112 | struct std::_Vector_base<unsigned char, class std::allocator<unsigned char> > (base)
5852
// CHECK-NEXT: 112 | struct std::_Vector_base<unsigned char, class std::allocator<unsigned char> >::_Vector_impl _M_impl
5953
// CHECK-NEXT: 112 | class std::allocator<unsigned char> (base) (empty)
60-
// CHECK-NEXT: 112 | class std::__new_allocator<unsigned char> (base) (empty)
61-
// CHECK-NEXT: 112 | struct std::_Vector_base<unsigned char, class std::allocator<unsigned char> >::_Vector_impl_data (base)
6254
// CHECK: 112 | pointer _M_start
6355
// CHECK-NEXT: 120 | pointer _M_finish
6456
// CHECK-NEXT: 128 | pointer _M_end_of_storage
6557
// CHECK-NEXT: 136 | class std::unique_ptr<class sycl::detail::HostKernelBase> MHostKernel
66-
// CHECK-NEXT: 136 | struct std::__uniq_ptr_data<class sycl::detail::HostKernelBase, struct std::default_delete<class sycl::detail::HostKernelBase> > _M_t
58+
// CHECK-NEXT: 136 | struct std::__uniq_ptr_data<class sycl::detail::HostKernelBase, struct std::default_delete<class sycl::detail::HostKernelBase> >
6759
// CHECK: 136 | class std::__uniq_ptr_impl<class sycl::detail::HostKernelBase, struct std::default_delete<class sycl::detail::HostKernelBase> > (base)
68-
// CHECK-NEXT: 136 | class std::tuple<class sycl::detail::HostKernelBase *, struct std::default_delete<class sycl::detail::HostKernelBase> > _M_t
60+
// CHECK-NEXT: 136 | class std::tuple<class sycl::detail::HostKernelBase *, struct std::default_delete<class sycl::detail::HostKernelBase> >
6961
// CHECK-NEXT: 136 | struct std::_Tuple_impl<0, class sycl::detail::HostKernelBase *, struct std::default_delete<class sycl::detail::HostKernelBase> > (base)
7062
// CHECK-NEXT: 136 | struct std::_Tuple_impl<1, struct std::default_delete<class sycl::detail::HostKernelBase> > (base) (empty)
71-
// CHECK: 136 | struct std::_Head_base<1, struct std::default_delete<class sycl::detail::HostKernelBase> > (base) (empty)
72-
// CHECK-NEXT: 136 | struct std::default_delete<class sycl::detail::HostKernelBase> _M_head_impl (empty)
7363
// CHECK: 136 | struct std::_Head_base<0, class sycl::detail::HostKernelBase *> (base)
7464
// CHECK-NEXT: 136 | class sycl::detail::HostKernelBase * _M_head_impl
7565
// CHECK-NEXT: 144 | struct sycl::detail::code_location MCodeLoc

0 commit comments

Comments
 (0)