diff --git a/level_zero/cmake/l0_tests.cmake b/level_zero/cmake/l0_tests.cmake index a59a883bea..cfa3862147 100644 --- a/level_zero/cmake/l0_tests.cmake +++ b/level_zero/cmake/l0_tests.cmake @@ -80,7 +80,6 @@ add_library(compute_runtime_mockable_extra ${CMAKE_CURRENT_LIST_DIR}/l0_tests.cmake ${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp ${COMPUTE_RUNTIME_DIR}/opencl/source/aub/aub_stream_interface.cpp - ${COMPUTE_RUNTIME_DIR}/shared/source/debug_settings/debug_settings_manager.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/abort.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/helpers/built_ins_helper.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/helpers/debug_helpers.cpp @@ -89,19 +88,20 @@ add_library(compute_runtime_mockable_extra ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/source_level_debugger_ult.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/source_level_debugger_library.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks/mock_cif.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks/mock_csr.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks/mock_compilers.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks/mock_device.cpp + ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks/mock_csr.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp + ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/create_tbx_sockets.cpp + ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks/mock_deferred_deleter.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks${BRANCH_SUFIX_DIR}/mock_gmm_client_context.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks/mock_gmm_client_context_base.cpp + ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks/mock_memory_manager.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks/mock_program.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks/mock_sip.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/create_tbx_sockets.cpp - ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/mocks/mock_deferred_deleter.cpp + ${COMPUTE_RUNTIME_DIR}/shared/source/debug_settings/debug_settings_manager.cpp + ${COMPUTE_RUNTIME_DIR}/shared/test/unit_test/mocks/mock_device.cpp ) set_property(TARGET compute_runtime_mockable_extra APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) diff --git a/level_zero/core/test/unit_tests/fixtures/device_fixture.h b/level_zero/core/test/unit_tests/fixtures/device_fixture.h index 6a231f550b..804f2cc847 100644 --- a/level_zero/core/test/unit_tests/fixtures/device_fixture.h +++ b/level_zero/core/test/unit_tests/fixtures/device_fixture.h @@ -8,8 +8,7 @@ #pragma once #include "shared/test/unit_test/helpers/default_hw_info.h" - -#include "opencl/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "level_zero/core/test/unit_tests/mocks/mock_device.h" diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_debugger.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_debugger.cpp index 202cc4fd74..be7f725705 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_debugger.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_debugger.cpp @@ -9,9 +9,9 @@ #include "shared/source/gen_common/reg_configs/reg_configs_common.h" #include "shared/source/helpers/preamble.h" #include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "shared/test/unit_test/mocks/mock_os_library.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_source_level_debugger.h" #include "test.h" diff --git a/level_zero/core/test/unit_tests/sources/device/test_device.cpp b/level_zero/core/test/unit_tests/sources/device/test_device.cpp index ac50c65a19..e23d75a56a 100644 --- a/level_zero/core/test/unit_tests/sources/device/test_device.cpp +++ b/level_zero/core/test/unit_tests/sources/device/test_device.cpp @@ -6,8 +6,7 @@ */ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" - -#include "opencl/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "level_zero/core/test/unit_tests/mocks/mock_driver_handle.h" diff --git a/level_zero/core/test/unit_tests/sources/image/test_image.cpp b/level_zero/core/test/unit_tests/sources/image/test_image.cpp index 21a98365db..38d5fcd017 100644 --- a/level_zero/core/test/unit_tests/sources/image/test_image.cpp +++ b/level_zero/core/test/unit_tests/sources/image/test_image.cpp @@ -6,8 +6,8 @@ */ #include "shared/test/unit_test/helpers/default_hw_info.h" +#include "shared/test/unit_test/mocks/mock_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" #include "level_zero/core/source/image/image_hw.h" diff --git a/opencl/test/unit_test/api/cl_api_tests.cpp b/opencl/test/unit_test/api/cl_api_tests.cpp index 674ecbf90a..40ff7b6001 100644 --- a/opencl/test/unit_test/api/cl_api_tests.cpp +++ b/opencl/test/unit_test/api/cl_api_tests.cpp @@ -7,10 +7,11 @@ #include "cl_api_tests.h" +#include "shared/test/unit_test/mocks/mock_device.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_device.h" namespace NEO { diff --git a/opencl/test/unit_test/api/cl_create_buffer_tests.cpp b/opencl/test/unit_test/api/cl_create_buffer_tests.cpp index 9c5b957247..4401e55753 100644 --- a/opencl/test/unit_test/api/cl_create_buffer_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_buffer_tests.cpp @@ -5,11 +5,12 @@ * */ +#include "shared/test/unit_test/mocks/mock_device.h" + #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.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/api/cl_create_command_queue_tests.inl b/opencl/test/unit_test/api/cl_create_command_queue_tests.inl index ad094e5368..e7ba97c44d 100644 --- a/opencl/test/unit_test/api/cl_create_command_queue_tests.inl +++ b/opencl/test/unit_test/api/cl_create_command_queue_tests.inl @@ -7,10 +7,10 @@ #include "shared/source/device/device.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp b/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp index 7662c38f52..990225fc0a 100644 --- a/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp @@ -10,13 +10,13 @@ #include "shared/source/os_interface/os_context.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/command_queue/command_queue.h" #include "opencl/source/device_queue/device_queue.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #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_device.h" #include "CL/cl_ext.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_create_image_tests.cpp b/opencl/test/unit_test/api/cl_create_image_tests.cpp index 467af7a9e4..06d3fa4b85 100644 --- a/opencl/test/unit_test/api/cl_create_image_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_image_tests.cpp @@ -6,11 +6,11 @@ */ #include "shared/source/helpers/hw_info.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl index 1d91495d4a..90e9b341c6 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl @@ -6,12 +6,12 @@ */ #include "shared/source/device/device.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl index 0777738c7b..db44a9f6db 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl @@ -6,11 +6,11 @@ */ #include "shared/source/device/device.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl index 165f7f190c..de43ac3af2 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl @@ -6,11 +6,11 @@ */ #include "shared/source/device/device.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl index a74a58fda5..11c5ca2202 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl @@ -6,11 +6,11 @@ */ #include "shared/source/device/device.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp b/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp index 7026426d14..9121b674dc 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp +++ b/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp @@ -8,12 +8,12 @@ #include "shared/source/device/device.h" #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/memory_manager/unified_memory_manager.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/user_event.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_device.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl index 585f1b878d..3d8bea9975 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl @@ -6,11 +6,11 @@ */ #include "shared/source/device/device.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_get_image_info_tests.inl b/opencl/test/unit_test/api/cl_get_image_info_tests.inl index 654a159bd3..efb6d39779 100644 --- a/opencl/test/unit_test/api/cl_get_image_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_image_info_tests.inl @@ -6,10 +6,10 @@ */ #include "shared/source/helpers/hw_info.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/context/context.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_get_image_params_tests.inl b/opencl/test/unit_test/api/cl_get_image_params_tests.inl index 460b9a2091..f28853fffc 100644 --- a/opencl/test/unit_test/api/cl_get_image_params_tests.inl +++ b/opencl/test/unit_test/api/cl_get_image_params_tests.inl @@ -6,9 +6,9 @@ */ #include "shared/source/helpers/hw_info.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/context/context.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_get_supported_image_formats_tests.inl b/opencl/test/unit_test/api/cl_get_supported_image_formats_tests.inl index af4cdcea71..199a3c32a4 100644 --- a/opencl/test/unit_test/api/cl_get_supported_image_formats_tests.inl +++ b/opencl/test/unit_test/api/cl_get_supported_image_formats_tests.inl @@ -6,11 +6,11 @@ */ #include "shared/source/device/device.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/gl/cl_get_gl_context_info_khr_tests.cpp b/opencl/test/unit_test/api/gl/cl_get_gl_context_info_khr_tests.cpp index 560aa295da..efd70cec81 100644 --- a/opencl/test/unit_test/api/gl/cl_get_gl_context_info_khr_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_get_gl_context_info_khr_tests.cpp @@ -7,10 +7,10 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/device_factory.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/api/cl_api_tests.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/sharings/gl/gl_dll_helper.h" diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp index 6510edb265..f0d43c0fb7 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.cpp @@ -13,11 +13,11 @@ #include "shared/source/os_interface/os_context.h" #include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h" #include "shared/test/unit_test/helpers/memory_management.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "shared/test/unit_test/tests_configuration.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/command_stream/tbx_command_stream_receiver.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h index 85641a63aa..445b0dcd1e 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h @@ -8,6 +8,7 @@ #pragma once #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "shared/test/unit_test/tests_configuration.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" @@ -18,7 +19,6 @@ #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp index 266a2afe81..08e43a65c4 100644 --- a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp +++ b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp @@ -10,6 +10,7 @@ #include "shared/source/memory_manager/graphics_allocation.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_device.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/event.h" @@ -19,7 +20,6 @@ #include "opencl/test/unit_test/aub_tests/fixtures/hello_world_fixture.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" using Gen12LPAubBatchBufferTests = Test; diff --git a/opencl/test/unit_test/built_ins/sip_tests.cpp b/opencl/test/unit_test/built_ins/sip_tests.cpp index 2c7727de72..a637f69e67 100644 --- a/opencl/test/unit_test/built_ins/sip_tests.cpp +++ b/opencl/test/unit_test/built_ins/sip_tests.cpp @@ -7,10 +7,10 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/built_ins/sip.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/global_environment.h" #include "opencl/test/unit_test/helpers/test_files.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "test.h" diff --git a/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp b/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp index 6d6d6f06fe..68b2c168e4 100644 --- a/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp +++ b/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/helpers/vec.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_device.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/event/user_event.h" @@ -15,7 +16,6 @@ #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_device.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_timestamp_container.h" #include "test.h" diff --git a/opencl/test/unit_test/command_queue/command_queue_fixture.cpp b/opencl/test/unit_test/command_queue/command_queue_fixture.cpp index fc0d18951c..bb09a4ee14 100644 --- a/opencl/test/unit_test/command_queue/command_queue_fixture.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_fixture.cpp @@ -8,12 +8,12 @@ #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "shared/source/device/device.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/context/context.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_device.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/command_queue/local_work_size_tests.cpp b/opencl/test/unit_test/command_queue/local_work_size_tests.cpp index 4db0c8011e..e9e9234de6 100644 --- a/opencl/test/unit_test/command_queue/local_work_size_tests.cpp +++ b/opencl/test/unit_test/command_queue/local_work_size_tests.cpp @@ -6,10 +6,10 @@ */ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp index 61b0c64a38..112ea0b71b 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/memory_manager/memory_manager.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/mem_obj/buffer.h" @@ -18,7 +19,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_device.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" diff --git a/opencl/test/unit_test/command_stream/compute_mode_tests.h b/opencl/test/unit_test/command_stream/compute_mode_tests.h index 24334dddc2..6e2e6a7f1d 100644 --- a/opencl/test/unit_test/command_stream/compute_mode_tests.h +++ b/opencl/test/unit_test/command_stream/compute_mode_tests.h @@ -9,9 +9,9 @@ #include "shared/source/command_stream/command_stream_receiver_hw.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.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 f13074d336..e0cdbc7c67 100644 --- a/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp +++ b/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp @@ -7,13 +7,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 "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_device.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_fixture.cpp b/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp index 7cff0450f8..0622fbcc7e 100644 --- a/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp +++ b/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp @@ -10,9 +10,9 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/device/device.h" #include "shared/test/unit_test/cmd_parse/gen_cmd_parse.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/command_queue/command_queue.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/context/context_tests.cpp b/opencl/test/unit_test/context/context_tests.cpp index 6cf6662c4a..62941684c9 100644 --- a/opencl/test/unit_test/context/context_tests.cpp +++ b/opencl/test/unit_test/context/context_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/device/device.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/command_queue/command_queue.h" #include "opencl/source/context/context.inl" @@ -18,7 +19,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_deferred_deleter.h" -#include "opencl/test/unit_test/mocks/mock_device.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/context/driver_diagnostics_tests.h b/opencl/test/unit_test/context/driver_diagnostics_tests.h index d77c5e8adb..9a6761ce7c 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_tests.h +++ b/opencl/test/unit_test/context/driver_diagnostics_tests.h @@ -7,6 +7,7 @@ #pragma once #include "shared/source/helpers/aligned_memory.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/context/context.h" @@ -17,7 +18,6 @@ #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "opencl/test/unit_test/fixtures/program_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp b/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp index 68d7d1531e..a6bae5f27e 100644 --- a/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp +++ b/opencl/test/unit_test/context/get_supported_image_formats_tests.cpp @@ -5,13 +5,14 @@ * */ +#include "shared/test/unit_test/mocks/mock_device.h" + #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" #include "opencl/test/unit_test/fixtures/platform_fixture.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_device.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp index 3a72d8191c..ea99ada48f 100644 --- a/opencl/test/unit_test/device/device_caps_tests.cpp +++ b/opencl/test/unit_test/device/device_caps_tests.cpp @@ -10,11 +10,11 @@ #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/test/unit_test/helpers/hw_helper_tests.h" #include "opencl/test/unit_test/mocks/mock_builtins.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "driver_version.h" diff --git a/opencl/test/unit_test/device/device_get_engine_tests.cpp b/opencl/test/unit_test/device/device_get_engine_tests.cpp index 72b266fcb5..daf521273a 100644 --- a/opencl/test/unit_test/device/device_get_engine_tests.cpp +++ b/opencl/test/unit_test/device/device_get_engine_tests.cpp @@ -9,8 +9,7 @@ #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/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/device/sub_device_tests.cpp b/opencl/test/unit_test/device/sub_device_tests.cpp index de2a61b86a..bc1078d9ef 100644 --- a/opencl/test/unit_test/device/sub_device_tests.cpp +++ b/opencl/test/unit_test/device/sub_device_tests.cpp @@ -10,9 +10,9 @@ #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 "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/cl_device/cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.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/device_queue/device_queue_hw_tests.cpp b/opencl/test/unit_test/device_queue/device_queue_hw_tests.cpp index 2141170bbe..51f2d72382 100644 --- a/opencl/test/unit_test/device_queue/device_queue_hw_tests.cpp +++ b/opencl/test/unit_test/device_queue/device_queue_hw_tests.cpp @@ -9,13 +9,13 @@ #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_device.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" #include "opencl/test/unit_test/fixtures/execution_model_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_device_queue.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" diff --git a/opencl/test/unit_test/event/event_builder_tests.cpp b/opencl/test/unit_test/event/event_builder_tests.cpp index dc4e7ae875..2796348967 100644 --- a/opencl/test/unit_test/event/event_builder_tests.cpp +++ b/opencl/test/unit_test/event/event_builder_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/utilities/arrayref.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/event/event_builder.h" #include "opencl/source/event/user_event.h" @@ -15,7 +16,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_device.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" diff --git a/opencl/test/unit_test/event/event_tests.cpp b/opencl/test/unit_test/event/event_tests.cpp index 602194b3cd..e9679565e9 100644 --- a/opencl/test/unit_test/event/event_tests.cpp +++ b/opencl/test/unit_test/event/event_tests.cpp @@ -11,6 +11,7 @@ #include "shared/source/os_interface/os_interface.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_device.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/perf_counter.h" @@ -21,7 +22,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_device.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.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 c6ea8d5ae6..34a2ee0c2e 100644 --- a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp +++ b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp @@ -16,6 +16,7 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/source/source_level_debugger/source_level_debugger.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/utilities/destructor_counted.h" #include "opencl/source/aub/aub_center.h" @@ -23,7 +24,6 @@ #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_device.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_memory_operations_handler.h" diff --git a/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h b/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h index 6010a31f4d..7c5baf29a2 100644 --- a/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h +++ b/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h @@ -9,12 +9,12 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/helpers/execution_environment_helper.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_csr.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" diff --git a/opencl/test/unit_test/fixtures/device_fixture.h b/opencl/test/unit_test/fixtures/device_fixture.h index b0569669f7..0b8f41c295 100644 --- a/opencl/test/unit_test/fixtures/device_fixture.h +++ b/opencl/test/unit_test/fixtures/device_fixture.h @@ -6,8 +6,9 @@ */ #pragma once +#include "shared/test/unit_test/mocks/mock_device.h" + #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" namespace NEO { struct HardwareInfo; diff --git a/opencl/test/unit_test/fixtures/device_info_fixture.h b/opencl/test/unit_test/fixtures/device_info_fixture.h index a6b66a75ed..efdf40cd35 100644 --- a/opencl/test/unit_test/fixtures/device_info_fixture.h +++ b/opencl/test/unit_test/fixtures/device_info_fixture.h @@ -6,8 +6,9 @@ */ #pragma once +#include "shared/test/unit_test/mocks/mock_device.h" + #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp b/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp index 01b5d36ff6..1af3424bd1 100644 --- a/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp +++ b/opencl/test/unit_test/fixtures/device_instrumentation_fixture.cpp @@ -7,9 +7,10 @@ #include "opencl/test/unit_test/fixtures/device_instrumentation_fixture.h" +#include "shared/test/unit_test/mocks/mock_device.h" + #include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/helpers/execution_environment_helper.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_platform.h" namespace NEO { diff --git a/opencl/test/unit_test/fixtures/dispatch_flags_fixture.h b/opencl/test/unit_test/fixtures/dispatch_flags_fixture.h index 0a8280bf75..7cffdd5d09 100644 --- a/opencl/test/unit_test/fixtures/dispatch_flags_fixture.h +++ b/opencl/test/unit_test/fixtures/dispatch_flags_fixture.h @@ -8,11 +8,11 @@ #pragma once #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_device.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_csr.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" namespace NEO { diff --git a/opencl/test/unit_test/fixtures/memory_allocator_fixture.h b/opencl/test/unit_test/fixtures/memory_allocator_fixture.h index 41266163af..6fc6c9a43a 100644 --- a/opencl/test/unit_test/fixtures/memory_allocator_fixture.h +++ b/opencl/test/unit_test/fixtures/memory_allocator_fixture.h @@ -10,10 +10,10 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/helpers/hw_helper.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_device.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" using namespace NEO; diff --git a/opencl/test/unit_test/fixtures/multi_root_device_fixture.h b/opencl/test/unit_test/fixtures/multi_root_device_fixture.h index 41a4ea07cd..05d33baf5e 100644 --- a/opencl/test/unit_test/fixtures/multi_root_device_fixture.h +++ b/opencl/test/unit_test/fixtures/multi_root_device_fixture.h @@ -7,10 +7,10 @@ #pragma once #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_device.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_device.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" namespace NEO { diff --git a/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp b/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp index c37db19d82..8587fefcaf 100644 --- a/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp @@ -9,10 +9,10 @@ #include "shared/source/gen11/reg_configs.h" #include "shared/source/helpers/hw_helper.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp index 6a4b6a9538..60a715ddea 100644 --- a/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/test_program_media_sampler_icllp.cpp @@ -10,9 +10,9 @@ #include "shared/source/helpers/hw_helper.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_device.h" #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl index 69e6c5c755..6c417f6dc6 100644 --- a/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl @@ -9,10 +9,10 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/ptr_math.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/gen12lp/helpers_gen12lp.h" #include "opencl/source/helpers/hardware_commands_helper.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/device_queue_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/device_queue_tests_gen12lp.cpp index 68993d3fc1..daa2024317 100644 --- a/opencl/test/unit_test/gen12lp/device_queue_tests_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/device_queue_tests_gen12lp.cpp @@ -5,9 +5,10 @@ * */ +#include "shared/test/unit_test/mocks/mock_device.h" + #include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_device_queue.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" diff --git a/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp index 186f6ffb43..e30d7938d4 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/kernel_tests_tgllp.cpp @@ -5,9 +5,10 @@ * */ +#include "shared/test/unit_test/mocks/mock_device.h" + #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" diff --git a/opencl/test/unit_test/gen8/bdw/device_tests_bdw.cpp b/opencl/test/unit_test/gen8/bdw/device_tests_bdw.cpp index ef9db08912..20f4bf3f60 100644 --- a/opencl/test/unit_test/gen8/bdw/device_tests_bdw.cpp +++ b/opencl/test/unit_test/gen8/bdw/device_tests_bdw.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/unit_test/mocks/mock_device.h" + #include "opencl/test/unit_test/fixtures/device_fixture.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_source_level_debugger.h" #include "test.h" diff --git a/opencl/test/unit_test/gen9/sip_tests_gen9.cpp b/opencl/test/unit_test/gen9/sip_tests_gen9.cpp index 3389c239f0..0442336779 100644 --- a/opencl/test/unit_test/gen9/sip_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/sip_tests_gen9.cpp @@ -7,10 +7,10 @@ #include "shared/source/built_ins/built_ins.h" #include "shared/source/built_ins/sip.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/global_environment.h" #include "opencl/test/unit_test/helpers/test_files.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp b/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp index e0bf516976..e479edeceb 100644 --- a/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp +++ b/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp @@ -6,9 +6,9 @@ */ #include "shared/source/helpers/hw_cmds.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/helpers/hardware_commands_helper.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" using namespace NEO; 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 3e38d9aff9..2436c3c8e4 100644 --- a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp +++ b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp @@ -13,12 +13,12 @@ #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 "opencl/source/helpers/gmm_types_converter.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_device.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" diff --git a/opencl/test/unit_test/gtpin/gtpin_tests.cpp b/opencl/test/unit_test/gtpin/gtpin_tests.cpp index 8517b9a449..635cd6e1c4 100644 --- a/opencl/test/unit_test/gtpin/gtpin_tests.cpp +++ b/opencl/test/unit_test/gtpin/gtpin_tests.cpp @@ -14,6 +14,7 @@ #include "shared/source/os_interface/os_context.h" #include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "shared/test/unit_test/helpers/variable_backup.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/api/api.h" #include "opencl/source/context/context.h" @@ -33,7 +34,6 @@ #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_context.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/program/program_tests.h" diff --git a/opencl/test/unit_test/helpers/kmd_notify_tests.cpp b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp index a8bd040f2e..0a10c23d6c 100644 --- a/opencl/test/unit_test/helpers/kmd_notify_tests.cpp +++ b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp @@ -7,12 +7,12 @@ #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_device.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_context.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp b/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp index 3078f4f382..0e7942c3a0 100644 --- a/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp +++ b/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp @@ -9,6 +9,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_device.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/command_queue/gpgpu_walker.h" @@ -21,7 +22,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_device.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "opencl/test/unit_test/mocks/mock_mdi.h" diff --git a/opencl/test/unit_test/kernel/debug_kernel_tests.cpp b/opencl/test/unit_test/kernel/debug_kernel_tests.cpp index 875448ed4e..0c921ee117 100644 --- a/opencl/test/unit_test/kernel/debug_kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/debug_kernel_tests.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/unit_test/mocks/mock_device.h" + #include "opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h" -#include "opencl/test/unit_test/mocks/mock_device.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/kernel/kernel_is_patched_tests.cpp b/opencl/test/unit_test/kernel/kernel_is_patched_tests.cpp index 187dbf6595..a46beed893 100644 --- a/opencl/test/unit_test/kernel/kernel_is_patched_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_is_patched_tests.cpp @@ -5,9 +5,10 @@ * */ +#include "shared/test/unit_test/mocks/mock_device.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_device.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/kernel/parent_kernel_tests.cpp b/opencl/test/unit_test/kernel/parent_kernel_tests.cpp index 8bfe9cbd53..ba84c1718f 100644 --- a/opencl/test/unit_test/kernel/parent_kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/parent_kernel_tests.cpp @@ -5,8 +5,9 @@ * */ +#include "shared/test/unit_test/mocks/mock_device.h" + #include "opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h" -#include "opencl/test/unit_test/mocks/mock_device.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_compression_fixture.h b/opencl/test/unit_test/mem_obj/image_compression_fixture.h index 1e1e05aa7c..aabf4e3b2e 100644 --- a/opencl/test/unit_test/mem_obj/image_compression_fixture.h +++ b/opencl/test/unit_test/mem_obj/image_compression_fixture.h @@ -5,12 +5,12 @@ * */ +#include "shared/test/unit_test/mocks/mock_device.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/helpers/surface_formats.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_device.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" diff --git a/opencl/test/unit_test/mem_obj/image_transfer_tests.cpp b/opencl/test/unit_test/mem_obj/image_transfer_tests.cpp index cf3cc40922..b96bf6c7e2 100644 --- a/opencl/test/unit_test/mem_obj/image_transfer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_transfer_tests.cpp @@ -6,10 +6,10 @@ */ #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_device.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_device.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp index a8daf22f71..9dcdaeab30 100644 --- a/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp +++ b/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/memory_manager/allocations_list.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/os_interface/os_context.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/api/api.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" @@ -17,7 +18,6 @@ #include "opencl/test/unit_test/mocks/mock_allocation_properties.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_device.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "test.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 acbacc6953..4efc91315e 100644 --- a/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp +++ b/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp @@ -10,6 +10,7 @@ #include "shared/source/gmm_helper/gmm.h" #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 "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/helpers/properties_helper.h" @@ -19,7 +20,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_device.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/deferrable_allocation_deletion_tests.cpp b/opencl/test/unit_test/memory_manager/deferrable_allocation_deletion_tests.cpp index b818232a00..f8862b0eab 100644 --- a/opencl/test/unit_test/memory_manager/deferrable_allocation_deletion_tests.cpp +++ b/opencl/test/unit_test/memory_manager/deferrable_allocation_deletion_tests.cpp @@ -10,11 +10,11 @@ #include "shared/source/memory_manager/deferrable_allocation_deletion.h" #include "shared/source/memory_manager/deferred_deleter.h" #include "shared/source/os_interface/os_context.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/platform/platform.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_device.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "test.h" diff --git a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp index 49a24918de..5182b62d54 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -18,6 +18,7 @@ #include "shared/test/unit_test/compiler_interface/linker_mock.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/event/event.h" #include "opencl/source/helpers/dispatch_info.h" @@ -37,7 +38,6 @@ #include "opencl/test/unit_test/mocks/mock_csr.h" #include "opencl/test/unit_test/mocks/mock_deferrable_deletion.h" #include "opencl/test/unit_test/mocks/mock_deferred_deleter.h" -#include "opencl/test/unit_test/mocks/mock_device.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" diff --git a/opencl/test/unit_test/mocks/CMakeLists.txt b/opencl/test/unit_test/mocks/CMakeLists.txt index d28557f9df..630fd0b5c4 100644 --- a/opencl/test/unit_test/mocks/CMakeLists.txt +++ b/opencl/test/unit_test/mocks/CMakeLists.txt @@ -49,8 +49,6 @@ set(IGDRCL_SRCS_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/mock_deferred_deleter.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_deferred_deleter.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_device_queue.h - ${CMAKE_CURRENT_SOURCE_DIR}/mock_device.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/mock_device.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_event.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_execution_environment.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_experimental_command_buffer.h diff --git a/opencl/test/unit_test/mocks/mock_buffer.h b/opencl/test/unit_test/mocks/mock_buffer.h index 955e3c95d2..fa14be958b 100644 --- a/opencl/test/unit_test/mocks/mock_buffer.h +++ b/opencl/test/unit_test/mocks/mock_buffer.h @@ -7,11 +7,11 @@ #pragma once #include "shared/source/helpers/aligned_memory.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/helpers/memory_properties_flags_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_device.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" using namespace NEO; diff --git a/opencl/test/unit_test/mocks/mock_cl_device.cpp b/opencl/test/unit_test/mocks/mock_cl_device.cpp index 7374110dd2..24236755f2 100644 --- a/opencl/test/unit_test/mocks/mock_cl_device.cpp +++ b/opencl/test/unit_test/mocks/mock_cl_device.cpp @@ -7,7 +7,8 @@ #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_device.h" + #include "opencl/test/unit_test/mocks/mock_platform.h" using namespace NEO; diff --git a/opencl/test/unit_test/mocks/mock_cl_device.h b/opencl/test/unit_test/mocks/mock_cl_device.h index 9adfd34841..20cc31ce52 100644 --- a/opencl/test/unit_test/mocks/mock_cl_device.h +++ b/opencl/test/unit_test/mocks/mock_cl_device.h @@ -7,9 +7,10 @@ #pragma once +#include "shared/test/unit_test/mocks/mock_device.h" + #include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h" -#include "opencl/test/unit_test/mocks/mock_device.h" namespace NEO { class FailMemoryManager; diff --git a/opencl/test/unit_test/mocks/mock_gmm.h b/opencl/test/unit_test/mocks/mock_gmm.h index d75afd4f02..e9a3d7a74f 100644 --- a/opencl/test/unit_test/mocks/mock_gmm.h +++ b/opencl/test/unit_test/mocks/mock_gmm.h @@ -8,10 +8,10 @@ #pragma once #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 "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/mt_tests/device_queue/device_queue_mt_tests.cpp b/opencl/test/unit_test/mt_tests/device_queue/device_queue_mt_tests.cpp index 6b3737918b..d302152020 100644 --- a/opencl/test/unit_test/mt_tests/device_queue/device_queue_mt_tests.cpp +++ b/opencl/test/unit_test/mt_tests/device_queue/device_queue_mt_tests.cpp @@ -5,9 +5,10 @@ * */ +#include "shared/test/unit_test/mocks/mock_device.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_device.h" #include "opencl/test/unit_test/mocks/mock_device_queue.h" #include "test.h" diff --git a/opencl/test/unit_test/os_interface/linux/device_os_tests.cpp b/opencl/test/unit_test/os_interface/linux/device_os_tests.cpp index aa939d9ae2..dea93f8faa 100644 --- a/opencl/test/unit_test/os_interface/linux/device_os_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/device_os_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/device/device.h" #include "shared/source/helpers/get_info.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/api/api.h" #include "opencl/source/platform/platform.h" @@ -15,7 +16,6 @@ #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_device.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h index e951baab56..e7c03ad82d 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h @@ -8,12 +8,12 @@ #pragma once #include "shared/source/os_interface/linux/drm_memory_operations_handler.h" #include "shared/source/os_interface/linux/os_interface.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h" #include "opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" 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 c5ee2b50a9..baa01c7492 100644 --- a/opencl/test/unit_test/os_interface/mock_performance_counters.h +++ b/opencl/test/unit_test/os_interface/mock_performance_counters.h @@ -7,12 +7,12 @@ #pragma once #include "shared/source/device/device.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" -#include "opencl/test/unit_test/mocks/mock_device.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/performance_counters_tests.cpp b/opencl/test/unit_test/os_interface/performance_counters_tests.cpp index 1df45e5b99..6f1d399355 100644 --- a/opencl/test/unit_test/os_interface/performance_counters_tests.cpp +++ b/opencl/test/unit_test/os_interface/performance_counters_tests.cpp @@ -10,10 +10,10 @@ #include "shared/source/os_interface/os_time.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_device.h" #include "opencl/test/unit_test/fixtures/device_instrumentation_fixture.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/os_interface/mock_performance_counters.h" diff --git a/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp index 5188a81f71..91c353c91c 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 @@ -20,6 +20,7 @@ #include "shared/source/os_interface/windows/wddm_memory_operations_handler.h" #include "shared/source/os_interface/windows/wddm_residency_controller.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/os_interface/windows/mock_gdi_interface.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" @@ -35,7 +36,6 @@ #include "opencl/test/unit_test/helpers/execution_environment_helper.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_builtins.h" -#include "opencl/test/unit_test/mocks/mock_device.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_platform.h" diff --git a/opencl/test/unit_test/os_interface/windows/device_os_tests.cpp b/opencl/test/unit_test/os_interface/windows/device_os_tests.cpp index 9dde187455..c808c5c662 100644 --- a/opencl/test/unit_test/os_interface/windows/device_os_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/device_os_tests.cpp @@ -8,9 +8,9 @@ #include "shared/source/device/device.h" #include "shared/source/helpers/get_info.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "gmock/gmock.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 e06ae55aac..85055e0fbf 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 @@ -13,11 +13,11 @@ #include "shared/source/os_interface/windows/os_interface.h" #include "shared/test/unit_test/helpers/ult_hw_config.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/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_csr.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_wddm.h" #include "opencl/test/unit_test/os_interface/windows/registry_reader_tests.h" diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp index 42865c1fb3..ee2698bbc0 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp @@ -18,6 +18,7 @@ #include "shared/source/utilities/tag_allocator.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/mocks/mock_device.h" #include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" @@ -29,7 +30,6 @@ #include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" #include "opencl/test/unit_test/mocks/mock_deferred_deleter.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_os_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/platform/platform_tests.cpp b/opencl/test/unit_test/platform/platform_tests.cpp index de32b3ab84..96331d956c 100644 --- a/opencl/test/unit_test/platform/platform_tests.cpp +++ b/opencl/test/unit_test/platform/platform_tests.cpp @@ -11,6 +11,7 @@ #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 "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/platform/extensions.h" @@ -19,7 +20,6 @@ #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_csr.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/mock_source_level_debugger.h" diff --git a/opencl/test/unit_test/program/printf_handler_tests.cpp b/opencl/test/unit_test/program/printf_handler_tests.cpp index 8826a23b87..13047df778 100644 --- a/opencl/test/unit_test/program/printf_handler_tests.cpp +++ b/opencl/test/unit_test/program/printf_handler_tests.cpp @@ -5,11 +5,12 @@ * */ +#include "shared/test/unit_test/mocks/mock_device.h" + #include "opencl/source/program/printf_handler.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_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_mdi.h" diff --git a/opencl/test/unit_test/program/printf_helper_tests.cpp b/opencl/test/unit_test/program/printf_helper_tests.cpp index f9ccdd3f5e..fc763ed372 100644 --- a/opencl/test/unit_test/program/printf_helper_tests.cpp +++ b/opencl/test/unit_test/program/printf_helper_tests.cpp @@ -8,9 +8,9 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/string.h" #include "shared/source/program/print_formatter.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_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/process_elf_binary_tests.cpp b/opencl/test/unit_test/program/process_elf_binary_tests.cpp index ad85c7db99..0bfa3aca96 100644 --- a/opencl/test/unit_test/program/process_elf_binary_tests.cpp +++ b/opencl/test/unit_test/program/process_elf_binary_tests.cpp @@ -12,10 +12,10 @@ #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/string.h" #include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/helpers/test_files.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "compiler_options.h" diff --git a/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp b/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp index 64e360f808..111ca3f700 100644 --- a/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp +++ b/opencl/test/unit_test/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp @@ -9,13 +9,13 @@ #include "shared/source/os_interface/windows/os_interface.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_device.h" #include "opencl/source/os_interface/windows/wddm_device_command_stream.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/helpers/execution_environment_helper.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_device.h" #include "opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h" #include "test.h" diff --git a/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp b/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp index f09970ae9e..2f8c9f935d 100644 --- a/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp +++ b/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp @@ -6,12 +6,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/utilities/base_object_utils.h" #include "opencl/source/scheduler/scheduler_kernel.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_device.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" diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp index 2c5f145cf3..d5006a31cd 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp @@ -7,6 +7,7 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/os_interface/os_interface.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/context/context.h" #include "opencl/source/event/user_event.h" @@ -19,7 +20,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_device.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "test.h" diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp index 4e213df0b0..e93868ccda 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_sharing_tests.cpp @@ -10,6 +10,7 @@ #include "shared/source/helpers/array_count.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/mocks/mock_device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/user_event.h" @@ -30,7 +31,6 @@ #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_device.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" diff --git a/opencl/test/unit_test/sharings/sharing_factory_tests.cpp b/opencl/test/unit_test/sharings/sharing_factory_tests.cpp index d46e805fa9..0aed3d250c 100644 --- a/opencl/test/unit_test/sharings/sharing_factory_tests.cpp +++ b/opencl/test/unit_test/sharings/sharing_factory_tests.cpp @@ -9,6 +9,7 @@ #include "shared/source/device/device.h" #include "shared/source/helpers/string.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/context/context.h" #include "opencl/source/platform/extensions.h" @@ -18,7 +19,6 @@ #include "opencl/test/unit_test/fixtures/memory_management_fixture.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_device.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/mock_sharing_factory.h" diff --git a/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h b/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h index 4ccc41b6a5..1dfb4ab067 100644 --- a/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h +++ b/opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h @@ -6,11 +6,11 @@ */ #include "shared/test/unit_test/helpers/variable_backup.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/sharings/unified/unified_sharing_types.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_device.h" #include "opencl/test/unit_test/mocks/mock_gmm.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "test.h" diff --git a/opencl/test/unit_test/sharings/unified/unified_sharing_tests.cpp b/opencl/test/unit_test/sharings/unified/unified_sharing_tests.cpp index 44065a1edf..166a27c03f 100644 --- a/opencl/test/unit_test/sharings/unified/unified_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/unified/unified_sharing_tests.cpp @@ -6,13 +6,13 @@ */ #include "shared/test/unit_test/helpers/variable_backup.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/sharings/unified/enable_unified.h" #include "opencl/source/sharings/unified/unified_buffer.h" #include "opencl/source/sharings/unified/unified_sharing.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_device.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "opencl/test/unit_test/sharings/unified/unified_sharing_fixtures.h" #include "test.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 a3e18aa288..41bef0a501 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 @@ -7,6 +7,7 @@ #include "shared/source/source_level_debugger/source_level_debugger.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" @@ -14,7 +15,6 @@ #include "opencl/test/unit_test/helpers/execution_environment_helper.h" #include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_csr.h" -#include "opencl/test/unit_test/mocks/mock_device.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/source_level_debugger/source_level_debugger_device_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp index abdbaf1ccf..5bc85e10c0 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_device_tests.cpp @@ -7,12 +7,12 @@ #include "shared/source/source_level_debugger/source_level_debugger.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_os_library.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/mocks/mock_builtins.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/mock_source_level_debugger.h" #include "test.h" diff --git a/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp b/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp index 36ca09a4d1..d5910e0d71 100644 --- a/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp +++ b/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp @@ -13,8 +13,8 @@ #include "shared/test/unit_test/cmd_parse/hw_parse.h" #include "shared/test/unit_test/helpers/ult_hw_config.h" #include "shared/test/unit_test/helpers/variable_backup.h" +#include "shared/test/unit_test/mocks/mock_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" struct WddmDirectSubmissionFixture : public WddmFixture { diff --git a/shared/test/unit_test/fixtures/preemption_fixture.cpp b/shared/test/unit_test/fixtures/preemption_fixture.cpp index d78ba60823..b80d1954f9 100644 --- a/shared/test/unit_test/fixtures/preemption_fixture.cpp +++ b/shared/test/unit_test/fixtures/preemption_fixture.cpp @@ -10,6 +10,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/helpers/hw_info.h" #include "shared/test/unit_test/cmd_parse/hw_parse.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/command_queue/enqueue_common.h" #include "opencl/source/command_queue/enqueue_kernel.h" @@ -19,7 +20,6 @@ #include "opencl/test/unit_test/fixtures/hello_world_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_device.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" diff --git a/shared/test/unit_test/mocks/CMakeLists.txt b/shared/test/unit_test/mocks/CMakeLists.txt index bf10f0314b..1730f1508c 100644 --- a/shared/test/unit_test/mocks/CMakeLists.txt +++ b/shared/test/unit_test/mocks/CMakeLists.txt @@ -9,6 +9,8 @@ set(NEO_CORE_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/mock_direct_submission_hw.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_dispatch_kernel_encoder_interface.cpp ${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_os_library.h ) diff --git a/opencl/test/unit_test/mocks/mock_device.cpp b/shared/test/unit_test/mocks/mock_device.cpp similarity index 98% rename from opencl/test/unit_test/mocks/mock_device.cpp rename to shared/test/unit_test/mocks/mock_device.cpp index dd57c1ee88..0bcc21fa6b 100644 --- a/opencl/test/unit_test/mocks/mock_device.cpp +++ b/shared/test/unit_test/mocks/mock_device.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/test/unit_test/mocks/mock_device.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/command_stream/preemption.h" diff --git a/opencl/test/unit_test/mocks/mock_device.h b/shared/test/unit_test/mocks/mock_device.h similarity index 100% rename from opencl/test/unit_test/mocks/mock_device.h rename to shared/test/unit_test/mocks/mock_device.h diff --git a/shared/test/unit_test/preamble/preamble_tests.cpp b/shared/test/unit_test/preamble/preamble_tests.cpp index f593609843..93456f9d64 100644 --- a/shared/test/unit_test/preamble/preamble_tests.cpp +++ b/shared/test/unit_test/preamble/preamble_tests.cpp @@ -12,8 +12,8 @@ #include "shared/source/utilities/stackvec.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_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" diff --git a/shared/test/unit_test/preemption/preemption_tests.cpp b/shared/test/unit_test/preemption/preemption_tests.cpp index c555ee1cf3..73892fb79a 100644 --- a/shared/test/unit_test/preemption/preemption_tests.cpp +++ b/shared/test/unit_test/preemption/preemption_tests.cpp @@ -10,13 +10,13 @@ #include "shared/test/unit_test/cmd_parse/hw_parse.h" #include "shared/test/unit_test/fixtures/preemption_fixture.h" #include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/test/unit_test/helpers/dispatch_flags_helper.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_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_platform.h" diff --git a/shared/test/unit_test/program/program_initialization_tests.cpp b/shared/test/unit_test/program/program_initialization_tests.cpp index 16371556b5..35eda56f4b 100644 --- a/shared/test/unit_test/program/program_initialization_tests.cpp +++ b/shared/test/unit_test/program/program_initialization_tests.cpp @@ -7,9 +7,9 @@ #include "shared/source/program/program_initialization.h" #include "shared/test/unit_test/compiler_interface/linker_mock.h" +#include "shared/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_cl_device.h" -#include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_svm_manager.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 eaeb8ea24d..ca74925e01 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 @@ -10,8 +10,8 @@ #include "shared/source/command_stream/preemption.h" #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 "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h"