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

Rename neo_core to neo_shared

Browse Source 
Change-Id: Ibf263a1c5a2445156859a647248918d3db48498b
Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>
This commit is contained in:
Mateusz Hoppe
2020-03-11 14:03:26 +01:00
committed by sys_ocldev
parent 30d3459aa9
commit c5454d6cce
19 changed files with 149 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
CMakeLists.txt
View File

@ -111,14 +111,14 @@ if(NOT DEFINED OCLOC_DIRECTORY)
set(OCLOC_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/shared/offline_compiler)
endif()
# Set the core source directory
if(NOT DEFINED NEO_CORE_DIRECTORY)
set(NEO_CORE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/shared/source)
# Set the shared source directory
if(NOT DEFINED NEO_SHARED_DIRECTORY)
set(NEO_SHARED_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/shared/source)
endif()
# Set the core source directory
if(NOT DEFINED NEO_CORE_TEST_DIRECTORY)
set(NEO_CORE_TEST_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/shared/test)
# Set the shared test directory
if(NOT DEFINED NEO_SHARED_TEST_DIRECTORY)
set(NEO_SHARED_TEST_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/shared/test)
endif()
if(SKIP_UNIT_TESTS)
@ -789,16 +789,16 @@ endif()
# Please keep alphabetical order
include_directories(${NEO_BUILD_DIR})
include_directories(${NEO_SOURCE_DIR})
include_directories(${NEO_CORE_DIRECTORY}/built_ins/builtinops${BRANCH_DIR_SUFFIX})
include_directories(${NEO_CORE_DIRECTORY}/command_stream/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_CORE_DIRECTORY}/compiler_interface/compiler_options${BRANCH_DIR_SUFFIX})
include_directories(${NEO_CORE_DIRECTORY}/debug_settings/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_CORE_DIRECTORY}/gen_common/reg_configs${BRANCH_DIR_SUFFIX})
include_directories(${NEO_CORE_DIRECTORY}/gmm_helper/client_context${BRANCH_DIR_SUFFIX})
include_directories(${NEO_CORE_DIRECTORY}/gmm_helper/windows/gmm_memory${BRANCH_DIR_SUFFIX})
include_directories(${NEO_CORE_DIRECTORY}/memory_manager/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_CORE_DIRECTORY}/memory_properties${BRANCH_DIR_SUFFIX})
include_directories(${NEO_CORE_DIRECTORY}/sku_info/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SHARED_DIRECTORY}/built_ins/builtinops${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SHARED_DIRECTORY}/command_stream/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SHARED_DIRECTORY}/compiler_interface/compiler_options${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SHARED_DIRECTORY}/debug_settings/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SHARED_DIRECTORY}/gen_common/reg_configs${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SHARED_DIRECTORY}/gmm_helper/client_context${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SHARED_DIRECTORY}/memory_manager/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SHARED_DIRECTORY}/memory_properties${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SHARED_DIRECTORY}/sku_info/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/opencl/source/command_queue/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/opencl/source/command_stream/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/opencl/source/mem_obj/definitions${BRANCH_DIR_SUFFIX})
@ -826,12 +826,12 @@ add_subdirectory_unique(${OCLOC_DIRECTORY} ${NEO_BUILD_DIR}/offline_compiler)
target_compile_definitions(ocloc_lib PRIVATE MOCKABLE_VIRTUAL=)
if(DONT_CARE_OF_VIRTUALS)
set(NEO_CORE_RELEASE_LIB_NAME "neo_core")
set(NEO_CORE_MOCKABLE_LIB_NAME ${NEO_CORE_RELEASE_LIB_NAME})
set(NEO_SHARED_RELEASE_LIB_NAME "neo_shared")
set(NEO_SHARED_MOCKABLE_LIB_NAME ${NEO_SHARED_RELEASE_LIB_NAME})
else()
set(NEO_CORE_RELEASE_LIB_NAME "neo_core")
set(NEO_SHARED_RELEASE_LIB_NAME "neo_shared")
if(NOT SKIP_UNIT_TESTS)
set(NEO_CORE_MOCKABLE_LIB_NAME "neo_core_mockable")
set(NEO_SHARED_MOCKABLE_LIB_NAME "neo_shared_mockable")
endif()
endif()
@ -850,9 +850,9 @@ macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC)
set(GENERATE_EXECUTABLE ${GENERATE_EXEC})
if(${MOCKABLE})
set(NEO_CORE_LIB ${NEO_CORE_MOCKABLE_LIB_NAME})
set(NEO_SHARED_LIB ${NEO_SHARED_MOCKABLE_LIB_NAME})
else()
set(NEO_CORE_LIB ${NEO_CORE_RELEASE_LIB_NAME})
set(NEO_SHARED_LIB ${NEO_SHARED_RELEASE_LIB_NAME})
endif()
if(NOT BUILD_WITHOUT_RUNTIME)
add_subdirectory(${NEO_RUNTIME_SUB_DIR} "${NEO_BUILD_DIR}/${LIB_NAME}")
@ -893,6 +893,9 @@ else()
endif()
endif()
set(NEO_STATICALLY_LINKED_LIBRARIES ${NEO_RELEASE_LIB_NAME} ${NEO_SHARED_RELEASE_LIB_NAME} ${NEO_RELEASE_LIB_NAME} ${NEO_SHARED_RELEASE_LIB_NAME})
set(NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME})
if(DEFAULT_TESTED_PLATFORM AND NOT SKIP_NEO_UNIT_TESTS)
add_subdirectory_unique(${NEO_RUNTIME_TESTS_SUB_DIR} ${NEO_BUILD_DIR}/${NEO_RUNTIME_TESTS_SUB_DIR})
else()

