ULT execution refactor

Add targets to run shared, OpenCL and L0 tests separately. Bind all
these to run_unit_tests.

Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>

cmake/run_ult_target.cmake

@@ -11,31 +11,51 @@ list(GET unit_test_config 2 subslices)
 list(GET unit_test_config 3 eu_per_ss)
 list(GET unit_test_config 4 revision_id)
 
-add_custom_target(run_${product}_${revision_id}_unit_tests ALL DEPENDS unit_tests)
-set_target_properties(run_${product}_${revision_id}_unit_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}/${revision_id}")
 if(NOT NEO_SKIP_SHARED_UNIT_TESTS)
   unset(GTEST_OUTPUT)
   if(DEFINED GTEST_OUTPUT_DIR)
     set(GTEST_OUTPUT "--gtest_output=json:${GTEST_OUTPUT_DIR}/shared_${product}_${revision_id}_unit_tests_results.json")
     message(STATUS "GTest output set to ${GTEST_OUTPUT}")
   endif()
+
+  if(NOT TARGET run_shared_tests)
+    add_custom_target(run_shared_tests)
+    set_target_properties(run_shared_tests PROPERTIES FOLDER ${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER})
+    add_dependencies(run_unit_tests run_shared_tests)
+  endif()
+
+  add_custom_target(run_${product}_${revision_id}_shared_tests DEPENDS unit_tests)
+  set_target_properties(run_${product}_${revision_id}_shared_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}/${revision_id}")
+
   add_custom_command(
-                     TARGET run_${product}_${revision_id}_unit_tests
+                     TARGET run_${product}_${revision_id}_shared_tests
                      POST_BUILD
                      COMMAND WORKING_DIRECTORY ${TargetDir}
                      COMMAND echo Running neo_shared_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product}
                      COMMAND ${NEO_RUN_INTERCEPTOR_LIST} $<TARGET_FILE:neo_shared_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${GTEST_OUTPUT} ${NEO_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id}
   )
 
+  add_dependencies(run_shared_tests run_${product}_${revision_id}_shared_tests)
 endif()
+
 if(NOT NEO_SKIP_OCL_UNIT_TESTS)
   unset(GTEST_OUTPUT)
   if(DEFINED GTEST_OUTPUT_DIR)
     set(GTEST_OUTPUT "--gtest_output=json:${GTEST_OUTPUT_DIR}/ocl_${product}_${revision_id}_unit_tests_results.json")
     message(STATUS "GTest output set to ${GTEST_OUTPUT}")
   endif()
+
+  if(NOT TARGET run_ocl_tests)
+    add_custom_target(run_ocl_tests)
+    set_target_properties(run_ocl_tests PROPERTIES FOLDER ${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER})
+    add_dependencies(run_unit_tests run_ocl_tests)
+  endif()
+
+  add_custom_target(run_${product}_${revision_id}_ocl_tests DEPENDS unit_tests)
+  set_target_properties(run_${product}_${revision_id}_ocl_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}/${revision_id}")
+
   add_custom_command(
-                     TARGET run_${product}_${revision_id}_unit_tests
+                     TARGET run_${product}_${revision_id}_ocl_tests
                      POST_BUILD
                      COMMAND WORKING_DIRECTORY ${TargetDir}
                      COMMAND echo Running igdrcl_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product}
@@ -49,7 +69,7 @@ if(NOT NEO_SKIP_OCL_UNIT_TESTS)
       message(STATUS "GTest output set to ${GTEST_OUTPUT}")
     endif()
     add_custom_command(
-                       TARGET run_${product}_${revision_id}_unit_tests
+                       TARGET run_${product}_${revision_id}_ocl_tests
                        POST_BUILD
                        COMMAND WORKING_DIRECTORY ${TargetDir}
                        COMMAND echo Running igdrcl_tests with App Verifier
@@ -57,6 +77,8 @@ if(NOT NEO_SKIP_OCL_UNIT_TESTS)
                        COMMAND echo App Verifier returned: %errorLevel%
     )
   endif()
