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

Add cmake macro to append sources from properties 

Change-Id: I06771c56ebca2e7a0dc5b65d6ea53aca95a70797
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski 2019-11-19 15:28:33 +01:00 committed by sys_ocldev
parent 4b0d1c93ea
commit bccfa1df38
12 changed files with 45 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common_macros.cmake
View File

@ -94,3 +94,11 @@ macro(get_family_name_with_type gen_type platform_type)
string(TOLOWER ${platform_type} platform_type_lower) string(TOLOWER ${platform_type} platform_type_lower)
set(family_name_with_type ${gen_type_capitalized}${platform_type_lower}) set(family_name_with_type ${gen_type_capitalized}${platform_type_lower})
endmacro() endmacro()
macro(append_sources_from_properties list_name)
foreach(name ${ARGN})
get_property(${name} GLOBAL PROPERTY ${name})
list(APPEND ${list_name} ${${name}})
endforeach()
endmacro()

4
core/page_fault_manager/linux/CMakeLists.txt
View File

@ -10,6 +10,4 @@ set(NEO_CORE_PAGE_FAULT_MANAGER_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_linux.h ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_linux.h
) )
if(UNIX) set_property(GLOBAL PROPERTY NEO_CORE_PAGE_FAULT_MANAGER_LINUX ${NEO_CORE_PAGE_FAULT_MANAGER_LINUX})
set_property(GLOBAL PROPERTY NEO_CORE_PAGE_FAULT_MANAGER_LINUX ${NEO_CORE_PAGE_FAULT_MANAGER_LINUX})
endif()

2
runtime/CMakeLists.txt
View File

@ -32,7 +32,7 @@ add_library(${NEO_STATIC_LIB_NAME} STATIC EXCLUDE_FROM_ALL
add_subdirectories() add_subdirectories()
add_subdirectory(instrumentation${IGDRCL__INSTRUMENTATION_DIR_SUFFIX}) add_subdirectory(instrumentation${IGDRCL__INSTRUMENTATION_DIR_SUFFIX})
include(enable_gens.cmake) include(enable_gens.cmake)
include(core_files.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/core_files.cmake)
# Enable SSE4/AVX2 options for files that need them # Enable SSE4/AVX2 options for files that need them
if(MSVC) if(MSVC)

3
runtime/command_stream/CMakeLists.txt
View File

@ -49,9 +49,6 @@ set(RUNTIME_SRCS_COMMAND_STREAM
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/command_stream_receiver_hw_ext.inl ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/command_stream_receiver_hw_ext.inl
) )
get_property(NEO_CORE_COMMAND_STREAM GLOBAL PROPERTY NEO_CORE_COMMAND_STREAM)
list(APPEND RUNTIME_SRCS_COMMAND_STREAM ${NEO_CORE_COMMAND_STREAM})
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COMMAND_STREAM}) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COMMAND_STREAM})
set_property(GLOBAL PROPERTY RUNTIME_SRCS_COMMAND_STREAM ${RUNTIME_SRCS_COMMAND_STREAM}) set_property(GLOBAL PROPERTY RUNTIME_SRCS_COMMAND_STREAM ${RUNTIME_SRCS_COMMAND_STREAM})
add_subdirectories() add_subdirectories()

42
runtime/core_files.cmake
View File

@ -4,13 +4,41 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
get_property(NEO_CORE_GMM_HELPER GLOBAL PROPERTY NEO_CORE_GMM_HELPER) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_SOURCE_DIR}/runtime/core_files.cmake)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_CORE_GMM_HELPER})
get_property(NEO_CORE_SKU_INFO_BASE GLOBAL PROPERTY NEO_CORE_SKU_INFO_BASE) append_sources_from_properties(NEO_CORE_SOURCES
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_CORE_SKU_INFO_BASE}) NEO_CORE_COMMAND_STREAM
NEO_CORE_EXECUTION_ENVIRONMENT
NEO_CORE_GMM_HELPER
NEO_CORE_HELPERS
NEO_CORE_MEMORY_MANAGER
NEO_CORE_OS_INTERFACE
NEO_CORE_PAGE_FAULT_MANAGER
NEO_CORE_SKU_INFO_BASE
NEO_CORE_UTILITIES
NEO_UNIFIED_MEMORY
)
append_sources_from_properties(NEO_CORE_SOURCES_WINDOWS
NEO_CORE_OS_INTERFACE_WINDOWS
NEO_CORE_PAGE_FAULT_MANAGER_WINDOWS
NEO_CORE_SKU_INFO_WINDOWS
NEO_CORE_UTILITIES_WINDOWS
)
append_sources_from_properties(NEO_CORE_SOURCES_LINUX
NEO_CORE_OS_INTERFACE_LINUX
NEO_CORE_PAGE_FAULT_MANAGER_LINUX
NEO_CORE_UTILITIES_LINUX
)
set_property(GLOBAL PROPERTY NEO_CORE_SOURCES ${NEO_CORE_SOURCES})
set_property(GLOBAL PROPERTY NEO_CORE_SOURCES_WINDOWS ${NEO_CORE_SOURCES_WINDOWS})
set_property(GLOBAL PROPERTY NEO_CORE_SOURCES_LINUX ${NEO_CORE_SOURCES_LINUX})
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_CORE_SOURCES})
if(WIN32) if(WIN32)
get_property(NEO_CORE_SKU_INFO_WINDOWS GLOBAL PROPERTY NEO_CORE_SKU_INFO_WINDOWS) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_CORE_SOURCES_WINDOWS})
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_CORE_SKU_INFO_WINDOWS}) else()
endif() target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_CORE_SOURCES_LINUX})
endif()

