Fix unit test build and ProcessKernelRuntimeInfo calls

Author: slawekptak

sycl/cmake/modules/AddSYCLUnitTest.cmake

@@ -34,11 +34,11 @@ function(add_sycl_unittest_internal test_dirname link_variant is_preview is_no_c
   # Chaning CMAKE_CURRENT_BINARY_DIR should not affect this variable in its
   # parent scope.
   if (${is_preview})
-    if (${is_no_cgh})
-      set(CMAKE_CURRENT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/PreviewNoCGH")
-    else()
       set(CMAKE_CURRENT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/Preview")
-    endif()
+  endif()
+
+  if (${is_no_cgh})
+    set(CMAKE_CURRENT_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/NoCGH")
   endif()
 
   if ("${link_variant}" MATCHES "SHARED")
@@ -66,11 +66,11 @@ function(add_sycl_unittest_internal test_dirname link_variant is_preview is_no_c
   if (${is_preview})
     target_compile_definitions(${test_dirname}
         PRIVATE __INTEL_PREVIEW_BREAKING_CHANGES)
-    if (${is_no_cgh})
-      set(sycl_cache_suffix "_non_preview_no_cgh")
-    else()
-      set(sycl_cache_suffix "_preview")
-    endif()
+    set(sycl_cache_suffix "_preview")
+  endif()
+
+  if (${is_no_cgh})
+    set(sycl_cache_suffix "_no_cgh")
   endif()
 
   if (${is_no_cgh})
@@ -175,6 +175,6 @@ endfunction()
 # Produces two binaries, named `basename(test_name_prefix_non_preview)` and `basename(test_name_prefix_preview)`
 macro(add_sycl_unittest test_name_prefix link_variant)
   add_sycl_unittest_internal(${test_name_prefix}_non_preview ${link_variant} FALSE FALSE ${ARGN})
-  add_sycl_unittest_internal(${test_name_prefix}_non_preview_no_cgh ${link_variant} FALSE TRUE ${ARGN})
+  add_sycl_unittest_internal(${test_name_prefix}_no_cgh ${link_variant} FALSE TRUE ${ARGN})
   add_sycl_unittest_internal(${test_name_prefix}_preview ${link_variant} TRUE FALSE ${ARGN})
 endmacro()

sycl/include/sycl/queue.hpp

@@ -3896,8 +3896,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
         typename detail::get_kernel_name_t<KernelName, KernelType>::name;
 
     ProcessSubmitProperties(Props, SI);
-    ProcessKernelRuntimeInfo<NameT, KernelType, Dims>(Props, KernelFunc,
-                                                      KRInfo);
+    ProcessKernelRuntimeInfo<NameT, KernelType, Dims>(KernelFunc, KRInfo);
 
     detail::KernelWrapper<detail::WrapAs::parallel_for, NameT, KernelType,
                           sycl::nd_item<Dims>, PropertiesT>::wrap(KernelFunc);
@@ -3921,8 +3920,7 @@ class __SYCL_EXPORT queue : public detail::OwnerLessBase<queue> {
         typename detail::get_kernel_name_t<KernelName, KernelType>::name;
 
     ProcessSubmitProperties(Props, SI);
-    ProcessKernelRuntimeInfo<NameT, KernelType, Dims>(Props, KernelFunc,
-                                                      KRInfo);
+    ProcessKernelRuntimeInfo<NameT, KernelType, Dims>(KernelFunc, KRInfo);
 
     detail::KernelWrapper<detail::WrapAs::parallel_for, NameT, KernelType,
                           sycl::nd_item<Dims>, PropertiesT>::wrap(KernelFunc);

sycl/unittests/xpti_trace/CMakeLists.txt

@@ -8,4 +8,4 @@ add_sycl_unittest(XptiTraceTests OBJECT
 )
 target_link_libraries(XptiTraceTests_non_preview PRIVATE xpti xptitest_subscriber)
 target_link_libraries(XptiTraceTests_preview PRIVATE xpti xptitest_subscriber)
-target_link_libraries(XptiTraceTests_non_preview_no_cgh PRIVATE xpti xptitest_subscriber)
+target_link_libraries(XptiTraceTests_no_cgh PRIVATE xpti xptitest_subscriber)