diff --git a/level_zero/core/test/aub_tests/CMakeLists.txt b/level_zero/core/test/aub_tests/CMakeLists.txt index f0cd4ee3a0..c9995ed3e2 100644 --- a/level_zero/core/test/aub_tests/CMakeLists.txt +++ b/level_zero/core/test/aub_tests/CMakeLists.txt @@ -70,7 +70,7 @@ target_sources(${TARGET_NAME} PRIVATE $ $ $ - $ + $ $ $ $ diff --git a/level_zero/core/test/unit_tests/CMakeLists.txt b/level_zero/core/test/unit_tests/CMakeLists.txt index ef543aa39d..5a10d7705b 100644 --- a/level_zero/core/test/unit_tests/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/CMakeLists.txt @@ -38,7 +38,7 @@ target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE $ - $ + $ $ ) diff --git a/level_zero/experimental/test/unit_tests/CMakeLists.txt b/level_zero/experimental/test/unit_tests/CMakeLists.txt index 12c8c0b4b0..1de5451684 100644 --- a/level_zero/experimental/test/unit_tests/CMakeLists.txt +++ b/level_zero/experimental/test/unit_tests/CMakeLists.txt @@ -47,7 +47,7 @@ target_sources( ${TARGET_NAME} PRIVATE $ - $ + $ $ ) diff --git a/level_zero/tools/test/unit_tests/CMakeLists.txt b/level_zero/tools/test/unit_tests/CMakeLists.txt index f2deff6924..76ff7f7c76 100644 --- a/level_zero/tools/test/unit_tests/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/CMakeLists.txt @@ -38,7 +38,7 @@ target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE $ - $ + $ $ ) diff --git a/opencl/test/unit_test/CMakeLists.txt b/opencl/test/unit_test/CMakeLists.txt index aa1670371a..4c2dcc3669 100644 --- a/opencl/test/unit_test/CMakeLists.txt +++ b/opencl/test/unit_test/CMakeLists.txt @@ -57,7 +57,7 @@ if(UNIX) endif() set(NEO_IGDRCL_TESTS__TARGET_OBJECTS - $ + $ $ $ $ diff --git a/opencl/test/unit_test/aub_tests/CMakeLists.txt b/opencl/test/unit_test/aub_tests/CMakeLists.txt index 32ff148990..abb1d8f8fb 100644 --- a/opencl/test/unit_test/aub_tests/CMakeLists.txt +++ b/opencl/test/unit_test/aub_tests/CMakeLists.txt @@ -18,7 +18,7 @@ list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS ${NEO_SHARED_aub_tests_configurations} $ $ - $ + $ $ $ ) diff --git a/opencl/test/unit_test/linux/CMakeLists.txt b/opencl/test/unit_test/linux/CMakeLists.txt index 576a9ecefc..3e2117406a 100644 --- a/opencl/test/unit_test/linux/CMakeLists.txt +++ b/opencl/test/unit_test/linux/CMakeLists.txt @@ -10,7 +10,7 @@ set(IGDRCL_SRCS_linux_dll_tests set(target_name linux_dll_tests) add_executable(igdrcl_${target_name} $ - $ + $ $ $ ${CMAKE_CURRENT_SOURCE_DIR}/drm_null_device_tests.cpp diff --git a/opencl/test/unit_test/mt_tests/CMakeLists.txt b/opencl/test/unit_test/mt_tests/CMakeLists.txt index 23d7dc54db..785f45a393 100644 --- a/opencl/test/unit_test/mt_tests/CMakeLists.txt +++ b/opencl/test/unit_test/mt_tests/CMakeLists.txt @@ -19,7 +19,7 @@ add_executable(igdrcl_mt_tests EXCLUDE_FROM_ALL ${NEO_SOURCE_DIR}/shared/source/aub/aub_stream_interface.cpp ${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp $ - $ + $ $ $ $ diff --git a/opencl/test/unit_test/windows/CMakeLists.txt b/opencl/test/unit_test/windows/CMakeLists.txt index 93d7df08c7..b17f2bf152 100644 --- a/opencl/test/unit_test/windows/CMakeLists.txt +++ b/opencl/test/unit_test/windows/CMakeLists.txt @@ -8,7 +8,7 @@ if(WIN32) project(igdrcl_windows_dll_tests) set(NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS - $ + $ $ $ $ diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt index 6d629782a0..2c1869fd1e 100644 --- a/shared/test/common/libult/CMakeLists.txt +++ b/shared/test/common/libult/CMakeLists.txt @@ -11,15 +11,15 @@ macro(macro_for_each_platform) foreach(BRANCH ${BRANCH_DIR_LIST}) set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}enable_hw_info_config_${PLATFORM_IT_LOWER}.cpp) if(EXISTS ${SRC_FILE}) - list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) + list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) endif() set(SRC_FILE ${NEO_SHARED_DIRECTORY}/os_interface/linux/local${BRANCH_DIR_SUFFIX}${PLATFORM_IT_LOWER}/enable_local_memory_helper_${PLATFORM_IT_LOWER}.cpp) if(EXISTS ${SRC_FILE}) - list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW_LINUX ${SRC_FILE}) + list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW_LINUX ${SRC_FILE}) endif() set(SRC_FILE ${NEO_SHARED_DIRECTORY}/ail${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}${PLATFORM_IT_LOWER}/ail_configuration_${PLATFORM_IT_LOWER}.cpp) if(EXISTS ${SRC_FILE}) - list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) + list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) endif() endforeach() endforeach() @@ -30,20 +30,20 @@ macro(macro_for_each_gen) foreach(BRANCH ${BRANCH_DIR_LIST}) set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/${BRANCH}${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp) if(EXISTS ${SRC_FILE}) - list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) + list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) endif() set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/libult/${BRANCH}${GEN_TYPE_LOWER}.cpp) if(EXISTS ${SRC_FILE}) - list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) + list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) endif() foreach(SRC_IT "enable_" "enable_family_full_core_") set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}${SRC_IT}${GEN_TYPE_LOWER}.cpp) if(EXISTS ${SRC_FILE}) - list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) + list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) endif() set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH_DIR}${GEN_TYPE_LOWER}/${SRC_IT}${GEN_TYPE_LOWER}.cpp) if(EXISTS ${SRC_FILE}) - list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) + list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) endif() endforeach() endforeach() @@ -54,7 +54,7 @@ endmacro() apply_macro_for_each_gen("TESTED") -set(igdrcl_libult_common_SRCS_LIB_ULT +set(neo_libult_common_SRCS_LIB_ULT ${NEO_SHARED_TEST_DIRECTORY}/common/fixtures/device_fixture.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/fixtures/device_fixture.h ${NEO_SHARED_TEST_DIRECTORY}/common/fixtures/mock_execution_environment_gmm_fixture.cpp @@ -96,20 +96,20 @@ set(igdrcl_libult_common_SRCS_LIB_ULT get_property(NEO_SHARED_TESTS_CMD_PARSE GLOBAL PROPERTY NEO_SHARED_TESTS_CMD_PARSE) -list(APPEND igdrcl_libult_common_SRCS_LIB_ULT +list(APPEND neo_libult_common_SRCS_LIB_ULT ${NEO_SHARED_TESTS_CMD_PARSE} ) if(UNIX) - list(APPEND igdrcl_libult_common_SRCS_ENABLE_TESTED_HW ${igdrcl_libult_common_SRCS_ENABLE_TESTED_HW_LINUX}) + list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${neo_libult_common_SRCS_ENABLE_TESTED_HW_LINUX}) endif() -add_library(igdrcl_libult_common OBJECT EXCLUDE_FROM_ALL - ${igdrcl_libult_common_SRCS_LIB_ULT} - ${igdrcl_libult_common_SRCS_ENABLE_TESTED_HW} +add_library(neo_libult_common OBJECT EXCLUDE_FROM_ALL + ${neo_libult_common_SRCS_LIB_ULT} + ${neo_libult_common_SRCS_ENABLE_TESTED_HW} ) -set(igdrcl_libult_common_SRCS_LIB_ULT_WIN +set(neo_libult_common_SRCS_LIB_ULT_WIN ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/windows/gmm_memory${BRANCH_DIR_SUFFIX}mock_gmm_memory.h ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/windows/mock_gmm_memory_base.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/windows/mock_gmm_memory_base.h @@ -119,38 +119,38 @@ set(igdrcl_libult_common_SRCS_LIB_ULT_WIN ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/ult_dxgi_factory.h ) -set(igdrcl_libult_common_SRCS_LIB_ULT_LINUX +set(neo_libult_common_SRCS_LIB_ULT_LINUX ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/device_command_stream_fixture.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/linux/device_command_stream_fixture.h ) -set_property(GLOBAL PROPERTY igdrcl_libult_common_SRCS_LIB_ULT_LINUX ${igdrcl_libult_common_SRCS_LIB_ULT_LINUX}) +set_property(GLOBAL PROPERTY neo_libult_common_SRCS_LIB_ULT_LINUX ${neo_libult_common_SRCS_LIB_ULT_LINUX}) if(UNIX AND NOT DISABLE_WDDM_LINUX) - target_sources(igdrcl_libult_common PRIVATE + target_sources(neo_libult_common PRIVATE ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp ${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp ) endif() if(WIN32) - target_sources(igdrcl_libult_common PRIVATE ${igdrcl_libult_common_SRCS_LIB_ULT_WIN}) - target_include_directories(igdrcl_libult_common PRIVATE + target_sources(neo_libult_common PRIVATE ${neo_libult_common_SRCS_LIB_ULT_WIN}) + target_include_directories(neo_libult_common PRIVATE ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/windows/gmm_memory${BRANCH_DIR_SUFFIX} ) elseif(UNIX) - target_sources(igdrcl_libult_common PRIVATE ${igdrcl_libult_common_SRCS_LIB_ULT_LINUX}) + target_sources(neo_libult_common PRIVATE ${neo_libult_common_SRCS_LIB_ULT_LINUX}) endif() -target_include_directories(igdrcl_libult_common PRIVATE +target_include_directories(neo_libult_common PRIVATE $ ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR} ${IGC_COMMON_PARENT_DIR} ) -set_target_properties(igdrcl_libult_common PROPERTIES POSITION_INDEPENDENT_CODE ON) -set_target_properties(igdrcl_libult_common PROPERTIES FOLDER ${SHARED_TEST_PROJECTS_FOLDER}) -set_property(TARGET igdrcl_libult_common APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) -target_include_directories(igdrcl_libult_common PRIVATE $) -target_compile_definitions(igdrcl_libult_common PRIVATE $) +set_target_properties(neo_libult_common PROPERTIES POSITION_INDEPENDENT_CODE ON) +set_target_properties(neo_libult_common PROPERTIES FOLDER ${SHARED_TEST_PROJECTS_FOLDER}) +set_property(TARGET neo_libult_common APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) +target_include_directories(neo_libult_common PRIVATE $) +target_compile_definitions(neo_libult_common PRIVATE $) -create_project_source_tree(igdrcl_libult_common) +create_project_source_tree(neo_libult_common) add_subdirectories() diff --git a/shared/test/common/libult/linux/CMakeLists.txt b/shared/test/common/libult/linux/CMakeLists.txt index e65a1fbbc6..601f575aa8 100644 --- a/shared/test/common/libult/linux/CMakeLists.txt +++ b/shared/test/common/libult/linux/CMakeLists.txt @@ -5,7 +5,7 @@ # if(UNIX) - target_sources(igdrcl_libult_common PRIVATE + target_sources(neo_libult_common PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/drm_mock.cpp ${CMAKE_CURRENT_SOURCE_DIR}/drm_mock.h diff --git a/shared/test/unit_test/CMakeLists.txt b/shared/test/unit_test/CMakeLists.txt index 23950581d0..aa9dd42756 100644 --- a/shared/test/unit_test/CMakeLists.txt +++ b/shared/test/unit_test/CMakeLists.txt @@ -34,7 +34,7 @@ if(NOT SKIP_UNIT_TESTS) ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/test_mode.h ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp $ - $ + $ $ )