Improve prepare_test_kernels targets to build kernels required in ULTs

Related-To: NEO-6370
Signed-off-by: Pawel Cieslak <[email protected]>

Author: Pawel-Cieslak

CMakeLists.txt

@@ -458,8 +458,10 @@ else()
 endif()
 message(STATUS "i915 includes dir: ${I915_INCLUDES_DIR}")
 
-# Enable/Disable BuiltIns compilation during build
-set(COMPILE_BUILT_INS TRUE CACHE BOOL "Enable built-in kernels compilation")
+if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
+  # Enable/Disable BuiltIns compilation during build
+  set(COMPILE_BUILT_INS TRUE CACHE BOOL "Enable built-in kernels compilation")
+endif()
 
 # Changing the default executable and library output directories
 set(IGDRCL_OUTPUT_DIR "${IGDRCL_OPTION__OUTPUT_DIR}")

cmake/run_aub_test_target.cmake

@@ -17,8 +17,8 @@ if(NOT SKIP_NEO_UNIT_TESTS OR NOT SKIP_L0_UNIT_TESTS)
 
   if(NOT SKIP_NEO_UNIT_TESTS)
     add_dependencies(run_${product}_${revision_id}_aub_tests copy_test_files_per_product)
-    add_dependencies(run_${product}_${revision_id}_aub_tests prepare_test_kernels)
-    add_dependencies(run_${product}_${revision_id}_aub_tests prepare_test_kernel_for_shared)
+    add_dependencies(run_${product}_${revision_id}_aub_tests prepare_test_kernels_for_ocl)
+    add_dependencies(run_${product}_${revision_id}_aub_tests prepare_test_kernels_for_shared)
   endif()
 
   add_dependencies(run_aub_tests run_${product}_${revision_id}_aub_tests)
@@ -68,7 +68,7 @@ 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)
+  add_dependencies(run_${product}_${revision_id}_aub_tests prepare_test_kernels_for_l0)
 
   if(WIN32 OR NOT DEFINED NEO__GMM_LIBRARY_PATH)
     set(l0_aub_test_cmd_prefix $<TARGET_FILE:ze_intel_gpu_aub_tests>)

level_zero/core/test/common/CMakeLists.txt

@@ -6,8 +6,8 @@
 
 include(gen_kernel.cmake)
 
-add_custom_target(prepare_l0_test_kernels)
-set_target_properties(prepare_l0_test_kernels PROPERTIES FOLDER ${TARGET_NAME_L0})
+add_custom_target(prepare_test_kernels_for_l0)
+set_target_properties(prepare_test_kernels_for_l0 PROPERTIES FOLDER ${TARGET_NAME_L0})
 
 set(TEST_MODULES
     ${CMAKE_CURRENT_SOURCE_DIR}/test_modules/test_kernel.cl
@@ -27,5 +27,5 @@ 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)
+add_dependencies(prepare_test_kernels_for_l0 l0_common_test_kernels)
 

level_zero/core/test/unit_tests/CMakeLists.txt

@@ -122,6 +122,6 @@ if(MSVC)
   )
 endif()
 
-add_dependencies(unit_tests ${TARGET_NAME} prepare_l0_test_kernels)
+add_dependencies(unit_tests ${TARGET_NAME} prepare_test_kernels_for_l0)
 
 create_source_tree(${TARGET_NAME} ${L0_ROOT_DIR}/..)

manifests/manifest.yml

@@ -20,7 +20,7 @@ components:
   infra:
     branch: master
     dest_dir: infra
-    revision: 9805ca5917c3b0535040e66bdd7215c79e0803a9
+    revision: 152350a0df8f87f800742d493dbd337d70bcf0ac
     type: git
   internal:
     branch: master

opencl/source/scheduler/CMakeLists.txt

