From d7e4117dcf2b1e3e77fa3a8197b6eb4ca053f50b Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Mon, 28 Nov 2022 15:05:25 +0000 Subject: [PATCH] Compile builtins and test kernels per product family Signed-off-by: Mateusz Jablonski --- cmake/setup_platform_flags.cmake | 134 ++++++++++-------- manifests/manifest.yml | 2 +- .../source/built_ins/kernels/CMakeLists.txt | 2 +- opencl/test/unit_test/CMakeLists.txt | 2 +- platforms.cmake | 12 +- shared/source/built_ins/built_ins_storage.cpp | 3 +- shared/source/gen11/hw_info_ehl.cpp | 2 +- shared/source/gen11/hw_info_icllp.cpp | 2 +- shared/source/gen11/hw_info_lkf.cpp | 2 +- shared/source/gen12lp/hw_info_adln.cpp | 2 +- shared/source/gen12lp/hw_info_adlp.cpp | 2 +- shared/source/gen12lp/hw_info_adls.cpp | 2 +- shared/source/gen12lp/hw_info_dg1.cpp | 2 +- shared/source/gen12lp/hw_info_rkl.cpp | 2 +- shared/source/gen12lp/hw_info_tgllp.cpp | 2 +- shared/source/gen8/hw_info_bdw.cpp | 2 +- .../cfl/os_agnostic_hw_info_config_cfl.inl | 5 + shared/source/gen9/hw_helper_gen9.cpp | 8 -- shared/source/gen9/hw_info_bxt.cpp | 2 +- shared/source/gen9/hw_info_cfl.cpp | 2 +- shared/source/gen9/hw_info_glk.cpp | 2 +- shared/source/gen9/hw_info_kbl.cpp | 2 +- shared/source/gen9/hw_info_skl.cpp | 2 +- .../kbl/os_agnostic_hw_info_config_kbl.inl | 5 + .../skl/os_agnostic_hw_info_config_skl.inl | 5 + shared/source/helpers/hw_helper.h | 3 - shared/source/helpers/hw_helper_base.inl | 5 - shared/source/os_interface/hw_info_config.h | 2 + shared/source/os_interface/hw_info_config.inl | 5 + .../unit_test/built_ins/builtin_tests.cpp | 15 +- .../gen9/cfl/test_hw_info_config_cfl.cpp | 5 + .../gen9/kbl/test_hw_info_config_kbl.cpp | 5 + .../gen9/skl/test_hw_info_config_skl.cpp | 5 + .../unit_test/helpers/hw_helper_tests.cpp | 11 -- .../os_interface/hw_info_config_tests.cpp | 4 + 35 files changed, 148 insertions(+), 120 deletions(-) diff --git a/cmake/setup_platform_flags.cmake b/cmake/setup_platform_flags.cmake index c5991aa4a8..8c3c4cc373 100644 --- a/cmake/setup_platform_flags.cmake +++ b/cmake/setup_platform_flags.cmake @@ -54,15 +54,15 @@ endforeach() # Add supported and tested platforms if(SUPPORT_GEN8) - set(CORE_GEN8_REVISIONS 0) if(TESTS_GEN8) ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN8" "Gen8Family") endif() if(SUPPORT_BDW) + set(BDW_GEN8_REVISIONS 0) ADD_PRODUCT("SUPPORTED" "BDW" "IGFX_BROADWELL") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN8" "BDW" "CORE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_2_0" "GEN8" "BDW" "CORE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN8" "BDW" "CORE") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN8" "BDW") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_2_0" "GEN8" "BDW") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN8" "BDW") if(TESTS_BDW) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN8" "BDW") ADD_PRODUCT("TESTED" "BDW" "IGFX_BROADWELL") @@ -71,17 +71,16 @@ if(SUPPORT_GEN8) endif() if(SUPPORT_GEN9) - set(CORE_GEN9_REVISIONS 9) - set(LP_GEN9_REVISIONS 0) if(TESTS_GEN9) ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN9" "Gen9Family") endif() if(SUPPORT_SKL) + set(SKL_GEN9_REVISIONS 9) ADD_PRODUCT("SUPPORTED" "SKL" "IGFX_SKYLAKE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN9" "SKL" "CORE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_2_0" "GEN9" "SKL" "CORE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN9" "SKL" "CORE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "SKL" "CORE") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN9" "SKL") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_2_0" "GEN9" "SKL") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN9" "SKL") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "SKL") if(TESTS_SKL) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN9" "SKL") ADD_PRODUCT("TESTED" "SKL" "IGFX_SKYLAKE") @@ -89,11 +88,12 @@ if(SUPPORT_GEN9) endif() if(SUPPORT_KBL) + set(KBL_GEN9_REVISIONS 9) ADD_PRODUCT("SUPPORTED" "KBL" "IGFX_KABYLAKE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN9" "KBL" "CORE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_2_0" "GEN9" "KBL" "CORE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN9" "KBL" "CORE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "KBL" "CORE") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN9" "KBL") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_2_0" "GEN9" "KBL") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN9" "KBL") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "KBL") if(TESTS_KBL) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN9" "KBL") ADD_PRODUCT("TESTED" "KBL" "IGFX_KABYLAKE") @@ -101,10 +101,11 @@ if(SUPPORT_GEN9) endif() if(SUPPORT_GLK) + set(GLK_GEN9_REVISIONS 0) ADD_PRODUCT("SUPPORTED" "GLK" "IGFX_GEMINILAKE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN9" "GLK" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN9" "GLK" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "GLK" "LP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN9" "GLK") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN9" "GLK") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "GLK") if(TESTS_GLK) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN9" "GLK") ADD_PRODUCT("TESTED" "GLK" "IGFX_GEMINILAKE") @@ -112,11 +113,12 @@ if(SUPPORT_GEN9) endif() if(SUPPORT_CFL) + set(CFL_GEN9_REVISIONS 9) ADD_PRODUCT("SUPPORTED" "CFL" "IGFX_COFFEELAKE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN9" "CFL" "CORE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_2_0" "GEN9" "CFL" "CORE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN9" "CFL" "CORE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "CFL" "CORE") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN9" "CFL") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_2_0" "GEN9" "CFL") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN9" "CFL") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "CFL") if(TESTS_CFL) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN9" "CFL") ADD_PRODUCT("TESTED" "CFL" "IGFX_COFFEELAKE") @@ -124,10 +126,11 @@ if(SUPPORT_GEN9) endif() if(SUPPORT_BXT) + set(BXT_GEN9_REVISIONS 0) ADD_PRODUCT("SUPPORTED" "BXT" "IGFX_BROXTON") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN9" "BXT" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN9" "BXT" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "BXT" "LP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN9" "BXT") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN9" "BXT") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "BXT") if(TESTS_BXT) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN9" "BXT") ADD_PRODUCT("TESTED" "BXT" "IGFX_BROXTON") @@ -136,18 +139,17 @@ if(SUPPORT_GEN9) endif() if(SUPPORT_GEN11) - set(CORE_GEN11_REVISIONS 0) - set(LP_GEN11_REVISIONS 0) if(TESTS_GEN11) ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN11" "Gen11Family") endif() if(SUPPORT_ICLLP) + set(ICLLP_GEN11_REVISIONS 0) ADD_PRODUCT("SUPPORTED" "ICLLP" "IGFX_ICELAKE_LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN11" "ICLLP" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_2_0" "GEN11" "ICLLP" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN11" "ICLLP" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN11" "ICLLP" "LP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN11" "ICLLP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_2_0" "GEN11" "ICLLP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN11" "ICLLP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN11" "ICLLP") if(TESTS_ICLLP) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN11" "ICLLP") ADD_PRODUCT("TESTED" "ICLLP" "IGFX_ICELAKE_LP") @@ -155,9 +157,10 @@ if(SUPPORT_GEN11) endif() if(SUPPORT_LKF) + set(LKF_GEN11_REVISIONS 0) ADD_PRODUCT("SUPPORTED" "LKF" "IGFX_LAKEFIELD") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN11" "LKF" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN11" "LKF" "LP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN11" "LKF") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN11" "LKF") if(TESTS_LKF) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN11" "LKF") ADD_PRODUCT("TESTED" "LKF" "IGFX_LAKEFIELD") @@ -165,9 +168,10 @@ if(SUPPORT_GEN11) endif() if(SUPPORT_EHL) + set(EHL_GEN11_REVISIONS 0) ADD_PRODUCT("SUPPORTED" "EHL" "IGFX_ELKHARTLAKE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN11" "EHL" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN11" "EHL" "LP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN11" "EHL") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN11" "EHL") if(TESTS_EHL) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN11" "EHL") ADD_PRODUCT("TESTED" "EHL" "IGFX_ELKHARTLAKE") @@ -176,15 +180,15 @@ if(SUPPORT_GEN11) endif() if(SUPPORT_GEN12LP) - set(LP_GEN12LP_REVISIONS 0) if(TESTS_GEN12LP) ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN12LP" "Gen12LpFamily") endif() if(SUPPORT_TGLLP) + set(TGLLP_GEN12LP_REVISIONS 0) ADD_PRODUCT("SUPPORTED" "TGLLP" "IGFX_TIGERLAKE_LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "TGLLP" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "TGLLP" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "TGLLP" "LP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "TGLLP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "TGLLP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "TGLLP") if(TESTS_TGLLP) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN12LP" "TGLLP") ADD_PRODUCT("TESTED" "TGLLP" "IGFX_TIGERLAKE_LP") @@ -192,10 +196,11 @@ if(SUPPORT_GEN12LP) endif() if(SUPPORT_DG1) + set(DG1_GEN12LP_REVISIONS 0) ADD_PRODUCT("SUPPORTED" "DG1" "IGFX_DG1") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "DG1" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "DG1" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "DG1" "LP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "DG1") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "DG1") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "DG1") if(TESTS_DG1) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN12LP" "DG1") ADD_PRODUCT("TESTED" "DG1" "IGFX_DG1") @@ -203,10 +208,11 @@ if(SUPPORT_GEN12LP) endif() if(SUPPORT_RKL) + set(RKL_GEN12LP_REVISIONS 0) ADD_PRODUCT("SUPPORTED" "RKL" "IGFX_ROCKETLAKE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "RKL" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "RKL" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "RKL" "LP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "RKL") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "RKL") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "RKL") if(TESTS_RKL) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN12LP" "RKL") ADD_PRODUCT("TESTED" "RKL" "IGFX_ROCKETLAKE") @@ -214,10 +220,11 @@ if(SUPPORT_GEN12LP) endif() if(SUPPORT_ADLS) + set(ADLS_GEN12LP_REVISIONS 0) ADD_PRODUCT("SUPPORTED" "ADLS" "IGFX_ALDERLAKE_S") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "ADLS" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "ADLS" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "ADLS" "LP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "ADLS") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "ADLS") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "ADLS") if(TESTS_ADLS) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN12LP" "ADLS") ADD_PRODUCT("TESTED" "ADLS" "IGFX_ALDERLAKE_S") @@ -225,10 +232,11 @@ if(SUPPORT_GEN12LP) endif() if(SUPPORT_ADLP) + set(ADLP_GEN12LP_REVISIONS 0) ADD_PRODUCT("SUPPORTED" "ADLP" "IGFX_ALDERLAKE_P") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "ADLP" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "ADLP" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "ADLP" "LP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "ADLP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "ADLP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "ADLP") if(TESTS_ADLP) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN12LP" "ADLP") ADD_PRODUCT("TESTED" "ADLP" "IGFX_ALDERLAKE_P") @@ -236,10 +244,11 @@ if(SUPPORT_GEN12LP) endif() if(SUPPORT_ADLN) + set(ADLN_GEN12LP_REVISIONS 0) ADD_PRODUCT("SUPPORTED" "ADLN" "IGFX_ALDERLAKE_N") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "ADLN" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "ADLN" "LP") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "ADLN" "LP") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "ADLN") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "ADLN") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "ADLN") if(TESTS_ADLN) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN12LP" "ADLN") ADD_PRODUCT("TESTED" "ADLN" "IGFX_ALDERLAKE_N") @@ -248,7 +257,6 @@ if(SUPPORT_GEN12LP) endif() if(SUPPORT_XE_HP_CORE) - set(CORE_XE_HP_CORE_REVISIONS 4) if(TESTS_XE_HP_CORE) if(TESTS_XE_HP_SDV) ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "XE_HP_CORE" "XeHpFamily") @@ -257,10 +265,11 @@ if(SUPPORT_XE_HP_CORE) endif() endif() if(SUPPORT_XE_HP_SDV) + set(XE_HP_SDV_XE_HP_CORE_REVISIONS 4) ADD_PRODUCT("SUPPORTED" "XE_HP_SDV" "IGFX_XE_HP_SDV") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "XE_HP_CORE" "XE_HP_SDV" "CORE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "XE_HP_CORE" "XE_HP_SDV" "CORE") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "XE_HP_CORE" "XE_HP_SDV" "CORE") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "XE_HP_CORE" "XE_HP_SDV") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "XE_HP_CORE" "XE_HP_SDV") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "XE_HP_CORE" "XE_HP_SDV") if(TESTS_XE_HP_SDV) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "XE_HP_CORE" "XE_HP_SDV") ADD_PRODUCT("TESTED" "XE_HP_SDV" "IGFX_XE_HP_SDV") @@ -269,16 +278,15 @@ if(SUPPORT_XE_HP_CORE) endif() if(SUPPORT_XE_HPG_CORE) - set(CORE_XE_HPG_CORE_REVISIONS 0) if(TESTS_XE_HPG_CORE) ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "XE_HPG_CORE" "XeHpgCoreFamily") endif() if(SUPPORT_DG2) set(DG2_XE_HPG_CORE_REVISIONS 0) ADD_PRODUCT("SUPPORTED" "DG2" "IGFX_DG2") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "XE_HPG_CORE" "DG2" "DG2") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "XE_HPG_CORE" "DG2" "DG2") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "XE_HPG_CORE" "DG2" "DG2") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "XE_HPG_CORE" "DG2") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "XE_HPG_CORE" "DG2") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "XE_HPG_CORE" "DG2") if(TESTS_DG2) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "XE_HPG_CORE" "DG2") ADD_PRODUCT("TESTED" "DG2" "IGFX_DG2") @@ -295,8 +303,8 @@ if(SUPPORT_XE_HPC_CORE) if(SUPPORT_PVC) set(PVC_XE_HPC_CORE_REVISIONS 0 3 30 38 46 47 157) ADD_PRODUCT("SUPPORTED" "PVC" "IGFX_PVC") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "XE_HPC_CORE" "PVC" "PVC") - ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "XE_HPC_CORE" "PVC" "PVC") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "XE_HPC_CORE" "PVC") + ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "XE_HPC_CORE" "PVC") set(PREFERRED_PLATFORM "PVC") if(TESTS_PVC) set(PREFERRED_FAMILY_NAME "XeHpcCoreFamily") diff --git a/manifests/manifest.yml b/manifests/manifest.yml index 67547f09a1..c645ecefd4 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -38,7 +38,7 @@ components: dest_dir: kernels_bin type: git branch: kernels_bin - revision: 2000-460 + revision: 2000-462 kmdaf: branch: kmdaf dest_dir: kmdaf diff --git a/opencl/source/built_ins/kernels/CMakeLists.txt b/opencl/source/built_ins/kernels/CMakeLists.txt index f7247f7df4..972b795eca 100644 --- a/opencl/source/built_ins/kernels/CMakeLists.txt +++ b/opencl/source/built_ins/kernels/CMakeLists.txt @@ -25,7 +25,7 @@ set(BUILTIN_CPP "") function(get_bits_for_stateless core_type platform_type) # Force 32bits compiling on gen9lp for stateless builtins - if((${CORE_TYPE} STREQUAL "GEN9") AND (${PLATFORM_TYPE} STREQUAL "LP")) + if((${CORE_TYPE} STREQUAL "GEN9") AND ((${PLATFORM_TYPE} STREQUAL "BXT") OR (${PLATFORM_TYPE} STREQUAL "GLK"))) set(BITS "32" PARENT_SCOPE) else() set(BITS ${NEO_BITS} PARENT_SCOPE) diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt index 7d1a835a05..584eca0a13 100644 --- a/opencl/test/unit_test/CMakeLists.txt +++ b/opencl/test/unit_test/CMakeLists.txt @@ -376,7 +376,7 @@ macro(macro_for_each_core_type) endif() # Gen9lp needs extra -m32 flag - if(("${CORE_TYPE_LOWER}" STREQUAL "gen9") AND ("${PLATFORM_TYPE_LOWER}" STREQUAL "lp")) + if(("${CORE_TYPE_LOWER}" STREQUAL "gen9") AND (("${PLATFORM_TYPE_LOWER}" STREQUAL "bxt") OR ("${PLATFORM_TYPE_LOWER}" STREQUAL "glk"))) foreach(REVISION_ID ${${PLATFORM_TYPE}_${CORE_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}) diff --git a/platforms.cmake b/platforms.cmake index ecef39ee9b..9f30b685e6 100644 --- a/platforms.cmake +++ b/platforms.cmake @@ -199,14 +199,14 @@ macro(DISABLE_FLAGS_FOR CORE_TYPE) endforeach() endmacro() -macro(ADD_PLATFORM_FOR_CORE_TYPE LIST_TYPE CORE_TYPE PLATFORM_NAME PLATFORM_TYPE) - list(APPEND PLATFORM_TYPES ${PLATFORM_TYPE}) +macro(ADD_PLATFORM_FOR_CORE_TYPE LIST_TYPE CORE_TYPE PLATFORM_NAME) + list(APPEND PLATFORM_TYPES ${PLATFORM_NAME}) list(REMOVE_DUPLICATES PLATFORM_TYPES) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" ${LIST_TYPE} ${CORE_TYPE} ${PLATFORM_NAME}) - set(${CORE_TYPE}_HAS_${PLATFORM_TYPE} TRUE) - set(${PLATFORM_NAME}_IS_${PLATFORM_TYPE} TRUE) - if(NOT DEFAULT_${LIST_TYPE}_${CORE_TYPE}_${PLATFORM_TYPE}_PLATFORM) - string(TOLOWER ${PLATFORM_NAME} DEFAULT_${LIST_TYPE}_${CORE_TYPE}_${PLATFORM_TYPE}_PLATFORM) + set(${CORE_TYPE}_HAS_${PLATFORM_NAME} TRUE) + set(${PLATFORM_NAME}_IS_${PLATFORM_NAME} TRUE) + if(NOT DEFAULT_${LIST_TYPE}_${CORE_TYPE}_${PLATFORM_NAME}_PLATFORM) + string(TOLOWER ${PLATFORM_NAME} DEFAULT_${LIST_TYPE}_${CORE_TYPE}_${PLATFORM_NAME}_PLATFORM) endif() endmacro() diff --git a/shared/source/built_ins/built_ins_storage.cpp b/shared/source/built_ins/built_ins_storage.cpp index b90d6bf7e8..6ac479aa2f 100644 --- a/shared/source/built_ins/built_ins_storage.cpp +++ b/shared/source/built_ins/built_ins_storage.cpp @@ -80,6 +80,7 @@ std::string createBuiltinResourceName(EBuiltInOps::Type builtin, const std::stri StackVec getBuiltinResourceNames(EBuiltInOps::Type builtin, BuiltinCode::ECodeType type, const Device &device) { auto &hwInfo = device.getHardwareInfo(); auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily); + auto &productHelper = device.getRootDeviceEnvironment().getHelper(); const auto platformName = getFamilyNameWithType(hwInfo); const auto revisionId = std::to_string(hwInfo.platform.usRevId); @@ -114,7 +115,7 @@ StackVec getBuiltinResourceNames(EBuiltInOps::Type builtin, Buil const bool requiresSpecificResource = (BuiltinCode::ECodeType::Binary == type && hwHelper.isRevisionSpecificBinaryBuiltinRequired()); if (false == requiresSpecificResource) { - const auto defaultRevisionId = std::to_string(hwHelper.getDefaultRevisionId(hwInfo)); + const auto defaultRevisionId = std::to_string(productHelper.getDefaultRevisionId()); resourcesToLookup.push_back(createBuiltinResourceName(platformName, defaultRevisionId, addressingMode, builtinName, extension)); resourcesToLookup.push_back(createBuiltinResourceName("", "", addressingMode, builtinName, extension)); } diff --git a/shared/source/gen11/hw_info_ehl.cpp b/shared/source/gen11/hw_info_ehl.cpp index 01df12a004..2bb86df5e1 100644 --- a/shared/source/gen11/hw_info_ehl.cpp +++ b/shared/source/gen11/hw_info_ehl.cpp @@ -36,7 +36,7 @@ const RuntimeCapabilityTable EHL::capabilityTable{ 0, // sharedSystemMemCapabilities 83.333, // defaultProfilingTimerResolution MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "lp", // platformType + "ehl", // platformType "", // deviceName PreemptionMode::MidThread, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType diff --git a/shared/source/gen11/hw_info_icllp.cpp b/shared/source/gen11/hw_info_icllp.cpp index 6a5f06d5c3..4fd96cd2dd 100644 --- a/shared/source/gen11/hw_info_icllp.cpp +++ b/shared/source/gen11/hw_info_icllp.cpp @@ -36,7 +36,7 @@ const RuntimeCapabilityTable ICLLP::capabilityTable{ 0, // sharedSystemMemCapabilities 83.333, // defaultProfilingTimerResolution MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "lp", // platformType + "icllp", // platformType "", // deviceName PreemptionMode::MidThread, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType diff --git a/shared/source/gen11/hw_info_lkf.cpp b/shared/source/gen11/hw_info_lkf.cpp index 482bbc8999..aa533ac0e1 100644 --- a/shared/source/gen11/hw_info_lkf.cpp +++ b/shared/source/gen11/hw_info_lkf.cpp @@ -36,7 +36,7 @@ const RuntimeCapabilityTable LKF::capabilityTable{ 0, // sharedSystemMemCapabilities 83.333, // defaultProfilingTimerResolution MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "lp", // platformType + "lkf", // platformType "", // deviceName PreemptionMode::MidThread, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType diff --git a/shared/source/gen12lp/hw_info_adln.cpp b/shared/source/gen12lp/hw_info_adln.cpp index bdd9cc8e96..060be7b9d6 100644 --- a/shared/source/gen12lp/hw_info_adln.cpp +++ b/shared/source/gen12lp/hw_info_adln.cpp @@ -37,7 +37,7 @@ const RuntimeCapabilityTable ADLN::capabilityTable{ 0, // sharedSystemMemCapabilities 83.333, // defaultProfilingTimerResolution MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "lp", // platformType + "adln", // platformType "", // deviceName PreemptionMode::MidThread, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType diff --git a/shared/source/gen12lp/hw_info_adlp.cpp b/shared/source/gen12lp/hw_info_adlp.cpp index 7b4fe1c9b0..28ea7d4534 100644 --- a/shared/source/gen12lp/hw_info_adlp.cpp +++ b/shared/source/gen12lp/hw_info_adlp.cpp @@ -37,7 +37,7 @@ const RuntimeCapabilityTable ADLP::capabilityTable{ 0, // sharedSystemMemCapabilities 83.333, // defaultProfilingTimerResolution MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "lp", // platformType + "adlp", // platformType "", // deviceName PreemptionMode::MidThread, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType diff --git a/shared/source/gen12lp/hw_info_adls.cpp b/shared/source/gen12lp/hw_info_adls.cpp index e0d6be7039..5996796126 100644 --- a/shared/source/gen12lp/hw_info_adls.cpp +++ b/shared/source/gen12lp/hw_info_adls.cpp @@ -37,7 +37,7 @@ const RuntimeCapabilityTable ADLS::capabilityTable{ 0, // sharedSystemMemCapabilities 83.333, // defaultProfilingTimerResolution MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "lp", // platformType + "adls", // platformType "", // deviceName PreemptionMode::MidThread, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType diff --git a/shared/source/gen12lp/hw_info_dg1.cpp b/shared/source/gen12lp/hw_info_dg1.cpp index 530e03ce58..10bd7ece10 100644 --- a/shared/source/gen12lp/hw_info_dg1.cpp +++ b/shared/source/gen12lp/hw_info_dg1.cpp @@ -37,7 +37,7 @@ const RuntimeCapabilityTable DG1::capabilityTable{ 0, // sharedSystemMemCapabilities 83.333, // defaultProfilingTimerResolution MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "lp", // platformType + "dg1", // platformType "", // deviceName PreemptionMode::MidThread, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType diff --git a/shared/source/gen12lp/hw_info_rkl.cpp b/shared/source/gen12lp/hw_info_rkl.cpp index bf8636060a..99c467f349 100644 --- a/shared/source/gen12lp/hw_info_rkl.cpp +++ b/shared/source/gen12lp/hw_info_rkl.cpp @@ -37,7 +37,7 @@ const RuntimeCapabilityTable RKL::capabilityTable{ 0, // sharedSystemMemCapabilities 83.333, // defaultProfilingTimerResolution MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "lp", // platformType + "rkl", // platformType "", // deviceName PreemptionMode::MidThread, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType diff --git a/shared/source/gen12lp/hw_info_tgllp.cpp b/shared/source/gen12lp/hw_info_tgllp.cpp index 3d5d2011b8..28f2952de3 100644 --- a/shared/source/gen12lp/hw_info_tgllp.cpp +++ b/shared/source/gen12lp/hw_info_tgllp.cpp @@ -37,7 +37,7 @@ const RuntimeCapabilityTable TGLLP::capabilityTable{ 0, // sharedSystemMemCapabilities 83.333, // defaultProfilingTimerResolution MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "lp", // platformType + "tgllp", // platformType "", // deviceName PreemptionMode::MidThread, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType diff --git a/shared/source/gen8/hw_info_bdw.cpp b/shared/source/gen8/hw_info_bdw.cpp index 875146d9bb..b666142703 100644 --- a/shared/source/gen8/hw_info_bdw.cpp +++ b/shared/source/gen8/hw_info_bdw.cpp @@ -36,7 +36,7 @@ const RuntimeCapabilityTable BDW::capabilityTable{ 0, // sharedSystemMemCapabilities 80, // defaultProfilingTimerResolution MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "core", // platformType + "bdw", // platformType "", // deviceName PreemptionMode::Disabled, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType diff --git a/shared/source/gen9/cfl/os_agnostic_hw_info_config_cfl.inl b/shared/source/gen9/cfl/os_agnostic_hw_info_config_cfl.inl index 36455e185f..783cb69dc0 100644 --- a/shared/source/gen9/cfl/os_agnostic_hw_info_config_cfl.inl +++ b/shared/source/gen9/cfl/os_agnostic_hw_info_config_cfl.inl @@ -35,4 +35,9 @@ std::optional HwInfoConfigHw::getAubStrea return aub_stream::ProductFamily::Cfl; }; +template <> +uint32_t HwInfoConfigHw::getDefaultRevisionId() const { + return 9u; +} + } // namespace NEO diff --git a/shared/source/gen9/hw_helper_gen9.cpp b/shared/source/gen9/hw_helper_gen9.cpp index 1f32a83d91..538b1d4eac 100644 --- a/shared/source/gen9/hw_helper_gen9.cpp +++ b/shared/source/gen9/hw_helper_gen9.cpp @@ -36,14 +36,6 @@ int32_t HwHelperHw::getDefaultThreadArbitrationPolicy() const { return ThreadArbitrationPolicy::RoundRobin; } -template <> -uint32_t HwHelperHw::getDefaultRevisionId(const HardwareInfo &hwInfo) const { - if (std::strcmp(hwInfo.capabilityTable.platformType, "core") == 0) { - return 9u; - } - return 0u; -} - template <> bool MemorySynchronizationCommands::isBarrierWaRequired(const HardwareInfo &hwInfo) { return true; } diff --git a/shared/source/gen9/hw_info_bxt.cpp b/shared/source/gen9/hw_info_bxt.cpp index 5a5fbe8c57..6599896302 100644 --- a/shared/source/gen9/hw_info_bxt.cpp +++ b/shared/source/gen9/hw_info_bxt.cpp @@ -36,7 +36,7 @@ const RuntimeCapabilityTable BXT::capabilityTable{ 0, // sharedSystemMemCapabilities 52.083, // defaultProfilingTimerResolution MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "lp", // platformType + "bxt", // platformType "", // deviceName PreemptionMode::MidThread, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType diff --git a/shared/source/gen9/hw_info_cfl.cpp b/shared/source/gen9/hw_info_cfl.cpp index f2d34ea65b..28d22466ef 100644 --- a/shared/source/gen9/hw_info_cfl.cpp +++ b/shared/source/gen9/hw_info_cfl.cpp @@ -36,7 +36,7 @@ const RuntimeCapabilityTable CFL::capabilityTable{ 0, // sharedSystemMemCapabilities 83.333, // defaultProfilingTimerResolution MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "core", // platformType + "cfl", // platformType "", // deviceName PreemptionMode::MidThread, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType diff --git a/shared/source/gen9/hw_info_glk.cpp b/shared/source/gen9/hw_info_glk.cpp index 98ce9e9ae5..6417e63986 100644 --- a/shared/source/gen9/hw_info_glk.cpp +++ b/shared/source/gen9/hw_info_glk.cpp @@ -36,7 +36,7 @@ const RuntimeCapabilityTable GLK::capabilityTable{ 0, // sharedSystemMemCapabilities 52.083, // defaultProfilingTimerResolution MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "lp", // platformType + "glk", // platformType "", // deviceName PreemptionMode::MidThread, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType diff --git a/shared/source/gen9/hw_info_kbl.cpp b/shared/source/gen9/hw_info_kbl.cpp index 5454cc3574..96b70a508d 100644 --- a/shared/source/gen9/hw_info_kbl.cpp +++ b/shared/source/gen9/hw_info_kbl.cpp @@ -36,7 +36,7 @@ const RuntimeCapabilityTable KBL::capabilityTable{ 0, // sharedSystemMemCapabilities 83.333, // defaultProfilingTimerResolution MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "core", // platformType + "kbl", // platformType "", // deviceName PreemptionMode::MidThread, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType diff --git a/shared/source/gen9/hw_info_skl.cpp b/shared/source/gen9/hw_info_skl.cpp index f40c37532c..e4bc8b5adb 100644 --- a/shared/source/gen9/hw_info_skl.cpp +++ b/shared/source/gen9/hw_info_skl.cpp @@ -36,7 +36,7 @@ const RuntimeCapabilityTable SKL::capabilityTable{ 0, // sharedSystemMemCapabilities 83.333, // defaultProfilingTimerResolution MemoryConstants::pageSize, // requiredPreemptionSurfaceSize - "core", // platformType + "skl", // platformType "", // deviceName PreemptionMode::MidThread, // defaultPreemptionMode aub_stream::ENGINE_RCS, // defaultEngineType diff --git a/shared/source/gen9/kbl/os_agnostic_hw_info_config_kbl.inl b/shared/source/gen9/kbl/os_agnostic_hw_info_config_kbl.inl index 639dc83216..1c1bf01e74 100644 --- a/shared/source/gen9/kbl/os_agnostic_hw_info_config_kbl.inl +++ b/shared/source/gen9/kbl/os_agnostic_hw_info_config_kbl.inl @@ -32,4 +32,9 @@ std::optional HwInfoConfigHw::getAubStrea return aub_stream::ProductFamily::Kbl; }; +template <> +uint32_t HwInfoConfigHw::getDefaultRevisionId() const { + return 9u; +} + } // namespace NEO diff --git a/shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl b/shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl index a72f0042e5..27e7bf3875 100644 --- a/shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl +++ b/shared/source/gen9/skl/os_agnostic_hw_info_config_skl.inl @@ -18,4 +18,9 @@ std::optional HwInfoConfigHw::getAubStrea return aub_stream::ProductFamily::Skl; }; +template <> +uint32_t HwInfoConfigHw::getDefaultRevisionId() const { + return 9u; +} + } // namespace NEO diff --git a/shared/source/helpers/hw_helper.h b/shared/source/helpers/hw_helper.h index 6484b2b4fc..7034483f87 100644 --- a/shared/source/helpers/hw_helper.h +++ b/shared/source/helpers/hw_helper.h @@ -113,7 +113,6 @@ class HwHelper { virtual bool isCpuImageTransferPreferred(const HardwareInfo &hwInfo) const = 0; virtual bool isKmdMigrationSupported(const HardwareInfo &hwInfo) const = 0; virtual aub_stream::MMIOList getExtraMmioList(const HardwareInfo &hwInfo, const GmmHelper &gmmHelper) const = 0; - virtual uint32_t getDefaultRevisionId(const HardwareInfo &hwInfo) const = 0; virtual uint32_t getNumCacheRegions() const = 0; virtual bool isSubDeviceEngineSupported(const HardwareInfo &hwInfo, const DeviceBitfield &deviceBitfield, aub_stream::EngineType engineType) const = 0; virtual uint32_t getPlanarYuvMaxHeight() const = 0; @@ -318,8 +317,6 @@ class HwHelperHw : public HwHelper { aub_stream::MMIOList getExtraMmioList(const HardwareInfo &hwInfo, const GmmHelper &gmmHelper) const override; - uint32_t getDefaultRevisionId(const HardwareInfo &hwInfo) const override; - uint32_t getNumCacheRegions() const override; bool isSubDeviceEngineSupported(const HardwareInfo &hwInfo, const DeviceBitfield &deviceBitfield, aub_stream::EngineType engineType) const override; diff --git a/shared/source/helpers/hw_helper_base.inl b/shared/source/helpers/hw_helper_base.inl index 8eabb4662c..cd9d70f81d 100644 --- a/shared/source/helpers/hw_helper_base.inl +++ b/shared/source/helpers/hw_helper_base.inl @@ -619,11 +619,6 @@ bool HwHelperHw::isAdditionalFeatureFlagRequired(const FeatureTable * return false; } -template -uint32_t HwHelperHw::getDefaultRevisionId(const HardwareInfo &hwInfo) const { - return 0u; -} - template uint32_t HwHelperHw::getNumCacheRegions() const { return 0; diff --git a/shared/source/os_interface/hw_info_config.h b/shared/source/os_interface/hw_info_config.h index 847c991940..0528440671 100644 --- a/shared/source/os_interface/hw_info_config.h +++ b/shared/source/os_interface/hw_info_config.h @@ -180,6 +180,7 @@ class HwInfoConfig { virtual void fillFrontEndPropertiesSupportStructure(FrontEndPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) = 0; virtual void fillPipelineSelectPropertiesSupportStructure(PipelineSelectPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) = 0; virtual void fillStateBaseAddressPropertiesSupportStructure(StateBaseAddressPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) = 0; + virtual uint32_t getDefaultRevisionId() const = 0; MOCKABLE_VIRTUAL ~HwInfoConfig() = default; @@ -320,6 +321,7 @@ class HwInfoConfigHw : public HwInfoConfig { void fillFrontEndPropertiesSupportStructure(FrontEndPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) override; void fillPipelineSelectPropertiesSupportStructure(PipelineSelectPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) override; void fillStateBaseAddressPropertiesSupportStructure(StateBaseAddressPropertiesSupport &propertiesSupport, const HardwareInfo &hwInfo) override; + uint32_t getDefaultRevisionId() const override; protected: HwInfoConfigHw() = default; diff --git a/shared/source/os_interface/hw_info_config.inl b/shared/source/os_interface/hw_info_config.inl index c4b5acea4c..2e490f9ede 100644 --- a/shared/source/os_interface/hw_info_config.inl +++ b/shared/source/os_interface/hw_info_config.inl @@ -679,4 +679,9 @@ void HwInfoConfigHw::fillPipelineSelectPropertiesSupportStructure(Pi propertiesSupport.systolicMode = isSystolicModeConfigurable(hwInfo); } +template +uint32_t HwInfoConfigHw::getDefaultRevisionId() const { + return 0u; +} + } // namespace NEO diff --git a/shared/test/unit_test/built_ins/builtin_tests.cpp b/shared/test/unit_test/built_ins/builtin_tests.cpp index 28ff5b12b5..6692959456 100644 --- a/shared/test/unit_test/built_ins/builtin_tests.cpp +++ b/shared/test/unit_test/built_ins/builtin_tests.cpp @@ -23,9 +23,10 @@ HWTEST2_F(BuiltInSharedTest, givenUseBindlessBuiltinDisabledWhenBinExtensionPass DebugManagerStateRestore dbgRestorer; DebugManager.flags.UseBindlessMode.set(0); auto &hwInfo = *pDevice->getRootDeviceEnvironment().getMutableHardwareInfo(); + auto &productHelper = pDevice->getRootDeviceEnvironment().getHelper(); const std::string platformName = getFamilyNameWithType(hwInfo); const std::string revId = std::to_string(hwInfo.platform.usRevId); - const std::string defaultRevId = std::to_string(HwHelper::get(hwInfo.platform.eRenderCoreFamily).getDefaultRevisionId(hwInfo)); + const std::string defaultRevId = std::to_string(productHelper.getDefaultRevisionId()); auto resourceNames = getBuiltinResourceNames(EBuiltInOps::CopyBufferToBuffer, BuiltinCode::ECodeType::Binary, *pDevice); @@ -42,9 +43,10 @@ HWTEST2_F(BuiltInSharedTest, givenUseBindlessBuiltinEnabledWhenBinExtensionPasse DebugManagerStateRestore dbgRestorer; DebugManager.flags.UseBindlessMode.set(1); auto &hwInfo = *pDevice->getRootDeviceEnvironment().getMutableHardwareInfo(); + auto &productHelper = pDevice->getRootDeviceEnvironment().getHelper(); const std::string platformName = getFamilyNameWithType(hwInfo); const std::string revId = std::to_string(hwInfo.platform.usRevId); - const std::string defaultRevId = std::to_string(HwHelper::get(hwInfo.platform.eRenderCoreFamily).getDefaultRevisionId(hwInfo)); + const std::string defaultRevId = std::to_string(productHelper.getDefaultRevisionId()); auto resourceNames = getBuiltinResourceNames(EBuiltInOps::CopyBufferToBuffer, BuiltinCode::ECodeType::Binary, *pDevice); @@ -85,9 +87,10 @@ HWTEST2_F(BuiltInSharedTest, GivenBuiltinTypeBinaryWhenGettingBuiltinResourceFor HWTEST2_F(BuiltInSharedTest, GivenStatelessBuiltinWhenGettingResourceNameThenAddressingIsStateless, HasStatefulSupport) { auto &hwInfo = *pDevice->getRootDeviceEnvironment().getMutableHardwareInfo(); + auto &productHelper = pDevice->getRootDeviceEnvironment().getHelper(); const std::string platformName = getFamilyNameWithType(hwInfo); const std::string revId = std::to_string(hwInfo.platform.usRevId); - const std::string defaultRevId = std::to_string(HwHelper::get(hwInfo.platform.eRenderCoreFamily).getDefaultRevisionId(hwInfo)); + const std::string defaultRevId = std::to_string(productHelper.getDefaultRevisionId()); auto resourceNames = getBuiltinResourceNames(EBuiltInOps::CopyBufferToBufferStateless, BuiltinCode::ECodeType::Binary, *pDevice); @@ -122,9 +125,10 @@ HWTEST_F(BuiltInSharedTest, GivenRequestedTypeIntermediateWhenGettingResourceNam DebugManagerStateRestore dbgRestorer; DebugManager.flags.UseBindlessMode.set(0); auto &hwInfo = *pDevice->getRootDeviceEnvironment().getMutableHardwareInfo(); + auto &productHelper = pDevice->getRootDeviceEnvironment().getHelper(); const std::string platformName = getFamilyNameWithType(hwInfo); const std::string revId = std::to_string(hwInfo.platform.usRevId); - const std::string defaultRevId = std::to_string(HwHelper::get(hwInfo.platform.eRenderCoreFamily).getDefaultRevisionId(hwInfo)); + const std::string defaultRevId = std::to_string(productHelper.getDefaultRevisionId()); auto resourceNames = getBuiltinResourceNames(EBuiltInOps::CopyBufferToBuffer, BuiltinCode::ECodeType::Intermediate, *pDevice); @@ -147,9 +151,10 @@ HWTEST_F(BuiltInSharedTest, GivenValidBuiltinTypeAndAnyTypeWhenGettingBuiltinCod auto builtinsLib = std::make_unique(); auto &hwInfo = *pDevice->getRootDeviceEnvironment().getMutableHardwareInfo(); + auto &productHelper = pDevice->getRootDeviceEnvironment().getHelper(); const std::string platformName = getFamilyNameWithType(hwInfo); const std::string revId = std::to_string(hwInfo.platform.usRevId); - const std::string defaultRevId = std::to_string(HwHelper::get(hwInfo.platform.eRenderCoreFamily).getDefaultRevisionId(hwInfo)); + const std::string defaultRevId = std::to_string(productHelper.getDefaultRevisionId()); auto builtinCode = builtinsLib->getBuiltinCode(EBuiltInOps::CopyBufferToBuffer, BuiltinCode::ECodeType::Any, *pDevice); EXPECT_EQ(BuiltinCode::ECodeType::Binary, builtinCode.type); diff --git a/shared/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp b/shared/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp index f9fbcb38c7..531e262c96 100644 --- a/shared/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp +++ b/shared/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp @@ -20,6 +20,11 @@ using namespace NEO; using CflProductHelper = HwInfoConfigTest; +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenGettingDefaultRevisionIdThenZeroIsReturned, IGFX_COFFEELAKE) +CFLTEST_F(CflProductHelper, whenGettingDefaultRevisionIdThen9IsReturned) { + EXPECT_EQ(9u, productHelper->getDefaultRevisionId()); +} + CFLTEST_F(CflProductHelper, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned) { GT_SYSTEM_INFO >SystemInfo = pInHwInfo.gtSystemInfo; diff --git a/shared/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp b/shared/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp index a253664f1e..bc2ed3e288 100644 --- a/shared/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp +++ b/shared/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp @@ -18,6 +18,11 @@ using namespace NEO; using KblProductHelper = HwInfoConfigTest; +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenGettingDefaultRevisionIdThenZeroIsReturned, IGFX_KABYLAKE) +KBLTEST_F(KblProductHelper, whenGettingDefaultRevisionIdThen9IsReturned) { + EXPECT_EQ(9u, productHelper->getDefaultRevisionId()); +} + KBLTEST_F(KblProductHelper, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned) { GT_SYSTEM_INFO >SystemInfo = pInHwInfo.gtSystemInfo; diff --git a/shared/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp b/shared/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp index e8f47197aa..f31a28a596 100644 --- a/shared/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp +++ b/shared/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp @@ -18,6 +18,11 @@ using namespace NEO; using SklProductHelper = HwInfoConfigTest; +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenGettingDefaultRevisionIdThenZeroIsReturned, IGFX_SKYLAKE) +SKLTEST_F(SklProductHelper, whenGettingDefaultRevisionIdThen9IsReturned) { + EXPECT_EQ(9u, productHelper->getDefaultRevisionId()); +} + SKLTEST_F(SklProductHelper, GivenIncorrectDataWhenConfiguringHwInfoThenErrorIsReturned) { GT_SYSTEM_INFO >SystemInfo = pInHwInfo.gtSystemInfo; diff --git a/shared/test/unit_test/helpers/hw_helper_tests.cpp b/shared/test/unit_test/helpers/hw_helper_tests.cpp index f889c1a804..142eeeacfb 100644 --- a/shared/test/unit_test/helpers/hw_helper_tests.cpp +++ b/shared/test/unit_test/helpers/hw_helper_tests.cpp @@ -1149,17 +1149,6 @@ TEST_F(HwHelperTest, whenFtrGpGpuMidThreadLevelPreemptFeatureDisabledThenFalseIs EXPECT_FALSE(result); } -HWTEST_F(HwHelperTest, whenGettingDefaultRevisionIdThenCorrectValueIsReturned) { - auto &hwHelper = HwHelper::get(renderCoreFamily); - auto revisionId = hwHelper.getDefaultRevisionId(*defaultHwInfo); - if ((defaultHwInfo->platform.eRenderCoreFamily == IGFX_GEN9_CORE) && - (strcmp(defaultHwInfo->capabilityTable.platformType, "core") == 0)) { - EXPECT_EQ(9u, revisionId); - } else { - EXPECT_EQ(0u, revisionId); - } -} - HWTEST_F(HwHelperTest, whenGettingNumberOfCacheRegionsThenReturnZero) { auto &hwHelper = HwHelper::get(renderCoreFamily); EXPECT_EQ(0u, hwHelper.getNumCacheRegions()); diff --git a/shared/test/unit_test/os_interface/hw_info_config_tests.cpp b/shared/test/unit_test/os_interface/hw_info_config_tests.cpp index 03ec3ac399..801302ffb7 100644 --- a/shared/test/unit_test/os_interface/hw_info_config_tests.cpp +++ b/shared/test/unit_test/os_interface/hw_info_config_tests.cpp @@ -46,6 +46,10 @@ HWTEST_F(HwInfoConfigTest, givenDebugFlagSetWhenAskingForHostMemCapabilitesThenR EXPECT_NE(0u, hwInfoConfig->getHostMemCapabilities(&pInHwInfo)); } +HWTEST_F(HwInfoConfigTest, whenGettingDefaultRevisionIdThenZeroIsReturned) { + EXPECT_EQ(0u, productHelper->getDefaultRevisionId()); +} + HWTEST_F(HwInfoConfigTest, givenHwInfoConfigWhenGettingSharedSystemMemCapabilitiesThenCorrectValueIsReturned) { DebugManagerStateRestore restore;