diff --git a/sycl/test/abi/sycl_classes_abi_neutral_test.cpp b/sycl/test/abi/sycl_classes_abi_neutral_test.cpp
index 403966df67455..676b368485e4a 100644
--- a/sycl/test/abi/sycl_classes_abi_neutral_test.cpp
+++ b/sycl/test/abi/sycl_classes_abi_neutral_test.cpp
@@ -1,5 +1,5 @@
-// RUN: %clangxx -std=c++17 -I %sycl_include -I %sycl_include/sycl -fsycl-device-only -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s -o %t.out | grep -Pzo "0 \| class sycl::.*\n([^\n].*\n)*" | FileCheck %s
-// RUN: %clangxx -std=c++17 -I %sycl_include -I %sycl_include/sycl -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s -o %t.out | grep -Pzo "0 \| class sycl::.*\n([^\n].*\n)*" | FileCheck %s
+// RUN: %clangxx -std=c++17 -I %sycl_include -I %sycl_include/sycl -fsycl-device-only -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s -o %t.out | grep -Pzo "0 \| class sycl::.*\n([^\n].*\n)*" | sort -z | FileCheck %s
+// RUN: %clangxx -std=c++17 -I %sycl_include -I %sycl_include/sycl -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s -o %t.out | grep -Pzo "0 \| class sycl::.*\n([^\n].*\n)*" | sort -z | FileCheck %s
 // REQUIRES: linux
 // UNSUPPORTED: libcxx
 
@@ -26,7 +26,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |     union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGExecKernel
+
+// CHECK: 0 | class sycl::detail::CGAdviseUSM
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -39,13 +40,9 @@
 // CHECK-NEXT:       168 |       struct std::basic_string<char>::_Alloc_hider _M_dataplus
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
-// CHECK-NOT:  {{^0}} | class
-// CHECK:       408 |   class std::basic_string<char> MKernelName
-// CHECK-NEXT:       408 |     struct std::basic_string<char>::_Alloc_hider _M_dataplus
-// CHECK-NOT:  {{^0}} | class
-// CHECK:       424 |     union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGCopy
+
+// CHECK: 0 | class sycl::detail::CGBarrier
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -59,7 +56,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGFill
+
+// CHECK: 0 | class sycl::detail::CGCopy
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -73,7 +71,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGUpdateHost
+
+// CHECK: 0 | class sycl::detail::CGCopy2DUSM
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -87,7 +86,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGCopyUSM
+
+// CHECK: 0 | class sycl::detail::CGCopyFromDeviceGlobal
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -101,7 +101,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGFillUSM
+
+// CHECK: 0 | class sycl::detail::CGCopyImage
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -115,7 +116,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGPrefetchUSM
+
+// CHECK: 0 | class sycl::detail::CGCopyToDeviceGlobal
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -129,7 +131,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGAdviseUSM
+
+// CHECK: 0 | class sycl::detail::CGCopyUSM
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -143,7 +146,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGBarrier
+
+// CHECK: 0 | class sycl::detail::CGExecCommandBuffer
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -157,7 +161,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGProfilingTag
+
+// CHECK: 0 | class sycl::detail::CGExecKernel
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -170,8 +175,14 @@
 // CHECK-NEXT:       168 |       struct std::basic_string<char>::_Alloc_hider _M_dataplus
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
+// CHECK-NOT:  {{^0}} | class
+// CHECK:       408 |   class std::basic_string<char> MKernelName
+// CHECK-NEXT:       408 |     struct std::basic_string<char>::_Alloc_hider _M_dataplus
+// CHECK-NOT:  {{^0}} | class
+// CHECK:       424 |     union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGCopy2DUSM
+
+// CHECK: 0 | class sycl::detail::CGFill
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -185,6 +196,7 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
+
 // CHECK: 0 | class sycl::detail::CGFill2DUSM
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
@@ -199,7 +211,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGMemset2DUSM
+
+// CHECK: 0 | class sycl::detail::CGFillUSM
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -213,7 +226,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGReadWriteHostPipe
+
+// CHECK: 0 | class sycl::detail::CGHostTask
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -226,12 +240,9 @@
 // CHECK-NEXT:       168 |       struct std::basic_string<char>::_Alloc_hider _M_dataplus
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
-// CHECK-NOT:  {{^0}} | class
-// CHECK:       208 |   class std::basic_string<char> PipeName
-// CHECK-NOT:  {{^0}} | class
-// CHECK:       224 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGCopyToDeviceGlobal
+
+// CHECK: 0 | class sycl::detail::CGMemset2DUSM
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -245,7 +256,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGCopyFromDeviceGlobal
+
+// CHECK: 0 | class sycl::detail::CGPrefetchUSM
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -259,7 +271,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGCopyImage
+
+// CHECK: 0 | class sycl::detail::CGProfilingTag
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -273,7 +286,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGSemaphoreWait
+
+// CHECK: 0 | class sycl::detail::CGReadWriteHostPipe
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -286,7 +300,12 @@
 // CHECK-NEXT:       168 |       struct std::basic_string<char>::_Alloc_hider _M_dataplus
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
+// CHECK-NOT:  {{^0}} | class
+// CHECK:       208 |   class std::basic_string<char> PipeName
+// CHECK-NOT:  {{^0}} | class
+// CHECK:       224 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
+
 // CHECK: 0 | class sycl::detail::CGSemaphoreSignal
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
@@ -301,7 +320,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGExecCommandBuffer
+
+// CHECK: 0 | class sycl::detail::CGSemaphoreWait
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class
@@ -315,7 +335,8 @@
 // CHECK-NOT:  {{^0}} | class
 // CHECK:       184 |       union std::basic_string<char>::(anonymous at
 // CHECK-NOT: {{std::basic_string|std::list}}
-// CHECK: 0 | class sycl::detail::CGHostTask
+
+// CHECK: 0 | class sycl::detail::CGUpdateHost
 // CHECK-NEXT:         0 |   class sycl::detail::CG (primary base)
 // CHECK-NEXT:         0 |     (CG vtable pointer)
 // CHECK-NOT:  {{^0}} | class