Reorganization directory structure [2/n]

Change-Id: I47962d17d755e80dcd9476e1ed75560f433f6115

CMakeLists.txt

@@ -106,7 +106,7 @@ endif()
 set(NEO_RUNTIME_SUB_DIR "opencl/source")
 set(NEO_RUNTIME_SOURCE_DIR "${NEO_SOURCE_DIR}/${NEO_RUNTIME_SUB_DIR}")
 
-set(NEO_RUNTIME_TESTS_SUB_DIR "unit_tests")
+set(NEO_RUNTIME_TESTS_SUB_DIR "opencl/test/unit_test")
 set(NEO_RUNTIME_TESTS_DIR "${NEO_SOURCE_DIR}/${NEO_RUNTIME_TESTS_SUB_DIR}")
 
 # Set the core source directory
@@ -562,6 +562,8 @@ add_definitions(-DGMM_OCL)
 # We want to organize our IDE targets into folders
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
+include_directories(${NEO_RUNTIME_TESTS_SUB_DIR})
+
 # determine Neo version
 include(version.cmake)
 
@@ -885,9 +887,9 @@ else()
 endif()
 
 if(DEFAULT_TESTED_PLATFORM AND NOT SKIP_NEO_UNIT_TESTS)
-  add_subdirectory_unique(unit_tests ${NEO_BUILD_DIR}/unit_tests)
+  add_subdirectory_unique(${NEO_RUNTIME_TESTS_SUB_DIR} ${NEO_BUILD_DIR}/${NEO_RUNTIME_TESTS_SUB_DIR})
 else()
-  hide_subdir(unit_tests)
+  hide_subdir(${NEO_RUNTIME_TESTS_SUB_DIR})
 endif()
 
 set(DONT_LINK_ELF_STATICALLY TRUE)

core/unit_tests/command_container/command_container_tests.cpp

@@ -7,8 +7,9 @@
 
 #include "core/command_container/cmdcontainer.h"
 #include "test.h"
-#include "unit_tests/fixtures/device_fixture.h"
-#include "unit_tests/mocks/mock_graphics_allocation.h"
+
+#include "fixtures/device_fixture.h"
+#include "mocks/mock_graphics_allocation.h"
 
 using namespace NEO;
 

core/unit_tests/command_container/command_encoder_tests.cpp

@@ -7,7 +7,8 @@
 
 #include "core/command_container/command_encoder.h"
 #include "test.h"
-#include "unit_tests/fixtures/device_fixture.h"
+
+#include "fixtures/device_fixture.h"
 
 using namespace NEO;
 

core/unit_tests/compiler_interface/compiler_cache_tests.cpp

@@ -13,10 +13,11 @@
 #include "core/helpers/string.h"
 #include "opencl/source/compiler_interface/default_cl_cache_config.h"
 #include "test.h"
-#include "unit_tests/fixtures/device_fixture.h"
-#include "unit_tests/global_environment.h"
-#include "unit_tests/mocks/mock_context.h"
-#include "unit_tests/mocks/mock_program.h"
+
+#include "fixtures/device_fixture.h"
+#include "global_environment.h"
+#include "mocks/mock_context.h"
+#include "mocks/mock_program.h"
 
 #include <array>
 #include <list>

core/unit_tests/compiler_interface/compiler_interface_tests.cpp

@@ -10,13 +10,13 @@
 #include "core/helpers/file_io.h"
 #include "core/helpers/hw_info.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "unit_tests/fixtures/device_fixture.h"
-#include "unit_tests/global_environment.h"
-#include "unit_tests/helpers/test_files.h"
-#include "unit_tests/mocks/mock_cif.h"
-#include "unit_tests/mocks/mock_compilers.h"
 
+#include "fixtures/device_fixture.h"
+#include "global_environment.h"
 #include "gmock/gmock.h"