@@ -13,6 +13,6 @@ set(RUNTIME_SRCS_SCHEDULER
 target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SCHEDULER})
 set_property(GLOBAL PROPERTY RUNTIME_SRCS_SCHEDULER ${RUNTIME_SRCS_SCHEDULER})
 
-if(NOT NEO_DISABLE_BUILTINS_COMPILATION AND NOT (TARGET ${SCHEDULER_BINARY_LIB_NAME}))
+if(NOT (TARGET ${SCHEDULER_BINARY_LIB_NAME}))
   include(scheduler_binary.cmake)
 endif()

opencl/test/unit_test/CMakeLists.txt

@@ -21,7 +21,8 @@ endfunction()
 ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION()
 link_libraries(${ASAN_LIBS} ${TSAN_LIBS})
 
-add_custom_target(prepare_test_kernels)
+add_custom_target(prepare_test_kernels_for_ocl)
+add_dependencies(prepare_test_kernels_for_ocl ${SCHEDULER_BINARY_LIB_NAME})
 add_custom_target(copy_test_files_per_product)
 add_custom_target(run_unit_tests ALL)
 add_dependencies(unit_tests copy_test_files_per_product)
@@ -156,8 +157,8 @@ endfunction()
 add_dependencies(unit_tests
                  igdrcl_tests
                  test_dynamic_lib
-                 prepare_test_kernels
-                 prepare_test_kernel_for_shared
+                 prepare_test_kernels_for_ocl
+                 prepare_test_kernels_for_shared
 )
 
 set_target_properties(igdrcl_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
@@ -168,7 +169,7 @@ endif()
 
 set_target_properties(unit_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
 set_target_properties(copy_test_files_per_product PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
-set_target_properties(prepare_test_kernels PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
+set_target_properties(prepare_test_kernels_for_ocl PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
 set_target_properties(run_unit_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
 
 target_include_directories(igdrcl_tests BEFORE PRIVATE
@@ -548,16 +549,8 @@ macro(macro_for_each_gen)
       endif()
 
       foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS})
-        if(NEO_DISABLE_BUILTINS_COMPILATION)
-          add_custom_target(prepare_test_kernels_${family_name_with_type}_${REVISION_ID} DEPENDS ${kernels_to_compile_${family_name_with_type}_${REVISION_ID}} copy_compiler_files)
-          # cp -a ../neo_test_kernels/XE_HPC_COREcore bin/
-          # message(FATAL_ERROR "list: ${kernels_to_compile_${family_name_with_type}_${REVISION_ID}}")
-          add_dependencies(prepare_test_kernels prepare_test_kernels_${family_name_with_type}_${REVISION_ID})
-
-        else()
-          add_custom_target(prepare_test_kernels_${family_name_with_type}_${REVISION_ID} DEPENDS ${kernels_to_compile_${family_name_with_type}_${REVISION_ID}} copy_compiler_files)
-          add_dependencies(prepare_test_kernels prepare_test_kernels_${family_name_with_type}_${REVISION_ID})
-        endif()
+        add_custom_target(prepare_test_kernels_${family_name_with_type}_${REVISION_ID} DEPENDS ${kernels_to_compile_${family_name_with_type}_${REVISION_ID}} copy_compiler_files)
+        add_dependencies(prepare_test_kernels_for_ocl prepare_test_kernels_${family_name_with_type}_${REVISION_ID})
         set_target_properties(prepare_test_kernels_${family_name_with_type}_${REVISION_ID} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${family_name_with_type}/${REVISION_ID}")
       endforeach()
     endif()

opencl/test/unit_test/mt_tests/CMakeLists.txt

@@ -43,8 +43,8 @@ endif()
 
 add_dependencies(igdrcl_mt_tests test_dynamic_lib)
 add_dependencies(igdrcl_mt_tests
-                 prepare_test_kernel_for_shared
-                 prepare_test_kernels
+                 prepare_test_kernels_for_shared
+                 prepare_test_kernels_for_ocl
                  copy_test_files_per_product
 )
 create_project_source_tree(igdrcl_mt_tests)

opencl/test/unit_test/mt_tests/cmake/run_mt_test_target.cmake

@@ -27,4 +27,4 @@ add_custom_command(
                    COMMAND igdrcl_mt_tests --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} --gtest_repeat=${GTEST_REPEAT} ${NEO_TESTS_LISTENER_OPTION} --rev_id ${revision_id}
 )
 
-add_dependencies(run_${product}_${revision_id}_mt_unit_tests prepare_test_kernels)
+add_dependencies(run_${product}_${revision_id}_mt_unit_tests prepare_test_kernels_for_ocl)

shared/test/common/test_files/CMakeLists.txt

@@ -79,15 +79,17 @@ endfunction()
 
 file(GLOB_RECURSE TEST_KERNELS *.cl)
 file(GLOB_RECURSE TEST_KERNELS_IMAGES *_images.cl)
-add_custom_target(prepare_test_kernel_for_shared)
-set_target_properties(prepare_test_kernel_for_shared PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}/${SHARED_TEST_PROJECTS_SUB_FOLDER}")
+add_custom_target(prepare_test_kernels_for_shared)
+add_dependencies(prepare_test_kernels_for_shared ${BUILTINS_BINARIES_BINDFUL_LIB_NAME})
+add_dependencies(prepare_test_kernels_for_shared ${BUILTINS_BINARIES_BINDLESS_LIB_NAME})
+set_target_properties(prepare_test_kernels_for_shared PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}/${SHARED_TEST_PROJECTS_SUB_FOLDER}")
 
 macro(macro_for_each_platform)
   foreach(PLATFORM_TYPE ${PLATFORM_TYPES})
     foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS})
       if(${PLATFORM_IT}_IS_${PLATFORM_TYPE})
         neo_shared_copy_test_files(copy_test_kernel_${PLATFORM_IT_LOWER}_${REVISION_ID} ${PLATFORM_IT} ${REVISION_ID})
-        add_dependencies(prepare_test_kernel_for_shared copy_test_kernel_${PLATFORM_IT_LOWER}_${REVISION_ID})
+        add_dependencies(prepare_test_kernels_for_shared copy_test_kernel_${PLATFORM_IT_LOWER}_${REVISION_ID})
       endif()
     endforeach()
   endforeach()
@@ -111,9 +113,9 @@ macro(macro_for_each_gen)
       foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS})
         compile_kernels_gen(${family_name_with_type} ${REVISION_ID} ${PLATFORM_LOWER} ${family_name_with_type} ${KERNELS_TO_COMPILE})
 
-        add_custom_target(prepare_test_kernel_for_shared_${family_name_with_type}_${REVISION_ID} DEPENDS ${compiled_kernels_${family_name_with_type}_${REVISION_ID}})
-        set_target_properties(prepare_test_kernel_for_shared_${family_name_with_type}_${REVISION_ID} PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}/${SHARED_TEST_PROJECTS_SUB_FOLDER}/${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${family_name_with_type}/${REVISION_ID}")
-        add_dependencies(prepare_test_kernel_for_shared prepare_test_kernel_for_shared_${family_name_with_type}_${REVISION_ID})
+        add_custom_target(prepare_test_kernels_for_shared_${family_name_with_type}_${REVISION_ID} DEPENDS ${compiled_kernels_${family_name_with_type}_${REVISION_ID}})
+        set_target_properties(prepare_test_kernels_for_shared_${family_name_with_type}_${REVISION_ID} PROPERTIES FOLDER "${SHARED_TEST_PROJECTS_FOLDER}/${SHARED_TEST_PROJECTS_SUB_FOLDER}/${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${family_name_with_type}/${REVISION_ID}")
+        add_dependencies(prepare_test_kernels_for_shared prepare_test_kernels_for_shared_${family_name_with_type}_${REVISION_ID})
       endforeach()
     endif()
   endforeach()