From ada32e0a87e84988775293cd12502837d09478fd Mon Sep 17 00:00:00 2001
From: Mateusz Jablonski <mateusz.jablonski@intel.com>
Date: Tue, 12 Oct 2021 14:14:38 +0000
Subject: [PATCH] Move mock gmm page table manager to shared

add missing definitions to neo_shared_tests

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
---
 level_zero/cmake/l0_tests.cmake                               | 1 -
 level_zero/core/test/aub_tests/CMakeLists.txt                 | 4 ----
 .../command_stream_receiver_flush_task_3_tests.cpp            | 2 +-
 opencl/test/unit_test/memory_manager/memory_manager_tests.cpp | 2 +-
 opencl/test/unit_test/mocks/CMakeLists.txt                    | 2 --
 .../os_interface/linux/drm_command_stream_tests_1.cpp         | 2 +-
 .../os_interface/linux/drm_command_stream_tests_2.cpp         | 2 +-
 .../os_interface/windows/device_command_stream_tests.cpp      | 2 +-
 .../os_interface/windows/wddm_memory_manager_tests.h          | 2 +-
 shared/test/common/libult/CMakeLists.txt                      | 1 +
 shared/test/common/mocks/CMakeLists.txt                       | 1 +
 .../test/common}/mocks/mock_gmm_page_table_mngr.cpp           | 2 +-
 .../test/common}/mocks/mock_gmm_page_table_mngr.h             | 0
 shared/test/unit_test/CMakeLists.txt                          | 2 +-
 shared/test/unit_test/ult_specific_config.cpp                 | 4 ++++
 15 files changed, 14 insertions(+), 15 deletions(-)
 rename {opencl/test/unit_test => shared/test/common}/mocks/mock_gmm_page_table_mngr.cpp (92%)
 rename {opencl/test/unit_test => shared/test/common}/mocks/mock_gmm_page_table_mngr.h (100%)

