Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move some files from opencl/source/dll to shared

Browse Source 
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2021-10-22 18:54:54 +00:00
committed by Compute-Runtime-Automation
parent 4cad3073f0
commit 19b8a03d30
18 changed files with 42 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
level_zero/CMakeLists.txt
View File

@ -217,18 +217,21 @@ if(BUILD_WITH_L0)
target_sources(${TARGET_NAME_L0}
PRIVATE
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_deferred_deleter.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_memory_manager_${DRIVER_MODEL}.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_tbx_sockets.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/get_devices.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/source_level_debugger_dll.cpp
${COMPUTE_RUNTIME_DIR}/shared/source/built_ins/sip_init.cpp
${COMPUTE_RUNTIME_DIR}/shared/source/aub/aub_stream_interface.cpp
${NEO_SHARED_DIRECTORY}/aub/aub_stream_interface.cpp
${NEO_SHARED_DIRECTORY}/built_ins/sip_init.cpp
${NEO_SHARED_DIRECTORY}/dll/create_deferred_deleter.cpp
${NEO_SHARED_DIRECTORY}/dll/create_memory_manager_${DRIVER_MODEL}.cpp
${NEO_SHARED_DIRECTORY}/dll/create_tbx_sockets.cpp
${NEO_SHARED_DIRECTORY}/dll/get_devices.cpp
${NEO_SHARED_DIRECTORY}/dll/source_level_debugger_dll.cpp
)
if(WIN32)
target_sources(${TARGET_NAME_L0}
PRIVATE
${NEO_SHARED_DIRECTORY}/dll/windows/environment_variables.cpp
${NEO_SHARED_DIRECTORY}/dll/windows/options_windows.cpp
${NEO_SHARED_DIRECTORY}/dll/windows/os_interface.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory_base.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/sys_calls.cpp
@ -236,9 +239,6 @@ if(BUILD_WITH_L0)
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_memory_virtual_alloc.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_calls.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
${NEO_SHARED_DIRECTORY}/dll/windows/environment_variables.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/windows/options_windows.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/windows/os_interface.cpp
)
target_link_libraries(${TARGET_NAME_L0}
dxgi
@ -255,8 +255,10 @@ if(BUILD_WITH_L0)
${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}devices.inl
${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}devices_additional.inl
${NEO_SHARED_DIRECTORY}/dll/devices/devices_base.inl
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/options_linux.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/os_interface.cpp
${NEO_SHARED_DIRECTORY}/dll/linux/drm_neo_create.cpp
${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.cpp
${NEO_SHARED_DIRECTORY}/dll/linux/os_interface.cpp
${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
)
if(NOT DISABLE_WDDM_LINUX)
target_sources(${TARGET_NAME_L0}
@ -308,11 +310,6 @@ if(BUILD_WITH_L0)
target_include_directories(${TARGET_NAME_L0} PRIVATE ${IGC_COMMON_PARENT_DIR})
if(UNIX)
target_sources(${TARGET_NAME_L0}
PRIVATE
${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/drm_neo_create.cpp
)
set(OS_SPECIFIC_LIBS dl pthread rt)
target_include_directories(${TARGET_NAME_L0} PUBLIC
${L0_ROOT_DIR}/core/source/os_interface/linux

22
opencl/source/dll/CMakeLists.txt
View File

@ -12,12 +12,11 @@ endif()
set(RUNTIME_SRCS_DLL_BASE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/create_deferred_deleter.cpp
${CMAKE_CURRENT_SOURCE_DIR}/create_memory_manager_${DRIVER_MODEL}.cpp
${CMAKE_CURRENT_SOURCE_DIR}/create_tbx_sockets.cpp
${CMAKE_CURRENT_SOURCE_DIR}/debug_manager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger_dll.cpp
${CMAKE_CURRENT_SOURCE_DIR}/get_devices.cpp
${NEO_SHARED_DIRECTORY}/dll/create_deferred_deleter.cpp
${NEO_SHARED_DIRECTORY}/dll/create_memory_manager_${DRIVER_MODEL}.cpp
${NEO_SHARED_DIRECTORY}/dll/create_tbx_sockets.cpp
${NEO_SHARED_DIRECTORY}/dll/source_level_debugger_dll.cpp
${NEO_SHARED_DIRECTORY}/dll/get_devices.cpp
${NEO_SHARED_DIRECTORY}/built_ins/sip_init.cpp
${NEO_SHARED_DIRECTORY}/dll/create_command_stream.cpp
${NEO_SHARED_DIRECTORY}/dll/options_dll.cpp
@ -31,6 +30,7 @@ set(RUNTIME_SRCS_DLL_BASE
${NEO_SHARED_DIRECTORY}/utilities/io_functions.cpp
${NEO_SOURCE_DIR}/opencl/source/api/api.cpp
${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp
${NEO_SOURCE_DIR}/opencl/source/dll/debug_manager.cpp
${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
${GTPIN_INIT_FILE}
@ -41,9 +41,9 @@ set(RUNTIME_SRCS_DLL_BASE
append_sources_from_properties(RUNTIME_SRCS_DLL_BASE NEO_CORE_SRCS_LINK)
set(RUNTIME_SRCS_DLL_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/linux/drm_neo_create.cpp
${CMAKE_CURRENT_SOURCE_DIR}/linux/options_linux.cpp
${CMAKE_CURRENT_SOURCE_DIR}/linux/os_interface.cpp
${NEO_SHARED_DIRECTORY}/dll/linux/drm_neo_create.cpp
${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.cpp
${NEO_SHARED_DIRECTORY}/dll/linux/os_interface.cpp
${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}devices.inl
${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}devices_additional.inl
${NEO_SHARED_DIRECTORY}/dll/devices/devices_base.inl
@ -52,8 +52,8 @@ set(RUNTIME_SRCS_DLL_LINUX
)
set(RUNTIME_SRCS_DLL_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/windows/options_windows.cpp
${CMAKE_CURRENT_SOURCE_DIR}/windows/os_interface.cpp
${NEO_SHARED_DIRECTORY}/dll/windows/options_windows.cpp
${NEO_SHARED_DIRECTORY}/dll/windows/os_interface.cpp
${NEO_SHARED_DIRECTORY}/dll/windows/environment_variables.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_memory_virtual_alloc.cpp

10
opencl/test/unit_test/linux/CMakeLists.txt
View File

@ -21,14 +21,14 @@ add_executable(igdrcl_${target_name}
${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.h
${CMAKE_CURRENT_SOURCE_DIR}/os_interface_linux_tests.cpp
${NEO_SHARED_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
${NEO_SOURCE_DIR}/opencl/source/dll/create_memory_manager_drm.cpp
${NEO_SOURCE_DIR}/opencl/source/dll/linux/drm_neo_create.cpp
${NEO_SOURCE_DIR}/opencl/source/dll/linux/options_linux.cpp
${NEO_SOURCE_DIR}/opencl/source/dll/linux/os_interface.cpp
${NEO_SHARED_DIRECTORY}/dll/create_memory_manager_drm.cpp
${NEO_SHARED_DIRECTORY}/dll/linux/drm_neo_create.cpp
${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.cpp
${NEO_SHARED_DIRECTORY}/dll/linux/os_interface.cpp
${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
${NEO_SOURCE_DIR}/opencl/source/os_interface/linux/platform_teardown_linux.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/linux${BRANCH_DIR_SUFFIX}drm_other_requests.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h
)
if(NEO__LIBVA_FOUND)

16
opencl/test/unit_test/windows/CMakeLists.txt
View File

@ -15,17 +15,15 @@ if(WIN32)
)
add_executable(igdrcl_windows_dll_tests
${NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS}
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
${NEO_SOURCE_DIR}/opencl/source/dll/get_devices.cpp
${NEO_SOURCE_DIR}/opencl/source/dll/windows/os_interface.cpp
${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp
${NEO_SOURCE_DIR}/shared/source/dll/create_command_stream.cpp
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}get_devices_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/wddm_create_tests.cpp
${NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS}
${NEO_SHARED_DIRECTORY}/aub/aub_stream_interface.cpp
${NEO_SHARED_DIRECTORY}/dll/get_devices.cpp
${NEO_SHARED_DIRECTORY}/dll/windows/os_interface.cpp
${NEO_SHARED_DIRECTORY}/dll/create_command_stream.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_wddm.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/create_wddm_memory_manager.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/mock_environment_variables.cpp
@ -36,6 +34,8 @@ if(WIN32)
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_checks_shared.cpp
${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
)
target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})

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

@ -86,16 +86,16 @@ endif()
if(WIN32)
list(APPEND CLOC_LIB_SRCS_LIB
${NEO_SHARED_DIRECTORY}/dll/windows/options_windows.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_library_win.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_library_win.h
${NEO_SOURCE_DIR}/opencl/source/dll/windows/options_windows.cpp
)
else()
list(APPEND CLOC_LIB_SRCS_LIB
${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.cpp
${NEO_SHARED_DIRECTORY}/os_interface/linux/os_library_linux.cpp
${NEO_SHARED_DIRECTORY}/os_interface/linux/os_library_linux.h
${NEO_SHARED_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
${NEO_SOURCE_DIR}/opencl/source/dll/linux/options_linux.cpp
${OCLOC_DIRECTORY}/source/linux/os_library_ocloc_helper.cpp
)
endif()

0
opencl/source/dll/create_deferred_deleter.cpp → shared/source/dll/create_deferred_deleter.cpp
View File

0
opencl/source/dll/create_memory_manager_drm.cpp → shared/source/dll/create_memory_manager_drm.cpp
View File

0
opencl/source/dll/create_memory_manager_drm_or_wddm.cpp → shared/source/dll/create_memory_manager_drm_or_wddm.cpp
View File

0
opencl/source/dll/create_memory_manager_wddm.cpp → shared/source/dll/create_memory_manager_wddm.cpp
View File

2
opencl/source/dll/create_tbx_sockets.cpp → shared/source/dll/create_tbx_sockets.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2020 Intel Corporation
* Copyright (C) 2018-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*

0
opencl/source/dll/get_devices.cpp → shared/source/dll/get_devices.cpp
View File

0
opencl/source/dll/linux/drm_neo_create.cpp → shared/source/dll/linux/drm_neo_create.cpp
View File

0
opencl/source/dll/linux/options_linux.cpp → shared/source/dll/linux/options_linux.cpp
View File

0
opencl/source/dll/linux/os_interface.cpp → shared/source/dll/linux/os_interface.cpp
View File

0
opencl/source/dll/source_level_debugger_dll.cpp → shared/source/dll/source_level_debugger_dll.cpp
View File

0
opencl/source/dll/windows/options_windows.cpp → shared/source/dll/windows/options_windows.cpp
View File

0
opencl/source/dll/windows/os_interface.cpp → shared/source/dll/windows/os_interface.cpp
View File

2
shared/test/unit_test/CMakeLists.txt
View File

@ -41,7 +41,7 @@ if(NOT SKIP_UNIT_TESTS)
if(UNIX)
target_sources(${TARGET_NAME} PRIVATE
${NEO_SOURCE_DIR}/opencl/source/dll/linux/os_interface.cpp
${NEO_SHARED_DIRECTORY}/dll/linux/os_interface.cpp
)
endif()