From f440d18fce935426bf8acb858295525a30923459 Mon Sep 17 00:00:00 2001 From: Wenju He Date: Tue, 7 Jul 2026 02:53:30 -0700 Subject: [PATCH 1/2] [SYCL][Test] Relax check in layout_handler.cpp to pass on RHEL 8.8 `struct std::__uniq_ptr_data` line isn't present on el88 with gcc 8.5. CMPLRLLVM-76646 --- sycl/test/abi/layout_handler.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sycl/test/abi/layout_handler.cpp b/sycl/test/abi/layout_handler.cpp index cfedce4277a31..f063cc332420e 100644 --- a/sycl/test/abi/layout_handler.cpp +++ b/sycl/test/abi/layout_handler.cpp @@ -14,8 +14,7 @@ void foo() { // The order of field declarations and their types are important. // CHECK: 0 | class sycl::handler // CHECK-NEXT: 0 | class std::unique_ptr implOwner -// CHECK-NEXT: 0 | struct std::__uniq_ptr_data > -// CHECK-NEXT: 0 | class std::__uniq_ptr_impl > (base) +// CHECK-NEXT: 0 | class std::__uniq_ptr_impl > // CHECK-NEXT: 0 | class std::tuple > // CHECK-NEXT: 0 | struct std::_Tuple_impl<0, class sycl::detail::handler_impl *, struct std::default_delete > (base) // CHECK-NEXT: 0 | struct std::_Tuple_impl<1, struct std::default_delete > (base) (empty) @@ -56,8 +55,7 @@ void foo() { // CHECK-NEXT: 128 | pointer _M_finish // CHECK-NEXT: 136 | pointer _M_end_of_storage // CHECK-NEXT: 144 | class std::unique_ptr MHostKernel -// CHECK-NEXT: 144 | struct std::__uniq_ptr_data > -// CHECK: 144 | class std::__uniq_ptr_impl > (base) +// CHECK: 144 | class std::__uniq_ptr_impl > // CHECK-NEXT: 144 | class std::tuple > // CHECK-NEXT: 144 | struct std::_Tuple_impl<0, class sycl::detail::HostKernelBase *, struct std::default_delete > (base) // CHECK-NEXT: 144 | struct std::_Tuple_impl<1, struct std::default_delete > (base) (empty) From 11c9dc2d8c36e43d08cdf5c1cdf4307792481858 Mon Sep 17 00:00:00 2001 From: Wenju He Date: Tue, 7 Jul 2026 12:18:35 +0200 Subject: [PATCH 2/2] remove NEXT --- sycl/test/abi/layout_handler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/test/abi/layout_handler.cpp b/sycl/test/abi/layout_handler.cpp index f063cc332420e..e4fe5088e3629 100644 --- a/sycl/test/abi/layout_handler.cpp +++ b/sycl/test/abi/layout_handler.cpp @@ -14,7 +14,7 @@ void foo() { // The order of field declarations and their types are important. // CHECK: 0 | class sycl::handler // CHECK-NEXT: 0 | class std::unique_ptr implOwner -// CHECK-NEXT: 0 | class std::__uniq_ptr_impl > +// CHECK: 0 | class std::__uniq_ptr_impl > // CHECK-NEXT: 0 | class std::tuple > // CHECK-NEXT: 0 | struct std::_Tuple_impl<0, class sycl::detail::handler_impl *, struct std::default_delete > (base) // CHECK-NEXT: 0 | struct std::_Tuple_impl<1, struct std::default_delete > (base) (empty) @@ -68,4 +68,4 @@ void foo() { // CHECK-NEXT: 172 | uint32_t MColumnNo // CHECK-NEXT: | [sizeof=176, dsize=176, align=8, // CHECK-NEXT: | nvsize=176, nvalign=8] -// clang-format on \ No newline at end of file +// clang-format on