Add absolute include paths

Change-Id: I5b8631603b0f0b2ed8eb1a61f7e7770b27867423
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

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})

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"

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"

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"

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"
 

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"

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"
 

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"

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"
 

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"

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"

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"

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"

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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 <cinttypes>
 #if defined(__linux__)

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"
 

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"
 

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"

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"
 

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"