diff --git a/test/support/utils.h b/test/support/utils.h index 402dbbf3d4c..6d56d6fa8e3 100644 --- a/test/support/utils.h +++ b/test/support/utils.h @@ -48,6 +48,7 @@ #if TEST_DPCPP_BACKEND_PRESENT # include "utils_sycl.h" # include "oneapi/dpl/experimental/kt/kernel_param.h" +# include "oneapi/dpl/execution" // for oneapi::dpl::execution::DefaultKernelName #endif namespace TestUtils @@ -967,11 +968,19 @@ struct __kernel_name_with_idx template constexpr auto -get_new_kernel_params(KernelParams) +get_new_kernel_params(KernelParams params) { - return oneapi::dpl::experimental::kt::kernel_param< + auto new_params = oneapi::dpl::experimental::kt::kernel_param< KernelParams::data_per_workitem, KernelParams::workgroup_size, __kernel_name_with_idx>{}; +#if TEST_EXPLICIT_KERNEL_NAMES + return new_params; +#else + if constexpr (std::is_same_v) + return params; + else + return new_params; +#endif // TEST_EXPLICIT_KERNEL_NAMES } #endif //TEST_DPCPP_BACKEND_PRESENT