[Tests] Simplify new_kernel_name implementation in tests (#2128)

Author: SergeyKopienko

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

@@ -24,6 +24,7 @@
 
 #include "iterator_utils.h"
 #include "compile_only_checks.h"
+#include "utils_sycl_defs.h"
 
 #ifdef ONEDPL_USE_PREDEFINED_POLICIES
 #  define TEST_USE_PREDEFINED_POLICIES ONEDPL_USE_PREDEFINED_POLICIES
@@ -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

@@ -18,10 +18,12 @@
 #ifndef _UTILS_SYCL_DEFS_H
 #define _UTILS_SYCL_DEFS_H
 
-#if __has_include(<sycl/sycl.hpp>)
-#    include <sycl/sycl.hpp>
-#else
-#    include <CL/sycl.hpp>
+#if _ONEDPL_BACKEND_SYCL
+#    if __has_include(<sycl/sycl.hpp>)
+#        include <sycl/sycl.hpp>
+#    else
+#        include <CL/sycl.hpp>
+#    endif
 #endif
 
 #if ONEDPL_FPGA_DEVICE
@@ -36,4 +38,45 @@
 #    define TEST_LIBSYCL_VERSION 0
 #endif
 
+namespace TestUtils
+{
+#if _ONEDPL_BACKEND_SYCL
+template <sycl::usm::alloc alloc_type>
+inline constexpr std::size_t
+uniq_kernel_index()
+{
+    return static_cast<std::underlying_type_t<sycl::usm::alloc>>(alloc_type);
+}
+#endif
+
+template <typename Op, std::size_t CallNumber>
+struct unique_kernel_name;
+
+template <typename T, typename = std::void_t<>>
+struct has_kernel_name : std::false_type
+{
+};
+
+template <typename T>
+struct has_kernel_name<T, std::void_t<typename T::kernel_name>> : std::true_type
+{
+};
+
+template <typename Policy, std::size_t CallNumber, typename = void>
+struct new_kernel_name_impl
+{
+    using type = unique_kernel_name<std::decay_t<Policy>, CallNumber>;
+};
+
+template <typename Policy, std::size_t CallNumber>
+struct new_kernel_name_impl<Policy, CallNumber, std::enable_if_t<has_kernel_name<std::decay_t<Policy>>::value>>
+{
+    using type = unique_kernel_name<typename std::decay_t<Policy>::kernel_name, CallNumber>;
+};
+
+template <typename Policy, std::size_t CallNumber>
+using new_kernel_name = typename new_kernel_name_impl<Policy, CallNumber>::type;
+
+} /* namespace TestUtils */
+
 #endif //  _UTILS_SYCL_DEFS_H