diff --git a/CMakeLists.txt b/CMakeLists.txt index b44b803a37..1336da64bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -785,7 +785,6 @@ endif() # Project-wide include paths # Please keep alphabetical order -include_directories(shared/test/unit_test) include_directories(${NEO_BUILD_DIR}) include_directories(${NEO_SOURCE_DIR}) include_directories(${NEO_CORE_DIRECTORY}/command_stream/definitions${BRANCH_DIR_SUFFIX}) diff --git a/opencl/test/unit_test/api/cl_api_tests.h b/opencl/test/unit_test/api/cl_api_tests.h index 3061527356..71f2f0eff4 100644 --- a/opencl/test/unit_test/api/cl_api_tests.h +++ b/opencl/test/unit_test/api/cl_api_tests.h @@ -7,7 +7,7 @@ #pragma once #include "shared/source/execution_environment/root_device_environment.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/tracing/tracing_api.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 43e872f64e..451df12335 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 @@ -6,7 +6,7 @@ */ #include "shared/source/device/device.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.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" 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 03d063e6db..b0feebc033 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 @@ -8,7 +8,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.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" diff --git a/opencl/test/unit_test/api/cl_create_pipe_tests.inl b/opencl/test/unit_test/api/cl_create_pipe_tests.inl index aca36bfe2e..5cb0e3bf35 100644 --- a/opencl/test/unit_test/api/cl_create_pipe_tests.inl +++ b/opencl/test/unit_test/api/cl_create_pipe_tests.inl @@ -6,7 +6,7 @@ */ #include "shared/source/device/device.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/context/context.h" #include "opencl/source/helpers/base_object.h" diff --git a/opencl/test/unit_test/api/cl_create_sub_devices_tests.inl b/opencl/test/unit_test/api/cl_create_sub_devices_tests.inl index 60f86c82f6..29fb380cb6 100644 --- a/opencl/test/unit_test/api/cl_create_sub_devices_tests.inl +++ b/opencl/test/unit_test/api/cl_create_sub_devices_tests.inl @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "test.h" diff --git a/opencl/test/unit_test/api/cl_get_device_ids_tests.inl b/opencl/test/unit_test/api/cl_get_device_ids_tests.inl index 313209be58..2f9ec67e63 100644 --- a/opencl/test/unit_test/api/cl_get_device_ids_tests.inl +++ b/opencl/test/unit_test/api/cl_get_device_ids_tests.inl @@ -5,8 +5,8 @@ * */ -#include "helpers/debug_manager_state_restore.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/helpers/variable_backup.h" diff --git a/opencl/test/unit_test/api/cl_get_platform_ids_tests.inl b/opencl/test/unit_test/api/cl_get_platform_ids_tests.inl index ad3961584e..d822a19182 100644 --- a/opencl/test/unit_test/api/cl_get_platform_ids_tests.inl +++ b/opencl/test/unit_test/api/cl_get_platform_ids_tests.inl @@ -5,7 +5,7 @@ * */ -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/source/context/context.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/helpers/variable_backup.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 79136941a0..b618ce49cb 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,7 +6,7 @@ */ #include "shared/source/device/device.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/mocks/mock_device.h" diff --git a/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp b/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp index 711acb7880..b51739bdee 100644 --- a/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp +++ b/opencl/test/unit_test/api/cl_mem_locally_uncached_resource_tests.cpp @@ -10,7 +10,7 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/state_base_address.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/api/api.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/extensions/public/cl_ext_private.h" diff --git a/opencl/test/unit_test/api/cl_set_event_callback_tests.inl b/opencl/test/unit_test/api/cl_set_event_callback_tests.inl index 31165fdd94..3d1da1f988 100644 --- a/opencl/test/unit_test/api/cl_set_event_callback_tests.inl +++ b/opencl/test/unit_test/api/cl_set_event_callback_tests.inl @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/event/event.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_svm_alloc_tests.inl b/opencl/test/unit_test/api/cl_svm_alloc_tests.inl index bef4708479..f2ace35a94 100644 --- a/opencl/test/unit_test/api/cl_svm_alloc_tests.inl +++ b/opencl/test/unit_test/api/cl_svm_alloc_tests.inl @@ -6,7 +6,7 @@ */ #include "shared/source/device/device.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/context/context.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl b/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl index 2c5c390b6c..dddd1aa3f0 100644 --- a/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl +++ b/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl @@ -6,7 +6,7 @@ */ #include "shared/source/memory_manager/unified_memory_manager.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/aub/aub_center_tests.cpp b/opencl/test/unit_test/aub/aub_center_tests.cpp index 57e7f2459a..73d16f94ca 100644 --- a/opencl/test/unit_test/aub/aub_center_tests.cpp +++ b/opencl/test/unit_test/aub/aub_center_tests.cpp @@ -8,8 +8,8 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/hw_info.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "opencl/test/unit_test/mocks/mock_aub_center.h" #include "opencl/test/unit_test/mocks/mock_aub_manager.h" diff --git a/opencl/test/unit_test/aub/aub_center_using_aubstream_stubs_tests.cpp b/opencl/test/unit_test/aub/aub_center_using_aubstream_stubs_tests.cpp index 7dbd3e3ae4..2c875f2505 100644 --- a/opencl/test/unit_test/aub/aub_center_using_aubstream_stubs_tests.cpp +++ b/opencl/test/unit_test/aub/aub_center_using_aubstream_stubs_tests.cpp @@ -8,8 +8,8 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/options.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "opencl/test/unit_test/mocks/mock_aub_center.h" diff --git a/opencl/test/unit_test/aub/aub_helper_tests.inl b/opencl/test/unit_test/aub/aub_helper_tests.inl index 82b04bf623..2421319614 100644 --- a/opencl/test/unit_test/aub/aub_helper_tests.inl +++ b/opencl/test/unit_test/aub/aub_helper_tests.inl @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/basic_math.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/aub/aub_helper.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" #include "opencl/source/aub_mem_dump/page_table_entry_bits.h" diff --git a/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp b/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp index 67d2444bbf..3d3d424718 100644 --- a/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp +++ b/opencl/test/unit_test/aub_mem_dump/aub_alloc_dump_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/gmm_helper/gmm.h" #include "shared/source/gmm_helper/gmm_helper.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/aub_mem_dump/aub_alloc_dump.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp index 3a1143956e..8356847999 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_buffer_aub_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/ptr_math.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp index 268c31d7fc..537f77afbb 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/ptr_math.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h index 6b9bb7a447..2dc05a9fb0 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h @@ -7,7 +7,7 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp index 9787fd7452..97dbf6fce2 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_buffer_aub_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/command_stream/command_stream_receiver.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.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 db80e9c384..e1682d6888 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 @@ -11,7 +11,7 @@ #include "shared/source/device/device.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/memory_management.h" +#include "shared/test/unit_test/helpers/memory_management.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/command_stream/tbx_command_stream_receiver.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp index aff2f9bb34..0f07a6d8b9 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.cpp @@ -8,7 +8,7 @@ #include "aub_mem_dump_tests.h" #include "shared/source/helpers/hw_helper.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/aub/aub_helper.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/mocks/mock_aub_csr.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 399e8ba255..0a1ede4f04 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 @@ -8,7 +8,7 @@ #include "aub_batch_buffer_tests_gen12lp.h" #include "shared/source/memory_manager/graphics_allocation.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/source/utilities/tag_allocator.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/event.h" diff --git a/opencl/test/unit_test/built_ins/built_in_tests.cpp b/opencl/test/unit_test/built_ins/built_in_tests.cpp index 667cc751ef..ca4ca620db 100644 --- a/opencl/test/unit_test/built_ins/built_in_tests.cpp +++ b/opencl/test/unit_test/built_ins/built_in_tests.cpp @@ -11,8 +11,8 @@ #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/hash.h" #include "shared/source/helpers/string.h" -#include "helpers/debug_manager_state_restore.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/built_ins/aux_translation_builtin.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.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 c9fa75c49a..94a106aafc 100644 --- a/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp +++ b/opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "helpers/debug_manager_state_restore.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/helpers/hw_parse.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" diff --git a/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp index f5a4dd85e4..e7d98e3ba5 100644 --- a/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_hw_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "helpers/debug_manager_state_restore.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/helpers/dispatch_info_builder.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" diff --git a/opencl/test/unit_test/command_queue/command_queue_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_tests.cpp index 66c236a0b6..a717c67779 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/timestamp_packet.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/memory_manager/memory_manager.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/event.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp index 68651e83b8..2d95fb8521 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/memory_manager/internal_allocation_storage.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/source/utilities/tag_allocator.h" #include "opencl/source/built_ins/aux_translation_builtin.h" #include "opencl/source/command_queue/gpgpu_walker.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 dafde1e920..c4e6f9d72d 100644 --- a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/command_stream/aub_subcapture.h" #include "opencl/source/event/user_event.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp index 08c2498d97..dc2b7085a1 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp index a5522aef6f..68b5546e69 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp @@ -8,8 +8,8 @@ #include "shared/source/command_stream/scratch_space_controller.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/memory_manager/allocations_list.h" -#include "helpers/debug_manager_state_restore.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp index ab0df09e06..652a572fec 100644 --- a/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_map_buffer_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/helpers/aligned_memory.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp index cde29a7dee..215208310b 100644 --- a/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_map_image_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_event_tests.cpp index 9b77811c65..80b74d3902 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_event_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_event_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp index 01f48365bd..dd61eb313e 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/cache_policy.h" #include "shared/source/memory_manager/allocations_list.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/helpers/dispatch_info.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp index f58b39c291..85221854b2 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/memory_manager/allocations_list.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp index b17da26a7d..3c2c19bc59 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp @@ -11,9 +11,9 @@ #include "shared/source/memory_manager/allocations_list.h" #include "shared/source/memory_manager/surface.h" #include "shared/source/memory_manager/unified_memory_manager.h" -#include "helpers/debug_manager_state_restore.h" -#include "page_fault_manager/mock_cpu_page_fault_manager.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/command_queue/enqueue_map_buffer_fixture.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp index 0d9239a3cc..f4d3c4e83e 100644 --- a/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_unmap_memobject_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/command_stream/command_stream_receiver.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_event_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_event_tests.cpp index 09a7792ce6..380453fc8d 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_event_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_event_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/command_queue/buffer_operations_fixture.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp index e8b66daa9f..8a724cc4a3 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/memory_manager/allocations_list.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/helpers/dispatch_info.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 8f52e7b757..c88a81c396 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 @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" diff --git a/opencl/test/unit_test/command_queue/work_group_size_tests.cpp b/opencl/test/unit_test/command_queue/work_group_size_tests.cpp index b0eea393ee..cc1b827259 100644 --- a/opencl/test/unit_test/command_queue/work_group_size_tests.cpp +++ b/opencl/test/unit_test/command_queue/work_group_size_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.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 882cdc7a08..b7f9ddbbb2 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 @@ -7,7 +7,7 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/aub_mem_dump/aub_alloc_dump.h" #include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/helpers/hardware_context_controller.h" 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 1f440469c9..338262f1d6 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 @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/hw_helper.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/aub_mem_dump/aub_alloc_dump.h" #include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/helpers/hardware_context_controller.h" diff --git a/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp b/opencl/test/unit_test/command_stream/aub_file_stream_tests.cpp index 9bd2d53807..d41d68d511 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 @@ -6,7 +6,7 @@ */ #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/helpers/hardware_context_controller.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 7813deb89b..ac1a46044b 100644 --- a/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp +++ b/opencl/test/unit_test/command_stream/aub_subcapture_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/command_stream/aub_subcapture.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp index ed63b9da8e..b7ad466702 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp @@ -7,8 +7,8 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/ult_hw_helper.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/ult_hw_helper.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" 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 1c8f38de32..95c27d38d0 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 @@ -12,7 +12,7 @@ #include "shared/source/helpers/state_base_address.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" #include "opencl/test/unit_test/helpers/dispatch_flags_helper.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 1e1c6e5182..bec9533165 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 @@ -7,7 +7,7 @@ #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/memory_manager/memory_manager.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/platform/platform.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 6a672338a0..08527d9dc5 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 @@ -17,8 +17,8 @@ #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/os_interface/linux/debug_env_reader.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/ult_hw_helper.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/ult_hw_helper.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/gpgpu_walker.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.cpp index 31a5a305dd..ceb9be75d6 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_tests.cpp @@ -20,8 +20,8 @@ #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/os_interface/linux/debug_env_reader.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/gpgpu_walker.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp index c4f8555bab..18a3e5e8a9 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp @@ -17,7 +17,7 @@ #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/memory_manager/surface.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/source/utilities/tag_allocator.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp b/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp index 50de0d1585..cebe5bd589 100644 --- a/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp +++ b/opencl/test/unit_test/command_stream/create_command_stream_receiver_tests.cpp @@ -7,8 +7,8 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/execution_environment/execution_environment.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" diff --git a/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp b/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp index a5606433e1..30e4ca06da 100644 --- a/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp +++ b/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/memory_manager/memory_constants.h" #include "shared/source/memory_manager/memory_manager.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/fixtures/multi_root_device_fixture.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h" diff --git a/opencl/test/unit_test/command_stream/get_devices_tests.cpp b/opencl/test/unit_test/command_stream/get_devices_tests.cpp index b0ec9f7ad7..0967418cca 100644 --- a/opencl/test/unit_test/command_stream/get_devices_tests.cpp +++ b/opencl/test/unit_test/command_stream/get_devices_tests.cpp @@ -9,8 +9,8 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/hw_info_config.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/helpers/variable_backup.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 ae4e3ca177..7c3322b1d0 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 @@ -10,7 +10,7 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" diff --git a/opencl/test/unit_test/context/context_tests.cpp b/opencl/test/unit_test/context/context_tests.cpp index 2cac84e04c..22891fcbe5 100644 --- a/opencl/test/unit_test/context/context_tests.cpp +++ b/opencl/test/unit_test/context/context_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/device/device.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.inl" #include "opencl/source/device_queue/device_queue.h" diff --git a/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp index 5f57e96ee1..179f03481c 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp +++ b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/memory_manager/unified_memory_manager.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/context/driver_diagnostics_tests.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" diff --git a/opencl/test/unit_test/context/driver_diagnostics_tests.cpp b/opencl/test/unit_test/context/driver_diagnostics_tests.cpp index 4175853847..10b67a3cb2 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_tests.cpp +++ b/opencl/test/unit_test/context/driver_diagnostics_tests.cpp @@ -7,7 +7,7 @@ #include "driver_diagnostics_tests.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/mem_obj_helper.h" #include "opencl/test/unit_test/mocks/mock_gmm.h" diff --git a/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp b/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp index cf0828fecf..7e7965f33b 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" diff --git a/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp b/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp index 371d66d393..e93aea015a 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/source/utilities/arrayref.h" #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp b/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp index 7c1747722b..ecd07e5707 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/source/utilities/arrayref.h" #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp index e867b91994..552215e5c6 100644 --- a/opencl/test/unit_test/device/device_caps_tests.cpp +++ b/opencl/test/unit_test/device/device_caps_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/os_interface/os_interface.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/device/driver_info.h" #include "opencl/test/unit_test/helpers/hw_helper_tests.h" #include "opencl/test/unit_test/helpers/variable_backup.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 161c0805cc..a040a82a4a 100644 --- a/opencl/test/unit_test/device/device_get_engine_tests.cpp +++ b/opencl/test/unit_test/device/device_get_engine_tests.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/helpers/options.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "opencl/test/unit_test/mocks/mock_device.h" diff --git a/opencl/test/unit_test/device/device_tests.cpp b/opencl/test/unit_test/device/device_tests.cpp index 1681785525..38f0d84e0c 100644 --- a/opencl/test/unit_test/device/device_tests.cpp +++ b/opencl/test/unit_test/device/device_tests.cpp @@ -9,8 +9,8 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/indirect_heap/indirect_heap.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/helpers/unit_test_helper.h" diff --git a/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp b/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp index f54be95d71..effa685c04 100644 --- a/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp +++ b/opencl/test/unit_test/device/gl/device_caps_gl_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/hw_info.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/device/sub_device_tests.cpp b/opencl/test/unit_test/device/sub_device_tests.cpp index 6e41de5507..185e8585f7 100644 --- a/opencl/test/unit_test/device/sub_device_tests.cpp +++ b/opencl/test/unit_test/device/sub_device_tests.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/device/sub_device.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.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 3a7673e506..98556e3cac 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 @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/hw_cmds.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/source/utilities/tag_allocator.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/test/unit_test/event/async_events_handler_tests.cpp b/opencl/test/unit_test/event/async_events_handler_tests.cpp index 5f1445db10..883c327cae 100644 --- a/opencl/test/unit_test/event/async_events_handler_tests.cpp +++ b/opencl/test/unit_test/event/async_events_handler_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/timestamp_packet.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/event/async_events_handler.h" #include "opencl/source/event/event.h" #include "opencl/source/event/user_event.h" diff --git a/opencl/test/unit_test/event/event_fixture.h b/opencl/test/unit_test/event/event_fixture.h index 94847d4233..014737be23 100644 --- a/opencl/test/unit_test/event/event_fixture.h +++ b/opencl/test/unit_test/event/event_fixture.h @@ -9,7 +9,7 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" diff --git a/opencl/test/unit_test/event/event_tests.cpp b/opencl/test/unit_test/event/event_tests.cpp index 4f8c7d572c..d558439549 100644 --- a/opencl/test/unit_test/event/event_tests.cpp +++ b/opencl/test/unit_test/event/event_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/os_interface/os_interface.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/source/utilities/tag_allocator.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/perf_counter.h" diff --git a/opencl/test/unit_test/event/event_tests_mt.cpp b/opencl/test/unit_test/event/event_tests_mt.cpp index 7a56263177..d430c16ac9 100644 --- a/opencl/test/unit_test/event/event_tests_mt.cpp +++ b/opencl/test/unit_test/event/event_tests_mt.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/mocks/mock_event.h" #include "event_fixture.h" diff --git a/opencl/test/unit_test/event/event_tracker_tests.cpp b/opencl/test/unit_test/event/event_tracker_tests.cpp index fc22b8a4a8..5998a15ac2 100644 --- a/opencl/test/unit_test/event/event_tracker_tests.cpp +++ b/opencl/test/unit_test/event/event_tracker_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/file_io.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/event/event.h" #include "opencl/source/event/event_tracker.h" diff --git a/opencl/test/unit_test/event/user_events_tests.cpp b/opencl/test/unit_test/event/user_events_tests.cpp index ff1b103ea6..3af83154c0 100644 --- a/opencl/test/unit_test/event/user_events_tests.cpp +++ b/opencl/test/unit_test/event/user_events_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/mocks/mock_event.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 18c5055606..2ca6bcb895 100644 --- a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp +++ b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp @@ -12,8 +12,8 @@ #include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/os_interface.h" -#include "helpers/debug_manager_state_restore.h" -#include "utilities/destructor_counted.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/utilities/destructor_counted.h" #include "opencl/source/aub/aub_center.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" diff --git a/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp b/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp index e663ce8be7..07772571d9 100644 --- a/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp +++ b/opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/helpers/engine_node_helper.h" -#include "helpers/debug_manager_state_restore.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h" #include "opencl/source/command_queue/gpgpu_walker.h" diff --git a/opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp b/opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp index 82c9997e85..4b88717054 100644 --- a/opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp +++ b/opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/enqueue_kernel.h" #include "opencl/source/command_queue/hardware_interface.h" #include "opencl/source/event/perf_counter.h" diff --git a/opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp b/opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp index 8b6b8bafc8..9070416318 100644 --- a/opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp +++ b/opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/enqueue_kernel.h" #include "opencl/source/device_queue/device_queue.h" diff --git a/opencl/test/unit_test/fixtures/d3d_test_fixture.h b/opencl/test/unit_test/fixtures/d3d_test_fixture.h index 98a323455d..4e9f3ab6e5 100644 --- a/opencl/test/unit_test/fixtures/d3d_test_fixture.h +++ b/opencl/test/unit_test/fixtures/d3d_test_fixture.h @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/fixtures/dispatch_flags_fixture.h b/opencl/test/unit_test/fixtures/dispatch_flags_fixture.h index 04ab5c2fb2..810f183e51 100644 --- a/opencl/test/unit_test/fixtures/dispatch_flags_fixture.h +++ b/opencl/test/unit_test/fixtures/dispatch_flags_fixture.h @@ -7,7 +7,7 @@ #pragma once #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.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" diff --git a/opencl/test/unit_test/fixtures/execution_model_fixture.h b/opencl/test/unit_test/fixtures/execution_model_fixture.h index 4fc2342c64..a114dd4038 100644 --- a/opencl/test/unit_test/fixtures/execution_model_fixture.h +++ b/opencl/test/unit_test/fixtures/execution_model_fixture.h @@ -7,7 +7,7 @@ #pragma once -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/device_queue/device_queue.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/execution_model_kernel_fixture.h" diff --git a/opencl/test/unit_test/fixtures/image_fixture.h b/opencl/test/unit_test/fixtures/image_fixture.h index 1d5aacbbd1..1f4c693c9c 100644 --- a/opencl/test/unit_test/fixtures/image_fixture.h +++ b/opencl/test/unit_test/fixtures/image_fixture.h @@ -8,7 +8,7 @@ #pragma once #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/helpers/hw_info.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/test/unit_test/fixtures/memory_allocator_multi_device_fixture.h b/opencl/test/unit_test/fixtures/memory_allocator_multi_device_fixture.h index 4664fad1df..f0a81c51ea 100644 --- a/opencl/test/unit_test/fixtures/memory_allocator_multi_device_fixture.h +++ b/opencl/test/unit_test/fixtures/memory_allocator_multi_device_fixture.h @@ -8,8 +8,8 @@ #pragma once #include "shared/source/execution_environment/execution_environment.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "opencl/test/unit_test/helpers/variable_backup.h" diff --git a/opencl/test/unit_test/fixtures/memory_management_fixture.cpp b/opencl/test/unit_test/fixtures/memory_management_fixture.cpp index ffbd4097a6..0de312dc74 100644 --- a/opencl/test/unit_test/fixtures/memory_management_fixture.cpp +++ b/opencl/test/unit_test/fixtures/memory_management_fixture.cpp @@ -7,8 +7,8 @@ #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" -#include "helpers/memory_leak_listener.h" -#include "helpers/memory_management.h" +#include "shared/test/unit_test/helpers/memory_leak_listener.h" +#include "shared/test/unit_test/helpers/memory_management.h" #include #if defined(__linux__) diff --git a/opencl/test/unit_test/fixtures/memory_management_fixture.h b/opencl/test/unit_test/fixtures/memory_management_fixture.h index 5b7493d138..f738e588ca 100644 --- a/opencl/test/unit_test/fixtures/memory_management_fixture.h +++ b/opencl/test/unit_test/fixtures/memory_management_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "helpers/memory_management.h" +#include "shared/test/unit_test/helpers/memory_management.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/fixtures/mock_aub_center_fixture.h b/opencl/test/unit_test/fixtures/mock_aub_center_fixture.h index 54116ca95f..cac76cab33 100644 --- a/opencl/test/unit_test/fixtures/mock_aub_center_fixture.h +++ b/opencl/test/unit_test/fixtures/mock_aub_center_fixture.h @@ -8,7 +8,7 @@ #pragma once #include "shared/source/execution_environment/root_device_environment.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_aub_center.h" #include "opencl/test/unit_test/mocks/mock_aub_manager.h" 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 53930a00b7..0bc7ca2ee3 100644 --- a/opencl/test/unit_test/fixtures/multi_root_device_fixture.h +++ b/opencl/test/unit_test/fixtures/multi_root_device_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.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" diff --git a/opencl/test/unit_test/fixtures/scenario_test_fixture.h b/opencl/test/unit_test/fixtures/scenario_test_fixture.h index 15fb767515..17bb63b5fb 100644 --- a/opencl/test/unit_test/fixtures/scenario_test_fixture.h +++ b/opencl/test/unit_test/fixtures/scenario_test_fixture.h @@ -7,7 +7,7 @@ #pragma once -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" diff --git a/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h b/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h index 0a60b2c040..320a89c6a4 100644 --- a/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h @@ -9,7 +9,7 @@ #include "shared/source/device/device.h" #include "shared/source/helpers/array_count.h" #include "shared/source/helpers/file_io.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/program/program.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" diff --git a/opencl/test/unit_test/fixtures/templated_fixture_tests.cpp b/opencl/test/unit_test/fixtures/templated_fixture_tests.cpp index e0f3604b9d..1e2c6c4c74 100644 --- a/opencl/test/unit_test/fixtures/templated_fixture_tests.cpp +++ b/opencl/test/unit_test/fixtures/templated_fixture_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "test.h" 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 1cdbd3b2d2..408f5c6fa7 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 @@ -7,7 +7,7 @@ #include "shared/source/command_stream/command_stream_receiver_hw.h" #include "shared/source/helpers/hw_helper.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/gen11/reg_configs.h" #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" #include "opencl/test/unit_test/helpers/hw_parse.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 8e0515f047..d9eef2ac4a 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 @@ -6,7 +6,7 @@ */ #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" 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 6cad0ba125..d519e2de37 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 @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/mocks/mock_aub_stream.h" #include "test.h" diff --git a/opencl/test/unit_test/gen12lp/gen12lp_tests_wrapper.cpp b/opencl/test/unit_test/gen12lp/gen12lp_tests_wrapper.cpp index ca7e7501d0..b702986ed2 100644 --- a/opencl/test/unit_test/gen12lp/gen12lp_tests_wrapper.cpp +++ b/opencl/test/unit_test/gen12lp/gen12lp_tests_wrapper.cpp @@ -5,7 +5,7 @@ * */ -#include "gen12lp/test_preemption_gen12lp.inl" +#include "shared/test/unit_test/gen12lp/test_preemption_gen12lp.inl" #include "opencl/test/unit_test/gen12lp/aub_command_stream_receiver_tests_gen12lp.inl" #include "opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl" #include "opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl" diff --git a/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl index 5b0491afeb..0b6ac69944 100644 --- a/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl @@ -6,8 +6,8 @@ */ #include "shared/source/debug_settings/debug_settings_manager.h" -#include "helpers/debug_manager_state_restore.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/sampler/sampler.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp index 643fb67eb8..ec3951b335 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/test_hw_info_config_tgllp.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/os_interface/device_factory.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "test.h" diff --git a/opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp index 6877cb6f58..e8e6ceb847 100644 --- a/opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/windows/gmm_callbacks_tests_gen12lp.cpp @@ -9,8 +9,8 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/helpers/windows/gmm_callbacks.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/os_interface/windows/wddm_device_command_stream.h" diff --git a/opencl/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp index be1f869f2b..836b9249da 100644 --- a/opencl/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/os_interface/windows/os_interface.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h" #include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" diff --git a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp index 8c5e1a9496..a5f00d97ee 100644 --- a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp +++ b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp @@ -11,7 +11,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/helpers/ptr_math.h" #include "shared/source/sku_info/operations/sku_info_transfer.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/helpers/variable_backup.h" diff --git a/opencl/test/unit_test/gtpin/gtpin_tests.cpp b/opencl/test/unit_test/gtpin/gtpin_tests.cpp index 31bdaa383b..ec62bed24f 100644 --- a/opencl/test/unit_test/gtpin/gtpin_tests.cpp +++ b/opencl/test/unit_test/gtpin/gtpin_tests.cpp @@ -12,7 +12,7 @@ #include "shared/source/helpers/hash.h" #include "shared/source/memory_manager/surface.h" #include "shared/source/os_interface/os_context.h" -#include "device_binary_format/patchtokens_tests.h" +#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "opencl/source/api/api.h" #include "opencl/source/context/context.h" #include "opencl/source/gtpin/gtpin_defs.h" diff --git a/opencl/test/unit_test/helpers/deferred_deleter_helpers_tests.cpp b/opencl/test/unit_test/helpers/deferred_deleter_helpers_tests.cpp index 75f533d15e..d59f09a5ba 100644 --- a/opencl/test/unit_test/helpers/deferred_deleter_helpers_tests.cpp +++ b/opencl/test/unit_test/helpers/deferred_deleter_helpers_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/deferred_deleter_helper.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/execution_environment_helper.cpp b/opencl/test/unit_test/helpers/execution_environment_helper.cpp index d09336183b..938ffa1020 100644 --- a/opencl/test/unit_test/helpers/execution_environment_helper.cpp +++ b/opencl/test/unit_test/helpers/execution_environment_helper.cpp @@ -8,7 +8,7 @@ #include "opencl/test/unit_test/helpers/execution_environment_helper.h" #include "shared/source/os_interface/device_factory.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/platform/platform.h" namespace NEO { diff --git a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp index 79a1861ab2..1348406513 100644 --- a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp @@ -10,8 +10,8 @@ #include "shared/source/helpers/basic_math.h" #include "shared/source/helpers/engine_node_helper.h" #include "shared/source/memory_manager/unified_memory_manager.h" -#include "helpers/debug_manager_state_restore.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/api/api.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" diff --git a/opencl/test/unit_test/helpers/hw_helper_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_tests.cpp index c6312c870a..9b22247134 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests.cpp @@ -15,7 +15,7 @@ #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/os_interface/hw_info_config.h" #include "shared/source/os_interface/os_interface.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/helpers/kmd_notify_tests.cpp b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp index 3ec8e01b4e..621a87138d 100644 --- a/opencl/test/unit_test/helpers/kmd_notify_tests.cpp +++ b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp b/opencl/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp index 94fe79ff01..61869edfde 100644 --- a/opencl/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp +++ b/opencl/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/kmd_notify_properties.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "test.h" namespace NEO { diff --git a/opencl/test/unit_test/helpers/memory_management_tests.cpp b/opencl/test/unit_test/helpers/memory_management_tests.cpp index 38d7eb996c..3eb076b572 100644 --- a/opencl/test/unit_test/helpers/memory_management_tests.cpp +++ b/opencl/test/unit_test/helpers/memory_management_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/memory_management.h" +#include "shared/test/unit_test/helpers/memory_management.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp b/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp index bd9c7fda54..46fb40cd87 100644 --- a/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp +++ b/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/helpers/timestamp_packet.h" -#include "helpers/debug_manager_state_restore.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "shared/source/utilities/tag_allocator.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/command_queue/hardware_interface.h" diff --git a/opencl/test/unit_test/helpers/transfer_properties_tests.cpp b/opencl/test/unit_test/helpers/transfer_properties_tests.cpp index 7e1b6032fa..a1a0dcaef3 100644 --- a/opencl/test/unit_test/helpers/transfer_properties_tests.cpp +++ b/opencl/test/unit_test/helpers/transfer_properties_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/helpers/properties_helper.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" diff --git a/opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp b/opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp index 469898b378..1ae8c22f54 100644 --- a/opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp +++ b/opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/helpers/kmd_notify_properties.h" #include "shared/source/os_interface/windows/sys_calls.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "test.h" diff --git a/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp b/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp index 44caf910b1..1cf0cde00b 100644 --- a/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_cache_flush_requirements_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" diff --git a/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp b/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp index 3b4ad6864e..8731de9e55 100644 --- a/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_reflection_surface_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/execution_model/device_enqueue.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/program/printf_handler.h" diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp index 3c1a1e0c9e..4a7dfca338 100644 --- a/opencl/test/unit_test/kernel/kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_tests.cpp @@ -13,9 +13,9 @@ #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 "helpers/debug_manager_state_restore.h" -#include "page_fault_manager/mock_cpu_page_fault_manager.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/helpers/surface_formats.h" diff --git a/opencl/test/unit_test/libult/create_command_stream.cpp b/opencl/test/unit_test/libult/create_command_stream.cpp index 56e1890def..4cb83a15f1 100644 --- a/opencl/test/unit_test/libult/create_command_stream.cpp +++ b/opencl/test/unit_test/libult/create_command_stream.cpp @@ -9,8 +9,8 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/execution_environment/root_device_environment.h" -#include "helpers/default_hw_info.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/command_stream/create_command_stream_impl.h" #include "opencl/source/command_stream/tbx_command_stream_receiver.h" diff --git a/opencl/test/unit_test/libult/ult_command_stream_receiver.h b/opencl/test/unit_test/libult/ult_command_stream_receiver.h index ce1fccd2a9..d6e2d53ce2 100644 --- a/opencl/test/unit_test/libult/ult_command_stream_receiver.h +++ b/opencl/test/unit_test/libult/ult_command_stream_receiver.h @@ -11,7 +11,7 @@ #include "shared/source/direct_submission/direct_submission_hw.h" #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" #include "opencl/test/unit_test/mocks/mock_experimental_command_buffer.h" diff --git a/opencl/test/unit_test/linux/drm_null_device_tests.cpp b/opencl/test/unit_test/linux/drm_null_device_tests.cpp index a1c0266068..e2c6a908c3 100644 --- a/opencl/test/unit_test/linux/drm_null_device_tests.cpp +++ b/opencl/test/unit_test/linux/drm_null_device_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/os_interface/linux/drm_null_device.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/linux/drm_wrap.h" #include "opencl/test/unit_test/linux/mock_os_layer.h" #include "test.h" diff --git a/opencl/test/unit_test/linux/main_linux_dll.cpp b/opencl/test/unit_test/linux/main_linux_dll.cpp index d028d1e262..b29a591ad8 100644 --- a/opencl/test/unit_test/linux/main_linux_dll.cpp +++ b/opencl/test/unit_test/linux/main_linux_dll.cpp @@ -11,9 +11,9 @@ #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/os_interface/linux/allocator_helper.h" #include "shared/source/os_interface/linux/os_interface.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/default_hw_info.inl" -#include "helpers/ult_hw_config.inl" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/default_hw_info.inl" +#include "shared/test/unit_test/helpers/ult_hw_config.inl" #include "opencl/test/unit_test/custom_event_listener.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "opencl/test/unit_test/linux/drm_wrap.h" diff --git a/opencl/test/unit_test/main.cpp b/opencl/test/unit_test/main.cpp index 1ea83a674d..80e7f7ef31 100644 --- a/opencl/test/unit_test/main.cpp +++ b/opencl/test/unit_test/main.cpp @@ -10,9 +10,9 @@ #include "shared/source/gmm_helper/gmm_interface.h" #include "shared/source/gmm_helper/resource_info.h" #include "shared/source/os_interface/hw_info_config.h" -#include "helpers/default_hw_info.inl" -#include "helpers/memory_leak_listener.h" -#include "helpers/ult_hw_config.inl" +#include "shared/test/unit_test/helpers/default_hw_info.inl" +#include "shared/test/unit_test/helpers/memory_leak_listener.h" +#include "shared/test/unit_test/helpers/ult_hw_config.inl" #include "shared/source/utilities/debug_settings_reader.h" #include "opencl/source/os_interface/ocl_reg_path.h" #include "opencl/test/unit_test/custom_event_listener.h" diff --git a/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp index 6ad4c7170d..8fb4766467 100644 --- a/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_set_arg_tests.cpp @@ -10,7 +10,7 @@ #include "shared/source/helpers/ptr_math.h" #include "shared/source/memory_manager/surface.h" #include "shared/source/memory_manager/unified_memory_manager.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" diff --git a/opencl/test/unit_test/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp index cb766ca623..d04441eff2 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp @@ -14,9 +14,9 @@ #include "shared/source/memory_manager/memory_operations_handler.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/ult_hw_config.h" -#include "utilities/base_object_utils.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/utilities/base_object_utils.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/event/user_event.h" diff --git a/opencl/test/unit_test/mem_obj/get_mem_object_info_tests.cpp b/opencl/test/unit_test/mem_obj/get_mem_object_info_tests.cpp index 8315f70986..3b0f54d53a 100644 --- a/opencl/test/unit_test/mem_obj/get_mem_object_info_tests.cpp +++ b/opencl/test/unit_test/mem_obj/get_mem_object_info_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/helpers/ptr_math.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/fixtures/platform_fixture.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 6f6fc0f2d4..fd6ca758f4 100644 --- a/opencl/test/unit_test/mem_obj/image_compression_fixture.h +++ b/opencl/test/unit_test/mem_obj/image_compression_fixture.h @@ -5,7 +5,7 @@ * */ -#include "utilities/base_object_utils.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_context.h" #include "opencl/test/unit_test/mocks/mock_device.h" diff --git a/opencl/test/unit_test/mem_obj/image_tests.cpp b/opencl/test/unit_test/mem_obj/image_tests.cpp index f840156424..2dea01cea5 100644 --- a/opencl/test/unit_test/mem_obj/image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/aligned_memory.h" #include "shared/source/image/image_surface_state.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/helpers/mipmap.h" #include "opencl/source/mem_obj/image.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 5b2ec20f9d..5ca3f353b3 100644 --- a/opencl/test/unit_test/mem_obj/image_transfer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_transfer_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.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" diff --git a/opencl/test/unit_test/mem_obj/mem_obj_helper_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_helper_tests.cpp index db89da5da7..c9b1f2ff55 100644 --- a/opencl/test/unit_test/mem_obj/mem_obj_helper_tests.cpp +++ b/opencl/test/unit_test/mem_obj/mem_obj_helper_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/mem_obj_helper.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" diff --git a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp index be79991baf..6ac55c84d6 100644 --- a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/gmm_helper/gmm.h" #include "shared/source/helpers/aligned_memory.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp b/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp index 111edd3da3..2123628eb9 100644 --- a/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp +++ b/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/aligned_memory.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" diff --git a/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp b/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp index 56210a4f83..3f13d64fa7 100644 --- a/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp +++ b/opencl/test/unit_test/memory_manager/cpu_page_fault_manager_memory_sync_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "page_fault_manager/cpu_page_fault_manager_tests_fixture.h" +#include "shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h" #include "opencl/source/command_queue/command_queue.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp b/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp index 161913c96c..2db88d8d5b 100644 --- a/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp +++ b/opencl/test/unit_test/memory_manager/internal_allocation_storage_tests.cpp @@ -7,8 +7,8 @@ #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" -#include "utilities/containers_tests_helpers.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/utilities/containers_tests_helpers.h" #include "opencl/test/unit_test/fixtures/memory_allocator_fixture.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" diff --git a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl index 0653931832..7cbb9dc20a 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl +++ b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.inl @@ -7,7 +7,7 @@ #include "shared/source/debug_settings/debug_settings_manager.h" #include "shared/source/execution_environment/execution_environment.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.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 5806a4140f..f787183ab8 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -15,8 +15,8 @@ #include "shared/source/os_interface/os_context.h" #include "shared/source/os_interface/os_interface.h" #include "shared/source/program/program_initialization.h" -#include "compiler_interface/linker_mock.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/compiler_interface/linker_mock.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/event/event.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp index ffad451fb9..8bb7e3d911 100644 --- a/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/unified_memory_manager_tests.cpp @@ -7,8 +7,8 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/memory_manager/allocations_list.h" -#include "helpers/debug_manager_state_restore.h" -#include "page_fault_manager/mock_cpu_page_fault_manager.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" #include "opencl/source/api/api.h" #include "opencl/source/mem_obj/mem_obj_helper.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" diff --git a/opencl/test/unit_test/mocks/mock_aub_csr.h b/opencl/test/unit_test/mocks/mock_aub_csr.h index 00c9ac7e18..3c9782dd76 100644 --- a/opencl/test/unit_test/mocks/mock_aub_csr.h +++ b/opencl/test/unit_test/mocks/mock_aub_csr.h @@ -11,7 +11,7 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/hw_info.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" diff --git a/opencl/test/unit_test/mocks/mock_device.h b/opencl/test/unit_test/mocks/mock_device.h index 4e69a0abd9..d2463b24d6 100644 --- a/opencl/test/unit_test/mocks/mock_device.h +++ b/opencl/test/unit_test/mocks/mock_device.h @@ -9,7 +9,7 @@ #include "shared/source/device/root_device.h" #include "shared/source/device/sub_device.h" #include "shared/source/helpers/hw_helper.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "opencl/source/device/cl_device.h" #include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" #include "opencl/test/unit_test/helpers/variable_backup.h" diff --git a/opencl/test/unit_test/mocks/mock_memory_manager.h b/opencl/test/unit_test/mocks/mock_memory_manager.h index 366421c6d9..40c9d06620 100644 --- a/opencl/test/unit_test/mocks/mock_memory_manager.h +++ b/opencl/test/unit_test/mocks/mock_memory_manager.h @@ -7,7 +7,7 @@ #pragma once #include "shared/source/execution_environment/execution_environment.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_host_ptr_manager.h" diff --git a/opencl/test/unit_test/mocks/mock_program.cpp b/opencl/test/unit_test/mocks/mock_program.cpp index 90b5f2f06d..fea48b276e 100644 --- a/opencl/test/unit_test/mocks/mock_program.cpp +++ b/opencl/test/unit_test/mocks/mock_program.cpp @@ -11,7 +11,7 @@ #include "shared/source/device_binary_format/patchtokens_decoder.h" #include "shared/source/helpers/hash.h" #include "shared/source/program/program_info_from_patchtokens.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "opencl/source/context/context.h" #include "opencl/source/program/create.inl" #include "opencl/source/program/kernel_info.h" diff --git a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp index 1d41305d8d..6fd40d9fe4 100644 --- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp +++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp @@ -11,7 +11,7 @@ #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/hw_cmds.h" #include "shared/source/helpers/hw_info.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/mocks/mock_compilers.h" #include "compiler_options.h" diff --git a/opencl/test/unit_test/os_interface/device_factory_tests.cpp b/opencl/test/unit_test/os_interface/device_factory_tests.cpp index 42de0ae591..b382084be0 100644 --- a/opencl/test/unit_test/os_interface/device_factory_tests.cpp +++ b/opencl/test/unit_test/os_interface/device_factory_tests.cpp @@ -11,7 +11,7 @@ #include "shared/source/os_interface/device_factory.h" #include "shared/source/os_interface/os_interface.h" #include "shared/source/os_interface/os_library.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" diff --git a/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp b/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp index 6fbd4a93ca..8422ad4c46 100644 --- a/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp +++ b/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp @@ -9,7 +9,7 @@ #include "shared/source/os_interface/linux/drm_memory_manager.h" #include "shared/source/os_interface/linux/os_interface.h" #include "shared/source/os_interface/os_interface.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h b/opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h index 91011369fd..d156bc99e7 100644 --- a/opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h +++ b/opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h @@ -10,7 +10,7 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/linux/drm_memory_manager.h" #include "shared/source/os_interface/linux/drm_neo.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/helpers/gtest_helpers.h" diff --git a/opencl/test/unit_test/os_interface/linux/device_factory_tests.cpp b/opencl/test/unit_test/os_interface/linux/device_factory_tests.cpp index 1e4bb91eb9..de8164b622 100644 --- a/opencl/test/unit_test/os_interface/linux/device_factory_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/device_factory_tests.cpp @@ -10,7 +10,7 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/linux/os_interface.h" #include "shared/source/os_interface/os_interface.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" TEST_F(DeviceFactoryLinuxTest, GetDevicesCheckEUCntSSCnt) { const HardwareInfo *refHwinfo = *platformDevices; 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 4e9c67e9c2..134785d233 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 @@ -7,7 +7,7 @@ #include "shared/source/device/device.h" #include "shared/source/helpers/get_info.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h b/opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h index 029ec07b03..4469eec0f1 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h +++ b/opencl/test/unit_test/os_interface/linux/drm_command_stream_fixture.h @@ -9,7 +9,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/source/os_interface/linux/os_interface.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/os_interface/linux/drm_command_stream.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/mocks/linux/mock_drm_command_stream_receiver.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp index 07cb044549..1d37248c49 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_command_stream_mm_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/os_interface/linux/drm_memory_manager.h" #include "shared/source/os_interface/linux/drm_memory_operations_handler.h" #include "shared/source/os_interface/linux/os_interface.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/os_interface/linux/drm_command_stream.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp index b71c1d4a70..15a081a66a 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp @@ -17,7 +17,7 @@ #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/source/os_interface/linux/os_interface.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/os_interface/linux/drm_command_stream.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp index 2da0aef980..918f06ccd0 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp @@ -22,8 +22,8 @@ #include "shared/source/os_interface/linux/drm_memory_manager.h" #include "shared/source/os_interface/linux/os_context_linux.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "shared/source/utilities/tag_allocator.h" #include "opencl/source/command_stream/device_command_stream.h" #include "opencl/source/event/event.h" diff --git a/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp index 99f09cd376..7d8d802e80 100644 --- a/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp @@ -9,8 +9,8 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/linux/os_interface.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/default_hw_info.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 dfb6f69771..976a5548f9 100644 --- a/opencl/test/unit_test/os_interface/performance_counters_tests.cpp +++ b/opencl/test/unit_test/os_interface/performance_counters_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/os_interface.h" #include "shared/source/os_interface/os_time.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/source/utilities/tag_allocator.h" #include "opencl/test/unit_test/fixtures/device_instrumentation_fixture.h" #include "opencl/test/unit_test/mocks/mock_device.h" diff --git a/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp b/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp index c90f85f187..58d6b1a6f7 100644 --- a/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp +++ b/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp @@ -9,7 +9,7 @@ #include "shared/source/os_interface/os_interface.h" #include "shared/source/os_interface/windows/os_interface.h" #include "shared/source/os_interface/windows/wddm_memory_manager.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" namespace NEO { 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 032e592eb9..62278aca95 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 @@ -18,8 +18,8 @@ #include "shared/source/os_interface/windows/wddm_memory_manager.h" #include "shared/source/os_interface/windows/wddm_memory_operations_handler.h" #include "shared/source/os_interface/windows/wddm_residency_controller.h" -#include "helpers/debug_manager_state_restore.h" -#include "os_interface/windows/mock_gdi_interface.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/os_interface/windows/mock_gdi_interface.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/command_stream/device_command_stream.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 b7ba8db57a..4208658f2c 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 @@ -7,7 +7,7 @@ #include "shared/source/device/device.h" #include "shared/source/helpers/get_info.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/mocks/mock_device.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 a7c24874a4..6c2ce64863 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 @@ -10,7 +10,7 @@ #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/os_interface/windows/debug_registry_reader.h" #include "shared/source/os_interface/windows/os_interface.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/os_interface/windows/driver_info.h" #include "opencl/test/unit_test/helpers/variable_backup.h" diff --git a/opencl/test/unit_test/os_interface/windows/gdi_dll_fixture.h b/opencl/test/unit_test/os_interface/windows/gdi_dll_fixture.h index 61e3fbf516..c3bf359412 100644 --- a/opencl/test/unit_test/os_interface/windows/gdi_dll_fixture.h +++ b/opencl/test/unit_test/os_interface/windows/gdi_dll_fixture.h @@ -8,7 +8,7 @@ #pragma once #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/os_library.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "opencl/test/unit_test/mock_gdi/mock_gdi.h" using namespace NEO; diff --git a/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp index 84e7bfce42..0bc22b573b 100644 --- a/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.cpp @@ -11,7 +11,7 @@ #include "shared/source/helpers/hw_helper.h" #include "shared/source/os_interface/windows/os_interface.h" #include "shared/source/os_interface/windows/wddm/wddm.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "test.h" diff --git a/opencl/test/unit_test/os_interface/windows/os_context_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/os_context_win_tests.cpp index b867758c3c..38d254b91d 100644 --- a/opencl/test/unit_test/os_interface/windows/os_context_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/os_context_win_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/mocks/mock_wddm.h" #include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" diff --git a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp index 8ace35cb23..46ec2aa1a4 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp @@ -18,7 +18,7 @@ #include "shared/source/os_interface/windows/wddm_allocation.h" #include "shared/source/os_interface/windows/wddm_engine_mapper.h" #include "shared/source/os_interface/windows/wddm_memory_manager.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" diff --git a/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp index 05051fa368..02f4074325 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp @@ -12,7 +12,7 @@ #include "shared/source/os_interface/windows/gdi_interface.h" #include "shared/source/os_interface/windows/os_context_win.h" #include "shared/source/os_interface/windows/os_interface.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_wddm.h" #include "opencl/test/unit_test/mocks/mock_wddm_interface23.h" diff --git a/opencl/test/unit_test/os_interface/windows/wddm_fixture.h b/opencl/test/unit_test/os_interface/windows/wddm_fixture.h index 64316c8375..1745a3bc3b 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_fixture.h +++ b/opencl/test/unit_test/os_interface/windows/wddm_fixture.h @@ -15,8 +15,8 @@ #include "shared/source/os_interface/windows/os_context_win.h" #include "shared/source/os_interface/windows/os_interface.h" #include "shared/source/os_interface/windows/wddm_memory_operations_handler.h" -#include "helpers/default_hw_info.h" -#include "os_interface/windows/mock_gdi_interface.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" +#include "shared/test/unit_test/os_interface/windows/mock_gdi_interface.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_wddm.h" #include "opencl/test/unit_test/mocks/mock_wddm_interface20.h" diff --git a/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp index bea270ab70..015b66dcbe 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_kmdaf_listener_tests.cpp @@ -12,7 +12,7 @@ #include "shared/source/memory_manager/memory_manager.h" #include "shared/source/os_interface/windows/wddm/wddm.h" #include "shared/source/os_interface/windows/wddm_allocation.h" -#include "os_interface/windows/mock_gdi_interface.h" +#include "shared/test/unit_test/os_interface/windows/mock_gdi_interface.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mock_gdi/mock_gdi.h" #include "opencl/test/unit_test/os_interface/windows/mock_kmdaf_listener.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 7384cdcfff..737c12a75f 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 @@ -14,9 +14,9 @@ #include "shared/source/os_interface/os_library.h" #include "shared/source/os_interface/windows/os_context_win.h" #include "shared/source/os_interface/windows/wddm_residency_controller.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/ult_hw_config.h" -#include "utilities/base_object_utils.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/utilities/base_object_utils.h" #include "shared/source/utilities/tag_allocator.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h index 317c6ff548..d1a139adbb 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h +++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h @@ -9,7 +9,7 @@ #include "shared/source/os_interface/windows/os_interface.h" #include "shared/source/os_interface/windows/wddm_memory_operations_handler.h" -#include "os_interface/windows/mock_gdi_interface.h" +#include "shared/test/unit_test/os_interface/windows/mock_gdi_interface.h" #include "opencl/test/unit_test/helpers/execution_environment_helper.h" #include "opencl/test/unit_test/mocks/mock_context.h" #include "opencl/test/unit_test/mocks/mock_gmm.h" diff --git a/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp index 903ec05d5e..6bfb45d823 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp @@ -18,7 +18,7 @@ #include "shared/source/os_interface/windows/wddm/wddm_interface.h" #include "shared/source/os_interface/windows/wddm_memory_operations_handler.h" #include "shared/source/os_interface/windows/wddm_residency_controller.h" -#include "os_interface/windows/mock_gdi_interface.h" +#include "shared/test/unit_test/os_interface/windows/mock_gdi_interface.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/libult/create_command_stream.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" diff --git a/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp index 05efee4305..ec41a60485 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_residency_handler_tests.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/os_interface/windows/wddm_memory_operations_handler.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "shared/source/utilities/stackvec.h" #include "opencl/source/device/cl_device.h" #include "opencl/test/unit_test/helpers/variable_backup.h" diff --git a/opencl/test/unit_test/platform/platform_tests.cpp b/opencl/test/unit_test/platform/platform_tests.cpp index 2e4a1aaafb..3ac454faa8 100644 --- a/opencl/test/unit_test/platform/platform_tests.cpp +++ b/opencl/test/unit_test/platform/platform_tests.cpp @@ -7,8 +7,8 @@ #include "shared/source/device/device.h" #include "shared/source/helpers/hw_info.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/source/platform/extensions.h" #include "opencl/source/sharings/sharing_factory.h" #include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" diff --git a/opencl/test/unit_test/profiling/profiling_tests.cpp b/opencl/test/unit_test/profiling/profiling_tests.cpp index 1db343c97d..beeebeb86b 100644 --- a/opencl/test/unit_test/profiling/profiling_tests.cpp +++ b/opencl/test/unit_test/profiling/profiling_tests.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/os_interface/os_interface.h" -#include "helpers/debug_manager_state_restore.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "shared/source/utilities/tag_allocator.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/enqueue_common.h" diff --git a/opencl/test/unit_test/program/evaluate_unhandled_token_tests.cpp b/opencl/test/unit_test/program/evaluate_unhandled_token_tests.cpp index 17378ff69a..5cca6d45b6 100644 --- a/opencl/test/unit_test/program/evaluate_unhandled_token_tests.cpp +++ b/opencl/test/unit_test/program/evaluate_unhandled_token_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/device_binary_format/patchtokens_decoder.h" #include "shared/source/execution_environment/execution_environment.h" -#include "device_binary_format/patchtokens_tests.h" +#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "opencl/source/program/create.inl" #include "opencl/source/program/program.h" diff --git a/opencl/test/unit_test/program/kernel_info_from_patchtokens_tests.cpp b/opencl/test/unit_test/program/kernel_info_from_patchtokens_tests.cpp index dd933e279e..3472362136 100644 --- a/opencl/test/unit_test/program/kernel_info_from_patchtokens_tests.cpp +++ b/opencl/test/unit_test/program/kernel_info_from_patchtokens_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/device_binary_format/patchtokens_decoder.h" -#include "device_binary_format/patchtokens_tests.h" +#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "opencl/source/program/kernel_info.h" #include "opencl/source/program/kernel_info_from_patchtokens.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 fcf6747929..0ac4397bbf 100644 --- a/opencl/test/unit_test/program/process_elf_binary_tests.cpp +++ b/opencl/test/unit_test/program/process_elf_binary_tests.cpp @@ -11,7 +11,7 @@ #include "shared/source/device_binary_format/elf/ocl_elf.h" #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/string.h" -#include "device_binary_format/patchtokens_tests.h" +#include "shared/test/unit_test/device_binary_format/patchtokens_tests.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" diff --git a/opencl/test/unit_test/program/program_data_tests.cpp b/opencl/test/unit_test/program/program_data_tests.cpp index 6dbd8055f2..a7c565cc8c 100644 --- a/opencl/test/unit_test/program/program_data_tests.cpp +++ b/opencl/test/unit_test/program/program_data_tests.cpp @@ -10,8 +10,8 @@ #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/program/program_info_from_patchtokens.h" -#include "compiler_interface/linker_mock.h" -#include "device_binary_format/patchtokens_tests.h" +#include "shared/test/unit_test/compiler_interface/linker_mock.h" +#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "opencl/source/platform/platform.h" #include "opencl/source/program/program.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" diff --git a/opencl/test/unit_test/program/program_spec_constants_tests.cpp b/opencl/test/unit_test/program/program_spec_constants_tests.cpp index 4b643c4276..a0472eae50 100644 --- a/opencl/test/unit_test/program/program_spec_constants_tests.cpp +++ b/opencl/test/unit_test/program/program_spec_constants_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/compiler_interface/compiler_interface.inl" #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/hw_info.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/global_environment.h" #include "opencl/test/unit_test/helpers/test_files.h" diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp index 48aff6cbb3..c515b1068c 100644 --- a/opencl/test/unit_test/program/program_tests.cpp +++ b/opencl/test/unit_test/program/program_tests.cpp @@ -22,9 +22,9 @@ #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/memory_manager/surface.h" #include "shared/source/os_interface/os_context.h" -#include "device_binary_format/patchtokens_tests.h" -#include "helpers/debug_manager_state_restore.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/program/create.inl" diff --git a/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp b/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp index 9b4efffa48..e096299e20 100644 --- a/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp +++ b/opencl/test/unit_test/scenarios/blocked_enqueue_barrier_scenario_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/fixtures/scenario_test_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.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 afd15afa5f..1ac2fcd535 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 @@ -7,7 +7,7 @@ #include "shared/source/memory_manager/internal_allocation_storage.h" #include "shared/source/os_interface/windows/os_interface.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.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" diff --git a/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp b/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp index bbe38cef09..b23c4b038e 100644 --- a/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp +++ b/opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "helpers/debug_manager_state_restore.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.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" 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 5aad7aaf84..0e1c6a78ba 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 @@ -9,7 +9,7 @@ #include "shared/source/gmm_helper/gmm.h" #include "shared/source/helpers/array_count.h" #include "shared/source/os_interface/os_interface.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/user_event.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/test/unit_test/sharings/sharing_factory_tests.cpp b/opencl/test/unit_test/sharings/sharing_factory_tests.cpp index dff96ca5dc..e2477d3cb9 100644 --- a/opencl/test/unit_test/sharings/sharing_factory_tests.cpp +++ b/opencl/test/unit_test/sharings/sharing_factory_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_stream/command_stream_receiver.h" #include "shared/source/device/device.h" #include "shared/source/helpers/string.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/context/context.h" #include "opencl/source/platform/extensions.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/test/unit_test/sharings/va/cl_get_extension_function_address_tests.cpp b/opencl/test/unit_test/sharings/va/cl_get_extension_function_address_tests.cpp index 56ee7f866f..00749559d0 100644 --- a/opencl/test/unit_test/sharings/va/cl_get_extension_function_address_tests.cpp +++ b/opencl/test/unit_test/sharings/va/cl_get_extension_function_address_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/sharings/va/cl_va_api.h" #include "opencl/test/unit_test/api/cl_api_tests.h" diff --git a/opencl/test/unit_test/sharings/va/context_va_tests.cpp b/opencl/test/unit_test/sharings/va/context_va_tests.cpp index 4b0ee0a32d..e8b4012435 100644 --- a/opencl/test/unit_test/sharings/va/context_va_tests.cpp +++ b/opencl/test/unit_test/sharings/va/context_va_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/sharings/va/va_sharing.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/sharings/va/va_sharing_linux_tests.cpp b/opencl/test/unit_test/sharings/va/va_sharing_linux_tests.cpp index bb30c9dead..7131a5a88b 100644 --- a/opencl/test/unit_test/sharings/va/va_sharing_linux_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_sharing_linux_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/sharings/va/va_sharing_functions.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "opencl/test/unit_test/sharings/va/mock_va_sharing.h" diff --git a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp index e248da75be..42df499e1c 100644 --- a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/gmm_helper/gmm.h" #include "shared/source/helpers/array_count.h" #include "shared/source/memory_manager/graphics_allocation.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/api/api.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/platform/platform.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 0ff5025f7e..1a5d319ba3 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 @@ -5,7 +5,7 @@ * */ -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/source/platform/platform.h" #include "opencl/source/source_level_debugger/source_level_debugger.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" diff --git a/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp b/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp index 21f7d65611..4f671f3ef8 100644 --- a/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp +++ b/opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/device/device.h" #include "shared/source/os_interface/os_interface.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/source/platform/platform.h" #include "opencl/source/program/kernel_info.h" #include "opencl/source/source_level_debugger/source_level_debugger.h" diff --git a/opencl/test/unit_test/ult_config_listener.cpp b/opencl/test/unit_test/ult_config_listener.cpp index d9b7ba53e2..b562a281b1 100644 --- a/opencl/test/unit_test/ult_config_listener.cpp +++ b/opencl/test/unit_test/ult_config_listener.cpp @@ -9,8 +9,8 @@ #include "shared/source/execution_environment/execution_environment.h" #include "shared/source/memory_manager/memory_manager.h" -#include "helpers/default_hw_info.h" -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" #include "opencl/source/platform/platform.h" void NEO::UltConfigListener::OnTestStart(const ::testing::TestInfo &testInfo) { diff --git a/opencl/test/unit_test/utilities/file_logger_tests.cpp b/opencl/test/unit_test/utilities/file_logger_tests.cpp index 51c887d69f..1f5ba9b8ea 100644 --- a/opencl/test/unit_test/utilities/file_logger_tests.cpp +++ b/opencl/test/unit_test/utilities/file_logger_tests.cpp @@ -7,8 +7,8 @@ #include "opencl/test/unit_test/utilities/file_logger_tests.h" -#include "helpers/debug_manager_state_restore.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "opencl/source/utilities/logger.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" diff --git a/opencl/test/unit_test/windows/wddm_create_tests.cpp b/opencl/test/unit_test/windows/wddm_create_tests.cpp index 101e857d21..36761feb71 100644 --- a/opencl/test/unit_test/windows/wddm_create_tests.cpp +++ b/opencl/test/unit_test/windows/wddm_create_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/os_interface.h" #include "shared/source/os_interface/windows/wddm/wddm.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "test.h" diff --git a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp index 39aaab659b..193527eecb 100644 --- a/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp +++ b/shared/test/unit_test/compiler_interface/compiler_interface_tests.cpp @@ -9,7 +9,7 @@ #include "shared/source/compiler_interface/compiler_interface.inl" #include "shared/source/helpers/file_io.h" #include "shared/source/helpers/hw_info.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/global_environment.h" #include "opencl/test/unit_test/helpers/test_files.h" diff --git a/shared/test/unit_test/debug_settings/debug_settings_manager_tests.cpp b/shared/test/unit_test/debug_settings/debug_settings_manager_tests.cpp index 4fc13312b5..cbc60cb4af 100644 --- a/shared/test/unit_test/debug_settings/debug_settings_manager_tests.cpp +++ b/shared/test/unit_test/debug_settings/debug_settings_manager_tests.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/memory_manager/graphics_allocation.h" -#include "helpers/debug_manager_state_restore.h" -#include "utilities/base_object_utils.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/utilities/base_object_utils.h" #include "shared/source/utilities/debug_file_reader.h" #include "test.h" diff --git a/shared/test/unit_test/device_binary_format/device_binary_format_ar_tests.cpp b/shared/test/unit_test/device_binary_format/device_binary_format_ar_tests.cpp index 357f3731e4..6453cc79d2 100644 --- a/shared/test/unit_test/device_binary_format/device_binary_format_ar_tests.cpp +++ b/shared/test/unit_test/device_binary_format/device_binary_format_ar_tests.cpp @@ -10,7 +10,7 @@ #include "shared/source/device_binary_format/ar/ar_encoder.h" #include "shared/source/device_binary_format/device_binary_formats.h" #include "shared/source/helpers/hw_info.h" -#include "device_binary_format/patchtokens_tests.h" +#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "test.h" TEST(IsDeviceBinaryFormatAr, GivenValidBinaryReturnTrue) { diff --git a/shared/test/unit_test/device_binary_format/device_binary_format_ocl_elf_tests.cpp b/shared/test/unit_test/device_binary_format/device_binary_format_ocl_elf_tests.cpp index be6592b972..8f80005dec 100644 --- a/shared/test/unit_test/device_binary_format/device_binary_format_ocl_elf_tests.cpp +++ b/shared/test/unit_test/device_binary_format/device_binary_format_ocl_elf_tests.cpp @@ -11,7 +11,7 @@ #include "shared/source/device_binary_format/elf/elf_encoder.h" #include "shared/source/device_binary_format/elf/ocl_elf.h" #include "shared/source/program/program_info.h" -#include "device_binary_format/patchtokens_tests.h" +#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "test.h" #include diff --git a/shared/test/unit_test/device_binary_format/device_binary_format_patchtokens_tests.cpp b/shared/test/unit_test/device_binary_format/device_binary_format_patchtokens_tests.cpp index b2e5861860..c1e56b6bef 100644 --- a/shared/test/unit_test/device_binary_format/device_binary_format_patchtokens_tests.cpp +++ b/shared/test/unit_test/device_binary_format/device_binary_format_patchtokens_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/device_binary_format/device_binary_formats.h" #include "shared/source/program/program_info.h" -#include "device_binary_format/patchtokens_tests.h" +#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "test.h" TEST(IsDeviceBinaryFormatPatchtokens, GivenValidBinaryReturnTrue) { diff --git a/shared/test/unit_test/device_binary_format/device_binary_formats_tests.cpp b/shared/test/unit_test/device_binary_format/device_binary_formats_tests.cpp index 5beff14b64..d95f7f2531 100644 --- a/shared/test/unit_test/device_binary_format/device_binary_formats_tests.cpp +++ b/shared/test/unit_test/device_binary_format/device_binary_formats_tests.cpp @@ -10,7 +10,7 @@ #include "shared/source/device_binary_format/elf/elf_encoder.h" #include "shared/source/device_binary_format/elf/ocl_elf.h" #include "shared/source/program/program_info.h" -#include "device_binary_format/patchtokens_tests.h" +#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "test.h" TEST(DecodeError, WhenStringRepresentationIsNeededThenAsStringEncodesProperly) { diff --git a/shared/test/unit_test/device_binary_format/patchtokens_dumper_tests.cpp b/shared/test/unit_test/device_binary_format/patchtokens_dumper_tests.cpp index 24870ceb9c..24c88f3b42 100644 --- a/shared/test/unit_test/device_binary_format/patchtokens_dumper_tests.cpp +++ b/shared/test/unit_test/device_binary_format/patchtokens_dumper_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/device_binary_format/patchtokens_decoder.h" #include "shared/source/device_binary_format/patchtokens_dumper.h" -#include "device_binary_format/patchtokens_tests.h" +#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "test.h" #include diff --git a/shared/test/unit_test/device_binary_format/patchtokens_validator_tests.cpp b/shared/test/unit_test/device_binary_format/patchtokens_validator_tests.cpp index 4e8c2ceb57..619c2bc252 100644 --- a/shared/test/unit_test/device_binary_format/patchtokens_validator_tests.cpp +++ b/shared/test/unit_test/device_binary_format/patchtokens_validator_tests.cpp @@ -7,7 +7,7 @@ #include "shared/source/device_binary_format/patchtokens_decoder.h" #include "shared/source/device_binary_format/patchtokens_validator.h" -#include "device_binary_format/patchtokens_tests.h" +#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/direct_submission/direct_submission_tests.cpp b/shared/test/unit_test/direct_submission/direct_submission_tests.cpp index 6c8c636714..7e134c922d 100644 --- a/shared/test/unit_test/direct_submission/direct_submission_tests.cpp +++ b/shared/test/unit_test/direct_submission/direct_submission_tests.cpp @@ -10,9 +10,9 @@ #include "shared/source/direct_submission/dispatchers/render_dispatcher.h" #include "shared/source/helpers/flush_stamp.h" #include "shared/source/os_interface/os_context.h" -#include "helpers/debug_manager_state_restore.h" -#include "helpers/ult_hw_config.h" -#include "mocks/mock_direct_submission_hw.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_direct_submission_hw.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" #include "opencl/test/unit_test/helpers/variable_backup.h" diff --git a/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp b/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp index bec0846e23..b7f9f7c82e 100644 --- a/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp +++ b/shared/test/unit_test/direct_submission/dispatchers/blitter_dispatcher_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/direct_submission/dispatchers/blitter_dispatcher.h" -#include "direct_submission/dispatchers/dispatcher_fixture.h" +#include "shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h" #include "test.h" using BlitterDispatcheTest = Test; diff --git a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.cpp b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.cpp index e9dc7b4a6c..c28004f53d 100644 --- a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.cpp +++ b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.cpp @@ -5,7 +5,7 @@ * */ -#include "direct_submission/dispatchers/dispatcher_fixture.h" +#include "shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h" #include "shared/source/helpers/aligned_memory.h" #include "shared/source/memory_manager/memory_constants.h" diff --git a/shared/test/unit_test/direct_submission/dispatchers/render_dispatcher_tests.cpp b/shared/test/unit_test/direct_submission/dispatchers/render_dispatcher_tests.cpp index 78e89c94b2..4279f93cdf 100644 --- a/shared/test/unit_test/direct_submission/dispatchers/render_dispatcher_tests.cpp +++ b/shared/test/unit_test/direct_submission/dispatchers/render_dispatcher_tests.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/direct_submission/dispatchers/render_dispatcher.h" -#include "direct_submission/dispatchers/dispatcher_fixture.h" -#include "fixtures/preemption_fixture.h" +#include "shared/test/unit_test/direct_submission/dispatchers/dispatcher_fixture.h" +#include "shared/test/unit_test/fixtures/preemption_fixture.h" #include "opencl/test/unit_test/helpers/hw_parse.h" #include "test.h" diff --git a/shared/test/unit_test/encoders/test_encode_atomic.cpp b/shared/test/unit_test/encoders/test_encode_atomic.cpp index 1a38b1505e..326cee74e3 100644 --- a/shared/test/unit_test/encoders/test_encode_atomic.cpp +++ b/shared/test/unit_test/encoders/test_encode_atomic.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/ptr_math.h" -#include "fixtures/command_container_fixture.h" +#include "shared/test/unit_test/fixtures/command_container_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp index 21638c9914..2301edddb7 100644 --- a/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp +++ b/shared/test/unit_test/encoders/test_encode_dispatch_kernel.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/helpers/ptr_math.h" -#include "fixtures/command_container_fixture.h" -#include "mocks/mock_dispatch_kernel_encoder_interface.h" +#include "shared/test/unit_test/fixtures/command_container_fixture.h" +#include "shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" diff --git a/shared/test/unit_test/encoders/test_encode_media_interface_descriptor.cpp b/shared/test/unit_test/encoders/test_encode_media_interface_descriptor.cpp index ab8fe7657c..0e84170548 100644 --- a/shared/test/unit_test/encoders/test_encode_media_interface_descriptor.cpp +++ b/shared/test/unit_test/encoders/test_encode_media_interface_descriptor.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/ptr_math.h" -#include "fixtures/command_container_fixture.h" +#include "shared/test/unit_test/fixtures/command_container_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/test_encode_semaphore.cpp b/shared/test/unit_test/encoders/test_encode_semaphore.cpp index 236ecd3e4c..a5332f8e81 100644 --- a/shared/test/unit_test/encoders/test_encode_semaphore.cpp +++ b/shared/test/unit_test/encoders/test_encode_semaphore.cpp @@ -7,7 +7,7 @@ #include "shared/source/command_stream/linear_stream.h" #include "shared/source/helpers/ptr_math.h" -#include "fixtures/command_container_fixture.h" +#include "shared/test/unit_test/fixtures/command_container_fixture.h" #include "opencl/test/unit_test/helpers/hw_parse.h" using namespace NEO; diff --git a/shared/test/unit_test/encoders/test_encode_states.cpp b/shared/test/unit_test/encoders/test_encode_states.cpp index 10b810956d..a091bfba4a 100644 --- a/shared/test/unit_test/encoders/test_encode_states.cpp +++ b/shared/test/unit_test/encoders/test_encode_states.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/ptr_math.h" -#include "fixtures/command_container_fixture.h" +#include "shared/test/unit_test/fixtures/command_container_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" using namespace NEO; diff --git a/shared/test/unit_test/fixtures/preemption_fixture.cpp b/shared/test/unit_test/fixtures/preemption_fixture.cpp index e1c47a770d..6a71a6cf3b 100644 --- a/shared/test/unit_test/fixtures/preemption_fixture.cpp +++ b/shared/test/unit_test/fixtures/preemption_fixture.cpp @@ -5,7 +5,7 @@ * */ -#include "fixtures/preemption_fixture.h" +#include "shared/test/unit_test/fixtures/preemption_fixture.h" #include "shared/source/command_stream/preemption.h" #include "shared/source/helpers/hw_info.h" diff --git a/shared/test/unit_test/fixtures/preemption_fixture.h b/shared/test/unit_test/fixtures/preemption_fixture.h index cd787d3dd2..730e047c40 100644 --- a/shared/test/unit_test/fixtures/preemption_fixture.h +++ b/shared/test/unit_test/fixtures/preemption_fixture.h @@ -7,7 +7,7 @@ #pragma once -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" #include "test.h" diff --git a/shared/test/unit_test/gen11/image_surface_state_tests_gen11.cpp b/shared/test/unit_test/gen11/image_surface_state_tests_gen11.cpp index e3ca98874d..242d859185 100644 --- a/shared/test/unit_test/gen11/image_surface_state_tests_gen11.cpp +++ b/shared/test/unit_test/gen11/image_surface_state_tests_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "image/image_surface_state_fixture.h" +#include "shared/test/unit_test/image/image_surface_state_fixture.h" using ImageSurfaceStateTestsGen11 = ImageSurfaceStateTests; diff --git a/shared/test/unit_test/gen11/preamble_tests_gen11.cpp b/shared/test/unit_test/gen11/preamble_tests_gen11.cpp index a2b361dd3c..95604d9b41 100644 --- a/shared/test/unit_test/gen11/preamble_tests_gen11.cpp +++ b/shared/test/unit_test/gen11/preamble_tests_gen11.cpp @@ -5,15 +5,15 @@ * */ -#include "helpers/debug_manager_state_restore.h" -#include "source_level_debugger/source_level_debugger_preamble_test.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h" #include "gtest/gtest.h" using namespace NEO; typedef ICLFamily GfxFamily; -#include "source_level_debugger/source_level_debugger_preamble_test.inl" +#include "shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.inl" using PreambleTestGen11 = ::testing::Test; diff --git a/shared/test/unit_test/gen11/simd_helper_tests_gen11.cpp b/shared/test/unit_test/gen11/simd_helper_tests_gen11.cpp index 590509e716..15f21f5602 100644 --- a/shared/test/unit_test/gen11/simd_helper_tests_gen11.cpp +++ b/shared/test/unit_test/gen11/simd_helper_tests_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/simd_helper_tests.inl" +#include "shared/test/unit_test/helpers/simd_helper_tests.inl" using namespace NEO; diff --git a/shared/test/unit_test/gen11/test_preamble_gen11.cpp b/shared/test/unit_test/gen11/test_preamble_gen11.cpp index 731c0bf8b8..81b7b6753f 100644 --- a/shared/test/unit_test/gen11/test_preamble_gen11.cpp +++ b/shared/test/unit_test/gen11/test_preamble_gen11.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/command_stream/preemption.h" -#include "helpers/debug_manager_state_restore.h" -#include "preamble/preamble_fixture.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/preamble/preamble_fixture.h" #include "reg_configs_common.h" diff --git a/shared/test/unit_test/gen11/test_preemption_gen11.cpp b/shared/test/unit_test/gen11/test_preemption_gen11.cpp index f765d29eb6..96272ee203 100644 --- a/shared/test/unit_test/gen11/test_preemption_gen11.cpp +++ b/shared/test/unit_test/gen11/test_preemption_gen11.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/helpers/hw_helper.h" -#include "fixtures/preemption_fixture.h" +#include "shared/test/unit_test/fixtures/preemption_fixture.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/test/unit_test/helpers/hw_parse.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" diff --git a/shared/test/unit_test/gen12lp/image_surface_state_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/image_surface_state_tests_gen12lp.cpp index a534318697..2c265a18c3 100644 --- a/shared/test/unit_test/gen12lp/image_surface_state_tests_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/image_surface_state_tests_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "image/image_surface_state_fixture.h" +#include "shared/test/unit_test/image/image_surface_state_fixture.h" using ImageSurfaceStateTestsGen12LP = ImageSurfaceStateTests; diff --git a/shared/test/unit_test/gen12lp/simd_helper_tests_gen12lp.cpp b/shared/test/unit_test/gen12lp/simd_helper_tests_gen12lp.cpp index 2e6fe04acb..4b55efe2be 100644 --- a/shared/test/unit_test/gen12lp/simd_helper_tests_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/simd_helper_tests_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/simd_helper_tests.inl" +#include "shared/test/unit_test/helpers/simd_helper_tests.inl" using namespace NEO; diff --git a/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp b/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp index 5e28c3c85c..6766247e21 100644 --- a/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp @@ -6,8 +6,8 @@ */ #include "shared/source/command_stream/preemption.h" -#include "helpers/debug_manager_state_restore.h" -#include "preamble/preamble_fixture.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/preamble/preamble_fixture.h" #include "reg_configs_common.h" diff --git a/shared/test/unit_test/gen12lp/test_preemption_gen12lp.inl b/shared/test/unit_test/gen12lp/test_preemption_gen12lp.inl index e8921777f7..7556a05214 100644 --- a/shared/test/unit_test/gen12lp/test_preemption_gen12lp.inl +++ b/shared/test/unit_test/gen12lp/test_preemption_gen12lp.inl @@ -5,7 +5,7 @@ * */ -#include "fixtures/preemption_fixture.h" +#include "shared/test/unit_test/fixtures/preemption_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_csr.h" diff --git a/shared/test/unit_test/gen8/image_surface_state_tests_gen8.cpp b/shared/test/unit_test/gen8/image_surface_state_tests_gen8.cpp index b2343d0098..ad496b5e6e 100644 --- a/shared/test/unit_test/gen8/image_surface_state_tests_gen8.cpp +++ b/shared/test/unit_test/gen8/image_surface_state_tests_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "image/image_surface_state_fixture.h" +#include "shared/test/unit_test/image/image_surface_state_fixture.h" using ImageSurfaceStateTestsGen8 = ImageSurfaceStateTests; diff --git a/shared/test/unit_test/gen8/simd_helper_tests_gen8.cpp b/shared/test/unit_test/gen8/simd_helper_tests_gen8.cpp index 62e8893fd7..ae52137fbc 100644 --- a/shared/test/unit_test/gen8/simd_helper_tests_gen8.cpp +++ b/shared/test/unit_test/gen8/simd_helper_tests_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/simd_helper_tests.inl" +#include "shared/test/unit_test/helpers/simd_helper_tests.inl" using namespace NEO; diff --git a/shared/test/unit_test/gen8/test_preamble_gen8.cpp b/shared/test/unit_test/gen8/test_preamble_gen8.cpp index 18ba75553d..5c9f685ac5 100644 --- a/shared/test/unit_test/gen8/test_preamble_gen8.cpp +++ b/shared/test/unit_test/gen8/test_preamble_gen8.cpp @@ -7,7 +7,7 @@ #include "shared/source/command_stream/thread_arbitration_policy.h" #include "shared/source/helpers/preamble.h" -#include "preamble/preamble_fixture.h" +#include "shared/test/unit_test/preamble/preamble_fixture.h" #include "opencl/source/gen8/reg_configs.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" diff --git a/shared/test/unit_test/gen8/test_preemption_gen8.cpp b/shared/test/unit_test/gen8/test_preemption_gen8.cpp index 7ab7cc6ad4..429af63239 100644 --- a/shared/test/unit_test/gen8/test_preemption_gen8.cpp +++ b/shared/test/unit_test/gen8/test_preemption_gen8.cpp @@ -9,7 +9,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/helpers/hw_helper.h" #include "shared/source/memory_manager/memory_constants.h" -#include "fixtures/preemption_fixture.h" +#include "shared/test/unit_test/fixtures/preemption_fixture.h" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" #include "opencl/test/unit_test/helpers/hw_parse.h" diff --git a/shared/test/unit_test/gen9/image_surface_state_tests_gen9.cpp b/shared/test/unit_test/gen9/image_surface_state_tests_gen9.cpp index 8c2fac2867..4122a6f5ef 100644 --- a/shared/test/unit_test/gen9/image_surface_state_tests_gen9.cpp +++ b/shared/test/unit_test/gen9/image_surface_state_tests_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "image/image_surface_state_fixture.h" +#include "shared/test/unit_test/image/image_surface_state_fixture.h" using ImageSurfaceStateTestsGen9 = ImageSurfaceStateTests; diff --git a/shared/test/unit_test/gen9/preamble_tests_gen9.cpp b/shared/test/unit_test/gen9/preamble_tests_gen9.cpp index 9d13cda553..f7ade1bd10 100644 --- a/shared/test/unit_test/gen9/preamble_tests_gen9.cpp +++ b/shared/test/unit_test/gen9/preamble_tests_gen9.cpp @@ -5,15 +5,15 @@ * */ -#include "helpers/debug_manager_state_restore.h" -#include "source_level_debugger/source_level_debugger_preamble_test.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.h" #include "gtest/gtest.h" using namespace NEO; typedef SKLFamily GfxFamily; -#include "source_level_debugger/source_level_debugger_preamble_test.inl" +#include "shared/test/unit_test/source_level_debugger/source_level_debugger_preamble_test.inl" using PreambleTestGen9 = ::testing::Test; diff --git a/shared/test/unit_test/gen9/simd_helper_tests_gen9.cpp b/shared/test/unit_test/gen9/simd_helper_tests_gen9.cpp index ed47eb2ac8..e4f7e90002 100644 --- a/shared/test/unit_test/gen9/simd_helper_tests_gen9.cpp +++ b/shared/test/unit_test/gen9/simd_helper_tests_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/simd_helper_tests.inl" +#include "shared/test/unit_test/helpers/simd_helper_tests.inl" using namespace NEO; diff --git a/shared/test/unit_test/gen9/skl/test_preamble_skl.cpp b/shared/test/unit_test/gen9/skl/test_preamble_skl.cpp index 02b803976a..f961f1fbbb 100644 --- a/shared/test/unit_test/gen9/skl/test_preamble_skl.cpp +++ b/shared/test/unit_test/gen9/skl/test_preamble_skl.cpp @@ -8,8 +8,8 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/thread_arbitration_policy.h" #include "shared/source/helpers/preamble.h" -#include "helpers/debug_manager_state_restore.h" -#include "preamble/preamble_fixture.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/preamble/preamble_fixture.h" #include "opencl/source/gen9/reg_configs.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" diff --git a/shared/test/unit_test/gen9/test_preemption_gen9.cpp b/shared/test/unit_test/gen9/test_preemption_gen9.cpp index e779e6b0a3..2910d78562 100644 --- a/shared/test/unit_test/gen9/test_preemption_gen9.cpp +++ b/shared/test/unit_test/gen9/test_preemption_gen9.cpp @@ -7,7 +7,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/helpers/hw_helper.h" -#include "fixtures/preemption_fixture.h" +#include "shared/test/unit_test/fixtures/preemption_fixture.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/helpers/hw_parse.h" diff --git a/shared/test/unit_test/helpers/memory_leak_listener.cpp b/shared/test/unit_test/helpers/memory_leak_listener.cpp index 2e4f0917be..721953c371 100644 --- a/shared/test/unit_test/helpers/memory_leak_listener.cpp +++ b/shared/test/unit_test/helpers/memory_leak_listener.cpp @@ -7,7 +7,7 @@ #include "memory_leak_listener.h" -#include "helpers/memory_management.h" +#include "shared/test/unit_test/helpers/memory_management.h" using ::testing::TestInfo; using namespace NEO; diff --git a/shared/test/unit_test/helpers/memory_management.cpp b/shared/test/unit_test/helpers/memory_management.cpp index c4d65175a9..0dcdcc9994 100644 --- a/shared/test/unit_test/helpers/memory_management.cpp +++ b/shared/test/unit_test/helpers/memory_management.cpp @@ -5,7 +5,7 @@ * */ -#include "helpers/memory_management.h" +#include "shared/test/unit_test/helpers/memory_management.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/helpers/ult_hw_config.inl b/shared/test/unit_test/helpers/ult_hw_config.inl index d965f2a63a..f28bf3f35e 100644 --- a/shared/test/unit_test/helpers/ult_hw_config.inl +++ b/shared/test/unit_test/helpers/ult_hw_config.inl @@ -5,7 +5,7 @@ * */ -#include "helpers/ult_hw_config.h" +#include "shared/test/unit_test/helpers/ult_hw_config.h" namespace NEO { UltHwConfig ultHwConfig{}; diff --git a/shared/test/unit_test/image/image_surface_state_tests.cpp b/shared/test/unit_test/image/image_surface_state_tests.cpp index 20abf2fe5d..c686d8e844 100644 --- a/shared/test/unit_test/image/image_surface_state_tests.cpp +++ b/shared/test/unit_test/image/image_surface_state_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "image/image_surface_state_fixture.h" +#include "shared/test/unit_test/image/image_surface_state_fixture.h" HWTEST_F(ImageSurfaceStateTests, givenImageInfoWhenSetImageSurfaceStateThenProperFieldsAreSet) { auto size = sizeof(typename FamilyType::RENDER_SURFACE_STATE); diff --git a/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.cpp b/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.cpp index def3ac1a61..62ae5ef731 100644 --- a/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.cpp +++ b/shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.cpp @@ -5,7 +5,7 @@ * */ -#include "mocks/mock_dispatch_kernel_encoder_interface.h" +#include "shared/test/unit_test/mocks/mock_dispatch_kernel_encoder_interface.h" using namespace NEO; diff --git a/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp b/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp index 611328874d..e45da8852d 100644 --- a/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp +++ b/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "os_interface/aub_memory_operations_handler_tests.h" +#include "shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" #include "opencl/test/unit_test/mocks/mock_aub_manager.h" diff --git a/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.h b/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.h index 3799b1a426..ea9fe4a54a 100644 --- a/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.h +++ b/shared/test/unit_test/os_interface/aub_memory_operations_handler_tests.h @@ -10,7 +10,7 @@ #include "shared/source/helpers/hw_info.h" #include "shared/source/os_interface/aub_memory_operations_handler.h" #include "shared/source/os_interface/device_factory.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/linux/gmm_helper_tests_linux.cpp b/shared/test/unit_test/os_interface/linux/gmm_helper_tests_linux.cpp index 25883cb847..39b56f0eb4 100644 --- a/shared/test/unit_test/os_interface/linux/gmm_helper_tests_linux.cpp +++ b/shared/test/unit_test/os_interface/linux/gmm_helper_tests_linux.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/gmm_helper/gmm_helper.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/windows/gdi_interface_tests.cpp b/shared/test/unit_test/os_interface/windows/gdi_interface_tests.cpp index 40fca0433f..90ff26eff4 100644 --- a/shared/test/unit_test/os_interface/windows/gdi_interface_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/gdi_interface_tests.cpp @@ -8,7 +8,7 @@ #if defined(_WIN32) #include "shared/source/os_interface/os_library.h" #include "shared/source/os_interface/windows/gdi_interface.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "test.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/windows/gmm_helper_tests_win.cpp b/shared/test/unit_test/os_interface/windows/gmm_helper_tests_win.cpp index 6ca572551e..83784fd5ba 100644 --- a/shared/test/unit_test/os_interface/windows/gmm_helper_tests_win.cpp +++ b/shared/test/unit_test/os_interface/windows/gmm_helper_tests_win.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/gmm_helper/gmm_helper.h" -#include "helpers/default_hw_info.h" +#include "shared/test/unit_test/helpers/default_hw_info.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp index 69b36e159f..4908a530c9 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/execution_environment/root_device_environment.h" #include "shared/source/helpers/hw_helper.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" #include "test.h" diff --git a/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests.cpp b/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests.cpp index 54f7dad88a..618c1bbfec 100644 --- a/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests.cpp +++ b/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/memory_manager/unified_memory_manager.h" #include "shared/source/unified_memory/unified_memory.h" -#include "page_fault_manager/cpu_page_fault_manager_tests_fixture.h" +#include "shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" using namespace NEO; diff --git a/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h b/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h index 44ee6af835..d56abf2a1d 100644 --- a/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h +++ b/shared/test/unit_test/page_fault_manager/cpu_page_fault_manager_tests_fixture.h @@ -7,7 +7,7 @@ #pragma once -#include "page_fault_manager/mock_cpu_page_fault_manager.h" +#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp b/shared/test/unit_test/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp index 5424a8229b..da9c5b9301 100644 --- a/shared/test/unit_test/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp +++ b/shared/test/unit_test/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/page_fault_manager/linux/cpu_page_fault_manager_linux.h" -#include "page_fault_manager/mock_cpu_page_fault_manager.h" +#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" #include "gtest/gtest.h" diff --git a/shared/test/unit_test/page_fault_manager/windows/cpu_page_fault_manager_windows_tests.cpp b/shared/test/unit_test/page_fault_manager/windows/cpu_page_fault_manager_windows_tests.cpp index 1a10234ac0..126c17b3b5 100644 --- a/shared/test/unit_test/page_fault_manager/windows/cpu_page_fault_manager_windows_tests.cpp +++ b/shared/test/unit_test/page_fault_manager/windows/cpu_page_fault_manager_windows_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/page_fault_manager/windows/cpu_page_fault_manager_windows.h" -#include "page_fault_manager/mock_cpu_page_fault_manager.h" +#include "shared/test/unit_test/page_fault_manager/mock_cpu_page_fault_manager.h" #include "gtest/gtest.h" #include diff --git a/shared/test/unit_test/preamble/preamble_tests.cpp b/shared/test/unit_test/preamble/preamble_tests.cpp index 4aec2caa9b..ca21f9fc1f 100644 --- a/shared/test/unit_test/preamble/preamble_tests.cpp +++ b/shared/test/unit_test/preamble/preamble_tests.cpp @@ -8,7 +8,7 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/helpers/flat_batch_buffer_helper_hw.h" #include "shared/source/helpers/preamble.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.h" #include "shared/source/utilities/stackvec.h" #include "opencl/source/gen11/reg_configs.h" #include "opencl/test/unit_test/helpers/hw_parse.h" diff --git a/shared/test/unit_test/preemption/preemption_tests.cpp b/shared/test/unit_test/preemption/preemption_tests.cpp index 6ffa80d1c5..662875a23d 100644 --- a/shared/test/unit_test/preemption/preemption_tests.cpp +++ b/shared/test/unit_test/preemption/preemption_tests.cpp @@ -7,8 +7,8 @@ #include "shared/source/command_stream/preemption.h" #include "shared/source/helpers/hw_helper.h" -#include "fixtures/preemption_fixture.h" -#include "helpers/debug_manager_state_restore.h" +#include "shared/test/unit_test/fixtures/preemption_fixture.h" +#include "shared/test/unit_test/helpers/debug_manager_state_restore.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" diff --git a/shared/test/unit_test/program/program_info_from_patchtokens_tests.cpp b/shared/test/unit_test/program/program_info_from_patchtokens_tests.cpp index af5eea6f0b..f8d2fc9bd1 100644 --- a/shared/test/unit_test/program/program_info_from_patchtokens_tests.cpp +++ b/shared/test/unit_test/program/program_info_from_patchtokens_tests.cpp @@ -9,8 +9,8 @@ #include "shared/source/device_binary_format/patchtokens_decoder.h" #include "shared/source/program/program_info.h" #include "shared/source/program/program_info_from_patchtokens.h" -#include "compiler_interface/linker_mock.h" -#include "device_binary_format/patchtokens_tests.h" +#include "shared/test/unit_test/compiler_interface/linker_mock.h" +#include "shared/test/unit_test/device_binary_format/patchtokens_tests.h" #include "opencl/source/program/kernel_info.h" #include "RelocationInfo.h" diff --git a/shared/test/unit_test/program/program_initialization_tests.cpp b/shared/test/unit_test/program/program_initialization_tests.cpp index 03ede00587..a69eafe287 100644 --- a/shared/test/unit_test/program/program_initialization_tests.cpp +++ b/shared/test/unit_test/program/program_initialization_tests.cpp @@ -6,7 +6,7 @@ */ #include "shared/source/program/program_initialization.h" -#include "compiler_interface/linker_mock.h" +#include "shared/test/unit_test/compiler_interface/linker_mock.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/utilities/containers_tests.cpp b/shared/test/unit_test/utilities/containers_tests.cpp index b076a7ad0f..b234036fa2 100644 --- a/shared/test/unit_test/utilities/containers_tests.cpp +++ b/shared/test/unit_test/utilities/containers_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "utilities/containers_tests_helpers.h" +#include "shared/test/unit_test/utilities/containers_tests_helpers.h" #include "shared/source/utilities/arrayref.h" #include "shared/source/utilities/idlist.h" #include "shared/source/utilities/iflist.h"