mirror of
https://github.com/intel/compute-runtime.git
synced 2025-09-10 12:53:42 +08:00
Cmake refactor part 20
set global properties with runtime sources, libult sources and os interface tests Change-Id: I9a84edf2f021b4581a16c19c7dbb0b2f94c33f4d
This commit is contained in:

committed by
sys_ocldev

parent
ed30f6e55f
commit
575d1bf381
@ -36,7 +36,7 @@ components:
|
||||
internal:
|
||||
branch: master
|
||||
dest_dir: internal
|
||||
revision: 41c6cfb452569d1037b1449847230a7da788ad8d
|
||||
revision: 1045f4b08e689ea893012f1c4d2883652c66c989
|
||||
type: git
|
||||
khronos:
|
||||
branch: master
|
||||
|
@ -27,3 +27,4 @@ set(RUNTIME_SRCS_ACCELERATORS
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_ACCELERATORS})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_ACCELERATORS ${RUNTIME_SRCS_ACCELERATORS})
|
||||
|
@ -27,3 +27,4 @@ set(RUNTIME_SRCS_API
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/dispatch.h
|
||||
)
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_API})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_API ${RUNTIME_SRCS_API})
|
||||
|
@ -27,3 +27,4 @@ set(RUNTIME_SRCS_AUB_MEM_DUMP
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/aub_services.h
|
||||
)
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_AUB_MEM_DUMP})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_AUB_MEM_DUMP ${RUNTIME_SRCS_AUB_MEM_DUMP})
|
||||
|
@ -27,8 +27,8 @@ set(RUNTIME_SRCS_BUILT_INS
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/sip.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/vme_dispatch_builder.h
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_BUILT_INS})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_BUILT_INS ${RUNTIME_SRCS_BUILT_INS})
|
||||
|
||||
set(RUNTIME_SRCS_BUILT_IN_KERNELS
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/kernels/copy_buffer_rect.igdrcl_built_in
|
||||
|
@ -57,3 +57,4 @@ set(RUNTIME_SRCS_COMMAND_QUEUE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/local_work_size.cpp
|
||||
)
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COMMAND_QUEUE})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_COMMAND_QUEUE ${RUNTIME_SRCS_COMMAND_QUEUE})
|
||||
|
@ -48,5 +48,5 @@ set(RUNTIME_SRCS_COMMAND_STREAM
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/preemption.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/preemption.inl
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COMMAND_STREAM})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_COMMAND_STREAM ${RUNTIME_SRCS_COMMAND_STREAM})
|
||||
|
@ -31,3 +31,4 @@ set(RUNTIME_SRCS_COMPILER_INTERFACE
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COMPILER_INTERFACE})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_COMPILER_INTERFACE ${RUNTIME_SRCS_COMPILER_INTERFACE})
|
||||
|
@ -28,3 +28,4 @@ set(RUNTIME_SRCS_CONTEXT
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_CONTEXT})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_CONTEXT ${RUNTIME_SRCS_CONTEXT})
|
||||
|
@ -29,5 +29,5 @@ set(RUNTIME_SRCS_DEVICE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/device_vector.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/driver_info.h
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DEVICE})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_DEVICE ${RUNTIME_SRCS_DEVICE})
|
||||
|
@ -26,5 +26,5 @@ set(RUNTIME_SRCS_DEVICE_QUEUE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/device_queue_hw.inl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/device_queue_hw_profiling.inl
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DEVICE_QUEUE})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_DEVICE_QUEUE ${RUNTIME_SRCS_DEVICE_QUEUE})
|
||||
|
@ -96,15 +96,21 @@ foreach(GEN_TYPE ${ALL_GEN_TYPES})
|
||||
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_TYPE}_BASE})
|
||||
list(APPEND RUNTIME_SRCS_GENX_ALL_BASE ${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_TYPE}_WINDOWS})
|
||||
else()
|
||||
list(APPEND RUNTIME_SRCS_GENX ${RUNTIME_SRCS_${GEN_TYPE}_LINUX})
|
||||
list(APPEND RUNTIME_SRCS_GENX_ALL_WINDOWS ${RUNTIME_SRCS_${GEN_TYPE}_WINDOWS})
|
||||
list(APPEND RUNTIME_SRCS_GENX_ALL_LINUX ${RUNTIME_SRCS_${GEN_TYPE}_LINUX})
|
||||
if(UNIX)
|
||||
list(APPEND HW_SRC_LINK ${${GEN_TYPE}_SRC_LINK_LINUX})
|
||||
endif()
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GENX})
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GENX_ALL_BASE})
|
||||
if(WIN32)
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GENX_ALL_WINDOWS})
|
||||
else()
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GENX_ALL_LINUX})
|
||||
endif()
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_GENX_ALL_BASE ${RUNTIME_SRCS_GENX_ALL_BASE})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_GENX_ALL_LINUX ${RUNTIME_SRCS_GENX_ALL_LINUX})
|
||||
|
@ -31,5 +31,5 @@ set(RUNTIME_SRCS_EVENT
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/hw_timestamps.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/perf_counter.h
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_EVENT})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_EVENT ${RUNTIME_SRCS_EVENT})
|
||||
|
@ -37,3 +37,4 @@ target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GMM_HELPER_BASE})
|
||||
if(WIN32)
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GMM_HELPER_WINDOWS})
|
||||
endif()
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_GMM_HELPER_BASE ${RUNTIME_SRCS_GMM_HELPER_BASE})
|
||||
|
@ -46,4 +46,5 @@ else()
|
||||
endif()
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GTPIN})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_GTPIN ${RUNTIME_SRCS_GTPIN})
|
||||
set(MSVC_DEF_ADDITIONAL_EXPORTS "${MSVC_DEF_ADDITIONAL_EXPORTS}" PARENT_SCOPE)
|
||||
|
@ -94,3 +94,4 @@ target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_HELPERS_BASE})
|
||||
if(WIN32)
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_HELPERS_WINDOWS})
|
||||
endif()
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_HELPERS_BASE ${RUNTIME_SRCS_HELPERS_BASE})
|
||||
|
@ -23,5 +23,5 @@ set(RUNTIME_SRCS_INDIRECT_HEAP
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/indirect_heap.h
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_INDIRECT_HEAP})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_INDIRECT_HEAP ${RUNTIME_SRCS_INDIRECT_HEAP})
|
||||
|
@ -23,5 +23,5 @@ set(RUNTIME_SRCS_INSTRUMENTATION
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/instrumentation.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/instrumentation.h
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_INSTRUMENTATION})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_INSTRUMENTATION ${RUNTIME_SRCS_INSTRUMENTATION})
|
||||
|
@ -25,5 +25,5 @@ set(RUNTIME_SRCS_KERNEL
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/kernel.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/kernel.inl
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_KERNEL})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_KERNEL ${RUNTIME_SRCS_KERNEL})
|
||||
|
@ -37,3 +37,4 @@ set(RUNTIME_SRCS_MEM_OBJ
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_MEM_OBJ})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_MEM_OBJ ${RUNTIME_SRCS_MEM_OBJ})
|
||||
|
@ -43,3 +43,4 @@ set(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})
|
||||
|
@ -37,4 +37,5 @@ set(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})
|
||||
add_subdirectories()
|
||||
|
@ -60,5 +60,5 @@ set(RUNTIME_SRCS_OS_INTERFACE_LINUX
|
||||
if(UNIX)
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_OS_INTERFACE_LINUX})
|
||||
endif()
|
||||
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_OS_INTERFACE_LINUX ${RUNTIME_SRCS_OS_INTERFACE_LINUX})
|
||||
add_subdirectories()
|
||||
|
@ -26,5 +26,5 @@ set(RUNTIME_SRCS_PLATFORM
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/platform.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/platform_info.h
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_PLATFORM})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_PLATFORM ${RUNTIME_SRCS_PLATFORM})
|
||||
|
@ -43,5 +43,5 @@ set(RUNTIME_SRCS_PROGRAM
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/program.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/program.h
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_PROGRAM})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_PROGRAM ${RUNTIME_SRCS_PROGRAM})
|
||||
|
@ -25,5 +25,5 @@ set(RUNTIME_SRCS_SAMPLER
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/sampler.inl
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/sampler_factory_init.inl
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SAMPLER})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_SAMPLER ${RUNTIME_SRCS_SAMPLER})
|
||||
|
@ -24,8 +24,8 @@ set(RUNTIME_SRCS_SCHEDULER
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/scheduler_kernel.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/scheduler_kernel.h
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SCHEDULER})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_SCHEDULER ${RUNTIME_SRCS_SCHEDULER})
|
||||
|
||||
if(NOT (TARGET ${SCHEDULER_BINARY_LIB_NAME}))
|
||||
include(scheduler_binary.cmake)
|
||||
|
@ -38,8 +38,9 @@ set(RUNTIME_SRCS_SHARINGS
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/sharing_factory.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/sharing_factory.inl
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SHARINGS})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_SHARINGS ${RUNTIME_SRCS_SHARINGS})
|
||||
|
||||
|
||||
if(WIN32)
|
||||
target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE ${IGDRCL_SOURCE_DIR}/runtime/os_interface/windows)
|
||||
|
@ -32,6 +32,7 @@ set(RUNTIME_SRCS_SKU_INFO_WINDOWS
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SKU_INFO_BASE})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_SKU_INFO_BASE ${RUNTIME_SRCS_SKU_INFO_BASE})
|
||||
|
||||
if(WIN32)
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SKU_INFO_WINDOWS})
|
||||
|
@ -25,5 +25,5 @@ set(RUNTIME_SRCS_TBX
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tbx_sockets_imp.cpp
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/tbx_sockets_imp.h
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_TBX})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_TBX ${RUNTIME_SRCS_TBX})
|
||||
|
@ -57,6 +57,8 @@ set(RUNTIME_SRCS_UTILITIES_LINUX
|
||||
)
|
||||
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_UTILITIES_BASE})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_UTILITIES_BASE ${RUNTIME_SRCS_UTILITIES_BASE})
|
||||
set_property(GLOBAL PROPERTY RUNTIME_SRCS_UTILITIES_LINUX ${RUNTIME_SRCS_UTILITIES_LINUX})
|
||||
if(WIN32)
|
||||
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_UTILITIES_WINDOWS})
|
||||
else()
|
||||
|
@ -48,3 +48,4 @@ set(IGDRCL_SRCS_tests_fixtures
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/two_walker_fixture.h
|
||||
)
|
||||
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_fixtures})
|
||||
set_property(GLOBAL PROPERTY IGDRCL_SRCS_tests_fixtures ${IGDRCL_SRCS_tests_fixtures})
|
@ -125,6 +125,13 @@ target_include_directories(igdrcl_libult_env PRIVATE
|
||||
${IGDRCL_SOURCE_DIR}/unit_tests/mocks${BRANCH_DIR_SUFFIX}
|
||||
)
|
||||
|
||||
set_property(GLOBAL PROPERTY IGDRCL_SRCS_ENABLE_TESTED_HW ${IGDRCL_SRCS_ENABLE_TESTED_HW})
|
||||
set_property(GLOBAL PROPERTY IGDRCL_SRCS_ENABLE_TESTED_HW_LINUX ${IGDRCL_SRCS_ENABLE_TESTED_HW_LINUX})
|
||||
set_property(GLOBAL PROPERTY IGDRCL_SRCS_LIB_ULT ${IGDRCL_SRCS_LIB_ULT})
|
||||
set_property(GLOBAL PROPERTY IGDRCL_SRCS_LIB_ULT_CS ${IGDRCL_SRCS_LIB_ULT_CS})
|
||||
set_property(GLOBAL PROPERTY IGDRCL_SRCS_LIB_ULT_ENV ${IGDRCL_SRCS_LIB_ULT_ENV})
|
||||
set_property(GLOBAL PROPERTY IGDRCL_SRCS_LIB_ULT_ENV_LINUX ${IGDRCL_SRCS_LIB_ULT_ENV_LINUX})
|
||||
|
||||
foreach(target_name igdrcl_libult igdrcl_libult_cs igdrcl_libult_env)
|
||||
set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
||||
set_target_properties(${target_name} PROPERTIES FOLDER ${TEST_PROJECTS_FOLDER})
|
||||
|
@ -33,4 +33,5 @@ set(IGDRCL_SRCS_tests_os_interface_base
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_tests.cpp
|
||||
)
|
||||
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_os_interface_base})
|
||||
set_property(GLOBAL PROPERTY IGDRCL_SRCS_tests_os_interface_base ${IGDRCL_SRCS_tests_os_interface_base})
|
||||
add_subdirectories()
|
||||
|
@ -47,4 +47,5 @@ set(IGDRCL_SRCS_tests_os_interface_linux
|
||||
if(UNIX)
|
||||
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_os_interface_linux})
|
||||
endif()
|
||||
set_property(GLOBAL PROPERTY IGDRCL_SRCS_tests_os_interface_linux ${IGDRCL_SRCS_tests_os_interface_linux})
|
||||
add_subdirectories()
|
||||
|
@ -21,7 +21,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <cstdint>
|
||||
#include "drm/i915_drm.h"
|
||||
#include "gmock/gmock.h"
|
||||
#include "gtest/gtest.h"
|
||||
|
Reference in New Issue
Block a user