Correct test kernel dependencies for l0 aub tests

Related-To: NEO-6328
Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

cmake/run_aub_test_target.cmake

@@ -68,6 +68,8 @@ if(NOT SKIP_NEO_UNIT_TESTS)
 endif()
 
 if(NOT SKIP_L0_UNIT_TESTS AND BUILD_WITH_L0)
+  add_dependencies(run_${product}_${revision_id}_aub_tests prepare_l0_test_kernels)
+
   if(WIN32 OR NOT DEFINED NEO__GMM_LIBRARY_PATH)
     set(l0_aub_test_cmd_prefix $<TARGET_FILE:ze_intel_gpu_aub_tests>)
   else()

level_zero/CMakeLists.txt

@@ -533,11 +533,13 @@ if(BUILD_WITH_L0)
     )
   endif()
   if(NOT SKIP_L0_UNIT_TESTS)
+    add_subdirectory_unique(core/test/common)
     add_subdirectory_unique(core/test/unit_tests)
     add_subdirectory_unique(core/test/aub_tests)
     add_subdirectory_unique(tools/test/unit_tests)
     add_subdirectory_unique(experimental/test/unit_tests)
   else()
+    hide_subdir(core/test/common)
     hide_subdir(core/test/unit_tests)
     hide_subdir(core/test/aub_tests)
     hide_subdir(tools/test/unit_tests)

level_zero/core/test/common/CMakeLists.txt

@@ -0,0 +1,31 @@
+#
+# Copyright (C) 2021 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+include(gen_kernel.cmake)
+
+add_custom_target(prepare_l0_test_kernels)
+set_target_properties(prepare_l0_test_kernels PROPERTIES FOLDER ${TARGET_NAME_L0})
+
+set(TEST_MODULES
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_modules/test_kernel.cl
+)
+
+set(l0_test_kernels_outputs)
+macro(macro_for_each_gen)
+  foreach(PLATFORM_TYPE ${PLATFORM_TYPES})
+    if(${GEN_TYPE}_HAS_${PLATFORM_TYPE})
+      get_family_name_with_type(${GEN_TYPE} ${PLATFORM_TYPE})
+      string(TOLOWER ${PLATFORM_TYPE} PLATFORM_TYPE_LOWER)
+      set(PLATFORM_LOWER ${DEFAULT_SUPPORTED_${GEN_TYPE}_${PLATFORM_TYPE}_PLATFORM})
+      level_zero_gen_kernels(l0_test_kernel_outputs ${PLATFORM_LOWER} ${family_name_with_type} "-g" ${TEST_MODULES})
+    endif()
+  endforeach()
+endmacro()
+apply_macro_for_each_gen("TESTED")
+add_custom_target(l0_common_test_kernels DEPENDS ${l0_test_kernel_outputs} copy_compiler_files)
+set_target_properties(l0_common_test_kernels PROPERTIES FOLDER ${TARGET_NAME_L0})
+add_dependencies(prepare_l0_test_kernels l0_common_test_kernels)
+

…ro/core/test/unit_tests/gen_kernel.cmake …l_zero/core/test/common/gen_kernel.cmakelevel_zero/core/test/unit_tests/gen_kernel.cmake renamed to level_zero/core/test/common/gen_kernel.cmake level_zero/core/test/unit_tests/gen_kernel.cmake renamed to level_zero/core/test/common/gen_kernel.cmake

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-function(level_zero_gen_kernels target platform_name suffix options)
+function(level_zero_gen_kernels target_list platform_name suffix options)
 
   if(NOT DEFINED cloc_cmd_prefix)
     if(WIN32)
@@ -20,7 +20,6 @@ function(level_zero_gen_kernels target platform_name suffix options)
 
   set(outputdir "${TargetDir}/level_zero/${suffix}/test_files/${NEO_ARCH}/")
 
-  set(results)
   if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
     foreach(filepath ${ARGN})
       get_filename_component(filename ${filepath} NAME)
@@ -41,9 +40,8 @@ function(level_zero_gen_kernels target platform_name suffix options)
                          DEPENDS ${filepath} ocloc
       )
 
-      list(APPEND results ${output_files})
+      list(APPEND ${target_list} ${output_files})
     endforeach()
   endif()
-  add_custom_target(${target} DEPENDS ${results} copy_compiler_files)
-  set_target_properties(${target} PROPERTIES FOLDER ${TARGET_NAME_L0})
+  set(${target_list} ${${target_list}} PARENT_SCOPE)
 endfunction()

…t/unit_tests/test_modules/test_kernel.cl …/test/common/test_modules/test_kernel.cllevel_zero/core/test/unit_tests/test_modules/test_kernel.cl renamed to level_zero/core/test/common/test_modules/test_kernel.cl level_zero/core/test/unit_tests/test_modules/test_kernel.cl renamed to level_zero/core/test/common/test_modules/test_kernel.cl

@@ -8,7 +8,6 @@ link_libraries(${ASAN_LIBS} ${TSAN_LIBS})
 
 set(TARGET_NAME ${TARGET_NAME_L0}_core_tests)
 
-include(gen_kernel.cmake)
 include(${NEO_SOURCE_DIR}/cmake/setup_ult_global_flags.cmake)
 
 function(ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION)
@@ -27,14 +26,14 @@ add_executable(${TARGET_NAME}
 )
 
 target_sources(${TARGET_NAME} PRIVATE
-               ${CMAKE_CURRENT_LIST_DIR}/gen_kernel.cmake
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
                ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
                ${CMAKE_CURRENT_SOURCE_DIR}/mock.h
                ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
                ${CMAKE_CURRENT_SOURCE_DIR}/white_box.h
                ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
                ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
+               ${NEO_SOURCE_DIR}/level_zero/core/test/common/gen_kernel.cmake
 )
 
 target_sources(${TARGET_NAME} PRIVATE
@@ -133,23 +132,6 @@ if(TARGET ${BUILTINS_SPIRV_LIB_NAME})
   )
 endif()
 
-set(TEST_MODULES
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_modules/test_kernel.cl
-)
-
-macro(macro_for_each_gen)
-  foreach(PLATFORM_TYPE ${PLATFORM_TYPES})
-    if(${GEN_TYPE}_HAS_${PLATFORM_TYPE})
-      get_family_name_with_type(${GEN_TYPE} ${PLATFORM_TYPE})
-      string(TOLOWER ${PLATFORM_TYPE} PLATFORM_TYPE_LOWER)
-      set(PLATFORM_LOWER ${DEFAULT_SUPPORTED_${GEN_TYPE}_${PLATFORM_TYPE}_PLATFORM})
-      level_zero_gen_kernels(level_zero_test_kernels_${family_name_with_type} ${PLATFORM_LOWER} ${family_name_with_type} "-g" ${TEST_MODULES})
-      add_dependencies(${TARGET_NAME} level_zero_test_kernels_${family_name_with_type})
-    endif()
-  endforeach()
-endmacro()
-apply_macro_for_each_gen("TESTED")
-
 option(L0_ULT_VERBOSE "Use the default/verbose test output" OFF)
 if(NOT L0_ULT_VERBOSE)
   set(L0_TESTS_LISTENER_OPTION "--disable_default_listener")
@@ -171,6 +153,6 @@ if(MSVC)
   )
 endif()
 
-add_dependencies(unit_tests ${TARGET_NAME})
+add_dependencies(unit_tests ${TARGET_NAME} prepare_l0_test_kernels)
 
 create_source_tree(${TARGET_NAME} ${L0_ROOT_DIR}/..)