Revert "Add Ult target for level_zero"

This reverts commit a748d7ccf5. Change-Id: Ifc49e45a93d42f7ae355fbf2a2d993538a1f71fe
2025-09-15 13:01:45 +08:00 · 2020-03-13 05:52:47 -08:00
parent a3dca017a4
commit 7fd91182b6
42 changed files with 67 additions and 861 deletions
--- a/opencl/test/unit_test/CMakeLists.txt
+++ b/opencl/test/unit_test/CMakeLists.txt
@ -7,7 +7,7 @@
 project(igdrcl_tests)

 set(OPENCL_TEST_PROJECTS_FOLDER "opencl runtime")
-set(PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER "${OPENCL_TEST_PROJECTS_FOLDER}/test platforms")
+set(OPENCL_PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER "${OPENCL_TEST_PROJECTS_FOLDER}/test platforms")
 set(OPENCL_UNIT_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})

 # disable optimizations for ults
@ -181,7 +181,7 @@ function(neo_copy_test_files target product)
    DEPENDS ${NEO_SOURCE_DIR}/opencl/test/unit_test/test_files
  )
  add_dependencies(${target} copy_compiler_files)
-  set_target_properties(${target} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}")
+  set_target_properties(${target} PROPERTIES FOLDER "${OPENCL_PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}")
 endfunction()

 add_dependencies(unit_tests
@ -470,7 +470,7 @@ macro(macro_for_each_gen)
        endif()
      endif()
      add_custom_target(prepare_test_kernels_${family_name_with_type} DEPENDS ${kernels_to_compile_${family_name_with_type}} copy_compiler_files)
-      set_target_properties(prepare_test_kernels_${family_name_with_type} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${family_name_with_type}")
+      set_target_properties(prepare_test_kernels_${family_name_with_type} PROPERTIES FOLDER "${OPENCL_PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${family_name_with_type}")
      add_dependencies(prepare_test_kernels prepare_test_kernels_${family_name_with_type})
    endif()
  endforeach()
--- a/opencl/test/unit_test/aub_tests/cmake/run_aub_test_target.cmake
+++ b/opencl/test/unit_test/aub_tests/cmake/run_aub_test_target.cmake
@ -12,7 +12,7 @@ list(GET aub_test_config 3 eu_per_ss)

 add_custom_target(run_${product}_aub_tests ALL DEPENDS copy_test_files_${product} prepare_test_kernels)
 add_dependencies(run_aub_tests run_${product}_aub_tests)
-set_target_properties(run_${product}_aub_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}")
+set_target_properties(run_${product}_aub_tests PROPERTIES FOLDER "${OPENCL_PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}")

 if(WIN32)
  add_dependencies(run_${product}_aub_tests mock_gdi)
--- a/opencl/test/unit_test/cmake/run_ult_target.cmake
+++ b/opencl/test/unit_test/cmake/run_ult_target.cmake
@ -0,0 +1,36 @@
+#
+# Copyright (C) 2020 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+string(REPLACE "/" ";" unit_test_config ${unit_test_config})
+list(GET unit_test_config 0 product)
+list(GET unit_test_config 1 slices)
+list(GET unit_test_config 2 subslices)
+list(GET unit_test_config 3 eu_per_ss)
+add_custom_target(run_${product}_unit_tests ALL DEPENDS unit_tests)
+neo_copy_test_files(copy_test_files_${product} ${product})
+add_dependencies(unit_tests copy_test_files_${product})
+set_target_properties(run_${product}_unit_tests PROPERTIES FOLDER "${OPENCL_PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}")
+add_custom_command(
+  TARGET run_${product}_unit_tests
+  POST_BUILD
+  COMMAND WORKING_DIRECTORY ${TargetDir}
+  COMMAND echo Running igdrcl_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product}
+  COMMAND $<TARGET_FILE:igdrcl_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION}
+)
+add_dependencies(run_unit_tests run_${product}_unit_tests)
+
+if(${CMAKE_BUILD_TYPE} STREQUAL "Debug" AND "${IGDRCL_OPTION__BITS}" STREQUAL "64" AND appverified_allowed)
+  add_custom_command(
+    TARGET run_${product}_unit_tests
+    POST_BUILD
+    COMMAND echo copying test verify.bat file from ${OPENCL_UNIT_TEST_DIR} to ${TargetDir}
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${OPENCL_UNIT_TEST_DIR}/verify.bat ${TargetDir}/verify.bat
+    COMMAND WORKING_DIRECTORY ${TargetDir}
+    COMMAND echo Running igdrcl_tests with App Verifier
+    COMMAND ${TargetDir}/verify.bat --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION}
+    COMMAND echo App Verifier returned: %errorLevel%
+  )
+endif()
--- a/opencl/test/unit_test/gen11/ehl/CMakeLists.txt
+++ b/opencl/test/unit_test/gen11/ehl/CMakeLists.txt
@ -12,6 +12,6 @@ if(TESTS_EHL)
  )
  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen11_ehl})
  add_subdirectories()
-  neo_copy_test_files(copy_test_files_ehl ehl)
-  add_dependencies(unit_tests copy_test_files_ehl)
+  set(unit_test_config "ehl/1/4/8")
+  include(${OPENCL_UNIT_TEST_DIR}/cmake/run_ult_target.cmake)
 endif()
--- a/opencl/test/unit_test/gen11/icllp/CMakeLists.txt
+++ b/opencl/test/unit_test/gen11/icllp/CMakeLists.txt
@ -14,6 +14,7 @@ if(TESTS_ICLLP)
  )
  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen11_icllp})
  add_subdirectories()
