Skip to content

[SYCL][NFC] Fix failing post-commit tests #2802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 20, 2020
Merged

[SYCL][NFC] Fix failing post-commit tests #2802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2727052
[SYCL][NFC] Fix failing post-commit tests
Nov 20, 2020
1af0abe
Disable formatting checks for handler test
Nov 20, 2020
bcd360e
Only disable formatting for CHECK directives
Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sycl/test/abi/layout_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void foo(sycl::buffer<int, 2>) {}
// CHECK-NEXT: 16 | class std::__shared_count<__gnu_cxx::_S_atomic> _M_refcount
// CHECK-NEXT: 16 | _Sp_counted_base<(enum __gnu_cxx::_Lock_policy)2U> * _M_pi
// CHECK-NEXT: 24 | class std::unique_ptr<class sycl::detail::SYCLMemObjAllocator> MAllocator
// CHECK: 24 | class std::__uniq_ptr_impl<class sycl::detail::SYCLMemObjAllocator, struct std::default_delete<class sycl::detail::SYCLMemObjAllocator> > _M_t
// CHECK: 24 | class std::__uniq_ptr_impl<class sycl::detail::SYCLMemObjAllocator, struct std::default_delete<class sycl::detail::SYCLMemObjAllocator> >
// CHECK-NEXT: 24 | class std::tuple<class sycl::detail::SYCLMemObjAllocator *, struct std::default_delete<class sycl::detail::SYCLMemObjAllocator> > _M_t
// CHECK-NEXT: 24 | struct std::_Tuple_impl<0, class sycl::detail::SYCLMemObjAllocator *, struct std::default_delete<class sycl::detail::SYCLMemObjAllocator> > (base)
// CHECK-NEXT: 24 | struct std::_Tuple_impl<1, struct std::default_delete<class sycl::detail::SYCLMemObjAllocator> > (base) (empty)
Expand Down
10 changes: 6 additions & 4 deletions sycl/test/abi/layout_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ void foo() {
});
}

// clang-format off

// The order of field declarations and their types are important.

