Move mocks: cif, gmm context, compilers

Related-To: NEO-5161 Signed-off-by: Dominik Dabek <dominik.dabek@intel.com>
2026-01-05 09:09:04 +08:00 · 2021-05-21 10:22:13 +00:00
parent 00fc92129d
commit d0cb27226f
88 changed files with 179 additions and 185 deletions
--- a/level_zero/cmake/l0_tests.cmake
+++ b/level_zero/cmake/l0_tests.cmake
@@ -11,28 +11,28 @@
 # These need to be added to a project to enable platform support in ULTs
 if(TESTS_GEN8)
  set(COMPUTE_RUNTIME_ULT_GEN8
-      ${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen8.cpp
+      ${NEO_SHARED_TEST_DIRECTORY}/common/libult/gen8.cpp
      ${NEO_SHARED_TEST_DIRECTORY}/common/gen8/cmd_parse_gen8.cpp
  )
 endif()

 if(TESTS_GEN9)
  set(COMPUTE_RUNTIME_ULT_GEN9
-      ${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen9.cpp
+      ${NEO_SHARED_TEST_DIRECTORY}/common/libult/gen9.cpp
      ${NEO_SHARED_TEST_DIRECTORY}/common/gen9/cmd_parse_gen9.cpp
  )
 endif()

 if(TESTS_GEN11)
  set(COMPUTE_RUNTIME_ULT_GEN11
-      ${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen11.cpp
+      ${NEO_SHARED_TEST_DIRECTORY}/common/libult/gen11.cpp
      ${NEO_SHARED_TEST_DIRECTORY}/common/gen11/cmd_parse_gen11.cpp
  )
 endif()

 if(TESTS_GEN12LP)
  set(COMPUTE_RUNTIME_ULT_GEN12LP
-      ${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen12lp.cpp
+      ${NEO_SHARED_TEST_DIRECTORY}/common/libult/gen12lp.cpp
      ${NEO_SHARED_TEST_DIRECTORY}/common/gen12lp/cmd_parse_gen12lp.cpp
  )
  include_directories(${NEO_SHARED_TEST_DIRECTORY}/common/gen12lp/cmd_parse${BRANCH_DIR_SUFFIX}/)
@@ -65,32 +65,32 @@ add_library(compute_runtime_mockable_extra
            STATIC
            EXCLUDE_FROM_ALL
            ${CMAKE_CURRENT_LIST_DIR}/l0_tests.cmake
-            ${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
            ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/sip_init.cpp
            ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/test_files.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/libult/create_tbx_sockets.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_library.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/libult/source_level_debugger_ult.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_SUFIX_DIR}/mock_gmm_client_context.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_cif.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_command_stream_receiver.cpp
            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compiler_interface_spirv.cpp
            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compiler_interface_spirv.h
-            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_command_stream_receiver.cpp
-            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_device.cpp
-            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_sip.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp
-            ${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/debug_helpers.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/os_interface.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/source_level_debugger_ult.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/source_level_debugger_library.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_cif.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_compilers.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/create_tbx_sockets.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compilers.cpp
            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_deferred_deleter.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks${BRANCH_SUFIX_DIR}/mock_gmm_client_context.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_client_context_base.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_device.cpp
+            ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_client_context_base.cpp
+            ${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/abort.cpp
+            ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/mock_execution_environment_gmm_fixture.cpp
+            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp
            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp
            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_memory_manager.cpp
            ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_program.cpp
            ${NEO_SOURCE_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp
-            ${NEO_SOURCE_DIR}/opencl/test/unit_test/fixtures/mock_execution_environment_gmm_fixture.cpp
            ${NEO_SOURCE_DIR}/shared/source/debug_settings/debug_settings_manager.cpp
 )

--- a/level_zero/core/test/unit_tests/fixtures/CMakeLists.txt
+++ b/level_zero/core/test/unit_tests/fixtures/CMakeLists.txt
@@ -15,7 +15,7 @@ set(L0_FIXTURES_SOURCES
    ${CMAKE_CURRENT_SOURCE_DIR}/module_fixture.h
 )

-add_library(${TARGET_NAME} OBJECT ${L0_FIXTURES_SOURCES} ${IGDRCL_SRCS_tests_compiler_mocks})
+add_library(${TARGET_NAME} OBJECT ${L0_FIXTURES_SOURCES} ${NEO_CORE_tests_compiler_mocks})

 target_include_directories(${TARGET_NAME} PRIVATE
                           $<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
--- a/level_zero/core/test/unit_tests/fixtures/device_fixture.h
+++ b/level_zero/core/test/unit_tests/fixtures/device_fixture.h
@@ -10,10 +10,9 @@
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_device.h"

-#include "opencl/test/unit_test/mocks/mock_compilers.h"
-
 #include "level_zero/core/source/context/context_imp.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h"

--- a/level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h
+++ b/level_zero/core/test/unit_tests/fixtures/host_pointer_manager_fixture.h
@@ -9,14 +9,13 @@

 #include "shared/source/helpers/constants.h"
 #include "shared/source/os_interface/device_factory.h"
+#include "shared/source/os_interface/os_inc_base.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_memory_operations_handler.h"

-#include "opencl/source/os_interface/os_inc_base.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
-
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h"
--- a/level_zero/core/test/unit_tests/fixtures/module_fixture.h
+++ b/level_zero/core/test/unit_tests/fixtures/module_fixture.h
@@ -11,10 +11,10 @@
 #include "shared/source/memory_manager/allocation_properties.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/test_files.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"

 #include "opencl/source/program/kernel_info.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"

 #include "level_zero/core/source/module/module.h"
--- a/level_zero/core/test/unit_tests/gen11/test_cmdqueue_thread_arbitration_policy_gen11.cpp
+++ b/level_zero/core/test/unit_tests/gen11/test_cmdqueue_thread_arbitration_policy_gen11.cpp
@@ -8,9 +8,9 @@
 #include "shared/source/gen9/reg_configs.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_compilers.h"

 #include "opencl/source/helpers/hardware_commands_helper.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "test.h"

 #include "level_zero/core/source/driver/driver_imp.h"
--- a/level_zero/core/test/unit_tests/gen9/test_cmdqueue_gen9.cpp
+++ b/level_zero/core/test/unit_tests/gen9/test_cmdqueue_gen9.cpp
@@ -8,9 +8,9 @@
 #include "shared/source/gen9/reg_configs.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_compilers.h"

 #include "opencl/source/helpers/hardware_commands_helper.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "test.h"

 #include "level_zero/core/source/cmdqueue/cmdqueue_imp.h"
--- a/level_zero/core/test/unit_tests/main.cpp
+++ b/level_zero/core/test/unit_tests/main.cpp
@@ -12,6 +12,7 @@
 #include "shared/test/common/helpers/memory_leak_listener.h"
 #include "shared/test/common/helpers/test_files.h"
 #include "shared/test/common/helpers/ult_hw_config.inl"
+#include "shared/test/common/mocks/mock_gmm_client_context.h"
 #include "shared/test/common/mocks/mock_sip.h"
 #include "shared/test/unit_test/base_ult_config_listener.h"

@@ -19,7 +20,6 @@
 #include "opencl/source/utilities/logger.h"
 #include "opencl/test/unit_test/custom_event_listener.h"
 #include "opencl/test/unit_test/global_environment.h"
-#include "opencl/test/unit_test/mocks/mock_gmm_client_context.h"

 #include "level_zero/core/source/cmdlist/cmdlist.h"

--- a/level_zero/core/test/unit_tests/mocks/mock_module.h
+++ b/level_zero/core/test/unit_tests/mocks/mock_module.h
@@ -6,10 +6,9 @@
 */

 #pragma once
+#include "shared/test/common/mocks/mock_cif.h"
 #include "shared/test/common/mocks/mock_compiler_interface.h"

-#include "opencl/test/unit_test/mocks/mock_cif.h"
-
 #include "level_zero/core/source/module/module_imp.h"
 #include "level_zero/core/test/unit_tests/mock.h"
 #include "level_zero/core/test/unit_tests/white_box.h"
--- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp
+++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp
@@ -8,9 +8,9 @@
 #include "shared/source/gmm_helper/gmm_helper.h"
 #include "shared/source/helpers/register_offsets.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_graphics_allocation.h"

-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 #include "test.h"

--- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel.cpp
+++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_append_launch_kernel.cpp
@@ -11,8 +11,8 @@
 #include "shared/source/helpers/register_offsets.h"
 #include "shared/source/utilities/software_tags_manager.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
+#include "shared/test/common/mocks/mock_compilers.h"

-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "test.h"

 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
--- a/level_zero/core/test/unit_tests/sources/context/test_context.cpp
+++ b/level_zero/core/test/unit_tests/sources/context/test_context.cpp
@@ -6,9 +6,9 @@
 */

 #include "shared/test/common/mocks/mock_command_stream_receiver.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h"

-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 #include "test.h"

--- a/level_zero/core/test/unit_tests/sources/debugger/active_debugger_fixture.h
+++ b/level_zero/core/test/unit_tests/sources/debugger/active_debugger_fixture.h
@@ -7,10 +7,10 @@

 #pragma once
 #include "shared/test/common/mocks/mock_compiler_interface.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_os_library.h"

-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_source_level_debugger.h"

 #include "level_zero/core/source/cmdqueue/cmdqueue_hw.h"
--- a/level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h
+++ b/level_zero/core/test/unit_tests/sources/debugger/l0_debugger_fixture.h
@@ -6,11 +6,10 @@
 */

 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_memory_operations_handler.h"

-#include "opencl/test/unit_test/mocks/mock_compilers.h"
-
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_built_ins.h"
 #include "level_zero/core/test/unit_tests/mocks/mock_l0_debugger.h"
--- a/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp
+++ b/level_zero/core/test/unit_tests/sources/debugger/test_module_with_debug.cpp
@@ -8,11 +8,11 @@
 #include "shared/source/device_binary_format/patchtokens_decoder.h"
 #include "shared/source/kernel/kernel_descriptor_from_patchtokens.h"
 #include "shared/test/common/helpers/unit_test_helper.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_elf.h"

 #include "opencl/source/program/kernel_info.h"
 #include "opencl/source/program/kernel_info_from_patchtokens.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "test.h"

 #include "level_zero/core/source/module/module_imp.h"
--- a/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp
+++ b/level_zero/core/test/unit_tests/sources/debugger/test_source_level_debugger.cpp
@@ -10,8 +10,8 @@
 #include "shared/source/helpers/preamble.h"
 #include "shared/test/common/cmd_parse/gen_cmd_parse.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_compilers.h"

-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "test.h"

 #include "level_zero/core/source/cmdqueue/cmdqueue_hw.h"
--- a/level_zero/core/test/unit_tests/sources/device/test_device.cpp
+++ b/level_zero/core/test/unit_tests/sources/device/test_device.cpp
@@ -8,14 +8,14 @@
 #include "shared/source/device/root_device.h"
 #include "shared/source/helpers/bindless_heaps_helper.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/os_inc_base.h"
 #include "shared/source/os_interface/os_time.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_device.h"
 #include "shared/test/common/mocks/mock_sip.h"
 #include "shared/test/common/mocks/ult_device_factory.h"

-#include "opencl/source/os_interface/os_inc_base.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 #include "test.h"

--- a/level_zero/core/test/unit_tests/sources/driver/linux/test_driver_handle_imp_linux.cpp
+++ b/level_zero/core/test/unit_tests/sources/driver/linux/test_driver_handle_imp_linux.cpp
@@ -9,10 +9,9 @@
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/os_interface.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/ult_device_factory.h"

-#include "opencl/test/unit_test/mocks/mock_compilers.h"
-
 #include "level_zero/core/source/driver/driver_imp.h"
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"

--- a/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp
+++ b/level_zero/core/test/unit_tests/sources/driver/test_driver.cpp
@@ -8,12 +8,12 @@
 #include "shared/source/helpers/string.h"
 #include "shared/source/os_interface/device_factory.h"
 #include "shared/source/os_interface/hw_info_config.h"
+#include "shared/source/os_interface/os_inc_base.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/ult_hw_config.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/ult_device_factory.h"

-#include "opencl/source/os_interface/os_inc_base.h"
-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_io_functions.h"
 #include "test.h"

--- a/level_zero/core/test/unit_tests/sources/event/test_event.cpp
+++ b/level_zero/core/test/unit_tests/sources/event/test_event.cpp
@@ -6,9 +6,9 @@
 */

 #include "shared/test/common/helpers/debug_manager_state_restore.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/mock_memory_operations_handler.h"

-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_csr.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 #include "test.h"
--- a/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp
+++ b/level_zero/core/test/unit_tests/sources/memory/test_memory.cpp
@@ -10,9 +10,9 @@
 #include "shared/source/memory_manager/memory_operations_status.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/test_files.h"
+#include "shared/test/common/mocks/mock_compilers.h"
 #include "shared/test/common/mocks/ult_device_factory.h"

-#include "opencl/test/unit_test/mocks/mock_compilers.h"
 #include "opencl/test/unit_test/mocks/mock_memory_manager.h"
 #include "test.h"