Update infra

- set revision = 9 for gen9 Change-Id: Icd8b73003eee3b1d32dbe3014c93174441e21f6a Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
2025-12-20 08:53:55 +08:00 · 2020-10-02 09:37:14 +02:00
parent 7e31ec37d7
commit cd85bcffdb
16 changed files with 44 additions and 35 deletions
--- a/cmake/setup_platform_flags.cmake
+++ b/cmake/setup_platform_flags.cmake
@@ -11,7 +11,7 @@ SET_FLAGS_FOR("GEN12LP" "TGLLP" "RKL")

 # Add supported and tested platforms
 if(SUPPORT_GEN8)
-  set(GEN8_REVISIONS 0)
+  set(CORE_GEN8_REVISIONS 0)
  if(TESTS_GEN8)
    ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN8" "BDWFamily")
  endif()
@@ -28,7 +28,8 @@ if(SUPPORT_GEN8)
 endif()

 if(SUPPORT_GEN9)
-  set(GEN9_REVISIONS 0)
+  set(CORE_GEN9_REVISIONS 9)
+  set(LP_GEN9_REVISIONS 0)
  if(TESTS_GEN9)
    ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN9" "SKLFamily")
  endif()
@@ -94,7 +95,8 @@ if(SUPPORT_GEN9)
 endif()

 if(SUPPORT_GEN11)
-  set(GEN11_REVISIONS 0)
+  set(CORE_GEN11_REVISIONS 0)
+  set(LP_GEN11_REVISIONS 0)
  if(TESTS_GEN11)
    ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN11" "ICLFamily")
  endif()
@@ -133,7 +135,7 @@ if(SUPPORT_GEN11)
 endif()

 if(SUPPORT_GEN12LP)
-  set(GEN12LP_REVISIONS 0)
+  set(LP_GEN12LP_REVISIONS 0)
  if(TESTS_GEN12LP)
    ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN12LP" "TGLLPFamily")
  endif()
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -14,7 +14,7 @@ components:
  infra:
    branch: infra
    dest_dir: infra
-    revision: 2dc6dd0ea93b93859cbad55ade61e1bc800ec1fe
+    revision: eaa19ddf81e8b620c7f87ca50230120905e7c679
    type: git
  internal:
    branch: master
--- a/opencl/source/gen9/hw_info_cfl.inl
+++ b/opencl/source/gen9/hw_info_cfl.inl
@@ -27,7 +27,7 @@ const PLATFORM CFL::platform = {
    IGFX_GEN9_CORE,
    PLATFORM_NONE, // default init
    0,             // usDeviceID
-    0,             // usRevId. 0 sets the stepping to A0
+    9,             // usRevId. 0 sets the stepping to A0
    0,             // usDeviceID_PCH
    0,             // usRevId_PCH
    GTTYPE_UNDEFINED};
--- a/opencl/source/gen9/hw_info_kbl.inl
+++ b/opencl/source/gen9/hw_info_kbl.inl
@@ -27,7 +27,7 @@ const PLATFORM KBL::platform = {
    IGFX_GEN9_CORE,
    PLATFORM_NONE, // default init
    0,             // usDeviceID
-    0,             // usRevId. 0 sets the stepping to A0
+    9,             // usRevId. 0 sets the stepping to A0
    0,             // usDeviceID_PCH
    0,             // usRevId_PCH
    GTTYPE_UNDEFINED};
--- a/opencl/test/unit_test/CMakeLists.txt
+++ b/opencl/test/unit_test/CMakeLists.txt
@@ -466,7 +466,7 @@ macro(macro_for_each_gen)
      endforeach()

      if(MSVC OR CMAKE_SIZEOF_VOID_P EQUAL 8)
-        foreach(REVISION_ID ${${GEN_TYPE}_REVISIONS})
+        foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS})
          neo_gen_kernels(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${PLATFORM_TEST_KERNELS})
          neo_gen_kernels_with_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL} ${TEST_KERNEL_options})
        endforeach()