+
+  add_dependencies(run_ocl_tests run_${product}_${revision_id}_ocl_tests)
 endif()
 
 if(NOT NEO_SKIP_L0_UNIT_TESTS AND BUILD_WITH_L0)
@@ -75,8 +97,18 @@ if(NOT NEO_SKIP_L0_UNIT_TESTS AND BUILD_WITH_L0)
     set(GTEST_OUTPUT_EXP "--gtest_output=json:${GTEST_OUTPUT_DIR}/ze_intel_gpu_exp_${product}_${revision_id}_unit_tests_results.json")
     message(STATUS "GTest output exp set to ${GTEST_OUTPUT_EXP}")
   endif()
+
+  if(NOT TARGET run_l0_tests)
+    add_custom_target(run_l0_tests)
+    set_target_properties(run_l0_tests PROPERTIES FOLDER ${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER})
+    add_dependencies(run_unit_tests run_l0_tests)
+  endif()
+
+  add_custom_target(run_${product}_${revision_id}_l0_tests DEPENDS unit_tests)
+  set_target_properties(run_${product}_${revision_id}_l0_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}/${revision_id}")
+
   add_custom_command(
-                     TARGET run_${product}_${revision_id}_unit_tests
+                     TARGET run_${product}_${revision_id}_l0_tests
                      POST_BUILD
                      COMMAND WORKING_DIRECTORY ${TargetDir}
                      COMMAND echo Running ze_intel_gpu_core_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product}
@@ -86,6 +118,6 @@ if(NOT NEO_SKIP_L0_UNIT_TESTS AND BUILD_WITH_L0)
                      COMMAND echo Running ze_intel_gpu_exp_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product}
                      COMMAND ${NEO_RUN_INTERCEPTOR_LIST} $<TARGET_FILE:ze_intel_gpu_exp_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${GTEST_OUTPUT_EXP} ${NEO_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} --rev_id ${revision_id}
   )
-endif()
 
-add_dependencies(run_unit_tests run_${product}_${revision_id}_unit_tests)
+  add_dependencies(run_l0_tests run_${product}_${revision_id}_l0_tests)
+endif()

manifests/manifest.yml

@@ -20,7 +20,7 @@ components:
   infra:
     branch: master
     dest_dir: infra
-    revision: facad98e53ce303e761290786933ce3bab09f021
+    revision: 0367e197da95cf5cee43bd71d3ce944f96b6fce7
     type: git
   internal:
     branch: master

opencl/test/unit_test/CMakeLists.txt

@@ -27,6 +27,9 @@ add_custom_target(copy_test_files_per_product)
 add_custom_target(run_unit_tests ALL)
 add_dependencies(unit_tests copy_test_files_per_product)
 
+add_custom_target(run_ocl_tests)
+set_target_properties(run_ocl_tests PROPERTIES FOLDER ${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER})
+
 set(IGDRCL_SRCS_tests_local
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
@@ -40,7 +43,7 @@ hide_subdir(linux)
 if(UNIX)
   add_subdirectory(linux)
   add_custom_command(
-                     TARGET run_unit_tests
+                     TARGET run_ocl_tests
                      POST_BUILD
                      COMMAND echo running tests for linux dynamic library - .so in ${TargetDir}
                      COMMAND ${NEO_RUN_INTERCEPTOR_LIST} igdrcl_linux_dll_tests ${NEO_TESTS_LISTENER_OPTION}

opencl/test/unit_test/windows/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2021 Intel Corporation
+# Copyright (C) 2018-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -55,7 +55,7 @@ if(WIN32)
                      COMMAND echo Running Windows dll tests
                      COMMAND igdrcl_windows_dll_tests
   )
-  add_dependencies(run_unit_tests run_windows_dll_tests)
+  add_dependencies(run_ocl_tests run_windows_dll_tests)
 
   set_target_properties(igdrcl_windows_dll_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
   set_target_properties(run_windows_dll_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})