// CHECK: 0 | class sycl::handler
Expand Down Expand Up @@ -104,7 +106,7 @@ void foo() {
// CHECK-NEXT: 312 | class __gnu_cxx::new_allocator<char> (base) (empty)
// CHECK-NEXT: 312 | std::basic_string<char>::pointer _M_p
// CHECK-NEXT: 320 | std::basic_string<char>::size_type _M_string_length
// CHECK-NEXT: 328 | union std::basic_string<char>::(anonymous at /usr/lib/gcc/x86_64-linux-gnu/7.4.0/../../../../include/c++/7.4.0/bits/basic_string.h:160:7)
// CHECK-NEXT: 328 | union std::basic_string<char>::(anonymous at {{.*}})
// CHECK-NEXT: 328 | char [16] _M_local_buf
// CHECK-NEXT: 328 | std::basic_string<char>::size_type _M_allocated_capacity
// CHECK-NEXT: 344 | class std::shared_ptr<class sycl::detail::kernel_impl> MKernel
Expand All @@ -126,7 +128,7 @@ void foo() {
// CHECK-NEXT: 400 | std::_Vector_base<char, class std::allocator<char> >::pointer _M_finish
// CHECK-NEXT: 408 | std::_Vector_base<char, class std::allocator<char> >::pointer _M_end_of_storage
// CHECK-NEXT: 416 | class std::unique_ptr<class sycl::detail::HostKernelBase> MHostKernel
// CHECK: 416 | class std::__uniq_ptr_impl<class sycl::detail::HostKernelBase, struct std::default_delete<class sycl::detail::HostKernelBase> > _M_t
// CHECK: 416 | class std::__uniq_ptr_impl<class sycl::detail::HostKernelBase, struct std::default_delete<class sycl::detail::HostKernelBase> >
// CHECK-NEXT: 416 | class std::tuple<class sycl::detail::HostKernelBase *, struct std::default_delete<class sycl::detail::HostKernelBase> > _M_t
// CHECK-NEXT: 416 | struct std::_Tuple_impl<0, class sycl::detail::HostKernelBase *, struct std::default_delete<class sycl::detail::HostKernelBase> > (base)
// CHECK-NEXT: 416 | struct std::_Tuple_impl<1, struct std::default_delete<class sycl::detail::HostKernelBase> > (base) (empty)
Expand All @@ -135,7 +137,7 @@ void foo() {
// CHECK-NEXT: 416 | struct std::_Head_base<0, class sycl::detail::HostKernelBase *, false> (base)
// CHECK-NEXT: 416 | class sycl::detail::HostKernelBase * _M_head_impl
// CHECK-NEXT: 424 | class std::unique_ptr<class sycl::detail::HostTask> MHostTask
// CHECK: 424 | class std::__uniq_ptr_impl<class sycl::detail::HostTask, struct std::default_delete<class sycl::detail::HostTask> > _M_t
// CHECK: 424 | class std::__uniq_ptr_impl<class sycl::detail::HostTask, struct std::default_delete<class sycl::detail::HostTask> >
// CHECK-NEXT: 424 | class std::tuple<class sycl::detail::HostTask *, struct std::default_delete<class sycl::detail::HostTask> > _M_t
// CHECK-NEXT: 424 | struct std::_Tuple_impl<0, class sycl::detail::HostTask *, struct std::default_delete<class sycl::detail::HostTask> > (base)
// CHECK-NEXT: 424 | struct std::_Tuple_impl<1, struct std::default_delete<class sycl::detail::HostTask> > (base) (empty)
Expand All @@ -145,7 +147,7 @@ void foo() {
// CHECK-NEXT: 424 | class sycl::detail::HostTask * _M_head_impl
// CHECK-NEXT: 432 | detail::OSModuleHandle MOSModuleHandle
// CHECK-NEXT: 440 | class std::unique_ptr<class sycl::detail::InteropTask> MInteropTask
// CHECK: 440 | class std::__uniq_ptr_impl<class sycl::detail::InteropTask, struct std::default_delete<class sycl::detail::InteropTask> > _M_t
// CHECK: 440 | class std::__uniq_ptr_impl<class sycl::detail::InteropTask, struct std::default_delete<class sycl::detail::InteropTask> >
// CHECK-NEXT: 440 | class std::tuple<class sycl::detail::InteropTask *, struct std::default_delete<class sycl::detail::InteropTask> > _M_t
// CHECK-NEXT: 440 | struct std::_Tuple_impl<0, class sycl::detail::InteropTask *, struct std::default_delete<class sycl::detail::InteropTask> > (base)
// CHECK-NEXT: 440 | struct std::_Tuple_impl<1, struct std::default_delete<class sycl::detail::InteropTask> > (base) (empty)
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/abi/layout_image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ sycl::image<2> Img{sycl::image_channel_order::rgba, sycl::image_channel_type::fp
// CHECK-NEXT: 16 | class std::__shared_count<__gnu_cxx::_S_atomic> _M_refcount
// CHECK-NEXT: 16 | _Sp_counted_base<(enum __gnu_cxx::_Lock_policy)2U> * _M_pi
// CHECK-NEXT: 24 | class std::unique_ptr<class sycl::detail::SYCLMemObjAllocator> MAllocator
// CHECK: 24 | class std::__uniq_ptr_impl<class sycl::detail::SYCLMemObjAllocator, struct std::default_delete<class sycl::detail::SYCLMemObjAllocator> > _M_t
// CHECK: 24 | class std::__uniq_ptr_impl<class sycl::detail::SYCLMemObjAllocator, struct std::default_delete<class sycl::detail::SYCLMemObjAllocator> >
// CHECK-NEXT: 24 | class std::tuple<class sycl::detail::SYCLMemObjAllocator *, struct std::default_delete<class sycl::detail::SYCLMemObjAllocator> > _M_t
// CHECK-NEXT: 24 | struct std::_Tuple_impl<0, class sycl::detail::SYCLMemObjAllocator *, struct std::default_delete<class sycl::detail::SYCLMemObjAllocator> > (base)
// CHECK-NEXT: 24 | struct std::_Tuple_impl<1, struct std::default_delete<class sycl::detail::SYCLMemObjAllocator> > (base) (empty)
Expand Down