intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-06 02:18:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

cmake refactor

Browse Source 
Change-Id: Ic276b78419f2828c34ad70e2a7b2dbdbdf38f89d
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
This commit is contained in:
Artur Harasimiuk
2020-08-06 19:38:21 +02:00
committed by sys_ocldev
parent c959847355
commit b7ff10fccf
4 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opencl/source/enable_gens.cmake
View File

@@ -97,8 +97,6 @@ macro(macro_for_each_gen)
apply_macro_for_each_platform() 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}) foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
string(REGEX REPLACE "/$" "" _BRANCH_FILENAME_SUFFIX "${BRANCH_DIR}") string(REGEX REPLACE "/$" "" _BRANCH_FILENAME_SUFFIX "${BRANCH_DIR}")
string(REGEX REPLACE "^/" "_" _BRANCH_FILENAME_SUFFIX "${_BRANCH_FILENAME_SUFFIX}") 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) 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) list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX ${GENX_PREFIX}${BRANCH_DIR}linux/hw_info_config_${GEN_TYPE_LOWER}${_BRANCH_FILENAME_SUFFIX}.cpp)
endif() 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() endforeach()
list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp) list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp)

11
opencl/test/unit_test/libult/CMakeLists.txt
View File

@@ -8,7 +8,6 @@ macro(macro_for_each_gen)
list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW 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/${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/${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 ${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}) if(EXISTS ${SRC_FILE})
list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
endif() 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() endforeach()
if(EXISTS "${NEO_SHARED_TEST_DIRECTORY}/unit_test/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl") if(EXISTS "${NEO_SHARED_TEST_DIRECTORY}/unit_test/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")

4
shared/offline_compiler/source/CMakeLists.txt
View File

@@ -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) 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) list(APPEND CLOC_LIB_SRCS_LIB ${NEO_SHARED_DIRECTORY}/${GEN_TYPE_LOWER}${BRANCH_DIR}enable_${GEN_TYPE_LOWER}${_BRANCH_FILENAME_SUFFIX}.cpp)
endif() 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()
endforeach() endforeach()
apply_macro_for_each_platform() apply_macro_for_each_platform()

51
shared/source/enable_gens.cmake
View File

@@ -41,36 +41,47 @@ macro(macro_for_each_gen)
set(CORE_GENX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/${GEN_TYPE_LOWER}) set(CORE_GENX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/${GEN_TYPE_LOWER})
set(GENERATED_GENX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/generated/${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}) foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
string(REGEX REPLACE "/$" "" _BRANCH_FILENAME_SUFFIX "${BRANCH_DIR}") string(REGEX REPLACE "/$" "" _BRANCH_FILENAME_SUFFIX "${BRANCH_DIR}")
string(REGEX REPLACE "^/" "_" _BRANCH_FILENAME_SUFFIX "${_BRANCH_FILENAME_SUFFIX}") 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_") 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) set(SRC_FILE ${CORE_GENX_PREFIX}${BRANCH_DIR}${SRC_IT}${GEN_TYPE_LOWER}${_BRANCH_FILENAME_SUFFIX}.cpp)
if(EXISTS ${SRC_FILE}) if(EXISTS ${SRC_FILE})
list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${SRC_FILE}) list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${SRC_FILE})
endif() 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()
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}_H_BASE})
list(APPEND CORE_SRCS_GENX_ALL_BASE ${CORE_SRCS_${GEN_TYPE}_CPP_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}) list(APPEND CORE_SRCS_LINK ${${GEN_TYPE}_SRC_LINK_BASE})
endmacro() endmacro()
apply_macro_for_each_gen("SUPPORTED") apply_macro_for_each_gen("SUPPORTED")
set_property(GLOBAL PROPERTY CORE_SRCS_GENX_ALL_BASE ${CORE_SRCS_GENX_ALL_BASE}) set_property(GLOBAL PROPERTY CORE_SRCS_GENX_ALL_BASE ${CORE_SRCS_GENX_ALL_BASE})