+#include "helpers/test_files.h"
+#include "mocks/mock_cif.h"
+#include "mocks/mock_compilers.h"
 
 #include <memory>
 

core/unit_tests/direct_submission/direct_submission_tests.cpp

@@ -14,10 +14,11 @@
 #include "core/unit_tests/helpers/ult_hw_config.h"
 #include "core/unit_tests/mocks/mock_direct_submission_hw.h"
 #include "test.h"
-#include "unit_tests/fixtures/device_fixture.h"
-#include "unit_tests/helpers/dispatch_flags_helper.h"
-#include "unit_tests/helpers/variable_backup.h"
-#include "unit_tests/mocks/mock_csr.h"
+
+#include "fixtures/device_fixture.h"
+#include "helpers/dispatch_flags_helper.h"
+#include "helpers/variable_backup.h"
+#include "mocks/mock_csr.h"
 
 #include <atomic>
 #include <memory>

core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h

@@ -6,7 +6,8 @@
  */
 
 #include "core/command_stream/linear_stream.h"
-#include "unit_tests/fixtures/device_fixture.h"
+
+#include "fixtures/device_fixture.h"
 
 class DispatcherFixture : public DeviceFixture {
   public:

core/unit_tests/direct_submission/dispatchers/render_dispatcher_tests.cpp

@@ -9,7 +9,8 @@
 #include "core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h"
 #include "core/unit_tests/fixtures/preemption_fixture.h"
 #include "test.h"
-#include "unit_tests/helpers/hw_parse.h"
+
+#include "helpers/hw_parse.h"
 
 using RenderDispatcheTest = Test<DispatcherFixture>;
 

core/unit_tests/direct_submission/linux/drm_direct_submission_tests.cpp

@@ -9,8 +9,9 @@
 #include "core/direct_submission/linux/drm_direct_submission.h"
 #include "core/os_interface/linux/os_context_linux.h"
 #include "test.h"
-#include "unit_tests/fixtures/device_fixture.h"
-#include "unit_tests/os_interface/linux/drm_mock.h"
+
+#include "fixtures/device_fixture.h"
+#include "os_interface/linux/drm_mock.h"
 
 #include <memory>
 

core/unit_tests/direct_submission/windows/wddm_direct_submission_tests.cpp

@@ -9,9 +9,10 @@
 #include "core/direct_submission/windows/wddm_direct_submission.h"
 #include "core/os_interface/windows/os_context_win.h"
 #include "core/os_interface/windows/wddm/wddm.h"
-#include "unit_tests/helpers/hw_parse.h"
-#include "unit_tests/mocks/mock_device.h"
-#include "unit_tests/os_interface/windows/wddm_fixture.h"
+
+#include "helpers/hw_parse.h"
+#include "mocks/mock_device.h"
+#include "os_interface/windows/wddm_fixture.h"
 
 struct WddmDirectSubmissionFixture : public WddmFixture {
     void SetUp() override {

core/unit_tests/encoders/test_encode_atomic.cpp

@@ -7,7 +7,8 @@
 
 #include "core/helpers/ptr_math.h"
 #include "core/unit_tests/fixtures/command_container_fixture.h"
-#include "unit_tests/gen_common/gen_cmd_parse.h"
+
+#include "gen_common/gen_cmd_parse.h"
 
 using namespace NEO;
 

core/unit_tests/encoders/test_encode_command_buffer.cpp

@@ -8,8 +8,9 @@
 #include "core/command_container/cmdcontainer.h"
 #include "core/command_container/command_encoder.h"
 #include "test.h"
-#include "unit_tests/fixtures/device_fixture.h"
-#include "unit_tests/gen_common/gen_cmd_parse.h"
+
+#include "fixtures/device_fixture.h"
+#include "gen_common/gen_cmd_parse.h"
 
 using namespace NEO;
 

core/unit_tests/encoders/test_encode_dispatch_kernel.cpp

@@ -9,7 +9,8 @@
 #include "core/unit_tests/fixtures/command_container_fixture.h"
 #include "core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"
-#include "unit_tests/gen_common/gen_cmd_parse.h"
+
+#include "gen_common/gen_cmd_parse.h"
 
 using namespace NEO;
 

core/unit_tests/encoders/test_encode_math.cpp

@@ -8,8 +8,9 @@
 #include "core/command_container/command_encoder.h"
 #include "core/helpers/register_offsets.h"
 #include "test.h"
-#include "unit_tests/fixtures/device_fixture.h"
-#include "unit_tests/gen_common/gen_cmd_parse.h"
+
+#include "fixtures/device_fixture.h"
+#include "gen_common/gen_cmd_parse.h"
 
 using namespace NEO;
 

core/unit_tests/encoders/test_encode_media_interface_descriptor.cpp

@@ -7,7 +7,8 @@
 
 #include "core/helpers/ptr_math.h"
 #include "core/unit_tests/fixtures/command_container_fixture.h"
-#include "unit_tests/gen_common/gen_cmd_parse.h"
+
+#include "gen_common/gen_cmd_parse.h"
 
 using namespace NEO;
 

core/unit_tests/encoders/test_encode_semaphore.cpp

@@ -8,7 +8,8 @@
 #include "core/command_stream/linear_stream.h"
 #include "core/helpers/ptr_math.h"
 #include "core/unit_tests/fixtures/command_container_fixture.h"
-#include "unit_tests/helpers/hw_parse.h"
+
+#include "helpers/hw_parse.h"
 
 using namespace NEO;
 

core/unit_tests/encoders/test_encode_set_mmio.cpp

@@ -7,8 +7,9 @@
 
 #include "core/command_container/command_encoder.h"
 #include "test.h"
-#include "unit_tests/fixtures/device_fixture.h"
-#include "unit_tests/gen_common/gen_cmd_parse.h"
+
+#include "fixtures/device_fixture.h"
+#include "gen_common/gen_cmd_parse.h"
 
 using namespace NEO;
 

core/unit_tests/encoders/test_encode_states.cpp

@@ -7,7 +7,8 @@
 
 #include "core/helpers/ptr_math.h"
 #include "core/unit_tests/fixtures/command_container_fixture.h"
-#include "unit_tests/gen_common/gen_cmd_parse.h"
+
+#include "gen_common/gen_cmd_parse.h"
 
 using namespace NEO;
 

core/unit_tests/fixtures/command_container_fixture.h

@@ -8,7 +8,8 @@
 #pragma once
 #include "core/command_container/command_encoder.h"
 #include "test.h"
-#include "unit_tests/fixtures/device_fixture.h"
+
+#include "fixtures/device_fixture.h"
 
 class CommandEncodeStatesFixture : public DeviceFixture {
   public:

core/unit_tests/fixtures/preemption_fixture.cpp

@@ -15,14 +15,14 @@
 #include "opencl/source/helpers/dispatch_info.h"
 #include "opencl/source/scheduler/scheduler_kernel.h"
 #include "test.h"
-#include "unit_tests/fixtures/hello_world_fixture.h"
-#include "unit_tests/helpers/hw_parse.h"
-#include "unit_tests/mocks/mock_command_queue.h"
-#include "unit_tests/mocks/mock_context.h"
-#include "unit_tests/mocks/mock_device.h"
-#include "unit_tests/mocks/mock_kernel.h"
 
+#include "fixtures/hello_world_fixture.h"
 #include "gtest/gtest.h"
+#include "helpers/hw_parse.h"
+#include "mocks/mock_command_queue.h"
+#include "mocks/mock_context.h"
+#include "mocks/mock_device.h"
+#include "mocks/mock_kernel.h"
 
 using namespace NEO;
 

core/unit_tests/fixtures/preemption_fixture.h

@@ -9,8 +9,8 @@
 
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "test.h"
-#include "unit_tests/fixtures/hello_world_fixture.h"
 
+#include "fixtures/hello_world_fixture.h"
 #include "gtest/gtest.h"
 
 #include <cinttypes>

core/unit_tests/gen11/cmd_parse_gen11.cpp

@@ -5,17 +5,16 @@
  *
  */
 
-#include "unit_tests/gen_common/gen_cmd_parse.h"
-
+#include "gen_common/gen_cmd_parse.h"
 #include "gtest/gtest.h"
 using GenStruct = NEO::GEN11;
 using GenGfxFamily = NEO::ICLFamily;
-#include "unit_tests/gen_common/cmd_parse_base.inl"
-#include "unit_tests/gen_common/cmd_parse_base_mi_arb.inl"
-#include "unit_tests/gen_common/cmd_parse_gpgpu_walker.inl"
-#include "unit_tests/gen_common/cmd_parse_sip.inl"
-#include "unit_tests/helpers/hw_parse.h"
-#include "unit_tests/helpers/hw_parse.inl"
+#include "gen_common/cmd_parse_base.inl"
+#include "gen_common/cmd_parse_base_mi_arb.inl"
+#include "gen_common/cmd_parse_gpgpu_walker.inl"
+#include "gen_common/cmd_parse_sip.inl"
+#include "helpers/hw_parse.h"
+#include "helpers/hw_parse.inl"
 
 template <>
 size_t CmdParse<GenGfxFamily>::getCommandLengthHwSpecific(void *cmd) {

core/unit_tests/gen11/test_preemption_gen11.cpp

@@ -8,10 +8,11 @@
 #include "core/helpers/hw_helper.h"
 #include "core/unit_tests/fixtures/preemption_fixture.h"
 #include "opencl/source/built_ins/built_ins.h"
-#include "unit_tests/helpers/hw_parse.h"
-#include "unit_tests/mocks/mock_buffer.h"
-#include "unit_tests/mocks/mock_command_queue.h"
-#include "unit_tests/mocks/mock_csr.h"
+
+#include "helpers/hw_parse.h"
+#include "mocks/mock_buffer.h"
+#include "mocks/mock_command_queue.h"
+#include "mocks/mock_csr.h"
 
 using namespace NEO;
 

core/unit_tests/gen12lp/cmd_parse_gen12lp.cpp

@@ -5,20 +5,18 @@
  *
  */
 
-#include "unit_tests/gen_common/gen_cmd_parse.h"
-
+#include "gen_common/gen_cmd_parse.h"
 #include "gtest/gtest.h"
 using GenStruct = NEO::GEN12LP;
 using GenGfxFamily = NEO::TGLLPFamily;
-#include "unit_tests/gen_common/cmd_parse_base.inl"
-#include "unit_tests/gen_common/cmd_parse_compute_mode.inl"
-#include "unit_tests/gen_common/cmd_parse_gpgpu_walker.inl"
-#include "unit_tests/gen_common/cmd_parse_mi_arb.inl"
-#include "unit_tests/gen_common/cmd_parse_sip.inl"
-#include "unit_tests/helpers/hw_parse.h"
-#include "unit_tests/helpers/hw_parse.inl"
-
 #include "cmd_parse_gen12lp.inl"
+#include "gen_common/cmd_parse_base.inl"
+#include "gen_common/cmd_parse_compute_mode.inl"
+#include "gen_common/cmd_parse_gpgpu_walker.inl"
+#include "gen_common/cmd_parse_mi_arb.inl"
+#include "gen_common/cmd_parse_sip.inl"
+#include "helpers/hw_parse.h"
+#include "helpers/hw_parse.inl"
 
 template <>
 size_t CmdParse<GenGfxFamily>::getCommandLengthHwSpecific(void *cmd) {

core/unit_tests/gen12lp/test_command_encoder_gen12lp.cpp

@@ -8,9 +8,9 @@
 #include "core/command_container/cmdcontainer.h"
 #include "core/command_container/command_encoder.h"
 #include "test.h"
-#include "unit_tests/fixtures/device_fixture.h"
-#include "unit_tests/gen_common/gen_cmd_parse.h"
 
+#include "fixtures/device_fixture.h"
+#include "gen_common/gen_cmd_parse.h"
 #include "reg_configs_common.h"
 
 using namespace NEO;

core/unit_tests/gen12lp/test_preemption_gen12lp.inl

@@ -6,9 +6,10 @@
  */
 
 #include "core/unit_tests/fixtures/preemption_fixture.h"
-#include "unit_tests/mocks/mock_buffer.h"
-#include "unit_tests/mocks/mock_command_queue.h"
-#include "unit_tests/mocks/mock_csr.h"
+
+#include "mocks/mock_buffer.h"
+#include "mocks/mock_command_queue.h"
+#include "mocks/mock_csr.h"
 
 using namespace NEO;
 

core/unit_tests/gen8/cmd_parse_gen8.cpp

@@ -5,17 +5,16 @@
  *
  */
 
-#include "unit_tests/gen_common/gen_cmd_parse.h"
-
+#include "gen_common/gen_cmd_parse.h"
 #include "gtest/gtest.h"
 using GenStruct = NEO::GEN8;
 using GenGfxFamily = NEO::BDWFamily;
-#include "unit_tests/gen_common/cmd_parse_base.inl"
-#include "unit_tests/gen_common/cmd_parse_base_mi_arb.inl"
-#include "unit_tests/gen_common/cmd_parse_gpgpu_walker.inl"
-#include "unit_tests/gen_common/cmd_parse_sip.inl"
-#include "unit_tests/helpers/hw_parse.h"
-#include "unit_tests/helpers/hw_parse.inl"
+#include "gen_common/cmd_parse_base.inl"
+#include "gen_common/cmd_parse_base_mi_arb.inl"
+#include "gen_common/cmd_parse_gpgpu_walker.inl"
+#include "gen_common/cmd_parse_sip.inl"
+#include "helpers/hw_parse.h"
+#include "helpers/hw_parse.inl"
 
 template <>
 size_t CmdParse<GenGfxFamily>::getCommandLengthHwSpecific(void *cmd) {

core/unit_tests/gen8/test_preamble_gen8.cpp

@@ -9,7 +9,8 @@
 #include "core/helpers/preamble.h"
 #include "core/unit_tests/preamble/preamble_fixture.h"
 #include "opencl/source/gen8/reg_configs.h"
-#include "unit_tests/fixtures/platform_fixture.h"
+
+#include "fixtures/platform_fixture.h"
 
 using namespace NEO;
 

core/unit_tests/gen8/test_preemption_gen8.cpp

@@ -10,13 +10,14 @@
 #include "core/helpers/hw_helper.h"
 #include "core/memory_manager/memory_constants.h"
 #include "core/unit_tests/fixtures/preemption_fixture.h"
-#include "unit_tests/command_queue/enqueue_fixture.h"
-#include "unit_tests/fixtures/hello_world_fixture.h"
-#include "unit_tests/helpers/hw_parse.h"
-#include "unit_tests/mocks/mock_buffer.h"
-#include "unit_tests/mocks/mock_command_queue.h"
-#include "unit_tests/mocks/mock_csr.h"
-#include "unit_tests/mocks/mock_submissions_aggregator.h"
+
+#include "command_queue/enqueue_fixture.h"
+#include "fixtures/hello_world_fixture.h"
+#include "helpers/hw_parse.h"
+#include "mocks/mock_buffer.h"
+#include "mocks/mock_command_queue.h"
+#include "mocks/mock_csr.h"
+#include "mocks/mock_submissions_aggregator.h"
 
 using namespace NEO;
 

core/unit_tests/gen9/cmd_parse_gen9.cpp

@@ -5,17 +5,16 @@
  *
  */
 
-#include "unit_tests/gen_common/gen_cmd_parse.h"
-
+#include "gen_common/gen_cmd_parse.h"
 #include "gtest/gtest.h"
 using GenStruct = NEO::GEN9;
 using GenGfxFamily = NEO::SKLFamily;
-#include "unit_tests/gen_common/cmd_parse_base.inl"
-#include "unit_tests/gen_common/cmd_parse_base_mi_arb.inl"
-#include "unit_tests/gen_common/cmd_parse_gpgpu_walker.inl"
-#include "unit_tests/gen_common/cmd_parse_sip.inl"
-#include "unit_tests/helpers/hw_parse.h"
-#include "unit_tests/helpers/hw_parse.inl"
+#include "gen_common/cmd_parse_base.inl"
+#include "gen_common/cmd_parse_base_mi_arb.inl"
+#include "gen_common/cmd_parse_gpgpu_walker.inl"
+#include "gen_common/cmd_parse_sip.inl"
+#include "helpers/hw_parse.h"
+#include "helpers/hw_parse.inl"
 
 template <>
 size_t CmdParse<GenGfxFamily>::getCommandLengthHwSpecific(void *cmd) {

core/unit_tests/gen9/skl/test_preamble_skl.cpp

@@ -11,7 +11,8 @@
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/preamble/preamble_fixture.h"
 #include "opencl/source/gen9/reg_configs.h"
-#include "unit_tests/gen_common/gen_cmd_parse.h"
+
+#include "gen_common/gen_cmd_parse.h"
 
 using namespace NEO;
 

core/unit_tests/gen9/test_command_encoder_gen9.cpp

@@ -8,9 +8,9 @@
 #include "core/command_container/cmdcontainer.h"
 #include "core/command_container/command_encoder.h"
 #include "test.h"
-#include "unit_tests/fixtures/device_fixture.h"
-#include "unit_tests/gen_common/gen_cmd_parse.h"
 
+#include "fixtures/device_fixture.h"
+#include "gen_common/gen_cmd_parse.h"
 #include "reg_configs_common.h"
 
 using namespace NEO;

core/unit_tests/gen9/test_preemption_gen9.cpp

@@ -9,12 +9,13 @@
 #include "core/helpers/hw_helper.h"
 #include "core/unit_tests/fixtures/preemption_fixture.h"
 #include "opencl/source/built_ins/built_ins.h"
-#include "unit_tests/command_queue/enqueue_fixture.h"
-#include "unit_tests/helpers/hw_parse.h"
-#include "unit_tests/mocks/mock_buffer.h"
-#include "unit_tests/mocks/mock_command_queue.h"
-#include "unit_tests/mocks/mock_csr.h"
-#include "unit_tests/mocks/mock_submissions_aggregator.h"
+
+#include "command_queue/enqueue_fixture.h"
+#include "helpers/hw_parse.h"
+#include "mocks/mock_buffer.h"
+#include "mocks/mock_command_queue.h"
+#include "mocks/mock_csr.h"
+#include "mocks/mock_submissions_aggregator.h"
 
 namespace NEO {
 

core/unit_tests/image/image_surface_state_fixture.h

@@ -16,11 +16,12 @@
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/source/mem_obj/image.h"
 #include "test.h"
-#include "unit_tests/fixtures/device_fixture.h"
-#include "unit_tests/fixtures/image_fixture.h"
-#include "unit_tests/mocks/mock_gmm.h"
-#include "unit_tests/mocks/mock_gmm_resource_info.h"
-#include "unit_tests/mocks/mock_graphics_allocation.h"
+
+#include "fixtures/device_fixture.h"
+#include "fixtures/image_fixture.h"
+#include "mocks/mock_gmm.h"
+#include "mocks/mock_gmm_resource_info.h"
+#include "mocks/mock_graphics_allocation.h"
 
 #include <memory>
 

core/unit_tests/libult/gen11.cpp

@@ -6,7 +6,8 @@
  */
 
 #include "opencl/source/helpers/base_object.h"
-#include "unit_tests/libult/ult_command_stream_receiver.h"
+
+#include "libult/ult_command_stream_receiver.h"
 
 namespace NEO {
 

core/unit_tests/libult/gen12lp.cpp

@@ -6,7 +6,8 @@
  */
 
 #include "opencl/source/helpers/base_object.h"
-#include "unit_tests/libult/ult_command_stream_receiver.h"
+
+#include "libult/ult_command_stream_receiver.h"
 
 namespace NEO {
 

core/unit_tests/libult/gen8.cpp

@@ -6,7 +6,8 @@
  */
 
 #include "opencl/source/helpers/base_object.h"
-#include "unit_tests/libult/ult_command_stream_receiver.h"
+
+#include "libult/ult_command_stream_receiver.h"
 
 namespace NEO {
 

core/unit_tests/libult/gen9.cpp

@@ -6,7 +6,8 @@
  */
 
 #include "opencl/source/helpers/base_object.h"
-#include "unit_tests/libult/ult_command_stream_receiver.h"
+
+#include "libult/ult_command_stream_receiver.h"
 
 namespace NEO {
 

core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.h

@@ -7,9 +7,9 @@
 
 #pragma once
 #include "core/kernel/dispatch_kernel_encoder_interface.h"
-#include "unit_tests/mocks/mock_graphics_allocation.h"
 
 #include "gmock/gmock.h"
+#include "mocks/mock_graphics_allocation.h"
 
 #include <stdint.h>
 

core/unit_tests/os_interface/aub_memory_operations_handler_tests.cpp

@@ -8,7 +8,8 @@
 #include "core/unit_tests/os_interface/aub_memory_operations_handler_tests.h"
 
 #include "opencl/source/aub_mem_dump/aub_mem_dump.h"
-#include "unit_tests/mocks/mock_aub_manager.h"
+
+#include "mocks/mock_aub_manager.h"
 
 TEST_F(AubMemoryOperationsHandlerTests, givenNullPtrAsAubManagerWhenMakeResidentCalledThenFalseReturned) {
     getMemoryOperationsHandler()->setAubManager(nullptr);

core/unit_tests/os_interface/aub_memory_operations_handler_tests.h

@@ -11,9 +11,9 @@
 #include "core/os_interface/aub_memory_operations_handler.h"
 #include "core/os_interface/device_factory.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "unit_tests/mocks/mock_graphics_allocation.h"
 
 #include "gtest/gtest.h"
+#include "mocks/mock_graphics_allocation.h"
 
 using namespace NEO;
 

core/unit_tests/os_interface/linux/gmm_helper_tests_linux.cpp

@@ -7,9 +7,9 @@
 
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/unit_tests/helpers/default_hw_info.h"
-#include "unit_tests/helpers/variable_backup.h"
 
 #include "gtest/gtest.h"
+#include "helpers/variable_backup.h"
 
 namespace NEO {
 

core/unit_tests/os_interface/windows/gmm_helper_tests_win.cpp

@@ -7,9 +7,9 @@
 
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/unit_tests/helpers/default_hw_info.h"
-#include "unit_tests/helpers/variable_backup.h"
 
 #include "gtest/gtest.h"
+#include "helpers/variable_backup.h"
 
 namespace NEO {
 

core/unit_tests/os_interface/windows/wddm_preemption_tests.cpp

@@ -10,7 +10,8 @@
 #include "core/helpers/hw_helper.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "test.h"
-#include "unit_tests/os_interface/windows/wddm_fixture.h"
+
+#include "os_interface/windows/wddm_fixture.h"
 
 using namespace NEO;
 

core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests.cpp

@@ -9,7 +9,8 @@
 #include "core/memory_manager/unified_memory_manager.h"
 #include "core/unified_memory/unified_memory.h"
 #include "core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests_fixture.h"
-#include "unit_tests/mocks/mock_memory_manager.h"
+
+#include "mocks/mock_memory_manager.h"
 
 using namespace NEO;
 

core/unit_tests/preamble/preamble_fixture.h

@@ -7,10 +7,11 @@
 
 #pragma once
 #include "core/helpers/preamble.h"
-#include "unit_tests/command_stream/linear_stream_fixture.h"
-#include "unit_tests/fixtures/device_fixture.h"
-#include "unit_tests/fixtures/platform_fixture.h"
-#include "unit_tests/helpers/hw_parse.h"
+
+#include "command_stream/linear_stream_fixture.h"
+#include "fixtures/device_fixture.h"
+#include "fixtures/platform_fixture.h"
+#include "helpers/hw_parse.h"
 
 using namespace NEO;
 

core/unit_tests/preamble/preamble_tests.cpp

@@ -12,10 +12,10 @@
 #include "core/utilities/stackvec.h"
 #include "opencl/source/gen11/reg_configs.h"
 #include "test.h"
-#include "unit_tests/helpers/hw_parse.h"
-#include "unit_tests/mocks/mock_device.h"
-#include "unit_tests/mocks/mock_graphics_allocation.h"
 
+#include "helpers/hw_parse.h"
+#include "mocks/mock_device.h"
+#include "mocks/mock_graphics_allocation.h"
 #include <gtest/gtest.h>
 
 #include <algorithm>

core/unit_tests/preemption/preemption_tests.cpp

@@ -11,14 +11,14 @@
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/helpers/dispatch_info.h"
-#include "unit_tests/helpers/dispatch_flags_helper.h"
-#include "unit_tests/helpers/hw_parse.h"
-#include "unit_tests/mocks/mock_builtins.h"
-#include "unit_tests/mocks/mock_device.h"
-#include "unit_tests/mocks/mock_graphics_allocation.h"
-#include "unit_tests/mocks/mock_kernel.h"
 
 #include "gmock/gmock.h"
+#include "helpers/dispatch_flags_helper.h"
+#include "helpers/hw_parse.h"
+#include "mocks/mock_builtins.h"
+#include "mocks/mock_device.h"
+#include "mocks/mock_graphics_allocation.h"
+#include "mocks/mock_kernel.h"
 
 using namespace NEO;
 

core/unit_tests/program/program_initialization_tests.cpp

@@ -7,12 +7,12 @@
 
 #include "core/program/program_initialization.h"
 #include "core/unit_tests/compiler_interface/linker_mock.h"
-#include "unit_tests/mocks/mock_device.h"
-#include "unit_tests/mocks/mock_memory_manager.h"
-#include "unit_tests/mocks/mock_svm_manager.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "mocks/mock_device.h"
+#include "mocks/mock_memory_manager.h"
+#include "mocks/mock_svm_manager.h"
 
 #include <cstdint>
 

core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h

@@ -10,10 +10,10 @@
 #include "core/helpers/preamble.h"
 #include "opencl/source/built_ins/built_ins.h"
 #include "test.h"
-#include "unit_tests/helpers/hw_parse.h"
-#include "unit_tests/mocks/mock_device.h"
-#include "unit_tests/mocks/mock_graphics_allocation.h"
 
+#include "helpers/hw_parse.h"
+#include "mocks/mock_device.h"
+#include "mocks/mock_graphics_allocation.h"
 #include <gtest/gtest.h>
 
 template <typename GfxFamily>

manifests/manifest.yml

@@ -14,7 +14,7 @@ components:
   infra:
     branch: infra
     dest_dir: infra
-    revision: 36b37dcf299f8c86dac87d621da41bd2b6eb6517
+    revision: a0b04a1678e59383351e967ea1c69fcd5d535a9c
     type: git
   internal:
     branch: master