-  neo_copy_test_files(copy_test_files_icllp icllp)
-  add_dependencies(unit_tests copy_test_files_icllp)
+  set(appverified_allowed ${APPVERIFIER_ALLOWED})
+  set(unit_test_config "icllp/1/8/8")
+  include(${OPENCL_UNIT_TEST_DIR}/cmake/run_ult_target.cmake)
 endif()
--- a/opencl/test/unit_test/gen11/lkf/CMakeLists.txt
+++ b/opencl/test/unit_test/gen11/lkf/CMakeLists.txt
@ -12,6 +12,6 @@ if(TESTS_LKF)
  )
  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen11_lkf})
  add_subdirectories()
-  neo_copy_test_files(copy_test_files_lkf lkf)
-  add_dependencies(unit_tests copy_test_files_lkf)
+  set(unit_test_config "lkf/1/8/8")
+  include(${OPENCL_UNIT_TEST_DIR}/cmake/run_ult_target.cmake)
 endif()
--- a/opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt
+++ b/opencl/test/unit_test/gen12lp/tgllp/CMakeLists.txt
@ -13,6 +13,7 @@ if(TESTS_TGLLP)
  )
  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen12lp_tgllp})
  add_subdirectories()
-  neo_copy_test_files(copy_test_files_tgllp tgllp)
-  add_dependencies(unit_tests copy_test_files_tgllp)
+  set(appverified_allowed ${APPVERIFIER_ALLOWED})
+  set(unit_test_config "tgllp/1/6/16")
+  include(${OPENCL_UNIT_TEST_DIR}/cmake/run_ult_target.cmake)
 endif()
--- a/opencl/test/unit_test/gen8/bdw/CMakeLists.txt
+++ b/opencl/test/unit_test/gen8/bdw/CMakeLists.txt
@ -13,6 +13,7 @@ if(TESTS_BDW)
  )
  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen8_bdw})
  add_subdirectories()
-  neo_copy_test_files(copy_test_files_bdw bdw)
-  add_dependencies(unit_tests copy_test_files_bdw)
+  set(appverified_allowed ${APPVERIFIER_ALLOWED})
+  set(unit_test_config "bdw/1/3/8")
+  include(${OPENCL_UNIT_TEST_DIR}/cmake/run_ult_target.cmake)
 endif()
--- a/opencl/test/unit_test/gen9/bxt/CMakeLists.txt
+++ b/opencl/test/unit_test/gen9/bxt/CMakeLists.txt
@ -13,6 +13,6 @@ if(TESTS_BXT)
  )
  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_bxt})
  add_subdirectories()
-  neo_copy_test_files(copy_test_files_bxt bxt)
-  add_dependencies(unit_tests copy_test_files_bxt)
+  set(unit_test_config "bxt/1/3/6")
+  include(${OPENCL_UNIT_TEST_DIR}/cmake/run_ult_target.cmake)
 endif()
--- a/opencl/test/unit_test/gen9/cfl/CMakeLists.txt
+++ b/opencl/test/unit_test/gen9/cfl/CMakeLists.txt
@ -12,6 +12,6 @@ if(TESTS_CFL)
  )
  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_cfl})
  add_subdirectories()
-  neo_copy_test_files(copy_test_files_cfl cfl)
-  add_dependencies(unit_tests copy_test_files_cfl)
+  set(unit_test_config "cfl/1/3/6")
+  include(${OPENCL_UNIT_TEST_DIR}/cmake/run_ult_target.cmake)
 endif()
--- a/opencl/test/unit_test/gen9/glk/CMakeLists.txt
+++ b/opencl/test/unit_test/gen9/glk/CMakeLists.txt
@ -12,6 +12,6 @@ if(TESTS_GLK)
  )
  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_glk})
  add_subdirectories()
-  neo_copy_test_files(copy_test_files_glk glk)
-  add_dependencies(unit_tests copy_test_files_glk)
+  set(unit_test_config "glk/1/3/6")
+  include(${OPENCL_UNIT_TEST_DIR}/cmake/run_ult_target.cmake)
 endif()
--- a/opencl/test/unit_test/gen9/kbl/CMakeLists.txt
+++ b/opencl/test/unit_test/gen9/kbl/CMakeLists.txt
@ -12,6 +12,6 @@ if(TESTS_KBL)
  )
  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_kbl})
  add_subdirectories()
-  neo_copy_test_files(copy_test_files_kbl kbl)
-  add_dependencies(unit_tests copy_test_files_kbl)
+  set(unit_test_config "kbl/1/3/6")
+  include(${OPENCL_UNIT_TEST_DIR}/cmake/run_ult_target.cmake)
 endif()
--- a/opencl/test/unit_test/gen9/skl/CMakeLists.txt
+++ b/opencl/test/unit_test/gen9/skl/CMakeLists.txt
@ -18,6 +18,7 @@ if(TESTS_SKL)

  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_skl})
  add_subdirectories()
-  neo_copy_test_files(copy_test_files_skl skl)
-  add_dependencies(unit_tests copy_test_files_skl)
+  set(appverified_allowed ${APPVERIFIER_ALLOWED})
+  set(unit_test_config "skl/1/3/8")
+  include(${OPENCL_UNIT_TEST_DIR}/cmake/run_ult_target.cmake)
 endif()
--- a/opencl/test/unit_test/mt_tests/cmake/run_mt_test_target.cmake
+++ b/opencl/test/unit_test/mt_tests/cmake/run_mt_test_target.cmake
@ -16,7 +16,7 @@ if(NOT WIN32)
 endif()

 add_dependencies(run_mt_unit_tests run_${product}_mt_unit_tests)
-set_target_properties(run_${product}_mt_unit_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}")
+set_target_properties(run_${product}_mt_unit_tests PROPERTIES FOLDER "${OPENCL_PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}")

 add_custom_command(
  TARGET run_${product}_mt_unit_tests