@@ -474,26 +474,26 @@ macro(macro_for_each_gen)
        # Compile platform specific kernels if any were found
        file(GLOB_RECURSE ${PLATFORM_LOWER}_TEST_KERNELS test_files/*.${PLATFORM_LOWER})
        if(NOT "${${PLATFORM_LOWER}_TEST_KERNELS}" STREQUAL "")
-          foreach(REVISION_ID ${${GEN_TYPE}_REVISIONS})
+          foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS})
            neo_gen_kernels(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${${PLATFORM_LOWER}_TEST_KERNELS})
          endforeach()
        endif()

        # Disable debug kernel generation on gen8 - debugger not supported on gen8
        if(NOT ("${GEN_TYPE_LOWER}" STREQUAL "gen8"))
-          foreach(REVISION_ID ${${GEN_TYPE}_REVISIONS})
+          foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS})
            neo_gen_kernel_with_kernel_debug_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL})
          endforeach()
        endif()

        # Gen9lp needs extra -m32 flag
        if(("${GEN_TYPE_LOWER}" STREQUAL "gen9") AND ("${PLATFORM_TYPE_LOWER}" STREQUAL "lp"))
-          foreach(REVISION_ID ${${GEN_TYPE}_REVISIONS})
+          foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS})
            neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL_PRINTF} "" ${TEST_KERNEL_PRINTF_internal_options_gen9lp})
            neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL_STATELESS} "" ${TEST_KERNEL_STATELESS_internal_options_gen9lp})
          endforeach()
        else()
-          foreach(REVISION_ID ${${GEN_TYPE}_REVISIONS})
+          foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS})
            neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL_PRINTF} "" " ")
            neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL_STATELESS} "" ${TEST_KERNEL_STATELESS_internal_options})
          endforeach()
@@ -501,7 +501,7 @@ macro(macro_for_each_gen)

        foreach(file ${TEST_KERNEL_BINDLESS})

-          foreach(REVISION_ID ${${GEN_TYPE}_REVISIONS})
+          foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS})
            neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${file} "bindless" ${TEST_KERNEL_BINDLESS_internal_options})
          endforeach()

@@ -523,18 +523,18 @@ macro(macro_for_each_gen)
        # neo_gen_kernel_from_ll(${family_name_with_type} ${PLATFORM_LOWER} ${family_name_with_type} ${sip_kernel_file_name} ${sip_debug_kernel_output_file} ${TEST_KERNEL_SIP_DEBUG_options})

        if(PLATFORM_2_0_LOWER)
-          foreach(REVISION_ID ${${GEN_TYPE}_REVISIONS})
+          foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS})
            neo_gen_kernels_with_options(${family_name_with_type} ${PLATFORM_2_0_LOWER} ${REVISION_ID} ${family_name_with_type} "${TEST_KERNEL_2_0}" ${TEST_KERNEL_2_0_options})
          endforeach()
        endif()
        if(PLATFORM_VME_LOWER)
-          foreach(REVISION_ID ${${GEN_TYPE}_REVISIONS})
+          foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS})
            neo_gen_kernels(${family_name_with_type} ${PLATFORM_VME_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL_VME})
          endforeach()
        endif()
      endif()

-      foreach(REVISION_ID ${${GEN_TYPE}_REVISIONS})
+      foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS})
        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)
        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}")
        add_dependencies(prepare_test_kernels prepare_test_kernels_${family_name_with_type}_${REVISION_ID})
--- a/opencl/test/unit_test/aub_tests/gen9/skl/CMakeLists.txt
+++ b/opencl/test/unit_test/aub_tests/gen9/skl/CMakeLists.txt
@@ -6,6 +6,6 @@

 if(TESTS_SKL)
  add_subdirectories()
-  set(aub_test_config "skl/1/3/8/0")
+  set(aub_test_config "skl/1/3/8/9")
  include(${OPENCL_AUB_TEST_DIR}/cmake/run_aub_test_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_with_revision(copy_test_files_cfl_0 cfl 0)
-  add_dependencies(unit_tests copy_test_files_cfl_0)
+  neo_copy_test_files_with_revision(copy_test_files_cfl_9 cfl 9)
+  add_dependencies(unit_tests copy_test_files_cfl_9)
 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_with_revision(copy_test_files_kbl_0 kbl 0)
-  add_dependencies(unit_tests copy_test_files_kbl_0)
+  neo_copy_test_files_with_revision(copy_test_files_kbl_9 kbl 9)
+  add_dependencies(unit_tests copy_test_files_kbl_9)
 endif()
--- a/opencl/test/unit_test/gen9/skl/CMakeLists.txt
+++ b/opencl/test/unit_test/gen9/skl/CMakeLists.txt
@@ -18,6 +18,6 @@ if(TESTS_SKL)

  target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen9_skl})
  add_subdirectories()
-  neo_copy_test_files_with_revision(copy_test_files_skl_0 skl 0)
-  add_dependencies(unit_tests copy_test_files_skl_0)
+  neo_copy_test_files_with_revision(copy_test_files_skl_9 skl 9)
+  add_dependencies(unit_tests copy_test_files_skl_9)
 endif()
--- a/opencl/test/unit_test/main.cpp
+++ b/opencl/test/unit_test/main.cpp
@@ -210,7 +210,7 @@ int main(int argc, char **argv) {
    uint32_t euPerSubSlice = 0;
    uint32_t sliceCount = 0;
    uint32_t subSlicePerSliceCount = 0;
-    int32_t revId = 0;
+    int32_t revId = -1;
    int dieRecovery = 0;

    for (int i = 1; i < argc; ++i) {
@@ -305,8 +305,11 @@ int main(int argc, char **argv) {
    renderCoreFamily = hwInfoForTests.platform.eRenderCoreFamily;
    uint32_t threadsPerEu = hwInfoConfigFactory[productFamily]->threadsPerEu;
    PLATFORM &platform = hwInfoForTests.platform;
+    if (revId != -1) {
        platform.usRevId = revId;
-
+    } else {
+        revId = platform.usRevId;
+    }
    uint64_t hwInfoConfig = defaultHardwareInfoConfigTable[productFamily];
    setHwInfoValuesFromConfig(hwInfoConfig, hwInfoForTests);

--- a/opencl/test/unit_test/mt_tests/gen9/skl/CMakeLists.txt
+++ b/opencl/test/unit_test/mt_tests/gen9/skl/CMakeLists.txt
@@ -5,6 +5,6 @@
 #

 if(TESTS_SKL)
-  set(mt_test_config "skl/1/3/8/0")
+  set(mt_test_config "skl/1/3/8/9")
  include(${OPENCL_MT_TEST_DIR}/cmake/run_mt_test_target.cmake)
 endif()
--- a/opencl/test/unit_test/offline_compiler/CMakeLists.txt
+++ b/opencl/test/unit_test/offline_compiler/CMakeLists.txt
@@ -112,7 +112,7 @@ macro(macro_for_each_platform)
  if("${PLATFORM_IT_LOWER}" STREQUAL "${CLOC_LIB_DEFAULT_DEVICE}")
    foreach(PLATFORM_TYPE ${PLATFORM_TYPES})
      if(${PLATFORM_IT}_IS_${PLATFORM_TYPE})
-        foreach(REVISION_ID ${${GEN_TYPE}_REVISIONS})
+        foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS})
          get_family_name_with_type(${GEN_TYPE} ${PLATFORM_TYPE})
          add_dependencies(run_ocloc_tests prepare_test_kernels_${family_name_with_type}_${REVISION_ID})
          neo_copy_test_files(copy_test_files_${family_name_with_type} ${family_name_with_type})
--- a/shared/test/unit_test/test_files/CMakeLists.txt
+++ b/shared/test/unit_test/test_files/CMakeLists.txt
@@ -69,9 +69,13 @@ file(GLOB_RECURSE TEST_KERNELS *.cl)
 add_custom_target(prepare_test_kernel_for_shared)

 macro(macro_for_each_platform)
-  foreach(REVISION_ID ${${GEN_TYPE}_REVISIONS})
+  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}_${REVISION_ID} ${PLATFORM_IT} ${REVISION_ID})
        add_dependencies(prepare_test_kernel_for_shared copy_test_kernel_${PLATFORM_IT}_${REVISION_ID})
+      endif()
+    endforeach()
  endforeach()
 endmacro()

@@ -83,7 +87,7 @@ macro(macro_for_each_gen)

      get_family_name_with_type(${GEN_TYPE} ${PLATFORM_TYPE})
      set(PLATFORM_LOWER ${DEFAULT_SUPPORTED_${GEN_TYPE}_${PLATFORM_TYPE}_PLATFORM})
-      foreach(REVISION_ID ${${GEN_TYPE}_REVISIONS})
+      foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS})
        compile_kernels_gen(${family_name_with_type} ${REVISION_ID} ${PLATFORM_LOWER} ${family_name_with_type} ${TEST_KERNELS})

        add_custom_target(prepare_test_kernel_for_shared_${family_name_with_type}_${REVISION_ID} DEPENDS ${compiled_kernels_${family_name_with_type}_${REVISION_ID}})
--- a/target_unit_tests/gen9/cfl/CMakeLists.txt
+++ b/target_unit_tests/gen9/cfl/CMakeLists.txt
@@ -5,6 +5,6 @@
 #

 if(TESTS_CFL)
-  set(unit_test_config "cfl/1/3/6/0")
+  set(unit_test_config "cfl/1/3/6/9")
  include(${NEO_SOURCE_DIR}/cmake/run_ult_target.cmake)
 endif()
--- a/target_unit_tests/gen9/kbl/CMakeLists.txt
+++ b/target_unit_tests/gen9/kbl/CMakeLists.txt
@@ -5,6 +5,6 @@
 #

 if(TESTS_KBL)
-  set(unit_test_config "kbl/1/3/6/0")
+  set(unit_test_config "kbl/1/3/6/9")
  include(${NEO_SOURCE_DIR}/cmake/run_ult_target.cmake)
 endif()
--- a/target_unit_tests/gen9/skl/CMakeLists.txt
+++ b/target_unit_tests/gen9/skl/CMakeLists.txt
@@ -5,6 +5,6 @@
 #

 if(TESTS_SKL)
-  set(unit_test_config "skl/1/3/8/0")
+  set(unit_test_config "skl/1/3/8/9")
  include(${NEO_SOURCE_DIR}/cmake/run_ult_target.cmake)
 endif()