diff --git a/platforms.cmake b/platforms.cmake index af7482673e..f419540bbf 100644 --- a/platforms.cmake +++ b/platforms.cmake @@ -58,6 +58,34 @@ macro(GEN_CONTAINS_PLATFORMS TYPE GEN_TYPE OUT_FLAG) endif() endmacro() +macro(INIT_PRODUCTS_LIST TYPE) + list(APPEND ALL_${TYPE}_PRODUCT_FAMILY " ") + list(APPEND ALL_${TYPE}_PRODUCT_TO_PRODUCT_FAMILY " ") +endmacro() + +macro(ADD_PRODUCT TYPE PRODUCT ITEM) + list(APPEND ALL_${TYPE}_PRODUCT_FAMILY ${ITEM}) + list(APPEND ALL_${TYPE}_PRODUCT_TO_PRODUCT_FAMILY ${PRODUCT}) +endmacro() + +macro(GET_AVAILABLE_PRODUCTS TYPE PRODUCT_FAMILY_LIST DEFAULT_PRODUCT_FAMILY) + list(REMOVE_ITEM ALL_${TYPE}_PRODUCT_FAMILY " ") + list(REMOVE_ITEM ALL_${TYPE}_PRODUCT_TO_PRODUCT_FAMILY " ") + + set(${PRODUCT_FAMILY_LIST} ${ALL_${TYPE}_PRODUCT_FAMILY}) + set(${DEFAULT_PRODUCT_FAMILY}) + + if(NOT "${DEFAULT_${TYPE}_PLATFORM}" STREQUAL "") + list(FIND ALL_${TYPE}_PRODUCT_TO_PRODUCT_FAMILY ${DEFAULT_${TYPE}_PLATFORM} INDEX) + if(${INDEX} EQUAL -1) + message(FATAL_ERROR "${DEFAULT_${TYPE}_PLATFORM} not found in product families.") + endif() + + list(GET ALL_${TYPE}_PRODUCT_FAMILY ${INDEX} DEFAULT) + set(${DEFAULT_PRODUCT_FAMILY} ${DEFAULT}) + endif() +endmacro() + macro(GET_AVAILABLE_PLATFORMS TYPE FLAG_NAME OUT_STR) set(${TYPE}_PLATFORM_LIST) set(${TYPE}_GEN_FLAGS_DEFINITONS) @@ -189,6 +217,7 @@ INIT_LIST("PLATFORMS" "TESTED_APPVERIFIER") INIT_LIST("CONFIGURATIONS" "UNIT_TESTS") INIT_LIST("CONFIGURATIONS" "AUB_TESTS") INIT_LIST("CONFIGURATIONS" "MT_TESTS") +INIT_PRODUCTS_LIST("TESTED") # Add supported and tested platforms if(SUPPORT_GEN8) @@ -204,6 +233,7 @@ if(SUPPORT_GEN8) ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" "GEN8" "bdw/1/3/8") ADD_ITEM_FOR_GEN("CONFIGURATIONS" "MT_TESTS" "GEN8" "bdw/1/3/8") ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN8" "bdw/1/3/8") + ADD_PRODUCT("TESTED" "BDW" "IGFX_BROADWELL") endif() endif() endif() @@ -224,6 +254,7 @@ if(SUPPORT_GEN9) ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" "GEN9" "skl/1/3/8") ADD_ITEM_FOR_GEN("CONFIGURATIONS" "MT_TESTS" "GEN9" "skl/1/3/8") ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "skl/1/3/8") + ADD_PRODUCT("TESTED" "SKL" "IGFX_SKYLAKE") endif() endif() @@ -234,6 +265,7 @@ if(SUPPORT_GEN9) if(TESTS_KBL) ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "KBL") ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "kbl/1/3/6") + ADD_PRODUCT("TESTED" "KBL" "IGFX_KABYLAKE") endif() endif() @@ -243,6 +275,7 @@ if(SUPPORT_GEN9) if(TESTS_GLK) ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "GLK") ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "glk/1/3/6") + ADD_PRODUCT("TESTED" "GLK" "IGFX_GEMINILAKE") endif() endif() @@ -253,6 +286,7 @@ if(SUPPORT_GEN9) if(TESTS_CFL) ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "CFL") ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "cfl/1/3/6") + ADD_PRODUCT("TESTED" "CFL" "IGFX_COFFEELAKE") endif() endif() @@ -263,6 +297,7 @@ if(SUPPORT_GEN9) ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "BXT") ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" "GEN9" "bxt/1/3/6") ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "bxt/1/3/6") + ADD_PRODUCT("TESTED" "BXT" "IGFX_BROXTON") endif() endif() endif() @@ -282,6 +317,7 @@ if(SUPPORT_GEN11) ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" "GEN11" "icllp/1/8/8") ADD_ITEM_FOR_GEN("CONFIGURATIONS" "MT_TESTS" "GEN11" "icllp/1/8/8") ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN11" "icllp/1/8/8") + ADD_PRODUCT("TESTED" "ICLLP" "IGFX_ICELAKE_LP") endif() endif() @@ -290,6 +326,7 @@ if(SUPPORT_GEN11) if(TESTS_LKF) ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN11" "LKF") ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN11" "lkf/1/8/8") + ADD_PRODUCT("TESTED" "LKF" "IGFX_LAKEFIELD") endif() endif() @@ -298,6 +335,7 @@ if(SUPPORT_GEN11) if(TESTS_EHL) ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN11" "EHL") ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN11" "ehl/1/4/8") + ADD_PRODUCT("TESTED" "EHL" "IGFX_ELKHARTLAKE") endif() endif() endif() @@ -315,6 +353,7 @@ if(SUPPORT_GEN12LP) ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" "GEN12LP" "tgllp/1/6/16") ADD_ITEM_FOR_GEN("CONFIGURATIONS" "MT_TESTS" "GEN12LP" "tgllp/1/6/16") ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN12LP" "tgllp/1/6/16") + ADD_PRODUCT("TESTED" "TGLLP" "IGFX_TIGERLAKE_LP") endif() endif() endif() @@ -323,12 +362,16 @@ endif() # Get platform lists, flag definition and set default platforms GET_AVAILABLE_PLATFORMS("SUPPORTED" "SUPPORT" ALL_AVAILABLE_SUPPORTED_PLATFORMS) GET_AVAILABLE_PLATFORMS("TESTED" "TESTS" ALL_AVAILABLE_TESTED_PLATFORMS) +GET_AVAILABLE_PRODUCTS("TESTED" ALL_PRODUCT_FAMILY_LIST DEFAULT_TESTED_PRODUCT_FAMILY) message(STATUS "All supported platforms: ${ALL_AVAILABLE_SUPPORTED_PLATFORMS}") message(STATUS "All tested platforms: ${ALL_AVAILABLE_TESTED_PLATFORMS}") message(STATUS "Default supported platform: ${DEFAULT_SUPPORTED_PLATFORM}") +message(STATUS "All product families: ${ALL_PRODUCT_FAMILY_LIST}") +message(STATUS "Default tested product family: ${DEFAULT_TESTED_PRODUCT_FAMILY}") + list(FIND SUPPORTED_PLATFORM_LIST ${DEFAULT_SUPPORTED_PLATFORM} VALID_DEFAULT_SUPPORTED_PLATFORM) if(VALID_DEFAULT_SUPPORTED_PLATFORM LESS 0) message(FATAL_ERROR "Not a valid supported platform: ${DEFAULT_SUPPORTED_PLATFORM}") diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt index f87d167313..424712e761 100644 --- a/unit_tests/CMakeLists.txt +++ b/unit_tests/CMakeLists.txt @@ -28,6 +28,13 @@ if(WIN32) string(REPLACE "/O2" "/Od" CMAKE_C_FLAGS_RELEASEINTERNAL ${CMAKE_C_FLAGS_RELEASEINTERNAL}) endif() +function(ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION) + set(NEO_SUPPORTED_PRODUCT_FAMILIES ${ALL_PRODUCT_FAMILY_LIST}) + string(REPLACE ";" "," NEO_SUPPORTED_PRODUCT_FAMILIES "${NEO_SUPPORTED_PRODUCT_FAMILIES}") + add_definitions(-DSUPPORTED_TEST_PRODUCT_FAMILIES=${NEO_SUPPORTED_PRODUCT_FAMILIES}) +endfunction() + +ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION() link_libraries(${ASAN_LIBS} ${TSAN_LIBS}) add_custom_target(unit_tests)