diff --git a/opencl/test/unit_test/aub/aub_helper_tests.cpp b/opencl/test/unit_test/aub/aub_helper_tests.cpp index db52793d81..8921d03822 100644 --- a/opencl/test/unit_test/aub/aub_helper_tests.cpp +++ b/opencl/test/unit_test/aub/aub_helper_tests.cpp @@ -13,10 +13,10 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/tbx/tbx_proto.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/mocks/mock_lrca_helper.h" #include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "opencl/test/unit_test/mocks/mock_lrca_helper.h" using namespace NEO; 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 97267a75fd..0d8dd5e9ee 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp @@ -23,6 +23,7 @@ #include "shared/test/common/mocks/mock_gmm_resource_info.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/common/test_macros/test_checks_shared.h" @@ -46,7 +47,6 @@ #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_mdi.h" -#include "opencl/test/unit_test/mocks/mock_os_context.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp index a9da80982d..82fea1e822 100644 --- a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp @@ -11,7 +11,10 @@ #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_aub_csr.h" +#include "shared/test/common/mocks/mock_aub_subcapture_manager.h" #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/mocks/mock_internal_allocation_storage.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_timestamp_container.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/utilities/base_object_utils.h" @@ -22,13 +25,10 @@ #include "opencl/test/unit_test/command_stream/thread_arbitration_policy_helper.h" #include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" #include "opencl/test/unit_test/helpers/cl_hw_parse.h" -#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_context.h" -#include "opencl/test/unit_test/mocks/mock_internal_allocation_storage.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" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/test_macros/test_checks_ocl.h" diff --git a/opencl/test/unit_test/command_stream/CMakeLists.txt b/opencl/test/unit_test/command_stream/CMakeLists.txt index 8e3108d25f..e2fb5ae86f 100644 --- a/opencl/test/unit_test/command_stream/CMakeLists.txt +++ b/opencl/test/unit_test/command_stream/CMakeLists.txt @@ -32,8 +32,6 @@ set(IGDRCL_SRCS_tests_command_stream ${CMAKE_CURRENT_SOURCE_DIR}/experimental_command_buffer_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/implicit_scaling_ocl_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/submissions_aggregator_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_fixture.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/thread_arbitration_policy_helper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/thread_arbitration_policy_helper.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 b1f2adda2c..2afe730d35 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 @@ -9,22 +9,21 @@ #include "shared/source/helpers/hardware_context_controller.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/os_context.h" +#include "shared/test/common/fixtures/aub_command_stream_receiver_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/libult/ult_aub_command_stream_receiver.h" #include "shared/test/common/mocks/mock_aub_center.h" #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_aub_manager.h" +#include "shared/test/common/mocks/mock_aub_subcapture_manager.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h" -#include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h" -#include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" -#include "opencl/test/unit_test/mocks/mock_os_context.h" - using namespace NEO; using AubCommandStreamReceiverTests = Test; diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp index 6c87bb4002..e87e501459 100644 --- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp @@ -10,24 +10,23 @@ #include "shared/source/helpers/hardware_context_controller.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/os_context.h" +#include "shared/test/common/fixtures/aub_command_stream_receiver_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/mocks/mock_aub_center.h" #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_aub_file_stream.h" #include "shared/test/common/mocks/mock_aub_manager.h" +#include "shared/test/common/mocks/mock_aub_subcapture_manager.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h" -#include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h" -#include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" -#include "opencl/test/unit_test/mocks/mock_os_context.h" - #include "third_party/aub_stream/headers/aubstream.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp index 27691b6c30..228debb466 100644 --- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_3_tests.cpp @@ -7,17 +7,16 @@ #include "shared/source/aub_mem_dump/aub_alloc_dump.h" #include "shared/source/helpers/hardware_context_controller.h" +#include "shared/test/common/fixtures/aub_command_stream_receiver_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_aub_manager.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_svm_manager.h" #include "shared/test/common/test_macros/test.h" -#include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h" -#include "opencl/test/unit_test/mocks/mock_os_context.h" - using namespace NEO; using AubCsrTest = ::testing::Test; diff --git a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp index b8f02243c9..19e8fc5552 100644 --- a/opencl/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/aub_command_stream_receiver_tests_xehp_and_later.cpp @@ -21,10 +21,9 @@ #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/test_macros/test.h" -#include "opencl/test/unit_test/mocks/mock_os_context.h" - #include #include 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 de551ef97d..7ffcdc1cbe 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 @@ -10,21 +10,20 @@ #include "shared/source/helpers/hardware_context_controller.h" #include "shared/source/helpers/neo_driver_version.h" #include "shared/source/os_interface/os_context.h" +#include "shared/test/common/fixtures/aub_command_stream_receiver_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/mocks/mock_aub_center.h" #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_aub_file_stream.h" #include "shared/test/common/mocks/mock_aub_manager.h" +#include "shared/test/common/mocks/mock_aub_subcapture_manager.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/test_macros/test.h" -#include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" -#include "opencl/test/unit_test/mocks/mock_mdi.h" -#include "opencl/test/unit_test/mocks/mock_os_context.h" #include "driver_version.h" #include "sys_calls.h" diff --git a/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp b/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp index 36e0d7217e..3a3b85e367 100644 --- a/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp @@ -8,10 +8,9 @@ #include "shared/source/aub/aub_subcapture.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/mocks/mock_aub_subcapture_manager.h" #include "shared/test/common/test_macros/test.h" -#include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" - using namespace NEO; struct AubSubCaptureTest : public DeviceFixture, diff --git a/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp index 13eed9a955..cbf654f8cb 100644 --- a/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp +++ b/opencl/test/unit_test/command_stream/cl_command_stream_receiver_tests.cpp @@ -8,13 +8,13 @@ #include "shared/source/memory_manager/surface.h" #include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/mocks/mock_hw_helper.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/helpers/raii_hw_helper.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_hw_helper.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp b/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp index 228c23c9a1..50119aab2e 100644 --- a/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/cl_tbx_command_stream_tests.cpp @@ -8,13 +8,13 @@ #include "shared/source/helpers/engine_control.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_tbx_csr.h" #include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_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_os_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp index abf19952d3..28259a7145 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_2_tests.cpp @@ -18,6 +18,7 @@ #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_gmm_page_table_mngr.h" +#include "shared/test/common/mocks/mock_hw_helper.h" #include "shared/test/common/mocks/mock_submissions_aggregator.h" #include "shared/test/common/test_macros/test.h" @@ -26,7 +27,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_event.h" -#include "opencl/test/unit_test/mocks/mock_hw_helper.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "reg_configs_common.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 e6935bb4d2..a85b7f15d1 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 @@ -14,6 +14,7 @@ #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_submissions_aggregator.h" #include "shared/test/common/mocks/mock_svm_manager.h" #include "shared/test/common/test_macros/test.h" @@ -26,7 +27,6 @@ #include "opencl/test/unit_test/mocks/mock_context.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_os_context.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/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp index c0b8eb32e7..fcb4216aa0 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp @@ -25,6 +25,7 @@ #include "shared/test/common/helpers/ult_hw_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_csr.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_submissions_aggregator.h" #include "shared/test/common/test_macros/test.h" @@ -37,10 +38,8 @@ #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.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_context.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_os_context.h" #include "gtest/gtest.h" #include "reg_configs_common.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp index 15a9ccf2e3..99c73bcd50 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_1_tests.cpp @@ -16,6 +16,7 @@ #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_timestamp_container.h" #include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/test.h" @@ -27,7 +28,6 @@ #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" -#include "opencl/test/unit_test/mocks/mock_os_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp index 9c1f09fe51..585362a460 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp @@ -12,6 +12,8 @@ #include "shared/test/common/helpers/ult_hw_config.h" #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_direct_submission_hw.h" +#include "shared/test/common/mocks/mock_hw_helper.h" +#include "shared/test/common/mocks/mock_internal_allocation_storage.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/mocks/mock_timestamp_container.h" #include "shared/test/common/test_macros/test.h" @@ -24,9 +26,7 @@ #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/helpers/raii_hw_helper.h" -#include "opencl/test/unit_test/mocks/mock_hw_helper.h" #include "opencl/test/unit_test/mocks/mock_image.h" -#include "opencl/test/unit_test/mocks/mock_internal_allocation_storage.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp index e19d05615c..d28e7a2b63 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_common_hw_tests_xehp_and_later.cpp @@ -9,11 +9,11 @@ #include "shared/source/command_stream/command_stream_receiver_simulated_common_hw.h" #include "shared/source/helpers/hardware_context_controller.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/mocks/mock_aub_stream.h" +#include "shared/test/common/mocks/mock_csr_simulated_common_hw.h" #include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "opencl/test/unit_test/mocks/mock_aub_stream.h" -#include "opencl/test/unit_test/mocks/mock_csr_simulated_common_hw.h" using XeHPAndLaterMockSimulatedCsrHwTests = Test; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp index 8c36cb57a0..39e01e737a 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_simulated_tests.cpp @@ -16,13 +16,12 @@ #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/mocks/mock_aub_manager.h" +#include "shared/test/common/mocks/mock_csr_simulated_common_hw.h" #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/test_macros/test.h" -#include "opencl/test/unit_test/mocks/mock_csr_simulated_common_hw.h" -#include "opencl/test/unit_test/mocks/mock_os_context.h" - #include #include using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp index 8737ee9d16..da5f2b6cba 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp @@ -25,12 +25,12 @@ #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_aub_manager.h" #include "shared/test/common/mocks/mock_execution_environment.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/platform/platform.h" -#include "opencl/test/unit_test/mocks/mock_os_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" using namespace NEO; diff --git a/opencl/test/unit_test/command_stream/compute_mode_tests_dg2.cpp b/opencl/test/unit_test/command_stream/compute_mode_tests_dg2.cpp index 85eb7c6bd5..56d6c79d79 100644 --- a/opencl/test/unit_test/command_stream/compute_mode_tests_dg2.cpp +++ b/opencl/test/unit_test/command_stream/compute_mode_tests_dg2.cpp @@ -11,10 +11,10 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/command_stream/compute_mode_tests.h" -#include "opencl/test/unit_test/mocks/mock_os_context.h" #include "test_traits_common.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 5f25bb5ec4..4ad8296248 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 @@ -15,20 +15,19 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/source/memory_manager/memory_banks.h" #include "shared/test/common/fixtures/device_fixture.h" +#include "shared/test/common/fixtures/tbx_command_stream_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/mocks/mock_allocation_properties.h" +#include "shared/test/common/mocks/mock_aub_subcapture_manager.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/mock_tbx_csr.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/fixtures/mock_aub_center_fixture.h" -#include "opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h" -#include "opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h" -#include "opencl/test/unit_test/mocks/mock_os_context.h" - #include using namespace NEO; diff --git a/opencl/test/unit_test/device/device_tests.cpp b/opencl/test/unit_test/device/device_tests.cpp index 8243f45f4b..a5d53622c1 100644 --- a/opencl/test/unit_test/device/device_tests.cpp +++ b/opencl/test/unit_test/device/device_tests.cpp @@ -20,6 +20,7 @@ #include "shared/test/common/mocks/mock_driver_info.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/common/test_macros/test_checks_shared.h" @@ -28,7 +29,6 @@ #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" #include "opencl/test/unit_test/helpers/raii_hw_helper.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_os_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include diff --git a/opencl/test/unit_test/device/device_win_timers_tests.cpp b/opencl/test/unit_test/device/device_win_timers_tests.cpp index cf06addb8d..2b1ba234e7 100644 --- a/opencl/test/unit_test/device/device_win_timers_tests.cpp +++ b/opencl/test/unit_test/device/device_win_timers_tests.cpp @@ -8,11 +8,11 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_ostime.h" +#include "shared/test/common/mocks/mock_ostime_win.h" #include "shared/test/common/mocks/mock_wddm.h" #include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "opencl/test/unit_test/mocks/mock_ostime_win.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/device/get_device_info_tests.cpp b/opencl/test/unit_test/device/get_device_info_tests.cpp index d56b165b06..2def4bae15 100644 --- a/opencl/test/unit_test/device/get_device_info_tests.cpp +++ b/opencl/test/unit_test/device/get_device_info_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/helpers/get_info.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_driver_info.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/cl_device/cl_device_info_map.h" @@ -17,7 +18,6 @@ #include "opencl/test/unit_test/helpers/raii_hw_helper.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_os_context.h" #include "opencl/test/unit_test/mocks/ult_cl_device_factory.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/fixtures/CMakeLists.txt b/opencl/test/unit_test/fixtures/CMakeLists.txt index baa26a9238..34eebc6d49 100644 --- a/opencl/test/unit_test/fixtures/CMakeLists.txt +++ b/opencl/test/unit_test/fixtures/CMakeLists.txt @@ -6,7 +6,6 @@ set(IGDRCL_SRCS_tests_fixtures ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/aub_command_stream_receiver_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/buffer_enqueue_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/cl_preemption_fixture.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cl_preemption_fixture.h diff --git a/opencl/test/unit_test/fixtures/kernel_data_fixture.h b/opencl/test/unit_test/fixtures/kernel_data_fixture.h index 81d2e90ffe..3a4b9dc5c3 100644 --- a/opencl/test/unit_test/fixtures/kernel_data_fixture.h +++ b/opencl/test/unit_test/fixtures/kernel_data_fixture.h @@ -9,10 +9,10 @@ #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/program/kernel_info.h" +#include "shared/test/common/mocks/mock_kernel_info.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_kernel_info.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "gtest/gtest.h" 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 6e671f99a3..e1132e4b7c 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 @@ -13,10 +13,10 @@ #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "opencl/test/unit_test/mocks/mock_os_context.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl index c6fe0e50c5..1b4f2e3e4c 100644 --- a/opencl/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/command_stream_receiver_simulated_common_hw_tests_gen12lp.inl @@ -7,11 +7,11 @@ #include "shared/source/command_stream/command_stream_receiver_simulated_hw.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" +#include "shared/test/common/mocks/mock_aub_stream.h" +#include "shared/test/common/mocks/mock_csr_simulated_common_hw.h" #include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/cl_device_fixture.h" -#include "opencl/test/unit_test/mocks/mock_aub_stream.h" -#include "opencl/test/unit_test/mocks/mock_csr_simulated_common_hw.h" using namespace NEO; diff --git a/opencl/test/unit_test/kernel/image_transformer_tests.cpp b/opencl/test/unit_test/kernel/image_transformer_tests.cpp index 2e117eb874..ac166c6e76 100644 --- a/opencl/test/unit_test/kernel/image_transformer_tests.cpp +++ b/opencl/test/unit_test/kernel/image_transformer_tests.cpp @@ -6,11 +6,11 @@ */ #include "shared/source/program/kernel_info.h" +#include "shared/test/common/mocks/mock_kernel_info.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/kernel/image_transformer.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" -#include "opencl/test/unit_test/mocks/mock_kernel_info.h" using namespace NEO; diff --git a/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp b/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp index 5e0797d14f..0b284dd3fe 100644 --- a/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp @@ -14,11 +14,11 @@ #include "shared/test/common/mocks/mock_allocation_properties.h" #include "shared/test/common/mocks/mock_csr.h" #include "shared/test/common/mocks/mock_host_ptr_manager.h" +#include "shared/test/common/mocks/mock_internal_allocation_storage.h" #include "shared/test/common/mocks/mock_memory_manager.h" #include "shared/test/common/test_macros/test.h" #include "opencl/test/unit_test/fixtures/memory_manager_fixture.h" -#include "opencl/test/unit_test/mocks/mock_internal_allocation_storage.h" using namespace NEO; diff --git a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp index ee13cee2bf..3c71e4822c 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp @@ -17,12 +17,12 @@ #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/cl_memory_properties_helpers.h" #include "opencl/source/mem_obj/mem_obj_helper.h" -#include "opencl/test/unit_test/mocks/mock_os_context.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 d1ac4fcd3e..0c564fd941 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -30,6 +30,7 @@ #include "shared/test/common/mocks/mock_gmm_page_table_mngr.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/unit_test/compiler_interface/linker_mock.h" @@ -50,7 +51,6 @@ #include "opencl/test/unit_test/mocks/mock_context.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" #include "opencl/test/unit_test/mocks/mock_platform.h" #include diff --git a/opencl/test/unit_test/mocks/CMakeLists.txt b/opencl/test/unit_test/mocks/CMakeLists.txt index 6960656865..37329060bf 100644 --- a/opencl/test/unit_test/mocks/CMakeLists.txt +++ b/opencl/test/unit_test/mocks/CMakeLists.txt @@ -8,8 +8,6 @@ set(IGDRCL_SRCS_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/mock_async_event_handler.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_async_event_handler.h - ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_stream.h - ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_subcapture_manager.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_block_kernel_manager.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_buffer.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_cl_device.cpp @@ -18,18 +16,12 @@ set(IGDRCL_SRCS_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/mock_command_queue.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_context.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_context.h - ${CMAKE_CURRENT_SOURCE_DIR}/mock_csr_simulated_common_hw.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_device_queue.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_event.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info_ocl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_image.h - ${CMAKE_CURRENT_SOURCE_DIR}/mock_internal_allocation_storage.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel.h - ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel_info.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel_info.h - ${CMAKE_CURRENT_SOURCE_DIR}/mock_lrca_helper.h - ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_context.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_platform.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_platform.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_program.cpp @@ -49,7 +41,6 @@ if(WIN32) file(GLOB IGDRCL_SRC_tests_mock_wddm "${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm2[0-9]\.*") list(APPEND IGDRCL_SRCS_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/mock_d3d_objects.h - ${CMAKE_CURRENT_SOURCE_DIR}/mock_ostime_win.h ${NEO_SHARED_TEST_DIRECTORY}/unit_test/os_interface/windows/mock_gdi_interface.cpp ${IGDRCL_SRC_tests_mock_wddm} ) diff --git a/opencl/test/unit_test/mocks/mock_kernel.h b/opencl/test/unit_test/mocks/mock_kernel.h index ba1084ace8..12e60a06a5 100644 --- a/opencl/test/unit_test/mocks/mock_kernel.h +++ b/opencl/test/unit_test/mocks/mock_kernel.h @@ -11,6 +11,7 @@ #include "shared/source/helpers/string.h" #include "shared/source/kernel/grf_config.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" +#include "shared/test/common/mocks/mock_kernel_info.h" #include "opencl/source/cl_device/cl_device.h" #include "opencl/source/kernel/kernel.h" @@ -21,7 +22,6 @@ #include "opencl/source/scheduler/scheduler_kernel.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_context.h" -#include "opencl/test/unit_test/mocks/mock_kernel_info.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include 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 6e3e8a0444..b064d6e070 100644 --- a/opencl/test/unit_test/os_interface/performance_counters_tests.cpp +++ b/opencl/test/unit_test/os_interface/performance_counters_tests.cpp @@ -13,10 +13,10 @@ #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_execution_environment.h" +#include "shared/test/common/mocks/mock_os_context.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_os_context.h" #include "opencl/test/unit_test/os_interface/mock_performance_counters.h" #include "gtest/gtest.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 bd91c4915d..c7b80c969b 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 @@ -25,6 +25,7 @@ #include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_gmm_client_context.h" #include "shared/test/common/mocks/mock_memory_manager.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/unit_test/utilities/base_object_utils.h" @@ -35,7 +36,6 @@ #include "opencl/source/platform/platform.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_os_context.h" #include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h" diff --git a/opencl/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp index a783633666..737a9affa1 100644 --- a/opencl/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/aub_command_stream_receiver_2_tests_xe_hpc_core.cpp @@ -6,15 +6,14 @@ */ #include "shared/source/aub_mem_dump/aub_alloc_dump.h" +#include "shared/test/common/fixtures/aub_command_stream_receiver_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/engine_descriptor_helper.h" #include "shared/test/common/mocks/mock_aub_csr.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/mocks/mock_os_context.h" #include "shared/test/common/test_macros/test.h" -#include "opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h" -#include "opencl/test/unit_test/mocks/mock_os_context.h" - using namespace NEO; using AubCommandStreamReceiverXeHpcCoreTests = ::testing::Test; diff --git a/opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h b/shared/test/common/fixtures/aub_command_stream_receiver_fixture.h similarity index 100% rename from opencl/test/unit_test/fixtures/aub_command_stream_receiver_fixture.h rename to shared/test/common/fixtures/aub_command_stream_receiver_fixture.h diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp b/shared/test/common/fixtures/tbx_command_stream_fixture.cpp similarity index 92% rename from opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp rename to shared/test/common/fixtures/tbx_command_stream_fixture.cpp index f0d2857ff3..cf38f06b46 100644 --- a/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp +++ b/shared/test/common/fixtures/tbx_command_stream_fixture.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h" +#include "shared/test/common/fixtures/tbx_command_stream_fixture.h" #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/command_stream/tbx_command_stream_receiver_hw.h" diff --git a/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h b/shared/test/common/fixtures/tbx_command_stream_fixture.h similarity index 100% rename from opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h rename to shared/test/common/fixtures/tbx_command_stream_fixture.h diff --git a/shared/test/common/libult/CMakeLists.txt b/shared/test/common/libult/CMakeLists.txt index 3e15ce3ab4..218926c28f 100644 --- a/shared/test/common/libult/CMakeLists.txt +++ b/shared/test/common/libult/CMakeLists.txt @@ -59,10 +59,13 @@ endmacro() apply_macro_for_each_core_type("TESTED") set(neo_libult_common_SRCS_LIB_ULT + ${NEO_SHARED_TEST_DIRECTORY}/common/fixtures/aub_command_stream_receiver_fixture.h ${NEO_SHARED_TEST_DIRECTORY}/common/fixtures/device_fixture.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/fixtures/device_fixture.h ${NEO_SHARED_TEST_DIRECTORY}/common/fixtures/mock_execution_environment_gmm_fixture.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/fixtures/mock_execution_environment_gmm_fixture.h + ${NEO_SHARED_TEST_DIRECTORY}/common/fixtures/tbx_command_stream_fixture.cpp + ${NEO_SHARED_TEST_DIRECTORY}/common/fixtures/tbx_command_stream_fixture.h ${NEO_SHARED_TEST_DIRECTORY}/common/helpers${BRANCH_DIR_SUFFIX}kernel_binary_helper_hash_value.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/kernel_binary_helper.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/helpers/kernel_binary_helper.h diff --git a/shared/test/common/mocks/CMakeLists.txt b/shared/test/common/mocks/CMakeLists.txt index dc5fa574ea..e8f89b2017 100644 --- a/shared/test/common/mocks/CMakeLists.txt +++ b/shared/test/common/mocks/CMakeLists.txt @@ -20,6 +20,8 @@ set(NEO_CORE_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_csr.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_file_stream.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_manager.h + ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_stream.h + ${CMAKE_CURRENT_SOURCE_DIR}/mock_aub_subcapture_manager.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_bindless_heaps_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_builtins.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_builtinslib.h @@ -32,6 +34,7 @@ set(NEO_CORE_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_compilers.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_csr.h + ${CMAKE_CURRENT_SOURCE_DIR}/mock_csr_simulated_common_hw.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_debugger.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_deferrable_deletion.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_deferrable_deletion.h @@ -55,12 +58,18 @@ set(NEO_CORE_tests_mocks ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_resource_info.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_graphics_allocation.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_host_ptr_manager.h + ${CMAKE_CURRENT_SOURCE_DIR}/mock_hw_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_hw_info_config.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/mock_internal_allocation_storage.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_io_functions.h + ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel_info.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/mock_kernel_info.h + ${CMAKE_CURRENT_SOURCE_DIR}/mock_lrca_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_manager.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_memory_operations_handler.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_migration_sync_data.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_multi_graphics_allocation.h + ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_context.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_library.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_ostime.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_physical_address_allocator.h @@ -80,6 +89,7 @@ set(NEO_CORE_tests_mocks if(WIN32) list(APPEND NEO_CORE_tests_mocks + ${CMAKE_CURRENT_SOURCE_DIR}/mock_ostime_win.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm_interface20.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_wddm_interface23.h diff --git a/opencl/test/unit_test/mocks/mock_aub_stream.h b/shared/test/common/mocks/mock_aub_stream.h similarity index 100% rename from opencl/test/unit_test/mocks/mock_aub_stream.h rename to shared/test/common/mocks/mock_aub_stream.h diff --git a/opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h b/shared/test/common/mocks/mock_aub_subcapture_manager.h similarity index 100% rename from opencl/test/unit_test/mocks/mock_aub_subcapture_manager.h rename to shared/test/common/mocks/mock_aub_subcapture_manager.h diff --git a/opencl/test/unit_test/mocks/mock_csr_simulated_common_hw.h b/shared/test/common/mocks/mock_csr_simulated_common_hw.h similarity index 100% rename from opencl/test/unit_test/mocks/mock_csr_simulated_common_hw.h rename to shared/test/common/mocks/mock_csr_simulated_common_hw.h diff --git a/opencl/test/unit_test/mocks/mock_hw_helper.h b/shared/test/common/mocks/mock_hw_helper.h similarity index 100% rename from opencl/test/unit_test/mocks/mock_hw_helper.h rename to shared/test/common/mocks/mock_hw_helper.h diff --git a/opencl/test/unit_test/mocks/mock_internal_allocation_storage.h b/shared/test/common/mocks/mock_internal_allocation_storage.h similarity index 96% rename from opencl/test/unit_test/mocks/mock_internal_allocation_storage.h rename to shared/test/common/mocks/mock_internal_allocation_storage.h index 9d230c0fc2..0335ddf234 100644 --- a/opencl/test/unit_test/mocks/mock_internal_allocation_storage.h +++ b/shared/test/common/mocks/mock_internal_allocation_storage.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2020 Intel Corporation + * Copyright (C) 2018-2021 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/opencl/test/unit_test/mocks/mock_kernel_info.cpp b/shared/test/common/mocks/mock_kernel_info.cpp similarity index 99% rename from opencl/test/unit_test/mocks/mock_kernel_info.cpp rename to shared/test/common/mocks/mock_kernel_info.cpp index 62b65f9fd4..72e6b214d7 100644 --- a/opencl/test/unit_test/mocks/mock_kernel_info.cpp +++ b/shared/test/common/mocks/mock_kernel_info.cpp @@ -5,7 +5,7 @@ * */ -#include "opencl/test/unit_test/mocks/mock_kernel_info.h" +#include "shared/test/common/mocks/mock_kernel_info.h" #include "shared/source/kernel/kernel_descriptor_from_patchtokens.h" diff --git a/opencl/test/unit_test/mocks/mock_kernel_info.h b/shared/test/common/mocks/mock_kernel_info.h similarity index 100% rename from opencl/test/unit_test/mocks/mock_kernel_info.h rename to shared/test/common/mocks/mock_kernel_info.h diff --git a/opencl/test/unit_test/mocks/mock_lrca_helper.h b/shared/test/common/mocks/mock_lrca_helper.h similarity index 100% rename from opencl/test/unit_test/mocks/mock_lrca_helper.h rename to shared/test/common/mocks/mock_lrca_helper.h diff --git a/opencl/test/unit_test/mocks/mock_os_context.h b/shared/test/common/mocks/mock_os_context.h similarity index 100% rename from opencl/test/unit_test/mocks/mock_os_context.h rename to shared/test/common/mocks/mock_os_context.h diff --git a/opencl/test/unit_test/mocks/mock_ostime_win.h b/shared/test/common/mocks/mock_ostime_win.h similarity index 100% rename from opencl/test/unit_test/mocks/mock_ostime_win.h rename to shared/test/common/mocks/mock_ostime_win.h