41
level_zero/CMakeLists.txt
View File

@ -193,14 +193,14 @@ if(BUILD_WITH_L0 AND "${NEO_BITS}" STREQUAL "64")
add_library(${TARGET_NAME_L0}
SHARED
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${NEO_CORE_DIRECTORY}/dll/options_dll.cpp
${NEO_CORE_DIRECTORY}/gmm_helper/resource_info.cpp
${NEO_CORE_DIRECTORY}/utilities/cpuintrinsics.cpp
${NEO_CORE_DIRECTORY}/utilities/debug_settings_reader_creator.cpp
${NEO_CORE_DIRECTORY}/gmm_helper/page_table_mngr.cpp
${NEO_CORE_DIRECTORY}/gmm_helper/resource_info.cpp
${NEO_CORE_DIRECTORY}/helpers/abort.cpp
${NEO_CORE_DIRECTORY}/helpers/debug_helpers.cpp
${NEO_SHARED_DIRECTORY}/dll/options_dll.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info.cpp
${NEO_SHARED_DIRECTORY}/utilities/cpuintrinsics.cpp
${NEO_SHARED_DIRECTORY}/utilities/debug_settings_reader_creator.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/page_table_mngr.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info.cpp
${NEO_SHARED_DIRECTORY}/helpers/abort.cpp
${NEO_SHARED_DIRECTORY}/helpers/debug_helpers.cpp
)
target_sources(${TARGET_NAME_L0}
@ -218,13 +218,13 @@ if(BUILD_WITH_L0 AND "${NEO_BITS}" STREQUAL "64")
if(WIN32)
target_sources(${TARGET_NAME_L0}
PRIVATE
${NEO_CORE_DIRECTORY}/gmm_helper/windows/gmm_memory_base.cpp
${NEO_CORE_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
${NEO_CORE_DIRECTORY}/os_interface/windows/sys_calls.cpp
${NEO_CORE_DIRECTORY}/os_interface/windows/os_interface.cpp
${NEO_CORE_DIRECTORY}/os_interface/windows/wddm/wddm_calls.cpp
${NEO_CORE_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
${NEO_CORE_DIRECTORY}/dll/windows/environment_variables.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
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_interface.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
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/windows/create_wddm_memory_manager.cpp
@ -236,7 +236,7 @@ if(BUILD_WITH_L0 AND "${NEO_BITS}" STREQUAL "64")
else()
target_sources(${TARGET_NAME_L0}
PRIVATE
${NEO_CORE_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
${NEO_SHARED_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/allocator_helper.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/create_drm_memory_manager.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/devices${BRANCH_DIR_SUFFIX}/devices.inl
@ -280,7 +280,7 @@ target_sources(${TARGET_NAME_L0} PRIVATE ${L0_SRCS_DLL})
if(UNIX)
target_sources(${TARGET_NAME_L0}
PRIVATE
${NEO_CORE_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
${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)
@ -311,15 +311,12 @@ else()
)
add_dependencies(${TARGET_NAME_L0} ${GMM_TARGET_NAME})
target_sources(${TARGET_NAME_L0} PRIVATE
${NEO_CORE_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
)
endif()
target_link_libraries(${TARGET_NAME_L0}
${NEO_RELEASE_LIB_NAME}
${NEO_CORE_RELEASE_LIB_NAME}
${NEO_RELEASE_LIB_NAME}
${NEO_CORE_RELEASE_LIB_NAME}
${NEO_STATICALLY_LINKED_LIBRARIES}
${OS_SPECIFIC_LIBS}
)
if(UNIX)

10
opencl/source/CMakeLists.txt
View File

@ -77,14 +77,14 @@ if(WIN32)
set(IGDRCL_EXTRA_LIBS Ws2_32)
target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
${WDK_INCLUDE_PATHS}
${NEO_CORE_DIRECTORY}/os_interface/windows
${NEO_SHARED_DIRECTORY}/os_interface/windows
${NEO_SOURCE_DIR}/opencl/source/os_interface/windows
)
target_compile_definitions(${NEO_STATIC_LIB_NAME} PRIVATE OGL=1)
else()
set(IGDRCL_EXTRA_LIBS dl pthread)
target_include_directories(${NEO_STATIC_LIB_NAME} PUBLIC
${NEO_CORE_DIRECTORY}/os_interface/linux
${NEO_SHARED_DIRECTORY}/os_interface/linux
${NEO_SOURCE_DIR}/opencl/source/os_interface/linux
${I915_INCLUDES_DIR}
)
@ -146,7 +146,7 @@ if(${GENERATE_EXECUTABLE})
add_subdirectory(dll)
target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${NEO_STATIC_LIB_NAME} ${NEO_CORE_LIB} ${NEO_STATIC_LIB_NAME} ${NEO_CORE_LIB} ${IGDRCL_EXTRA_LIBS})
target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${NEO_STATIC_LIB_NAME} ${NEO_SHARED_LIB} ${NEO_STATIC_LIB_NAME} ${NEO_SHARED_LIB} ${IGDRCL_EXTRA_LIBS})
target_include_directories(${NEO_DYNAMIC_LIB_NAME} BEFORE PRIVATE
${CMAKE_CURRENT_BINARY_DIR}
@ -157,7 +157,7 @@ if(${GENERATE_EXECUTABLE})
target_link_libraries(${NEO_DYNAMIC_LIB_NAME} dxgi)
add_dependencies(${NEO_DYNAMIC_LIB_NAME} ${GMM_TARGET_NAME})
target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE
${NEO_CORE_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
)
else()
target_link_libraries(${NEO_DYNAMIC_LIB_NAME} ${GMM_LINK_NAME})
@ -172,7 +172,7 @@ if(${GENERATE_EXECUTABLE})
)
set_property(TARGET ${NEO_DYNAMIC_LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE
${NEO_CORE_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
)
endif()

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

@ -19,14 +19,14 @@ set(RUNTIME_SRCS_DLL_BASE
${CMAKE_CURRENT_SOURCE_DIR}/debugger.cpp
${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger.cpp
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices.cpp
${NEO_CORE_DIRECTORY}/dll/options_dll.cpp
${NEO_CORE_DIRECTORY}/gmm_helper/resource_info.cpp
${NEO_CORE_DIRECTORY}/gmm_helper/page_table_mngr.cpp
${NEO_CORE_DIRECTORY}/helpers/abort.cpp
${NEO_CORE_DIRECTORY}/helpers/debug_helpers.cpp
${NEO_CORE_DIRECTORY}/helpers/allow_deferred_deleter.cpp
${NEO_CORE_DIRECTORY}/utilities/cpuintrinsics.cpp
${NEO_CORE_DIRECTORY}/utilities/debug_settings_reader_creator.cpp
${NEO_SHARED_DIRECTORY}/dll/options_dll.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/page_table_mngr.cpp
${NEO_SHARED_DIRECTORY}/helpers/abort.cpp
${NEO_SHARED_DIRECTORY}/helpers/debug_helpers.cpp
${NEO_SHARED_DIRECTORY}/helpers/allow_deferred_deleter.cpp
${NEO_SHARED_DIRECTORY}/utilities/cpuintrinsics.cpp
${NEO_SHARED_DIRECTORY}/utilities/debug_settings_reader_creator.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/helpers/built_ins_helper.cpp
@ -46,18 +46,18 @@ 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_CORE_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
${NEO_SHARED_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
)
set(RUNTIME_SRCS_DLL_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/windows/create_wddm_memory_manager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/windows/options_windows.cpp
${CMAKE_CURRENT_SOURCE_DIR}/windows/os_interface.cpp
${NEO_CORE_DIRECTORY}/dll/windows/environment_variables.cpp
${NEO_CORE_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
${NEO_CORE_DIRECTORY}/os_interface/windows/sys_calls.cpp
${NEO_CORE_DIRECTORY}/os_interface/windows/wddm/wddm_calls.cpp
${NEO_CORE_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
${NEO_SHARED_DIRECTORY}/dll/windows/environment_variables.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/sys_calls.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_calls.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
)
target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DLL_BASE})

2
opencl/source/enable_gens.cmake
View File

@ -88,7 +88,7 @@ macro(macro_for_each_gen)
apply_macro_for_each_platform()
list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${NEO_CORE_DIRECTORY}/${GEN_TYPE_LOWER}/image_core_${GEN_TYPE_LOWER}.cpp)
list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${NEO_SHARED_DIRECTORY}/${GEN_TYPE_LOWER}/image_core_${GEN_TYPE_LOWER}.cpp)
list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_WINDOWS ${GENX_PREFIX}/windows/hw_info_config_${GEN_TYPE_LOWER}.cpp)
list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX ${GENX_PREFIX}/linux/hw_info_config_${GEN_TYPE_LOWER}.cpp)

4
opencl/test/unit_test/CMakeLists.txt
View File

@ -142,7 +142,7 @@ if(NOT MSVC)
set_source_files_properties(helpers/uint16_sse4_tests.cpp PROPERTIES COMPILE_FLAGS -msse4.2)
endif()
target_link_libraries(igdrcl_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_MOCKABLE_LIB_NAME} ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_MOCKABLE_LIB_NAME})
target_link_libraries(igdrcl_tests ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
target_link_libraries(igdrcl_tests igdrcl_mocks)
option(SHOW_VERBOSE_UTESTS_RESULTS "Use the default/verbose test output" OFF)
@ -200,7 +200,7 @@ set_target_properties(unit_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER
set_target_properties(prepare_test_kernels PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
set_target_properties(run_unit_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
target_include_directories(igdrcl_tests BEFORE PRIVATE ${NEO_CORE_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX})
target_include_directories(igdrcl_tests BEFORE PRIVATE ${NEO_SHARED_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX})
if(WIN32)
set(cloc_cmd_prefix ocloc)

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

@ -47,20 +47,20 @@ endif()
target_include_directories(igdrcl_aub_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_sources(igdrcl_aub_tests PRIVATE
${NEO_CORE_TEST_DIRECTORY}/unit_test/page_fault_manager/default_asan_options.cpp
${NEO_CORE_DIRECTORY}/gmm_helper/resource_info.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/page_fault_manager/default_asan_options.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
)
if(WIN32)
target_sources(igdrcl_aub_tests PRIVATE
${NEO_CORE_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
${NEO_CORE_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp
)
else()
target_sources(igdrcl_aub_tests PRIVATE
${NEO_CORE_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp
)
endif()
@ -69,7 +69,7 @@ copy_gmm_dll_for(igdrcl_aub_tests)
add_subdirectories()
target_link_libraries(igdrcl_aub_tests igdrcl_mocks)
target_link_libraries(igdrcl_aub_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_MOCKABLE_LIB_NAME} ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_MOCKABLE_LIB_NAME})
target_link_libraries(igdrcl_aub_tests ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
target_link_libraries(igdrcl_aub_tests igdrcl_mocks)
target_link_libraries(igdrcl_aub_tests gmock-gtest ${IGDRCL_EXTRA_LIBS})
if(UNIX)
@ -77,9 +77,9 @@ if(UNIX)
else()
add_dependencies(igdrcl_aub_tests ${GMM_TARGET_NAME})
target_sources(igdrcl_aub_tests PRIVATE
${NEO_CORE_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
)
endif()
target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${NEO_CORE_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX})
target_include_directories(igdrcl_aub_tests BEFORE PRIVATE ${NEO_SHARED_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX})
create_project_source_tree(igdrcl_aub_tests)

2
opencl/test/unit_test/gen_common/CMakeLists.txt
View File

@ -18,7 +18,7 @@ set(IGDRCL_SRCS_tests_gen_common
${CMAKE_CURRENT_SOURCE_DIR}/gen_commands_common_validation.h
${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/matchers.h
${NEO_CORE_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX}/test.h
${NEO_SHARED_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX}/test.h
)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gen_common})

4
opencl/test/unit_test/helpers/CMakeLists.txt
View File

@ -54,8 +54,8 @@ set(IGDRCL_SRCS_tests_helpers
${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper.inl
${CMAKE_CURRENT_SOURCE_DIR}/validator_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/variable_backup.h
${NEO_CORE_TEST_DIRECTORY}/unit_test/helpers/aligned_memory_tests.cpp
${NEO_CORE_TEST_DIRECTORY}/unit_test/helpers/debug_manager_state_restore.h
${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/aligned_memory_tests.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/debug_manager_state_restore.h
)
get_property(NEO_CORE_PREAMBLE_TESTS GLOBAL PROPERTY NEO_CORE_PREAMBLE_TESTS)

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

@ -6,25 +6,25 @@
macro(macro_for_each_gen)
list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW
${NEO_CORE_TEST_DIRECTORY}/unit_test/${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp
${NEO_CORE_TEST_DIRECTORY}/unit_test/libult/${GEN_TYPE_LOWER}.cpp
${NEO_CORE_DIRECTORY}/${GEN_TYPE_LOWER}/enable_hw_info_config_${GEN_TYPE_LOWER}.cpp
${NEO_CORE_DIRECTORY}/${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp
${NEO_CORE_DIRECTORY}/${GEN_TYPE_LOWER}/enable_family_full_core_${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_DIRECTORY}/${GEN_TYPE_LOWER}/enable_hw_info_config_${GEN_TYPE_LOWER}.cpp
${NEO_SHARED_DIRECTORY}/${GEN_TYPE_LOWER}/enable_${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
)
if(EXISTS "${NEO_CORE_TEST_DIRECTORY}/unit_test/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")
list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW "${NEO_CORE_TEST_DIRECTORY}/unit_test/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")
include_directories(${NEO_CORE_TEST_DIRECTORY}/unit_test/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/)
if(EXISTS "${NEO_SHARED_TEST_DIRECTORY}/unit_test/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")
list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW "${NEO_SHARED_TEST_DIRECTORY}/unit_test/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/cmd_parse_${GEN_TYPE_LOWER}.inl")
include_directories(${NEO_SHARED_TEST_DIRECTORY}/unit_test/${GEN_TYPE_LOWER}/cmd_parse${BRANCH_DIR_SUFFIX}/)
endif()
endmacro()
apply_macro_for_each_gen("TESTED")
set(IGDRCL_SRCS_LIB_ULT
${NEO_CORE_DIRECTORY}/helpers/allow_deferred_deleter.cpp
${NEO_CORE_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp
${NEO_SHARED_DIRECTORY}/helpers/allow_deferred_deleter.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp
${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp
${NEO_SOURCE_DIR}/opencl/source/dll/debugger.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp
@ -42,10 +42,10 @@ set(IGDRCL_SRCS_LIB_ULT
${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h
${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/ult_command_stream_receiver.h
${NEO_SOURCE_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp
${NEO_CORE_TEST_DIRECTORY}/unit_test/helpers/memory_leak_listener.cpp
${NEO_CORE_TEST_DIRECTORY}/unit_test/helpers/memory_leak_listener.h
${NEO_CORE_TEST_DIRECTORY}/unit_test/helpers/memory_management.cpp
${NEO_CORE_TEST_DIRECTORY}/unit_test/helpers/memory_management.h
${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/memory_leak_listener.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/memory_leak_listener.h
${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/memory_management.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/memory_management.h
)
set(IGDRCL_SRCS_LIB_ULT_WINDOWS

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

@ -19,7 +19,7 @@ add_executable(igdrcl_${target_name}
${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock_os_layer.h
${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
${NEO_CORE_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
${NEO_SHARED_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
${NEO_SOURCE_DIR}/opencl/source/dll/linux/allocator_helper.cpp
${NEO_SOURCE_DIR}/opencl/source/dll/linux/drm_neo_create.cpp
${NEO_SOURCE_DIR}/opencl/source/dll/linux/options_linux.cpp
@ -32,11 +32,11 @@ if(NEO__LIBVA_FOUND)
target_sources(igdrcl_${target_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/va_tests.cpp)
endif()
target_link_libraries(igdrcl_${target_name} ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_MOCKABLE_LIB_NAME} ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_MOCKABLE_LIB_NAME} igdrcl_mocks ${IGDRCL_EXTRA_LIBS} gmock-gtest)
target_link_libraries(igdrcl_${target_name} ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE} igdrcl_mocks ${IGDRCL_EXTRA_LIBS} gmock-gtest)
set_property(TARGET igdrcl_${target_name} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
target_include_directories(igdrcl_${target_name} PRIVATE
${NEO_CORE_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX}
${NEO_SHARED_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX}
${NEO_SOURCE_DIR}/opencl/source/dll/linux/devices${BRANCH_DIR_SUFFIX}
${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX}
${CMAKE_CURRENT_SOURCE_DIR}

4
opencl/test/unit_test/mocks/CMakeLists.txt
View File

@ -91,7 +91,7 @@ set(IGDRCL_SRCS_tests_mocks
${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_csr.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_stream.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_timestamp_container.h
${NEO_CORE_DIRECTORY}/gmm_helper/page_table_mngr_impl.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/page_table_mngr_impl.cpp
${IGDRCL_SRCS_tests_compiler_mocks}
)
@ -117,7 +117,7 @@ else()
${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_memory_manager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_memory_manager.h
${CMAKE_CURRENT_SOURCE_DIR}/linux/mock_drm_command_stream_receiver.h
${NEO_CORE_DIRECTORY}/os_interface/linux/page_table_manager_functions.cpp
${NEO_SHARED_DIRECTORY}/os_interface/linux/page_table_manager_functions.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_mock.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_mock.h
)

4
opencl/test/unit_test/mt_tests/CMakeLists.txt
View File

@ -30,14 +30,14 @@ add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL
target_include_directories(igdrcl_mt_tests PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
${NEO_CORE_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX}
${NEO_SHARED_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX}
${NEO_SOURCE_DIR}/opencl/source/gen_common
)
add_subdirectories()
target_link_libraries(igdrcl_mt_tests ${TSAN_LIB})
target_link_libraries(igdrcl_mt_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_MOCKABLE_LIB_NAME} ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_MOCKABLE_LIB_NAME})
target_link_libraries(igdrcl_mt_tests ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE})
target_link_libraries(igdrcl_mt_tests gmock-gtest)
target_link_libraries(igdrcl_mt_tests igdrcl_mocks ${IGDRCL_EXTRA_LIBS})

12
opencl/test/unit_test/offline_compiler/CMakeLists.txt
View File

@ -55,10 +55,10 @@ set(IGDRCL_SRCS_offline_compiler_tests
${CMAKE_CURRENT_SOURCE_DIR}/ocloc_fatbinary_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/offline_compiler_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/offline_compiler_tests.h
${NEO_CORE_DIRECTORY}/helpers/abort.cpp
${NEO_CORE_DIRECTORY}/helpers/file_io.cpp
${NEO_CORE_DIRECTORY}/memory_manager/deferred_deleter.cpp
${NEO_CORE_DIRECTORY}/memory_manager/deferred_deleter.h
${NEO_SHARED_DIRECTORY}/helpers/abort.cpp
${NEO_SHARED_DIRECTORY}/helpers/file_io.cpp
${NEO_SHARED_DIRECTORY}/memory_manager/deferred_deleter.cpp
${NEO_SHARED_DIRECTORY}/memory_manager/deferred_deleter.h
${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/test_files.cpp
${IGDRCL_SRCS_cloc}
${IGDRCL_SRCS_offline_compiler_mock}
@ -69,11 +69,11 @@ set(IGDRCL_SRCS_offline_compiler_tests
if(WIN32)
list(APPEND IGDRCL_SRCS_offline_compiler_tests
${NEO_CORE_DIRECTORY}/os_interface/windows/os_thread_win.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_thread_win.cpp
)
else()
list(APPEND IGDRCL_SRCS_offline_compiler_tests
${NEO_CORE_DIRECTORY}/os_interface/linux/os_thread_linux.cpp
${NEO_SHARED_DIRECTORY}/os_interface/linux/os_thread_linux.cpp
)
endif()

12
opencl/test/unit_test/offline_compiler/segfault_test/CMakeLists.txt
View File

@ -8,16 +8,16 @@ set(CLOC_SEGFAULT_TEST_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/segfault_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
${NEO_CORE_DIRECTORY}/helpers/abort.cpp
${NEO_CORE_DIRECTORY}/os_interface/os_library.h
${NEO_SHARED_DIRECTORY}/helpers/abort.cpp
${NEO_SHARED_DIRECTORY}/os_interface/os_library.h
${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/debug_helpers.cpp
)
if(WIN32)
list(APPEND CLOC_SEGFAULT_TEST_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/windows/safety_guard_caller_windows.cpp
${NEO_CORE_DIRECTORY}/os_interface/windows/os_library_win.cpp
${NEO_CORE_DIRECTORY}/os_interface/windows/os_library_win.h
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_library_win.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_library_win.h
${OCLOC_DIRECTORY}/source/utilities/windows/safety_guard_windows.h
${OCLOC_DIRECTORY}/source/utilities/windows/seh_exception.cpp
${OCLOC_DIRECTORY}/source/utilities/windows/seh_exception.h
@ -25,8 +25,8 @@ if(WIN32)
else()
list(APPEND CLOC_SEGFAULT_TEST_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/linux/safety_guard_caller_linux.cpp
${NEO_CORE_DIRECTORY}/os_interface/linux/os_library_linux.cpp
${NEO_CORE_DIRECTORY}/os_interface/linux/os_library_linux.h
${NEO_SHARED_DIRECTORY}/os_interface/linux/os_library_linux.cpp
${NEO_SHARED_DIRECTORY}/os_interface/linux/os_library_linux.h
)
endif()

6
opencl/test/unit_test/page_fault_manager_tests/CMakeLists.txt
View File

@ -25,7 +25,7 @@ target_sources(neo_page_fault_manager_tests PRIVATE ${CPU_PAGE_FAULT_MANAGER_TES
if(WIN32)
target_sources(neo_page_fault_manager_tests PRIVATE
${CPU_PAGE_FAULT_MANAGER_WINDOWS_TESTS}
${NEO_CORE_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
)
else()
target_sources(neo_page_fault_manager_tests PRIVATE
@ -34,10 +34,10 @@ else()
)
endif()
target_link_libraries(neo_page_fault_manager_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_MOCKABLE_LIB_NAME} ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})
target_link_libraries(neo_page_fault_manager_tests ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})
target_include_directories(neo_page_fault_manager_tests PRIVATE
${NEO_CORE_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX}
${NEO_SHARED_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX}
${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX}
)

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

@ -19,7 +19,7 @@ add_executable(igdrcl_windows_dll_tests
${NEO_SOURCE_DIR}/opencl/source/dll/create_command_stream.cpp
${NEO_SOURCE_DIR}/opencl/source/dll${BRANCH_DIR_SUFFIX}/get_devices.cpp
${NEO_SOURCE_DIR}/opencl/source/dll/windows/os_interface.cpp
${NEO_CORE_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_configuration.cpp
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp
@ -27,10 +27,10 @@ add_executable(igdrcl_windows_dll_tests
${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
)
target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_CORE_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})
target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})
target_include_directories(igdrcl_windows_dll_tests PRIVATE
${NEO_CORE_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX}
${NEO_SHARED_TEST_DIRECTORY}/unit_test/test_macros${BRANCH_DIR_SUFFIX}
${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX}
${CMAKE_CURRENT_SOURCE_DIR}
)

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

@ -7,21 +7,21 @@
project(ocloc_lib)
set(CLOC_LIB_SRCS_LIB
${NEO_CORE_DIRECTORY}/device_binary_format/ar/ar.h
${NEO_CORE_DIRECTORY}/device_binary_format/ar/ar_decoder.h
${NEO_CORE_DIRECTORY}/device_binary_format/ar/ar_decoder.cpp
${NEO_CORE_DIRECTORY}/device_binary_format/ar/ar_encoder.h
${NEO_CORE_DIRECTORY}/device_binary_format/ar/ar_encoder.cpp
${NEO_CORE_DIRECTORY}/device_binary_format/elf/elf.h
${NEO_CORE_DIRECTORY}/device_binary_format/elf/elf_decoder.h
${NEO_CORE_DIRECTORY}/device_binary_format/elf/elf_decoder.cpp
${NEO_CORE_DIRECTORY}/device_binary_format/elf/elf_encoder.h
${NEO_CORE_DIRECTORY}/device_binary_format/elf/elf_encoder.cpp
${NEO_CORE_DIRECTORY}/device_binary_format/elf/ocl_elf.h
${NEO_CORE_DIRECTORY}/helpers/abort.cpp
${NEO_CORE_DIRECTORY}/helpers/debug_helpers.cpp
${NEO_CORE_DIRECTORY}/helpers/file_io.cpp
${NEO_CORE_DIRECTORY}/os_interface/os_library.h
${NEO_SHARED_DIRECTORY}/device_binary_format/ar/ar.h
${NEO_SHARED_DIRECTORY}/device_binary_format/ar/ar_decoder.h
${NEO_SHARED_DIRECTORY}/device_binary_format/ar/ar_decoder.cpp
${NEO_SHARED_DIRECTORY}/device_binary_format/ar/ar_encoder.h
${NEO_SHARED_DIRECTORY}/device_binary_format/ar/ar_encoder.cpp
${NEO_SHARED_DIRECTORY}/device_binary_format/elf/elf.h
${NEO_SHARED_DIRECTORY}/device_binary_format/elf/elf_decoder.h
${NEO_SHARED_DIRECTORY}/device_binary_format/elf/elf_decoder.cpp
${NEO_SHARED_DIRECTORY}/device_binary_format/elf/elf_encoder.h
${NEO_SHARED_DIRECTORY}/device_binary_format/elf/elf_encoder.cpp
${NEO_SHARED_DIRECTORY}/device_binary_format/elf/ocl_elf.h
${NEO_SHARED_DIRECTORY}/helpers/abort.cpp
${NEO_SHARED_DIRECTORY}/helpers/debug_helpers.cpp
${NEO_SHARED_DIRECTORY}/helpers/file_io.cpp
${NEO_SHARED_DIRECTORY}/os_interface/os_library.h
${OCLOC_DIRECTORY}/source/decoder/binary_decoder.cpp
${OCLOC_DIRECTORY}/source/decoder/binary_decoder.h
${OCLOC_DIRECTORY}/source/decoder/binary_encoder.cpp
@ -43,9 +43,9 @@ set(CLOC_LIB_SRCS_LIB
${OCLOC_DIRECTORY}/source/multi_command.h
${OCLOC_DIRECTORY}/source/offline_compiler_options.cpp
${OCLOC_DIRECTORY}/source/${BRANCH_DIR_SUFFIX}/extra_settings.cpp
${NEO_CORE_DIRECTORY}/compiler_interface/compiler_options/compiler_options_base.cpp
${NEO_CORE_DIRECTORY}/compiler_interface/create_main.cpp
${NEO_CORE_DIRECTORY}/helpers/hw_info.cpp
${NEO_SHARED_DIRECTORY}/compiler_interface/compiler_options/compiler_options_base.cpp
${NEO_SHARED_DIRECTORY}/compiler_interface/create_main.cpp
${NEO_SHARED_DIRECTORY}/helpers/hw_info.cpp
${NEO_SOURCE_DIR}/opencl/source/platform/extensions.cpp
${NEO_SOURCE_DIR}/opencl/source/platform/extensions.h
)
@ -63,14 +63,14 @@ endif()
if(WIN32)
list(APPEND CLOC_LIB_SRCS_LIB
${NEO_CORE_DIRECTORY}/os_interface/windows/os_library_win.cpp
${NEO_CORE_DIRECTORY}/os_interface/windows/os_library_win.h
${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_CORE_DIRECTORY}/os_interface/linux/os_library_linux.cpp
${NEO_CORE_DIRECTORY}/os_interface/linux/os_library_linux.h
${NEO_SHARED_DIRECTORY}/os_interface/linux/os_library_linux.cpp
${NEO_SHARED_DIRECTORY}/os_interface/linux/os_library_linux.h
${NEO_SOURCE_DIR}/opencl/source/dll/linux/options_linux.cpp
)
endif()
@ -99,7 +99,7 @@ macro(macro_for_each_gen)
endforeach()
apply_macro_for_each_platform()
list(APPEND CLOC_LIB_SRCS_LIB ${NEO_CORE_DIRECTORY}/${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp)
list(APPEND CLOC_LIB_SRCS_LIB ${NEO_SHARED_DIRECTORY}/${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp)
endmacro()
apply_macro_for_each_gen("SUPPORTED")
@ -111,22 +111,22 @@ set(CLOC_LIB_SRCS
add_library(ocloc_lib SHARED ${CLOC_LIB_SRCS})
set(CLOC_SRCS
${NEO_CORE_DIRECTORY}/os_interface/os_library.h
${NEO_SHARED_DIRECTORY}/os_interface/os_library.h
${OCLOC_DIRECTORY}/source/ocloc_wrapper.h
${OCLOC_DIRECTORY}/source/ocloc_wrapper.cpp
${OCLOC_DIRECTORY}/source/utilities/get_path.h
)
if(WIN32)
list(APPEND CLOC_SRCS
${NEO_CORE_DIRECTORY}/os_interface/windows/os_library_win.cpp
${NEO_CORE_DIRECTORY}/os_interface/windows/os_library_win.h
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_library_win.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_library_win.h
${OCLOC_DIRECTORY}/source/utilities/windows/get_path.cpp
)
else()
list(APPEND CLOC_SRCS
${NEO_CORE_DIRECTORY}/os_interface/linux/os_library_linux.cpp
${NEO_CORE_DIRECTORY}/os_interface/linux/os_library_linux.h
${NEO_SHARED_DIRECTORY}/os_interface/linux/os_library_linux.cpp
${NEO_SHARED_DIRECTORY}/os_interface/linux/os_library_linux.h
${OCLOC_DIRECTORY}/source/utilities/linux/get_path.cpp
)
endif()

10
shared/source/CMakeLists.txt
View File

@ -4,13 +4,13 @@
# SPDX-License-Identifier: MIT
#
if(NOT DEFINED NEO_CORE_RELEASE_LIB_NAME)
if(NOT DEFINED NEO_SHARED_RELEASE_LIB_NAME)
MESSAGE(FATAL_ERROR "NEO Core library name undefined!")
endif()
include(enable_gens.cmake)
function(generate_core_lib LIB_NAME MOCKABLE)
function(generate_shared_lib LIB_NAME MOCKABLE)
add_library(${LIB_NAME} STATIC
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/enable_gens.cmake
@ -124,11 +124,11 @@ if(NOT MSVC)
endif()
if(DONT_CARE_OF_VIRTUALS)
generate_core_lib(${NEO_CORE_RELEASE_LIB_NAME} TRUE)
generate_shared_lib(${NEO_SHARED_RELEASE_LIB_NAME} TRUE)
else()
generate_core_lib(${NEO_CORE_RELEASE_LIB_NAME} FALSE)
generate_shared_lib(${NEO_SHARED_RELEASE_LIB_NAME} FALSE)
if(NOT SKIP_UNIT_TESTS)
generate_core_lib(${NEO_CORE_MOCKABLE_LIB_NAME} TRUE)
generate_shared_lib(${NEO_SHARED_MOCKABLE_LIB_NAME} TRUE)
endif()
endif()