diff --git a/level_zero/core/test/unit_tests/mocks/mock_driver_handle.cpp b/level_zero/core/test/unit_tests/mocks/mock_driver_handle.cpp index dc7a6eec60..0a2bd8cb4c 100644 --- a/level_zero/core/test/unit_tests/mocks/mock_driver_handle.cpp +++ b/level_zero/core/test/unit_tests/mocks/mock_driver_handle.cpp @@ -7,7 +7,7 @@ #include "mock_driver_handle.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" namespace L0 { namespace ult { diff --git a/level_zero/core/test/unit_tests/mocks/mock_memory_manager.h b/level_zero/core/test/unit_tests/mocks/mock_memory_manager.h index 63144704da..a9894828d8 100644 --- a/level_zero/core/test/unit_tests/mocks/mock_memory_manager.h +++ b/level_zero/core/test/unit_tests/mocks/mock_memory_manager.h @@ -6,10 +6,9 @@ */ #pragma once +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/memory_manager/unified_memory_manager.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" - #include "level_zero/core/test/unit_tests/mock.h" #include "level_zero/core/test/unit_tests/white_box.h" diff --git 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 index 42e3340125..26e39ef076 100644 --- 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,8 +8,8 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/register_offsets.h" #include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" #include "level_zero/core/source/builtin/builtin_functions_lib_impl.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp index c8a5afc50e..40c51d427a 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_2.cpp @@ -10,8 +10,8 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/register_offsets.h" #include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" #include "level_zero/core/source/driver/driver_handle_imp.h" diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp index 8f4d09b52d..d2f64ffc6c 100644 --- a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_blit.cpp @@ -7,8 +7,8 @@ #include "shared/source/helpers/register_offsets.h" #include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" #include "level_zero/core/source/builtin/builtin_functions_lib_impl.h" diff --git a/level_zero/core/test/unit_tests/sources/module/test_module.cpp b/level_zero/core/test/unit_tests/sources/module/test_module.cpp index 54cd83db75..600254867d 100644 --- a/level_zero/core/test/unit_tests/sources/module/test_module.cpp +++ b/level_zero/core/test/unit_tests/sources/module/test_module.cpp @@ -7,9 +7,9 @@ #include "shared/test/unit_test/compiler_interface/linker_mock.h" #include "shared/test/unit_test/device_binary_format/zebin_tests.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/program/kernel_info.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" #include "level_zero/core/source/context/context.h" diff --git a/opencl/source/command_stream/aub_command_stream_receiver.cpp b/opencl/source/command_stream/aub_command_stream_receiver.cpp index 87f0acbe22..e210014ce8 100644 --- a/opencl/source/command_stream/aub_command_stream_receiver.cpp +++ b/opencl/source/command_stream/aub_command_stream_receiver.cpp @@ -13,8 +13,8 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/options.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/os_interface/os_inc_base.h" #include diff --git a/opencl/source/command_stream/aub_command_stream_receiver_hw.h b/opencl/source/command_stream/aub_command_stream_receiver_hw.h index 771f4772ae..2e1540e41a 100644 --- a/opencl/source/command_stream/aub_command_stream_receiver_hw.h +++ b/opencl/source/command_stream/aub_command_stream_receiver_hw.h @@ -8,11 +8,11 @@ #pragma once #include "shared/source/aub/aub_center.h" #include "shared/source/helpers/array_count.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/memory_manager/physical_address_allocator.h" #include "shared/source/utilities/spinlock.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/memory_manager/page_table.h" #include "aub_mapper.h" diff --git a/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl b/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl index 7f95dcbab0..2734822372 100644 --- a/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl +++ b/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl @@ -24,13 +24,13 @@ #include "shared/source/helpers/string.h" #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/memory_manager/memory_banks.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/os_context.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/helpers/hardware_context_controller.h" #include "opencl/source/helpers/neo_driver_version.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/os_interface/ocl_reg_path.h" #include "driver_version.h" diff --git a/opencl/source/command_stream/tbx_command_stream_receiver_hw.h b/opencl/source/command_stream/tbx_command_stream_receiver_hw.h index cb4793a026..f6b7bab788 100644 --- a/opencl/source/command_stream/tbx_command_stream_receiver_hw.h +++ b/opencl/source/command_stream/tbx_command_stream_receiver_hw.h @@ -7,9 +7,9 @@ #pragma once #include "shared/source/memory_manager/address_mapper.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/command_stream/tbx_command_stream_receiver.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/memory_manager/page_table.h" #include "aub_mapper.h" diff --git a/opencl/source/memory_manager/CMakeLists.txt b/opencl/source/memory_manager/CMakeLists.txt index 0858fcd9c7..2105a45981 100644 --- a/opencl/source/memory_manager/CMakeLists.txt +++ b/opencl/source/memory_manager/CMakeLists.txt @@ -9,9 +9,6 @@ set(RUNTIME_SRCS_MEMORY_MANAGER ${CMAKE_CURRENT_SOURCE_DIR}/compression_selector_ocl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cpu_page_fault_manager_memory_sync.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mem_obj_surface.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_agnostic_memory_manager.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_agnostic_memory_manager.h - ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_agnostic_memory_manager_allocate_in_device_pool.cpp ${CMAKE_CURRENT_SOURCE_DIR}/page_table.cpp ${CMAKE_CURRENT_SOURCE_DIR}/page_table.h ${CMAKE_CURRENT_SOURCE_DIR}/page_table.inl diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp index d503f0f655..c1d05f7647 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp @@ -7,9 +7,9 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp index c0a26a2728..18d61edc04 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp @@ -8,9 +8,9 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp index df72215167..e4133c49b0 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp @@ -8,9 +8,9 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "test.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp index fb9586ea6a..a6545df171 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp @@ -7,12 +7,12 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/aub_tests_configuration.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" #include diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp index e573d67ae2..ec7c8b62b6 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp @@ -9,9 +9,9 @@ #include "shared/source/device/device.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp index d9ed365910..7a5b15d225 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp @@ -8,10 +8,10 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp index c1c508a87a..eac9311064 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp @@ -8,9 +8,9 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp index 31a7293540..322397e0ea 100644 --- a/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/helpers/aligned_memory.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" diff --git a/opencl/test/unit_test/command_queue/command_queue_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_tests.cpp index 6a91a864b4..fd01754bc8 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp @@ -12,6 +12,7 @@ #include "shared/source/memory_manager/memory_manager.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/variable_backup.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/event.h" @@ -29,7 +30,6 @@ #include "opencl/test/unit_test/mocks/mock_command_queue.h" #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_graphics_allocation.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_memory_manager.h" diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp index 43aab16789..e4dbaaafa5 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp @@ -11,6 +11,7 @@ #include "shared/source/utilities/tag_allocator.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/built_ins/aux_translation_builtin.h" #include "opencl/source/command_queue/gpgpu_walker.h" @@ -23,7 +24,6 @@ #include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.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_program.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp index 037c8f0372..c4bc48c4c1 100644 --- a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/helpers/timestamp_packet.h" #include "shared/source/memory_manager/surface.h" #include "shared/source/os_interface/os_context.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/event/event_builder.h" #include "opencl/source/event/user_event.h" @@ -19,7 +20,6 @@ #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_execution_environment.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.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_timestamp_container.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp index a9b4e12152..2d019f91ec 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp @@ -14,6 +14,7 @@ #include "shared/source/os_interface/device_factory.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" #include "shared/test/unit_test/utilities/base_object_utils.h" @@ -25,7 +26,6 @@ #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_svm_manager.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp index b4d00ef140..c13907b7ea 100644 --- a/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp @@ -7,13 +7,13 @@ #include "shared/source/command_stream/command_stream_receiver_hw.h" #include "shared/source/helpers/aligned_memory.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/memory_properties_helpers.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp index 886e8232f3..a08d2b60fe 100644 --- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp @@ -10,6 +10,7 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/os_context.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/helpers/hardware_context_controller.h" #include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h" @@ -22,7 +23,6 @@ #include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_gmm.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.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/command_stream/aub_file_stream_tests.cpp b/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp index d4917de6d9..e49ffc614b 100644 --- a/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/aub_mem_dump/page_table_entry_bits.h" #include "shared/source/os_interface/os_context.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/helpers/hardware_context_controller.h" @@ -20,7 +21,6 @@ #include "opencl/test/unit_test/mocks/mock_aub_manager.h" #include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" #include "test.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp index 8613710366..db1b782da0 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp @@ -20,6 +20,7 @@ #include "shared/source/os_interface/device_factory.h" #include "shared/source/utilities/tag_allocator.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/platform/platform.h" @@ -34,7 +35,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_execution_environment.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_hw_helper.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp index d124797c15..ab1bc2d769 100644 --- a/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp +++ b/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp @@ -7,12 +7,12 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/ult_hw_config.h" #include "shared/test/unit_test/helpers/variable_backup.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" #include "opencl/test/unit_test/helpers/execution_environment_helper.h" #include "opencl/test/unit_test/libult/create_command_stream.h" diff --git a/opencl/test/unit_test/command_stream/get_devices_tests.cpp b/opencl/test/unit_test/command_stream/get_devices_tests.cpp index 987d5b2530..fc6d3c0254 100644 --- a/opencl/test/unit_test/command_stream/get_devices_tests.cpp +++ b/opencl/test/unit_test/command_stream/get_devices_tests.cpp @@ -7,13 +7,13 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/ult_hw_config.h" #include "shared/test/unit_test/helpers/variable_backup.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/libult/create_command_stream.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/command_stream/linear_stream_fixture.h b/opencl/test/unit_test/command_stream/linear_stream_fixture.h index 94ad38046e..21f8b84459 100644 --- a/opencl/test/unit_test/command_stream/linear_stream_fixture.h +++ b/opencl/test/unit_test/command_stream/linear_stream_fixture.h @@ -7,8 +7,8 @@ #pragma once #include "shared/source/command_stream/linear_stream.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" #include diff --git a/opencl/test/unit_test/command_stream/linear_stream_tests.cpp b/opencl/test/unit_test/command_stream/linear_stream_tests.cpp index 6a298d072f..626a0bac70 100644 --- a/opencl/test/unit_test/command_stream/linear_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/linear_stream_tests.cpp @@ -7,9 +7,9 @@ #include "shared/source/command_stream/linear_stream.h" #include "shared/source/memory_manager/graphics_allocation.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/command_stream/linear_stream_fixture.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp b/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp index 8ecd604d51..0562e81932 100644 --- a/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp +++ b/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp @@ -8,13 +8,13 @@ #include "shared/source/command_stream/submissions_aggregator.h" #include "shared/source/helpers/flush_stamp.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #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_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp index e0b208537c..7d61a5ea2a 100644 --- a/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/tbx_command_stream_tests.cpp @@ -16,6 +16,7 @@ #include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/variable_backup.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" @@ -33,7 +34,6 @@ #include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.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/d3d_sharing/d3d9_tests.cpp b/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp index cbaafa42d8..f938d870af 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/os_interface/windows/d3d_sharing_functions.h" #include "opencl/source/sharings/d3d/cl_d3d_api.h" #include "opencl/source/sharings/d3d/d3d_surface.h" diff --git a/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp b/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp index 681d5a18f3..e244c85fcd 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/utilities/arrayref.h" #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/platform.h" #include "opencl/source/sharings/d3d/cl_d3d_api.h" #include "opencl/source/sharings/d3d/d3d_buffer.h" diff --git a/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp b/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp index e6089aaa62..4c678f01da 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp @@ -5,13 +5,13 @@ * */ +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/driver_info.h" #include "shared/source/utilities/arrayref.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/platform.h" #include "opencl/source/sharings/d3d/cl_d3d_api.h" #include "opencl/source/sharings/d3d/d3d_buffer.h" diff --git a/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp b/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp index add583a715..d741cb3516 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp @@ -5,13 +5,13 @@ * */ +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/windows/os_interface.h" #include "shared/source/utilities/arrayref.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/platform.h" #include "opencl/source/sharings/d3d/cl_d3d_api.h" #include "opencl/source/sharings/d3d/d3d_buffer.h" diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp index 1c82e269b6..abc2b084e9 100644 --- a/opencl/test/unit_test/device/device_caps_tests.cpp +++ b/opencl/test/unit_test/device/device_caps_tests.cpp @@ -6,13 +6,13 @@ */ #include "shared/source/command_stream/command_stream_receiver.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/driver_info.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/variable_backup.h" #include "shared/test/unit_test/mocks/mock_device.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/extensions.h" #include "opencl/test/unit_test/helpers/hw_helper_tests.h" #include "opencl/test/unit_test/mocks/mock_builtins.h" diff --git a/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp b/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp index d80a0f2978..7a6f3e2022 100644 --- a/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp +++ b/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp @@ -8,9 +8,9 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/hw_info.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp index 8abde72347..f33b955b5b 100644 --- a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp +++ b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp @@ -13,6 +13,7 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/hw_helper.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/os_interface.h" #include "shared/source/source_level_debugger/source_level_debugger.h" @@ -21,7 +22,6 @@ #include "shared/test/unit_test/utilities/destructor_counted.h" #include "opencl/source/cl_device/cl_device.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_async_event_handler.h" #include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" diff --git a/opencl/test/unit_test/fixtures/memory_allocator_fixture.h b/opencl/test/unit_test/fixtures/memory_allocator_fixture.h index fc20e89b66..bba7715ac0 100644 --- a/opencl/test/unit_test/fixtures/memory_allocator_fixture.h +++ b/opencl/test/unit_test/fixtures/memory_allocator_fixture.h @@ -10,9 +10,9 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/helpers/hw_helper.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/unit_test/mocks/mock_device.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" diff --git a/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h b/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h index 9b78b9791e..c83a22f8ba 100644 --- a/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h +++ b/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h @@ -13,11 +13,11 @@ #include "shared/source/helpers/cache_policy.h" #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" namespace NEO { diff --git a/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl index 0afb16bedc..aa4970c1ba 100644 --- a/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl @@ -8,12 +8,12 @@ #include "shared/source/aub_mem_dump/page_table_entry_bits.h" #include "shared/source/os_interface/os_context.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/helpers/hw_helper_tests.h" #include "opencl/test/unit_test/mocks/mock_aub_csr.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" #include "test.h" diff --git a/opencl/test/unit_test/gen12lp/dg1/hw_helper_tests_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/hw_helper_tests_dg1.cpp index 4008e4acf0..823067868c 100644 --- a/opencl/test/unit_test/gen12lp/dg1/hw_helper_tests_dg1.cpp +++ b/opencl/test/unit_test/gen12lp/dg1/hw_helper_tests_dg1.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/utilities/compiler_support.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/helpers/hw_helper_tests.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" using HwHelperTestDg1 = HwHelperTest; diff --git a/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl index a851078732..f3a6e2f5af 100644 --- a/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/tbx_command_stream_receiver_tests_gen12lp.inl @@ -6,10 +6,10 @@ */ #include "shared/source/aub_mem_dump/page_table_entry_bits.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp b/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp index f40acaf669..71343b781e 100644 --- a/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp @@ -10,6 +10,7 @@ #include "shared/source/command_stream/linear_stream.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" #include "shared/test/unit_test/helpers/dispatch_flags_helper.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/user_event.h" @@ -19,7 +20,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_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" diff --git a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp index 1380bf8c65..cd4b786c47 100644 --- a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp +++ b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp @@ -9,18 +9,18 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/device_factory.h" #include "shared/source/sku_info/operations/sku_info_transfer.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/variable_backup.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/helpers/gmm_types_converter.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/fixtures/mock_execution_environment_gmm_fixture.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_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" diff --git a/opencl/test/unit_test/helpers/dirty_state_helpers_tests.cpp b/opencl/test/unit_test/helpers/dirty_state_helpers_tests.cpp index bad16f5c48..f8827b0c16 100644 --- a/opencl/test/unit_test/helpers/dirty_state_helpers_tests.cpp +++ b/opencl/test/unit_test/helpers/dirty_state_helpers_tests.cpp @@ -9,8 +9,7 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/source/indirect_heap/indirect_heap.h" #include "shared/source/memory_manager/graphics_allocation.h" - -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp index 27310354b4..ce3ed6dae2 100644 --- a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp @@ -14,6 +14,7 @@ #include "shared/source/os_interface/os_context.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/api/api.h" @@ -24,7 +25,6 @@ #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h index 376394de96..110ed65755 100644 --- a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h +++ b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.h @@ -7,6 +7,7 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/command_container/command_encoder.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/kernel/kernel.h" @@ -14,7 +15,6 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" diff --git a/opencl/test/unit_test/helpers/memory_properties_helpers_tests.cpp b/opencl/test/unit_test/helpers/memory_properties_helpers_tests.cpp index 65b246d9fa..244aed7369 100644 --- a/opencl/test/unit_test/helpers/memory_properties_helpers_tests.cpp +++ b/opencl/test/unit_test/helpers/memory_properties_helpers_tests.cpp @@ -6,12 +6,12 @@ */ #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/mocks/ult_device_factory.h" #include "opencl/source/helpers/memory_properties_helpers.h" #include "opencl/source/mem_obj/mem_obj_helper.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "CL/cl_ext_intel.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/per_thread_data_tests.cpp b/opencl/test/unit_test/helpers/per_thread_data_tests.cpp index 318dbf2b2a..5bdea260cb 100644 --- a/opencl/test/unit_test/helpers/per_thread_data_tests.cpp +++ b/opencl/test/unit_test/helpers/per_thread_data_tests.cpp @@ -8,11 +8,11 @@ #include "shared/source/command_stream/linear_stream.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/local_id_gen.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/helpers/per_thread_data.h" #include "opencl/source/program/kernel_info.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" #include "patch_shared.h" diff --git a/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp b/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp index f913d37a39..64ee5739da 100644 --- a/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp @@ -6,12 +6,12 @@ */ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" diff --git a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp index 44ee67eb67..0cdf316f5f 100644 --- a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/helpers/memory_properties_helpers.h" #include "opencl/source/kernel/kernel.h" @@ -14,7 +15,6 @@ #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" #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_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_image.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp index 5e29eaf0c2..7ae33c6019 100644 --- a/opencl/test/unit_test/kernel/kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_tests.cpp @@ -11,9 +11,11 @@ #include "shared/source/helpers/flush_stamp.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/memory_manager/allocations_list.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/os_interface/os_context.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" #include "shared/test/unit_test/utilities/base_object_utils.h" @@ -23,7 +25,6 @@ #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" #include "opencl/test/unit_test/fixtures/execution_model_fixture.h" @@ -34,7 +35,6 @@ #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_program.h" diff --git a/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp b/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp index 77e66d7d46..f91c30bb46 100644 --- a/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp +++ b/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/memory_manager/internal_allocation_storage.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/os_context.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" diff --git a/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h b/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h index 7f449cdb90..d328527c22 100644 --- a/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h +++ b/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h @@ -7,9 +7,9 @@ #pragma once #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_experimental_command_buffer.h" namespace NEO { diff --git a/opencl/test/unit_test/libult/ult_command_stream_receiver.h b/opencl/test/unit_test/libult/ult_command_stream_receiver.h index 489d7e8ba0..95e3722a05 100644 --- a/opencl/test/unit_test/libult/ult_command_stream_receiver.h +++ b/opencl/test/unit_test/libult/ult_command_stream_receiver.h @@ -10,11 +10,11 @@ #include "shared/source/device/device.h" #include "shared/source/direct_submission/direct_submission_hw.h" #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/os_context.h" #include "shared/test/unit_test/helpers/dispatch_flags_helper.h" #include "shared/test/unit_test/helpers/ult_hw_config.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_experimental_command_buffer.h" #include diff --git a/opencl/test/unit_test/mem_obj/buffer_pin_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_pin_tests.cpp index 180894ea51..a00cae0457 100644 --- a/opencl/test/unit_test/mem_obj/buffer_pin_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_pin_tests.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" + #include "opencl/source/mem_obj/buffer.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" diff --git a/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp b/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp index 8b9d7ba5ab..b3438ec4be 100644 --- a/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp @@ -6,11 +6,11 @@ */ #include "shared/source/helpers/aligned_memory.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/helpers/memory_properties_helpers.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp index 6a1d12127e..e8f1cebf0f 100644 --- a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp @@ -12,6 +12,7 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/memory_manager/surface.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/kernel/kernel.h" @@ -21,7 +22,6 @@ #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" #include "opencl/test/unit_test/mocks/mock_gmm.h" #include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" diff --git a/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp b/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp index b184aeeb6a..28b68af2be 100644 --- a/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/helpers/hw_helper.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" @@ -14,7 +15,6 @@ #include "opencl/test/unit_test/helpers/unit_test_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_graphics_allocation.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/mem_obj/image_validate_tests.cpp b/opencl/test/unit_test/mem_obj/image_validate_tests.cpp index 236cf3419c..0089ee86c3 100644 --- a/opencl/test/unit_test/mem_obj/image_validate_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_validate_tests.cpp @@ -6,6 +6,7 @@ */ #include "shared/source/helpers/aligned_memory.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/helpers/convert_color.h" @@ -13,7 +14,6 @@ #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp index db769a831d..4f2dcef196 100644 --- a/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp +++ b/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp @@ -11,6 +11,7 @@ #include "shared/source/memory_manager/allocations_list.h" #include "shared/source/os_interface/os_context.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/helpers/memory_properties_helpers.h" #include "opencl/source/helpers/properties_helper.h" @@ -20,7 +21,6 @@ #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_deferred_deleter.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp b/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp index d685fc004e..fbddfb63bc 100644 --- a/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp +++ b/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp @@ -6,13 +6,13 @@ */ #include "shared/source/memory_manager/unified_memory_manager.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h" #include "shared/test/unit_test/test_macros/test_checks_shared.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/memory_manager/deferred_deleter_mt_tests.cpp b/opencl/test/unit_test/memory_manager/deferred_deleter_mt_tests.cpp index 5c4011750f..06173d0ac8 100644 --- a/opencl/test/unit_test/memory_manager/deferred_deleter_mt_tests.cpp +++ b/opencl/test/unit_test/memory_manager/deferred_deleter_mt_tests.cpp @@ -5,7 +5,8 @@ * */ -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" + #include "opencl/test/unit_test/mocks/mock_deferrable_deletion.h" #include "opencl/test/unit_test/mocks/mock_deferred_deleter.h" diff --git a/opencl/test/unit_test/memory_manager/graphics_allocation_tests.cpp b/opencl/test/unit_test/memory_manager/graphics_allocation_tests.cpp index 72613931b3..04d4842c8a 100644 --- a/opencl/test/unit_test/memory_manager/graphics_allocation_tests.cpp +++ b/opencl/test/unit_test/memory_manager/graphics_allocation_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp b/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp index 8cf37e3320..b4063af495 100644 --- a/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp +++ b/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp @@ -8,11 +8,11 @@ #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/os_interface/os_context.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/utilities/containers_tests_helpers.h" #include "opencl/test/unit_test/fixtures/memory_allocator_fixture.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" struct InternalAllocationStorageTest : public MemoryAllocatorFixture, diff --git a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.inl b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.inl index 87819a94c4..eb4dc3be4b 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.inl +++ b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.inl @@ -6,12 +6,12 @@ */ #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/unit_test/mocks/mock_device.h" #include "shared/test/unit_test/mocks/ult_device_factory.h" #include "opencl/source/helpers/memory_properties_helpers.h" #include "opencl/source/mem_obj/mem_obj_helper.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" diff --git a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl index e468e9995c..e27445dac2 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl +++ b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl @@ -7,13 +7,13 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" #include "test.h" diff --git a/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp index e38e8244ab..0142f4bc09 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp @@ -8,9 +8,9 @@ #include "shared/source/helpers/constants.h" #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/memory_manager/memory_manager.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/fixtures/memory_allocator_multi_device_fixture.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" using namespace NEO; 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 639b2fa975..8c26fb8da8 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -19,6 +19,7 @@ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/variable_backup.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/event/event.h" #include "opencl/source/helpers/dispatch_info.h" @@ -41,7 +42,6 @@ #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_gfx_partition.h" #include "opencl/test/unit_test/mocks/mock_gmm.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.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_memory_manager.h" diff --git a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp index bf302b6757..34237b9c25 100644 --- a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp @@ -9,6 +9,7 @@ #include "shared/source/memory_manager/allocations_list.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/mocks/ult_device_factory.h" #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" @@ -17,7 +18,6 @@ #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/mock_svm_manager.h" diff --git a/opencl/test/unit_test/mocks/CMakeLists.txt b/opencl/test/unit_test/mocks/CMakeLists.txt index 5331147c2d..6e36cdfb10 100644 --- a/opencl/test/unit_test/mocks/CMakeLists.txt +++ b/opencl/test/unit_test/mocks/CMakeLists.txt @@ -52,7 +52,6 @@ set(IGDRCL_SRCS_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_page_table_mngr.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/mock_graphics_allocation.h ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_gmm_client_context.cpp ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/mock_gmm_client_context.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_host_ptr_manager.h diff --git a/opencl/test/unit_test/mocks/mock_allocation_properties.h b/opencl/test/unit_test/mocks/mock_allocation_properties.h index 355c0d79c6..e76975d208 100644 --- a/opencl/test/unit_test/mocks/mock_allocation_properties.h +++ b/opencl/test/unit_test/mocks/mock_allocation_properties.h @@ -7,8 +7,7 @@ #pragma once #include "shared/source/memory_manager/memory_manager.h" - -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" namespace NEO { struct MockAllocationProperties : public AllocationProperties { diff --git a/opencl/test/unit_test/mocks/mock_buffer.h b/opencl/test/unit_test/mocks/mock_buffer.h index 9647829c2a..bfd64a0f6e 100644 --- a/opencl/test/unit_test/mocks/mock_buffer.h +++ b/opencl/test/unit_test/mocks/mock_buffer.h @@ -8,11 +8,11 @@ #pragma once #include "shared/source/helpers/aligned_memory.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/helpers/memory_properties_helpers.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/opencl/test/unit_test/mocks/mock_context.cpp b/opencl/test/unit_test/mocks/mock_context.cpp index 2e07120e75..1161618daf 100644 --- a/opencl/test/unit_test/mocks/mock_context.cpp +++ b/opencl/test/unit_test/mocks/mock_context.cpp @@ -10,10 +10,10 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/compiler_interface/compiler_interface.h" #include "shared/source/memory_manager/deferred_deleter.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "opencl/source/command_queue/command_queue.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/sharings/sharing.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" diff --git a/opencl/test/unit_test/mocks/mock_gmm.h b/opencl/test/unit_test/mocks/mock_gmm.h index 82d269ddc0..4c1c784a5a 100644 --- a/opencl/test/unit_test/mocks/mock_gmm.h +++ b/opencl/test/unit_test/mocks/mock_gmm.h @@ -9,11 +9,11 @@ #include "shared/source/gmm_helper/gmm.h" #include "shared/source/memory_manager/memory_manager.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_platform.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_image.h b/opencl/test/unit_test/mocks/mock_image.h index 330202a781..5c6ecebde7 100644 --- a/opencl/test/unit_test/mocks/mock_image.h +++ b/opencl/test/unit_test/mocks/mock_image.h @@ -7,8 +7,9 @@ #pragma once +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" + #include "opencl/source/mem_obj/image.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "memory_properties_flags.h" diff --git a/opencl/test/unit_test/mocks/mock_memory_manager.h b/opencl/test/unit_test/mocks/mock_memory_manager.h index f8a9918bf0..6f65066796 100644 --- a/opencl/test/unit_test/mocks/mock_memory_manager.h +++ b/opencl/test/unit_test/mocks/mock_memory_manager.h @@ -7,9 +7,9 @@ #pragma once #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/unit_test/helpers/default_hw_info.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_host_ptr_manager.h" diff --git a/opencl/test/unit_test/mocks/mock_pipe.h b/opencl/test/unit_test/mocks/mock_pipe.h index 3f81c9125d..999ed7a0b0 100644 --- a/opencl/test/unit_test/mocks/mock_pipe.h +++ b/opencl/test/unit_test/mocks/mock_pipe.h @@ -7,9 +7,9 @@ #pragma once #include "shared/source/helpers/aligned_memory.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/mem_obj/pipe.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/opencl/test/unit_test/mocks/mock_program.cpp b/opencl/test/unit_test/mocks/mock_program.cpp index f681b50e85..3ae1afe7bd 100644 --- a/opencl/test/unit_test/mocks/mock_program.cpp +++ b/opencl/test/unit_test/mocks/mock_program.cpp @@ -13,6 +13,7 @@ #include "shared/source/program/program_info_from_patchtokens.h" #include "shared/test/unit_test/helpers/default_hw_info.h" #include "shared/test/unit_test/mocks/mock_compiler_interface.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/context/context.h" #include "opencl/source/program/create.inl" @@ -20,7 +21,6 @@ #include "opencl/test/unit_test/helpers/ult_limits.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_compilers.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" namespace NEO { ClDeviceVector toClDeviceVector(ClDevice &clDevice) { diff --git a/opencl/test/unit_test/mocks/mock_sip.cpp b/opencl/test/unit_test/mocks/mock_sip.cpp index 5ff6f3a03d..23466da9fb 100644 --- a/opencl/test/unit_test/mocks/mock_sip.cpp +++ b/opencl/test/unit_test/mocks/mock_sip.cpp @@ -9,9 +9,9 @@ #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/hw_info.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/unit_test/helpers/test_files.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.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_program.h" diff --git a/opencl/test/unit_test/mocks/mock_timestamp_container.h b/opencl/test/unit_test/mocks/mock_timestamp_container.h index bdff4f785c..ad7ba3cf64 100644 --- a/opencl/test/unit_test/mocks/mock_timestamp_container.h +++ b/opencl/test/unit_test/mocks/mock_timestamp_container.h @@ -7,8 +7,7 @@ #pragma once #include "shared/source/helpers/timestamp_packet.h" - -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp b/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp index d8735a78a0..96bc2a5eaa 100644 --- a/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp +++ b/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp @@ -6,13 +6,12 @@ */ #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/linux/drm_memory_manager.h" #include "shared/source/os_interface/linux/os_interface.h" #include "shared/source/os_interface/os_interface.h" #include "shared/test/unit_test/helpers/ult_hw_config.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" - namespace NEO { std::unique_ptr MemoryManager::createMemoryManager(ExecutionEnvironment &executionEnvironment) { diff --git a/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp index b0fb742d9e..1ae131c60a 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/os_interface/linux/drm_memory_operations_handler_default.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" #include diff --git a/opencl/test/unit_test/os_interface/mock_performance_counters.h b/opencl/test/unit_test/os_interface/mock_performance_counters.h index baa01c7492..bd028c42b8 100644 --- a/opencl/test/unit_test/os_interface/mock_performance_counters.h +++ b/opencl/test/unit_test/os_interface/mock_performance_counters.h @@ -7,9 +7,9 @@ #pragma once #include "shared/source/device/device.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/test/unit_test/mocks/mock_device.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp b/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp index 122290289f..2aedff18bb 100644 --- a/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp +++ b/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp @@ -6,13 +6,12 @@ */ #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/os_interface.h" #include "shared/source/os_interface/windows/os_interface.h" #include "shared/source/os_interface/windows/wddm_memory_manager.h" #include "shared/test/unit_test/helpers/ult_hw_config.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" - namespace NEO { std::unique_ptr MemoryManager::createMemoryManager(ExecutionEnvironment &executionEnvironment) { 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 64b9404292..fe93b86ccc 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 @@ -23,6 +23,7 @@ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/dispatch_flags_helper.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/mocks/windows/mock_wddm_direct_submission.h" #include "shared/test/unit_test/os_interface/windows/mock_gdi_interface.h" @@ -39,7 +40,6 @@ #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_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_io_functions.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/mock_program.h" diff --git a/opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp b/opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp index b08999ceae..13849e931b 100644 --- a/opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/driver_info_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/windows/debug_registry_reader.h" #include "shared/source/os_interface/windows/driver_info_windows.h" #include "shared/source/os_interface/windows/os_interface.h" @@ -15,7 +16,6 @@ #include "shared/test/unit_test/helpers/variable_backup.h" #include "shared/test/unit_test/mocks/mock_device.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_csr.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" 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 a3e44607df..99c3018a2e 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp @@ -10,6 +10,7 @@ #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/hw_info.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/os_library.h" #include "shared/source/os_interface/os_time.h" #include "shared/source/os_interface/windows/driver_info_windows.h" @@ -24,7 +25,6 @@ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/variable_backup.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_gfx_partition.h" #include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" diff --git a/opencl/test/unit_test/program/block_kernel_manager_tests.cpp b/opencl/test/unit_test/program/block_kernel_manager_tests.cpp index 0bbcf788de..9e831d3afb 100644 --- a/opencl/test/unit_test/program/block_kernel_manager_tests.cpp +++ b/opencl/test/unit_test/program/block_kernel_manager_tests.cpp @@ -6,10 +6,10 @@ */ #include "shared/source/memory_manager/graphics_allocation.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/program/kernel_info.h" #include "opencl/test/unit_test/mocks/mock_block_kernel_manager.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/program/kernel_info_tests.cpp b/opencl/test/unit_test/program/kernel_info_tests.cpp index 9f5180f1bd..bf51e40b9a 100644 --- a/opencl/test/unit_test/program/kernel_info_tests.cpp +++ b/opencl/test/unit_test/program/kernel_info_tests.cpp @@ -6,14 +6,14 @@ */ #include "shared/source/execution_environment/execution_environment.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/mocks/ult_device_factory.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/program/kernel_arg_info.h" #include "opencl/source/program/kernel_info.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/program/printf_helper_tests.cpp b/opencl/test/unit_test/program/printf_helper_tests.cpp index 1bf85b001b..6c767620c8 100644 --- a/opencl/test/unit_test/program/printf_helper_tests.cpp +++ b/opencl/test/unit_test/program/printf_helper_tests.cpp @@ -9,9 +9,9 @@ #include "shared/source/helpers/string.h" #include "shared/source/program/print_formatter.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_program.h" diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp index 63a8e7881d..1d440251b5 100644 --- a/opencl/test/unit_test/program/program_tests.cpp +++ b/opencl/test/unit_test/program/program_tests.cpp @@ -26,6 +26,7 @@ #include "shared/test/unit_test/device_binary_format/zebin_tests.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/mocks/mock_compiler_interface.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/gtpin/gtpin_notify.h" @@ -38,7 +39,6 @@ #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/mock_program.h" diff --git a/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp b/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp index 6634376079..9902114d52 100644 --- a/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp +++ b/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp @@ -7,12 +7,12 @@ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/scheduler/scheduler_kernel.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_ostime.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" diff --git a/opencl/test/unit_test/sharings/sharing_tests.cpp b/opencl/test/unit_test/sharings/sharing_tests.cpp index e15df081d2..38bac9b04e 100644 --- a/opencl/test/unit_test/sharings/sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/sharing_tests.cpp @@ -5,12 +5,13 @@ * */ +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" + #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/helpers/memory_properties_helpers.h" #include "opencl/source/mem_obj/mem_obj.h" #include "opencl/source/sharings/sharing.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp index e6c20ec61f..cec85fe13b 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp @@ -9,6 +9,7 @@ #include "shared/test/unit_test/cmd_parse/hw_parse.h" #include "shared/test/unit_test/helpers/dispatch_flags_helper.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/mocks/mock_os_library.h" #include "opencl/source/command_queue/command_queue_hw.h" @@ -16,7 +17,6 @@ #include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_csr.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_source_level_debugger.h" #include "test.h" diff --git a/opencl/test/unit_test/utilities/tag_allocator_tests.cpp b/opencl/test/unit_test/utilities/tag_allocator_tests.cpp index 4da1ee3cea..1811cdd170 100644 --- a/opencl/test/unit_test/utilities/tag_allocator_tests.cpp +++ b/opencl/test/unit_test/utilities/tag_allocator_tests.cpp @@ -8,10 +8,10 @@ #include "shared/source/helpers/timestamp_packet.h" #include "shared/source/utilities/tag_allocator.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/mocks/ult_device_factory.h" #include "opencl/test/unit_test/fixtures/memory_allocator_fixture.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" #include "gtest/gtest.h" diff --git a/shared/source/execution_environment/execution_environment.cpp b/shared/source/execution_environment/execution_environment.cpp index 3acbe1278e..bba5eb1343 100644 --- a/shared/source/execution_environment/execution_environment.cpp +++ b/shared/source/execution_environment/execution_environment.cpp @@ -10,10 +10,9 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/memory_manager/memory_manager.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/os_interface/os_environment.h" -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" - namespace NEO { ExecutionEnvironment::ExecutionEnvironment() = default; diff --git a/shared/source/memory_manager/CMakeLists.txt b/shared/source/memory_manager/CMakeLists.txt index fc79a4688f..5b9c1fe5f2 100644 --- a/shared/source/memory_manager/CMakeLists.txt +++ b/shared/source/memory_manager/CMakeLists.txt @@ -41,6 +41,9 @@ set(NEO_CORE_MEMORY_MANAGER ${CMAKE_CURRENT_SOURCE_DIR}/memory_pool.h ${CMAKE_CURRENT_SOURCE_DIR}/multi_graphics_allocation.cpp ${CMAKE_CURRENT_SOURCE_DIR}/multi_graphics_allocation.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_agnostic_memory_manager.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_agnostic_memory_manager.h + ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/os_agnostic_memory_manager_allocate_in_device_pool.cpp ${CMAKE_CURRENT_SOURCE_DIR}/physical_address_allocator.h ${CMAKE_CURRENT_SOURCE_DIR}/residency.cpp ${CMAKE_CURRENT_SOURCE_DIR}/residency.h diff --git a/opencl/source/memory_manager/os_agnostic_memory_manager.cpp b/shared/source/memory_manager/os_agnostic_memory_manager.cpp similarity index 99% rename from opencl/source/memory_manager/os_agnostic_memory_manager.cpp rename to shared/source/memory_manager/os_agnostic_memory_manager.cpp index d79269bcd9..92f40b258b 100644 --- a/opencl/source/memory_manager/os_agnostic_memory_manager.cpp +++ b/shared/source/memory_manager/os_agnostic_memory_manager.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" #include "shared/source/aub/aub_center.h" #include "shared/source/execution_environment/execution_environment.h" @@ -19,12 +19,11 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/ptr_math.h" +#include "shared/source/helpers/surface_format_info.h" #include "shared/source/memory_manager/host_ptr_manager.h" #include "shared/source/memory_manager/residency.h" #include "shared/source/os_interface/os_memory.h" -#include "opencl/source/helpers/surface_formats.h" - #include namespace NEO { diff --git a/opencl/source/memory_manager/os_agnostic_memory_manager.h b/shared/source/memory_manager/os_agnostic_memory_manager.h similarity index 100% rename from opencl/source/memory_manager/os_agnostic_memory_manager.h rename to shared/source/memory_manager/os_agnostic_memory_manager.h diff --git a/opencl/source/memory_manager/os_agnostic_memory_manager_allocate_in_device_pool.cpp b/shared/source/memory_manager/os_agnostic_memory_manager_allocate_in_device_pool.cpp similarity index 96% rename from opencl/source/memory_manager/os_agnostic_memory_manager_allocate_in_device_pool.cpp rename to shared/source/memory_manager/os_agnostic_memory_manager_allocate_in_device_pool.cpp index a61c89ba5c..6e3550a3a3 100644 --- a/opencl/source/memory_manager/os_agnostic_memory_manager_allocate_in_device_pool.cpp +++ b/shared/source/memory_manager/os_agnostic_memory_manager_allocate_in_device_pool.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" namespace NEO { GraphicsAllocation *OsAgnosticMemoryManager::allocateGraphicsMemoryInDevicePool(const AllocationData &allocationData, AllocationStatus &status) { diff --git a/shared/test/unit_test/command_container/command_container_tests.cpp b/shared/test/unit_test/command_container/command_container_tests.cpp index 20df760d95..5ddc1ab1a7 100644 --- a/shared/test/unit_test/command_container/command_container_tests.cpp +++ b/shared/test/unit_test/command_container/command_container_tests.cpp @@ -7,8 +7,8 @@ #include "shared/source/command_container/cmdcontainer.h" #include "shared/test/unit_test/fixtures/device_fixture.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" using namespace NEO; diff --git a/shared/test/unit_test/compiler_interface/linker_tests.cpp b/shared/test/unit_test/compiler_interface/linker_tests.cpp index e9e0f265ea..74932e1c9f 100644 --- a/shared/test/unit_test/compiler_interface/linker_tests.cpp +++ b/shared/test/unit_test/compiler_interface/linker_tests.cpp @@ -10,9 +10,9 @@ #include "shared/source/program/program_initialization.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/default_hw_info.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_svm_manager.h" #include "RelocationInfo.h" diff --git a/shared/test/unit_test/encoders/test_encode_mi_flush_dw.cpp b/shared/test/unit_test/encoders/test_encode_mi_flush_dw.cpp index 813e4fde31..1e0071895f 100644 --- a/shared/test/unit_test/encoders/test_encode_mi_flush_dw.cpp +++ b/shared/test/unit_test/encoders/test_encode_mi_flush_dw.cpp @@ -9,8 +9,8 @@ #include "shared/source/command_stream/linear_stream.h" #include "shared/source/helpers/blit_commands_helper.h" #include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" using namespace NEO; diff --git a/shared/test/unit_test/gen9/test_preemption_gen9.cpp b/shared/test/unit_test/gen9/test_preemption_gen9.cpp index 46dd7329c4..8fe4020cf4 100644 --- a/shared/test/unit_test/gen9/test_preemption_gen9.cpp +++ b/shared/test/unit_test/gen9/test_preemption_gen9.cpp @@ -12,8 +12,7 @@ #include "shared/test/unit_test/fixtures/preemption_fixture.h" #include "shared/test/unit_test/mocks/mock_command_stream_receiver.h" #include "shared/test/unit_test/mocks/mock_device.h" - -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/shared/test/unit_test/helpers/bindless_heaps_helper_tests.cpp b/shared/test/unit_test/helpers/bindless_heaps_helper_tests.cpp index 95656e6ac7..b572fbfa1d 100644 --- a/shared/test/unit_test/helpers/bindless_heaps_helper_tests.cpp +++ b/shared/test/unit_test/helpers/bindless_heaps_helper_tests.cpp @@ -9,9 +9,9 @@ #include "shared/test/unit_test/fixtures/front_window_fixture.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/mocks/ult_device_factory.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" using namespace NEO; diff --git a/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp b/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp index 90b5fd6ce8..f3fc97e9f1 100644 --- a/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp +++ b/shared/test/unit_test/helpers/blit_commands_helper_tests.cpp @@ -10,8 +10,7 @@ #include "shared/source/helpers/blit_commands_helper.h" #include "shared/test/unit_test/fixtures/device_fixture.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" - -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/helpers/blit_commands_helper_tests.inl b/shared/test/unit_test/helpers/blit_commands_helper_tests.inl index be11254912..d137b3832f 100644 --- a/shared/test/unit_test/helpers/blit_commands_helper_tests.inl +++ b/shared/test/unit_test/helpers/blit_commands_helper_tests.inl @@ -8,8 +8,8 @@ #include "shared/source/helpers/blit_commands_helper.h" #include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h" #include "shared/test/unit_test/fixtures/device_fixture.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" using namespace NEO; diff --git a/shared/test/unit_test/helpers/blit_commands_helper_tests_gen12lp.cpp b/shared/test/unit_test/helpers/blit_commands_helper_tests_gen12lp.cpp index 551c788d02..c98e893abd 100644 --- a/shared/test/unit_test/helpers/blit_commands_helper_tests_gen12lp.cpp +++ b/shared/test/unit_test/helpers/blit_commands_helper_tests_gen12lp.cpp @@ -9,9 +9,9 @@ #include "shared/test/unit_test/fixtures/device_fixture.h" #include "shared/test/unit_test/helpers/blit_commands_helper_tests.inl" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_gmm.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/helpers/state_base_address_tests.h b/shared/test/unit_test/helpers/state_base_address_tests.h index 5f27d7834b..2af4e32a26 100644 --- a/shared/test/unit_test/helpers/state_base_address_tests.h +++ b/shared/test/unit_test/helpers/state_base_address_tests.h @@ -10,8 +10,8 @@ #include "shared/source/indirect_heap/indirect_heap.h" #include "shared/test/unit_test/fixtures/device_fixture.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" struct SBATest : public NEO::DeviceFixture, public ::testing::Test { diff --git a/shared/test/unit_test/mocks/CMakeLists.txt b/shared/test/unit_test/mocks/CMakeLists.txt index 9b6f53b4bf..a206b4093f 100644 --- a/shared/test/unit_test/mocks/CMakeLists.txt +++ b/shared/test/unit_test/mocks/CMakeLists.txt @@ -14,6 +14,7 @@ set(NEO_CORE_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/mock_dispatch_kernel_encoder_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_device.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_device.h + ${CMAKE_CURRENT_SOURCE_DIR}/mock_graphics_allocation.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_library.h ${CMAKE_CURRENT_SOURCE_DIR}/ult_device_factory.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ult_device_factory.h diff --git a/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h b/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h index d13795365b..7adeae54c3 100644 --- a/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h +++ b/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h @@ -8,8 +8,7 @@ #pragma once #include "shared/source/kernel/dispatch_kernel_encoder_interface.h" #include "shared/source/kernel/kernel_descriptor.h" - -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/mocks/mock_graphics_allocation.h b/shared/test/unit_test/mocks/mock_graphics_allocation.h similarity index 97% rename from opencl/test/unit_test/mocks/mock_graphics_allocation.h rename to shared/test/unit_test/mocks/mock_graphics_allocation.h index 3d38bdf9b6..6cafe20cd8 100644 --- a/opencl/test/unit_test/mocks/mock_graphics_allocation.h +++ b/shared/test/unit_test/mocks/mock_graphics_allocation.h @@ -8,8 +8,7 @@ #pragma once #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/memory_manager/multi_graphics_allocation.h" - -#include "opencl/source/memory_manager/os_agnostic_memory_manager.h" +#include "shared/source/memory_manager/os_agnostic_memory_manager.h" namespace NEO { diff --git a/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.h b/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.h index e8da7eada5..34b4145485 100644 --- a/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.h +++ b/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.h @@ -11,8 +11,7 @@ #include "shared/source/os_interface/aub_memory_operations_handler.h" #include "shared/source/os_interface/device_factory.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" - -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests.cpp b/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests.cpp index ee057ec239..2c61f9d570 100644 --- a/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests.cpp +++ b/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests.cpp @@ -8,10 +8,10 @@ #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/unified_memory/unified_memory.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h" #include "shared/test/unit_test/test_macros/test_checks_shared.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" using namespace NEO; diff --git a/shared/test/unit_test/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp b/shared/test/unit_test/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp index 4059af006a..33fea5912e 100644 --- a/shared/test/unit_test/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp +++ b/shared/test/unit_test/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp @@ -8,10 +8,10 @@ #include "shared/source/page_fault_manager/linux/cpu_page_fault_manager_linux.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h" #include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_memory_operations_handler.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/preamble/preamble_tests.cpp b/shared/test/unit_test/preamble/preamble_tests.cpp index 58013b3de3..89a4bbd61b 100644 --- a/shared/test/unit_test/preamble/preamble_tests.cpp +++ b/shared/test/unit_test/preamble/preamble_tests.cpp @@ -14,8 +14,8 @@ #include "shared/test/unit_test/cmd_parse/hw_parse.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" #include diff --git a/shared/test/unit_test/preemption/preemption_tests.cpp b/shared/test/unit_test/preemption/preemption_tests.cpp index ec4c2f836b..3484d45c91 100644 --- a/shared/test/unit_test/preemption/preemption_tests.cpp +++ b/shared/test/unit_test/preemption/preemption_tests.cpp @@ -12,12 +12,12 @@ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/test/unit_test/helpers/dispatch_flags_helper.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" #include "opencl/test/unit_test/mocks/mock_builtins.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h b/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h index ca74925e01..57db5d4956 100644 --- a/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h +++ b/shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h @@ -11,8 +11,8 @@ #include "shared/source/helpers/preamble.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" #include "shared/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_graphics_allocation.h" -#include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" #include