Simplify new_kernel_name implementation in tests

test/support/test_dynamic_load_utils.h

@@ -18,20 +18,13 @@
 #include <algorithm>
 #include <iostream>
 
+#include "support/utils_sycl_defs.h" // for TestUtils::unique_kernel_name and etc.
+
 #if TEST_DYNAMIC_SELECTION_AVAILABLE
 
 class load1;
 class load2;
 
-namespace TestUtils
-{
-template <typename Op, ::std::size_t CallNumber>
-struct unique_kernel_name;
-
-template <typename Policy, int idx>
-using new_kernel_name = unique_kernel_name<std::decay_t<Policy>, idx>;
-} // namespace TestUtils
-
 int
 test_dl_initialization(const std::vector<sycl::queue>& u)
 {

test/support/test_dynamic_selection_utils.h

@@ -15,16 +15,9 @@
 #include <random>
 #include <algorithm>
 #include <iostream>
-#if TEST_DYNAMIC_SELECTION_AVAILABLE
-
-namespace TestUtils
-{
-template <typename Op, ::std::size_t CallNumber>
-struct unique_kernel_name;
 
-template <typename Policy, int idx>
-using new_kernel_name = unique_kernel_name<std::decay_t<Policy>, idx>;
-} // namespace TestUtils
+#if TEST_DYNAMIC_SELECTION_AVAILABLE
+#include "utils_sycl_defs.h"
 
 static inline void
 build_universe(std::vector<sycl::queue>& u)

test/support/utils_invoke.h

@@ -22,6 +22,7 @@
 #include <mutex>            // for std::once_flag
 #include <stdexcept>        // for std::logic_error
 
+#include "utils_sycl_defs.h"
 #include "iterator_utils.h"
 #include "compile_only_checks.h"
 
@@ -38,19 +39,6 @@ namespace TestUtils
 // Implemented in utils_sycl.h, required to include this file.
 sycl::queue get_test_queue();
 
-template <sycl::usm::alloc alloc_type>
-constexpr ::std::size_t
-uniq_kernel_index()
-{
-    return static_cast<::std::underlying_type_t<sycl::usm::alloc>>(alloc_type);
-}
-
-template <typename Op, ::std::size_t CallNumber>
-struct unique_kernel_name;
-
-template <typename Policy, int idx>
-using new_kernel_name = unique_kernel_name<::std::decay_t<Policy>, idx>;
-
 /**
  * make_policy functions test wrappers
  * The main purpose of this function wrapper in TestUtils namespace - to cut template params from

test/support/utils_sycl_defs.h

@@ -36,4 +36,22 @@
 #    define TEST_LIBSYCL_VERSION 0
 #endif
 
+namespace TestUtils
+{
+
+template <sycl::usm::alloc alloc_type>
+constexpr std::size_t
+uniq_kernel_index()
+{
+    return static_cast<std::underlying_type_t<sycl::usm::alloc>>(alloc_type);
+}
+
+template <typename Op, std::size_t CallNumber>
+struct unique_kernel_name;
+
+template <typename Policy, std::size_t idx>
+using new_kernel_name = unique_kernel_name<typename std::decay_t<Policy>::kernel_name, idx>;
+
+} /* namespace TestUtils */
+
 #endif //  _UTILS_SYCL_DEFS_H