diff --git a/level_zero/cmake/l0_tests.cmake b/level_zero/cmake/l0_tests.cmake
index a6eaad2259..461b0a5674 100644
--- a/level_zero/cmake/l0_tests.cmake
+++ b/level_zero/cmake/l0_tests.cmake
@@ -44,7 +44,6 @@ add_library(compute_runtime_mockable_extra
             ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_sip.cpp
             ${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/debug_helpers.cpp
             ${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp
             ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_program.cpp
             ${NEO_SHARED_DIRECTORY}/debug_settings/debug_settings_manager.cpp
 )
diff --git a/level_zero/core/test/aub_tests/CMakeLists.txt b/level_zero/core/test/aub_tests/CMakeLists.txt
index 416556b744..3270749312 100644
--- a/level_zero/core/test/aub_tests/CMakeLists.txt
+++ b/level_zero/core/test/aub_tests/CMakeLists.txt
@@ -82,10 +82,6 @@ if(TARGET ${BUILTINS_SPIRV_LIB_NAME})
   )
 endif()
 
-target_sources(${TARGET_NAME} PRIVATE
-               ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp
-)
-
 if(UNIX)
   if(NOT DISABLE_WDDM_LINUX)
     target_sources(${TARGET_NAME} PRIVATE
diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp
index 9d2773c476..f58d3f1459 100644
--- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp
+++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp
@@ -12,6 +12,7 @@
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/mocks/mock_device.h"
+#include "shared/test/common/mocks/mock_gmm_page_table_mngr.h"
 
 #include "opencl/source/helpers/hardware_commands_helper.h"
 #include "opencl/source/mem_obj/buffer.h"
@@ -22,7 +23,6 @@
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "opencl/test/unit_test/mocks/mock_event.h"
-#include "opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "opencl/test/unit_test/mocks/mock_os_context.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
diff --git a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
index 51635453b2..ff1ca7983e 100644
--- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
+++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
@@ -24,6 +24,7 @@
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/mocks/mock_gfx_partition.h"
+#include "shared/test/common/mocks/mock_gmm_page_table_mngr.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/unit_test/compiler_interface/linker_mock.h"
@@ -46,7 +47,6 @@
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
-#include "opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 #include "opencl/test/unit_test/mocks/mock_mdi.h"
 #include "opencl/test/unit_test/mocks/mock_os_context.h"
diff --git a/opencl/test/unit_test/mocks/CMakeLists.txt b/opencl/test/unit_test/mocks/CMakeLists.txt
index 2cacf06a65..62c05c98ea 100644
--- a/opencl/test/unit_test/mocks/CMakeLists.txt
+++ b/opencl/test/unit_test/mocks/CMakeLists.txt
@@ -27,8 +27,6 @@ set(IGDRCL_SRCS_tests_mocks
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_device_queue.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_event.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_page_table_mngr.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_page_table_mngr.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info_ocl.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_image.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_internal_allocation_storage.h
diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp
index 98aff9079d..65427309df 100644
--- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp
+++ b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp
@@ -24,6 +24,7 @@
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/dispatch_flags_helper.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
+#include "shared/test/common/mocks/mock_gmm_page_table_mngr.h"
 #include "shared/test/common/mocks/mock_host_ptr_manager.h"
 
 #include "opencl/source/mem_obj/buffer.h"
@@ -33,7 +34,6 @@
 #include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
-#include "opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h"
 #include "opencl/test/unit_test/mocks/mock_program.h"
 #include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h"
 #include "opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h"
diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_2.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_2.cpp
index d2004fe688..4941dcc1bd 100644
--- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_2.cpp
+++ b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests_2.cpp
@@ -22,6 +22,7 @@
 #include "shared/test/common/cmd_parse/hw_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/dispatch_flags_helper.h"
+#include "shared/test/common/mocks/mock_gmm_page_table_mngr.h"
 #include "shared/test/common/mocks/mock_host_ptr_manager.h"
 
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
@@ -32,7 +33,6 @@
 #include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
-#include "opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h"
 #include "opencl/test/unit_test/mocks/mock_program.h"
 #include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h"
 #include "opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h"
diff --git a/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp
index 67499a8e5f..552f079230 100644
--- a/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp
+++ b/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp
@@ -28,6 +28,7 @@
 #include "shared/test/common/helpers/dispatch_flags_helper.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
 #include "shared/test/common/mocks/mock_device.h"
+#include "shared/test/common/mocks/mock_gmm_page_table_mngr.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"
 #include "shared/test/common/mocks/mock_io_functions.h"
 #include "shared/test/common/mocks/windows/mock_wddm_direct_submission.h"
@@ -42,7 +43,6 @@
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_builtins.h"
-#include "opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 #include "opencl/test/unit_test/mocks/mock_program.h"
 #include "opencl/test/unit_test/mocks/mock_submissions_aggregator.h"
diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h
index 1c6e02961e..97fe812f27 100644
--- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h
+++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h
@@ -11,6 +11,7 @@
 #include "shared/source/os_interface/windows/os_environment_win.h"
 #include "shared/source/os_interface/windows/wddm_memory_operations_handler.h"
 #include "shared/test/common/helpers/engine_descriptor_helper.h"
+#include "shared/test/common/mocks/mock_gmm_page_table_mngr.h"
 #include "shared/test/common/mocks/mock_wddm_residency_allocations_container.h"
 #include "shared/test/common/os_interface/windows/wddm_fixture.h"
 #include "shared/test/unit_test/os_interface/windows/mock_gdi_interface.h"
@@ -18,7 +19,6 @@
 #include "opencl/test/unit_test/helpers/execution_environment_helper.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_gmm.h"
-#include "opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 #include "opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h"
 #include "test.h"
diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt
index 82207eda20..f6081c6913 100644
--- a/shared/test/common/libult/CMakeLists.txt
+++ b/shared/test/common/libult/CMakeLists.txt
@@ -81,6 +81,7 @@ set(igdrcl_libult_common_SRCS_LIB_ULT
     ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.h
     ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_ult.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_memory_manager.cpp
+    ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_page_table_mngr.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_excludes.cpp
     ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_excludes.h
     ${NEO_SHARED_TEST_DIRECTORY}/unit_test/base_ult_config_listener.cpp
diff --git a/shared/test/common/mocks/CMakeLists.txt b/shared/test/common/mocks/CMakeLists.txt
index 499236d2ae..9a3dd711d8 100644
--- a/shared/test/common/mocks/CMakeLists.txt
+++ b/shared/test/common/mocks/CMakeLists.txt
@@ -45,6 +45,7 @@ set(NEO_CORE_tests_mocks
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_gfx_partition.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_client_context_base.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_client_context_base.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_page_table_mngr.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info_common.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mock_graphics_allocation.h
diff --git a/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp b/shared/test/common/mocks/mock_gmm_page_table_mngr.cpp
similarity index 92%
rename from opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp
rename to shared/test/common/mocks/mock_gmm_page_table_mngr.cpp
index b5a622bbc5..b165614a69 100644
--- a/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp
+++ b/shared/test/common/mocks/mock_gmm_page_table_mngr.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h"
+#include "shared/test/common/mocks/mock_gmm_page_table_mngr.h"
 
 namespace NEO {
 using namespace ::testing;
diff --git a/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h b/shared/test/common/mocks/mock_gmm_page_table_mngr.h
similarity index 100%
rename from opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h
rename to shared/test/common/mocks/mock_gmm_page_table_mngr.h
diff --git a/shared/test/unit_test/CMakeLists.txt b/shared/test/unit_test/CMakeLists.txt
index c28a864924..239aeba3d0 100644
--- a/shared/test/unit_test/CMakeLists.txt
+++ b/shared/test/unit_test/CMakeLists.txt
@@ -28,8 +28,8 @@ if(NOT SKIP_UNIT_TESTS)
                  ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
                  ${CMAKE_CURRENT_SOURCE_DIR}/tests_configuration.h
                  ${CMAKE_CURRENT_SOURCE_DIR}/ult_specific_config.cpp
-                 ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp
                  ${NEO_SHARED_DIRECTORY}/helpers/allow_deferred_deleter.cpp
+                 ${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/api_specific_config_shared_tests.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/test_macros/test_checks_shared.cpp
                  ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests/ult_configuration.cpp
diff --git a/shared/test/unit_test/ult_specific_config.cpp b/shared/test/unit_test/ult_specific_config.cpp
index e3a74554b5..9a44d12a74 100644
--- a/shared/test/unit_test/ult_specific_config.cpp
+++ b/shared/test/unit_test/ult_specific_config.cpp
@@ -5,7 +5,9 @@
  *
  */
 
+#include "shared/source/built_ins/built_ins.h"
 #include "shared/source/command_container/implicit_scaling.h"
+#include "shared/source/compiler_interface/default_cache_config.h"
 #include "shared/source/memory_manager/compression_selector.h"
 #include "shared/source/page_fault_manager/cpu_page_fault_manager.h"
 
@@ -22,4 +24,6 @@ void PageFaultManager::transferToCpu(void *ptr, size_t size, void *cmdQ) {
 }
 void PageFaultManager::transferToGpu(void *ptr, void *cmdQ) {
 }
+CompilerCacheConfig getDefaultCompilerCacheConfig() { return {}; }
+const char *getAdditionalBuiltinAsString(EBuiltInOps::Type builtin) { return nullptr; }
 } // namespace NEO