From 029094437a1ec86c0a872998628eab363eec7d76 Mon Sep 17 00:00:00 2001 From: "Zdanowicz, Zbigniew" Date: Mon, 19 Mar 2018 16:54:27 +0100 Subject: [PATCH] Change identification of gen families from number to type Change-Id: I780528aeb2572fc95d8cd9a20eba26687156726b --- manifests/manifest.yml | 2 +- offline_compiler/CMakeLists.txt | 13 +- platforms.cmake | 161 ++++++++++-------- runtime/CMakeLists.txt | 7 +- runtime/built_ins/builtins_binary.cmake | 13 +- runtime/built_ins/kernels/CMakeLists.txt | 13 +- .../builtin_kernels_simulation/CMakeLists.txt | 9 +- runtime/enable_gens.cmake | 33 ++-- runtime/scheduler/scheduler_binary.cmake | 19 ++- unit_tests/CMakeLists.txt | 15 +- unit_tests/aub_tests/CMakeLists.txt | 10 +- unit_tests/gtpin/CMakeLists.txt | 7 +- unit_tests/libult/CMakeLists.txt | 19 ++- unit_tests/linux/CMakeLists.txt | 9 +- unit_tests/mt_tests/CMakeLists.txt | 10 +- 15 files changed, 186 insertions(+), 154 deletions(-) diff --git a/manifests/manifest.yml b/manifests/manifest.yml index d619119962..2dcb471c56 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -36,7 +36,7 @@ components: internal: branch: master dest_dir: internal - revision: 7b713c9b8b5c18feaa222e84ecfcc07ac988dafa + revision: 948b79f564d5685eca9c34c8b0d7f941bdf0d879 type: git khronos: branch: master diff --git a/offline_compiler/CMakeLists.txt b/offline_compiler/CMakeLists.txt index d6b51b26b5..31f19b302c 100644 --- a/offline_compiler/CMakeLists.txt +++ b/offline_compiler/CMakeLists.txt @@ -54,22 +54,23 @@ set(OPTIONAL_RUNTIME_GENX_FILES hw_info.cpp ) -foreach(GEN_NUM RANGE ${MAX_GEN}) - GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_NUM} GENX_HAS_PLATFORMS) +foreach(GEN_TYPE ${ALL_GEN_TYPES}) + string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER) + GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_TYPE} GENX_HAS_PLATFORMS) if(${GENX_HAS_PLATFORMS}) foreach(SRC_IT ${OPTIONAL_RUNTIME_GENX_FILES}) - set(SRC_FILE ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/${SRC_IT}) + set(SRC_FILE ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/${SRC_IT}) if(EXISTS ${SRC_FILE}) list(APPEND CLOC_SRCS_LIB ${SRC_FILE}) endif() endforeach() - GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_NUM} SUPPORTED_GENX_PLATFORMS) + GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_TYPE} SUPPORTED_GENX_PLATFORMS) foreach(PLATFORM_IT ${SUPPORTED_GENX_PLATFORMS}) string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER) list(APPEND CLOC_SRCS_LIB - ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/hw_info_${PLATFORM_IT_LOWER}.cpp - ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/enable_${PLATFORM_IT_LOWER}.cpp + ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/hw_info_${PLATFORM_IT_LOWER}.cpp + ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_${PLATFORM_IT_LOWER}.cpp ) endforeach() endif() diff --git a/platforms.cmake b/platforms.cmake index e02548d9b5..0ff2aee6d9 100644 --- a/platforms.cmake +++ b/platforms.cmake @@ -20,31 +20,48 @@ set(MAX_GEN 64) +set(ALL_GEN_TYPES "") + +list(APPEND ALL_GEN_TYPES "GEN8") +list(APPEND ALL_GEN_TYPES "GEN9") + +set(ALL_GEN_TYPES_REVERSED ${ALL_GEN_TYPES}) +list(REVERSE ALL_GEN_TYPES_REVERSED) + +macro(FIND_IDX_FOR_GEN_TYPE GEN_TYPE GEN_IDX) + list(FIND ALL_GEN_TYPES "${GEN_TYPE}" GEN_IDX) + if(${GEN_IDX} EQUAL -1) + message(FATAL_ERROR "No ${GEN_TYPE} allowed, exiting") + endif(${GEN_IDX} EQUAL -1) +endmacro(FIND_IDX_FOR_GEN_TYPE) + macro(INIT_LIST LIST_TYPE ELEMENT_TYPE) foreach(IT RANGE 0 ${MAX_GEN} 1) list(APPEND ALL_${ELEMENT_TYPE}_${LIST_TYPE} " ") endforeach(IT) endmacro(INIT_LIST) -macro(GET_LIST_FOR_GEN LIST_TYPE ELEMENT_TYPE GEN_NUMBER OUT_LIST) - list(GET ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_NUMBER} GEN_X_${LIST_TYPE}) +macro(GET_LIST_FOR_GEN LIST_TYPE ELEMENT_TYPE GEN_IDX OUT_LIST) + list(GET ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_IDX} GEN_X_${LIST_TYPE}) string(REPLACE "_" ";" ${OUT_LIST} ${GEN_X_${LIST_TYPE}}) endmacro(GET_LIST_FOR_GEN) -macro(ADD_ITEM_FOR_GEN LIST_TYPE ELEMENT_TYPE GEN_NUMBER ITEM) - list(GET ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_NUMBER} GEN_X_LIST) +macro(ADD_ITEM_FOR_GEN LIST_TYPE ELEMENT_TYPE GEN_TYPE ITEM) + FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX) + list(GET ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_IDX} GEN_X_LIST) string(REPLACE " " "" GEN_X_LIST ${GEN_X_LIST}) if("${GEN_X_LIST}" STREQUAL "") set(GEN_X_LIST "${ITEM}") else("${GEN_X_LIST}" STREQUAL "") set(GEN_X_LIST "${GEN_X_LIST}_${ITEM}") endif("${GEN_X_LIST}" STREQUAL "") - list(REMOVE_AT ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_NUMBER}) - list(INSERT ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_NUMBER} ${GEN_X_LIST}) + list(REMOVE_AT ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_IDX}) + list(INSERT ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_IDX} ${GEN_X_LIST}) endmacro(ADD_ITEM_FOR_GEN) -macro(GEN_CONTAINS_PLATFORMS TYPE GEN_NUMBER OUT_FLAG) - GET_LIST_FOR_GEN("PLATFORMS" ${TYPE} ${GEN_NUMBER} GEN_X_PLATFORMS) +macro(GEN_CONTAINS_PLATFORMS TYPE GEN_TYPE OUT_FLAG) + FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX) + GET_LIST_FOR_GEN("PLATFORMS" ${TYPE} ${GEN_IDX} GEN_X_PLATFORMS) string(REPLACE " " "" GEN_X_PLATFORMS ${GEN_X_PLATFORMS}) if("${GEN_X_PLATFORMS}" STREQUAL "") set(${OUT_FLAG} FALSE) @@ -56,17 +73,18 @@ endmacro(GEN_CONTAINS_PLATFORMS) macro(GET_AVAILABLE_PLATFORMS TYPE FLAG_NAME OUT_STR) set(${TYPE}_PLATFORM_LIST) set(${TYPE}_GEN_FLAGS_DEFINITONS) - foreach(GEN_NUM RANGE ${MAX_GEN} 0 -1) - GEN_CONTAINS_PLATFORMS(${TYPE} ${GEN_NUM} GENX_HAS_PLATFORMS) + foreach(GEN_TYPE ${ALL_GEN_TYPES_REVERSED}) + GEN_CONTAINS_PLATFORMS(${TYPE} ${GEN_TYPE} GENX_HAS_PLATFORMS) if(${GENX_HAS_PLATFORMS}) - list(APPEND ${TYPE}_GEN_FLAGS_DEFINITONS ${FLAG_NAME}_GEN${GEN_NUM}) - GET_LIST_FOR_GEN("PLATFORMS" ${TYPE} ${GEN_NUM} ${TYPE}_GENX_PLATFORMS) + FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX) + list(APPEND ${TYPE}_GEN_FLAGS_DEFINITONS ${FLAG_NAME}_${GEN_TYPE}) + GET_LIST_FOR_GEN("PLATFORMS" ${TYPE} ${GEN_IDX} ${TYPE}_GENX_PLATFORMS) list(APPEND ${TYPE}_PLATFORM_LIST ${${TYPE}_GENX_PLATFORMS}) if(NOT DEFAULT_${TYPE}_PLATFORM) list(GET ${TYPE}_PLATFORM_LIST 0 DEFAULT_${TYPE}_PLATFORM ${PLATFORM_IT}) endif() - if(NOT DEFAULT_${TYPE}_GEN${GEN_NUM}_PLATFORM) - list(GET ${TYPE}_GENX_PLATFORMS 0 DEFAULT_${TYPE}_GEN${GEN_NUM}_PLATFORM) + if(NOT DEFAULT_${TYPE}_${GEN_TYPE}_PLATFORM) + list(GET ${TYPE}_GENX_PLATFORMS 0 DEFAULT_${TYPE}_${GEN_TYPE}_PLATFORM) endif() endif() endforeach() @@ -76,14 +94,16 @@ macro(GET_AVAILABLE_PLATFORMS TYPE FLAG_NAME OUT_STR) endforeach() endmacro(GET_AVAILABLE_PLATFORMS) -macro(GET_PLATFORMS_FOR_GEN TYPE GEN_NUMBER OUT_LIST) - GET_LIST_FOR_GEN("PLATFORMS" ${TYPE} ${GEN_NUMBER} ${OUT_LIST}) +macro(GET_PLATFORMS_FOR_GEN TYPE GEN_TYPE OUT_LIST) + FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX) + GET_LIST_FOR_GEN("PLATFORMS" ${TYPE} ${GEN_IDX} ${OUT_LIST}) endmacro(GET_PLATFORMS_FOR_GEN) -macro(GET_TEST_CONFIGURATIONS_FOR_PLATFORM TYPE GEN_NUMBER PLATFORM OUT_LIST) +macro(GET_TEST_CONFIGURATIONS_FOR_PLATFORM TYPE GEN_TYPE PLATFORM OUT_LIST) + FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX) set(${OUT_LIST}) string(TOLOWER ${PLATFORM} PLATFORM_LOWER) - GET_LIST_FOR_GEN("CONFIGURATIONS" ${TYPE} ${GEN_NUMBER} ALL_CONFIGURATIONS_FOR_GEN) + GET_LIST_FOR_GEN("CONFIGURATIONS" ${TYPE} ${GEN_IDX} ALL_CONFIGURATIONS_FOR_GEN) foreach(CONFIGURATION ${ALL_CONFIGURATIONS_FOR_GEN}) string(REPLACE "/" ";" CONFIGURATION_PARAMS ${CONFIGURATION}) list(GET CONFIGURATION_PARAMS 0 CONFIGURATION_PLATFORM) @@ -93,26 +113,26 @@ macro(GET_TEST_CONFIGURATIONS_FOR_PLATFORM TYPE GEN_NUMBER PLATFORM OUT_LIST) endforeach(CONFIGURATION) endmacro(GET_TEST_CONFIGURATIONS_FOR_PLATFORM) -macro(PLATFORM_HAS_2_0 GEN_NUMBER PLATFORM_NAME OUT_FLAG) - GET_LIST_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" ${GEN_NUMBER} GEN_X_PLATFORMS) +macro(PLATFORM_HAS_2_0 GEN_TYPE PLATFORM_NAME OUT_FLAG) + FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX) + GET_LIST_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" ${GEN_IDX} GEN_X_PLATFORMS) list(FIND GEN_X_PLATFORMS ${PLATFORM_NAME} PLATFORM_EXISTS) if("${PLATFORM_EXISTS}" LESS 0) set(${OUT_FLAG} FALSE) else("${PLATFORM_EXISTS}" LESS 0) set(${OUT_FLAG} TRUE) endif("${PLATFORM_EXISTS}" LESS 0) - endmacro(PLATFORM_HAS_2_0 PLATFORM_NAME OUT_FLAG) -macro(PLATFORM_TESTED_WITH_APPVERIFIER GEN_NUMBER PLATFORM_NAME OUT_FLAG) - GET_LIST_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER" ${GEN_NUMBER} GEN_X_PLATFORMS) +macro(PLATFORM_TESTED_WITH_APPVERIFIER GEN_TYPE PLATFORM_NAME OUT_FLAG) + FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX) + GET_LIST_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER" ${GEN_IDX} GEN_X_PLATFORMS) list(FIND GEN_X_PLATFORMS ${PLATFORM_NAME} PLATFORM_EXISTS) if("${PLATFORM_EXISTS}" LESS 0) set(${OUT_FLAG} FALSE) else("${PLATFORM_EXISTS}" LESS 0) set(${OUT_FLAG} TRUE) endif("${PLATFORM_EXISTS}" LESS 0) - endmacro(PLATFORM_TESTED_WITH_APPVERIFIER PLATFORM_NAME OUT_FLAG) # default flag for GenX devices support @@ -121,26 +141,26 @@ set(SUPPORT_GEN_DEFAULT TRUE CACHE BOOL "default value for SUPPORT_GENx") set(SUPPORT_PLATFORM_DEFAULT TRUE CACHE BOOL "default value for support platform") # Define the hardware configurations we support and test -macro(SET_FLAGS_FOR GEN_NUM) - set(SUPPORT_GEN${GEN_NUM} ${SUPPORT_GEN_DEFAULT} CACHE BOOL "Support Gen${GEN_NUM} devices") - set(TESTS_GEN${GEN_NUM} ${SUPPORT_GEN${GEN_NUM}} CACHE BOOL "Build ULTs for Gen${GEN_NUM} devices") - if(NOT SUPPORT_GEN${GEN_NUM}) - set(TESTS_GEN${GEN_NUM} FALSE) +macro(SET_FLAGS_FOR GEN_TYPE) + set(SUPPORT_${GEN_TYPE} ${SUPPORT_GEN_DEFAULT} CACHE BOOL "Support ${GEN_TYPE} devices") + set(TESTS_${GEN_TYPE} ${SUPPORT_${GEN_TYPE}} CACHE BOOL "Build ULTs for ${GEN_TYPE} devices") + if(NOT SUPPORT_${GEN_TYPE}) + set(TESTS_${GEN_TYPE} FALSE) else() - foreach(GEN${GEN_NUM}_PLATFORM ${ARGN}) - set(SUPPORT_${GEN${GEN_NUM}_PLATFORM} ${SUPPORT_PLATFORM_DEFAULT} CACHE BOOL "Support ${GEN${GEN_NUM}_PLATFORM}") - if(TESTS_GEN${GEN_NUM}) - set(TESTS_${GEN${GEN_NUM}_PLATFORM} ${SUPPORT_${GEN${GEN_NUM}_PLATFORM}} CACHE BOOL "Build ULTs for ${GEN${GEN_NUM}_PLATFORM}") + foreach(${GEN_TYPE}_PLATFORM ${ARGN}) + set(SUPPORT_${${GEN_TYPE}_PLATFORM} ${SUPPORT_PLATFORM_DEFAULT} CACHE BOOL "Support ${${GEN_TYPE}_PLATFORM}") + if(TESTS_${GEN_TYPE}) + set(TESTS_${${GEN_TYPE}_PLATFORM} ${SUPPORT_${${GEN_TYPE}_PLATFORM}} CACHE BOOL "Build ULTs for ${${GEN_TYPE}_PLATFORM}") endif() - if(NOT SUPPORT_${GEN${GEN_NUM}_PLATFORM} OR NOT TESTS_GEN${GEN_NUM}) - set(TESTS_${GEN${GEN_NUM}_PLATFORM} FALSE) + if(NOT SUPPORT_${${GEN_TYPE}_PLATFORM} OR NOT TESTS_${GEN_TYPE}) + set(TESTS_${${GEN_TYPE}_PLATFORM} FALSE) endif() endforeach() endif() endmacro() -SET_FLAGS_FOR(8 "BDW") -SET_FLAGS_FOR(9 "SKL" "KBL" "BXT" "GLK" "CFL") +SET_FLAGS_FOR("GEN8" "BDW") +SET_FLAGS_FOR("GEN9" "SKL" "KBL" "BXT" "GLK" "CFL") # Init lists INIT_LIST("FAMILY_NAME" "TESTED") @@ -154,66 +174,66 @@ INIT_LIST("CONFIGURATIONS" "MT_TESTS") # Add supported and tested platforms if(SUPPORT_GEN8) - ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" 8 "BDW") - ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" 8 "BDW") + ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" "GEN8" "BDW") + ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" "GEN8" "BDW") if(TESTS_GEN8) - ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" 8 "BDWFamily") - ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" 8 "BDW") - ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER" 8 "BDW") - ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" 8 "bdw/1/3/8") - ADD_ITEM_FOR_GEN("CONFIGURATIONS" "MT_TESTS" 8 "bdw/1/3/8") - ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" 8 "bdw/1/3/8") + ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN8" "BDWFamily") + ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN8" "BDW") + ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER" "GEN8" "BDW") + 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") endif() endif(SUPPORT_GEN8) if(SUPPORT_GEN9) if(TESTS_GEN9) - ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" 9 "SKLFamily") + ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN9" "SKLFamily") endif() if(SUPPORT_SKL) - ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" 9 "SKL") - ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" 9 "SKL") + ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" "GEN9" "SKL") + ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" "GEN9" "SKL") if(TESTS_SKL) - ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" 9 "SKL") - ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED_APPVERIFIER" 9 "SKL") - ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" 9 "skl/1/3/8") - ADD_ITEM_FOR_GEN("CONFIGURATIONS" "MT_TESTS" 9 "skl/1/3/8") - ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" 9 "skl/1/3/8") + 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") + ADD_ITEM_FOR_GEN("CONFIGURATIONS" "MT_TESTS" "GEN9" "skl/1/3/8") + ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "skl/1/3/8") endif() endif() if(SUPPORT_KBL) - ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" 9 "KBL") - ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" 9 "KBL") + ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" "GEN9" "KBL") + ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" "GEN9" "KBL") if(TESTS_KBL) - ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" 9 "KBL") - ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" 9 "kbl/1/3/6") + ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "KBL") + ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "kbl/1/3/6") endif() endif() if(SUPPORT_GLK) - ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" 9 "GLK") + ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" "GEN9" "GLK") if(TESTS_GLK) - ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" 9 "GLK") - ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" 9 "glk/1/3/6") + ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "GLK") + ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "glk/1/3/6") endif() endif() if(SUPPORT_CFL) - ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" 9 "CFL") - ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" 9 "CFL") + ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" "GEN9" "CFL") + ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" "GEN9" "CFL") if(TESTS_CFL) - ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" 9 "CFL") - ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" 9 "cfl/1/3/6") + ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "CFL") + ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" "GEN9" "cfl/1/3/6") endif() endif() if(SUPPORT_BXT) - ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" 9 "BXT") + ADD_ITEM_FOR_GEN("PLATFORMS" "SUPPORTED" "GEN9" "BXT") if(TESTS_BXT) - ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" 9 "BXT") - ADD_ITEM_FOR_GEN("CONFIGURATIONS" "AUB_TESTS" 9 "bxt/1/3/6") - ADD_ITEM_FOR_GEN("CONFIGURATIONS" "UNIT_TESTS" 9 "bxt/1/3/6") + 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") endif() endif() endif(SUPPORT_GEN9) @@ -242,8 +262,9 @@ if(DEFAULT_TESTED_PLATFORM) endif() if(NOT DEFAULT_TESTED_FAMILY_NAME) - foreach(GEN_NUM RANGE ${MAX_GEN} 0 -1) - list(GET ALL_TESTED_FAMILY_NAME ${GEN_NUM} GEN_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) if(NOT GEN_FAMILY_NAME STREQUAL " ") set(DEFAULT_TESTED_FAMILY_NAME ${GEN_FAMILY_NAME}) break() diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index dda2540802..f659c694ce 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -128,10 +128,11 @@ set_target_properties(${NEO_STATIC_LIB_NAME} PROPERTIES FOLDER "opencl runtime") if(${GENERATE_EXECUTABLE}) if(GTPIN_HEADERS_DIR) - foreach(GEN_NUM RANGE ${MAX_GEN}) - GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_NUM} GENX_HAS_PLATFORMS) + foreach(GEN_TYPE ${ALL_GEN_TYPES}) + string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER) + GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_TYPE} GENX_HAS_PLATFORMS) if(${GENX_HAS_PLATFORMS}) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/gen${GEN_NUM}/gtpin_setup_gen${GEN_NUM}.cpp) + target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/${GEN_TYPE_LOWER}/gtpin_setup_${GEN_TYPE_LOWER}.cpp) endif(${GENX_HAS_PLATFORMS}) endforeach() endif() diff --git a/runtime/built_ins/builtins_binary.cmake b/runtime/built_ins/builtins_binary.cmake index f9b74759ad..ba99af976a 100644 --- a/runtime/built_ins/builtins_binary.cmake +++ b/runtime/built_ins/builtins_binary.cmake @@ -42,22 +42,23 @@ if(COMPILE_BUILT_INS) add_subdirectory(kernels) endif() -foreach(GEN_NUM RANGE ${MAX_GEN}) - GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_NUM} GENX_HAS_PLATFORMS) +foreach(GEN_TYPE ${ALL_GEN_TYPES}) + string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER) + GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_TYPE} GENX_HAS_PLATFORMS) if(${GENX_HAS_PLATFORMS}) # Get all supported platforms for this GEN - GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_NUM} SUPPORTED_GENX_PLATFORMS) + GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_TYPE} SUPPORTED_GENX_PLATFORMS) # Add platform-specific files foreach(PLATFORM_IT ${SUPPORTED_GENX_PLATFORMS}) foreach(GENERATED_BUILTIN ${GENERATED_BUILTINS}) - list(APPEND GENERATED_BUILTINS_CPPS ${BUILTINS_INCLUDE_DIR}/${RUNTIME_GENERATED_${GENERATED_BUILTIN}_GEN${GEN_NUM}_${PLATFORM_IT}}) + list(APPEND GENERATED_BUILTINS_CPPS ${BUILTINS_INCLUDE_DIR}/${RUNTIME_GENERATED_${GENERATED_BUILTIN}_${GEN_TYPE_LOWER}_${PLATFORM_IT}}) endforeach(GENERATED_BUILTIN) endforeach(PLATFORM_IT) - source_group("generated files\\gen${GEN_NUM}" FILES ${GENERATED_BUILTINS_CPPS}) + source_group("generated files\\${GEN_TYPE_LOWER}" FILES ${GENERATED_BUILTINS_CPPS}) endif(${GENX_HAS_PLATFORMS}) -endforeach(GEN_NUM) +endforeach(GEN_TYPE) if(COMPILE_BUILT_INS) target_sources(${BUILTINS_BINARIES_LIB_NAME} PUBLIC ${GENERATED_BUILTINS_CPPS}) diff --git a/runtime/built_ins/kernels/CMakeLists.txt b/runtime/built_ins/kernels/CMakeLists.txt index 3388e50a60..c9a501ef0d 100644 --- a/runtime/built_ins/kernels/CMakeLists.txt +++ b/runtime/built_ins/kernels/CMakeLists.txt @@ -78,9 +78,9 @@ function(compile_builtin gen_name builtin) endif() endfunction() -macro(compile_builtins GEN_NUM PLATFORM_IT) +macro(compile_builtins GEN_TYPE PLATFORM_IT) string(TOLOWER ${PLATFORM_IT} PLATFORM_LOWER) - string(CONCAT GEN "_GEN" ${GEN_NUM} "_" ${PLATFORM_IT}) + string(CONCAT GEN "_" ${GEN_TYPE} "_" ${PLATFORM_IT}) set (BUILTINS_COMMANDS) foreach(GENERATED_BUILTIN ${GENERATED_BUILTINS}) @@ -96,12 +96,13 @@ macro(compile_builtins GEN_NUM PLATFORM_IT) endmacro() # Compile built-in kernels for all GENs -foreach(GEN_NUM RANGE ${MAX_GEN} 0 -1) - GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_NUM} GENX_HAS_PLATFORMS) +foreach(GEN_TYPE ${ALL_GEN_TYPES}) + string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER) + GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_TYPE} GENX_HAS_PLATFORMS) if(${GENX_HAS_PLATFORMS}) - GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_NUM} SUPPORTED_GENX_PLATFORMS) + GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_TYPE} SUPPORTED_GENX_PLATFORMS) foreach(PLATFORM_IT ${SUPPORTED_GENX_PLATFORMS}) - compile_builtins(${GEN_NUM} ${PLATFORM_IT}) + compile_builtins(${GEN_TYPE_LOWER} ${PLATFORM_IT}) endforeach() endif() endforeach() diff --git a/runtime/builtin_kernels_simulation/CMakeLists.txt b/runtime/builtin_kernels_simulation/CMakeLists.txt index 4c6e97dac9..0cc48fda91 100644 --- a/runtime/builtin_kernels_simulation/CMakeLists.txt +++ b/runtime/builtin_kernels_simulation/CMakeLists.txt @@ -49,11 +49,12 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -fPIC") endif() -foreach(GEN_NUM RANGE ${MAX_GEN}) - GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_NUM} GENX_HAS_PLATFORMS) +foreach(GEN_TYPE ${ALL_GEN_TYPES}) + string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER) + GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_TYPE} GENX_HAS_PLATFORMS) if(${GENX_HAS_PLATFORMS}) - list(APPEND DEFAULT_GEN_PLATFORMS_DEFITIONS DEFAULT_GEN${GEN_NUM}_PLATFORM=${DEFAULT_SUPPORTED_GEN${GEN_NUM}_PLATFORM}) - list(APPEND BUILTIN_KERNELS_SIMULATION_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/gen${GEN_NUM}/scheduler_simulation.cpp) + list(APPEND DEFAULT_GEN_PLATFORMS_DEFITIONS DEFAULT_${GEN_TYPE}_PLATFORM=${DEFAULT_SUPPORTED_${GEN_TYPE}_PLATFORM}) + list(APPEND BUILTIN_KERNELS_SIMULATION_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/${GEN_TYPE_LOWER}/scheduler_simulation.cpp) endif() endforeach() diff --git a/runtime/enable_gens.cmake b/runtime/enable_gens.cmake index 2e34495139..2b1df9d794 100644 --- a/runtime/enable_gens.cmake +++ b/runtime/enable_gens.cmake @@ -55,52 +55,53 @@ set(RUNTIME_SRCS_GENX_BASE tbx_command_stream_receiver.cpp ) -foreach(GEN_NUM RANGE ${MAX_GEN}) - GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_NUM} GENX_HAS_PLATFORMS) +foreach(GEN_TYPE ${ALL_GEN_TYPES}) + string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER) + GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_TYPE} GENX_HAS_PLATFORMS) if(${GENX_HAS_PLATFORMS}) - set(GENX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/gen${GEN_NUM}) + set(GENX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/${GEN_TYPE_LOWER}) # Add default GEN files foreach(OS_IT "BASE" "WINDOWS" "LINUX") foreach(SRC_IT ${RUNTIME_SRCS_GENX_${OS_IT}}) if(EXISTS ${GENX_PREFIX}/${SRC_IT}) - list(APPEND RUNTIME_SRCS_GEN${GEN_NUM}_${OS_IT} ${GENX_PREFIX}/${SRC_IT}) + list(APPEND RUNTIME_SRCS_${GEN_TYPE}_${OS_IT} ${GENX_PREFIX}/${SRC_IT}) endif() endforeach() endforeach() # Get all supported platforms for this GEN - GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_NUM} SUPPORTED_GENX_PLATFORMS) + GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_TYPE} SUPPORTED_GENX_PLATFORMS) # Add platform-specific files foreach(PLATFORM_IT ${SUPPORTED_GENX_PLATFORMS}) string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER) foreach(PLATFORM_FILE "hw_cmds_${PLATFORM_IT_LOWER}.h" "hw_info_${PLATFORM_IT_LOWER}.cpp") if(EXISTS ${GENX_PREFIX}/${PLATFORM_FILE}) - list(APPEND RUNTIME_SRCS_GEN${GEN_NUM}_BASE ${GENX_PREFIX}/${PLATFORM_FILE}) + list(APPEND RUNTIME_SRCS_${GEN_TYPE}_BASE ${GENX_PREFIX}/${PLATFORM_FILE}) endif() endforeach() if(EXISTS ${GENX_PREFIX}/linux/hw_info_config_${PLATFORM_IT_LOWER}.cpp) - list(APPEND RUNTIME_SRCS_GEN${GEN_NUM}_LINUX ${GENX_PREFIX}/linux/hw_info_config_${PLATFORM_IT_LOWER}.cpp) + list(APPEND RUNTIME_SRCS_${GEN_TYPE}_LINUX ${GENX_PREFIX}/linux/hw_info_config_${PLATFORM_IT_LOWER}.cpp) endif() # Enable platform - list(APPEND GEN${GEN_NUM}_SRC_LINK_BASE ${GENX_PREFIX}/enable_${PLATFORM_IT_LOWER}.cpp) - list(APPEND GEN${GEN_NUM}_SRC_LINK_LINUX ${GENX_PREFIX}/linux/enable_${PLATFORM_IT_LOWER}.cpp) + list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/enable_${PLATFORM_IT_LOWER}.cpp) + list(APPEND ${GEN_TYPE}_SRC_LINK_LINUX ${GENX_PREFIX}/linux/enable_${PLATFORM_IT_LOWER}.cpp) endforeach() - list(APPEND GEN${GEN_NUM}_SRC_LINK_BASE ${GENX_PREFIX}/enable_family_full.cpp) + list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/enable_family_full.cpp) if(GTPIN_HEADERS_DIR) - list(APPEND GEN${GEN_NUM}_SRC_LINK_BASE ${GENX_PREFIX}/gtpin_setup_gen${GEN_NUM}.cpp) + list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/gtpin_setup_${GEN_TYPE_LOWER}.cpp) endif(GTPIN_HEADERS_DIR) - list(APPEND RUNTIME_SRCS_GENX ${RUNTIME_SRCS_GEN${GEN_NUM}_BASE}) - list(APPEND HW_SRC_LINK ${GEN${GEN_NUM}_SRC_LINK_BASE}) + list(APPEND RUNTIME_SRCS_GENX ${RUNTIME_SRCS_${GEN_TYPE}_BASE}) + list(APPEND HW_SRC_LINK ${${GEN_TYPE}_SRC_LINK_BASE}) if(WIN32) - list(APPEND RUNTIME_SRCS_GENX ${RUNTIME_SRCS_GEN${GEN_NUM}_WINDOWS}) + list(APPEND RUNTIME_SRCS_GENX ${RUNTIME_SRCS_${GEN_TYPE}_WINDOWS}) else() - list(APPEND RUNTIME_SRCS_GENX ${RUNTIME_SRCS_GEN${GEN_NUM}_LINUX}) - list(APPEND HW_SRC_LINK ${GEN${GEN_NUM}_SRC_LINK_LINUX}) + list(APPEND RUNTIME_SRCS_GENX ${RUNTIME_SRCS_${GEN_TYPE}_LINUX}) + list(APPEND HW_SRC_LINK ${${GEN_TYPE}_SRC_LINK_LINUX}) endif() endif() endforeach() diff --git a/runtime/scheduler/scheduler_binary.cmake b/runtime/scheduler/scheduler_binary.cmake index 58a5b55679..7a7b1116f8 100644 --- a/runtime/scheduler/scheduler_binary.cmake +++ b/runtime/scheduler/scheduler_binary.cmake @@ -33,9 +33,9 @@ endif() set(SCHEDULER_INCLUDE_DIR ${TargetDir}) -function(compile_kernel target gen_name gen_num kernel) +function(compile_kernel target gen_name gen_type kernel) set(OUTPUTDIR "${SCHEDULER_OUTDIR_WITH_ARCH}/${gen_name}") - set(SCHEDULER_INCLUDE_OPTIONS "${SCHEDULER_INCLUDE_OPTIONS} -I ../gen${gen_num}") + set(SCHEDULER_INCLUDE_OPTIONS "${SCHEDULER_INCLUDE_OPTIONS} -I ../${gen_type}") get_filename_component(BASENAME ${kernel} NAME_WE) @@ -64,24 +64,25 @@ function(compile_kernel target gen_name gen_num kernel) set_target_properties(${target} PROPERTIES FOLDER "scheduler/${gen_name}") endfunction() -foreach(GEN_NUM RANGE ${MAX_GEN}) - GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_NUM} GENX_HAS_PLATFORMS) +foreach(GEN_TYPE ${ALL_GEN_TYPES}) + string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER) + GEN_CONTAINS_PLATFORMS("SUPPORTED" ${GEN_TYPE} GENX_HAS_PLATFORMS) if(${GENX_HAS_PLATFORMS}) - GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_NUM} SUPPORTED_GENX_PLATFORMS) + GET_PLATFORMS_FOR_GEN("SUPPORTED" ${GEN_TYPE} SUPPORTED_GENX_PLATFORMS) foreach(PLATFORM_IT ${SUPPORTED_GENX_PLATFORMS}) - PLATFORM_HAS_2_0(${GEN_NUM} ${PLATFORM_IT} PLATFORM_SUPPORTS_2_0) + PLATFORM_HAS_2_0(${GEN_TYPE} ${PLATFORM_IT} PLATFORM_SUPPORTS_2_0) if(COMPILE_BUILT_INS AND ${PLATFORM_SUPPORTS_2_0}) string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER) - compile_kernel(scheduler_${PLATFORM_IT_LOWER} ${PLATFORM_IT_LOWER} ${GEN_NUM} ${SCHEDULER_KERNEL}) + compile_kernel(scheduler_${PLATFORM_IT_LOWER} ${PLATFORM_IT_LOWER} ${GEN_TYPE_LOWER} ${SCHEDULER_KERNEL}) add_dependencies(scheduler scheduler_${PLATFORM_IT_LOWER}) list(APPEND GENERATED_SCHEDULER_CPPS ${SCHEDULER_CPP}) endif(COMPILE_BUILT_INS AND ${PLATFORM_SUPPORTS_2_0}) endforeach(PLATFORM_IT) - source_group("generated files\\gen${GEN_NUM}" FILES ${GENERATED_SCHEDULER_CPPS}) + source_group("generated files\\${GEN_TYPE_LOWER}" FILES ${GENERATED_SCHEDULER_CPPS}) endif(${GENX_HAS_PLATFORMS}) -endforeach(GEN_NUM) +endforeach(GEN_TYPE) add_library(${SCHEDULER_BINARY_LIB_NAME} OBJECT CMakeLists.txt) diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt index f914871566..9742207845 100644 --- a/unit_tests/CMakeLists.txt +++ b/unit_tests/CMakeLists.txt @@ -369,13 +369,14 @@ function(gen_run_unit_tests product slices subslices eu_per_ss) add_dependencies(run_unit_tests run_${product}_unit_tests) endfunction() -foreach(GEN_NUM RANGE ${MAX_GEN}) - GEN_CONTAINS_PLATFORMS("TESTED" ${GEN_NUM} GENX_HAS_PLATFORMS) +foreach(GEN_TYPE ${ALL_GEN_TYPES}) + string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER) + GEN_CONTAINS_PLATFORMS("TESTED" ${GEN_TYPE} GENX_HAS_PLATFORMS) if(${GENX_HAS_PLATFORMS}) - GET_PLATFORMS_FOR_GEN("TESTED" ${GEN_NUM} TESTED_GENX_PLATFORMS) + GET_PLATFORMS_FOR_GEN("TESTED" ${GEN_TYPE} TESTED_GENX_PLATFORMS) foreach(PLATFORM_IT ${TESTED_GENX_PLATFORMS}) - PLATFORM_HAS_2_0(${GEN_NUM} ${PLATFORM_IT} PLATFORM_SUPPORTS_2_0) - PLATFORM_TESTED_WITH_APPVERIFIER(${GEN_NUM} ${PLATFORM_IT} TESTED_WITH_APPVERIFIER) + PLATFORM_HAS_2_0(${GEN_TYPE} ${PLATFORM_IT} PLATFORM_SUPPORTS_2_0) + PLATFORM_TESTED_WITH_APPVERIFIER(${GEN_TYPE} ${PLATFORM_IT} TESTED_WITH_APPVERIFIER) string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER) if(MSVC OR CMAKE_SIZEOF_VOID_P EQUAL 8) @@ -404,7 +405,7 @@ foreach(GEN_NUM RANGE ${MAX_GEN}) list(APPEND sip_debug_local_kernel_output_file "sip_dummy_kernel_debug_local_${NEO_BITS}") # Temporarily disabled sip kernel generation - # if("gen${GEN_NUM}" STREQUAL "gen9" ) + # if("${GEN_TYPE_LOWER}" STREQUAL "gen9" ) # neo_gen_kernel_from_ll(test_kernel_sip_debug_local_${PLATFORM_IT_LOWER} ${PLATFORM_IT_LOWER} ${sip_kernel_file_name} ${sip_debug_local_kernel_output_file} ${TEST_KERNEL_SIP_DEBUG_LOCAL_options}) # add_dependencies(unit_tests test_kernel_sip_debug_local_${PLATFORM_IT_LOWER}) # endif() @@ -417,7 +418,7 @@ foreach(GEN_NUM RANGE ${MAX_GEN}) add_dependencies(unit_tests test_kernel_2_0_${PLATFORM_IT_LOWER}) endif() endif() - GET_TEST_CONFIGURATIONS_FOR_PLATFORM("UNIT_TESTS" ${GEN_NUM} ${PLATFORM_IT} PLATFORM_CONFIGURATIONS) + GET_TEST_CONFIGURATIONS_FOR_PLATFORM("UNIT_TESTS" ${GEN_TYPE} ${PLATFORM_IT} PLATFORM_CONFIGURATIONS) foreach(PLATFORM_CONFIGURATION ${PLATFORM_CONFIGURATIONS}) string(REPLACE "/" ";" CONFIGURATION_PARAMS ${PLATFORM_CONFIGURATION}) list(GET CONFIGURATION_PARAMS 1 SLICES) diff --git a/unit_tests/aub_tests/CMakeLists.txt b/unit_tests/aub_tests/CMakeLists.txt index b12bbeb4b1..4a7624fa89 100644 --- a/unit_tests/aub_tests/CMakeLists.txt +++ b/unit_tests/aub_tests/CMakeLists.txt @@ -86,10 +86,10 @@ target_link_libraries(igdrcl_aub_tests gtest gmock ${IGDRCL_EXTRA_LIBS}) target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${IGDRCL_SOURCE_DIR}/unit_tests/gen_common) -foreach(GEN_NUM RANGE ${MAX_GEN}) - GEN_CONTAINS_PLATFORMS("TESTED" ${GEN_NUM} GENX_HAS_PLATFORMS) +foreach(GEN_TYPE ${ALL_GEN_TYPES}) + GEN_CONTAINS_PLATFORMS("TESTED" ${GEN_TYPE} GENX_HAS_PLATFORMS) if(${GENX_HAS_PLATFORMS}) - GET_PLATFORMS_FOR_GEN("TESTED" ${GEN_NUM} TESTED_GENX_PLATFORMS) + GET_PLATFORMS_FOR_GEN("TESTED" ${GEN_TYPE} TESTED_GENX_PLATFORMS) foreach(PLATFORM_IT ${TESTED_GENX_PLATFORMS}) string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER) add_custom_target(${PLATFORM_IT_LOWER}_aub_tests @@ -98,7 +98,7 @@ foreach(GEN_NUM RANGE ${MAX_GEN}) ) add_dependencies(${PLATFORM_IT_LOWER}_aub_tests test_kernels_${PLATFORM_IT_LOWER}) add_dependencies(${PLATFORM_IT_LOWER}_aub_tests test_kernel_${PLATFORM_IT_LOWER}) - PLATFORM_HAS_2_0(${GEN_NUM} ${PLATFORM_IT} PLATFORM_SUPPORTS_2_0) + PLATFORM_HAS_2_0(${GEN_TYPE} ${PLATFORM_IT} PLATFORM_SUPPORTS_2_0) if(${PLATFORM_SUPPORTS_2_0}) add_dependencies(${PLATFORM_IT_LOWER}_aub_tests test_kernel_2_0_${PLATFORM_IT_LOWER}) endif(${PLATFORM_SUPPORTS_2_0}) @@ -109,7 +109,7 @@ foreach(GEN_NUM RANGE ${MAX_GEN}) if(WIN32) add_dependencies(${PLATFORM_IT_LOWER}_aub_tests mock_gdi) endif() - GET_TEST_CONFIGURATIONS_FOR_PLATFORM("AUB_TESTS" ${GEN_NUM} ${PLATFORM_IT} PLATFORM_CONFIGURATIONS) + GET_TEST_CONFIGURATIONS_FOR_PLATFORM("AUB_TESTS" ${GEN_TYPE} ${PLATFORM_IT} PLATFORM_CONFIGURATIONS) foreach(PLATFORM_CONFIGURATION ${PLATFORM_CONFIGURATIONS}) string(REPLACE "/" ";" CONFIGURATION_PARAMS ${PLATFORM_CONFIGURATION}) list(GET CONFIGURATION_PARAMS 1 SLICES) diff --git a/unit_tests/gtpin/CMakeLists.txt b/unit_tests/gtpin/CMakeLists.txt index ec1fe80ef5..d225a8a37f 100644 --- a/unit_tests/gtpin/CMakeLists.txt +++ b/unit_tests/gtpin/CMakeLists.txt @@ -22,10 +22,11 @@ set(IGDRCL_SRCS_tests_gtpin ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_tests.cpp ) -foreach(GEN_NUM RANGE ${MAX_GEN}) - GEN_CONTAINS_PLATFORMS("TESTED" ${GEN_NUM} GENX_HAS_PLATFORMS) +foreach(GEN_TYPE ${ALL_GEN_TYPES}) + string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER) + GEN_CONTAINS_PLATFORMS("TESTED" ${GEN_TYPE} GENX_HAS_PLATFORMS) if(${GENX_HAS_PLATFORMS}) - list(APPEND IGDRCL_SRCS_tests_gtpin ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/gtpin_setup_gen${GEN_NUM}.cpp) + list(APPEND IGDRCL_SRCS_tests_gtpin ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/gtpin_setup_${GEN_TYPE_LOWER}.cpp) endif() endforeach() if(GTPIN_HEADERS_DIR) diff --git a/unit_tests/libult/CMakeLists.txt b/unit_tests/libult/CMakeLists.txt index b7b352785a..68290287c5 100644 --- a/unit_tests/libult/CMakeLists.txt +++ b/unit_tests/libult/CMakeLists.txt @@ -18,23 +18,24 @@ # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. -foreach(GEN_NUM RANGE ${MAX_GEN}) - GEN_CONTAINS_PLATFORMS("TESTED" ${GEN_NUM} GENX_HAS_PLATFORMS) +foreach(GEN_TYPE ${ALL_GEN_TYPES}) + string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER) + GEN_CONTAINS_PLATFORMS("TESTED" ${GEN_TYPE} GENX_HAS_PLATFORMS) if(${GENX_HAS_PLATFORMS}) list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW - ${IGDRCL_SOURCE_DIR}/unit_tests/gen${GEN_NUM}/cmd_parse_gen${GEN_NUM}.cpp - ${IGDRCL_SOURCE_DIR}/unit_tests/gen${GEN_NUM}/gen_cmd_parse.h - ${IGDRCL_SOURCE_DIR}/unit_tests/libult/gen${GEN_NUM}.cpp - ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/enable_family_full.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp + ${IGDRCL_SOURCE_DIR}/unit_tests/${GEN_TYPE_LOWER}/gen_cmd_parse.h + ${IGDRCL_SOURCE_DIR}/unit_tests/libult/${GEN_TYPE_LOWER}.cpp + ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_family_full.cpp ) - GET_PLATFORMS_FOR_GEN("TESTED" ${GEN_NUM} TESTED_GENX_PLATFORMS) + GET_PLATFORMS_FOR_GEN("TESTED" ${GEN_TYPE} TESTED_GENX_PLATFORMS) foreach(PLATFORM_IT ${TESTED_GENX_PLATFORMS}) string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER) list (APPEND IGDRCL_SRCS_ENABLE_TESTED_HW - ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/enable_${PLATFORM_IT_LOWER}.cpp + ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/enable_${PLATFORM_IT_LOWER}.cpp ) list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW_LINUX - ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/linux/enable_${PLATFORM_IT_LOWER}.cpp + ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/linux/enable_${PLATFORM_IT_LOWER}.cpp ) endforeach() endif() diff --git a/unit_tests/linux/CMakeLists.txt b/unit_tests/linux/CMakeLists.txt index 6b4a210f65..a5106b57b7 100644 --- a/unit_tests/linux/CMakeLists.txt +++ b/unit_tests/linux/CMakeLists.txt @@ -32,13 +32,14 @@ set(IGDRCL_SRCS_linux_dll_tests ${IGDRCL_SOURCE_DIR}/runtime/dll/linux/drm_neo_create.cpp ) -foreach(GEN_NUM RANGE ${MAX_GEN}) - GEN_CONTAINS_PLATFORMS("TESTED" ${GEN_NUM} GENX_HAS_PLATFORMS) +foreach(GEN_TYPE ${ALL_GEN_TYPES}) + string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER) + GEN_CONTAINS_PLATFORMS("TESTED" ${GEN_TYPE} GENX_HAS_PLATFORMS) if(${GENX_HAS_PLATFORMS}) - GET_PLATFORMS_FOR_GEN("TESTED" ${GEN_NUM} TESTED_GENX_PLATFORMS) + GET_PLATFORMS_FOR_GEN("TESTED" ${GEN_TYPE} TESTED_GENX_PLATFORMS) foreach(PLATFORM_IT ${TESTED_GENX_PLATFORMS}) string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER) - list(APPEND IGDRCL_SRCS_linux_dll_tests ${IGDRCL_SOURCE_DIR}/runtime/gen${GEN_NUM}/hw_info_${PLATFORM_IT_LOWER}.cpp) + list(APPEND IGDRCL_SRCS_linux_dll_tests ${IGDRCL_SOURCE_DIR}/runtime/${GEN_TYPE_LOWER}/hw_info_${PLATFORM_IT_LOWER}.cpp) endforeach() endif() endforeach() diff --git a/unit_tests/mt_tests/CMakeLists.txt b/unit_tests/mt_tests/CMakeLists.txt index 8c7f41c259..402f9b1bd0 100644 --- a/unit_tests/mt_tests/CMakeLists.txt +++ b/unit_tests/mt_tests/CMakeLists.txt @@ -149,16 +149,16 @@ endfunction() target_include_directories(igdrcl_mt_tests BEFORE PRIVATE ${IGDRCL_SOURCE_DIR}/unit_tests/gen_common ${IGDRCL_SOURCE_DIR}/runtime/gen_common) -foreach(GEN_NUM RANGE 0 ${MAX_GEN} 1) - GEN_CONTAINS_PLATFORMS("TESTED" ${GEN_NUM} GENX_HAS_PLATFORMS) +foreach(GEN_TYPE ${ALL_GEN_TYPES}) + GEN_CONTAINS_PLATFORMS("TESTED" ${GEN_TYPE} GENX_HAS_PLATFORMS) if(${GENX_HAS_PLATFORMS}) - GET_PLATFORMS_FOR_GEN("TESTED" ${GEN_NUM} TESTED_GENX_PLATFORMS) + GET_PLATFORMS_FOR_GEN("TESTED" ${GEN_TYPE} TESTED_GENX_PLATFORMS) foreach(PLATFORM_IT ${TESTED_GENX_PLATFORMS}) string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER) if(MSVC OR CMAKE_SIZEOF_VOID_P EQUAL 8) add_dependencies(igdrcl_mt_tests test_kernels_${PLATFORM_IT_LOWER}) endif(MSVC OR CMAKE_SIZEOF_VOID_P EQUAL 8) - GET_TEST_CONFIGURATIONS_FOR_PLATFORM("MT_TESTS" ${GEN_NUM} ${PLATFORM_IT} PLATFORM_CONFIGURATIONS) + GET_TEST_CONFIGURATIONS_FOR_PLATFORM("MT_TESTS" ${GEN_TYPE} ${PLATFORM_IT} PLATFORM_CONFIGURATIONS) foreach(PLATFORM_CONFIGURATION ${PLATFORM_CONFIGURATIONS}) string(REPLACE "/" ";" CONFIGURATION_PARAMS ${PLATFORM_CONFIGURATION}) list(GET CONFIGURATION_PARAMS 1 SLICES) @@ -168,4 +168,4 @@ foreach(GEN_NUM RANGE 0 ${MAX_GEN} 1) endforeach(PLATFORM_CONFIGURATION) endforeach(PLATFORM_IT) endif(${GENX_HAS_PLATFORMS}) -endforeach(GEN_NUM) +endforeach(GEN_TYPE)