From 9d18df63a949d5b242190a0278b442b6e96be82b Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Wed, 28 Sep 2022 16:25:54 +0000 Subject: [PATCH] Prevent auto-enabling gen flags for pre-gen12 devices on Windows Signed-off-by: Mateusz Jablonski --- cmake/setup_platform_flags.cmake | 13 +++++++------ platforms.cmake | 9 +++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/cmake/setup_platform_flags.cmake b/cmake/setup_platform_flags.cmake index e454bc65be..209e89041a 100644 --- a/cmake/setup_platform_flags.cmake +++ b/cmake/setup_platform_flags.cmake @@ -5,13 +5,14 @@ # if(WIN32) - set(SUPPORT_GEN8 FALSE CACHE BOOL "Support Gen8 devices" FORCE) - set(SUPPORT_GEN9 FALSE CACHE BOOL "Support Gen9 devices" FORCE) - set(SUPPORT_GEN11 FALSE CACHE BOOL "Support Gen11 devices" FORCE) + DISABLE_FLAGS_FOR("GEN8" "BDW") + DISABLE_FLAGS_FOR("GEN9" "SKL" "KBL" "BXT" "GLK" "CFL") + DISABLE_FLAGS_FOR("GEN11" "ICLLP" "LKF" "EHL") +else() + SET_FLAGS_FOR("GEN8" "BDW") + SET_FLAGS_FOR("GEN9" "SKL" "KBL" "BXT" "GLK" "CFL") + SET_FLAGS_FOR("GEN11" "ICLLP" "LKF" "EHL") endif() -SET_FLAGS_FOR("GEN8" "BDW") -SET_FLAGS_FOR("GEN9" "SKL" "KBL" "BXT" "GLK" "CFL") -SET_FLAGS_FOR("GEN11" "ICLLP" "LKF" "EHL") SET_FLAGS_FOR("GEN12LP" "TGLLP" "RKL" "ADLS" "ADLP" "DG1" "ADLN") SET_FLAGS_FOR("XE_HP_CORE" "XE_HP_SDV") SET_FLAGS_FOR("XE_HPG_CORE" "DG2") diff --git a/platforms.cmake b/platforms.cmake index 2012e56a9f..33ae0bb0fe 100644 --- a/platforms.cmake +++ b/platforms.cmake @@ -188,6 +188,15 @@ macro(SET_FLAGS_FOR CORE_TYPE) endif() endmacro() +macro(DISABLE_FLAGS_FOR CORE_TYPE) + set(SUPPORT_${CORE_TYPE} FALSE CACHE BOOL "Support ${CORE_TYPE} devices" FORCE) + set(TESTS_${CORE_TYPE} FALSE CACHE BOOL "Build ULTs for ${CORE_TYPE} devices" FORCE) + foreach(SKU_NAME ${ARGN}) + set(SUPPORT_${SKU_NAME} FALSE CACHE BOOL "Support ${SKU_NAME}" FORCE) + set(TESTS_${SKU_NAME} FALSE CACHE BOOL "Build ULTs for ${SKU_NAME}" FORCE) + endforeach() +endmacro() + macro(ADD_PLATFORM_FOR_CORE_TYPE LIST_TYPE CORE_TYPE PLATFORM_NAME PLATFORM_TYPE) list(APPEND PLATFORM_TYPES ${PLATFORM_TYPE}) list(REMOVE_DUPLICATES PLATFORM_TYPES)