Skip to content

Commit aa38180

Browse files
aelovikov-intelaelovikov-intel
committed
[SYCL] Update abi/layout* tests
Dumps have changed after llvm/llvm-project#133610
1 parent 31138ec commit aa38180

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

‎sycl/test/abi/layout_accessors_host.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void hostAcc(accessor<int, 1, access::mode::read, access::target::host_buffer> A
2424
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic> (base) (empty)
2525
// CHECK-NEXT: 0 | element_type * _M_ptr
2626
// CHECK-NEXT: 8 | class std::__shared_count<> _M_refcount
27-
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
27+
// CHECK-NEXT: 8 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
2828
// 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)
2929
// CHECK-NEXT: 0 | class sycl::detail::OwnerLessBase<class sycl::accessor<int, 1, sycl::access::mode::read, sycl::access::target::host_buffer> > (base) (empty)
3030
// CHECK-NEXT: 16 | detail::AccHostDataT * MAccData
@@ -47,7 +47,7 @@ void hostAcc(accessor<int, 1, access::mode::read, access::target::global_buffer>
4747
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic> (base) (empty)
4848
// CHECK-NEXT: 0 | element_type * _M_ptr
4949
// CHECK-NEXT: 8 | class std::__shared_count<> _M_refcount
50-
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
50+
// CHECK-NEXT: 8 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
5151
// 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)
5252
// CHECK-NEXT: 0 | class sycl::detail::OwnerLessBase<class sycl::accessor<int, 1, sycl::access::mode::read, sycl::access::target::global_buffer> > (base) (empty)
5353
// CHECK-NEXT: 16 | detail::AccHostDataT * MAccData
@@ -71,7 +71,7 @@ void hostAcc(accessor<int, 1, access::mode::read_write, access::target::local> A
7171
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::LocalAccessorImplHost, __gnu_cxx::_S_atomic> (base) (empty)
7272
// CHECK-NEXT: 0 | element_type * _M_ptr
7373
// CHECK-NEXT: 8 | class std::__shared_count<> _M_refcount
74-
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
74+
// CHECK-NEXT: 8 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
7575
// 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)
7676
// CHECK-NEXT: 16 | char[16] padding
7777
// CHECK-NEXT: 0 | class sycl::detail::OwnerLessBase<class sycl::accessor<int, 1, sycl::access::mode::read_write, sycl::access::target::local> > (base) (empty)
@@ -90,7 +90,7 @@ void hostAcc(local_accessor<int, 1> Acc) {
9090
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::LocalAccessorImplHost, __gnu_cxx::_S_atomic> (base) (empty)
9191
// CHECK-NEXT: 0 | element_type * _M_ptr
9292
// CHECK-NEXT: 8 | class std::__shared_count<> _M_refcount
93-
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
93+
// CHECK-NEXT: 8 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
9494
// 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)
9595
// CHECK-NEXT: 16 | char[16] padding
9696
// CHECK-NEXT: 0 | class sycl::detail::OwnerLessBase<class sycl::local_accessor<int> > (base) (empty)
@@ -112,7 +112,7 @@ void hostAcc(accessor<int4, 1, access::mode::read_write, access::target::host_im
112112
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic> (base) (empty)
113113
// CHECK-NEXT: 0 | element_type * _M_ptr
114114
// CHECK-NEXT: 8 | class std::__shared_count<> _M_refcount
115-
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
115+
// CHECK-NEXT: 8 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
116116
// CHECK-NEXT: 16 | size_t MImageCount
117117
// CHECK-NEXT: 24 | image_channel_order MImgChannelOrder
118118
// CHECK-NEXT: 28 | image_channel_type MImgChannelType
@@ -135,7 +135,7 @@ void hostAcc(accessor<int4, 1, access::mode::read, access::target::image> Acc) {
135135
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::AccessorImplHost, __gnu_cxx::_S_atomic> (base) (empty)
136136
// CHECK-NEXT: 0 | element_type * _M_ptr
137137
// CHECK-NEXT: 8 | class std::__shared_count<> _M_refcount
138-
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
138+
// CHECK-NEXT: 8 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
139139
// CHECK-NEXT: 16 | size_t MImageCount
140140
// CHECK-NEXT: 24 | image_channel_order MImgChannelOrder
141141
// CHECK-NEXT: 28 | image_channel_type MImgChannelType

‎sycl/test/abi/layout_buffer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void foo(sycl::buffer<int, 2>) {}
1515
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::buffer_impl, __gnu_cxx::_S_atomic> (base) (empty)
1616
// CHECK-NEXT: 0 | element_type * _M_ptr
1717
// CHECK-NEXT: 8 | class std::__shared_count<> _M_refcount
18-
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
18+
// CHECK-NEXT: 8 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
1919
// CHECK-NEXT: 0 | class sycl::detail::OwnerLessBase<class sycl::buffer<int, 2> > (base) (empty)
2020
// CHECK-NEXT: 16 | class sycl::range<2> Range
2121
// CHECK-NEXT: 16 | class sycl::detail::array<2> (base)

‎sycl/test/abi/layout_exception.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ void foo() {
1919
// CHECK-NEXT: 8 | class std::__shared_ptr_access<class sycl::detail::string, __gnu_cxx::_S_atomic> (base) (empty)
2020
// CHECK-NEXT: 8 | element_type * _M_ptr
2121
// CHECK-NEXT: 16 | class std::__shared_count<> _M_refcount
22-
// CHECK-NEXT: 16 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
22+
// CHECK-NEXT: 16 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
2323
// CHECK-NEXT: 24 | int32_t MErr
2424
// CHECK-NEXT: 32 | class std::shared_ptr<class sycl::context> MContext
2525
// CHECK-NEXT: 32 | class std::__shared_ptr<class sycl::context> (base)
2626
// CHECK-NEXT: 32 | class std::__shared_ptr_access<class sycl::context, __gnu_cxx::_S_atomic> (base) (empty)
2727
// CHECK-NEXT: 32 | element_type * _M_ptr
2828
// CHECK-NEXT: 40 | class std::__shared_count<> _M_refcount
29-
// CHECK-NEXT: 40 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
29+
// CHECK-NEXT: 40 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
3030
// CHECK-NEXT: 48 | {{class|struct}} std::error_code MErrC
3131
// CHECK-NEXT: 48 | int _M_value
3232
// CHECK-NEXT: 56 | const error_category * _M_cat

‎sycl/test/abi/layout_handler.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ void foo() {
1919
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::handler_impl, __gnu_cxx::_S_atomic> (base) (empty)
2020
// CHECK-NEXT: 0 | element_type * _M_ptr
2121
// CHECK-NEXT: 8 | class std::__shared_count<> _M_refcount
22-
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
22+
// CHECK-NEXT: 8 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
2323
// CHECK-NEXT: 16 | class std::shared_ptr<class sycl::detail::queue_impl> MQueue
2424
// CHECK-NEXT: 16 | class std::__shared_ptr<class sycl::detail::queue_impl> (base)
2525
// CHECK-NEXT: 16 | class std::__shared_ptr_access<class sycl::detail::queue_impl, __gnu_cxx::_S_atomic> (base) (empty)
2626
// CHECK-NEXT: 16 | element_type * _M_ptr
2727
// CHECK-NEXT: 24 | class std::__shared_count<> _M_refcount
28-
// CHECK-NEXT: 24 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
28+
// CHECK-NEXT: 24 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
2929
// CHECK-NEXT: 32 | class std::vector<class std::shared_ptr<class sycl::detail::LocalAccessorImplHost> > MLocalAccStorage
3030
// CHECK-NEXT: 32 | struct std::_Vector_base<class std::shared_ptr<class sycl::detail::LocalAccessorImplHost>, class std::allocator<class std::shared_ptr<class sycl::detail::LocalAccessorImplHost> > > (base)
3131
// CHECK-NEXT: 32 | 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
@@ -47,7 +47,7 @@ void foo() {
4747
// CHECK-NEXT: 88 | class std::__shared_ptr_access<class sycl::detail::kernel_impl, __gnu_cxx::_S_atomic> (base) (empty)
4848
// CHECK-NEXT: 88 | element_type * _M_ptr
4949
// CHECK-NEXT: 96 | class std::__shared_count<> _M_refcount
50-
// CHECK-NEXT: 96 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
50+
// CHECK-NEXT: 96 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
5151
// CHECK-NEXT: 104 | void * MSrcPtr
5252
// CHECK-NEXT: 112 | void * MDstPtr
5353
// CHECK-NEXT: 120 | size_t MLength
@@ -78,6 +78,6 @@ void foo() {
7878
// CHECK-NEXT: 200 | class std::__shared_ptr_access<class sycl::detail::event_impl, __gnu_cxx::_S_atomic> (base) (empty)
7979
// CHECK-NEXT: 200 | element_type * _M_ptr
8080
// CHECK-NEXT: 208 | class std::__shared_count<> _M_refcount
81-
// CHECK-NEXT: 208 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
81+
// CHECK-NEXT: 208 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
8282
// CHECK-NEXT: | [sizeof=216, dsize=216, align=8,
8383
// CHECK-NEXT: | nvsize=216, nvalign=8]

‎sycl/test/abi/layout_image.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ sycl::image<2> Img1{sycl::image_channel_order::rgba, sycl::image_channel_type::f
1717
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::image_impl, __gnu_cxx::_S_atomic> (base) (empty)
1818
// CHECK-NEXT: 0 | element_type * _M_ptr
1919
// CHECK-NEXT: 8 | class std::__shared_count<> _M_refcount
20-
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
20+
// CHECK-NEXT: 8 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
2121
// CHECK-NEXT: | [sizeof=16, dsize=16, align=8,
2222
// CHECK-NEXT: | nvsize=16, nvalign=8]
2323

@@ -32,7 +32,7 @@ sycl::unsampled_image<2> Img2{sycl::image_format::r16b16g16a16_sfloat, sycl::ran
3232
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::image_impl, __gnu_cxx::_S_atomic> (base) (empty)
3333
// CHECK-NEXT: 0 | element_type * _M_ptr
3434
// CHECK-NEXT: 8 | class std::__shared_count<> _M_refcount
35-
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
35+
// CHECK-NEXT: 8 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
3636
// CHECK-NEXT: 0 | class sycl::detail::OwnerLessBase<class sycl::unsampled_image<2> > (base) (empty)
3737
// CHECK-NEXT: | [sizeof=16, dsize=16, align=8,
3838
// CHECK-NEXT: | nvsize=16, nvalign=8]
@@ -53,7 +53,7 @@ sycl::sampled_image<2> Img3{Data, sycl::image_format::r16b16g16a16_sfloat, Sampl
5353
// CHECK-NEXT: 0 | class std::__shared_ptr_access<class sycl::detail::image_impl, __gnu_cxx::_S_atomic> (base) (empty)
5454
// CHECK-NEXT: 0 | element_type * _M_ptr
5555
// CHECK-NEXT: 8 | class std::__shared_count<> _M_refcount
56-
// CHECK-NEXT: 8 | _Sp_counted_base<(_Lock_policy)2U> * _M_pi
56+
// CHECK-NEXT: 8 | _Sp_counted_base<(__gnu_cxx::_Lock_policy)2U> * _M_pi
5757
// CHECK-NEXT: 0 | class sycl::detail::OwnerLessBase<class sycl::sampled_image<2> > (base) (empty)
5858
// CHECK-NEXT: | [sizeof=16, dsize=16, align=8,
5959
// CHECK-NEXT: | nvsize=16, nvalign=8]

0 commit comments

Comments
 (0)