Move mock_gmm_memory to shared

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
2026-02-08 10:25:52 +08:00 · 2021-10-21 18:22:38 +00:00
parent 6e90770279
commit 802a272c5f
19 changed files with 40 additions and 102 deletions
--- a/level_zero/cmake/l0_tests.cmake
+++ b/level_zero/cmake/l0_tests.cmake
@@ -55,7 +55,6 @@ set_property(TARGET compute_runtime_mockable_extra APPEND_STRING PROPERTY COMPIL
 target_include_directories(compute_runtime_mockable_extra
                           PUBLIC
                           ${COMPUTE_RUNTIME_MOCKABLE_INCLUDES}
-                           ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/gmm_memory
                           ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR}
 )

@@ -73,7 +72,6 @@ if(WIN32)
  target_sources(compute_runtime_mockable_extra
                 PRIVATE
                 ${NEO_SOURCE_DIR}/shared/source/dll/windows/environment_variables.cpp
-                 ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_memory_base.cpp
                 ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_wddm.cpp
  )

--- a/level_zero/core/test/aub_tests/CMakeLists.txt
+++ b/level_zero/core/test/aub_tests/CMakeLists.txt
@@ -82,12 +82,6 @@ if(TARGET ${BUILTINS_SPIRV_LIB_NAME})
 endif()

 if(UNIX)