3
runtime/execution_environment/CMakeLists.txt
View File

@ -10,8 +10,5 @@ set(RUNTIME_SRCS_EXECUTION_ENVIRONMENT
${CMAKE_CURRENT_SOURCE_DIR}/execution_environment.cpp ${CMAKE_CURRENT_SOURCE_DIR}/execution_environment.cpp
) )
get_property(NEO_CORE_EXECUTION_ENVIRONMENT GLOBAL PROPERTY NEO_CORE_EXECUTION_ENVIRONMENT)
list(APPEND RUNTIME_SRCS_EXECUTION_ENVIRONMENT ${NEO_CORE_EXECUTION_ENVIRONMENT})
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_EXECUTION_ENVIRONMENT}) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_EXECUTION_ENVIRONMENT})
set_property(GLOBAL PROPERTY RUNTIME_SRCS_EXECUTION_ENVIRONMENT ${RUNTIME_SRCS_EXECUTION_ENVIRONMENT}) set_property(GLOBAL PROPERTY RUNTIME_SRCS_EXECUTION_ENVIRONMENT ${RUNTIME_SRCS_EXECUTION_ENVIRONMENT})

3
runtime/helpers/CMakeLists.txt
View File

@ -86,9 +86,6 @@ set(RUNTIME_SRCS_HELPERS_BASE
${CMAKE_CURRENT_SOURCE_DIR}/validators.h ${CMAKE_CURRENT_SOURCE_DIR}/validators.h
) )
get_property(NEO_CORE_HELPERS GLOBAL PROPERTY NEO_CORE_HELPERS)
list(APPEND RUNTIME_SRCS_HELPERS_BASE ${NEO_CORE_HELPERS})
set(RUNTIME_SRCS_HELPERS_WINDOWS set(RUNTIME_SRCS_HELPERS_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/gmm_callbacks.h ${CMAKE_CURRENT_SOURCE_DIR}/gmm_callbacks.h
${CMAKE_CURRENT_SOURCE_DIR}/gmm_callbacks.inl ${CMAKE_CURRENT_SOURCE_DIR}/gmm_callbacks.inl

22
runtime/memory_manager/CMakeLists.txt
View File

@ -35,28 +35,6 @@ set(RUNTIME_SRCS_MEMORY_MANAGER
${CMAKE_CURRENT_SOURCE_DIR}/surface.h ${CMAKE_CURRENT_SOURCE_DIR}/surface.h
) )
get_property(NEO_UNIFIED_MEMORY GLOBAL PROPERTY NEO_UNIFIED_MEMORY)
list(APPEND RUNTIME_SRCS_MEMORY_MANAGER ${NEO_UNIFIED_MEMORY})
get_property(NEO_CORE_MEMORY_MANAGER GLOBAL PROPERTY NEO_CORE_MEMORY_MANAGER)
list(APPEND RUNTIME_SRCS_MEMORY_MANAGER ${NEO_CORE_MEMORY_MANAGER})
get_property(NEO_CORE_MEMORY_PROPERTIES GLOBAL PROPERTY NEO_CORE_MEMORY_PROPERTIES)
list(APPEND RUNTIME_SRCS_MEMORY_MANAGER ${NEO_CORE_MEMORY_PROPERTIES})
get_property(NEO_CORE_PAGE_FAULT_MANAGER GLOBAL PROPERTY NEO_CORE_PAGE_FAULT_MANAGER)
list(APPEND RUNTIME_SRCS_MEMORY_MANAGER ${NEO_CORE_PAGE_FAULT_MANAGER})
if(WIN32)
get_property(NEO_CORE_PAGE_FAULT_MANAGER_WINDOWS GLOBAL PROPERTY NEO_CORE_PAGE_FAULT_MANAGER_WINDOWS)
list(APPEND RUNTIME_SRCS_MEMORY_MANAGER ${NEO_CORE_PAGE_FAULT_MANAGER_WINDOWS})
endif()
if(UNIX)
get_property(NEO_CORE_PAGE_FAULT_MANAGER_LINUX GLOBAL PROPERTY NEO_CORE_PAGE_FAULT_MANAGER_LINUX)
list(APPEND RUNTIME_SRCS_MEMORY_MANAGER ${NEO_CORE_PAGE_FAULT_MANAGER_LINUX})
endif()
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_MEMORY_MANAGER}) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_MEMORY_MANAGER})
set_property(GLOBAL PROPERTY RUNTIME_SRCS_MEMORY_MANAGER ${RUNTIME_SRCS_MEMORY_MANAGER}) set_property(GLOBAL PROPERTY RUNTIME_SRCS_MEMORY_MANAGER ${RUNTIME_SRCS_MEMORY_MANAGER})
add_subdirectories() add_subdirectories()

