From b7ff10fccf7bb137d15ea0a371533ebd811dc6a4 Mon Sep 17 00:00:00 2001 From: Artur Harasimiuk Date: Thu, 6 Aug 2020 19:38:21 +0200 Subject: [PATCH] cmake refactor Change-Id: Ic276b78419f2828c34ad70e2a7b2dbdbdf38f89d Signed-off-by: Artur Harasimiuk --- opencl/source/enable_gens.cmake | 6 ++- opencl/test/unit_test/libult/CMakeLists.txt | 11 +++- shared/offline_compiler/source/CMakeLists.txt | 4 ++ shared/source/enable_gens.cmake | 51 +++++++++++-------- 4 files changed, 47 insertions(+), 25 deletions(-) diff --git a/opencl/source/enable_gens.cmake b/opencl/source/enable_gens.cmake index 7195bae89d..0f30f627ff 100644 --- a/opencl/source/enable_gens.cmake +++ b/opencl/source/enable_gens.cmake @@ -97,8 +97,6 @@ macro(macro_for_each_gen) apply_macro_for_each_platform() - list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${NEO_SHARED_DIRECTORY}/${GEN_TYPE_LOWER}/image_core_${GEN_TYPE_LOWER}.cpp) - foreach(BRANCH_DIR ${BRANCH_DIR_LIST}) string(REGEX REPLACE "/$" "" _BRANCH_FILENAME_SUFFIX "${BRANCH_DIR}") string(REGEX REPLACE "^/" "_" _BRANCH_FILENAME_SUFFIX "${_BRANCH_FILENAME_SUFFIX}") @@ -108,6 +106,10 @@ macro(macro_for_each_gen) if(EXISTS ${GENX_PREFIX}${BRANCH_DIR}linux/hw_info_config_${GEN_TYPE_LOWER}${_BRANCH_FILENAME_SUFFIX}.cpp) list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX ${GENX_PREFIX}${BRANCH_DIR}linux/hw_info_config_${GEN_TYPE_LOWER}${_BRANCH_FILENAME_SUFFIX}.cpp) endif() + set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH_DIR}${GEN_TYPE_LOWER}/image_core_${GEN_TYPE_LOWER}.cpp) + if(EXISTS ${SRC_FILE}) + list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${SRC_FILE}) + endif() endforeach() list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp) diff --git a/opencl/test/unit_test/libult/CMakeLists.txt b/opencl/test/unit_test/libult/CMakeLists.txt index 7259de5ef5..085a181037 100644 --- a/opencl/test/unit_test/libult/CMakeLists.txt +++ b/opencl/test/unit_test/libult/CMakeLists.txt @@ -8,7 +8,6 @@ macro(macro_for_each_gen) list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW ${NEO_SHARED_TEST_DIRECTORY}/unit_test/${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/${GEN_TYPE_LOWER}.cpp - ${NEO_SHARED_DIRECTORY}/${GEN_TYPE_LOWER}/enable_family_full_core_${GEN_TYPE_LOWER}.cpp ${NEO_SOURCE_DIR}/opencl/source/${GEN_TYPE_LOWER}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp ) @@ -20,7 +19,15 @@ macro(macro_for_each_gen) if(EXISTS ${SRC_FILE}) list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) endif() - endforeach() + set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH_DIR}${GEN_TYPE_LOWER}/${SRC_IT}${GEN_TYPE_LOWER}.cpp) + if(EXISTS ${SRC_FILE}) + list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) + endif() + endforeach() + set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH_DIR}${GEN_TYPE_LOWER}/enable_family_full_core_${GEN_TYPE_LOWER}.cpp) + if(EXISTS ${SRC_FILE}) + list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) + endif() endforeach() if(EXISTS "${NEO_SHARED_TEST_DIRECTORY}/unit_test/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl") diff --git a/shared/offline_compiler/source/CMakeLists.txt b/shared/offline_compiler/source/CMakeLists.txt index e5eee0f0b5..cc180253f0 100644 --- a/shared/offline_compiler/source/CMakeLists.txt +++ b/shared/offline_compiler/source/CMakeLists.txt @@ -111,6 +111,10 @@ macro(macro_for_each_gen) if(EXISTS ${NEO_SHARED_DIRECTORY}/${GEN_TYPE_LOWER}${BRANCH_DIR}enable_${GEN_TYPE_LOWER}${_BRANCH_FILENAME_SUFFIX}.cpp) list(APPEND CLOC_LIB_SRCS_LIB ${NEO_SHARED_DIRECTORY}/${GEN_TYPE_LOWER}${BRANCH_DIR}enable_${GEN_TYPE_LOWER}${_BRANCH_FILENAME_SUFFIX}.cpp) endif() + set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH_DIR}${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp) + if(EXISTS ${SRC_FILE}) + list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE}) + endif() endforeach() endforeach() apply_macro_for_each_platform() diff --git a/shared/source/enable_gens.cmake b/shared/source/enable_gens.cmake index 5a77a835f2..005bca22f5 100644 --- a/shared/source/enable_gens.cmake +++ b/shared/source/enable_gens.cmake @@ -41,36 +41,47 @@ macro(macro_for_each_gen) set(CORE_GENX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/${GEN_TYPE_LOWER}) set(GENERATED_GENX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/generated/${GEN_TYPE_LOWER}) - foreach(SRC_IT ${CORE_SRCS_GENX_H_BASE}) - list(APPEND CORE_SRCS_${GEN_TYPE}_H_BASE ${CORE_GENX_PREFIX}/${SRC_IT}) - endforeach() - - list(APPEND CORE_SRCS_${GEN_TYPE}_H_BASE "${GENERATED_GENX_PREFIX}/hw_cmds_generated_${GEN_TYPE_LOWER}.inl") - list(APPEND CORE_SRCS_${GEN_TYPE}_H_BASE "${CORE_GENX_PREFIX}/hw_info_${GEN_TYPE_LOWER}.h") - - foreach(SRC_IT ${CORE_RUNTIME_SRCS_GENX_CPP_BASE}) - list(APPEND CORE_SRCS_${GEN_TYPE}_CPP_BASE ${CORE_GENX_PREFIX}/${SRC_IT}_${GEN_TYPE_LOWER}.cpp) - endforeach() - - foreach(OS_IT "BASE" "WINDOWS" "LINUX") - foreach(SRC_IT ${CORE_RUNTIME_SRCS_GENX_CPP_${OS_IT}}) - list(APPEND CORE_SRCS_${GEN_TYPE}_CPP_${OS_IT} ${CORE_GENX_PREFIX}/${SRC_IT}_${GEN_TYPE_LOWER}.cpp) - endforeach() - endforeach() - apply_macro_for_each_platform() - - list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${CORE_GENX_PREFIX}/enable_family_full_core_${GEN_TYPE_LOWER}.cpp) foreach(BRANCH_DIR ${BRANCH_DIR_LIST}) string(REGEX REPLACE "/$" "" _BRANCH_FILENAME_SUFFIX "${BRANCH_DIR}") string(REGEX REPLACE "^/" "_" _BRANCH_FILENAME_SUFFIX "${_BRANCH_FILENAME_SUFFIX}") + + foreach(SRC_IT ${CORE_SRCS_GENX_H_BASE} "hw_info_${GEN_TYPE_LOWER}.h") + set(SRC_FILE ${CORE_GENX_PREFIX}${BRANCH_DIR}${SRC_IT}) + if(EXISTS ${SRC_FILE}) + list(APPEND CORE_SRCS_${GEN_TYPE}_H_BASE ${SRC_FILE}) + endif() + endforeach() + + foreach(OS_IT "BASE" "WINDOWS" "LINUX") + foreach(SRC_IT ${CORE_RUNTIME_SRCS_GENX_CPP_${OS_IT}}) + set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/${SRC_IT}_${GEN_TYPE_LOWER}.cpp) + if(EXISTS ${SRC_FILE}) + list(APPEND CORE_SRCS_${GEN_TYPE}_CPP_${OS_IT} ${SRC_FILE}) + endif() + endforeach() + endforeach() + + set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/enable_family_full_core_${GEN_TYPE_LOWER}.cpp) + if(EXISTS ${SRC_FILE}) + list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${SRC_FILE}) + endif() + foreach(SRC_IT "enable_hw_info_config_" "enable_") set(SRC_FILE ${CORE_GENX_PREFIX}${BRANCH_DIR}${SRC_IT}${GEN_TYPE_LOWER}${_BRANCH_FILENAME_SUFFIX}.cpp) if(EXISTS ${SRC_FILE}) list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${SRC_FILE}) endif() + set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/${SRC_IT}${GEN_TYPE_LOWER}.cpp) + if(EXISTS ${SRC_FILE}) + list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${SRC_FILE}) + endif() endforeach() endforeach() + list(APPEND CORE_SRCS_${GEN_TYPE}_H_BASE "${GENERATED_GENX_PREFIX}/hw_cmds_generated_${GEN_TYPE_LOWER}.inl") + + apply_macro_for_each_platform() + list(APPEND CORE_SRCS_GENX_ALL_BASE ${CORE_SRCS_${GEN_TYPE}_H_BASE}) list(APPEND CORE_SRCS_GENX_ALL_BASE ${CORE_SRCS_${GEN_TYPE}_CPP_BASE}) @@ -80,8 +91,6 @@ macro(macro_for_each_gen) list(APPEND CORE_SRCS_LINK ${${GEN_TYPE}_SRC_LINK_BASE}) endmacro() - - apply_macro_for_each_gen("SUPPORTED") set_property(GLOBAL PROPERTY CORE_SRCS_GENX_ALL_BASE ${CORE_SRCS_GENX_ALL_BASE})