Skip to content

Commit 19b8a03

Browse files
JablonskiMateuszCompute-Runtime-Automation
JablonskiMateusz
authored and
Compute-Runtime-Automation
committed
Move some files from opencl/source/dll to shared
Signed-off-by: Mateusz Jablonski <[email protected]>
1 parent 4cad307 commit 19b8a03

18 files changed

+42
-45
lines changed

‎level_zero/CMakeLists.txt‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -217,28 +217,28 @@ if(BUILD_WITH_L0)
217217

218218
target_sources(${TARGET_NAME_L0}
219219
PRIVATE
220-
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_deferred_deleter.cpp
221-
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_memory_manager_${DRIVER_MODEL}.cpp
222-
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_tbx_sockets.cpp
223-
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/get_devices.cpp
224-
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/source_level_debugger_dll.cpp
225-
${COMPUTE_RUNTIME_DIR}/shared/source/built_ins/sip_init.cpp
226-
${COMPUTE_RUNTIME_DIR}/shared/source/aub/aub_stream_interface.cpp
220+
${NEO_SHARED_DIRECTORY}/aub/aub_stream_interface.cpp
221+
${NEO_SHARED_DIRECTORY}/built_ins/sip_init.cpp
222+
${NEO_SHARED_DIRECTORY}/dll/create_deferred_deleter.cpp
223+
${NEO_SHARED_DIRECTORY}/dll/create_memory_manager_${DRIVER_MODEL}.cpp
224+
${NEO_SHARED_DIRECTORY}/dll/create_tbx_sockets.cpp
225+
${NEO_SHARED_DIRECTORY}/dll/get_devices.cpp
226+
${NEO_SHARED_DIRECTORY}/dll/source_level_debugger_dll.cpp
227227
)
228228