-  if(NOT DISABLE_WDDM_LINUX)
-    target_sources(${TARGET_NAME} PRIVATE
-                   ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
-                   ${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
-    )
-  endif()
  target_sources(${TARGET_NAME} PRIVATE
                 ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp
                 ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp
@@ -97,11 +91,9 @@ if(UNIX)
  )
 else()
  target_sources(${TARGET_NAME} PRIVATE
-                 ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
                 ${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
                 ${NEO_SHARED_DIRECTORY}/os_interface/windows/os_memory_virtual_alloc.cpp
                 ${NEO_SHARED_DIRECTORY}/dll/windows/environment_variables.cpp
-                 ${NEO_SOURCE_DIR}/shared/source/dll/windows/environment_variables.cpp
                 ${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
@@ -131,7 +123,6 @@ target_include_directories(${TARGET_NAME} PRIVATE
                           ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/aub_tests
                           ${NEO_SOURCE_DIR}/shared/test/common/helpers/includes${BRANCH_DIR_SUFFIX}
                           ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/header${BRANCH_DIR_SUFFIX}
-                           ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/gmm_memory
                           ${NEO_SOURCE_DIR}/level_zero/core/test/unit_tests
                           ${ENGINE_NODE_DIR}
                           ${CIF_BASE_DIR}
--- a/level_zero/core/test/unit_tests/CMakeLists.txt
+++ b/level_zero/core/test/unit_tests/CMakeLists.txt
@@ -49,13 +49,6 @@ if(UNIX)
                 ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/options.cpp
                 ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp
  )
-  if(NOT DISABLE_WDDM_LINUX)
-    target_sources(${TARGET_NAME} PRIVATE
-                   ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
-                   ${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
-    )
-
-  endif()
 else()
  target_sources(${TARGET_NAME} PRIVATE
                 ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp
--- a/level_zero/experimental/test/unit_tests/CMakeLists.txt
+++ b/level_zero/experimental/test/unit_tests/CMakeLists.txt
@@ -60,14 +60,6 @@ if(UNIX)
                 ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/options.cpp
                 ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp
  )
-  if(NOT DISABLE_WDDM_LINUX)
-    target_sources(
-                   ${TARGET_NAME}
-                   PRIVATE
-                   ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
-                   ${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
-    )
-  endif()
 else()
  target_sources(
                 ${TARGET_NAME}
--- a/level_zero/tools/test/unit_tests/CMakeLists.txt
+++ b/level_zero/tools/test/unit_tests/CMakeLists.txt
@@ -49,12 +49,6 @@ if(UNIX)
                 ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/options.cpp
                 ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp
  )
-  if(NOT DISABLE_WDDM_LINUX)
-    target_sources(${TARGET_NAME} PRIVATE
-                   ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
-                   ${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
-    )
-  endif()
 else()
  target_sources(${TARGET_NAME} PRIVATE
                 ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp
--- a/opencl/test/unit_test/CMakeLists.txt
+++ b/opencl/test/unit_test/CMakeLists.txt
@@ -38,12 +38,6 @@ set(IGDRCL_SRCS_tests_local
 if(WIN32)
  list(APPEND IGDRCL_SRCS_tests_local ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp)
  list(APPEND IGDRCL_SRCS_tests_local ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/os_memory_virtual_alloc_ult.cpp)
-else()
-  if(NOT DISABLE_WDDM_LINUX)
-    list(APPEND IGDRCL_SRCS_tests_local ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
-         ${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
-    )
-  endif()
 endif()

 add_subdirectory(libult)
@@ -126,6 +120,11 @@ target_include_directories(igdrcl_tests PRIVATE
                           ${KHRONOS_GL_HEADERS_DIR}
                           ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests
 )
+if(WIN32)
+  target_include_directories(igdrcl_tests PRIVATE
+                             ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/windows/gmm_memory${BRANCH_DIR_SUFFIX}
+  )
+endif()

 target_link_libraries(igdrcl_tests gmock-gtest ${IGDRCL_EXTRA_LIBS})

--- a/opencl/test/unit_test/aub_tests/CMakeLists.txt
+++ b/opencl/test/unit_test/aub_tests/CMakeLists.txt
@@ -65,7 +65,6 @@ target_sources(igdrcl_aub_tests PRIVATE
 if(WIN32)
  target_sources(igdrcl_aub_tests PRIVATE
                 ${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
                 ${NEO_SOURCE_DIR}/shared/source/os_interface/windows/os_memory_virtual_alloc.cpp
  )
@@ -74,12 +73,6 @@ else()
                 ${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
                 ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp
  )
-  if(NOT DISABLE_WDDM_LINUX)
-    target_sources(igdrcl_aub_tests PRIVATE
-                   ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
-                   ${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
-    )
-  endif()
 endif()

 copy_gmm_dll_for(igdrcl_aub_tests)
--- a/opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp
+++ b/opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp
@@ -11,12 +11,11 @@
 #include "shared/source/os_interface/windows/gdi_interface.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_wddm.h"
+#include "shared/test/common/mocks/windows/mock_gmm_memory_base.h"
 #include "shared/test/common/os_interface/windows/gdi_dll_fixture.h"

 #include "test.h"

-#include "mock_gmm_memory.h"
-
 using namespace NEO;

 struct Gen12LpWddmTest : public GdiDllFixture, ::testing::Test {
--- a/opencl/test/unit_test/linux/CMakeLists.txt
+++ b/opencl/test/unit_test/linux/CMakeLists.txt
@@ -35,12 +35,6 @@ if(NEO__LIBVA_FOUND)
  target_sources(igdrcl_${target_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/va_tests.cpp)
 endif()

-if(NOT DISABLE_WDDM_LINUX)
-  target_sources(igdrcl_${target_name} PRIVATE ${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
-                 ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
-  )
-endif()
-
 target_link_libraries(igdrcl_${target_name} ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE} igdrcl_mocks ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE} ${IGDRCL_EXTRA_LIBS} gmock-gtest)

 set_property(TARGET igdrcl_${target_name} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
--- a/opencl/test/unit_test/mocks/CMakeLists.txt
+++ b/opencl/test/unit_test/mocks/CMakeLists.txt
@@ -58,9 +58,6 @@ if(WIN32)
  list(APPEND IGDRCL_SRCS_tests_mocks
       ${CMAKE_CURRENT_SOURCE_DIR}/mock_d3d_objects.h
       ${CMAKE_CURRENT_SOURCE_DIR}/mock_ostime_win.h
-       ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_memory_base.cpp
-       ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_memory_base.h
-       ${CMAKE_CURRENT_SOURCE_DIR}/gmm_memory${BRANCH_DIR_SUFFIX}mock_gmm_memory.h
       ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm_interface23.h
       ${NEO_SHARED_TEST_DIRECTORY}/unit_test/os_interface/windows/mock_gdi_interface.cpp
       ${IGDRCL_SRC_tests_mock_wddm}
@@ -74,14 +71,6 @@ endif()
 add_library(igdrcl_mocks STATIC EXCLUDE_FROM_ALL ${IGDRCL_SRCS_tests_mocks})
 add_subdirectories()

-if(WIN32)
-  target_include_directories(igdrcl_mocks PUBLIC
-                             ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/gmm_memory${BRANCH_DIR_SUFFIX}
-  )
-endif()
-
-# add_dependencies(igdrcl_mocks gmock-gtest)
-
 get_property(NEO_CORE_tests_mocks GLOBAL PROPERTY NEO_CORE_tests_mocks)
 list(APPEND NEO_CORE_tests_mocks
     ${NEO_CORE_tests_mocks}
--- a/opencl/test/unit_test/mocks/gmm_memory/mock_gmm_memory.h
+++ b/opencl/test/unit_test/mocks/gmm_memory/mock_gmm_memory.h
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2018-2020 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- *
- */
-
-#pragma once
-#include "opencl/test/unit_test/mocks/mock_gmm_memory_base.h"
-
-namespace NEO {
-
-class MockGmmMemory : public MockGmmMemoryBase {
-    using MockGmmMemoryBase::MockGmmMemoryBase;
-};
-
-class GmockGmmMemory : public GmockGmmMemoryBase {
-    using GmockGmmMemoryBase::GmockGmmMemoryBase;
-};
-} // namespace NEO
--- a/opencl/test/unit_test/mt_tests/CMakeLists.txt
+++ b/opencl/test/unit_test/mt_tests/CMakeLists.txt
@@ -49,12 +49,6 @@ else()
  target_sources(igdrcl_mt_tests PRIVATE
                 ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp
  )
-  if(NOT DISABLE_WDDM_LINUX)
-    target_sources(igdrcl_mt_tests PRIVATE
-                   ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
-                   ${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
-    )
-  endif()
 endif()

 if(WIN32)
--- a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
+++ b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
@@ -36,6 +36,7 @@
 #include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h"

 #include "gtest/gtest.h"
+#include "mock_gmm_memory.h"

 #include <functional>
 #include <memory>
--- a/shared/test/common/libult/CMakeLists.txt
+++ b/shared/test/common/libult/CMakeLists.txt
@@ -110,6 +110,9 @@ add_library(igdrcl_libult_common OBJECT EXCLUDE_FROM_ALL
 )

 set(igdrcl_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
    ${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
@@ -122,8 +125,17 @@ set(igdrcl_libult_common_SRCS_LIB_ULT_LINUX
 )
 set_property(GLOBAL PROPERTY igdrcl_libult_common_SRCS_LIB_ULT_LINUX ${igdrcl_libult_common_SRCS_LIB_ULT_LINUX})

+if(UNIX AND NOT DISABLE_WDDM_LINUX)
+  target_sources(igdrcl_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
+                             ${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})
 endif()
--- a/shared/test/common/mocks/windows/gmm_memory/mock_gmm_memory.h
+++ b/shared/test/common/mocks/windows/gmm_memory/mock_gmm_memory.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2018-2021 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+#include "shared/test/common/mocks/windows/mock_gmm_memory_base.h"
+
+namespace NEO {
+
+class MockGmmMemory : public MockGmmMemoryBase {
+    using MockGmmMemoryBase::MockGmmMemoryBase;
+};
+} // namespace NEO
--- a/shared/test/common/mocks/windows/mock_gmm_memory_base.cpp
+++ b/shared/test/common/mocks/windows/mock_gmm_memory_base.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
 *
 * SPDX-License-Identifier: MIT
 *
--- a/shared/test/common/mocks/windows/mock_gmm_memory_base.h
+++ b/shared/test/common/mocks/windows/mock_gmm_memory_base.h
@@ -47,11 +47,11 @@ class MockGmmMemoryBase : public GmmMemory {
    GMM_DEVICE_CALLBACKS_INT deviceCallbacks{};
 };

-class GmockGmmMemoryBase : public GmmMemory {
+class GmockGmmMemory : public GmmMemory {
  public:
-    ~GmockGmmMemoryBase() = default;
+    ~GmockGmmMemory() = default;

-    GmockGmmMemoryBase(GmmClientContext *gmmClientContext) : GmmMemory(gmmClientContext) {
+    GmockGmmMemory(GmmClientContext *gmmClientContext) : GmmMemory(gmmClientContext) {
        ON_CALL(*this, getInternalGpuVaRangeLimit())
            .WillByDefault(::testing::Return(NEO::windowsMinAddress));

--- a/shared/test/common/os_interface/windows/wddm_fixture.h
+++ b/shared/test/common/os_interface/windows/wddm_fixture.h
@@ -24,13 +24,12 @@
 #include "shared/test/common/mocks/mock_wddm.h"
 #include "shared/test/common/mocks/mock_wddm_interface20.h"
 #include "shared/test/common/mocks/mock_wddm_residency_allocations_container.h"
+#include "shared/test/common/mocks/windows/mock_gmm_memory_base.h"
 #include "shared/test/common/os_interface/windows/gdi_dll_fixture.h"
 #include "shared/test/unit_test/os_interface/windows/mock_gdi_interface.h"

 #include "test.h"

-#include "mock_gmm_memory.h"
-
 namespace NEO {
 struct WddmFixture : public Test<MockExecutionEnvironmentGmmFixture> {
    void SetUp() override {
--- a/shared/test/unit_test/CMakeLists.txt
+++ b/shared/test/unit_test/CMakeLists.txt
@@ -48,12 +48,6 @@ if(NOT SKIP_UNIT_TESTS)
                   ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/linux/mock_drm_memory_manager.cpp
                   ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/linux/mock_drm_memory_manager.h
    )
-    if(NOT DISABLE_WDDM_LINUX)
-      target_sources(${TARGET_NAME} PRIVATE
-                     ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
-                     ${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
-      )
-    endif()
  else()
    target_sources(${TARGET_NAME} PRIVATE
                   ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp