From 271e0ee7feee5f7ea4ad93750c641629eaf4edac Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Tue, 19 Oct 2021 18:41:15 +0000 Subject: [PATCH] Move ult dxgi/dxcore factories to shared Signed-off-by: Mateusz Jablonski --- level_zero/core/test/aub_tests/CMakeLists.txt | 2 -- level_zero/core/test/unit_tests/CMakeLists.txt | 2 -- .../experimental/test/unit_tests/CMakeLists.txt | 2 -- level_zero/tools/test/unit_tests/CMakeLists.txt | 2 -- opencl/test/unit_test/libult/CMakeLists.txt | 4 ---- .../unit_test/os_interface/windows/wddm20_tests.cpp | 2 +- .../unit_test/os_interface/windows/wddm_calls.cpp | 5 ++--- shared/test/common/libult/CMakeLists.txt | 11 +++++++++++ .../os_interface/windows/ult_dxcore_factory.cpp | 2 +- .../common}/os_interface/windows/ult_dxcore_factory.h | 0 .../common}/os_interface/windows/ult_dxgi_factory.cpp | 2 +- .../common}/os_interface/windows/ult_dxgi_factory.h | 0 shared/test/unit_test/CMakeLists.txt | 2 -- .../os_interface/windows/adapter_info_tests.cpp | 4 ++-- 14 files changed, 18 insertions(+), 22 deletions(-) rename {opencl/test/unit_test => shared/test/common}/os_interface/windows/ult_dxcore_factory.cpp (89%) rename {opencl/test/unit_test => shared/test/common}/os_interface/windows/ult_dxcore_factory.h (100%) rename {opencl/test/unit_test => shared/test/common}/os_interface/windows/ult_dxgi_factory.cpp (83%) rename {opencl/test/unit_test => shared/test/common}/os_interface/windows/ult_dxgi_factory.h (100%) diff --git a/level_zero/core/test/aub_tests/CMakeLists.txt b/level_zero/core/test/aub_tests/CMakeLists.txt index a3d3cf87da..10a9ab9899 100644 --- a/level_zero/core/test/aub_tests/CMakeLists.txt +++ b/level_zero/core/test/aub_tests/CMakeLists.txt @@ -105,8 +105,6 @@ else() ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/options.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/sys_calls.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_wddm.cpp diff --git a/level_zero/core/test/unit_tests/CMakeLists.txt b/level_zero/core/test/unit_tests/CMakeLists.txt index 9c1a93b68a..c0c04907d8 100644 --- a/level_zero/core/test/unit_tests/CMakeLists.txt +++ b/level_zero/core/test/unit_tests/CMakeLists.txt @@ -62,8 +62,6 @@ else() ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/options.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/os_memory_virtual_alloc_ult.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/sys_calls.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp ) diff --git a/level_zero/experimental/test/unit_tests/CMakeLists.txt b/level_zero/experimental/test/unit_tests/CMakeLists.txt index 132960a485..22a0795e98 100644 --- a/level_zero/experimental/test/unit_tests/CMakeLists.txt +++ b/level_zero/experimental/test/unit_tests/CMakeLists.txt @@ -76,8 +76,6 @@ else() ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/options.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/os_memory_virtual_alloc_ult.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/sys_calls.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp ) diff --git a/level_zero/tools/test/unit_tests/CMakeLists.txt b/level_zero/tools/test/unit_tests/CMakeLists.txt index 1158fde510..58e86998c0 100644 --- a/level_zero/tools/test/unit_tests/CMakeLists.txt +++ b/level_zero/tools/test/unit_tests/CMakeLists.txt @@ -61,8 +61,6 @@ else() ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/options.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/os_memory_virtual_alloc_ult.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/sys_calls.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp ) diff --git a/opencl/test/unit_test/libult/CMakeLists.txt b/opencl/test/unit_test/libult/CMakeLists.txt index 403c601232..0bac013093 100644 --- a/opencl/test/unit_test/libult/CMakeLists.txt +++ b/opencl/test/unit_test/libult/CMakeLists.txt @@ -62,10 +62,6 @@ set(IGDRCL_SRCS_LIB_ULT_ENV_WINDOWS ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/options.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/sys_calls.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.h - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp ) diff --git a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp index 345e93c03d..0d5e186757 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp @@ -30,10 +30,10 @@ #include "shared/test/common/mocks/mock_io_functions.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_wddm_residency_logger.h" +#include "shared/test/common/os_interface/windows/ult_dxcore_factory.h" #include "shared/test/common/os_interface/windows/wddm_fixture.h" #include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h" -#include "opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp b/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp index 9909b582df..047783aabe 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp @@ -7,9 +7,8 @@ #include "shared/source/memory_manager/host_ptr_defines.h" #include "shared/test/common/mocks/mock_wddm.h" - -#include "opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.h" -#include "opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h" +#include "shared/test/common/os_interface/windows/ult_dxcore_factory.h" +#include "shared/test/common/os_interface/windows/ult_dxgi_factory.h" namespace NEO { Wddm::CreateDXGIFactoryFcn getCreateDxgiFactory() { diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt index 30c1fbdd04..736ccc24a8 100644 --- a/shared/test/common/libult/CMakeLists.txt +++ b/shared/test/common/libult/CMakeLists.txt @@ -107,6 +107,17 @@ add_library(igdrcl_libult_common OBJECT EXCLUDE_FROM_ALL ${igdrcl_libult_common_SRCS_ENABLE_TESTED_HW} ) +set(igdrcl_libult_common_SRCS_LIB_ULT_WIN + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/ult_dxcore_factory.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/ult_dxcore_factory.h + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/ult_dxgi_factory.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/os_interface/windows/ult_dxgi_factory.h +) + +if(WIN32) + target_sources(igdrcl_libult_common PRIVATE ${igdrcl_libult_common_SRCS_LIB_ULT_WIN}) +endif() + target_include_directories(igdrcl_libult_common PRIVATE $ ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR} diff --git a/opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.cpp b/shared/test/common/os_interface/windows/ult_dxcore_factory.cpp similarity index 89% rename from opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.cpp rename to shared/test/common/os_interface/windows/ult_dxcore_factory.cpp index 8d97db95b0..e90d2efba7 100644 --- a/opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.cpp +++ b/shared/test/common/os_interface/windows/ult_dxcore_factory.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.h" +#include "shared/test/common/os_interface/windows/ult_dxcore_factory.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.h b/shared/test/common/os_interface/windows/ult_dxcore_factory.h similarity index 100% rename from opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.h rename to shared/test/common/os_interface/windows/ult_dxcore_factory.h diff --git a/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp b/shared/test/common/os_interface/windows/ult_dxgi_factory.cpp similarity index 83% rename from opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp rename to shared/test/common/os_interface/windows/ult_dxgi_factory.cpp index 97c3f21df6..cf36dc9678 100644 --- a/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp +++ b/shared/test/common/os_interface/windows/ult_dxgi_factory.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h" +#include "shared/test/common/os_interface/windows/ult_dxgi_factory.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h b/shared/test/common/os_interface/windows/ult_dxgi_factory.h similarity index 100% rename from opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h rename to shared/test/common/os_interface/windows/ult_dxgi_factory.h diff --git a/shared/test/unit_test/CMakeLists.txt b/shared/test/unit_test/CMakeLists.txt index 556a90ef01..bb6d4dea8f 100644 --- a/shared/test/unit_test/CMakeLists.txt +++ b/shared/test/unit_test/CMakeLists.txt @@ -60,8 +60,6 @@ if(NOT SKIP_UNIT_TESTS) ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/options.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/os_memory_virtual_alloc_ult.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/sys_calls.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.cpp - ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp ) diff --git a/shared/test/unit_test/os_interface/windows/adapter_info_tests.cpp b/shared/test/unit_test/os_interface/windows/adapter_info_tests.cpp index b1beef906a..076fa7fce2 100644 --- a/shared/test/unit_test/os_interface/windows/adapter_info_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/adapter_info_tests.cpp @@ -12,9 +12,9 @@ #include "shared/source/os_interface/windows/wddm/adapter_factory_dxgi.h" #include "shared/source/os_interface/windows/wddm/adapter_info.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/os_interface/windows/ult_dxcore_factory.h" +#include "shared/test/common/os_interface/windows/ult_dxgi_factory.h" -#include "opencl/test/unit_test/os_interface/windows/ult_dxcore_factory.h" -#include "opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h" #include "test.h" #include