From 0940776a974cfcba610457a7871a3cb37487dc77 Mon Sep 17 00:00:00 2001 From: Zbigniew Zdanowicz Date: Fri, 9 Aug 2024 01:19:34 +0000 Subject: [PATCH] refactor: add before cmake macro for older platforms Signed-off-by: Zbigniew Zdanowicz --- cmake/fill_core_types.cmake | 1 + cmake/setup_platform_flags.cmake | 9 +++++++++ shared/source/command_container/CMakeLists.txt | 6 ++++++ .../command_encoder_pre_xe2_hpg_core.inl | 2 +- .../command_encoder_xe2_hpg_core_and_later.inl | 2 +- 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/cmake/fill_core_types.cmake b/cmake/fill_core_types.cmake index af9ce47226..bcba48ad86 100644 --- a/cmake/fill_core_types.cmake +++ b/cmake/fill_core_types.cmake @@ -17,3 +17,4 @@ list(APPEND PVC_AND_LATER_CORE_TYPES ${XE2_AND_LATER_CORE_TYPES} "XE_HPC_CORE") list(APPEND DG2_AND_LATER_CORE_TYPES ${PVC_AND_LATER_CORE_TYPES} "XE_HPG_CORE") list(APPEND MTL_AND_LATER_CORE_TYPES ${DG2_AND_LATER_CORE_TYPES}) list(APPEND XEHP_AND_LATER_CORE_TYPES ${MTL_AND_LATER_CORE_TYPES}) +list(APPEND XE_HPC_AND_BEFORE_CORE_TYPES "GEN8" "GEN9" "GEN11" "GEN12LP" "XE_HPG_CORE" "XE_HPC_CORE") diff --git a/cmake/setup_platform_flags.cmake b/cmake/setup_platform_flags.cmake index 1d1675be81..c6e98c0c08 100644 --- a/cmake/setup_platform_flags.cmake +++ b/cmake/setup_platform_flags.cmake @@ -19,6 +19,15 @@ SET_FLAGS_FOR_CURRENT("XE2_HPG_CORE" "BMG" "LNL") DISABLE_WDDM_LINUX_FOR("XE_HPC_CORE" "PVC") +foreach(CORE_TYPE ${XE_HPC_AND_BEFORE_CORE_TYPES}) + if(TESTS_${CORE_TYPE}) + set(TESTS_XE_HPC_AND_BEFORE 1) + endif() + if(SUPPORT_${CORE_TYPE}) + set(SUPPORT_XE_HPC_AND_BEFORE 1) + endif() +endforeach() + foreach(CORE_TYPE ${XEHP_AND_LATER_CORE_TYPES}) if(TESTS_${CORE_TYPE}) set(TESTS_XEHP_AND_LATER 1) diff --git a/shared/source/command_container/CMakeLists.txt b/shared/source/command_container/CMakeLists.txt index 6042009316..a6ef3b8cf3 100644 --- a/shared/source/command_container/CMakeLists.txt +++ b/shared/source/command_container/CMakeLists.txt @@ -54,6 +54,12 @@ if(SUPPORT_XE2_AND_LATER) ) endif() +if(SUPPORT_XE_HPC_AND_BEFORE) + list(APPEND NEO_CORE_COMMAND_CONTAINER + ${CMAKE_CURRENT_SOURCE_DIR}/command_encoder_pre_xe2_hpg_core.inl + ) +endif() + set_property(GLOBAL PROPERTY NEO_CORE_COMMAND_CONTAINER ${NEO_CORE_COMMAND_CONTAINER}) add_subdirectories() diff --git a/shared/source/command_container/command_encoder_pre_xe2_hpg_core.inl b/shared/source/command_container/command_encoder_pre_xe2_hpg_core.inl index 23d10f1412..6be6b6d6ae 100644 --- a/shared/source/command_container/command_encoder_pre_xe2_hpg_core.inl +++ b/shared/source/command_container/command_encoder_pre_xe2_hpg_core.inl @@ -10,4 +10,4 @@ template size_t EncodeDispatchKernel::getDefaultIOHAlignment() { return 1; } -} // namespace NEO \ No newline at end of file +} // namespace NEO diff --git a/shared/source/command_container/command_encoder_xe2_hpg_core_and_later.inl b/shared/source/command_container/command_encoder_xe2_hpg_core_and_later.inl index 3c62ec0b10..5a7513b9be 100644 --- a/shared/source/command_container/command_encoder_xe2_hpg_core_and_later.inl +++ b/shared/source/command_container/command_encoder_xe2_hpg_core_and_later.inl @@ -15,4 +15,4 @@ size_t EncodeDispatchKernel::getDefaultIOHAlignment() { return alignment; } -} // namespace NEO \ No newline at end of file +} // namespace NEO