Re-order local and global id in the assert format string

Signed-off-by: Andrew Savonichev <[email protected]>

Author: Andrew Savonichev

sycl/doc/extensions/C-CXX-StandardLibrary/DeviceLibExtensions.rst

@@ -31,4 +31,4 @@ Arguments:
 
 Example of a message:
 .. code:
-   foo.cpp:42: void foo(int): local id: [0,0,0], global id: [0,0,0] Assertion `buf[wiID] == 0 && "Invalid value"` failed.
+   foo.cpp:42: void foo(int): global id: [0,0,0], local id: [0,0,0] Assertion `buf[wiID] == 0 && "Invalid value"` failed.

sycl/source/detail/devicelib/fallback-cassert.cpp

@@ -13,7 +13,7 @@ int __spirv_ocl_printf(const __attribute__((opencl_constant)) char *fmt, ...)
     __attribute__((format(printf, 1, 2)));
 
 static const __attribute__((opencl_constant)) char assert_fmt[] =
-    "%s:%d: %s: local id: [%lu,%lu,%lu], global id: [%lu,%lu,%lu] "
+    "%s:%d: %s: global id: [%lu,%lu,%lu], local id: [%lu,%lu,%lu] "
     "Assertion `%s` failed.\n";
 
 SYCL_EXTERNAL

sycl/test/devicelib/assert-windows.cpp

@@ -16,7 +16,7 @@
 //
 // RUN: env SYCL_PI_TRACE=1 SYCL_DEVICELIB_INHIBIT_NATIVE=1 SYCL_DEVICE_TYPE=CPU %t.out >%t.stdout.fallback 2>%t.stderr.fallback
 // RUN: FileCheck %s --check-prefix=CHECK-MESSAGE --input-file %t.stdout.fallback
-// CHECK-MESSAGE: {{.*}}assert-windows.cpp:{{[0-9]+}}: (null): local id: [{{[0-3]}},0,0], global id: [{{[0-3]}},0,0] Assertion `accessorC[wiID] == 0 && "Invalid value"` failed.
+// CHECK-MESSAGE: {{.*}}assert-windows.cpp:{{[0-9]+}}: (null): global id: [{{[0-3]}},0,0], local id: [{{[0-3]}},0,0] Assertion `accessorC[wiID] == 0 && "Invalid value"` failed.
 //
 // RUN: FileCheck %s --input-file %t.stdout.fallback --check-prefix=CHECK-FALLBACK
 // CHECK-FALLBACK: ---> piProgramLink

sycl/test/devicelib/assert.cpp

@@ -87,7 +87,7 @@
 // native modes (fallback prints to stdout, while native prints to stderr; we
 // already handled this difference in the RUN lines):
 //
-// CHECK-MESSAGE: {{.*}}assert.cpp:{{[0-9]+}}: auto simple_vadd(const std::array<int, 3UL> &, const std::array<int, 3UL> &, std::array<int, 3UL> &)::(anonymous class)::operator()(cl::sycl::handler &)::(anonymous class)::operator()(cl::sycl::id<1>) const: local id: [{{[0-3]}},0,0], global id: [{{[0-3]}},0,0] Assertion `accessorC[wiID] == 0 && "Invalid value"` failed.
+// CHECK-MESSAGE: {{.*}}assert.cpp:{{[0-9]+}}: auto simple_vadd(const std::array<int, 3UL> &, const std::array<int, 3UL> &, std::array<int, 3UL> &)::(anonymous class)::operator()(cl::sycl::handler &)::(anonymous class)::operator()(cl::sycl::id<1>) const: global id: [{{[0-3]}},0,0], local id: [{{[0-3]}},0,0] Assertion `accessorC[wiID] == 0 && "Invalid value"` failed.
 //
 // Note that the work-item that hits the assert first may vary, since the order
 // of execution is undefined. We catch only the first one (whatever id it is).