Media
/
compute-runtime
mirror of https://github.com/intel/compute-runtime.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: set preferred platform only when that platform is supported 

Change-Id: I33a426f001422c3f82ac7d3b3d37ec5e65c41129
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski 2018-11-27 15:13:00 +00:00 committed by sys_ocldev
parent b0de2a11d2
commit 5df48bf33a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
platforms.cmake
View File

@ -60,7 +60,7 @@ endmacro()
macro(GET_AVAILABLE_PLATFORMS TYPE FLAG_NAME OUT_STR)
set(${TYPE}_PLATFORM_LIST)
set(${TYPE}_GEN_FLAGS_DEFINITONS)
if(NOT DEFAULT_${TYPE}_PLATFORM AND ${FLAG_NAME}_${PREFERRED_PLATFORM})
if(NOT DEFAULT_${TYPE}_PLATFORM AND DEFINED PREFERRED_PLATFORM AND ${FLAG_NAME}_${PREFERRED_PLATFORM})
set(DEFAULT_${TYPE}_PLATFORM ${PREFERRED_PLATFORM})
endif()
foreach(GEN_TYPE ${ALL_GEN_TYPES_REVERSED})
@ -162,9 +162,6 @@ SET_FLAGS_FOR("GEN8" "BDW")
SET_FLAGS_FOR("GEN9" "SKL" "KBL" "BXT" "GLK" "CFL")
SET_FLAGS_FOR("GEN10" "CNL")
set(PREFERRED_PLATFORM "SKL")
set(PREFERRED_FAMILY_NAME "SKLFamily")
# Init lists
INIT_LIST("FAMILY_NAME" "TESTED")
INIT_LIST("PLATFORMS" "SUPPORTED")
@ -200,7 +197,9 @@ if(SUPPORT_GEN9)
if(SUPPORT_SKL)
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN9" "SKL" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_2_0" "GEN9" "SKL" "CORE")
set(PREFERRED_PLATFORM "SKL")
if(TESTS_SKL)
set(PREFERRED_FAMILY_NAME "SKLFamily")
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "SKL")
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER" "GEN9" "SKL")
ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" "GEN9" "skl/1/3/8")
@ -282,10 +281,13 @@ if(DEFAULT_TESTED_PLATFORM)
endif()
if(NOT DEFAULT_TESTED_FAMILY_NAME)
list(FIND ALL_TESTED_FAMILY_NAME ${PREFERRED_FAMILY_NAME} GEN_IDX)
if(${GEN_IDX} GREATER -1)
set(DEFAULT_TESTED_FAMILY_NAME ${PREFERRED_FAMILY_NAME})
else()
if(DEFINED PREFERRED_FAMILY_NAME)
list(FIND ALL_TESTED_FAMILY_NAME ${PREFERRED_FAMILY_NAME} GEN_IDX)
if(${GEN_IDX} GREATER -1)
set(DEFAULT_TESTED_FAMILY_NAME ${PREFERRED_FAMILY_NAME})
endif()
endif()
if(NOT DEFINED DEFAULT_TESTED_FAMILY_NAME)
foreach(GEN_TYPE ${ALL_GEN_TYPES_REVERSED})
FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX)
list(GET ALL_TESTED_FAMILY_NAME ${GEN_IDX} GEN_FAMILY_NAME)