229229
if(WIN32)
230230
target_sources(${TARGET_NAME_L0}
231231
PRIVATE
232+
${NEO_SHARED_DIRECTORY}/dll/windows/environment_variables.cpp
233+
${NEO_SHARED_DIRECTORY}/dll/windows/options_windows.cpp
234+
${NEO_SHARED_DIRECTORY}/dll/windows/os_interface.cpp
232235
${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory_base.cpp
233236
${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
234237
${NEO_SHARED_DIRECTORY}/os_interface/windows/sys_calls.cpp
235238
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_interface_win.cpp
236239
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_memory_virtual_alloc.cpp
237240
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_calls.cpp
238241
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
239-
${NEO_SHARED_DIRECTORY}/dll/windows/environment_variables.cpp
240-
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/windows/options_windows.cpp
241-
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/windows/os_interface.cpp
242242
)
243243
target_link_libraries(${TARGET_NAME_L0}
244244
dxgi
@@ -255,8 +255,10 @@ if(BUILD_WITH_L0)
255255
${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}devices.inl
256256
${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}devices_additional.inl
257257
${NEO_SHARED_DIRECTORY}/dll/devices/devices_base.inl
258-
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/options_linux.cpp
259-
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/os_interface.cpp
258+
${NEO_SHARED_DIRECTORY}/dll/linux/drm_neo_create.cpp
259+
${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.cpp
260+
${NEO_SHARED_DIRECTORY}/dll/linux/os_interface.cpp
261+
${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
260262
)
261263
if(NOT DISABLE_WDDM_LINUX)
262264
target_sources(${TARGET_NAME_L0}
@@ -308,11 +310,6 @@ if(BUILD_WITH_L0)
308310
target_include_directories(${TARGET_NAME_L0} PRIVATE ${IGC_COMMON_PARENT_DIR})
309311

310312
if(UNIX)
311-
target_sources(${TARGET_NAME_L0}
312-
PRIVATE
313-
${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
314-
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/drm_neo_create.cpp
315-
)
316313
set(OS_SPECIFIC_LIBS dl pthread rt)
317314
target_include_directories(${TARGET_NAME_L0} PUBLIC
318315
${L0_ROOT_DIR}/core/source/os_interface/linux

‎opencl/source/dll/CMakeLists.txt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ endif()
1212

1313
set(RUNTIME_SRCS_DLL_BASE
1414
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
15-
${CMAKE_CURRENT_SOURCE_DIR}/create_deferred_deleter.cpp
16-
${CMAKE_CURRENT_SOURCE_DIR}/create_memory_manager_${DRIVER_MODEL}.cpp
17-
${CMAKE_CURRENT_SOURCE_DIR}/create_tbx_sockets.cpp
18-
${CMAKE_CURRENT_SOURCE_DIR}/debug_manager.cpp
19-
${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger_dll.cpp
20-
${CMAKE_CURRENT_SOURCE_DIR}/get_devices.cpp
15+
${NEO_SHARED_DIRECTORY}/dll/create_deferred_deleter.cpp
16+
${NEO_SHARED_DIRECTORY}/dll/create_memory_manager_${DRIVER_MODEL}.cpp
17+
${NEO_SHARED_DIRECTORY}/dll/create_tbx_sockets.cpp
18+
${NEO_SHARED_DIRECTORY}/dll/source_level_debugger_dll.cpp
19+
${NEO_SHARED_DIRECTORY}/dll/get_devices.cpp
2120
${NEO_SHARED_DIRECTORY}/built_ins/sip_init.cpp
2221
${NEO_SHARED_DIRECTORY}/dll/create_command_stream.cpp
2322
${NEO_SHARED_DIRECTORY}/dll/options_dll.cpp
@@ -31,6 +30,7 @@ set(RUNTIME_SRCS_DLL_BASE
3130
${NEO_SHARED_DIRECTORY}/utilities/io_functions.cpp
3231
${NEO_SOURCE_DIR}/opencl/source/api/api.cpp
3332
${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp
33+
${NEO_SOURCE_DIR}/opencl/source/dll/debug_manager.cpp
3434
${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
3535

3636
${GTPIN_INIT_FILE}
@@ -41,9 +41,9 @@ set(RUNTIME_SRCS_DLL_BASE
4141
append_sources_from_properties(RUNTIME_SRCS_DLL_BASE NEO_CORE_SRCS_LINK)
4242

4343
set(RUNTIME_SRCS_DLL_LINUX
44-
${CMAKE_CURRENT_SOURCE_DIR}/linux/drm_neo_create.cpp
45-
${CMAKE_CURRENT_SOURCE_DIR}/linux/options_linux.cpp
46-
${CMAKE_CURRENT_SOURCE_DIR}/linux/os_interface.cpp
44+
${NEO_SHARED_DIRECTORY}/dll/linux/drm_neo_create.cpp
45+
${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.cpp
46+
${NEO_SHARED_DIRECTORY}/dll/linux/os_interface.cpp
4747
${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}devices.inl
4848
${NEO_SHARED_DIRECTORY}/dll/devices${BRANCH_DIR_SUFFIX}devices_additional.inl
4949
${NEO_SHARED_DIRECTORY}/dll/devices/devices_base.inl
@@ -52,8 +52,8 @@ set(RUNTIME_SRCS_DLL_LINUX
5252
)
5353

5454
set(RUNTIME_SRCS_DLL_WINDOWS
55-
${CMAKE_CURRENT_SOURCE_DIR}/windows/options_windows.cpp
56-
${CMAKE_CURRENT_SOURCE_DIR}/windows/os_interface.cpp
55+
${NEO_SHARED_DIRECTORY}/dll/windows/options_windows.cpp
56+
${NEO_SHARED_DIRECTORY}/dll/windows/os_interface.cpp
5757
${NEO_SHARED_DIRECTORY}/dll/windows/environment_variables.cpp
5858
${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
5959
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_memory_virtual_alloc.cpp

‎opencl/test/unit_test/linux/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ add_executable(igdrcl_${target_name}
2121
${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.h
2222
${CMAKE_CURRENT_SOURCE_DIR}/os_interface_linux_tests.cpp
2323
${NEO_SHARED_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
24-
${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
25-
${NEO_SOURCE_DIR}/opencl/source/dll/create_memory_manager_drm.cpp
26-
${NEO_SOURCE_DIR}/opencl/source/dll/linux/drm_neo_create.cpp
27-
${NEO_SOURCE_DIR}/opencl/source/dll/linux/options_linux.cpp
28-
${NEO_SOURCE_DIR}/opencl/source/dll/linux/os_interface.cpp
24+
${NEO_SHARED_DIRECTORY}/dll/create_memory_manager_drm.cpp
25+
${NEO_SHARED_DIRECTORY}/dll/linux/drm_neo_create.cpp
26+
${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.cpp
27+
${NEO_SHARED_DIRECTORY}/dll/linux/os_interface.cpp
2928
${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
3029
${NEO_SOURCE_DIR}/opencl/source/os_interface/linux/platform_teardown_linux.cpp
3130
${NEO_SOURCE_DIR}/opencl/test/unit_test/linux${BRANCH_DIR_SUFFIX}drm_other_requests.cpp
31+
${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
3232
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h
3333
)
3434
if(NEO__LIBVA_FOUND)

‎opencl/test/unit_test/windows/CMakeLists.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,15 @@ if(WIN32)
1515
)
1616

1717
add_executable(igdrcl_windows_dll_tests
18-
${NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS}
19-
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
20-
${NEO_SOURCE_DIR}/opencl/source/dll/get_devices.cpp
21-
${NEO_SOURCE_DIR}/opencl/source/dll/windows/os_interface.cpp
22-
${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
23-
${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
24-
${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp
25-
${NEO_SOURCE_DIR}/shared/source/dll/create_command_stream.cpp
2618
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}get_devices_tests.cpp
2719
${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp
2820
${CMAKE_CURRENT_SOURCE_DIR}/wddm_create_tests.cpp
21+
${NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS}
22+
${NEO_SHARED_DIRECTORY}/aub/aub_stream_interface.cpp
23+
${NEO_SHARED_DIRECTORY}/dll/get_devices.cpp
24+
${NEO_SHARED_DIRECTORY}/dll/windows/os_interface.cpp
25+
${NEO_SHARED_DIRECTORY}/dll/create_command_stream.cpp
26+
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
2927
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_wddm.cpp
3028
${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/create_wddm_memory_manager.cpp
3129
${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/mock_environment_variables.cpp
@@ -36,6 +34,8 @@ if(WIN32)
3634
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h
3735
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
3836
${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_checks_shared.cpp
37+
${NEO_SOURCE_DIR}/opencl/source/helpers/api_specific_config_ocl.cpp
38+
${NEO_SOURCE_DIR}/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
3939
)
4040

4141
target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})

‎shared/offline_compiler/source/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,16 @@ endif()
8686

8787
if(WIN32)
8888
list(APPEND CLOC_LIB_SRCS_LIB
89+
${NEO_SHARED_DIRECTORY}/dll/windows/options_windows.cpp
8990
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_library_win.cpp
9091
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_library_win.h
91-
${NEO_SOURCE_DIR}/opencl/source/dll/windows/options_windows.cpp
9292
)
9393
else()
9494
list(APPEND CLOC_LIB_SRCS_LIB
95+
${NEO_SHARED_DIRECTORY}/dll/linux/options_linux.cpp
9596
${NEO_SHARED_DIRECTORY}/os_interface/linux/os_library_linux.cpp
9697
${NEO_SHARED_DIRECTORY}/os_interface/linux/os_library_linux.h
9798
${NEO_SHARED_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
98-
${NEO_SOURCE_DIR}/opencl/source/dll/linux/options_linux.cpp
9999
${OCLOC_DIRECTORY}/source/linux/os_library_ocloc_helper.cpp
100100
)
101101
endif()

‎opencl/source/dll/create_deferred_deleter.cpp‎ renamed to ‎shared/source/dll/create_deferred_deleter.cpp‎

File renamed without changes.

‎opencl/source/dll/create_memory_manager_drm.cpp‎ renamed to ‎shared/source/dll/create_memory_manager_drm.cpp‎

File renamed without changes.

‎opencl/source/dll/create_memory_manager_drm_or_wddm.cpp‎ renamed to ‎shared/source/dll/create_memory_manager_drm_or_wddm.cpp‎

File renamed without changes.

‎opencl/source/dll/create_memory_manager_wddm.cpp‎ renamed to ‎shared/source/dll/create_memory_manager_wddm.cpp‎

File renamed without changes.

‎opencl/source/dll/create_tbx_sockets.cpp‎ renamed to ‎shared/source/dll/create_tbx_sockets.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2018-2020 Intel Corporation
2+
* Copyright (C) 2018-2021 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*

0 commit comments

Comments
 (0)