Skip to content

Commit ef85fcc

Browse files
dwoodwor-inteldwoodwor-intel
committed
Fix SYCL tests after sycl-web merge of 15f3cd6
This is a follow-up to 6a1b91c to make similar updates to SYCL tests.
1 parent 6a1b91c commit ef85fcc

File tree

7 files changed

+106
-106
lines changed

7 files changed

+106
-106
lines changed

‎sycl/test/abi/layout_accessors_device.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SYCL_EXTERNAL void hostAcc(accessor<int, 1, access::mode::read, access::target::
2828
// CHECK-NEXT: 16 | class sycl::detail::array<1> (base)
2929
// CHECK-NEXT: 16 | size_t[1] common_array
3030
// CHECK-NEXT: 24 | union sycl::accessor<int, 1, sycl::access::mode::read, sycl::access::target::global_buffer, sycl::access::placeholder::false_t>
31-
// CHECK-NEXT: 24 | sycl::accessor<int, 1, sycl::access::mode::read, sycl::access::target::global_buffer, sycl::access::placeholder::false_t>::ConcreteASPtrType MData
31+
// CHECK-NEXT: 24 | ConcreteASPtrType MData
3232
// CHECK-NEXT: | [sizeof=32, dsize=32, align=8,
3333
// CHECK-NEXT: | nvsize=32, nvalign=8]
3434

@@ -51,7 +51,7 @@ SYCL_EXTERNAL void hostAcc(accessor<int, 1, access::mode::read_write, access::ta
5151
// CHECK-NEXT: 16 | class sycl::id<1> Offset
5252
// CHECK-NEXT: 16 | class sycl::detail::array<1> (base)
5353
// CHECK-NEXT: 16 | size_t[1] common_array
54-
// CHECK-NEXT: 24 | sycl::accessor<int, 1, sycl::access::mode::read_write, sycl::access::target::local, sycl::access::placeholder::false_t>::ConcreteASPtrType MData
54+
// CHECK-NEXT: 24 | ConcreteASPtrType MData
5555
// CHECK-NEXT: | [sizeof=32, dsize=32, align=8,
5656
// CHECK-NEXT: | nvsize=32, nvalign=8]
5757

@@ -65,7 +65,7 @@ SYCL_EXTERNAL void hostAcc(accessor<int4, 1, access::mode::read, access::target:
6565

6666
// CHECK: 0 | class sycl::accessor<class sycl::vec<int, 4>, 1, sycl::access::mode::read, sycl::access::target::image, sycl::access::placeholder::false_t>
6767
// 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)
68-
// 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
68+
// CHECK-NEXT: 0 | OCLImageTy MImageObj
6969
// CHECK-NEXT: 8 | char[24] MPadding
7070
// CHECK-NEXT: | [sizeof=32, dsize=32, align=8,
7171
// CHECK-NEXT: | nvsize=32, nvalign=8]

‎sycl/test/abi/layout_accessors_host.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ using namespace cl::sycl;
2525
// CHECK-NEXT: 96 | unsigned int MOffsetInBytes
2626
// CHECK-NEXT: 100 | _Bool MIsSubBuffer
2727
// CHECK-NEXT: 104 | void * MData
28-
// CHECK-NEXT: 112 | class sycl::detail::Command * MBlockedCmd
28+
// CHECK-NEXT: 112 | Command * MBlockedCmd
2929
// CHECK-NEXT: 120 | _Bool PerWI
3030
// CHECK-NEXT: 121 | _Bool MIsESIMDAcc
3131
// CHECK-NEXT: | [sizeof=128, dsize=122, align=8,
@@ -42,9 +42,9 @@ using namespace cl::sycl;
4242
// CHECK-NEXT: 32 | struct std::_Vector_base<char, class std::allocator<char> >::_Vector_impl _M_impl
4343
// CHECK-NEXT: 32 | class std::allocator<char> (base) (empty)
4444
// CHECK-NEXT: 32 | class __gnu_cxx::new_allocator<char> (base) (empty)
45-
// CHECK: 32 | std::_Vector_base<char, class std::allocator<char> >::pointer _M_start
46-
// CHECK-NEXT: 40 | std::_Vector_base<char, class std::allocator<char> >::pointer _M_finish
47-
// CHECK-NEXT: 48 | std::_Vector_base<char, class std::allocator<char> >::pointer _M_end_of_storage
45+
// CHECK: 32 | pointer _M_start
46+
// CHECK-NEXT: 40 | pointer _M_finish
47+
// CHECK-NEXT: 48 | pointer _M_end_of_storage
4848
// CHECK-NEXT: | [sizeof=56, dsize=56, align=8,
4949
// CHECK-NEXT: | nvsize=56, nvalign=8]
5050

@@ -61,9 +61,9 @@ void hostAcc(accessor<int, 1, access::mode::read, access::target::host_buffer> A
6161
// CHECK-NEXT: 0 | class std::shared_ptr<class sycl::detail::AccessorImplHost> impl
6262
// CHECK-NEXT: 0 | class std::__shared_ptr<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic> (base)
6363
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic, false, false> (base) (empty)
64-
// CHECK-NEXT: 0 | std::__shared_ptr<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic>::element_type * _M_ptr
64+
// CHECK-NEXT: 0 | element_type * _M_ptr
6565
// CHECK-NEXT: 8 | class std::__shared_count<__gnu_cxx::_S_atomic> _M_refcount
66-
// CHECK-NEXT: 8 | _Sp_counted_base<(enum __gnu_cxx::_Lock_policy)2U> * _M_pi
66+
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
6767
// CHECK-NEXT: 0 | class sycl::detail::accessor_common<int, 1, sycl::access::mode::read, sycl::access::target::host_buffer, sycl::access::placeholder::false_t> (base) (empty)
6868
// CHECK-NEXT: 16 | char[16] padding
6969
// CHECK-NEXT: [sizeof=32, dsize=32, align=8,
@@ -82,9 +82,9 @@ void hostAcc(accessor<int, 1, access::mode::read, access::target::global_buffer>
8282
// CHECK-NEXT: 0 | class std::shared_ptr<class sycl::detail::AccessorImplHost> impl
8383
// CHECK-NEXT: 0 | class std::__shared_ptr<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic> (base)
8484
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic, false, false> (base) (empty)
85-
// CHECK-NEXT: 0 | std::__shared_ptr<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic>::element_type * _M_ptr
85+
// CHECK-NEXT: 0 | element_type * _M_ptr
8686
// CHECK-NEXT: 8 | class std::__shared_count<__gnu_cxx::_S_atomic> _M_refcount
87-
// CHECK-NEXT: 8 | _Sp_counted_base<(enum __gnu_cxx::_Lock_policy)2U> * _M_pi
87+
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
8888
// 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)
8989
// CHECK-NEXT: 16 | char[16] padding
9090
// CHECK-NEXT: [sizeof=32, dsize=32, align=8,
@@ -103,9 +103,9 @@ void hostAcc(accessor<int, 1, access::mode::read_write, access::target::local> A
103103
// CHECK-NEXT: 0 | class std::shared_ptr<class sycl::detail::LocalAccessorImplHost> impl
104104
// CHECK-NEXT: 0 | class std::__shared_ptr<class sycl::detail::LocalAccessorImplHost, __gnu_cxx::_S_atomic> (base)
105105
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::LocalAccessorImplHost, __gnu_cxx::_S_atomic, false, false> (base) (empty)
106-
// CHECK-NEXT: 0 | std::__shared_ptr<class sycl::detail::LocalAccessorImplHost, __gnu_cxx::_S_atomic>::element_type * _M_ptr
106+
// CHECK-NEXT: 0 | element_type * _M_ptr
107107
// CHECK-NEXT: 8 | class std::__shared_count<__gnu_cxx::_S_atomic> _M_refcount
108-
// CHECK-NEXT: 8 | _Sp_counted_base<(enum __gnu_cxx::_Lock_policy)2U> * _M_pi
108+
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
109109
// 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)
110110
// CHECK-NEXT: 16 | char[16] padding
111111
// CHECK-NEXT: [sizeof=32, dsize=32, align=8,
@@ -124,12 +124,12 @@ void hostAcc(accessor<int4, 1, access::mode::read_write, access::target::host_im
124124
// CHECK-NEXT: 0 | class std::shared_ptr<class sycl::detail::AccessorImplHost> impl
125125
// CHECK-NEXT: 0 | class std::__shared_ptr<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic> (base)
126126
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic, false, false> (base) (empty)
127-
// CHECK-NEXT: 0 | std::__shared_ptr<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic>::element_type * _M_ptr
127+
// CHECK-NEXT: 0 | element_type * _M_ptr
128128
// CHECK-NEXT: 8 | class std::__shared_count<__gnu_cxx::_S_atomic> _M_refcount
129-
// CHECK-NEXT: 8 | _Sp_counted_base<(enum __gnu_cxx::_Lock_policy)2U> * _M_pi
129+
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
130130
// CHECK-NEXT: 16 | size_t MImageCount
131-
// CHECK-NEXT: 24 | enum sycl::image_channel_order MImgChannelOrder
132-
// CHECK-NEXT: 28 | enum sycl::image_channel_type MImgChannelType
131+
// CHECK-NEXT: 24 | image_channel_order MImgChannelOrder
132+
// CHECK-NEXT: 28 | image_channel_type MImgChannelType
133133
// CHECK-NEXT: [sizeof=32, dsize=32, align=8,
134134
// CHECK-NEXT: nvsize=32, nvalign=8]
135135

@@ -146,11 +146,11 @@ void hostAcc(accessor<int4, 1, access::mode::read, access::target::image> Acc) {
146146
// CHECK-NEXT: 0 | class std::shared_ptr<class sycl::detail::AccessorImplHost> impl
147147
// CHECK-NEXT: 0 | class std::__shared_ptr<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic> (base)
148148
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic, false, false> (base) (empty)
149-
// CHECK-NEXT: 0 | std::__shared_ptr<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic>::element_type * _M_ptr
149+
// CHECK-NEXT: 0 | element_type * _M_ptr
150150
// CHECK-NEXT: 8 | class std::__shared_count<__gnu_cxx::_S_atomic> _M_refcount
151-
// CHECK-NEXT: 8 | _Sp_counted_base<(enum __gnu_cxx::_Lock_policy)2U> * _M_pi
151+
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
152152
// CHECK-NEXT: 16 | size_t MImageCount
153-
// CHECK-NEXT: 24 | enum sycl::image_channel_order MImgChannelOrder
154-
// CHECK-NEXT: 28 | enum sycl::image_channel_type MImgChannelType
153+
// CHECK-NEXT: 24 | image_channel_order MImgChannelOrder
154+
// CHECK-NEXT: 28 | image_channel_type MImgChannelType
155155
// CHECK-NEXT: [sizeof=32, dsize=32, align=8,
156156
// CHECK-NEXT: nvsize=32, nvalign=8]

‎sycl/test/abi/layout_buffer.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ void foo(sycl::buffer<int, 2>) {}
1414
// CHECK-NEXT: 8 | class std::shared_ptr<struct sycl::detail::MemObjRecord> MRecord
1515
// CHECK-NEXT: 8 | class std::__shared_ptr<struct sycl::detail::MemObjRecord, __gnu_cxx::_S_atomic> (base)
1616
// CHECK-NEXT: 8 | class std::__shared_ptr_access<struct sycl::detail::MemObjRecord, __gnu_cxx::_S_atomic, false, false> (base) (empty)
17-
// CHECK-NEXT: 8 | std::__shared_ptr<struct sycl::detail::MemObjRecord, __gnu_cxx::_S_atomic>::element_type * _M_ptr
17+
// CHECK-NEXT: 8 | element_type * _M_ptr
1818
// CHECK-NEXT: 16 | class std::__shared_count<__gnu_cxx::_S_atomic> _M_refcount
19-
// CHECK-NEXT: 16 | _Sp_counted_base<(enum __gnu_cxx::_Lock_policy)2U> * _M_pi
19+
// CHECK-NEXT: 16 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
2020
// CHECK-NEXT: 24 | class std::unique_ptr<class sycl::detail::SYCLMemObjAllocator> MAllocator
2121
// CHECK: 24 | class std::__uniq_ptr_impl<class sycl::detail::SYCLMemObjAllocator, struct std::default_delete<class sycl::detail::SYCLMemObjAllocator> >
2222
// CHECK-NEXT: 24 | class std::tuple<class sycl::detail::SYCLMemObjAllocator *, struct std::default_delete<class sycl::detail::SYCLMemObjAllocator> > _M_t
@@ -30,27 +30,27 @@ void foo(sycl::buffer<int, 2>) {}
3030
// CHECK-NEXT: 32 | class sycl::detail::PropertyListBase (base)
3131
// CHECK-NEXT: 32 | class std::bitset<32> MDataLessProps
3232
// CHECK-NEXT: 32 | struct std::_Base_bitset<1> (base)
33-
// CHECK-NEXT: 32 | std::_Base_bitset<1>::_WordT _M_w
33+
// CHECK-NEXT: 32 | _WordT _M_w
3434
// CHECK-NEXT: 40 | class std::vector<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > MPropsWithData
3535
// CHECK-NEXT: 40 | struct std::_Vector_base<class std::shared_ptr<class sycl::detail::PropertyWithDataBase>, class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > > (base)
3636
// CHECK-NEXT: 40 | struct std::_Vector_base<class std::shared_ptr<class sycl::detail::PropertyWithDataBase>, class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > >::_Vector_impl _M_impl
3737
// CHECK-NEXT: 40 | class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > (base) (empty)
3838
// CHECK-NEXT: 40 | class __gnu_cxx::new_allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > (base) (empty)
39-
// CHECK: 40 | std::_Vector_base<class std::shared_ptr<class sycl::detail::PropertyWithDataBase>, class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > >::pointer _M_start
40-
// CHECK-NEXT: 48 | std::_Vector_base<class std::shared_ptr<class sycl::detail::PropertyWithDataBase>, class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > >::pointer _M_finish
41-
// CHECK-NEXT: 56 | std::_Vector_base<class std::shared_ptr<class sycl::detail::PropertyWithDataBase>, class std::allocator<class std::shared_ptr<class sycl::detail::PropertyWithDataBase> > >::pointer _M_end_of_storage
39+
// CHECK: 40 | pointer _M_start
40+
// CHECK-NEXT: 48 | pointer _M_finish
41+
// CHECK-NEXT: 56 | pointer _M_end_of_storage
4242
// CHECK-NEXT: 64 | class std::shared_ptr<class sycl::detail::event_impl> MInteropEvent
4343
// CHECK-NEXT: 64 | class std::__shared_ptr<class sycl::detail::event_impl, __gnu_cxx::_S_atomic> (base)
4444
// CHECK-NEXT: 64 | class std::__shared_ptr_access<class sycl::detail::event_impl, __gnu_cxx::_S_atomic, false, false> (base) (empty)
45-
// CHECK-NEXT: 64 | std::__shared_ptr<class sycl::detail::event_impl, __gnu_cxx::_S_atomic>::element_type * _M_ptr
45+
// CHECK-NEXT: 64 | element_type * _M_ptr
4646
// CHECK-NEXT: 72 | class std::__shared_count<__gnu_cxx::_S_atomic> _M_refcount
47-
// CHECK-NEXT: 72 | _Sp_counted_base<(enum __gnu_cxx::_Lock_policy)2U> * _M_pi
47+
// CHECK-NEXT: 72 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
4848
// CHECK-NEXT: 80 | class std::shared_ptr<class sycl::detail::context_impl> MInteropContext
4949
// CHECK-NEXT: 80 | class std::__shared_ptr<class sycl::detail::context_impl, __gnu_cxx::_S_atomic> (base)
5050
// CHECK-NEXT: 80 | class std::__shared_ptr_access<class sycl::detail::context_impl, __gnu_cxx::_S_atomic, false, false> (base) (empty)
51-
// CHECK-NEXT: 80 | std::__shared_ptr<class sycl::detail::context_impl, __gnu_cxx::_S_atomic>::element_type * _M_ptr
51+
// CHECK-NEXT: 80 | element_type * _M_ptr
5252
// CHECK-NEXT: 88 | class std::__shared_count<__gnu_cxx::_S_atomic> _M_refcount
53-
// CHECK-NEXT: 88 | _Sp_counted_base<(enum __gnu_cxx::_Lock_policy)2U> * _M_pi
53+
// CHECK-NEXT: 88 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
5454
// CHECK-NEXT: 96 | RT::PiMem MInteropMemObject
5555
// CHECK-NEXT: 104 | _Bool MOpenCLInterop
5656
// CHECK-NEXT: 105 | _Bool MHostPtrReadOnly
@@ -68,24 +68,24 @@ void foo(sycl::buffer<int, 2>) {}
6868
// CHECK-NEXT: 136 | void (*)(void) _M_function_pointer
6969
// CHECK-NEXT: 136 | void (class std::_Undefined_class::*)(void) _M_member_pointer
7070
// CHECK-NEXT: 136 | char[16] _M_pod_data
71-
// CHECK-NEXT: 152 | std::_Function_base::_Manager_type _M_manager
72-
// CHECK-NEXT: 160 | std::function<void (void)>::_Invoker_type _M_invoker
71+
// CHECK-NEXT: 152 | _Manager_type _M_manager
72+
// CHECK-NEXT: 160 | _Invoker_type _M_invoker
7373
// CHECK-NEXT: 168 | class std::shared_ptr<const void> MSharedPtrStorage
7474
// CHECK-NEXT: 168 | class std::__shared_ptr<const void, __gnu_cxx::_S_atomic> (base)
7575
// CHECK-NEXT: 168 | class std::__shared_ptr_access<const void, __gnu_cxx::_S_atomic, false, true> (base) (empty)
76-
// CHECK-NEXT: 168 | std::__shared_ptr<const void, __gnu_cxx::_S_atomic>::element_type * _M_ptr
76+
// CHECK-NEXT: 168 | element_type * _M_ptr
7777
// CHECK-NEXT: 176 | class std::__shared_count<__gnu_cxx::_S_atomic> _M_refcount
78-
// CHECK-NEXT: 176 | _Sp_counted_base<(enum __gnu_cxx::_Lock_policy)2U> * _M_pi
78+
// CHECK-NEXT: 176 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
7979
// CHECK-NEXT: | [sizeof=184, dsize=184, align=8,
8080
// CHECK-NEXT: | nvsize=184, nvalign=8]
8181

8282
// CHECK: 0 | class sycl::buffer<int, 2, class sycl::detail::aligned_allocator<char>, void>
8383
// CHECK-NEXT: 0 | class std::shared_ptr<class sycl::detail::buffer_impl> impl
8484
// CHECK-NEXT: 0 | class std::__shared_ptr<class sycl::detail::buffer_impl, __gnu_cxx::_S_atomic> (base)
8585
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::buffer_impl, __gnu_cxx::_S_atomic, false, false> (base) (empty)
86-
// CHECK-NEXT: 0 | std::__shared_ptr<class sycl::detail::buffer_impl, __gnu_cxx::_S_atomic>::element_type * _M_ptr
86+
// CHECK-NEXT: 0 | element_type * _M_ptr
8787
// CHECK-NEXT: 8 | class std::__shared_count<__gnu_cxx::_S_atomic> _M_refcount
88-
// CHECK-NEXT: 8 | _Sp_counted_base<(enum __gnu_cxx::_Lock_policy)2U> * _M_pi
88+
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
8989
// CHECK-NEXT: 16 | class sycl::range<2> Range
9090
// CHECK-NEXT: 16 | class sycl::detail::array<2> (base)
9191
// CHECK-NEXT: 16 | size_t[2] common_array

0 commit comments

Comments
 (0)