3
runtime/os_interface/CMakeLists.txt
View File

@ -30,9 +30,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_BASE
${CMAKE_CURRENT_SOURCE_DIR}/print.h ${CMAKE_CURRENT_SOURCE_DIR}/print.h
) )
get_property(NEO_CORE_OS_INTERFACE GLOBAL PROPERTY NEO_CORE_OS_INTERFACE)
list(APPEND RUNTIME_SRCS_OS_INTERFACE_BASE ${NEO_CORE_OS_INTERFACE})
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_OS_INTERFACE_BASE}) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_OS_INTERFACE_BASE})
set_property(GLOBAL PROPERTY RUNTIME_SRCS_OS_INTERFACE_BASE ${RUNTIME_SRCS_OS_INTERFACE_BASE}) set_property(GLOBAL PROPERTY RUNTIME_SRCS_OS_INTERFACE_BASE ${RUNTIME_SRCS_OS_INTERFACE_BASE})
add_subdirectories() add_subdirectories()

4
runtime/os_interface/linux/CMakeLists.txt
View File

@ -52,10 +52,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux.h ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_linux.h
${CMAKE_CURRENT_SOURCE_DIR}/print.cpp ${CMAKE_CURRENT_SOURCE_DIR}/print.cpp
) )
get_property(NEO_CORE_OS_INTERFACE_LINUX GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_LINUX)
list(APPEND RUNTIME_SRCS_OS_INTERFACE_LINUX ${NEO_CORE_OS_INTERFACE_LINUX})
if(UNIX) if(UNIX)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_OS_INTERFACE_LINUX}) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_OS_INTERFACE_LINUX})
endif() endif()

3
runtime/os_interface/windows/CMakeLists.txt
View File

@ -71,9 +71,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
) )
if(WIN32) if(WIN32)
get_property(NEO_CORE_OS_INTERFACE_WINDOWS GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_WINDOWS)
list(APPEND RUNTIME_SRCS_OS_INTERFACE_WINDOWS ${NEO_CORE_OS_INTERFACE_WINDOWS})
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE target_sources(${NEO_STATIC_LIB_NAME} PRIVATE
${RUNTIME_SRCS_OS_INTERFACE_WINDOWS} ${RUNTIME_SRCS_OS_INTERFACE_WINDOWS}
) )

6
runtime/utilities/CMakeLists.txt
View File

@ -12,12 +12,6 @@ set(RUNTIME_SRCS_UTILITIES_BASE
${CMAKE_CURRENT_SOURCE_DIR}/tag_allocator.h ${CMAKE_CURRENT_SOURCE_DIR}/tag_allocator.h
) )
get_property(NEO_CORE_UTILITIES GLOBAL PROPERTY NEO_CORE_UTILITIES)
list(APPEND RUNTIME_SRCS_UTILITIES_BASE ${NEO_CORE_UTILITIES})
get_property(NEO_CORE_UTILITIES_WINDOWS GLOBAL PROPERTY NEO_CORE_UTILITIES_WINDOWS)
get_property(NEO_CORE_UTILITIES_LINUX GLOBAL PROPERTY NEO_CORE_UTILITIES_LINUX)
set_property(GLOBAL PROPERTY RUNTIME_SRCS_UTILITIES_BASE ${RUNTIME_SRCS_UTILITIES_BASE}) set_property(GLOBAL PROPERTY RUNTIME_SRCS_UTILITIES_BASE ${RUNTIME_SRCS_UTILITIES_BASE})
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_UTILITIES_BASE}) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_UTILITIES_BASE})