[SYCL] Improve error handling for max_num_work_groups launch query test

Author: Georgi Mirazchiyski

sycl/test-e2e/Basic/launch_queries/max_num_work_groups.cpp

@@ -1,16 +1,14 @@
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 
-#include <sycl/detail/core.hpp>
-
+#include <algorithm>
 #include <cassert>
 #include <cstdint>
 
-namespace syclex = sycl::ext::oneapi::experimental;
-using namespace sycl::info::device;
-using namespace sycl::info::kernel_device_specific;
+#include <sycl/detail/core.hpp>
 
 using value_type = int64_t;
+static constexpr value_type TestValue{42};
 
 namespace kernels {
 
@@ -27,7 +25,7 @@ class TestKernel {
 
   void operator()(sycl::nd_item<1> item) const {
     const auto gtid = item.get_global_linear_id();
-    acc_[gtid] = gtid + 42;
+    acc_[gtid] = gtid + TestValue;
   }
 
 private:
@@ -46,7 +44,7 @@ class TestLocalMemoryKernel {
     const auto ltid = item.get_local_linear_id();
     const auto gtid = item.get_global_linear_id();
     if (ltid < loc_acc_.size()) {
-      loc_acc_[ltid] = ltid + 42;
+      loc_acc_[ltid] = ltid + TestValue;
       item.barrier(sycl::access::fence_space::local_space);
       acc_[gtid] = loc_acc_[ltid];
     } else {
@@ -65,6 +63,10 @@ namespace {
 
 template <class KernelName>
 int test_max_num_work_groups(sycl::queue &q, const sycl::device &dev) {
+  using namespace sycl::info::device;
+  using namespace sycl::info::kernel_device_specific;
+  namespace syclex = sycl::ext::oneapi::experimental;
+
   const auto ctx = q.get_context();
   auto bundle = sycl::get_kernel_bundle<sycl::bundle_state::executable>(ctx);
   auto kernel = bundle.template get_kernel<KernelName>();
@@ -115,7 +117,7 @@ int test_max_num_work_groups(sycl::queue &q, const sycl::device &dev) {
        cgh.parallel_for(launch_range, KernelName{acc});
      }
    }).wait();
-  assert(sycl::host_accessor{buf}[0] == 42);
+  assert(sycl::host_accessor{buf}[0] == TestValue);
 
   // ========================== //
   // Test 3 - use max resources //
@@ -147,7 +149,7 @@ int test_max_num_work_groups(sycl::queue &q, const sycl::device &dev) {
        cgh.parallel_for(launch_range, KernelName{acc});
      }
    }).wait();
-  assert(sycl::host_accessor{buf}[0] == 42);
+  assert(sycl::host_accessor{buf}[0] == TestValue);
 
   // =============================== //
   // Test 4 - exceed resource limits //
@@ -187,7 +189,12 @@ int test_max_num_work_groups(sycl::queue &q, const sycl::device &dev) {
        } else {
          cgh.parallel_for(launch_range, KernelName{acc});
        }
-     }).wait();
+     }).wait_and_throw();
+    if constexpr (KernelName::HasLocalMemory)
+      std::cerr << "Test (LocalMemory) with exceeded resource limits failed\n";
+    else
+      std::cerr << "Test with exceed resource limits failed\n";
+    return 1; // We shouldn't be here, exception is expected
   } catch (const sycl::exception &e) {
     // 'nd_range' error is the expected outcome from the above launch config.
     if (e.code() == sycl::make_error_code(sycl::errc::nd_range)) {
@@ -204,13 +211,14 @@ int test_max_num_work_groups(sycl::queue &q, const sycl::device &dev) {
 } // namespace
 
 int main() {
-  sycl::queue q{};
+  auto asynch = [](sycl::exception_list el) {
+    std::for_each(el.begin(), el.end(), std::rethrow_exception);
+  };
+  sycl::queue q{asynch};
   sycl::device dev = q.get_device();
 
-  using namespace kernels;
-
   int ret{0};
-  ret &= test_max_num_work_groups<TestKernel>(q, dev);
-  ret &= test_max_num_work_groups<TestLocalMemoryKernel>(q, dev);
+  ret |= test_max_num_work_groups<kernels::TestKernel>(q, dev);
+  ret |= test_max_num_work_groups<kernels::TestLocalMemoryKernel>(q, dev);
   return ret;
 }