diff --git a/.clang-format b/.clang-format index 4aa62ec560..fa7893bcb6 100644 --- a/.clang-format +++ b/.clang-format @@ -85,7 +85,7 @@ PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 60 PointerAlignment: Right ReflowComments: true -SortIncludes: true +SortIncludes: false SpaceAfterCStyleCast: false SpaceBeforeAssignmentOperators: true SpaceBeforeParens: ControlStatements diff --git a/CMakeLists.txt b/CMakeLists.txt index ac7dec948f..e31e62bac0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -780,6 +780,7 @@ endif() # Project-wide include paths # Please keep alphabetical order +include_directories(core) include_directories(${NEO_BUILD_DIR}) include_directories(${NEO_SOURCE_DIR}) include_directories(${NEO_SOURCE_DIR}/core/command_stream/definitions${BRANCH_DIR_SUFFIX}) diff --git a/core/command_container/cmdcontainer.cpp b/core/command_container/cmdcontainer.cpp index 0ecf635ac9..d99a816528 100644 --- a/core/command_container/cmdcontainer.cpp +++ b/core/command_container/cmdcontainer.cpp @@ -5,16 +5,16 @@ * */ -#include "core/command_container/cmdcontainer.h" +#include "command_container/cmdcontainer.h" -#include "core/command_container/command_encoder.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/linear_stream.h" -#include "core/device/device.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/heap_helper.h" -#include "core/indirect_heap/indirect_heap.h" -#include "core/memory_manager/memory_manager.h" +#include "command_container/command_encoder.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/linear_stream.h" +#include "device/device.h" +#include "helpers/debug_helpers.h" +#include "helpers/heap_helper.h" +#include "indirect_heap/indirect_heap.h" +#include "memory_manager/memory_manager.h" namespace NEO { diff --git a/core/command_container/cmdcontainer.h b/core/command_container/cmdcontainer.h index d636ff3498..dc11687253 100644 --- a/core/command_container/cmdcontainer.h +++ b/core/command_container/cmdcontainer.h @@ -6,10 +6,10 @@ */ #pragma once -#include "core/command_stream/csr_definitions.h" -#include "core/helpers/heap_helper.h" -#include "core/helpers/non_copyable_or_moveable.h" -#include "core/indirect_heap/indirect_heap.h" +#include "command_stream/csr_definitions.h" +#include "helpers/heap_helper.h" +#include "helpers/non_copyable_or_moveable.h" +#include "indirect_heap/indirect_heap.h" #include #include diff --git a/core/command_container/command_encoder.h b/core/command_container/command_encoder.h index fc4001d9dd..fcf3d41ce2 100644 --- a/core/command_container/command_encoder.h +++ b/core/command_container/command_encoder.h @@ -6,11 +6,11 @@ */ #pragma once -#include "core/command_container/cmdcontainer.h" -#include "core/command_stream/linear_stream.h" -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/simd_helper.h" -#include "core/kernel/dispatch_kernel_encoder_interface.h" +#include "command_container/cmdcontainer.h" +#include "command_stream/linear_stream.h" +#include "execution_environment/execution_environment.h" +#include "helpers/simd_helper.h" +#include "kernel/dispatch_kernel_encoder_interface.h" #include diff --git a/core/command_container/command_encoder.inl b/core/command_container/command_encoder.inl index 0d25660700..0a571394e7 100644 --- a/core/command_container/command_encoder.inl +++ b/core/command_container/command_encoder.inl @@ -6,16 +6,16 @@ */ #pragma once -#include "core/command_container/command_encoder.h" -#include "core/command_stream/linear_stream.h" -#include "core/device/device.h" -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/preamble.h" -#include "core/helpers/register_offsets.h" -#include "core/helpers/simd_helper.h" -#include "core/helpers/string.h" -#include "core/kernel/dispatch_kernel_encoder_interface.h" +#include "command_container/command_encoder.h" +#include "command_stream/linear_stream.h" +#include "device/device.h" +#include "execution_environment/execution_environment.h" +#include "helpers/hw_helper.h" +#include "helpers/preamble.h" +#include "helpers/register_offsets.h" +#include "helpers/simd_helper.h" +#include "helpers/string.h" +#include "kernel/dispatch_kernel_encoder_interface.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include diff --git a/core/command_container/command_encoder_base.inl b/core/command_container/command_encoder_base.inl index 06e2ddd8fe..544fad8fe5 100644 --- a/core/command_container/command_encoder_base.inl +++ b/core/command_container/command_encoder_base.inl @@ -6,14 +6,14 @@ */ #pragma once -#include "core/command_container/command_encoder.h" -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/preemption.h" -#include "core/execution_environment/execution_environment.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/simd_helper.h" -#include "core/helpers/state_base_address.h" -#include "core/kernel/dispatch_kernel_encoder_interface.h" +#include "command_container/command_encoder.h" +#include "command_stream/linear_stream.h" +#include "command_stream/preemption.h" +#include "execution_environment/execution_environment.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/simd_helper.h" +#include "helpers/state_base_address.h" +#include "kernel/dispatch_kernel_encoder_interface.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include diff --git a/core/command_stream/command_stream_receiver.cpp b/core/command_stream/command_stream_receiver.cpp index b85e59eb9b..be662d75d1 100644 --- a/core/command_stream/command_stream_receiver.cpp +++ b/core/command_stream/command_stream_receiver.cpp @@ -5,26 +5,26 @@ * */ -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" -#include "core/command_stream/experimental_command_buffer.h" -#include "core/command_stream/preemption.h" -#include "core/command_stream/scratch_space_controller.h" -#include "core/device/device.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/array_count.h" -#include "core/helpers/cache_policy.h" -#include "core/helpers/flush_stamp.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/string.h" -#include "core/helpers/timestamp_packet.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_manager.h" -#include "core/memory_manager/surface.h" -#include "core/os_interface/os_context.h" -#include "core/os_interface/os_interface.h" -#include "core/utilities/cpuintrinsics.h" -#include "core/utilities/tag_allocator.h" +#include "command_stream/experimental_command_buffer.h" +#include "command_stream/preemption.h" +#include "command_stream/scratch_space_controller.h" +#include "device/device.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/array_count.h" +#include "helpers/cache_policy.h" +#include "helpers/flush_stamp.h" +#include "helpers/hw_helper.h" +#include "helpers/string.h" +#include "helpers/timestamp_packet.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_manager.h" +#include "memory_manager/surface.h" +#include "os_interface/os_context.h" +#include "os_interface/os_interface.h" +#include "utilities/cpuintrinsics.h" +#include "utilities/tag_allocator.h" #include "opencl/source/built_ins/built_ins.h" namespace NEO { diff --git a/core/command_stream/command_stream_receiver.h b/core/command_stream/command_stream_receiver.h index 3db283b812..7154aaf455 100644 --- a/core/command_stream/command_stream_receiver.h +++ b/core/command_stream/command_stream_receiver.h @@ -6,18 +6,18 @@ */ #pragma once -#include "core/command_stream/aub_subcapture_status.h" -#include "core/command_stream/csr_definitions.h" -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/submissions_aggregator.h" -#include "core/command_stream/thread_arbitration_policy.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/blit_commands_helper.h" -#include "core/helpers/completion_stamp.h" -#include "core/helpers/flat_batch_buffer_helper.h" -#include "core/helpers/options.h" -#include "core/indirect_heap/indirect_heap.h" -#include "core/kernel/grf_config.h" +#include "command_stream/aub_subcapture_status.h" +#include "command_stream/csr_definitions.h" +#include "command_stream/linear_stream.h" +#include "command_stream/submissions_aggregator.h" +#include "command_stream/thread_arbitration_policy.h" +#include "helpers/aligned_memory.h" +#include "helpers/blit_commands_helper.h" +#include "helpers/completion_stamp.h" +#include "helpers/flat_batch_buffer_helper.h" +#include "helpers/options.h" +#include "indirect_heap/indirect_heap.h" +#include "kernel/grf_config.h" #include #include diff --git a/core/command_stream/command_stream_receiver_hw.h b/core/command_stream/command_stream_receiver_hw.h index 3e89aab0c8..a5b05449fe 100644 --- a/core/command_stream/command_stream_receiver_hw.h +++ b/core/command_stream/command_stream_receiver_hw.h @@ -6,11 +6,11 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/dirty_state_helpers.h" -#include "core/helpers/hw_cmds.h" -#include "core/helpers/hw_info.h" +#include "command_stream/command_stream_receiver.h" +#include "execution_environment/execution_environment.h" +#include "helpers/dirty_state_helpers.h" +#include "helpers/hw_cmds.h" +#include "helpers/hw_info.h" namespace NEO { template diff --git a/core/command_stream/command_stream_receiver_hw_base.inl b/core/command_stream/command_stream_receiver_hw_base.inl index eb13eda5e9..46a7076392 100644 --- a/core/command_stream/command_stream_receiver_hw_base.inl +++ b/core/command_stream/command_stream_receiver_hw_base.inl @@ -5,30 +5,30 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/command_stream/experimental_command_buffer.h" -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/preemption.h" -#include "core/command_stream/scratch_space_controller_base.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/device/device.h" -#include "core/direct_submission/direct_submission_hw.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/gmm_helper/page_table_mngr.h" -#include "core/helpers/blit_commands_helper.h" -#include "core/helpers/cache_policy.h" -#include "core/helpers/flat_batch_buffer_helper_hw.h" -#include "core/helpers/flush_stamp.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/preamble.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/state_base_address.h" -#include "core/helpers/timestamp_packet.h" -#include "core/indirect_heap/indirect_heap.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/os_context.h" -#include "core/utilities/tag_allocator.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "command_stream/experimental_command_buffer.h" +#include "command_stream/linear_stream.h" +#include "command_stream/preemption.h" +#include "command_stream/scratch_space_controller_base.h" +#include "debug_settings/debug_settings_manager.h" +#include "device/device.h" +#include "direct_submission/direct_submission_hw.h" +#include "execution_environment/root_device_environment.h" +#include "gmm_helper/page_table_mngr.h" +#include "helpers/blit_commands_helper.h" +#include "helpers/cache_policy.h" +#include "helpers/flat_batch_buffer_helper_hw.h" +#include "helpers/flush_stamp.h" +#include "helpers/hw_helper.h" +#include "helpers/preamble.h" +#include "helpers/ptr_math.h" +#include "helpers/state_base_address.h" +#include "helpers/timestamp_packet.h" +#include "indirect_heap/indirect_heap.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/os_context.h" +#include "utilities/tag_allocator.h" #include "command_stream_receiver_hw_ext.inl" diff --git a/core/command_stream/command_stream_receiver_hw_bdw_plus.inl b/core/command_stream/command_stream_receiver_hw_bdw_plus.inl index a42fb8a458..3c141d0bde 100644 --- a/core/command_stream/command_stream_receiver_hw_bdw_plus.inl +++ b/core/command_stream/command_stream_receiver_hw_bdw_plus.inl @@ -5,7 +5,7 @@ * */ -#include "core/command_stream/command_stream_receiver_hw_base.inl" +#include "command_stream/command_stream_receiver_hw_base.inl" namespace NEO { diff --git a/core/command_stream/command_stream_receiver_hw_tgllp_plus.inl b/core/command_stream/command_stream_receiver_hw_tgllp_plus.inl index 4386acac34..2241ecda8c 100644 --- a/core/command_stream/command_stream_receiver_hw_tgllp_plus.inl +++ b/core/command_stream/command_stream_receiver_hw_tgllp_plus.inl @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/helpers/state_compute_mode_helper.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "helpers/state_compute_mode_helper.h" namespace NEO { template diff --git a/core/command_stream/csr_definitions.h b/core/command_stream/csr_definitions.h index 58b9497069..889daede07 100644 --- a/core/command_stream/csr_definitions.h +++ b/core/command_stream/csr_definitions.h @@ -6,13 +6,13 @@ */ #pragma once -#include "core/command_stream/csr_deps.h" -#include "core/command_stream/queue_throttle.h" -#include "core/command_stream/thread_arbitration_policy.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/pipeline_select_args.h" -#include "core/kernel/grf_config.h" -#include "core/memory_manager/memory_constants.h" +#include "command_stream/csr_deps.h" +#include "command_stream/queue_throttle.h" +#include "command_stream/thread_arbitration_policy.h" +#include "helpers/hw_info.h" +#include "helpers/pipeline_select_args.h" +#include "kernel/grf_config.h" +#include "memory_manager/memory_constants.h" #include diff --git a/core/command_stream/csr_deps.cpp b/core/command_stream/csr_deps.cpp index e5b3469ae2..7177d05008 100644 --- a/core/command_stream/csr_deps.cpp +++ b/core/command_stream/csr_deps.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/csr_deps.h" +#include "command_stream/csr_deps.h" -#include "core/helpers/timestamp_packet.h" +#include "helpers/timestamp_packet.h" namespace NEO { diff --git a/core/command_stream/csr_deps.h b/core/command_stream/csr_deps.h index c1a01eca82..5289dbae4d 100644 --- a/core/command_stream/csr_deps.h +++ b/core/command_stream/csr_deps.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/utilities/stackvec.h" +#include "utilities/stackvec.h" namespace NEO { diff --git a/core/command_stream/definitions/command_stream_receiver_hw_ext.inl b/core/command_stream/definitions/command_stream_receiver_hw_ext.inl index 68061ed0aa..0f0f4f1a2c 100644 --- a/core/command_stream/definitions/command_stream_receiver_hw_ext.inl +++ b/core/command_stream/definitions/command_stream_receiver_hw_ext.inl @@ -6,9 +6,9 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/command_stream/csr_definitions.h" -#include "core/command_stream/linear_stream.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "command_stream/csr_definitions.h" +#include "command_stream/linear_stream.h" namespace NEO { diff --git a/core/command_stream/experimental_command_buffer.cpp b/core/command_stream/experimental_command_buffer.cpp index 94b3d6abbc..dad346a4ff 100644 --- a/core/command_stream/experimental_command_buffer.cpp +++ b/core/command_stream/experimental_command_buffer.cpp @@ -5,13 +5,13 @@ * */ -#include "core/command_stream/experimental_command_buffer.h" +#include "command_stream/experimental_command_buffer.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/linear_stream.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_constants.h" -#include "core/memory_manager/memory_manager.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/linear_stream.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_constants.h" +#include "memory_manager/memory_manager.h" #include #include diff --git a/core/command_stream/experimental_command_buffer.inl b/core/command_stream/experimental_command_buffer.inl index 295ff18b6b..f8e31ec965 100644 --- a/core/command_stream/experimental_command_buffer.inl +++ b/core/command_stream/experimental_command_buffer.inl @@ -5,12 +5,12 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/command_stream/experimental_command_buffer.h" -#include "core/command_stream/linear_stream.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/graphics_allocation.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "command_stream/experimental_command_buffer.h" +#include "command_stream/linear_stream.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/hw_helper.h" +#include "memory_manager/graphics_allocation.h" namespace NEO { diff --git a/core/command_stream/linear_stream.cpp b/core/command_stream/linear_stream.cpp index 2501db1b05..334fd0085a 100644 --- a/core/command_stream/linear_stream.cpp +++ b/core/command_stream/linear_stream.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/linear_stream.h" +#include "command_stream/linear_stream.h" -#include "core/memory_manager/graphics_allocation.h" +#include "memory_manager/graphics_allocation.h" namespace NEO { diff --git a/core/command_stream/linear_stream.h b/core/command_stream/linear_stream.h index 15b2995435..131efb7666 100644 --- a/core/command_stream/linear_stream.h +++ b/core/command_stream/linear_stream.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/debug_helpers.h" -#include "core/helpers/ptr_math.h" +#include "helpers/debug_helpers.h" +#include "helpers/ptr_math.h" #include #include diff --git a/core/command_stream/preemption.cpp b/core/command_stream/preemption.cpp index 53891382aa..75edb8f3de 100644 --- a/core/command_stream/preemption.cpp +++ b/core/command_stream/preemption.cpp @@ -5,10 +5,10 @@ * */ -#include "core/command_stream/preemption.h" +#include "command_stream/preemption.h" -#include "core/device/device.h" -#include "core/helpers/string.h" +#include "device/device.h" +#include "helpers/string.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/kernel/kernel.h" diff --git a/core/command_stream/preemption.h b/core/command_stream/preemption.h index 0d23fb293e..2d382f9994 100644 --- a/core/command_stream/preemption.h +++ b/core/command_stream/preemption.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/preemption_mode.h" -#include "core/helpers/hw_info.h" +#include "command_stream/linear_stream.h" +#include "command_stream/preemption_mode.h" +#include "helpers/hw_info.h" #include "sku_info.h" diff --git a/core/command_stream/preemption.inl b/core/command_stream/preemption.inl index 2213547793..217e459f20 100644 --- a/core/command_stream/preemption.inl +++ b/core/command_stream/preemption.inl @@ -5,10 +5,10 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/device/device.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/graphics_allocation.h" +#include "command_stream/preemption.h" +#include "device/device.h" +#include "helpers/hw_helper.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/built_ins/sip.h" #include "opencl/source/command_queue/gpgpu_walker.h" diff --git a/core/command_stream/scratch_space_controller.cpp b/core/command_stream/scratch_space_controller.cpp index f8aa16bde7..da67770744 100644 --- a/core/command_stream/scratch_space_controller.cpp +++ b/core/command_stream/scratch_space_controller.cpp @@ -5,14 +5,14 @@ * */ -#include "core/command_stream/scratch_space_controller.h" +#include "command_stream/scratch_space_controller.h" -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_manager.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/hw_helper.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_manager.h" namespace NEO { ScratchSpaceController::ScratchSpaceController(uint32_t rootDeviceIndex, ExecutionEnvironment &environment, InternalAllocationStorage &allocationStorage) diff --git a/core/command_stream/scratch_space_controller.h b/core/command_stream/scratch_space_controller.h index c4283760ac..acbbfe8e24 100644 --- a/core/command_stream/scratch_space_controller.h +++ b/core/command_stream/scratch_space_controller.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/indirect_heap/indirect_heap.h" +#include "indirect_heap/indirect_heap.h" #include #include diff --git a/core/command_stream/scratch_space_controller_base.cpp b/core/command_stream/scratch_space_controller_base.cpp index 3a4ec43cf3..e7a9d39dab 100644 --- a/core/command_stream/scratch_space_controller_base.cpp +++ b/core/command_stream/scratch_space_controller_base.cpp @@ -5,17 +5,17 @@ * */ -#include "core/command_stream/scratch_space_controller_base.h" +#include "command_stream/scratch_space_controller_base.h" -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/preamble.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_constants.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/os_context.h" +#include "execution_environment/execution_environment.h" +#include "helpers/aligned_memory.h" +#include "helpers/hw_helper.h" +#include "helpers/preamble.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_constants.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/os_context.h" namespace NEO { ScratchSpaceControllerBase::ScratchSpaceControllerBase(uint32_t rootDeviceIndex, ExecutionEnvironment &environment, InternalAllocationStorage &allocationStorage) diff --git a/core/command_stream/scratch_space_controller_base.h b/core/command_stream/scratch_space_controller_base.h index b29b659a5a..9c88ca3b60 100644 --- a/core/command_stream/scratch_space_controller_base.h +++ b/core/command_stream/scratch_space_controller_base.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/scratch_space_controller.h" +#include "command_stream/scratch_space_controller.h" namespace NEO { diff --git a/core/command_stream/submissions_aggregator.cpp b/core/command_stream/submissions_aggregator.cpp index f43e479c82..bf8a545c2c 100644 --- a/core/command_stream/submissions_aggregator.cpp +++ b/core/command_stream/submissions_aggregator.cpp @@ -7,8 +7,8 @@ #include "submissions_aggregator.h" -#include "core/helpers/flush_stamp.h" -#include "core/memory_manager/graphics_allocation.h" +#include "helpers/flush_stamp.h" +#include "memory_manager/graphics_allocation.h" void NEO::SubmissionAggregator::recordCommandBuffer(CommandBuffer *commandBuffer) { this->cmdBuffers.pushTailOne(*commandBuffer); diff --git a/core/command_stream/submissions_aggregator.h b/core/command_stream/submissions_aggregator.h index f0e4bf9eba..d37653f91c 100644 --- a/core/command_stream/submissions_aggregator.h +++ b/core/command_stream/submissions_aggregator.h @@ -6,11 +6,11 @@ */ #pragma once -#include "core/command_stream/csr_definitions.h" -#include "core/command_stream/linear_stream.h" -#include "core/memory_manager/residency_container.h" -#include "core/utilities/idlist.h" -#include "core/utilities/stackvec.h" +#include "command_stream/csr_definitions.h" +#include "command_stream/linear_stream.h" +#include "memory_manager/residency_container.h" +#include "utilities/idlist.h" +#include "utilities/stackvec.h" #include namespace NEO { diff --git a/core/compiler_interface/compiler_cache.cpp b/core/compiler_interface/compiler_cache.cpp index 190f290f45..790b1b1c95 100644 --- a/core/compiler_interface/compiler_cache.cpp +++ b/core/compiler_interface/compiler_cache.cpp @@ -5,13 +5,13 @@ * */ -#include "core/compiler_interface/compiler_cache.h" +#include "compiler_interface/compiler_cache.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/file_io.h" -#include "core/helpers/hash.h" -#include "core/helpers/hw_info.h" -#include "core/utilities/debug_settings_reader.h" +#include "helpers/aligned_memory.h" +#include "helpers/file_io.h" +#include "helpers/hash.h" +#include "helpers/hw_info.h" +#include "utilities/debug_settings_reader.h" #include "config.h" #include "os_inc.h" diff --git a/core/compiler_interface/compiler_cache.h b/core/compiler_interface/compiler_cache.h index 3db49a1f4f..90fa5ee30b 100644 --- a/core/compiler_interface/compiler_cache.h +++ b/core/compiler_interface/compiler_cache.h @@ -7,7 +7,7 @@ #pragma once -#include "core/utilities/arrayref.h" +#include "utilities/arrayref.h" #include #include diff --git a/core/compiler_interface/compiler_interface.cpp b/core/compiler_interface/compiler_interface.cpp index 01e4c9ebcb..0d78b1bcb0 100644 --- a/core/compiler_interface/compiler_interface.cpp +++ b/core/compiler_interface/compiler_interface.cpp @@ -5,13 +5,13 @@ * */ -#include "core/compiler_interface/compiler_interface.h" +#include "compiler_interface/compiler_interface.h" -#include "core/compiler_interface/compiler_cache.h" -#include "core/compiler_interface/compiler_interface.inl" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/device/device.h" -#include "core/helpers/hw_info.h" +#include "compiler_interface/compiler_cache.h" +#include "compiler_interface/compiler_interface.inl" +#include "debug_settings/debug_settings_manager.h" +#include "device/device.h" +#include "helpers/hw_info.h" #include "opencl/source/os_interface/os_inc_base.h" #include "cif/common/cif_main.h" diff --git a/core/compiler_interface/compiler_interface.h b/core/compiler_interface/compiler_interface.h index 2e91c1d6d1..9414f4c38a 100644 --- a/core/compiler_interface/compiler_interface.h +++ b/core/compiler_interface/compiler_interface.h @@ -6,11 +6,11 @@ */ #pragma once -#include "core/compiler_interface/compiler_cache.h" -#include "core/helpers/string.h" -#include "core/os_interface/os_library.h" -#include "core/utilities/arrayref.h" -#include "core/utilities/spinlock.h" +#include "compiler_interface/compiler_cache.h" +#include "helpers/string.h" +#include "os_interface/os_library.h" +#include "utilities/arrayref.h" +#include "utilities/spinlock.h" #include "opencl/source/built_ins/sip.h" #include "cif/common/cif_main.h" diff --git a/core/compiler_interface/compiler_interface.inl b/core/compiler_interface/compiler_interface.inl index 8ce2e768b5..a812e66cb7 100644 --- a/core/compiler_interface/compiler_interface.inl +++ b/core/compiler_interface/compiler_interface.inl @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "opencl/source/helpers/validators.h" #include "cif/builtins/memory/buffer/buffer.h" diff --git a/core/compiler_interface/compiler_options/compiler_options.h b/core/compiler_interface/compiler_options/compiler_options.h index d1887ce2e7..d7d3b42d9b 100644 --- a/core/compiler_interface/compiler_options/compiler_options.h +++ b/core/compiler_interface/compiler_options/compiler_options.h @@ -7,4 +7,4 @@ #pragma once -#include "core/compiler_interface/compiler_options/compiler_options_base.h" +#include "compiler_interface/compiler_options/compiler_options_base.h" diff --git a/core/compiler_interface/compiler_options/compiler_options_base.h b/core/compiler_interface/compiler_options/compiler_options_base.h index 43f807d147..f39ad61020 100644 --- a/core/compiler_interface/compiler_options/compiler_options_base.h +++ b/core/compiler_interface/compiler_options/compiler_options_base.h @@ -7,8 +7,8 @@ #pragma once -#include "core/utilities/const_stringref.h" -#include "core/utilities/stackvec.h" +#include "utilities/const_stringref.h" +#include "utilities/stackvec.h" namespace NEO { namespace CompilerOptions { diff --git a/core/compiler_interface/default_cache_config.h b/core/compiler_interface/default_cache_config.h index fae4fd8929..91c0a95780 100644 --- a/core/compiler_interface/default_cache_config.h +++ b/core/compiler_interface/default_cache_config.h @@ -7,7 +7,7 @@ #pragma once -#include "core/compiler_interface/compiler_cache.h" +#include "compiler_interface/compiler_cache.h" namespace NEO { CompilerCacheConfig getDefaultCompilerCacheConfig(); diff --git a/core/compiler_interface/intermediate_representations.h b/core/compiler_interface/intermediate_representations.h index 30ab50ba37..6ad9502c1d 100644 --- a/core/compiler_interface/intermediate_representations.h +++ b/core/compiler_interface/intermediate_representations.h @@ -7,8 +7,8 @@ #pragma once -#include "core/utilities/arrayref.h" -#include "core/utilities/const_stringref.h" +#include "utilities/arrayref.h" +#include "utilities/const_stringref.h" #include #include diff --git a/core/compiler_interface/linker.cpp b/core/compiler_interface/linker.cpp index bd5cf86a61..cf60d4d122 100644 --- a/core/compiler_interface/linker.cpp +++ b/core/compiler_interface/linker.cpp @@ -7,9 +7,9 @@ #include "linker.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/ptr_math.h" -#include "core/utilities/compiler_support.h" +#include "helpers/debug_helpers.h" +#include "helpers/ptr_math.h" +#include "utilities/compiler_support.h" #include "RelocationInfo.h" diff --git a/core/debug_settings/debug_settings_manager.cpp b/core/debug_settings/debug_settings_manager.cpp index 6656e4424b..c6472bb05d 100644 --- a/core/debug_settings/debug_settings_manager.cpp +++ b/core/debug_settings/debug_settings_manager.cpp @@ -7,11 +7,11 @@ #include "debug_settings_manager.h" -#include "core/debug_settings/definitions/translate_debug_settings.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/string.h" -#include "core/utilities/debug_settings_reader_creator.h" +#include "debug_settings/definitions/translate_debug_settings.h" +#include "helpers/debug_helpers.h" +#include "helpers/ptr_math.h" +#include "helpers/string.h" +#include "utilities/debug_settings_reader_creator.h" #include #include diff --git a/core/debug_settings/definitions/debug_variables.inl b/core/debug_settings/definitions/debug_variables.inl index a283b61516..744dec23fe 100644 --- a/core/debug_settings/definitions/debug_variables.inl +++ b/core/debug_settings/definitions/debug_variables.inl @@ -5,4 +5,4 @@ * */ -#include "core/debug_settings/debug_variables_base.inl" +#include "debug_settings/debug_variables_base.inl" diff --git a/core/debug_settings/definitions/translate_debug_settings.cpp b/core/debug_settings/definitions/translate_debug_settings.cpp index 4811129f82..3f78cb01af 100644 --- a/core/debug_settings/definitions/translate_debug_settings.cpp +++ b/core/debug_settings/definitions/translate_debug_settings.cpp @@ -5,7 +5,7 @@ * */ -#include "core/debug_settings/definitions/translate_debug_settings.h" +#include "debug_settings/definitions/translate_debug_settings.h" namespace NEO { diff --git a/core/device/device.cpp b/core/device/device.cpp index 3236f75a3e..9a66d72a71 100644 --- a/core/device/device.cpp +++ b/core/device/device.cpp @@ -5,17 +5,17 @@ * */ -#include "core/device/device.h" +#include "device/device.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/experimental_command_buffer.h" -#include "core/command_stream/preemption.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/os_context.h" -#include "core/os_interface/os_interface.h" -#include "core/os_interface/os_time.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/experimental_command_buffer.h" +#include "command_stream/preemption.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/hw_helper.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/os_context.h" +#include "os_interface/os_interface.h" +#include "os_interface/os_time.h" #include "opencl/source/device/driver_info.h" #include "opencl/source/source_level_debugger/source_level_debugger.h" diff --git a/core/device/device.h b/core/device/device.h index 98f0429045..e9c8cbea83 100644 --- a/core/device/device.h +++ b/core/device/device.h @@ -6,10 +6,10 @@ */ #pragma once -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/common_types.h" -#include "core/helpers/engine_control.h" -#include "core/helpers/hw_info.h" +#include "execution_environment/execution_environment.h" +#include "helpers/common_types.h" +#include "helpers/engine_control.h" +#include "helpers/hw_info.h" #include "opencl/source/device/device_info.h" #include "opencl/source/os_interface/performance_counters.h" diff --git a/core/device/device_get_engine.cpp b/core/device/device_get_engine.cpp index bc87f9940a..3ad298967c 100644 --- a/core/device/device_get_engine.cpp +++ b/core/device/device_get_engine.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" -#include "core/helpers/hw_helper.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" +#include "helpers/hw_helper.h" namespace NEO { diff --git a/core/device/root_device.cpp b/core/device/root_device.cpp index 28307df779..a83c292504 100644 --- a/core/device/root_device.cpp +++ b/core/device/root_device.cpp @@ -5,14 +5,14 @@ * */ -#include "core/device/root_device.h" +#include "device/root_device.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/preemption.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/device/sub_device.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/memory_manager.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/preemption.h" +#include "debug_settings/debug_settings_manager.h" +#include "device/sub_device.h" +#include "helpers/hw_helper.h" +#include "memory_manager/memory_manager.h" namespace NEO { extern CommandStreamReceiver *createCommandStream(ExecutionEnvironment &executionEnvironment, uint32_t rootDeviceIndex); diff --git a/core/device/root_device.h b/core/device/root_device.h index 764d5c808d..060e3a210e 100644 --- a/core/device/root_device.h +++ b/core/device/root_device.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/device/device.h" +#include "device/device.h" namespace NEO { diff --git a/core/device/sub_device.cpp b/core/device/sub_device.cpp index 2f9474b56d..5a48a71b77 100644 --- a/core/device/sub_device.cpp +++ b/core/device/sub_device.cpp @@ -5,9 +5,9 @@ * */ -#include "core/device/sub_device.h" +#include "device/sub_device.h" -#include "core/device/root_device.h" +#include "device/root_device.h" namespace NEO { diff --git a/core/device/sub_device.h b/core/device/sub_device.h index 0c112be39c..8e492b2e85 100644 --- a/core/device/sub_device.h +++ b/core/device/sub_device.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/device/device.h" +#include "device/device.h" namespace NEO { class RootDevice; diff --git a/core/device_binary_format/ar/ar.h b/core/device_binary_format/ar/ar.h index 439783f22e..22e4a2a0e1 100644 --- a/core/device_binary_format/ar/ar.h +++ b/core/device_binary_format/ar/ar.h @@ -7,7 +7,7 @@ #pragma once -#include "core/utilities/const_stringref.h" +#include "utilities/const_stringref.h" namespace NEO { namespace Ar { diff --git a/core/device_binary_format/ar/ar_decoder.cpp b/core/device_binary_format/ar/ar_decoder.cpp index 30e2da69dd..c31a1f224c 100644 --- a/core/device_binary_format/ar/ar_decoder.cpp +++ b/core/device_binary_format/ar/ar_decoder.cpp @@ -5,7 +5,7 @@ * */ -#include "core/device_binary_format/ar/ar_decoder.h" +#include "device_binary_format/ar/ar_decoder.h" #include diff --git a/core/device_binary_format/ar/ar_decoder.h b/core/device_binary_format/ar/ar_decoder.h index 987423e7d4..04563504fb 100644 --- a/core/device_binary_format/ar/ar_decoder.h +++ b/core/device_binary_format/ar/ar_decoder.h @@ -7,10 +7,10 @@ #pragma once -#include "core/compiler_interface/intermediate_representations.h" -#include "core/device_binary_format/ar/ar.h" -#include "core/utilities/arrayref.h" -#include "core/utilities/stackvec.h" +#include "compiler_interface/intermediate_representations.h" +#include "device_binary_format/ar/ar.h" +#include "utilities/arrayref.h" +#include "utilities/stackvec.h" namespace NEO { namespace Ar { diff --git a/core/device_binary_format/ar/ar_encoder.cpp b/core/device_binary_format/ar/ar_encoder.cpp index 7be1df3027..47a66a1b65 100644 --- a/core/device_binary_format/ar/ar_encoder.cpp +++ b/core/device_binary_format/ar/ar_encoder.cpp @@ -5,10 +5,10 @@ * */ -#include "core/device_binary_format/ar/ar_encoder.h" +#include "device_binary_format/ar/ar_encoder.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/string.h" +#include "helpers/debug_helpers.h" +#include "helpers/string.h" #include diff --git a/core/device_binary_format/ar/ar_encoder.h b/core/device_binary_format/ar/ar_encoder.h index a7cb89755e..99fac79a4a 100644 --- a/core/device_binary_format/ar/ar_encoder.h +++ b/core/device_binary_format/ar/ar_encoder.h @@ -7,9 +7,9 @@ #pragma once -#include "core/device_binary_format/ar/ar.h" -#include "core/utilities/arrayref.h" -#include "core/utilities/const_stringref.h" +#include "device_binary_format/ar/ar.h" +#include "utilities/arrayref.h" +#include "utilities/const_stringref.h" #include #include diff --git a/core/device_binary_format/device_binary_format_ar.cpp b/core/device_binary_format/device_binary_format_ar.cpp index 1e3bf81c9e..a4fdd2d64b 100644 --- a/core/device_binary_format/device_binary_format_ar.cpp +++ b/core/device_binary_format/device_binary_format_ar.cpp @@ -5,9 +5,9 @@ * */ -#include "core/device_binary_format/ar/ar.h" -#include "core/device_binary_format/ar/ar_decoder.h" -#include "core/device_binary_format/device_binary_formats.h" +#include "device_binary_format/ar/ar.h" +#include "device_binary_format/ar/ar_decoder.h" +#include "device_binary_format/device_binary_formats.h" namespace NEO { diff --git a/core/device_binary_format/device_binary_format_ocl_elf.cpp b/core/device_binary_format/device_binary_format_ocl_elf.cpp index cfe5c36ace..c72478c3bf 100644 --- a/core/device_binary_format/device_binary_format_ocl_elf.cpp +++ b/core/device_binary_format/device_binary_format_ocl_elf.cpp @@ -5,12 +5,12 @@ * */ -#include "core/compiler_interface/intermediate_representations.h" -#include "core/device_binary_format/device_binary_formats.h" -#include "core/device_binary_format/elf/elf_decoder.h" -#include "core/device_binary_format/elf/elf_encoder.h" -#include "core/device_binary_format/elf/ocl_elf.h" -#include "core/utilities/compiler_support.h" +#include "compiler_interface/intermediate_representations.h" +#include "device_binary_format/device_binary_formats.h" +#include "device_binary_format/elf/elf_decoder.h" +#include "device_binary_format/elf/elf_encoder.h" +#include "device_binary_format/elf/ocl_elf.h" +#include "utilities/compiler_support.h" #include diff --git a/core/device_binary_format/device_binary_format_patchtokens.cpp b/core/device_binary_format/device_binary_format_patchtokens.cpp index fe176f4325..edd7533bef 100644 --- a/core/device_binary_format/device_binary_format_patchtokens.cpp +++ b/core/device_binary_format/device_binary_format_patchtokens.cpp @@ -5,12 +5,12 @@ * */ -#include "core/device_binary_format/device_binary_formats.h" -#include "core/device_binary_format/patchtokens_decoder.h" -#include "core/device_binary_format/patchtokens_dumper.h" -#include "core/device_binary_format/patchtokens_validator.h" -#include "core/helpers/debug_helpers.h" -#include "core/program/program_info_from_patchtokens.h" +#include "device_binary_format/device_binary_formats.h" +#include "device_binary_format/patchtokens_decoder.h" +#include "device_binary_format/patchtokens_dumper.h" +#include "device_binary_format/patchtokens_validator.h" +#include "helpers/debug_helpers.h" +#include "program/program_info_from_patchtokens.h" #include "opencl/source/utilities/logger.h" namespace NEO { diff --git a/core/device_binary_format/device_binary_formats.cpp b/core/device_binary_format/device_binary_formats.cpp index 5916a4f881..035a67d476 100644 --- a/core/device_binary_format/device_binary_formats.cpp +++ b/core/device_binary_format/device_binary_formats.cpp @@ -5,7 +5,7 @@ * */ -#include "core/device_binary_format/device_binary_formats.h" +#include "device_binary_format/device_binary_formats.h" namespace NEO { diff --git a/core/device_binary_format/device_binary_formats.h b/core/device_binary_format/device_binary_formats.h index c9fafbd9b7..328b13ee0b 100644 --- a/core/device_binary_format/device_binary_formats.h +++ b/core/device_binary_format/device_binary_formats.h @@ -7,8 +7,8 @@ #pragma once -#include "core/utilities/arrayref.h" -#include "core/utilities/const_stringref.h" +#include "utilities/arrayref.h" +#include "utilities/const_stringref.h" #include #include diff --git a/core/device_binary_format/elf/elf.h b/core/device_binary_format/elf/elf.h index d29d23d09a..f7e09f78bd 100644 --- a/core/device_binary_format/elf/elf.h +++ b/core/device_binary_format/elf/elf.h @@ -7,7 +7,7 @@ #pragma once -#include "core/utilities/const_stringref.h" +#include "utilities/const_stringref.h" #include #include diff --git a/core/device_binary_format/elf/elf_decoder.cpp b/core/device_binary_format/elf/elf_decoder.cpp index 71e9542f23..ebaf37f7cd 100644 --- a/core/device_binary_format/elf/elf_decoder.cpp +++ b/core/device_binary_format/elf/elf_decoder.cpp @@ -5,9 +5,9 @@ * */ -#include "core/device_binary_format/elf/elf_decoder.h" +#include "device_binary_format/elf/elf_decoder.h" -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include diff --git a/core/device_binary_format/elf/elf_decoder.h b/core/device_binary_format/elf/elf_decoder.h index b517cd1d04..ee44ac102a 100644 --- a/core/device_binary_format/elf/elf_decoder.h +++ b/core/device_binary_format/elf/elf_decoder.h @@ -6,10 +6,10 @@ */ #pragma once -#include "core/device_binary_format/elf/elf.h" -#include "core/utilities/arrayref.h" -#include "core/utilities/const_stringref.h" -#include "core/utilities/stackvec.h" +#include "device_binary_format/elf/elf.h" +#include "utilities/arrayref.h" +#include "utilities/const_stringref.h" +#include "utilities/stackvec.h" #include diff --git a/core/device_binary_format/elf/elf_encoder.cpp b/core/device_binary_format/elf/elf_encoder.cpp index 391851d008..5fe9143565 100644 --- a/core/device_binary_format/elf/elf_encoder.cpp +++ b/core/device_binary_format/elf/elf_encoder.cpp @@ -5,9 +5,9 @@ * */ -#include "core/device_binary_format/elf/elf_encoder.h" +#include "device_binary_format/elf/elf_encoder.h" -#include "core/utilities/range.h" +#include "utilities/range.h" #include diff --git a/core/device_binary_format/elf/elf_encoder.h b/core/device_binary_format/elf/elf_encoder.h index 7aaf7f1ed5..557e0d51d0 100644 --- a/core/device_binary_format/elf/elf_encoder.h +++ b/core/device_binary_format/elf/elf_encoder.h @@ -6,11 +6,11 @@ */ #pragma once -#include "core/device_binary_format/elf/elf.h" -#include "core/helpers/aligned_memory.h" -#include "core/utilities/arrayref.h" -#include "core/utilities/const_stringref.h" -#include "core/utilities/stackvec.h" +#include "device_binary_format/elf/elf.h" +#include "helpers/aligned_memory.h" +#include "utilities/arrayref.h" +#include "utilities/const_stringref.h" +#include "utilities/stackvec.h" #include #include diff --git a/core/device_binary_format/elf/ocl_elf.h b/core/device_binary_format/elf/ocl_elf.h index 03ecbb7858..ba2e922777 100644 --- a/core/device_binary_format/elf/ocl_elf.h +++ b/core/device_binary_format/elf/ocl_elf.h @@ -8,8 +8,8 @@ // Abstract: Defines the types used for ELF headers/sections. #pragma once -#include "core/device_binary_format/elf/elf.h" -#include "core/utilities/const_stringref.h" +#include "device_binary_format/elf/elf.h" +#include "utilities/const_stringref.h" #include #include diff --git a/core/device_binary_format/patchtokens_decoder.cpp b/core/device_binary_format/patchtokens_decoder.cpp index a46ca7e5f1..164fb8a420 100644 --- a/core/device_binary_format/patchtokens_decoder.cpp +++ b/core/device_binary_format/patchtokens_decoder.cpp @@ -7,10 +7,10 @@ #include "patchtokens_decoder.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/hash.h" -#include "core/helpers/ptr_math.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/debug_helpers.h" +#include "helpers/hash.h" +#include "helpers/ptr_math.h" #include diff --git a/core/device_binary_format/patchtokens_decoder.h b/core/device_binary_format/patchtokens_decoder.h index 1fa9ac1ac9..01b34a1dbd 100644 --- a/core/device_binary_format/patchtokens_decoder.h +++ b/core/device_binary_format/patchtokens_decoder.h @@ -7,10 +7,10 @@ #pragma once -#include "core/device_binary_format/device_binary_formats.h" -#include "core/helpers/ptr_math.h" -#include "core/utilities/arrayref.h" -#include "core/utilities/stackvec.h" +#include "device_binary_format/device_binary_formats.h" +#include "helpers/ptr_math.h" +#include "utilities/arrayref.h" +#include "utilities/stackvec.h" #include "igfxfmid.h" #include "patch_g7.h" diff --git a/core/device_binary_format/patchtokens_validator.cpp b/core/device_binary_format/patchtokens_validator.cpp index 24281296c5..59d0250d0a 100644 --- a/core/device_binary_format/patchtokens_validator.cpp +++ b/core/device_binary_format/patchtokens_validator.cpp @@ -5,10 +5,10 @@ * */ -#include "core/device_binary_format/patchtokens_validator.h" +#include "device_binary_format/patchtokens_validator.h" -#include "core/device_binary_format/patchtokens_decoder.h" -#include "core/helpers/hw_info.h" +#include "device_binary_format/patchtokens_decoder.h" +#include "helpers/hw_info.h" #include "opencl/source/program/kernel_arg_info.h" #include "igfxfmid.h" diff --git a/core/device_binary_format/patchtokens_validator.h b/core/device_binary_format/patchtokens_validator.h index 3bef60be12..57ba8b3bab 100644 --- a/core/device_binary_format/patchtokens_validator.h +++ b/core/device_binary_format/patchtokens_validator.h @@ -7,7 +7,7 @@ #pragma once -#include "core/device_binary_format/device_binary_formats.h" +#include "device_binary_format/device_binary_formats.h" #include diff --git a/core/direct_submission/direct_submission_hw.h b/core/direct_submission/direct_submission_hw.h index ae65081575..78418d859a 100644 --- a/core/direct_submission/direct_submission_hw.h +++ b/core/direct_submission/direct_submission_hw.h @@ -6,10 +6,10 @@ */ #pragma once -#include "core/command_stream/linear_stream.h" -#include "core/helpers/completion_stamp.h" -#include "core/memory_manager/memory_constants.h" -#include "core/utilities/stackvec.h" +#include "command_stream/linear_stream.h" +#include "helpers/completion_stamp.h" +#include "memory_manager/memory_constants.h" +#include "utilities/stackvec.h" #include diff --git a/core/direct_submission/direct_submission_hw.inl b/core/direct_submission/direct_submission_hw.inl index 0387614652..0cd1dff8b3 100644 --- a/core/direct_submission/direct_submission_hw.inl +++ b/core/direct_submission/direct_submission_hw.inl @@ -5,20 +5,20 @@ * */ -#include "core/command_container/command_encoder.h" -#include "core/command_stream/submissions_aggregator.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/device/device.h" -#include "core/direct_submission/direct_submission_hw.h" -#include "core/direct_submission/dispatchers/dispatcher.h" -#include "core/helpers/flush_stamp.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/allocation_properties.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/os_context.h" -#include "core/utilities/cpu_info.h" -#include "core/utilities/cpuintrinsics.h" +#include "command_container/command_encoder.h" +#include "command_stream/submissions_aggregator.h" +#include "debug_settings/debug_settings_manager.h" +#include "device/device.h" +#include "direct_submission/direct_submission_hw.h" +#include "direct_submission/dispatchers/dispatcher.h" +#include "helpers/flush_stamp.h" +#include "helpers/ptr_math.h" +#include "memory_manager/allocation_properties.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/os_context.h" +#include "utilities/cpu_info.h" +#include "utilities/cpuintrinsics.h" #include diff --git a/core/direct_submission/dispatchers/blitter_dispatcher.h b/core/direct_submission/dispatchers/blitter_dispatcher.h index 61b101929c..9499d2628f 100644 --- a/core/direct_submission/dispatchers/blitter_dispatcher.h +++ b/core/direct_submission/dispatchers/blitter_dispatcher.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/direct_submission/dispatchers/dispatcher.h" +#include "direct_submission/dispatchers/dispatcher.h" namespace NEO { diff --git a/core/direct_submission/dispatchers/blitter_dispatcher.inl b/core/direct_submission/dispatchers/blitter_dispatcher.inl index c8c92f9dec..b9d310a484 100644 --- a/core/direct_submission/dispatchers/blitter_dispatcher.inl +++ b/core/direct_submission/dispatchers/blitter_dispatcher.inl @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/linear_stream.h" -#include "core/direct_submission/dispatchers/blitter_dispatcher.h" -#include "core/helpers/hw_info.h" +#include "command_stream/linear_stream.h" +#include "direct_submission/dispatchers/blitter_dispatcher.h" +#include "helpers/hw_info.h" namespace NEO { diff --git a/core/direct_submission/dispatchers/render_dispatcher.h b/core/direct_submission/dispatchers/render_dispatcher.h index bb97bc8bd4..d5c1d85ca4 100644 --- a/core/direct_submission/dispatchers/render_dispatcher.h +++ b/core/direct_submission/dispatchers/render_dispatcher.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/direct_submission/dispatchers/dispatcher.h" +#include "direct_submission/dispatchers/dispatcher.h" namespace NEO { diff --git a/core/direct_submission/dispatchers/render_dispatcher.inl b/core/direct_submission/dispatchers/render_dispatcher.inl index c3a1ee1997..4ef123ed36 100644 --- a/core/direct_submission/dispatchers/render_dispatcher.inl +++ b/core/direct_submission/dispatchers/render_dispatcher.inl @@ -5,10 +5,10 @@ * */ -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/preemption.h" -#include "core/direct_submission/dispatchers/render_dispatcher.h" -#include "core/helpers/hw_helper.h" +#include "command_stream/linear_stream.h" +#include "command_stream/preemption.h" +#include "direct_submission/dispatchers/render_dispatcher.h" +#include "helpers/hw_helper.h" namespace NEO { diff --git a/core/direct_submission/linux/drm_direct_submission.h b/core/direct_submission/linux/drm_direct_submission.h index 39f6995806..8162a051d7 100644 --- a/core/direct_submission/linux/drm_direct_submission.h +++ b/core/direct_submission/linux/drm_direct_submission.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/direct_submission/direct_submission_hw.h" +#include "direct_submission/direct_submission_hw.h" namespace NEO { diff --git a/core/direct_submission/linux/drm_direct_submission.inl b/core/direct_submission/linux/drm_direct_submission.inl index b74ae689f2..10e4c77de3 100644 --- a/core/direct_submission/linux/drm_direct_submission.inl +++ b/core/direct_submission/linux/drm_direct_submission.inl @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/linear_stream.h" -#include "core/direct_submission/linux/drm_direct_submission.h" -#include "core/os_interface/linux/drm_allocation.h" +#include "command_stream/linear_stream.h" +#include "direct_submission/linux/drm_direct_submission.h" +#include "os_interface/linux/drm_allocation.h" namespace NEO { diff --git a/core/direct_submission/windows/wddm_direct_submission.h b/core/direct_submission/windows/wddm_direct_submission.h index 8588614b72..909d10d972 100644 --- a/core/direct_submission/windows/wddm_direct_submission.h +++ b/core/direct_submission/windows/wddm_direct_submission.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/direct_submission/direct_submission_hw.h" -#include "core/os_interface/windows/windows_defs.h" +#include "direct_submission/direct_submission_hw.h" +#include "os_interface/windows/windows_defs.h" struct COMMAND_BUFFER_HEADER_REC; diff --git a/core/direct_submission/windows/wddm_direct_submission.inl b/core/direct_submission/windows/wddm_direct_submission.inl index aa150d9d6d..3178142be8 100644 --- a/core/direct_submission/windows/wddm_direct_submission.inl +++ b/core/direct_submission/windows/wddm_direct_submission.inl @@ -5,15 +5,15 @@ * */ -#include "core/direct_submission/windows/wddm_direct_submission.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/os_interface/windows/os_context_win.h" -#include "core/os_interface/windows/wddm/wddm.h" -#include "core/os_interface/windows/wddm/wddm_interface.h" -#include "core/os_interface/windows/wddm_allocation.h" -#include "core/os_interface/windows/wddm_memory_operations_handler.h" -#include "core/utilities/arrayref.h" +#include "direct_submission/windows/wddm_direct_submission.h" +#include "execution_environment/root_device_environment.h" +#include "gmm_helper/gmm_helper.h" +#include "os_interface/windows/os_context_win.h" +#include "os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/wddm/wddm_interface.h" +#include "os_interface/windows/wddm_allocation.h" +#include "os_interface/windows/wddm_memory_operations_handler.h" +#include "utilities/arrayref.h" namespace NEO { diff --git a/core/execution_environment/execution_environment.cpp b/core/execution_environment/execution_environment.cpp index c8b463e5ed..c314a02582 100644 --- a/core/execution_environment/execution_environment.cpp +++ b/core/execution_environment/execution_environment.cpp @@ -5,14 +5,14 @@ * */ -#include "core/execution_environment/execution_environment.h" +#include "execution_environment/execution_environment.h" -#include "core/compiler_interface/compiler_interface.h" -#include "core/compiler_interface/default_cache_config.h" -#include "core/debugger/debugger.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/hw_helper.h" +#include "compiler_interface/compiler_interface.h" +#include "compiler_interface/default_cache_config.h" +#include "debugger/debugger.h" +#include "execution_environment/root_device_environment.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/hw_helper.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" diff --git a/core/execution_environment/execution_environment.h b/core/execution_environment/execution_environment.h index 5dea10f232..a70ddfd95d 100644 --- a/core/execution_environment/execution_environment.h +++ b/core/execution_environment/execution_environment.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/os_interface/device_factory.h" -#include "core/utilities/reference_tracked_object.h" +#include "os_interface/device_factory.h" +#include "utilities/reference_tracked_object.h" #include #include diff --git a/core/execution_environment/root_device_environment.cpp b/core/execution_environment/root_device_environment.cpp index b7c6e2b4da..26aa9033c7 100644 --- a/core/execution_environment/root_device_environment.cpp +++ b/core/execution_environment/root_device_environment.cpp @@ -5,12 +5,12 @@ * */ -#include "core/execution_environment/root_device_environment.h" +#include "execution_environment/root_device_environment.h" -#include "core/execution_environment/execution_environment.h" -#include "core/gmm_helper/page_table_mngr.h" -#include "core/memory_manager/memory_operations_handler.h" -#include "core/os_interface/os_interface.h" +#include "execution_environment/execution_environment.h" +#include "gmm_helper/page_table_mngr.h" +#include "memory_manager/memory_operations_handler.h" +#include "os_interface/os_interface.h" #include "opencl/source/aub/aub_center.h" namespace NEO { diff --git a/core/execution_environment/root_device_environment.h b/core/execution_environment/root_device_environment.h index bd4330f617..4e54d922aa 100644 --- a/core/execution_environment/root_device_environment.h +++ b/core/execution_environment/root_device_environment.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/options.h" +#include "helpers/options.h" #include #include diff --git a/core/gen11/command_encoder_gen11.cpp b/core/gen11/command_encoder_gen11.cpp index 12933c6cd6..5393ec115b 100644 --- a/core/gen11/command_encoder_gen11.cpp +++ b/core/gen11/command_encoder_gen11.cpp @@ -5,10 +5,10 @@ * */ -#include "core/command_container/command_encoder.h" -#include "core/command_container/command_encoder.inl" -#include "core/command_container/command_encoder_base.inl" -#include "core/gen11/hw_cmds_base.h" +#include "command_container/command_encoder.h" +#include "command_container/command_encoder.inl" +#include "command_container/command_encoder_base.inl" +#include "gen11/hw_cmds_base.h" #include "opencl/source/gen11/reg_configs.h" namespace NEO { diff --git a/core/gen11/enable_family_full_core_gen11.cpp b/core/gen11/enable_family_full_core_gen11.cpp index a85f477620..172649ebd8 100644 --- a/core/gen11/enable_family_full_core_gen11.cpp +++ b/core/gen11/enable_family_full_core_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen11/hw_cmds.h" -#include "core/helpers/hw_helper.h" +#include "gen11/hw_cmds.h" +#include "helpers/hw_helper.h" namespace NEO { diff --git a/core/gen11/enable_gen11.cpp b/core/gen11/enable_gen11.cpp index e239bebf7e..a18fb2407c 100644 --- a/core/gen11/enable_gen11.cpp +++ b/core/gen11/enable_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen11/hw_cmds.h" -#include "core/os_interface/hw_info_config.h" +#include "gen11/hw_cmds.h" +#include "os_interface/hw_info_config.h" #include "opencl/source/helpers/enable_product.inl" namespace NEO { diff --git a/core/gen11/enable_hw_info_config_gen11.cpp b/core/gen11/enable_hw_info_config_gen11.cpp index 74b039c4ec..7aa3807c61 100644 --- a/core/gen11/enable_hw_info_config_gen11.cpp +++ b/core/gen11/enable_hw_info_config_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen11/hw_cmds.h" -#include "core/os_interface/hw_info_config.h" +#include "gen11/hw_cmds.h" +#include "os_interface/hw_info_config.h" namespace NEO { diff --git a/core/gen11/hw_cmds_base.h b/core/gen11/hw_cmds_base.h index dace1d7198..0e206adda3 100644 --- a/core/gen11/hw_cmds_base.h +++ b/core/gen11/hw_cmds_base.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/commands/bxml_generator_glue.h" -#include "core/gen11/hw_info.h" -#include "core/helpers/debug_helpers.h" +#include "commands/bxml_generator_glue.h" +#include "gen11/hw_info.h" +#include "helpers/debug_helpers.h" #include "igfxfmid.h" @@ -18,7 +18,7 @@ struct CmdParse; namespace NEO { struct GEN11 { -#include "core/generated/gen11/hw_cmds_generated_gen11.inl" +#include "generated/gen11/hw_cmds_generated_gen11.inl" }; struct ICLFamily : public GEN11 { using PARSE = CmdParse; diff --git a/core/gen11/hw_cmds_ehl.h b/core/gen11/hw_cmds_ehl.h index 6c761d5792..4937d6513d 100644 --- a/core/gen11/hw_cmds_ehl.h +++ b/core/gen11/hw_cmds_ehl.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gen11/hw_cmds_base.h" +#include "gen11/hw_cmds_base.h" namespace NEO { diff --git a/core/gen11/hw_cmds_icllp.h b/core/gen11/hw_cmds_icllp.h index d7ae3a86f7..333ab1227d 100644 --- a/core/gen11/hw_cmds_icllp.h +++ b/core/gen11/hw_cmds_icllp.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gen11/hw_cmds_base.h" +#include "gen11/hw_cmds_base.h" namespace NEO { diff --git a/core/gen11/hw_cmds_lkf.h b/core/gen11/hw_cmds_lkf.h index 09078a7f95..34094a7d80 100644 --- a/core/gen11/hw_cmds_lkf.h +++ b/core/gen11/hw_cmds_lkf.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gen11/hw_cmds_base.h" +#include "gen11/hw_cmds_base.h" namespace NEO { diff --git a/core/gen11/hw_info_ehl.h b/core/gen11/hw_info_ehl.h index 30d4b6ec81..70085adfa4 100644 --- a/core/gen11/hw_info_ehl.h +++ b/core/gen11/hw_info_ehl.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gen11/hw_info_gen11.h" +#include "gen11/hw_info_gen11.h" namespace NEO { diff --git a/core/gen11/hw_info_gen11.h b/core/gen11/hw_info_gen11.h index b85da1cff9..c425431f13 100644 --- a/core/gen11/hw_info_gen11.h +++ b/core/gen11/hw_info_gen11.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" namespace NEO { diff --git a/core/gen11/hw_info_lkf.h b/core/gen11/hw_info_lkf.h index 85a78f5529..78b775e9e2 100644 --- a/core/gen11/hw_info_lkf.h +++ b/core/gen11/hw_info_lkf.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gen11/hw_info_gen11.h" +#include "gen11/hw_info_gen11.h" namespace NEO { diff --git a/core/gen11/image_core_gen11.cpp b/core/gen11/image_core_gen11.cpp index 4027febc8c..0551c42b47 100644 --- a/core/gen11/image_core_gen11.cpp +++ b/core/gen11/image_core_gen11.cpp @@ -5,15 +5,15 @@ * */ -#include "core/gen11/hw_cmds_base.h" -#include "core/image/image_surface_state.h" +#include "gen11/hw_cmds_base.h" +#include "image/image_surface_state.h" namespace NEO { typedef ICLFamily Family; // clang-format off -#include "core/image/image_bdw_plus.inl" -#include "core/image/image_skl_plus.inl" +#include "image/image_bdw_plus.inl" +#include "image/image_skl_plus.inl" // clang-format on } // namespace NEO diff --git a/core/gen11/linux/direct_submission_gen11.cpp b/core/gen11/linux/direct_submission_gen11.cpp index 213bee0400..8f78254a36 100644 --- a/core/gen11/linux/direct_submission_gen11.cpp +++ b/core/gen11/linux/direct_submission_gen11.cpp @@ -5,11 +5,11 @@ * */ -#include "core/direct_submission/direct_submission_hw.inl" -#include "core/direct_submission/dispatchers/blitter_dispatcher.inl" -#include "core/direct_submission/dispatchers/render_dispatcher.inl" -#include "core/direct_submission/linux/drm_direct_submission.inl" -#include "core/helpers/hw_cmds.h" +#include "direct_submission/direct_submission_hw.inl" +#include "direct_submission/dispatchers/blitter_dispatcher.inl" +#include "direct_submission/dispatchers/render_dispatcher.inl" +#include "direct_submission/linux/drm_direct_submission.inl" +#include "helpers/hw_cmds.h" namespace NEO { template class BlitterDispatcher; diff --git a/core/gen11/preamble_gen11.cpp b/core/gen11/preamble_gen11.cpp index 616c4fbf99..5ad4499f49 100644 --- a/core/gen11/preamble_gen11.cpp +++ b/core/gen11/preamble_gen11.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/csr_definitions.h" -#include "core/helpers/pipeline_select_helper.h" -#include "core/helpers/preamble_bdw_plus.inl" +#include "command_stream/csr_definitions.h" +#include "helpers/pipeline_select_helper.h" +#include "helpers/preamble_bdw_plus.inl" #include "reg_configs_common.h" diff --git a/core/gen11/preemption_gen11.cpp b/core/gen11/preemption_gen11.cpp index 57d334fb0b..1e66f4181d 100644 --- a/core/gen11/preemption_gen11.cpp +++ b/core/gen11/preemption_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/command_stream/preemption.inl" +#include "command_stream/preemption.h" +#include "command_stream/preemption.inl" namespace NEO { diff --git a/core/gen11/windows/direct_submission_gen11.cpp b/core/gen11/windows/direct_submission_gen11.cpp index 257dc28a2b..e8e8c48243 100644 --- a/core/gen11/windows/direct_submission_gen11.cpp +++ b/core/gen11/windows/direct_submission_gen11.cpp @@ -5,11 +5,11 @@ * */ -#include "core/direct_submission/direct_submission_hw.inl" -#include "core/direct_submission/dispatchers/blitter_dispatcher.inl" -#include "core/direct_submission/dispatchers/render_dispatcher.inl" -#include "core/direct_submission/windows/wddm_direct_submission.inl" -#include "core/helpers/hw_cmds.h" +#include "direct_submission/direct_submission_hw.inl" +#include "direct_submission/dispatchers/blitter_dispatcher.inl" +#include "direct_submission/dispatchers/render_dispatcher.inl" +#include "direct_submission/windows/wddm_direct_submission.inl" +#include "helpers/hw_cmds.h" namespace NEO { template class BlitterDispatcher; diff --git a/core/gen12lp/command_encoder_gen12lp.cpp b/core/gen12lp/command_encoder_gen12lp.cpp index 6e960a819c..86cdfa78ef 100644 --- a/core/gen12lp/command_encoder_gen12lp.cpp +++ b/core/gen12lp/command_encoder_gen12lp.cpp @@ -5,10 +5,10 @@ * */ -#include "core/command_container/command_encoder.h" -#include "core/command_container/command_encoder.inl" -#include "core/command_container/command_encoder_base.inl" -#include "core/gen12lp/hw_cmds_base.h" +#include "command_container/command_encoder.h" +#include "command_container/command_encoder.inl" +#include "command_container/command_encoder_base.inl" +#include "gen12lp/hw_cmds_base.h" #include "opencl/source/gen12lp/reg_configs.h" namespace NEO { diff --git a/core/gen12lp/enable_family_full_core_gen12lp.cpp b/core/gen12lp/enable_family_full_core_gen12lp.cpp index fcded4d4bc..f12bf1d7b9 100644 --- a/core/gen12lp/enable_family_full_core_gen12lp.cpp +++ b/core/gen12lp/enable_family_full_core_gen12lp.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen12lp/hw_cmds.h" -#include "core/helpers/hw_helper.h" +#include "gen12lp/hw_cmds.h" +#include "helpers/hw_helper.h" namespace NEO { diff --git a/core/gen12lp/enable_gen12lp.cpp b/core/gen12lp/enable_gen12lp.cpp index 8a642e42d6..231fe16388 100644 --- a/core/gen12lp/enable_gen12lp.cpp +++ b/core/gen12lp/enable_gen12lp.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen12lp/hw_cmds.h" -#include "core/os_interface/hw_info_config.h" +#include "gen12lp/hw_cmds.h" +#include "os_interface/hw_info_config.h" #include "opencl/source/helpers/enable_product.inl" namespace NEO { diff --git a/core/gen12lp/enable_hw_info_config_gen12lp.cpp b/core/gen12lp/enable_hw_info_config_gen12lp.cpp index 6a581bbaf0..b54251b4a7 100644 --- a/core/gen12lp/enable_hw_info_config_gen12lp.cpp +++ b/core/gen12lp/enable_hw_info_config_gen12lp.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen12lp/hw_cmds.h" -#include "core/os_interface/hw_info_config.h" +#include "gen12lp/hw_cmds.h" +#include "os_interface/hw_info_config.h" namespace NEO { diff --git a/core/gen12lp/hw_cmds_base.h b/core/gen12lp/hw_cmds_base.h index 3142c4ba68..7b11446b64 100644 --- a/core/gen12lp/hw_cmds_base.h +++ b/core/gen12lp/hw_cmds_base.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/commands/bxml_generator_glue.h" -#include "core/gen12lp/hw_info.h" -#include "core/helpers/debug_helpers.h" +#include "commands/bxml_generator_glue.h" +#include "gen12lp/hw_info.h" +#include "helpers/debug_helpers.h" #include "igfxfmid.h" @@ -20,7 +20,7 @@ struct CmdParse; namespace NEO { struct GEN12LP { -#include "core/generated/gen12lp/hw_cmds_generated_gen12lp.inl" +#include "generated/gen12lp/hw_cmds_generated_gen12lp.inl" static constexpr uint32_t stateComputeModeForceNonCoherentMask = (((1 << 0) | (1 << 1)) << 3); }; struct TGLLPFamily : public GEN12LP { diff --git a/core/gen12lp/hw_cmds_tgllp.h b/core/gen12lp/hw_cmds_tgllp.h index f50877bae5..c5ab49ed13 100644 --- a/core/gen12lp/hw_cmds_tgllp.h +++ b/core/gen12lp/hw_cmds_tgllp.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gen12lp/hw_cmds_base.h" +#include "gen12lp/hw_cmds_base.h" namespace NEO { struct TGLLP : public TGLLPFamily { diff --git a/core/gen12lp/hw_info_gen12lp.h b/core/gen12lp/hw_info_gen12lp.h index 90bf3a4dee..9b4edcc435 100644 --- a/core/gen12lp/hw_info_gen12lp.h +++ b/core/gen12lp/hw_info_gen12lp.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" namespace NEO { diff --git a/core/gen12lp/image_core_gen12lp.cpp b/core/gen12lp/image_core_gen12lp.cpp index cffd622b10..c4dc9a1263 100644 --- a/core/gen12lp/image_core_gen12lp.cpp +++ b/core/gen12lp/image_core_gen12lp.cpp @@ -5,15 +5,15 @@ * */ -#include "core/gen12lp/hw_cmds.h" -#include "core/image/image_surface_state.h" +#include "gen12lp/hw_cmds.h" +#include "image/image_surface_state.h" namespace NEO { using Family = TGLLPFamily; // clang-format off -#include "core/image/image_tgllp_plus.inl" -#include "core/image/image_skl_plus.inl" +#include "image/image_tgllp_plus.inl" +#include "image/image_skl_plus.inl" // clang-format on } // namespace NEO diff --git a/core/gen12lp/linux/direct_submission_gen12lp.cpp b/core/gen12lp/linux/direct_submission_gen12lp.cpp index b2e764b569..1283584a68 100644 --- a/core/gen12lp/linux/direct_submission_gen12lp.cpp +++ b/core/gen12lp/linux/direct_submission_gen12lp.cpp @@ -5,11 +5,11 @@ * */ -#include "core/direct_submission/direct_submission_hw.inl" -#include "core/direct_submission/dispatchers/blitter_dispatcher.inl" -#include "core/direct_submission/dispatchers/render_dispatcher.inl" -#include "core/direct_submission/linux/drm_direct_submission.inl" -#include "core/helpers/hw_cmds.h" +#include "direct_submission/direct_submission_hw.inl" +#include "direct_submission/dispatchers/blitter_dispatcher.inl" +#include "direct_submission/dispatchers/render_dispatcher.inl" +#include "direct_submission/linux/drm_direct_submission.inl" +#include "helpers/hw_cmds.h" namespace NEO { template class BlitterDispatcher; diff --git a/core/gen12lp/preamble_gen12lp.cpp b/core/gen12lp/preamble_gen12lp.cpp index 22723cfe0b..fb5c26a8bd 100644 --- a/core/gen12lp/preamble_gen12lp.cpp +++ b/core/gen12lp/preamble_gen12lp.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/csr_definitions.h" -#include "core/helpers/engine_node_helper.h" -#include "core/helpers/preamble_bdw_plus.inl" +#include "command_stream/csr_definitions.h" +#include "helpers/engine_node_helper.h" +#include "helpers/preamble_bdw_plus.inl" #include "opencl/source/gen12lp/helpers_gen12lp.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/core/gen12lp/preemption_gen12lp.cpp b/core/gen12lp/preemption_gen12lp.cpp index 102abe56bd..23e79f8abb 100644 --- a/core/gen12lp/preemption_gen12lp.cpp +++ b/core/gen12lp/preemption_gen12lp.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/command_stream/preemption.inl" +#include "command_stream/preemption.h" +#include "command_stream/preemption.inl" namespace NEO { diff --git a/core/gen12lp/windows/direct_submission_gen12lp.cpp b/core/gen12lp/windows/direct_submission_gen12lp.cpp index 9ad77e0fff..0ac064aba8 100644 --- a/core/gen12lp/windows/direct_submission_gen12lp.cpp +++ b/core/gen12lp/windows/direct_submission_gen12lp.cpp @@ -5,11 +5,11 @@ * */ -#include "core/direct_submission/direct_submission_hw.inl" -#include "core/direct_submission/dispatchers/blitter_dispatcher.inl" -#include "core/direct_submission/dispatchers/render_dispatcher.inl" -#include "core/direct_submission/windows/wddm_direct_submission.inl" -#include "core/helpers/hw_cmds.h" +#include "direct_submission/direct_submission_hw.inl" +#include "direct_submission/dispatchers/blitter_dispatcher.inl" +#include "direct_submission/dispatchers/render_dispatcher.inl" +#include "direct_submission/windows/wddm_direct_submission.inl" +#include "helpers/hw_cmds.h" namespace NEO { template class BlitterDispatcher; diff --git a/core/gen8/command_encoder_gen8.cpp b/core/gen8/command_encoder_gen8.cpp index 011b441d28..cf3b47505e 100644 --- a/core/gen8/command_encoder_gen8.cpp +++ b/core/gen8/command_encoder_gen8.cpp @@ -5,10 +5,10 @@ * */ -#include "core/command_container/command_encoder.h" -#include "core/command_container/command_encoder.inl" -#include "core/command_container/command_encoder_base.inl" -#include "core/gen8/hw_cmds_base.h" +#include "command_container/command_encoder.h" +#include "command_container/command_encoder.inl" +#include "command_container/command_encoder_base.inl" +#include "gen8/hw_cmds_base.h" #include "opencl/source/gen8/reg_configs.h" namespace NEO { diff --git a/core/gen8/enable_family_full_core_gen8.cpp b/core/gen8/enable_family_full_core_gen8.cpp index 682bfcb405..1ee17ad7c9 100644 --- a/core/gen8/enable_family_full_core_gen8.cpp +++ b/core/gen8/enable_family_full_core_gen8.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen8/hw_cmds.h" -#include "core/helpers/hw_helper.h" +#include "gen8/hw_cmds.h" +#include "helpers/hw_helper.h" #include diff --git a/core/gen8/enable_gen8.cpp b/core/gen8/enable_gen8.cpp index abb1d838a5..a0b965ee98 100644 --- a/core/gen8/enable_gen8.cpp +++ b/core/gen8/enable_gen8.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen8/hw_cmds.h" -#include "core/os_interface/hw_info_config.h" +#include "gen8/hw_cmds.h" +#include "os_interface/hw_info_config.h" #include "opencl/source/helpers/enable_product.inl" namespace NEO { diff --git a/core/gen8/enable_hw_info_config_gen8.cpp b/core/gen8/enable_hw_info_config_gen8.cpp index 28450991f3..09ffe18cb8 100644 --- a/core/gen8/enable_hw_info_config_gen8.cpp +++ b/core/gen8/enable_hw_info_config_gen8.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen8/hw_cmds.h" -#include "core/os_interface/hw_info_config.h" +#include "gen8/hw_cmds.h" +#include "os_interface/hw_info_config.h" namespace NEO { diff --git a/core/gen8/hw_cmds_base.h b/core/gen8/hw_cmds_base.h index 3ba175e5fb..062b831e48 100644 --- a/core/gen8/hw_cmds_base.h +++ b/core/gen8/hw_cmds_base.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/commands/bxml_generator_glue.h" -#include "core/gen8/hw_info.h" -#include "core/helpers/debug_helpers.h" +#include "commands/bxml_generator_glue.h" +#include "gen8/hw_info.h" +#include "helpers/debug_helpers.h" #include "igfxfmid.h" @@ -20,7 +20,7 @@ struct CmdParse; namespace NEO { struct GEN8 { -#include "core/generated/gen8/hw_cmds_generated_gen8.inl" +#include "generated/gen8/hw_cmds_generated_gen8.inl" }; struct BDWFamily : public GEN8 { using PARSE = CmdParse; diff --git a/core/gen8/hw_cmds_bdw.h b/core/gen8/hw_cmds_bdw.h index 7b5b37621a..e6c3e22248 100644 --- a/core/gen8/hw_cmds_bdw.h +++ b/core/gen8/hw_cmds_bdw.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gen8/hw_cmds_base.h" +#include "gen8/hw_cmds_base.h" #include diff --git a/core/gen8/hw_info_gen8.h b/core/gen8/hw_info_gen8.h index 00cbc03037..a7005e94b3 100644 --- a/core/gen8/hw_info_gen8.h +++ b/core/gen8/hw_info_gen8.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" namespace NEO { diff --git a/core/gen8/image_core_gen8.cpp b/core/gen8/image_core_gen8.cpp index 28846d9e6f..39263bab26 100644 --- a/core/gen8/image_core_gen8.cpp +++ b/core/gen8/image_core_gen8.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen8/hw_cmds.h" -#include "core/image/image_surface_state.h" +#include "gen8/hw_cmds.h" +#include "image/image_surface_state.h" namespace NEO { @@ -16,6 +16,6 @@ template <> void setMipTailStartLod(Family::RENDER_SURFACE_STATE *surfaceState, Gmm *gmm) {} // clang-format off -#include "core/image/image_bdw_plus.inl" +#include "image/image_bdw_plus.inl" // clang-format on } // namespace NEO diff --git a/core/gen8/linux/direct_submission_gen8.cpp b/core/gen8/linux/direct_submission_gen8.cpp index faef28bb01..b477fc8f7f 100644 --- a/core/gen8/linux/direct_submission_gen8.cpp +++ b/core/gen8/linux/direct_submission_gen8.cpp @@ -5,11 +5,11 @@ * */ -#include "core/direct_submission/direct_submission_hw.inl" -#include "core/direct_submission/dispatchers/blitter_dispatcher.inl" -#include "core/direct_submission/dispatchers/render_dispatcher.inl" -#include "core/direct_submission/linux/drm_direct_submission.inl" -#include "core/helpers/hw_cmds.h" +#include "direct_submission/direct_submission_hw.inl" +#include "direct_submission/dispatchers/blitter_dispatcher.inl" +#include "direct_submission/dispatchers/render_dispatcher.inl" +#include "direct_submission/linux/drm_direct_submission.inl" +#include "helpers/hw_cmds.h" namespace NEO { template class BlitterDispatcher; diff --git a/core/gen8/preamble_gen8.cpp b/core/gen8/preamble_gen8.cpp index bfb7320ca3..abdd331042 100644 --- a/core/gen8/preamble_gen8.cpp +++ b/core/gen8/preamble_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/preamble_bdw_plus.inl" +#include "helpers/preamble_bdw_plus.inl" namespace NEO { diff --git a/core/gen8/preemption_gen8.cpp b/core/gen8/preemption_gen8.cpp index 46cc3adc78..41bd172b47 100644 --- a/core/gen8/preemption_gen8.cpp +++ b/core/gen8/preemption_gen8.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/command_stream/preemption.inl" +#include "command_stream/preemption.h" +#include "command_stream/preemption.inl" namespace NEO { diff --git a/core/gen8/windows/direct_submission_gen8.cpp b/core/gen8/windows/direct_submission_gen8.cpp index 64b45ee371..c4e825b612 100644 --- a/core/gen8/windows/direct_submission_gen8.cpp +++ b/core/gen8/windows/direct_submission_gen8.cpp @@ -5,11 +5,11 @@ * */ -#include "core/direct_submission/direct_submission_hw.inl" -#include "core/direct_submission/dispatchers/blitter_dispatcher.inl" -#include "core/direct_submission/dispatchers/render_dispatcher.inl" -#include "core/direct_submission/windows/wddm_direct_submission.inl" -#include "core/helpers/hw_cmds.h" +#include "direct_submission/direct_submission_hw.inl" +#include "direct_submission/dispatchers/blitter_dispatcher.inl" +#include "direct_submission/dispatchers/render_dispatcher.inl" +#include "direct_submission/windows/wddm_direct_submission.inl" +#include "helpers/hw_cmds.h" namespace NEO { template class BlitterDispatcher; diff --git a/core/gen9/command_encoder_gen9.cpp b/core/gen9/command_encoder_gen9.cpp index 7da5fdd2bd..a97eedc125 100644 --- a/core/gen9/command_encoder_gen9.cpp +++ b/core/gen9/command_encoder_gen9.cpp @@ -5,10 +5,10 @@ * */ -#include "core/command_container/command_encoder.h" -#include "core/command_container/command_encoder.inl" -#include "core/command_container/command_encoder_base.inl" -#include "core/gen9/hw_cmds_base.h" +#include "command_container/command_encoder.h" +#include "command_container/command_encoder.inl" +#include "command_container/command_encoder_base.inl" +#include "gen9/hw_cmds_base.h" #include "opencl/source/gen9/reg_configs.h" namespace NEO { diff --git a/core/gen9/enable_family_full_core_gen9.cpp b/core/gen9/enable_family_full_core_gen9.cpp index a72e4e8c7b..8a953a8f12 100644 --- a/core/gen9/enable_family_full_core_gen9.cpp +++ b/core/gen9/enable_family_full_core_gen9.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen8/hw_cmds.h" -#include "core/helpers/hw_helper.h" +#include "gen8/hw_cmds.h" +#include "helpers/hw_helper.h" #include diff --git a/core/gen9/enable_gen9.cpp b/core/gen9/enable_gen9.cpp index 28df5ef783..4f00f7a88f 100644 --- a/core/gen9/enable_gen9.cpp +++ b/core/gen9/enable_gen9.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen9/hw_cmds.h" -#include "core/os_interface/hw_info_config.h" +#include "gen9/hw_cmds.h" +#include "os_interface/hw_info_config.h" #include "opencl/source/helpers/enable_product.inl" namespace NEO { diff --git a/core/gen9/enable_hw_info_config_gen9.cpp b/core/gen9/enable_hw_info_config_gen9.cpp index 4f621426a8..e55f9f9166 100644 --- a/core/gen9/enable_hw_info_config_gen9.cpp +++ b/core/gen9/enable_hw_info_config_gen9.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen9/hw_cmds.h" -#include "core/os_interface/hw_info_config.h" +#include "gen9/hw_cmds.h" +#include "os_interface/hw_info_config.h" namespace NEO { diff --git a/core/gen9/hw_cmds_base.h b/core/gen9/hw_cmds_base.h index a3376fa4f5..c861648af7 100644 --- a/core/gen9/hw_cmds_base.h +++ b/core/gen9/hw_cmds_base.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/commands/bxml_generator_glue.h" -#include "core/gen9/hw_info.h" -#include "core/helpers/debug_helpers.h" +#include "commands/bxml_generator_glue.h" +#include "gen9/hw_info.h" +#include "helpers/debug_helpers.h" #include "igfxfmid.h" @@ -20,7 +20,7 @@ struct CmdParse; namespace NEO { struct GEN9 { -#include "core/generated/gen9/hw_cmds_generated_gen9.inl" +#include "generated/gen9/hw_cmds_generated_gen9.inl" }; struct SKLFamily : public GEN9 { diff --git a/core/gen9/hw_cmds_bxt.h b/core/gen9/hw_cmds_bxt.h index a31bfd6205..4fe97f42aa 100644 --- a/core/gen9/hw_cmds_bxt.h +++ b/core/gen9/hw_cmds_bxt.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gen9/hw_cmds_base.h" +#include "gen9/hw_cmds_base.h" namespace NEO { diff --git a/core/gen9/hw_cmds_cfl.h b/core/gen9/hw_cmds_cfl.h index bcfcd5df47..fd01980125 100644 --- a/core/gen9/hw_cmds_cfl.h +++ b/core/gen9/hw_cmds_cfl.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gen9/hw_cmds_base.h" +#include "gen9/hw_cmds_base.h" namespace NEO { diff --git a/core/gen9/hw_cmds_glk.h b/core/gen9/hw_cmds_glk.h index 299bb24323..d5430a00e3 100644 --- a/core/gen9/hw_cmds_glk.h +++ b/core/gen9/hw_cmds_glk.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gen9/hw_cmds_base.h" +#include "gen9/hw_cmds_base.h" namespace NEO { diff --git a/core/gen9/hw_cmds_kbl.h b/core/gen9/hw_cmds_kbl.h index ab01b3f580..0408b6f15a 100644 --- a/core/gen9/hw_cmds_kbl.h +++ b/core/gen9/hw_cmds_kbl.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gen9/hw_cmds_base.h" +#include "gen9/hw_cmds_base.h" namespace NEO { diff --git a/core/gen9/hw_cmds_skl.h b/core/gen9/hw_cmds_skl.h index 57df62c582..3eb7995b93 100644 --- a/core/gen9/hw_cmds_skl.h +++ b/core/gen9/hw_cmds_skl.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gen9/hw_cmds_base.h" +#include "gen9/hw_cmds_base.h" namespace NEO { diff --git a/core/gen9/hw_info_gen9.h b/core/gen9/hw_info_gen9.h index ab7930f061..ae14b52b27 100644 --- a/core/gen9/hw_info_gen9.h +++ b/core/gen9/hw_info_gen9.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" namespace NEO { diff --git a/core/gen9/image_core_gen9.cpp b/core/gen9/image_core_gen9.cpp index 2c437d45b4..449faa6c5f 100644 --- a/core/gen9/image_core_gen9.cpp +++ b/core/gen9/image_core_gen9.cpp @@ -5,15 +5,15 @@ * */ -#include "core/gen9/hw_cmds.h" -#include "core/image/image_surface_state.h" +#include "gen9/hw_cmds.h" +#include "image/image_surface_state.h" namespace NEO { typedef SKLFamily Family; // clang-format off -#include "core/image/image_bdw_plus.inl" -#include "core/image/image_skl_plus.inl" +#include "image/image_bdw_plus.inl" +#include "image/image_skl_plus.inl" // clang-format on } // namespace NEO diff --git a/core/gen9/linux/direct_submission_gen9.cpp b/core/gen9/linux/direct_submission_gen9.cpp index 66eb875dfb..5c52bc27fd 100644 --- a/core/gen9/linux/direct_submission_gen9.cpp +++ b/core/gen9/linux/direct_submission_gen9.cpp @@ -5,11 +5,11 @@ * */ -#include "core/direct_submission/direct_submission_hw.inl" -#include "core/direct_submission/dispatchers/blitter_dispatcher.inl" -#include "core/direct_submission/dispatchers/render_dispatcher.inl" -#include "core/direct_submission/linux/drm_direct_submission.inl" -#include "core/helpers/hw_cmds.h" +#include "direct_submission/direct_submission_hw.inl" +#include "direct_submission/dispatchers/blitter_dispatcher.inl" +#include "direct_submission/dispatchers/render_dispatcher.inl" +#include "direct_submission/linux/drm_direct_submission.inl" +#include "helpers/hw_cmds.h" namespace NEO { template class BlitterDispatcher; diff --git a/core/gen9/preamble_gen9.cpp b/core/gen9/preamble_gen9.cpp index 12633758f9..8c071512b3 100644 --- a/core/gen9/preamble_gen9.cpp +++ b/core/gen9/preamble_gen9.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/csr_definitions.h" -#include "core/helpers/preamble_bdw_plus.inl" +#include "command_stream/csr_definitions.h" +#include "helpers/preamble_bdw_plus.inl" namespace NEO { diff --git a/core/gen9/preemption_gen9.cpp b/core/gen9/preemption_gen9.cpp index 2083d4c09d..850673730d 100644 --- a/core/gen9/preemption_gen9.cpp +++ b/core/gen9/preemption_gen9.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/csr_definitions.h" -#include "core/command_stream/preemption.h" -#include "core/command_stream/preemption.inl" +#include "command_stream/csr_definitions.h" +#include "command_stream/preemption.h" +#include "command_stream/preemption.inl" #include "opencl/source/built_ins/built_ins.h" #include diff --git a/core/gen9/windows/direct_submission_gen9.cpp b/core/gen9/windows/direct_submission_gen9.cpp index 42a95789a0..a104c0e42f 100644 --- a/core/gen9/windows/direct_submission_gen9.cpp +++ b/core/gen9/windows/direct_submission_gen9.cpp @@ -5,11 +5,11 @@ * */ -#include "core/direct_submission/direct_submission_hw.inl" -#include "core/direct_submission/dispatchers/blitter_dispatcher.inl" -#include "core/direct_submission/dispatchers/render_dispatcher.inl" -#include "core/direct_submission/windows/wddm_direct_submission.inl" -#include "core/helpers/hw_cmds.h" +#include "direct_submission/direct_submission_hw.inl" +#include "direct_submission/dispatchers/blitter_dispatcher.inl" +#include "direct_submission/dispatchers/render_dispatcher.inl" +#include "direct_submission/windows/wddm_direct_submission.inl" +#include "helpers/hw_cmds.h" namespace NEO { template class BlitterDispatcher; diff --git a/core/gmm_helper/client_context/gmm_client_context.h b/core/gmm_helper/client_context/gmm_client_context.h index 7e7210f6d6..58eff9ee54 100644 --- a/core/gmm_helper/client_context/gmm_client_context.h +++ b/core/gmm_helper/client_context/gmm_client_context.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gmm_helper/client_context/gmm_client_context_base.h" +#include "gmm_helper/client_context/gmm_client_context_base.h" namespace NEO { class GmmClientContext : public GmmClientContextBase { diff --git a/core/gmm_helper/client_context/gmm_client_context_base.cpp b/core/gmm_helper/client_context/gmm_client_context_base.cpp index e3f13d41b8..225a2fa5e2 100644 --- a/core/gmm_helper/client_context/gmm_client_context_base.cpp +++ b/core/gmm_helper/client_context/gmm_client_context_base.cpp @@ -5,14 +5,14 @@ * */ -#include "core/gmm_helper/client_context/gmm_client_context_base.h" +#include "gmm_helper/client_context/gmm_client_context_base.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/gmm_interface.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/hw_info.h" -#include "core/os_interface/os_interface.h" -#include "core/sku_info/operations/sku_info_transfer.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/gmm_interface.h" +#include "helpers/debug_helpers.h" +#include "helpers/hw_info.h" +#include "os_interface/os_interface.h" +#include "sku_info/operations/sku_info_transfer.h" namespace NEO { GmmClientContextBase::GmmClientContextBase(OSInterface *osInterface, HardwareInfo *hwInfo) : hardwareInfo(hwInfo) { diff --git a/core/gmm_helper/client_context/gmm_client_context_base.h b/core/gmm_helper/client_context/gmm_client_context_base.h index 37f933fc24..06334eccdd 100644 --- a/core/gmm_helper/client_context/gmm_client_context_base.h +++ b/core/gmm_helper/client_context/gmm_client_context_base.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gmm_helper/gmm_lib.h" +#include "gmm_helper/gmm_lib.h" #include diff --git a/core/gmm_helper/gmm.cpp b/core/gmm_helper/gmm.cpp index ff48b8410d..8e11eba2b7 100644 --- a/core/gmm_helper/gmm.cpp +++ b/core/gmm_helper/gmm.cpp @@ -5,17 +5,17 @@ * */ -#include "core/gmm_helper/gmm.h" +#include "gmm_helper/gmm.h" -#include "core/gmm_helper/client_context/gmm_client_context.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/surface_format_info.h" +#include "gmm_helper/client_context/gmm_client_context.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/resource_info.h" +#include "helpers/aligned_memory.h" +#include "helpers/debug_helpers.h" +#include "helpers/hw_helper.h" +#include "helpers/hw_info.h" +#include "helpers/ptr_math.h" +#include "helpers/surface_format_info.h" namespace NEO { Gmm::Gmm(GmmClientContext *clientContext, const void *alignedPtr, size_t alignedSize, bool uncacheable) : Gmm(clientContext, alignedPtr, alignedSize, uncacheable, false, true, {}) {} diff --git a/core/gmm_helper/gmm.h b/core/gmm_helper/gmm.h index 5ee187d0cb..9a50fce5c7 100644 --- a/core/gmm_helper/gmm.h +++ b/core/gmm_helper/gmm.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gmm_helper/gmm_lib.h" +#include "gmm_helper/gmm_lib.h" #include "storage_info.h" diff --git a/core/gmm_helper/gmm_helper.cpp b/core/gmm_helper/gmm_helper.cpp index b95005da08..3965bbcc13 100644 --- a/core/gmm_helper/gmm_helper.cpp +++ b/core/gmm_helper/gmm_helper.cpp @@ -5,13 +5,13 @@ * */ -#include "core/gmm_helper/gmm_helper.h" +#include "gmm_helper/gmm_helper.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/hw_info.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/os_interface/os_library.h" -#include "core/sku_info/operations/sku_info_transfer.h" +#include "helpers/debug_helpers.h" +#include "helpers/hw_info.h" +#include "memory_manager/graphics_allocation.h" +#include "os_interface/os_library.h" +#include "sku_info/operations/sku_info_transfer.h" #include "gmm_client_context.h" diff --git a/core/gmm_helper/gmm_helper.h b/core/gmm_helper/gmm_helper.h index 2bb10a1fd8..7434c50900 100644 --- a/core/gmm_helper/gmm_helper.h +++ b/core/gmm_helper/gmm_helper.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/gmm_helper/gmm_lib.h" -#include "core/helpers/basic_math.h" -#include "core/memory_manager/memory_constants.h" +#include "gmm_helper/gmm_lib.h" +#include "helpers/basic_math.h" +#include "memory_manager/memory_constants.h" #include diff --git a/core/gmm_helper/gmm_interface.h b/core/gmm_helper/gmm_interface.h index 8ed2597b12..881146eaf7 100644 --- a/core/gmm_helper/gmm_interface.h +++ b/core/gmm_helper/gmm_interface.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gmm_helper/gmm_lib.h" +#include "gmm_helper/gmm_lib.h" namespace NEO { diff --git a/core/gmm_helper/gmm_lib.h b/core/gmm_helper/gmm_lib.h index d23d33d4e7..c75b8fa2aa 100644 --- a/core/gmm_helper/gmm_lib.h +++ b/core/gmm_helper/gmm_lib.h @@ -7,7 +7,7 @@ #pragma once #ifdef WIN32 -#include "core/os_interface/windows/windows_wrapper.h" +#include "os_interface/windows/windows_wrapper.h" #else #ifndef C_ASSERT diff --git a/core/gmm_helper/gmm_types_converter.cpp b/core/gmm_helper/gmm_types_converter.cpp index cd51af81c3..8c8e4db089 100644 --- a/core/gmm_helper/gmm_types_converter.cpp +++ b/core/gmm_helper/gmm_types_converter.cpp @@ -5,11 +5,11 @@ * */ -#include "core/gmm_helper/gmm_types_converter.h" +#include "gmm_helper/gmm_types_converter.h" -#include "core/helpers/get_info.h" -#include "core/helpers/surface_format_info.h" -#include "core/memory_manager/graphics_allocation.h" +#include "helpers/get_info.h" +#include "helpers/surface_format_info.h" +#include "memory_manager/graphics_allocation.h" #include "GL/gl.h" #include "GL/glext.h" diff --git a/core/gmm_helper/gmm_types_converter.h b/core/gmm_helper/gmm_types_converter.h index f9311ae602..d04a84deea 100644 --- a/core/gmm_helper/gmm_types_converter.h +++ b/core/gmm_helper/gmm_types_converter.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gmm_helper/gmm_lib.h" +#include "gmm_helper/gmm_lib.h" namespace NEO { enum class ImagePlane; diff --git a/core/gmm_helper/gmm_utils.cpp b/core/gmm_helper/gmm_utils.cpp index bcb776eef6..8bc8f5aa78 100644 --- a/core/gmm_helper/gmm_utils.cpp +++ b/core/gmm_helper/gmm_utils.cpp @@ -6,8 +6,8 @@ */ # -#include "core/gmm_helper/gmm.h" -#include "core/helpers/surface_format_info.h" +#include "gmm_helper/gmm.h" +#include "helpers/surface_format_info.h" using namespace NEO; diff --git a/core/gmm_helper/page_table_mngr.cpp b/core/gmm_helper/page_table_mngr.cpp index ca72ba9ae3..6a360ecc57 100644 --- a/core/gmm_helper/page_table_mngr.cpp +++ b/core/gmm_helper/page_table_mngr.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gmm_helper/page_table_mngr.h" +#include "gmm_helper/page_table_mngr.h" namespace NEO { GmmPageTableMngr *GmmPageTableMngr::create(GmmClientContext *clientContext, unsigned int translationTableFlags, GMM_TRANSLATIONTABLE_CALLBACKS *translationTableCb) { diff --git a/core/gmm_helper/page_table_mngr.h b/core/gmm_helper/page_table_mngr.h index 2b50f24ff0..a632188060 100644 --- a/core/gmm_helper/page_table_mngr.h +++ b/core/gmm_helper/page_table_mngr.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gmm_helper/gmm_lib.h" +#include "gmm_helper/gmm_lib.h" #include "External/Common/GmmPageTableMgr.h" diff --git a/core/gmm_helper/page_table_mngr_impl.cpp b/core/gmm_helper/page_table_mngr_impl.cpp index 1067dd9b1b..845cd5e4b6 100644 --- a/core/gmm_helper/page_table_mngr_impl.cpp +++ b/core/gmm_helper/page_table_mngr_impl.cpp @@ -5,10 +5,10 @@ * */ -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/page_table_mngr.h" -#include "core/gmm_helper/resource_info.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/page_table_mngr.h" +#include "gmm_helper/resource_info.h" #include "gmm_client_context.h" diff --git a/core/gmm_helper/resource_info.cpp b/core/gmm_helper/resource_info.cpp index b81a9a5b9a..b6d3bcef35 100644 --- a/core/gmm_helper/resource_info.cpp +++ b/core/gmm_helper/resource_info.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gmm_helper/resource_info.h" +#include "gmm_helper/resource_info.h" namespace NEO { GmmResourceInfo *GmmResourceInfo::create(GmmClientContext *clientContext, GMM_RESCREATE_PARAMS *resourceCreateParams) { diff --git a/core/gmm_helper/resource_info.h b/core/gmm_helper/resource_info.h index 9ed2d012b0..28daf5cd91 100644 --- a/core/gmm_helper/resource_info.h +++ b/core/gmm_helper/resource_info.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gmm_helper/gmm_lib.h" +#include "gmm_helper/gmm_lib.h" #include #include diff --git a/core/gmm_helper/resource_info_impl.cpp b/core/gmm_helper/resource_info_impl.cpp index c117681a0a..0a1308dc02 100644 --- a/core/gmm_helper/resource_info_impl.cpp +++ b/core/gmm_helper/resource_info_impl.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/resource_info.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/resource_info.h" #include "gmm_client_context.h" diff --git a/core/gmm_helper/windows/gmm_memory/gmm_memory.h b/core/gmm_helper/windows/gmm_memory/gmm_memory.h index 3c02b4d786..abed582f85 100644 --- a/core/gmm_helper/windows/gmm_memory/gmm_memory.h +++ b/core/gmm_helper/windows/gmm_memory/gmm_memory.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gmm_helper/windows/gmm_memory_base.h" +#include "gmm_helper/windows/gmm_memory_base.h" namespace NEO { class GmmMemory : public GmmMemoryBase { diff --git a/core/gmm_helper/windows/gmm_memory_base.cpp b/core/gmm_helper/windows/gmm_memory_base.cpp index a58de386cd..a7bc041d6e 100644 --- a/core/gmm_helper/windows/gmm_memory_base.cpp +++ b/core/gmm_helper/windows/gmm_memory_base.cpp @@ -5,10 +5,10 @@ * */ -#include "core/gmm_helper/windows/gmm_memory_base.h" +#include "gmm_helper/windows/gmm_memory_base.h" -#include "core/helpers/debug_helpers.h" -#include "core/os_interface/windows/windows_defs.h" +#include "helpers/debug_helpers.h" +#include "os_interface/windows/windows_defs.h" #include "gmm_client_context.h" diff --git a/core/gmm_helper/windows/gmm_memory_base.h b/core/gmm_helper/windows/gmm_memory_base.h index acc1ba199a..1230307a35 100644 --- a/core/gmm_helper/windows/gmm_memory_base.h +++ b/core/gmm_helper/windows/gmm_memory_base.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gmm_helper/gmm_lib.h" +#include "gmm_helper/gmm_lib.h" #include diff --git a/core/helpers/abort.cpp b/core/helpers/abort.cpp index 3b594e8f17..d8272e5e57 100644 --- a/core/helpers/abort.cpp +++ b/core/helpers/abort.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/abort.h" +#include "helpers/abort.h" #include diff --git a/core/helpers/aligned_memory.h b/core/helpers/aligned_memory.h index 3e1bc5f5dd..ee9eeef4d6 100644 --- a/core/helpers/aligned_memory.h +++ b/core/helpers/aligned_memory.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/debug_helpers.h" -#include "core/memory_manager/memory_constants.h" +#include "helpers/debug_helpers.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/utilities/logger.h" #include diff --git a/core/helpers/allow_deferred_deleter.cpp b/core/helpers/allow_deferred_deleter.cpp index 6d9da6dbb9..d8758e8137 100644 --- a/core/helpers/allow_deferred_deleter.cpp +++ b/core/helpers/allow_deferred_deleter.cpp @@ -5,8 +5,8 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/deferred_deleter_helper.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/deferred_deleter_helper.h" namespace NEO { bool isDeferredDeleterEnabled() { diff --git a/core/helpers/basic_math.h b/core/helpers/basic_math.h index 9c449eb025..a28ba600ab 100644 --- a/core/helpers/basic_math.h +++ b/core/helpers/basic_math.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/vec.h" +#include "helpers/vec.h" #include #include diff --git a/core/helpers/blit_commands_helper.cpp b/core/helpers/blit_commands_helper.cpp index 3870c56b2d..d948c3de75 100644 --- a/core/helpers/blit_commands_helper.cpp +++ b/core/helpers/blit_commands_helper.cpp @@ -5,10 +5,10 @@ * */ -#include "core/helpers/blit_commands_helper.h" +#include "helpers/blit_commands_helper.h" -#include "core/helpers/timestamp_packet.h" -#include "core/memory_manager/surface.h" +#include "helpers/timestamp_packet.h" +#include "memory_manager/surface.h" namespace NEO { BlitProperties BlitProperties::constructPropertiesForReadWriteBuffer(BlitterConstants::BlitDirection blitDirection, diff --git a/core/helpers/blit_commands_helper.h b/core/helpers/blit_commands_helper.h index 07cbec91d7..d7f8391429 100644 --- a/core/helpers/blit_commands_helper.h +++ b/core/helpers/blit_commands_helper.h @@ -6,10 +6,10 @@ */ #pragma once -#include "core/command_stream/csr_deps.h" -#include "core/helpers/aux_translation.h" -#include "core/memory_manager/memory_constants.h" -#include "core/utilities/stackvec.h" +#include "command_stream/csr_deps.h" +#include "helpers/aux_translation.h" +#include "memory_manager/memory_constants.h" +#include "utilities/stackvec.h" #include diff --git a/core/helpers/blit_commands_helper_base.inl b/core/helpers/blit_commands_helper_base.inl index 1b2315cfc1..98fe85782f 100644 --- a/core/helpers/blit_commands_helper_base.inl +++ b/core/helpers/blit_commands_helper_base.inl @@ -5,9 +5,9 @@ * */ -#include "core/helpers/blit_commands_helper.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/timestamp_packet.h" +#include "helpers/blit_commands_helper.h" +#include "helpers/hw_helper.h" +#include "helpers/timestamp_packet.h" namespace NEO { diff --git a/core/helpers/blit_commands_helper_bdw_plus.inl b/core/helpers/blit_commands_helper_bdw_plus.inl index 647104cc93..b9cd8e035b 100644 --- a/core/helpers/blit_commands_helper_bdw_plus.inl +++ b/core/helpers/blit_commands_helper_bdw_plus.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/blit_commands_helper_base.inl" +#include "helpers/blit_commands_helper_base.inl" namespace NEO { diff --git a/core/helpers/cache_policy.cpp b/core/helpers/cache_policy.cpp index 2fd0c335b3..fcde1a06b9 100644 --- a/core/helpers/cache_policy.cpp +++ b/core/helpers/cache_policy.cpp @@ -5,10 +5,10 @@ * */ -#include "core/helpers/cache_policy.h" +#include "helpers/cache_policy.h" -#include "core/helpers/aligned_memory.h" -#include "core/memory_manager/graphics_allocation.h" +#include "helpers/aligned_memory.h" +#include "memory_manager/graphics_allocation.h" namespace NEO { diff --git a/core/helpers/cache_policy.h b/core/helpers/cache_policy.h index 777d0a6c64..c16d842c5c 100644 --- a/core/helpers/cache_policy.h +++ b/core/helpers/cache_policy.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gmm_helper/gmm_lib.h" +#include "gmm_helper/gmm_lib.h" namespace CacheSettings { constexpr uint32_t unknownMocs = GMM_RESOURCE_USAGE_UNKNOWN; diff --git a/core/helpers/completion_stamp.cpp b/core/helpers/completion_stamp.cpp index 5c2dd50aae..17eb015546 100644 --- a/core/helpers/completion_stamp.cpp +++ b/core/helpers/completion_stamp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/completion_stamp.h" +#include "helpers/completion_stamp.h" namespace NEO { diff --git a/core/helpers/debug_helpers.cpp b/core/helpers/debug_helpers.cpp index 36d0488237..7617e1ca9c 100644 --- a/core/helpers/debug_helpers.cpp +++ b/core/helpers/debug_helpers.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/debug_helpers.h" +#include "helpers/debug_helpers.h" -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include #include diff --git a/core/helpers/debug_helpers.h b/core/helpers/debug_helpers.h index 82e4c46446..7519e3dd78 100644 --- a/core/helpers/debug_helpers.h +++ b/core/helpers/debug_helpers.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/abort.h" +#include "helpers/abort.h" #define UNRECOVERABLE_IF(expression) \ \ diff --git a/core/helpers/dirty_state_helpers.cpp b/core/helpers/dirty_state_helpers.cpp index 50a848fce6..77e2d85f67 100644 --- a/core/helpers/dirty_state_helpers.cpp +++ b/core/helpers/dirty_state_helpers.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/dirty_state_helpers.h" +#include "helpers/dirty_state_helpers.h" -#include "core/indirect_heap/indirect_heap.h" +#include "indirect_heap/indirect_heap.h" using namespace NEO; diff --git a/core/helpers/engine_node_helper.cpp b/core/helpers/engine_node_helper.cpp index 498aaf8a3a..b216e76570 100644 --- a/core/helpers/engine_node_helper.cpp +++ b/core/helpers/engine_node_helper.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/engine_node_helper.h" +#include "helpers/engine_node_helper.h" namespace NEO { namespace EngineHelpers { diff --git a/core/helpers/file_io.cpp b/core/helpers/file_io.cpp index c0a635e3be..3a10840e7f 100644 --- a/core/helpers/file_io.cpp +++ b/core/helpers/file_io.cpp @@ -7,8 +7,8 @@ #include "file_io.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/stdio.h" +#include "helpers/debug_helpers.h" +#include "helpers/stdio.h" #include #include diff --git a/core/helpers/flat_batch_buffer_helper.cpp b/core/helpers/flat_batch_buffer_helper.cpp index 6c9871b088..3206dcb4cb 100644 --- a/core/helpers/flat_batch_buffer_helper.cpp +++ b/core/helpers/flat_batch_buffer_helper.cpp @@ -5,10 +5,10 @@ * */ -#include "core/helpers/flat_batch_buffer_helper.h" +#include "helpers/flat_batch_buffer_helper.h" -#include "core/execution_environment/execution_environment.h" -#include "core/memory_manager/graphics_allocation.h" +#include "execution_environment/execution_environment.h" +#include "memory_manager/graphics_allocation.h" namespace NEO { diff --git a/core/helpers/flat_batch_buffer_helper.h b/core/helpers/flat_batch_buffer_helper.h index c0ab926c67..cc9f4c9a97 100644 --- a/core/helpers/flat_batch_buffer_helper.h +++ b/core/helpers/flat_batch_buffer_helper.h @@ -7,8 +7,8 @@ #pragma once -#include "core/command_stream/submissions_aggregator.h" -#include "core/helpers/address_patch.h" +#include "command_stream/submissions_aggregator.h" +#include "helpers/address_patch.h" #include #include diff --git a/core/helpers/flat_batch_buffer_helper_hw.h b/core/helpers/flat_batch_buffer_helper_hw.h index 880f1f1da3..57321b2571 100644 --- a/core/helpers/flat_batch_buffer_helper_hw.h +++ b/core/helpers/flat_batch_buffer_helper_hw.h @@ -7,7 +7,7 @@ #pragma once -#include "core/helpers/flat_batch_buffer_helper.h" +#include "helpers/flat_batch_buffer_helper.h" namespace NEO { diff --git a/core/helpers/flat_batch_buffer_helper_hw.inl b/core/helpers/flat_batch_buffer_helper_hw.inl index 76432dcb1c..62a14dce44 100644 --- a/core/helpers/flat_batch_buffer_helper_hw.inl +++ b/core/helpers/flat_batch_buffer_helper_hw.inl @@ -5,12 +5,12 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/flat_batch_buffer_helper_hw.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/string.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/memory_manager.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/flat_batch_buffer_helper_hw.h" +#include "helpers/hw_helper.h" +#include "helpers/string.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/memory_manager.h" namespace NEO { diff --git a/core/helpers/flush_stamp.cpp b/core/helpers/flush_stamp.cpp index 55ff87ee9b..0e91e11edf 100644 --- a/core/helpers/flush_stamp.cpp +++ b/core/helpers/flush_stamp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/flush_stamp.h" +#include "helpers/flush_stamp.h" using namespace NEO; diff --git a/core/helpers/flush_stamp.h b/core/helpers/flush_stamp.h index 7a02a62a7a..95ab865524 100644 --- a/core/helpers/flush_stamp.h +++ b/core/helpers/flush_stamp.h @@ -7,9 +7,9 @@ #pragma once -#include "core/helpers/completion_stamp.h" -#include "core/utilities/reference_tracked_object.h" -#include "core/utilities/stackvec.h" +#include "helpers/completion_stamp.h" +#include "utilities/reference_tracked_object.h" +#include "utilities/stackvec.h" namespace NEO { struct FlushStampTrackingObj : public ReferenceTrackedObject { diff --git a/core/helpers/get_info.h b/core/helpers/get_info.h index edc5de5893..ed180809d4 100644 --- a/core/helpers/get_info.h +++ b/core/helpers/get_info.h @@ -11,7 +11,7 @@ #include // Need for linux compatibility with memcpy_s -#include "core/helpers/string.h" +#include "helpers/string.h" inline GetInfoStatus getInfo(void *destParamValue, size_t destParamValueSize, const void *srcParamValue, size_t srcParamValueSize) { diff --git a/core/helpers/hash.h b/core/helpers/hash.h index 4153ed0c71..b7ab72af43 100644 --- a/core/helpers/hash.h +++ b/core/helpers/hash.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/aligned_memory.h" -#include "core/utilities/compiler_support.h" +#include "helpers/aligned_memory.h" +#include "utilities/compiler_support.h" #include diff --git a/core/helpers/heap_helper.cpp b/core/helpers/heap_helper.cpp index 5104f9b3d2..341793a813 100644 --- a/core/helpers/heap_helper.cpp +++ b/core/helpers/heap_helper.cpp @@ -5,12 +5,12 @@ * */ -#include "core/helpers/heap_helper.h" +#include "helpers/heap_helper.h" -#include "core/indirect_heap/indirect_heap.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_manager.h" +#include "indirect_heap/indirect_heap.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_manager.h" namespace NEO { diff --git a/core/helpers/hw_cmds.h b/core/helpers/hw_cmds.h index b1c540c3d9..2e1bbd3e98 100644 --- a/core/helpers/hw_cmds.h +++ b/core/helpers/hw_cmds.h @@ -7,14 +7,14 @@ #pragma once #ifdef SUPPORT_GEN8 -#include "core/gen8/hw_cmds.h" +#include "gen8/hw_cmds.h" #endif #ifdef SUPPORT_GEN9 -#include "core/gen9/hw_cmds.h" +#include "gen9/hw_cmds.h" #endif #ifdef SUPPORT_GEN11 -#include "core/gen11/hw_cmds.h" +#include "gen11/hw_cmds.h" #endif #ifdef SUPPORT_GEN12LP -#include "core/gen12lp/hw_cmds.h" +#include "gen12lp/hw_cmds.h" #endif diff --git a/core/helpers/hw_helper.cpp b/core/helpers/hw_helper.cpp index 4a60236ad6..64fc19f449 100644 --- a/core/helpers/hw_helper.cpp +++ b/core/helpers/hw_helper.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" namespace NEO { HwHelper *hwHelperFactory[IGFX_MAX_CORE] = {}; diff --git a/core/helpers/hw_helper.h b/core/helpers/hw_helper.h index d09b8d95f8..61ff3499f5 100644 --- a/core/helpers/hw_helper.h +++ b/core/helpers/hw_helper.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/command_stream/linear_stream.h" -#include "core/helpers/aux_translation.h" -#include "core/helpers/hw_cmds.h" +#include "command_stream/linear_stream.h" +#include "helpers/aux_translation.h" +#include "helpers/hw_cmds.h" #include "opencl/source/built_ins/sip.h" #include "opencl/source/gen_common/aub_mapper.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/core/helpers/hw_helper_base.inl b/core/helpers/hw_helper_base.inl index 424291e71e..fdb3ccc47f 100644 --- a/core/helpers/hw_helper_base.inl +++ b/core/helpers/hw_helper_base.inl @@ -5,16 +5,16 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/preamble.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/memory_constants.h" -#include "core/os_interface/os_interface.h" +#include "execution_environment/execution_environment.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/aligned_memory.h" +#include "helpers/hw_helper.h" +#include "helpers/hw_info.h" +#include "helpers/preamble.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/memory_constants.h" +#include "os_interface/os_interface.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/core/helpers/hw_helper_bdw_plus.inl b/core/helpers/hw_helper_bdw_plus.inl index 5f609a220a..8e6059edf8 100644 --- a/core/helpers/hw_helper_bdw_plus.inl +++ b/core/helpers/hw_helper_bdw_plus.inl @@ -5,8 +5,8 @@ * */ -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/hw_helper_base.inl" +#include "gmm_helper/gmm_helper.h" +#include "helpers/hw_helper_base.inl" namespace NEO { diff --git a/core/helpers/hw_helper_extended.cpp b/core/helpers/hw_helper_extended.cpp index 99d24791d3..3c42e091e6 100644 --- a/core/helpers/hw_helper_extended.cpp +++ b/core/helpers/hw_helper_extended.cpp @@ -5,8 +5,8 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/hw_helper.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/hw_helper.h" namespace NEO { diff --git a/core/helpers/hw_info.cpp b/core/helpers/hw_info.cpp index 2ffb2218ed..883f5b059c 100644 --- a/core/helpers/hw_info.cpp +++ b/core/helpers/hw_info.cpp @@ -5,10 +5,10 @@ * */ -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/hw_cmds.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/hw_cmds.h" #include diff --git a/core/helpers/hw_info.h b/core/helpers/hw_info.h index 834171524a..864a1d4378 100644 --- a/core/helpers/hw_info.h +++ b/core/helpers/hw_info.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/command_stream/preemption_mode.h" -#include "core/direct_submission/direct_submission_properties.h" -#include "core/helpers/kmd_notify_properties.h" +#include "command_stream/preemption_mode.h" +#include "direct_submission/direct_submission_properties.h" +#include "helpers/kmd_notify_properties.h" #include "engine_node.h" #include "gtsysinfo.h" diff --git a/core/helpers/kernel_helpers.cpp b/core/helpers/kernel_helpers.cpp index b2a3b3681f..54d92c60d4 100644 --- a/core/helpers/kernel_helpers.cpp +++ b/core/helpers/kernel_helpers.cpp @@ -5,10 +5,10 @@ * */ -#include "core/helpers/kernel_helpers.h" +#include "helpers/kernel_helpers.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/debug_helpers.h" +#include "helpers/basic_math.h" +#include "helpers/debug_helpers.h" #include diff --git a/core/helpers/kmd_notify_properties.cpp b/core/helpers/kmd_notify_properties.cpp index 1ee3bf0de6..98523389f2 100644 --- a/core/helpers/kmd_notify_properties.cpp +++ b/core/helpers/kmd_notify_properties.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/kmd_notify_properties.h" +#include "helpers/kmd_notify_properties.h" -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include diff --git a/core/helpers/kmd_notify_properties.h b/core/helpers/kmd_notify_properties.h index 9e4f6e6cc4..224ec95109 100644 --- a/core/helpers/kmd_notify_properties.h +++ b/core/helpers/kmd_notify_properties.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/completion_stamp.h" +#include "helpers/completion_stamp.h" #include #include diff --git a/core/helpers/preamble.h b/core/helpers/preamble.h index 39333476b3..f0b390592e 100644 --- a/core/helpers/preamble.h +++ b/core/helpers/preamble.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/pipeline_select_helper.h" +#include "helpers/pipeline_select_helper.h" #include "engine_node.h" #include "igfxfmid.h" diff --git a/core/helpers/preamble_base.inl b/core/helpers/preamble_base.inl index 522be0982a..aa4dbe32dc 100644 --- a/core/helpers/preamble_base.inl +++ b/core/helpers/preamble_base.inl @@ -5,12 +5,12 @@ * */ -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/preemption.h" -#include "core/device/device.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/hw_cmds.h" -#include "core/helpers/preamble.h" +#include "command_stream/linear_stream.h" +#include "command_stream/preemption.h" +#include "device/device.h" +#include "helpers/aligned_memory.h" +#include "helpers/hw_cmds.h" +#include "helpers/preamble.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/kernel/kernel.h" diff --git a/core/helpers/preamble_bdw_plus.inl b/core/helpers/preamble_bdw_plus.inl index 3202c6c238..7e88277143 100644 --- a/core/helpers/preamble_bdw_plus.inl +++ b/core/helpers/preamble_bdw_plus.inl @@ -5,9 +5,9 @@ * */ -#include "core/helpers/flat_batch_buffer_helper.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/preamble_base.inl" +#include "helpers/flat_batch_buffer_helper.h" +#include "helpers/hw_helper.h" +#include "helpers/preamble_base.inl" namespace NEO { diff --git a/core/helpers/state_base_address_base.inl b/core/helpers/state_base_address_base.inl index 105fd8040d..536d630a08 100644 --- a/core/helpers/state_base_address_base.inl +++ b/core/helpers/state_base_address_base.inl @@ -5,12 +5,12 @@ * */ -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/cache_policy.h" -#include "core/helpers/hw_cmds.h" -#include "core/helpers/state_base_address.h" -#include "core/indirect_heap/indirect_heap.h" -#include "core/memory_manager/memory_constants.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/cache_policy.h" +#include "helpers/hw_cmds.h" +#include "helpers/state_base_address.h" +#include "indirect_heap/indirect_heap.h" +#include "memory_manager/memory_constants.h" namespace NEO { template diff --git a/core/helpers/state_base_address_bdw_plus.inl b/core/helpers/state_base_address_bdw_plus.inl index 6d9f5cf256..8a00b95466 100644 --- a/core/helpers/state_base_address_bdw_plus.inl +++ b/core/helpers/state_base_address_bdw_plus.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/state_base_address_base.inl" +#include "helpers/state_base_address_base.inl" namespace NEO { diff --git a/core/helpers/state_compute_mode_helper.h b/core/helpers/state_compute_mode_helper.h index f56b14e572..7c8b0f996b 100644 --- a/core/helpers/state_compute_mode_helper.h +++ b/core/helpers/state_compute_mode_helper.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/command_stream/csr_definitions.h" -#include "core/helpers/hw_cmds.h" +#include "command_stream/csr_definitions.h" +#include "helpers/hw_cmds.h" namespace NEO { template diff --git a/core/helpers/surface_format_info.h b/core/helpers/surface_format_info.h index 163972f940..73e1b7447c 100644 --- a/core/helpers/surface_format_info.h +++ b/core/helpers/surface_format_info.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gmm_helper/gmm_lib.h" +#include "gmm_helper/gmm_lib.h" namespace NEO { enum GFX3DSTATE_SURFACEFORMAT : unsigned short { diff --git a/core/helpers/timestamp_packet.cpp b/core/helpers/timestamp_packet.cpp index ed4d4cf513..5ace6c2dab 100644 --- a/core/helpers/timestamp_packet.cpp +++ b/core/helpers/timestamp_packet.cpp @@ -5,11 +5,11 @@ * */ -#include "core/helpers/timestamp_packet.h" +#include "helpers/timestamp_packet.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/linear_stream.h" -#include "core/utilities/tag_allocator.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/linear_stream.h" +#include "utilities/tag_allocator.h" using namespace NEO; diff --git a/core/helpers/timestamp_packet.h b/core/helpers/timestamp_packet.h index 5e4289dc66..50d32ed2e8 100644 --- a/core/helpers/timestamp_packet.h +++ b/core/helpers/timestamp_packet.h @@ -7,11 +7,11 @@ #pragma once -#include "core/command_container/command_encoder.h" -#include "core/command_stream/csr_deps.h" -#include "core/helpers/aux_translation.h" -#include "core/helpers/non_copyable_or_moveable.h" -#include "core/utilities/tag_allocator.h" +#include "command_container/command_encoder.h" +#include "command_stream/csr_deps.h" +#include "helpers/aux_translation.h" +#include "helpers/non_copyable_or_moveable.h" +#include "utilities/tag_allocator.h" #include #include diff --git a/core/helpers/windows/gmm_callbacks.inl b/core/helpers/windows/gmm_callbacks.inl index 19e0a71938..7debe9d4fb 100644 --- a/core/helpers/windows/gmm_callbacks.inl +++ b/core/helpers/windows/gmm_callbacks.inl @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/linear_stream.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/windows/gmm_callbacks.h" +#include "command_stream/linear_stream.h" +#include "helpers/hw_helper.h" +#include "helpers/windows/gmm_callbacks.h" #include diff --git a/core/image/image_surface_state.h b/core/image/image_surface_state.h index 5853ef9bb4..1cb4d7d2df 100644 --- a/core/image/image_surface_state.h +++ b/core/image/image_surface_state.h @@ -7,12 +7,12 @@ #pragma once -#include "core/execution_environment/execution_environment.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/surface_format_info.h" -#include "core/memory_manager/graphics_allocation.h" +#include "execution_environment/execution_environment.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/resource_info.h" +#include "helpers/surface_format_info.h" +#include "memory_manager/graphics_allocation.h" namespace NEO { template diff --git a/core/indirect_heap/indirect_heap.h b/core/indirect_heap/indirect_heap.h index 88af0bb846..693ab51967 100644 --- a/core/indirect_heap/indirect_heap.h +++ b/core/indirect_heap/indirect_heap.h @@ -6,12 +6,12 @@ */ #pragma once -#include "core/command_stream/linear_stream.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/memory_constants.h" +#include "command_stream/linear_stream.h" +#include "helpers/aligned_memory.h" +#include "helpers/basic_math.h" +#include "helpers/ptr_math.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/memory_constants.h" namespace NEO { class GraphicsAllocation; diff --git a/core/memory_manager/allocation_properties.h b/core/memory_manager/allocation_properties.h index 6503930e9d..fbc22efa09 100644 --- a/core/memory_manager/allocation_properties.h +++ b/core/memory_manager/allocation_properties.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/device/sub_device.h" -#include "core/memory_manager/graphics_allocation.h" +#include "device/sub_device.h" +#include "memory_manager/graphics_allocation.h" namespace NEO { struct ImageInfo; diff --git a/core/memory_manager/allocations_list.h b/core/memory_manager/allocations_list.h index 1598be57a1..a5bd6b99e8 100644 --- a/core/memory_manager/allocations_list.h +++ b/core/memory_manager/allocations_list.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/graphics_allocation.h" +#include "memory_manager/graphics_allocation.h" #include diff --git a/core/memory_manager/deferrable_allocation_deletion.cpp b/core/memory_manager/deferrable_allocation_deletion.cpp index 56ec8dfa70..1de7f92c89 100644 --- a/core/memory_manager/deferrable_allocation_deletion.cpp +++ b/core/memory_manager/deferrable_allocation_deletion.cpp @@ -5,12 +5,12 @@ * */ -#include "core/memory_manager/deferrable_allocation_deletion.h" +#include "memory_manager/deferrable_allocation_deletion.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/engine_control.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/os_context.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/engine_control.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/os_context.h" namespace NEO { diff --git a/core/memory_manager/deferrable_allocation_deletion.h b/core/memory_manager/deferrable_allocation_deletion.h index df59850d13..793f242ff2 100644 --- a/core/memory_manager/deferrable_allocation_deletion.h +++ b/core/memory_manager/deferrable_allocation_deletion.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/deferrable_deletion.h" +#include "memory_manager/deferrable_deletion.h" namespace NEO { diff --git a/core/memory_manager/deferrable_deletion.h b/core/memory_manager/deferrable_deletion.h index 3a13ceec0f..c1dbf99699 100644 --- a/core/memory_manager/deferrable_deletion.h +++ b/core/memory_manager/deferrable_deletion.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/utilities/idlist.h" +#include "utilities/idlist.h" namespace NEO { class DeferrableDeletion : public IDNode { diff --git a/core/memory_manager/deferred_deleter.cpp b/core/memory_manager/deferred_deleter.cpp index 9364797fa2..b2868c90b7 100644 --- a/core/memory_manager/deferred_deleter.cpp +++ b/core/memory_manager/deferred_deleter.cpp @@ -5,10 +5,10 @@ * */ -#include "core/memory_manager/deferred_deleter.h" +#include "memory_manager/deferred_deleter.h" -#include "core/memory_manager/deferrable_deletion.h" -#include "core/os_interface/os_thread.h" +#include "memory_manager/deferrable_deletion.h" +#include "os_interface/os_thread.h" namespace NEO { DeferredDeleter::DeferredDeleter() { diff --git a/core/memory_manager/deferred_deleter.h b/core/memory_manager/deferred_deleter.h index 832b9ab233..30d00461c0 100644 --- a/core/memory_manager/deferred_deleter.h +++ b/core/memory_manager/deferred_deleter.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/utilities/idlist.h" +#include "utilities/idlist.h" #include #include diff --git a/core/memory_manager/definitions/storage_info.cpp b/core/memory_manager/definitions/storage_info.cpp index 8cb871f395..8023977752 100644 --- a/core/memory_manager/definitions/storage_info.cpp +++ b/core/memory_manager/definitions/storage_info.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/memory_manager.h" +#include "memory_manager/memory_manager.h" namespace NEO { StorageInfo MemoryManager::createStorageInfoFromProperties(const AllocationProperties &properties) { diff --git a/core/memory_manager/gfx_partition.cpp b/core/memory_manager/gfx_partition.cpp index 61412ecc4d..2ed73baf66 100644 --- a/core/memory_manager/gfx_partition.cpp +++ b/core/memory_manager/gfx_partition.cpp @@ -5,9 +5,9 @@ * */ -#include "core/memory_manager/gfx_partition.h" +#include "memory_manager/gfx_partition.h" -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" namespace NEO { diff --git a/core/memory_manager/gfx_partition.h b/core/memory_manager/gfx_partition.h index 354133a35f..7c231984a3 100644 --- a/core/memory_manager/gfx_partition.h +++ b/core/memory_manager/gfx_partition.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/memory_manager/memory_constants.h" -#include "core/os_interface/os_memory.h" -#include "core/utilities/heap_allocator.h" +#include "memory_manager/memory_constants.h" +#include "os_interface/os_memory.h" +#include "utilities/heap_allocator.h" #include diff --git a/core/memory_manager/gfx_partition_init_additional_range.cpp b/core/memory_manager/gfx_partition_init_additional_range.cpp index 8eca663b4d..4f52d22549 100644 --- a/core/memory_manager/gfx_partition_init_additional_range.cpp +++ b/core/memory_manager/gfx_partition_init_additional_range.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/gfx_partition.h" +#include "memory_manager/gfx_partition.h" namespace NEO { diff --git a/core/memory_manager/graphics_allocation.cpp b/core/memory_manager/graphics_allocation.cpp index ee32f4540c..7f78d093fa 100644 --- a/core/memory_manager/graphics_allocation.cpp +++ b/core/memory_manager/graphics_allocation.cpp @@ -7,8 +7,8 @@ #include "graphics_allocation.h" -#include "core/helpers/aligned_memory.h" -#include "core/memory_manager/memory_manager.h" +#include "helpers/aligned_memory.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/utilities/logger.h" namespace NEO { diff --git a/core/memory_manager/graphics_allocation.h b/core/memory_manager/graphics_allocation.h index 30bbcef1e0..469bb01f1a 100644 --- a/core/memory_manager/graphics_allocation.h +++ b/core/memory_manager/graphics_allocation.h @@ -7,13 +7,13 @@ #pragma once -#include "core/helpers/debug_helpers.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/host_ptr_defines.h" -#include "core/memory_manager/memory_constants.h" -#include "core/memory_manager/memory_pool.h" -#include "core/utilities/idlist.h" -#include "core/utilities/stackvec.h" +#include "helpers/debug_helpers.h" +#include "helpers/ptr_math.h" +#include "memory_manager/host_ptr_defines.h" +#include "memory_manager/memory_constants.h" +#include "memory_manager/memory_pool.h" +#include "utilities/idlist.h" +#include "utilities/stackvec.h" #include "engine_limits.h" #include "storage_info.h" diff --git a/core/memory_manager/graphics_allocation_extra.cpp b/core/memory_manager/graphics_allocation_extra.cpp index 13fe1bf84d..b17c4e7dd2 100644 --- a/core/memory_manager/graphics_allocation_extra.cpp +++ b/core/memory_manager/graphics_allocation_extra.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/graphics_allocation.h" +#include "memory_manager/graphics_allocation.h" namespace NEO { diff --git a/core/memory_manager/host_ptr_manager.cpp b/core/memory_manager/host_ptr_manager.cpp index fbf6b6e761..a96bbaf9e8 100644 --- a/core/memory_manager/host_ptr_manager.cpp +++ b/core/memory_manager/host_ptr_manager.cpp @@ -5,9 +5,9 @@ * */ -#include "core/memory_manager/host_ptr_manager.h" +#include "memory_manager/host_ptr_manager.h" -#include "core/memory_manager/memory_manager.h" +#include "memory_manager/memory_manager.h" using namespace NEO; diff --git a/core/memory_manager/host_ptr_manager.h b/core/memory_manager/host_ptr_manager.h index c6a07ed12b..bce3ad3ab9 100644 --- a/core/memory_manager/host_ptr_manager.h +++ b/core/memory_manager/host_ptr_manager.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/host_ptr_defines.h" +#include "memory_manager/host_ptr_defines.h" #include #include diff --git a/core/memory_manager/internal_allocation_storage.cpp b/core/memory_manager/internal_allocation_storage.cpp index ec44bd001d..fe4113b553 100644 --- a/core/memory_manager/internal_allocation_storage.cpp +++ b/core/memory_manager/internal_allocation_storage.cpp @@ -5,12 +5,12 @@ * */ -#include "core/memory_manager/internal_allocation_storage.h" +#include "memory_manager/internal_allocation_storage.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/memory_manager/host_ptr_manager.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/os_context.h" +#include "command_stream/command_stream_receiver.h" +#include "memory_manager/host_ptr_manager.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/os_context.h" namespace NEO { InternalAllocationStorage::InternalAllocationStorage(CommandStreamReceiver &commandStreamReceiver) : commandStreamReceiver(commandStreamReceiver){}; diff --git a/core/memory_manager/internal_allocation_storage.h b/core/memory_manager/internal_allocation_storage.h index bb71a59fdc..4fe517ae20 100644 --- a/core/memory_manager/internal_allocation_storage.h +++ b/core/memory_manager/internal_allocation_storage.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/allocations_list.h" +#include "memory_manager/allocations_list.h" namespace NEO { class CommandStreamReceiver; diff --git a/core/memory_manager/local_memory_usage.cpp b/core/memory_manager/local_memory_usage.cpp index 2dbb8683b3..d47560c6f8 100644 --- a/core/memory_manager/local_memory_usage.cpp +++ b/core/memory_manager/local_memory_usage.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/local_memory_usage.h" +#include "memory_manager/local_memory_usage.h" #include #include diff --git a/core/memory_manager/local_memory_usage.h b/core/memory_manager/local_memory_usage.h index 723842e102..617adb8c44 100644 --- a/core/memory_manager/local_memory_usage.h +++ b/core/memory_manager/local_memory_usage.h @@ -7,8 +7,8 @@ #pragma once -#include "core/helpers/debug_helpers.h" -#include "core/helpers/non_copyable_or_moveable.h" +#include "helpers/debug_helpers.h" +#include "helpers/non_copyable_or_moveable.h" #include #include diff --git a/core/memory_manager/memory_manager.cpp b/core/memory_manager/memory_manager.cpp index 456731164e..6065e2ed38 100644 --- a/core/memory_manager/memory_manager.cpp +++ b/core/memory_manager/memory_manager.cpp @@ -5,29 +5,29 @@ * */ -#include "core/memory_manager/memory_manager.h" +#include "memory_manager/memory_manager.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/page_table_mngr.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/string.h" -#include "core/helpers/surface_format_info.h" -#include "core/memory_manager/deferrable_allocation_deletion.h" -#include "core/memory_manager/deferred_deleter.h" -#include "core/memory_manager/host_ptr_manager.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/os_interface/os_context.h" -#include "core/os_interface/os_interface.h" -#include "core/utilities/compiler_support.h" -#include "core/utilities/stackvec.h" +#include "command_stream/command_stream_receiver.h" +#include "debug_settings/debug_settings_manager.h" +#include "execution_environment/root_device_environment.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/page_table_mngr.h" +#include "gmm_helper/resource_info.h" +#include "helpers/aligned_memory.h" +#include "helpers/basic_math.h" +#include "helpers/hw_helper.h" +#include "helpers/hw_info.h" +#include "helpers/string.h" +#include "helpers/surface_format_info.h" +#include "memory_manager/deferrable_allocation_deletion.h" +#include "memory_manager/deferred_deleter.h" +#include "memory_manager/host_ptr_manager.h" +#include "memory_manager/internal_allocation_storage.h" +#include "os_interface/os_context.h" +#include "os_interface/os_interface.h" +#include "utilities/compiler_support.h" +#include "utilities/stackvec.h" #include diff --git a/core/memory_manager/memory_manager.h b/core/memory_manager/memory_manager.h index 1ee22d7e5e..2969ac0cb8 100644 --- a/core/memory_manager/memory_manager.h +++ b/core/memory_manager/memory_manager.h @@ -6,17 +6,17 @@ */ #pragma once -#include "core/command_stream/preemption_mode.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/bit_helpers.h" -#include "core/helpers/common_types.h" -#include "core/helpers/engine_control.h" -#include "core/memory_manager/allocation_properties.h" -#include "core/memory_manager/gfx_partition.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/host_ptr_defines.h" -#include "core/memory_manager/local_memory_usage.h" -#include "core/page_fault_manager/cpu_page_fault_manager.h" +#include "command_stream/preemption_mode.h" +#include "helpers/aligned_memory.h" +#include "helpers/bit_helpers.h" +#include "helpers/common_types.h" +#include "helpers/engine_control.h" +#include "memory_manager/allocation_properties.h" +#include "memory_manager/gfx_partition.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/host_ptr_defines.h" +#include "memory_manager/local_memory_usage.h" +#include "page_fault_manager/cpu_page_fault_manager.h" #include "engine_node.h" diff --git a/core/memory_manager/memory_operations_handler.h b/core/memory_manager/memory_operations_handler.h index afd54db5ca..59e77c8017 100644 --- a/core/memory_manager/memory_operations_handler.h +++ b/core/memory_manager/memory_operations_handler.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/memory_manager/memory_operations_status.h" -#include "core/utilities/arrayref.h" +#include "memory_manager/memory_operations_status.h" +#include "utilities/arrayref.h" namespace NEO { diff --git a/core/memory_manager/memory_pool.h b/core/memory_manager/memory_pool.h index d7b276a880..ec578e832f 100644 --- a/core/memory_manager/memory_pool.h +++ b/core/memory_manager/memory_pool.h @@ -7,7 +7,7 @@ #pragma once -#include "core/helpers/extendable_enum.h" +#include "helpers/extendable_enum.h" namespace MemoryPool { struct Type : ExtendableEnum { diff --git a/core/memory_manager/residency.cpp b/core/memory_manager/residency.cpp index a8dcf379e8..475e9e9123 100644 --- a/core/memory_manager/residency.cpp +++ b/core/memory_manager/residency.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/residency.h" +#include "memory_manager/residency.h" using namespace NEO; diff --git a/core/memory_manager/residency.h b/core/memory_manager/residency.h index 41255c6e5b..348cc210c7 100644 --- a/core/memory_manager/residency.h +++ b/core/memory_manager/residency.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/memory_manager/memory_manager.h" -#include "core/utilities/stackvec.h" +#include "memory_manager/memory_manager.h" +#include "utilities/stackvec.h" #include diff --git a/core/memory_manager/surface.h b/core/memory_manager/surface.h index f356dbb900..a8bbcf6753 100644 --- a/core/memory_manager/surface.h +++ b/core/memory_manager/surface.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/cache_policy.h" -#include "core/memory_manager/graphics_allocation.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/cache_policy.h" +#include "memory_manager/graphics_allocation.h" namespace NEO { diff --git a/core/memory_manager/unified_memory_manager.cpp b/core/memory_manager/unified_memory_manager.cpp index e18467bb6f..3b635374ab 100644 --- a/core/memory_manager/unified_memory_manager.cpp +++ b/core/memory_manager/unified_memory_manager.cpp @@ -5,11 +5,11 @@ * */ -#include "core/memory_manager/unified_memory_manager.h" +#include "memory_manager/unified_memory_manager.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/aligned_memory.h" -#include "core/memory_manager/memory_manager.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/aligned_memory.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/mem_obj/mem_obj_helper.h" namespace NEO { diff --git a/core/memory_manager/unified_memory_manager.h b/core/memory_manager/unified_memory_manager.h index e723e70c13..cbd627f165 100644 --- a/core/memory_manager/unified_memory_manager.h +++ b/core/memory_manager/unified_memory_manager.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/helpers/common_types.h" -#include "core/unified_memory/unified_memory.h" -#include "core/utilities/spinlock.h" +#include "helpers/common_types.h" +#include "unified_memory/unified_memory.h" +#include "utilities/spinlock.h" #include "memory_properties_flags.h" diff --git a/core/memory_properties/memory_properties_flags.h b/core/memory_properties/memory_properties_flags.h index 30d2dc482c..3421dfefe8 100644 --- a/core/memory_properties/memory_properties_flags.h +++ b/core/memory_properties/memory_properties_flags.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_properties/memory_properties_flags_common.inl" +#include "memory_properties/memory_properties_flags_common.inl" namespace NEO { diff --git a/core/os_interface/aub_memory_operations_handler.cpp b/core/os_interface/aub_memory_operations_handler.cpp index a6d41146a7..e2135a3512 100644 --- a/core/os_interface/aub_memory_operations_handler.cpp +++ b/core/os_interface/aub_memory_operations_handler.cpp @@ -5,9 +5,9 @@ * */ -#include "core/os_interface/aub_memory_operations_handler.h" +#include "os_interface/aub_memory_operations_handler.h" -#include "core/memory_manager/graphics_allocation.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" #include diff --git a/core/os_interface/aub_memory_operations_handler.h b/core/os_interface/aub_memory_operations_handler.h index bdd9633908..ffcd4c8891 100644 --- a/core/os_interface/aub_memory_operations_handler.h +++ b/core/os_interface/aub_memory_operations_handler.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/memory_manager/memory_operations_handler.h" -#include "core/utilities/spinlock.h" +#include "memory_manager/memory_operations_handler.h" +#include "utilities/spinlock.h" #include "third_party/aub_stream/headers/aub_manager.h" diff --git a/core/os_interface/device_factory.cpp b/core/os_interface/device_factory.cpp index b9e5b7df26..2eab397b65 100644 --- a/core/os_interface/device_factory.cpp +++ b/core/os_interface/device_factory.cpp @@ -5,16 +5,16 @@ * */ -#include "core/os_interface/device_factory.h" +#include "os_interface/device_factory.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/device/device.h" -#include "core/device/root_device.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/hw_helper.h" -#include "core/os_interface/aub_memory_operations_handler.h" -#include "core/os_interface/hw_info_config.h" -#include "core/os_interface/os_interface.h" +#include "debug_settings/debug_settings_manager.h" +#include "device/device.h" +#include "device/root_device.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/hw_helper.h" +#include "os_interface/aub_memory_operations_handler.h" +#include "os_interface/hw_info_config.h" +#include "os_interface/os_interface.h" #include "opencl/source/aub/aub_center.h" #include "hw_device_id.h" diff --git a/core/os_interface/hw_info_config.h b/core/os_interface/hw_info_config.h index 4d3c57cf63..36951be265 100644 --- a/core/os_interface/hw_info_config.h +++ b/core/os_interface/hw_info_config.h @@ -7,8 +7,8 @@ #pragma once -#include "core/helpers/hw_info.h" -#include "core/unified_memory/usm_memory_support.h" +#include "helpers/hw_info.h" +#include "unified_memory/usm_memory_support.h" #include "igfxfmid.h" diff --git a/core/os_interface/hw_info_config.inl b/core/os_interface/hw_info_config.inl index aeaa7b07c6..b59b1825df 100644 --- a/core/os_interface/hw_info_config.inl +++ b/core/os_interface/hw_info_config.inl @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/hw_info_config.h" +#include "os_interface/hw_info_config.h" namespace NEO { diff --git a/core/os_interface/hw_info_config_bdw_plus.inl b/core/os_interface/hw_info_config_bdw_plus.inl index dfee59561e..318552d31e 100644 --- a/core/os_interface/hw_info_config_bdw_plus.inl +++ b/core/os_interface/hw_info_config_bdw_plus.inl @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/hw_info_config.h" +#include "os_interface/hw_info_config.h" namespace NEO { template diff --git a/core/os_interface/linux/debug_env_reader.cpp b/core/os_interface/linux/debug_env_reader.cpp index d783439d57..f5ff6e2515 100644 --- a/core/os_interface/linux/debug_env_reader.cpp +++ b/core/os_interface/linux/debug_env_reader.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/debug_env_reader.h" +#include "os_interface/linux/debug_env_reader.h" namespace NEO { diff --git a/core/os_interface/linux/debug_env_reader.h b/core/os_interface/linux/debug_env_reader.h index c50d0b7363..66c64bd54c 100644 --- a/core/os_interface/linux/debug_env_reader.h +++ b/core/os_interface/linux/debug_env_reader.h @@ -7,8 +7,8 @@ #pragma once -#include "core/debug_settings/debug_settings_manager.h" -#include "core/utilities/debug_settings_reader.h" +#include "debug_settings/debug_settings_manager.h" +#include "utilities/debug_settings_reader.h" namespace NEO { diff --git a/core/os_interface/linux/drm_allocation.cpp b/core/os_interface/linux/drm_allocation.cpp index 93e9108384..cdd4c2bfcc 100644 --- a/core/os_interface/linux/drm_allocation.cpp +++ b/core/os_interface/linux/drm_allocation.cpp @@ -5,10 +5,10 @@ * */ -#include "core/os_interface/linux/drm_allocation.h" +#include "os_interface/linux/drm_allocation.h" -#include "core/os_interface/linux/drm_buffer_object.h" -#include "core/os_interface/linux/drm_memory_manager.h" +#include "os_interface/linux/drm_buffer_object.h" +#include "os_interface/linux/drm_memory_manager.h" #include diff --git a/core/os_interface/linux/drm_allocation.h b/core/os_interface/linux/drm_allocation.h index 1fabc7fe43..81548adaa9 100644 --- a/core/os_interface/linux/drm_allocation.h +++ b/core/os_interface/linux/drm_allocation.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/graphics_allocation.h" +#include "memory_manager/graphics_allocation.h" namespace NEO { class BufferObject; diff --git a/core/os_interface/linux/drm_buffer_object.cpp b/core/os_interface/linux/drm_buffer_object.cpp index 7c39f14b17..e0cabe4ea5 100644 --- a/core/os_interface/linux/drm_buffer_object.cpp +++ b/core/os_interface/linux/drm_buffer_object.cpp @@ -5,14 +5,14 @@ * */ -#include "core/os_interface/linux/drm_buffer_object.h" +#include "os_interface/linux/drm_buffer_object.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/debug_helpers.h" -#include "core/os_interface/linux/drm_memory_manager.h" -#include "core/os_interface/linux/drm_neo.h" -#include "core/os_interface/linux/os_time_linux.h" -#include "core/utilities/stackvec.h" +#include "helpers/aligned_memory.h" +#include "helpers/debug_helpers.h" +#include "os_interface/linux/drm_memory_manager.h" +#include "os_interface/linux/drm_neo.h" +#include "os_interface/linux/os_time_linux.h" +#include "utilities/stackvec.h" #include "drm/i915_drm.h" diff --git a/core/os_interface/linux/drm_engine_mapper.cpp b/core/os_interface/linux/drm_engine_mapper.cpp index 2b5fc35552..3104e76f3d 100644 --- a/core/os_interface/linux/drm_engine_mapper.cpp +++ b/core/os_interface/linux/drm_engine_mapper.cpp @@ -5,9 +5,9 @@ * */ -#include "core/os_interface/linux/drm_engine_mapper.h" +#include "os_interface/linux/drm_engine_mapper.h" -#include "core/helpers/debug_helpers.h" +#include "helpers/debug_helpers.h" #include "drm/i915_drm.h" diff --git a/core/os_interface/linux/drm_gem_close_worker.cpp b/core/os_interface/linux/drm_gem_close_worker.cpp index 178ac9c68c..085964684a 100644 --- a/core/os_interface/linux/drm_gem_close_worker.cpp +++ b/core/os_interface/linux/drm_gem_close_worker.cpp @@ -5,12 +5,12 @@ * */ -#include "core/os_interface/linux/drm_gem_close_worker.h" +#include "os_interface/linux/drm_gem_close_worker.h" -#include "core/helpers/aligned_memory.h" -#include "core/os_interface/linux/drm_buffer_object.h" -#include "core/os_interface/linux/drm_memory_manager.h" -#include "core/os_interface/os_thread.h" +#include "helpers/aligned_memory.h" +#include "os_interface/linux/drm_buffer_object.h" +#include "os_interface/linux/drm_memory_manager.h" +#include "os_interface/os_thread.h" #include "opencl/source/os_interface/linux/drm_command_stream.h" #include diff --git a/core/os_interface/linux/drm_memory_manager.cpp b/core/os_interface/linux/drm_memory_manager.cpp index a239402e30..30d1d6d176 100644 --- a/core/os_interface/linux/drm_memory_manager.cpp +++ b/core/os_interface/linux/drm_memory_manager.cpp @@ -5,22 +5,22 @@ * */ -#include "core/os_interface/linux/drm_memory_manager.h" +#include "os_interface/linux/drm_memory_manager.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/surface_format_info.h" -#include "core/memory_manager/host_ptr_manager.h" -#include "core/memory_manager/residency.h" -#include "core/os_interface/linux/allocator_helper.h" -#include "core/os_interface/linux/os_context_linux.h" -#include "core/os_interface/linux/os_interface.h" +#include "command_stream/command_stream_receiver.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/resource_info.h" +#include "helpers/hw_info.h" +#include "helpers/ptr_math.h" +#include "helpers/surface_format_info.h" +#include "memory_manager/host_ptr_manager.h" +#include "memory_manager/residency.h" +#include "os_interface/linux/allocator_helper.h" +#include "os_interface/linux/os_context_linux.h" +#include "os_interface/linux/os_interface.h" #include "drm/i915_drm.h" diff --git a/core/os_interface/linux/drm_memory_manager.h b/core/os_interface/linux/drm_memory_manager.h index 0390c6fbaa..4e73c70a2c 100644 --- a/core/os_interface/linux/drm_memory_manager.h +++ b/core/os_interface/linux/drm_memory_manager.h @@ -6,10 +6,10 @@ */ #pragma once -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/linux/drm_allocation.h" -#include "core/os_interface/linux/drm_buffer_object.h" -#include "core/os_interface/linux/drm_neo.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/linux/drm_allocation.h" +#include "os_interface/linux/drm_buffer_object.h" +#include "os_interface/linux/drm_neo.h" #include "drm_gem_close_worker.h" diff --git a/core/os_interface/linux/drm_memory_manager_allocate_in_device_pool.cpp b/core/os_interface/linux/drm_memory_manager_allocate_in_device_pool.cpp index 1c41598de4..3413ea3d70 100644 --- a/core/os_interface/linux/drm_memory_manager_allocate_in_device_pool.cpp +++ b/core/os_interface/linux/drm_memory_manager_allocate_in_device_pool.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/basic_math.h" -#include "core/os_interface/linux/drm_memory_manager.h" +#include "helpers/basic_math.h" +#include "os_interface/linux/drm_memory_manager.h" namespace NEO { GraphicsAllocation *DrmMemoryManager::allocateGraphicsMemoryInDevicePool(const AllocationData &allocationData, AllocationStatus &status) { diff --git a/core/os_interface/linux/drm_memory_operations_handler.cpp b/core/os_interface/linux/drm_memory_operations_handler.cpp index ed75bafe9f..1e71f3eaf6 100644 --- a/core/os_interface/linux/drm_memory_operations_handler.cpp +++ b/core/os_interface/linux/drm_memory_operations_handler.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_memory_operations_handler.h" +#include "os_interface/linux/drm_memory_operations_handler.h" namespace NEO { diff --git a/core/os_interface/linux/drm_memory_operations_handler.h b/core/os_interface/linux/drm_memory_operations_handler.h index bc623af277..98074b177c 100644 --- a/core/os_interface/linux/drm_memory_operations_handler.h +++ b/core/os_interface/linux/drm_memory_operations_handler.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/memory_operations_handler.h" +#include "memory_manager/memory_operations_handler.h" namespace NEO { diff --git a/core/os_interface/linux/drm_neo.cpp b/core/os_interface/linux/drm_neo.cpp index d049650954..5e6fd24934 100644 --- a/core/os_interface/linux/drm_neo.cpp +++ b/core/os_interface/linux/drm_neo.cpp @@ -7,15 +7,15 @@ #include "drm_neo.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/hw_info.h" -#include "core/memory_manager/memory_constants.h" -#include "core/os_interface/linux/hw_device_id.h" -#include "core/os_interface/linux/os_inc.h" -#include "core/os_interface/linux/sys_calls.h" -#include "core/os_interface/os_interface.h" -#include "core/utilities/directory.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/debug_helpers.h" +#include "helpers/hw_info.h" +#include "memory_manager/memory_constants.h" +#include "os_interface/linux/hw_device_id.h" +#include "os_interface/linux/os_inc.h" +#include "os_interface/linux/sys_calls.h" +#include "os_interface/os_interface.h" +#include "utilities/directory.h" #include #include diff --git a/core/os_interface/linux/drm_neo.h b/core/os_interface/linux/drm_neo.h index 57514c24aa..40c524840d 100644 --- a/core/os_interface/linux/drm_neo.h +++ b/core/os_interface/linux/drm_neo.h @@ -6,11 +6,11 @@ */ #pragma once -#include "core/helpers/basic_math.h" -#include "core/os_interface/linux/engine_info.h" -#include "core/os_interface/linux/hw_device_id.h" -#include "core/os_interface/linux/memory_info.h" -#include "core/utilities/api_intercept.h" +#include "helpers/basic_math.h" +#include "os_interface/linux/engine_info.h" +#include "os_interface/linux/hw_device_id.h" +#include "os_interface/linux/memory_info.h" +#include "utilities/api_intercept.h" #include "drm/i915_drm.h" #include "engine_node.h" diff --git a/core/os_interface/linux/drm_null_device.h b/core/os_interface/linux/drm_null_device.h index 2376f78554..8b86f90ace 100644 --- a/core/os_interface/linux/drm_null_device.h +++ b/core/os_interface/linux/drm_null_device.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/os_interface/linux/drm_neo.h" -#include "core/os_interface/linux/os_time_linux.h" +#include "os_interface/linux/drm_neo.h" +#include "os_interface/linux/os_time_linux.h" #include "drm/i915_drm.h" diff --git a/core/os_interface/linux/drm_query.cpp b/core/os_interface/linux/drm_query.cpp index f3921f272b..feda846371 100644 --- a/core/os_interface/linux/drm_query.cpp +++ b/core/os_interface/linux/drm_query.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_engine_mapper.h" +#include "os_interface/linux/drm_engine_mapper.h" #include "drm_neo.h" diff --git a/core/os_interface/linux/gmm_interface_linux.cpp b/core/os_interface/linux/gmm_interface_linux.cpp index f9d664171c..2168441479 100644 --- a/core/os_interface/linux/gmm_interface_linux.cpp +++ b/core/os_interface/linux/gmm_interface_linux.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gmm_helper/gmm_interface.h" +#include "gmm_helper/gmm_interface.h" namespace NEO { namespace GmmInterface { GMM_STATUS initialize(GMM_INIT_IN_ARGS *pInArgs, GMM_INIT_OUT_ARGS *pOutArgs) { diff --git a/core/os_interface/linux/hw_device_id.h b/core/os_interface/linux/hw_device_id.h index a6807ff22a..00a24824bb 100644 --- a/core/os_interface/linux/hw_device_id.h +++ b/core/os_interface/linux/hw_device_id.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/non_copyable_or_moveable.h" +#include "helpers/non_copyable_or_moveable.h" namespace NEO { diff --git a/core/os_interface/linux/hw_device_id_linux.cpp b/core/os_interface/linux/hw_device_id_linux.cpp index 5465b9afdd..c5f366e264 100644 --- a/core/os_interface/linux/hw_device_id_linux.cpp +++ b/core/os_interface/linux/hw_device_id_linux.cpp @@ -5,8 +5,8 @@ * */ -#include "core/os_interface/linux/hw_device_id.h" -#include "core/os_interface/linux/sys_calls.h" +#include "os_interface/linux/hw_device_id.h" +#include "os_interface/linux/sys_calls.h" namespace NEO { diff --git a/core/os_interface/linux/hw_info_config.cpp b/core/os_interface/linux/hw_info_config.cpp index 8740790d60..9a69c8a5c7 100644 --- a/core/os_interface/linux/hw_info_config.cpp +++ b/core/os_interface/linux/hw_info_config.cpp @@ -5,17 +5,17 @@ * */ -#include "core/os_interface/hw_info_config.h" +#include "os_interface/hw_info_config.h" -#include "core/command_stream/preemption.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/hw_cmds.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/hw_info.h" -#include "core/memory_manager/memory_constants.h" -#include "core/os_interface/linux/drm_neo.h" -#include "core/os_interface/linux/os_interface.h" -#include "core/utilities/cpu_info.h" +#include "command_stream/preemption.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/hw_cmds.h" +#include "helpers/hw_helper.h" +#include "helpers/hw_info.h" +#include "memory_manager/memory_constants.h" +#include "os_interface/linux/drm_neo.h" +#include "os_interface/linux/os_interface.h" +#include "utilities/cpu_info.h" #include "instrumentation.h" diff --git a/core/os_interface/linux/linux_inc.cpp b/core/os_interface/linux/linux_inc.cpp index 5dfc30c647..c0730ef5bc 100644 --- a/core/os_interface/linux/linux_inc.cpp +++ b/core/os_interface/linux/linux_inc.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/os_inc.h" +#include "os_interface/linux/os_inc.h" namespace Os { const char *fileSeparator = "/"; } diff --git a/core/os_interface/linux/os_context_linux.cpp b/core/os_interface/linux/os_context_linux.cpp index 66f5875399..32a8388aa0 100644 --- a/core/os_interface/linux/os_context_linux.cpp +++ b/core/os_interface/linux/os_context_linux.cpp @@ -5,11 +5,11 @@ * */ -#include "core/os_interface/linux/os_context_linux.h" +#include "os_interface/linux/os_context_linux.h" -#include "core/os_interface/linux/drm_neo.h" -#include "core/os_interface/linux/os_interface.h" -#include "core/os_interface/os_context.h" +#include "os_interface/linux/drm_neo.h" +#include "os_interface/linux/os_interface.h" +#include "os_interface/os_context.h" namespace NEO { diff --git a/core/os_interface/linux/os_context_linux.h b/core/os_interface/linux/os_context_linux.h index 465597e2c1..8063830766 100644 --- a/core/os_interface/linux/os_context_linux.h +++ b/core/os_interface/linux/os_context_linux.h @@ -7,7 +7,7 @@ #pragma once -#include "core/os_interface/os_context.h" +#include "os_interface/os_context.h" #include diff --git a/core/os_interface/linux/os_interface.cpp b/core/os_interface/linux/os_interface.cpp index 86e5abd1c6..0ace603054 100644 --- a/core/os_interface/linux/os_interface.cpp +++ b/core/os_interface/linux/os_interface.cpp @@ -5,13 +5,13 @@ * */ -#include "core/os_interface/linux/os_interface.h" +#include "os_interface/linux/os_interface.h" -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/os_interface/hw_info_config.h" -#include "core/os_interface/linux/drm_memory_operations_handler.h" -#include "core/os_interface/linux/drm_neo.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "os_interface/hw_info_config.h" +#include "os_interface/linux/drm_memory_operations_handler.h" +#include "os_interface/linux/drm_neo.h" namespace NEO { diff --git a/core/os_interface/linux/os_interface.h b/core/os_interface/linux/os_interface.h index e8227649b7..7b18280836 100644 --- a/core/os_interface/linux/os_interface.h +++ b/core/os_interface/linux/os_interface.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/os_interface.h" +#include "os_interface/os_interface.h" #include diff --git a/core/os_interface/linux/os_library_linux.cpp b/core/os_interface/linux/os_library_linux.cpp index 5e6488c4a9..4f0fe11c66 100644 --- a/core/os_interface/linux/os_library_linux.cpp +++ b/core/os_interface/linux/os_library_linux.cpp @@ -5,9 +5,9 @@ * */ -#include "core/os_interface/linux/os_library_linux.h" +#include "os_interface/linux/os_library_linux.h" -#include "core/helpers/debug_helpers.h" +#include "helpers/debug_helpers.h" #include diff --git a/core/os_interface/linux/os_library_linux.h b/core/os_interface/linux/os_library_linux.h index e6a22235a2..fe36466d4b 100644 --- a/core/os_interface/linux/os_library_linux.h +++ b/core/os_interface/linux/os_library_linux.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" namespace NEO { namespace Linux { diff --git a/core/os_interface/linux/os_memory_linux.cpp b/core/os_interface/linux/os_memory_linux.cpp index d085d03145..7b0f7564a9 100644 --- a/core/os_interface/linux/os_memory_linux.cpp +++ b/core/os_interface/linux/os_memory_linux.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/os_memory_linux.h" +#include "os_interface/linux/os_memory_linux.h" namespace NEO { diff --git a/core/os_interface/linux/os_memory_linux.h b/core/os_interface/linux/os_memory_linux.h index 074fea2bd5..410e054239 100644 --- a/core/os_interface/linux/os_memory_linux.h +++ b/core/os_interface/linux/os_memory_linux.h @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_memory.h" +#include "os_interface/os_memory.h" #include #include diff --git a/core/os_interface/linux/os_thread_linux.cpp b/core/os_interface/linux/os_thread_linux.cpp index 1a8a049542..609cbdffe8 100644 --- a/core/os_interface/linux/os_thread_linux.cpp +++ b/core/os_interface/linux/os_thread_linux.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/os_thread_linux.h" +#include "os_interface/linux/os_thread_linux.h" namespace NEO { ThreadLinux::ThreadLinux(pthread_t threadId) : threadId(threadId){}; diff --git a/core/os_interface/linux/os_thread_linux.h b/core/os_interface/linux/os_thread_linux.h index 52cf4011d8..4010774191 100644 --- a/core/os_interface/linux/os_thread_linux.h +++ b/core/os_interface/linux/os_thread_linux.h @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_thread.h" +#include "os_interface/os_thread.h" #include diff --git a/core/os_interface/linux/os_time_linux.cpp b/core/os_interface/linux/os_time_linux.cpp index 44034b65b9..559126409e 100644 --- a/core/os_interface/linux/os_time_linux.cpp +++ b/core/os_interface/linux/os_time_linux.cpp @@ -5,10 +5,10 @@ * */ -#include "core/os_interface/linux/os_time_linux.h" +#include "os_interface/linux/os_time_linux.h" -#include "core/os_interface/linux/drm_neo.h" -#include "core/os_interface/linux/os_interface.h" +#include "os_interface/linux/drm_neo.h" +#include "os_interface/linux/os_interface.h" #include "drm/i915_drm.h" diff --git a/core/os_interface/linux/os_time_linux.h b/core/os_interface/linux/os_time_linux.h index 80734ce056..e9e4c59008 100644 --- a/core/os_interface/linux/os_time_linux.h +++ b/core/os_interface/linux/os_time_linux.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/os_interface/linux/drm_neo.h" -#include "core/os_interface/os_time.h" +#include "os_interface/linux/drm_neo.h" +#include "os_interface/os_time.h" #define OCLRT_NUM_TIMESTAMP_BITS (36) #define OCLRT_NUM_TIMESTAMP_BITS_FALLBACK (32) diff --git a/core/os_interface/linux/page_table_manager_functions.cpp b/core/os_interface/linux/page_table_manager_functions.cpp index 29a4038bcb..268a14e9e4 100644 --- a/core/os_interface/linux/page_table_manager_functions.cpp +++ b/core/os_interface/linux/page_table_manager_functions.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/page_table_mngr.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/page_table_mngr.h" #include "opencl/source/platform/platform.h" #include "gmm_client_context.h" diff --git a/core/os_interface/linux/print.cpp b/core/os_interface/linux/print.cpp index 563263a254..e530509470 100644 --- a/core/os_interface/linux/print.cpp +++ b/core/os_interface/linux/print.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/print.h" +#include "os_interface/print.h" #include #include diff --git a/core/os_interface/linux/sys_calls_linux.cpp b/core/os_interface/linux/sys_calls_linux.cpp index 121b16bd23..b87b4b13dc 100644 --- a/core/os_interface/linux/sys_calls_linux.cpp +++ b/core/os_interface/linux/sys_calls_linux.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/sys_calls.h" +#include "os_interface/linux/sys_calls.h" #include #include diff --git a/core/os_interface/os_context.h b/core/os_interface/os_context.h index 164fa6a67a..ccb6bab116 100644 --- a/core/os_interface/os_context.h +++ b/core/os_interface/os_context.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/command_stream/preemption_mode.h" -#include "core/helpers/common_types.h" -#include "core/utilities/reference_tracked_object.h" +#include "command_stream/preemption_mode.h" +#include "helpers/common_types.h" +#include "utilities/reference_tracked_object.h" #include "engine_node.h" diff --git a/core/os_interface/os_time.cpp b/core/os_interface/os_time.cpp index 78060168ef..dc1b5e7497 100644 --- a/core/os_interface/os_time.cpp +++ b/core/os_interface/os_time.cpp @@ -5,9 +5,9 @@ * */ -#include "core/os_interface/os_time.h" +#include "os_interface/os_time.h" -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" namespace NEO { diff --git a/core/os_interface/windows/debug_registry_reader.cpp b/core/os_interface/windows/debug_registry_reader.cpp index d52aa3a09f..c3ff125de2 100644 --- a/core/os_interface/windows/debug_registry_reader.cpp +++ b/core/os_interface/windows/debug_registry_reader.cpp @@ -5,11 +5,11 @@ * */ -#include "core/os_interface/windows/debug_registry_reader.h" +#include "os_interface/windows/debug_registry_reader.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/os_interface/windows/windows_wrapper.h" -#include "core/utilities/debug_settings_reader.h" +#include "debug_settings/debug_settings_manager.h" +#include "os_interface/windows/windows_wrapper.h" +#include "utilities/debug_settings_reader.h" #include diff --git a/core/os_interface/windows/debug_registry_reader.h b/core/os_interface/windows/debug_registry_reader.h index b5e673288c..8b3bf4fe23 100644 --- a/core/os_interface/windows/debug_registry_reader.h +++ b/core/os_interface/windows/debug_registry_reader.h @@ -7,7 +7,7 @@ #pragma once -#include "core/utilities/debug_settings_reader.h" +#include "utilities/debug_settings_reader.h" #include diff --git a/core/os_interface/windows/deferrable_deletion_win.cpp b/core/os_interface/windows/deferrable_deletion_win.cpp index a3ddcbfee1..510c729b19 100644 --- a/core/os_interface/windows/deferrable_deletion_win.cpp +++ b/core/os_interface/windows/deferrable_deletion_win.cpp @@ -5,9 +5,9 @@ * */ -#include "core/os_interface/windows/deferrable_deletion_win.h" +#include "os_interface/windows/deferrable_deletion_win.h" -#include "core/os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/wddm/wddm.h" namespace NEO { diff --git a/core/os_interface/windows/deferrable_deletion_win.h b/core/os_interface/windows/deferrable_deletion_win.h index a8a75c0a48..70ee39d4d8 100644 --- a/core/os_interface/windows/deferrable_deletion_win.h +++ b/core/os_interface/windows/deferrable_deletion_win.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/memory_manager/deferrable_deletion.h" -#include "core/os_interface/os_context.h" -#include "core/os_interface/windows/windows_wrapper.h" +#include "memory_manager/deferrable_deletion.h" +#include "os_interface/os_context.h" +#include "os_interface/windows/windows_wrapper.h" #include diff --git a/core/os_interface/windows/gdi_interface.cpp b/core/os_interface/windows/gdi_interface.cpp index 2bd3ac62da..c6aa98d3a4 100644 --- a/core/os_interface/windows/gdi_interface.cpp +++ b/core/os_interface/windows/gdi_interface.cpp @@ -5,9 +5,9 @@ * */ -#include "core/os_interface/windows/gdi_interface.h" +#include "os_interface/windows/gdi_interface.h" -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" namespace NEO { diff --git a/core/os_interface/windows/gdi_interface.h b/core/os_interface/windows/gdi_interface.h index 43d0300d5c..43adc7c3d8 100644 --- a/core/os_interface/windows/gdi_interface.h +++ b/core/os_interface/windows/gdi_interface.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/os_interface/windows/os_inc.h" -#include "core/os_interface/windows/os_library_win.h" -#include "core/os_interface/windows/thk_wrapper.h" +#include "os_interface/windows/os_inc.h" +#include "os_interface/windows/os_library_win.h" +#include "os_interface/windows/thk_wrapper.h" #include diff --git a/core/os_interface/windows/gmm_interface_win.cpp b/core/os_interface/windows/gmm_interface_win.cpp index 4f7ca82118..f598b3cff8 100644 --- a/core/os_interface/windows/gmm_interface_win.cpp +++ b/core/os_interface/windows/gmm_interface_win.cpp @@ -5,9 +5,9 @@ * */ -#include "core/gmm_helper/gmm_interface.h" -#include "core/helpers/debug_helpers.h" -#include "core/os_interface/os_library.h" +#include "gmm_helper/gmm_interface.h" +#include "helpers/debug_helpers.h" +#include "os_interface/os_library.h" #include diff --git a/core/os_interface/windows/hw_device_id.h b/core/os_interface/windows/hw_device_id.h index e9c2a3ac88..fe088c4f43 100644 --- a/core/os_interface/windows/hw_device_id.h +++ b/core/os_interface/windows/hw_device_id.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/non_copyable_or_moveable.h" -#include "core/os_interface/windows/windows_wrapper.h" +#include "helpers/non_copyable_or_moveable.h" +#include "os_interface/windows/windows_wrapper.h" #include diff --git a/core/os_interface/windows/hw_device_id_win.cpp b/core/os_interface/windows/hw_device_id_win.cpp index caca707f2a..44c271904c 100644 --- a/core/os_interface/windows/hw_device_id_win.cpp +++ b/core/os_interface/windows/hw_device_id_win.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/debug_helpers.h" -#include "core/os_interface/windows/gdi_interface.h" -#include "core/os_interface/windows/hw_device_id.h" +#include "helpers/debug_helpers.h" +#include "os_interface/windows/gdi_interface.h" +#include "os_interface/windows/hw_device_id.h" namespace NEO { HwDeviceId::~HwDeviceId() { diff --git a/core/os_interface/windows/hw_info_config.cpp b/core/os_interface/windows/hw_info_config.cpp index ccc38e12ed..4d33ee10be 100644 --- a/core/os_interface/windows/hw_info_config.cpp +++ b/core/os_interface/windows/hw_info_config.cpp @@ -5,14 +5,14 @@ * */ -#include "core/os_interface/hw_info_config.h" +#include "os_interface/hw_info_config.h" -#include "core/command_stream/preemption.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/hw_cmds.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/hw_info.h" -#include "core/memory_manager/memory_constants.h" +#include "command_stream/preemption.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/hw_cmds.h" +#include "helpers/hw_helper.h" +#include "helpers/hw_info.h" +#include "memory_manager/memory_constants.h" #include "instrumentation.h" diff --git a/core/os_interface/windows/kmdaf_listener.cpp b/core/os_interface/windows/kmdaf_listener.cpp index 03a2c0e8c5..87cace98bc 100644 --- a/core/os_interface/windows/kmdaf_listener.cpp +++ b/core/os_interface/windows/kmdaf_listener.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/kmdaf_listener.h" +#include "os_interface/windows/kmdaf_listener.h" #pragma warning(push) // save the current state #pragma warning(disable : 4189) // disable warning 4189 (unused local variable) #include "kmdaf.h" diff --git a/core/os_interface/windows/kmdaf_listener.h b/core/os_interface/windows/kmdaf_listener.h index 8020961dbc..c3ac625981 100644 --- a/core/os_interface/windows/kmdaf_listener.h +++ b/core/os_interface/windows/kmdaf_listener.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/windows/windows_wrapper.h" +#include "os_interface/windows/windows_wrapper.h" #include diff --git a/core/os_interface/windows/kmdaf_listener_stub.cpp b/core/os_interface/windows/kmdaf_listener_stub.cpp index d5e9d65b0e..68ea21b3b6 100644 --- a/core/os_interface/windows/kmdaf_listener_stub.cpp +++ b/core/os_interface/windows/kmdaf_listener_stub.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/kmdaf_listener.h" +#include "os_interface/windows/kmdaf_listener.h" namespace NEO { diff --git a/core/os_interface/windows/os_context_win.cpp b/core/os_interface/windows/os_context_win.cpp index 0f88b4e678..7848f7ab2e 100644 --- a/core/os_interface/windows/os_context_win.cpp +++ b/core/os_interface/windows/os_context_win.cpp @@ -5,11 +5,11 @@ * */ -#include "core/os_interface/windows/os_context_win.h" +#include "os_interface/windows/os_context_win.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm/wddm.h" -#include "core/os_interface/windows/wddm/wddm_interface.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/wddm/wddm_interface.h" namespace NEO { diff --git a/core/os_interface/windows/os_context_win.h b/core/os_interface/windows/os_context_win.h index b0a8b53bda..b1990aa0b6 100644 --- a/core/os_interface/windows/os_context_win.h +++ b/core/os_interface/windows/os_context_win.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/os_interface/os_context.h" -#include "core/os_interface/windows/wddm_residency_controller.h" +#include "os_interface/os_context.h" +#include "os_interface/windows/wddm_residency_controller.h" namespace NEO { diff --git a/core/os_interface/windows/os_interface.cpp b/core/os_interface/windows/os_interface.cpp index 2c121265ad..1300264d78 100644 --- a/core/os_interface/windows/os_interface.cpp +++ b/core/os_interface/windows/os_interface.cpp @@ -5,12 +5,12 @@ * */ -#include "core/os_interface/windows/os_interface.h" +#include "os_interface/windows/os_interface.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/os_interface/windows/sys_calls.h" -#include "core/os_interface/windows/wddm/wddm.h" -#include "core/os_interface/windows/wddm_memory_operations_handler.h" +#include "execution_environment/root_device_environment.h" +#include "os_interface/windows/sys_calls.h" +#include "os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/wddm_memory_operations_handler.h" namespace NEO { diff --git a/core/os_interface/windows/os_interface.h b/core/os_interface/windows/os_interface.h index fb2a67894f..444aecd09e 100644 --- a/core/os_interface/windows/os_interface.h +++ b/core/os_interface/windows/os_interface.h @@ -7,9 +7,9 @@ #pragma once -#include "core/os_interface/os_interface.h" -#include "core/os_interface/windows/wddm/wddm.h" -#include "core/os_interface/windows/windows_wrapper.h" +#include "os_interface/os_interface.h" +#include "os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/windows_wrapper.h" #include "profileapi.h" #include "umKmInc/sharedata.h" diff --git a/core/os_interface/windows/os_library_win.cpp b/core/os_interface/windows/os_library_win.cpp index 3d8e96e26a..b50f745f5f 100644 --- a/core/os_interface/windows/os_library_win.cpp +++ b/core/os_interface/windows/os_library_win.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/os_library_win.h" +#include "os_interface/windows/os_library_win.h" namespace NEO { diff --git a/core/os_interface/windows/os_library_win.h b/core/os_interface/windows/os_library_win.h index 1561c0cbe4..f4b722f57e 100644 --- a/core/os_interface/windows/os_library_win.h +++ b/core/os_interface/windows/os_library_win.h @@ -6,10 +6,10 @@ */ #pragma once -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #define UMDF_USING_NTSTATUS -#include "core/os_interface/windows/windows_wrapper.h" +#include "os_interface/windows/windows_wrapper.h" namespace NEO { namespace Windows { diff --git a/core/os_interface/windows/os_memory_win.cpp b/core/os_interface/windows/os_memory_win.cpp index a79c43f142..f57da870b8 100644 --- a/core/os_interface/windows/os_memory_win.cpp +++ b/core/os_interface/windows/os_memory_win.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/os_memory_win.h" +#include "os_interface/windows/os_memory_win.h" namespace NEO { diff --git a/core/os_interface/windows/os_memory_win.h b/core/os_interface/windows/os_memory_win.h index 3c5819e712..87ad722b90 100644 --- a/core/os_interface/windows/os_memory_win.h +++ b/core/os_interface/windows/os_memory_win.h @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_memory.h" +#include "os_interface/os_memory.h" #include diff --git a/core/os_interface/windows/os_thread_win.cpp b/core/os_interface/windows/os_thread_win.cpp index f49412b1ff..0d2376c1ae 100644 --- a/core/os_interface/windows/os_thread_win.cpp +++ b/core/os_interface/windows/os_thread_win.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/os_thread_win.h" +#include "os_interface/windows/os_thread_win.h" namespace NEO { ThreadWin::ThreadWin(std::thread *thread) { this->thread.reset(thread); diff --git a/core/os_interface/windows/os_thread_win.h b/core/os_interface/windows/os_thread_win.h index 8da3a8748b..c19601ecae 100644 --- a/core/os_interface/windows/os_thread_win.h +++ b/core/os_interface/windows/os_thread_win.h @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_thread.h" +#include "os_interface/os_thread.h" #include diff --git a/core/os_interface/windows/os_time_win.cpp b/core/os_interface/windows/os_time_win.cpp index 3125ac9afa..cb2c60f1d7 100644 --- a/core/os_interface/windows/os_time_win.cpp +++ b/core/os_interface/windows/os_time_win.cpp @@ -5,10 +5,10 @@ * */ -#include "core/os_interface/windows/os_time_win.h" +#include "os_interface/windows/os_time_win.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm/wddm.h" #include diff --git a/core/os_interface/windows/os_time_win.h b/core/os_interface/windows/os_time_win.h index eda0d1f2d2..08269a7e34 100644 --- a/core/os_interface/windows/os_time_win.h +++ b/core/os_interface/windows/os_time_win.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/os_interface/os_time.h" -#include "core/os_interface/windows/windows_wrapper.h" +#include "os_interface/os_time.h" +#include "os_interface/windows/windows_wrapper.h" #include "gfxEscape.h" diff --git a/core/os_interface/windows/page_table_manager_functions.cpp b/core/os_interface/windows/page_table_manager_functions.cpp index 8d6bb89aab..1e082aa149 100644 --- a/core/os_interface/windows/page_table_manager_functions.cpp +++ b/core/os_interface/windows/page_table_manager_functions.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/page_table_mngr.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/page_table_mngr.h" #include "opencl/source/platform/platform.h" #include "gmm_client_context.h" diff --git a/core/os_interface/windows/print.cpp b/core/os_interface/windows/print.cpp index 0c0e3b9bb9..7e5d4658b5 100644 --- a/core/os_interface/windows/print.cpp +++ b/core/os_interface/windows/print.cpp @@ -5,9 +5,9 @@ * */ -#include "core/os_interface/print.h" +#include "os_interface/print.h" -#include "core/os_interface/windows/windows_wrapper.h" +#include "os_interface/windows/windows_wrapper.h" #include #include diff --git a/core/os_interface/windows/sys_calls.cpp b/core/os_interface/windows/sys_calls.cpp index 98b920ee86..dca2584aad 100644 --- a/core/os_interface/windows/sys_calls.cpp +++ b/core/os_interface/windows/sys_calls.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/sys_calls.h" +#include "os_interface/windows/sys_calls.h" namespace NEO { diff --git a/core/os_interface/windows/thk_wrapper.h b/core/os_interface/windows/thk_wrapper.h index 0bb271370a..2ee8298dd6 100644 --- a/core/os_interface/windows/thk_wrapper.h +++ b/core/os_interface/windows/thk_wrapper.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/options.h" -#include "core/utilities/api_intercept.h" +#include "helpers/options.h" +#include "utilities/api_intercept.h" #include diff --git a/core/os_interface/windows/wddm/wddm.cpp b/core/os_interface/windows/wddm/wddm.cpp index 8cfe504f42..dc7b2ca02a 100644 --- a/core/os_interface/windows/wddm/wddm.cpp +++ b/core/os_interface/windows/wddm/wddm.cpp @@ -5,29 +5,29 @@ * */ -#include "core/os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/wddm/wddm.h" -#include "core/command_stream/preemption.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/page_table_mngr.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/interlocked_max.h" -#include "core/helpers/windows/gmm_callbacks.h" -#include "core/os_interface/hw_info_config.h" -#include "core/os_interface/windows/debug_registry_reader.h" -#include "core/os_interface/windows/gdi_interface.h" -#include "core/os_interface/windows/kmdaf_listener.h" -#include "core/os_interface/windows/os_context_win.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/sys_calls.h" -#include "core/os_interface/windows/wddm/wddm_interface.h" -#include "core/os_interface/windows/wddm_allocation.h" -#include "core/os_interface/windows/wddm_engine_mapper.h" -#include "core/os_interface/windows/wddm_residency_allocations_container.h" -#include "core/sku_info/operations/windows/sku_info_receiver.h" -#include "core/utilities/stackvec.h" +#include "command_stream/preemption.h" +#include "execution_environment/root_device_environment.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/page_table_mngr.h" +#include "gmm_helper/resource_info.h" +#include "helpers/interlocked_max.h" +#include "helpers/windows/gmm_callbacks.h" +#include "os_interface/hw_info_config.h" +#include "os_interface/windows/debug_registry_reader.h" +#include "os_interface/windows/gdi_interface.h" +#include "os_interface/windows/kmdaf_listener.h" +#include "os_interface/windows/os_context_win.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/sys_calls.h" +#include "os_interface/windows/wddm/wddm_interface.h" +#include "os_interface/windows/wddm_allocation.h" +#include "os_interface/windows/wddm_engine_mapper.h" +#include "os_interface/windows/wddm_residency_allocations_container.h" +#include "sku_info/operations/windows/sku_info_receiver.h" +#include "utilities/stackvec.h" #include "gmm_memory.h" diff --git a/core/os_interface/windows/wddm/wddm.h b/core/os_interface/windows/wddm/wddm.h index 2098acb463..bd20679146 100644 --- a/core/os_interface/windows/wddm/wddm.h +++ b/core/os_interface/windows/wddm/wddm.h @@ -6,14 +6,14 @@ */ #pragma once -#include "core/command_stream/preemption_mode.h" -#include "core/gmm_helper/gmm_lib.h" -#include "core/helpers/debug_helpers.h" -#include "core/memory_manager/gfx_partition.h" -#include "core/os_interface/os_context.h" -#include "core/os_interface/windows/hw_device_id.h" -#include "core/os_interface/windows/wddm/wddm_defs.h" -#include "core/utilities/spinlock.h" +#include "command_stream/preemption_mode.h" +#include "gmm_helper/gmm_lib.h" +#include "helpers/debug_helpers.h" +#include "memory_manager/gfx_partition.h" +#include "os_interface/os_context.h" +#include "os_interface/windows/hw_device_id.h" +#include "os_interface/windows/wddm/wddm_defs.h" +#include "utilities/spinlock.h" #include "sku_info.h" diff --git a/core/os_interface/windows/wddm/wddm_calls.cpp b/core/os_interface/windows/wddm/wddm_calls.cpp index 24d6ce797c..7c43da1dea 100644 --- a/core/os_interface/windows/wddm/wddm_calls.cpp +++ b/core/os_interface/windows/wddm/wddm_calls.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/wddm/wddm.h" #include diff --git a/core/os_interface/windows/wddm/wddm_create.cpp b/core/os_interface/windows/wddm/wddm_create.cpp index 4a3daec0dd..71fad19ce5 100644 --- a/core/os_interface/windows/wddm/wddm_create.cpp +++ b/core/os_interface/windows/wddm/wddm_create.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/wddm/wddm.h" namespace NEO { Wddm *Wddm::createWddm(std::unique_ptr hwDeviceId, RootDeviceEnvironment &rootDeviceEnvironment) { diff --git a/core/os_interface/windows/wddm/wddm_defs.h b/core/os_interface/windows/wddm/wddm_defs.h index ce04a3da60..c1ad4c6efd 100644 --- a/core/os_interface/windows/wddm/wddm_defs.h +++ b/core/os_interface/windows/wddm/wddm_defs.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/windows/windows_defs.h" +#include "os_interface/windows/windows_defs.h" #include diff --git a/core/os_interface/windows/wddm/wddm_interface.cpp b/core/os_interface/windows/wddm/wddm_interface.cpp index f37c21382b..f9dd4465f4 100644 --- a/core/os_interface/windows/wddm/wddm_interface.cpp +++ b/core/os_interface/windows/wddm/wddm_interface.cpp @@ -5,12 +5,12 @@ * */ -#include "core/os_interface/windows/wddm/wddm_interface.h" +#include "os_interface/windows/wddm/wddm_interface.h" -#include "core/memory_manager/memory_constants.h" -#include "core/os_interface/windows/gdi_interface.h" -#include "core/os_interface/windows/os_context_win.h" -#include "core/os_interface/windows/wddm/wddm.h" +#include "memory_manager/memory_constants.h" +#include "os_interface/windows/gdi_interface.h" +#include "os_interface/windows/os_context_win.h" +#include "os_interface/windows/wddm/wddm.h" using namespace NEO; diff --git a/core/os_interface/windows/wddm/wddm_interface.h b/core/os_interface/windows/wddm/wddm_interface.h index b9ee7575e8..bffd39eb09 100644 --- a/core/os_interface/windows/wddm/wddm_interface.h +++ b/core/os_interface/windows/wddm/wddm_interface.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/helpers/hw_info.h" -#include "core/os_interface/os_context.h" -#include "core/os_interface/windows/windows_wrapper.h" +#include "helpers/hw_info.h" +#include "os_interface/os_context.h" +#include "os_interface/windows/windows_wrapper.h" #include diff --git a/core/os_interface/windows/wddm_additional_context_flags.cpp b/core/os_interface/windows/wddm_additional_context_flags.cpp index 7bf88fce2a..422e4aae0f 100644 --- a/core/os_interface/windows/wddm_additional_context_flags.cpp +++ b/core/os_interface/windows/wddm_additional_context_flags.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/wddm/wddm.h" namespace NEO { void Wddm::applyAdditionalContextFlags(CREATECONTEXT_PVTDATA &privateData, OsContextWin &osContext) { diff --git a/core/os_interface/windows/wddm_allocation.cpp b/core/os_interface/windows/wddm_allocation.cpp index e0d35f0305..2b8cf9dbd0 100644 --- a/core/os_interface/windows/wddm_allocation.cpp +++ b/core/os_interface/windows/wddm_allocation.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/wddm_allocation.h" +#include "os_interface/windows/wddm_allocation.h" namespace NEO { std::string WddmAllocation::getAllocationInfoString() const { diff --git a/core/os_interface/windows/wddm_allocation.h b/core/os_interface/windows/wddm_allocation.h index 3c74b14a63..7b46477172 100644 --- a/core/os_interface/windows/wddm_allocation.h +++ b/core/os_interface/windows/wddm_allocation.h @@ -7,10 +7,10 @@ #pragma once #define UMDF_USING_NTSTATUS -#include "core/helpers/aligned_memory.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/residency.h" -#include "core/os_interface/windows/windows_wrapper.h" +#include "helpers/aligned_memory.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/residency.h" +#include "os_interface/windows/windows_wrapper.h" #include diff --git a/core/os_interface/windows/wddm_engine_mapper.cpp b/core/os_interface/windows/wddm_engine_mapper.cpp index 24982452f9..a8a4adc02e 100644 --- a/core/os_interface/windows/wddm_engine_mapper.cpp +++ b/core/os_interface/windows/wddm_engine_mapper.cpp @@ -5,9 +5,9 @@ * */ -#include "core/os_interface/windows/wddm_engine_mapper.h" +#include "os_interface/windows/wddm_engine_mapper.h" -#include "core/helpers/debug_helpers.h" +#include "helpers/debug_helpers.h" namespace NEO { diff --git a/core/os_interface/windows/wddm_engine_mapper.h b/core/os_interface/windows/wddm_engine_mapper.h index ca931522c0..40cdd1bf78 100644 --- a/core/os_interface/windows/wddm_engine_mapper.h +++ b/core/os_interface/windows/wddm_engine_mapper.h @@ -7,7 +7,7 @@ #pragma once -#include "core/gmm_helper/gmm_lib.h" +#include "gmm_helper/gmm_lib.h" #include "engine_node.h" diff --git a/core/os_interface/windows/wddm_memory_manager.cpp b/core/os_interface/windows/wddm_memory_manager.cpp index d25303ea70..71e3c28520 100644 --- a/core/os_interface/windows/wddm_memory_manager.cpp +++ b/core/os_interface/windows/wddm_memory_manager.cpp @@ -5,29 +5,29 @@ * */ -#include "core/os_interface/windows/wddm_memory_manager.h" +#include "os_interface/windows/wddm_memory_manager.h" -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/page_table_mngr.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/deferred_deleter_helper.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/surface_format_info.h" -#include "core/memory_manager/deferrable_deletion.h" -#include "core/memory_manager/deferred_deleter.h" -#include "core/memory_manager/host_ptr_manager.h" -#include "core/memory_manager/memory_operations_handler.h" -#include "core/os_interface/os_interface.h" -#include "core/os_interface/windows/os_context_win.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm/wddm.h" -#include "core/os_interface/windows/wddm_allocation.h" -#include "core/os_interface/windows/wddm_residency_allocations_container.h" -#include "core/os_interface/windows/wddm_residency_controller.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "execution_environment/root_device_environment.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/page_table_mngr.h" +#include "gmm_helper/resource_info.h" +#include "helpers/aligned_memory.h" +#include "helpers/deferred_deleter_helper.h" +#include "helpers/ptr_math.h" +#include "helpers/surface_format_info.h" +#include "memory_manager/deferrable_deletion.h" +#include "memory_manager/deferred_deleter.h" +#include "memory_manager/host_ptr_manager.h" +#include "memory_manager/memory_operations_handler.h" +#include "os_interface/os_interface.h" +#include "os_interface/windows/os_context_win.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/wddm_allocation.h" +#include "os_interface/windows/wddm_residency_allocations_container.h" +#include "os_interface/windows/wddm_residency_controller.h" #include diff --git a/core/os_interface/windows/wddm_memory_manager.h b/core/os_interface/windows/wddm_memory_manager.h index a8d1ec962b..2b9c9a9f87 100644 --- a/core/os_interface/windows/wddm_memory_manager.h +++ b/core/os_interface/windows/wddm_memory_manager.h @@ -6,11 +6,11 @@ */ #pragma once -#include "core/helpers/aligned_memory.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/os_context.h" -#include "core/os_interface/windows/wddm_allocation.h" -#include "core/os_interface/windows/windows_wrapper.h" +#include "helpers/aligned_memory.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/os_context.h" +#include "os_interface/windows/wddm_allocation.h" +#include "os_interface/windows/windows_wrapper.h" #include diff --git a/core/os_interface/windows/wddm_memory_manager_allocate_in_device_pool.cpp b/core/os_interface/windows/wddm_memory_manager_allocate_in_device_pool.cpp index 5325fee665..b901c2f306 100644 --- a/core/os_interface/windows/wddm_memory_manager_allocate_in_device_pool.cpp +++ b/core/os_interface/windows/wddm_memory_manager_allocate_in_device_pool.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/basic_math.h" -#include "core/os_interface/windows/wddm_memory_manager.h" +#include "helpers/basic_math.h" +#include "os_interface/windows/wddm_memory_manager.h" namespace NEO { GraphicsAllocation *WddmMemoryManager::allocateGraphicsMemoryInDevicePool(const AllocationData &allocationData, AllocationStatus &status) { diff --git a/core/os_interface/windows/wddm_memory_operations_handler.cpp b/core/os_interface/windows/wddm_memory_operations_handler.cpp index b280ff7510..a9e2f8d78d 100644 --- a/core/os_interface/windows/wddm_memory_operations_handler.cpp +++ b/core/os_interface/windows/wddm_memory_operations_handler.cpp @@ -5,12 +5,12 @@ * */ -#include "core/os_interface/windows/wddm_memory_operations_handler.h" +#include "os_interface/windows/wddm_memory_operations_handler.h" -#include "core/memory_manager/host_ptr_defines.h" -#include "core/os_interface/windows/wddm_allocation.h" -#include "core/os_interface/windows/wddm_residency_allocations_container.h" -#include "core/utilities/stackvec.h" +#include "memory_manager/host_ptr_defines.h" +#include "os_interface/windows/wddm_allocation.h" +#include "os_interface/windows/wddm_residency_allocations_container.h" +#include "utilities/stackvec.h" namespace NEO { diff --git a/core/os_interface/windows/wddm_memory_operations_handler.h b/core/os_interface/windows/wddm_memory_operations_handler.h index d3811ce0ff..0b6bec3763 100644 --- a/core/os_interface/windows/wddm_memory_operations_handler.h +++ b/core/os_interface/windows/wddm_memory_operations_handler.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/memory_operations_handler.h" +#include "memory_manager/memory_operations_handler.h" #include diff --git a/core/os_interface/windows/wddm_residency_allocations_container.cpp b/core/os_interface/windows/wddm_residency_allocations_container.cpp index 6993798dfb..266a1cab40 100644 --- a/core/os_interface/windows/wddm_residency_allocations_container.cpp +++ b/core/os_interface/windows/wddm_residency_allocations_container.cpp @@ -5,10 +5,10 @@ * */ -#include "core/os_interface/windows/wddm_residency_allocations_container.h" +#include "os_interface/windows/wddm_residency_allocations_container.h" -#include "core/os_interface/windows/wddm/wddm.h" -#include "core/os_interface/windows/wddm_allocation.h" +#include "os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/wddm_allocation.h" #include diff --git a/core/os_interface/windows/wddm_residency_allocations_container.h b/core/os_interface/windows/wddm_residency_allocations_container.h index 7278f1e847..43b0c0d639 100644 --- a/core/os_interface/windows/wddm_residency_allocations_container.h +++ b/core/os_interface/windows/wddm_residency_allocations_container.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/memory_manager/memory_operations_status.h" -#include "core/os_interface/windows/windows_defs.h" -#include "core/utilities/spinlock.h" +#include "memory_manager/memory_operations_status.h" +#include "os_interface/windows/windows_defs.h" +#include "utilities/spinlock.h" #include #include diff --git a/core/os_interface/windows/wddm_residency_controller.cpp b/core/os_interface/windows/wddm_residency_controller.cpp index c2a98c3dab..15223fa443 100644 --- a/core/os_interface/windows/wddm_residency_controller.cpp +++ b/core/os_interface/windows/wddm_residency_controller.cpp @@ -5,13 +5,13 @@ * */ -#include "core/os_interface/windows/wddm_residency_controller.h" +#include "os_interface/windows/wddm_residency_controller.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/os_interface/windows/wddm/wddm.h" -#include "core/os_interface/windows/wddm_allocation.h" -#include "core/os_interface/windows/wddm_residency_allocations_container.h" -#include "core/utilities/spinlock.h" +#include "debug_settings/debug_settings_manager.h" +#include "os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/wddm_allocation.h" +#include "os_interface/windows/wddm_residency_allocations_container.h" +#include "utilities/spinlock.h" namespace NEO { diff --git a/core/os_interface/windows/wddm_residency_controller.h b/core/os_interface/windows/wddm_residency_controller.h index 70548079e7..d3df6b5e26 100644 --- a/core/os_interface/windows/wddm_residency_controller.h +++ b/core/os_interface/windows/wddm_residency_controller.h @@ -7,10 +7,10 @@ #pragma once -#include "core/memory_manager/residency_container.h" -#include "core/os_interface/windows/windows_defs.h" -#include "core/os_interface/windows/windows_wrapper.h" -#include "core/utilities/spinlock.h" +#include "memory_manager/residency_container.h" +#include "os_interface/windows/windows_defs.h" +#include "os_interface/windows/windows_wrapper.h" +#include "utilities/spinlock.h" #include #include diff --git a/core/page_fault_manager/cpu_page_fault_manager.cpp b/core/page_fault_manager/cpu_page_fault_manager.cpp index 1280673ba0..1b79b882c2 100644 --- a/core/page_fault_manager/cpu_page_fault_manager.cpp +++ b/core/page_fault_manager/cpu_page_fault_manager.cpp @@ -5,12 +5,12 @@ * */ -#include "core/page_fault_manager/cpu_page_fault_manager.h" +#include "page_fault_manager/cpu_page_fault_manager.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/unified_memory_manager.h" +#include "helpers/debug_helpers.h" +#include "helpers/ptr_math.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/unified_memory_manager.h" #include diff --git a/core/page_fault_manager/cpu_page_fault_manager.h b/core/page_fault_manager/cpu_page_fault_manager.h index 70945fa1aa..ed7ca14312 100644 --- a/core/page_fault_manager/cpu_page_fault_manager.h +++ b/core/page_fault_manager/cpu_page_fault_manager.h @@ -7,8 +7,8 @@ #pragma once -#include "core/helpers/non_copyable_or_moveable.h" -#include "core/utilities/spinlock.h" +#include "helpers/non_copyable_or_moveable.h" +#include "utilities/spinlock.h" #include #include diff --git a/core/page_fault_manager/linux/cpu_page_fault_manager_linux.cpp b/core/page_fault_manager/linux/cpu_page_fault_manager_linux.cpp index 7c1039cbd3..2696084477 100644 --- a/core/page_fault_manager/linux/cpu_page_fault_manager_linux.cpp +++ b/core/page_fault_manager/linux/cpu_page_fault_manager_linux.cpp @@ -5,9 +5,9 @@ * */ -#include "core/page_fault_manager/linux/cpu_page_fault_manager_linux.h" +#include "page_fault_manager/linux/cpu_page_fault_manager_linux.h" -#include "core/helpers/debug_helpers.h" +#include "helpers/debug_helpers.h" #include diff --git a/core/page_fault_manager/linux/cpu_page_fault_manager_linux.h b/core/page_fault_manager/linux/cpu_page_fault_manager_linux.h index 9a305dae45..565999c180 100644 --- a/core/page_fault_manager/linux/cpu_page_fault_manager_linux.h +++ b/core/page_fault_manager/linux/cpu_page_fault_manager_linux.h @@ -7,7 +7,7 @@ #pragma once -#include "core/page_fault_manager/cpu_page_fault_manager.h" +#include "page_fault_manager/cpu_page_fault_manager.h" #include #include diff --git a/core/page_fault_manager/windows/cpu_page_fault_manager_windows.cpp b/core/page_fault_manager/windows/cpu_page_fault_manager_windows.cpp index bd4974beaa..e66821c010 100644 --- a/core/page_fault_manager/windows/cpu_page_fault_manager_windows.cpp +++ b/core/page_fault_manager/windows/cpu_page_fault_manager_windows.cpp @@ -5,9 +5,9 @@ * */ -#include "core/page_fault_manager/windows/cpu_page_fault_manager_windows.h" +#include "page_fault_manager/windows/cpu_page_fault_manager_windows.h" -#include "core/helpers/debug_helpers.h" +#include "helpers/debug_helpers.h" namespace NEO { std::unique_ptr PageFaultManager::create() { diff --git a/core/page_fault_manager/windows/cpu_page_fault_manager_windows.h b/core/page_fault_manager/windows/cpu_page_fault_manager_windows.h index 2b752640b3..a170e7efef 100644 --- a/core/page_fault_manager/windows/cpu_page_fault_manager_windows.h +++ b/core/page_fault_manager/windows/cpu_page_fault_manager_windows.h @@ -7,7 +7,7 @@ #pragma once -#include "core/page_fault_manager/cpu_page_fault_manager.h" +#include "page_fault_manager/cpu_page_fault_manager.h" #include diff --git a/core/program/print_formatter.cpp b/core/program/print_formatter.cpp index 77c19b9c1e..52e4548155 100644 --- a/core/program/print_formatter.cpp +++ b/core/program/print_formatter.cpp @@ -7,7 +7,7 @@ #include "print_formatter.h" -#include "core/helpers/string.h" +#include "helpers/string.h" #include diff --git a/core/program/print_formatter.h b/core/program/print_formatter.h index 08340be0ef..51bc1e5448 100644 --- a/core/program/print_formatter.h +++ b/core/program/print_formatter.h @@ -7,8 +7,8 @@ #pragma once -#include "core/helpers/aligned_memory.h" -#include "core/os_interface/print.h" +#include "helpers/aligned_memory.h" +#include "os_interface/print.h" #include #include diff --git a/core/program/program_info.cpp b/core/program/program_info.cpp index bd3ab9eb60..758d658bc5 100644 --- a/core/program/program_info.cpp +++ b/core/program/program_info.cpp @@ -5,7 +5,7 @@ * */ -#include "core/program/program_info.h" +#include "program/program_info.h" #include "opencl/source/program/kernel_info.h" diff --git a/core/program/program_info.h b/core/program/program_info.h index 51ef36e2d7..27a73f3066 100644 --- a/core/program/program_info.h +++ b/core/program/program_info.h @@ -7,7 +7,7 @@ #pragma once -#include "core/compiler_interface/linker.h" +#include "compiler_interface/linker.h" #include #include diff --git a/core/program/program_info_from_patchtokens.cpp b/core/program/program_info_from_patchtokens.cpp index 46d31297c9..3c113771df 100644 --- a/core/program/program_info_from_patchtokens.cpp +++ b/core/program/program_info_from_patchtokens.cpp @@ -5,12 +5,12 @@ * */ -#include "core/program/program_info_from_patchtokens.h" +#include "program/program_info_from_patchtokens.h" -#include "core/compiler_interface/linker.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/device_binary_format/patchtokens_decoder.h" -#include "core/program/program_info.h" +#include "compiler_interface/linker.h" +#include "debug_settings/debug_settings_manager.h" +#include "device_binary_format/patchtokens_decoder.h" +#include "program/program_info.h" #include "opencl/source/program/kernel_info.h" #include "opencl/source/program/kernel_info_from_patchtokens.h" diff --git a/core/program/program_initialization.cpp b/core/program/program_initialization.cpp index 1de1e9b854..811742bcac 100644 --- a/core/program/program_initialization.cpp +++ b/core/program/program_initialization.cpp @@ -7,13 +7,13 @@ #include "program_initialization.h" -#include "core/compiler_interface/linker.h" -#include "core/device/device.h" -#include "core/helpers/string.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/memory_manager.h" -#include "core/memory_manager/unified_memory_manager.h" -#include "core/program/program_info.h" +#include "compiler_interface/linker.h" +#include "device/device.h" +#include "helpers/string.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/memory_manager.h" +#include "memory_manager/unified_memory_manager.h" +#include "program/program_info.h" namespace NEO { diff --git a/core/program/sync_buffer_handler.cpp b/core/program/sync_buffer_handler.cpp index e511bc5312..915e208692 100644 --- a/core/program/sync_buffer_handler.cpp +++ b/core/program/sync_buffer_handler.cpp @@ -5,11 +5,11 @@ * */ -#include "core/program/sync_buffer_handler.h" +#include "program/sync_buffer_handler.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/memory_manager.h" +#include "command_stream/command_stream_receiver.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/kernel/kernel.h" namespace NEO { diff --git a/core/program/sync_buffer_handler.h b/core/program/sync_buffer_handler.h index caa1e62684..06296674e7 100644 --- a/core/program/sync_buffer_handler.h +++ b/core/program/sync_buffer_handler.h @@ -7,7 +7,7 @@ #pragma once -#include "core/helpers/basic_math.h" +#include "helpers/basic_math.h" #include diff --git a/core/sku_info/definitions/sku_info.h b/core/sku_info/definitions/sku_info.h index 59ddd5f74d..bf6a8bb838 100644 --- a/core/sku_info/definitions/sku_info.h +++ b/core/sku_info/definitions/sku_info.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/sku_info/sku_info_base.h" +#include "sku_info/sku_info_base.h" namespace NEO { struct FeatureTable : FeatureTableBase {}; diff --git a/core/sku_info/operations/sku_info_transfer.cpp b/core/sku_info/operations/sku_info_transfer.cpp index 18735d649f..d3ef365dfa 100644 --- a/core/sku_info/operations/sku_info_transfer.cpp +++ b/core/sku_info/operations/sku_info_transfer.cpp @@ -5,7 +5,7 @@ * */ -#include "core/sku_info/operations/sku_info_transfer.h" +#include "sku_info/operations/sku_info_transfer.h" namespace NEO { void SkuInfoTransfer::transferWaTableForGmm(_WA_TABLE *dstWaTable, const NEO::WorkaroundTable *srcWaTable) { diff --git a/core/sku_info/operations/sku_info_transfer.h b/core/sku_info/operations/sku_info_transfer.h index f097ad24d2..940b96285f 100644 --- a/core/sku_info/operations/sku_info_transfer.h +++ b/core/sku_info/operations/sku_info_transfer.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/gmm_helper/gmm_lib.h" -#include "core/sku_info/operations/sku_info_transfer.h" +#include "gmm_helper/gmm_lib.h" +#include "sku_info/operations/sku_info_transfer.h" #include "sku_info.h" diff --git a/core/sku_info/operations/windows/sku_info_receiver.cpp b/core/sku_info/operations/windows/sku_info_receiver.cpp index 213a225371..4481b10d60 100644 --- a/core/sku_info/operations/windows/sku_info_receiver.cpp +++ b/core/sku_info/operations/windows/sku_info_receiver.cpp @@ -5,7 +5,7 @@ * */ -#include "core/sku_info/operations/windows/sku_info_receiver.h" +#include "sku_info/operations/windows/sku_info_receiver.h" namespace NEO { void SkuInfoReceiver::receiveFtrTableFromAdapterInfo(FeatureTable *ftrTable, _ADAPTER_INFO *adapterInfo) { diff --git a/core/sku_info/operations/windows/sku_info_receiver.h b/core/sku_info/operations/windows/sku_info_receiver.h index e625fde2b6..8c0fc53957 100644 --- a/core/sku_info/operations/windows/sku_info_receiver.h +++ b/core/sku_info/operations/windows/sku_info_receiver.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/windows/windows_wrapper.h" +#include "os_interface/windows/windows_wrapper.h" #include "sku_info.h" #include "umKmInc/sharedata.h" diff --git a/core/unified_memory/unified_memory.cpp b/core/unified_memory/unified_memory.cpp index 5052998d02..f33ce57bd1 100644 --- a/core/unified_memory/unified_memory.cpp +++ b/core/unified_memory/unified_memory.cpp @@ -5,7 +5,7 @@ * */ -#include "core/unified_memory/unified_memory.h" +#include "unified_memory/unified_memory.h" uint32_t UnifiedMemoryControls::generateMask() { uint32_t resourceMask = 0u; diff --git a/core/unit_tests/command_container/command_container_tests.cpp b/core/unit_tests/command_container/command_container_tests.cpp index 15bc487ef2..f8dbcdea8d 100644 --- a/core/unit_tests/command_container/command_container_tests.cpp +++ b/core/unit_tests/command_container/command_container_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/command_container/cmdcontainer.h" +#include "command_container/cmdcontainer.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" diff --git a/core/unit_tests/command_container/command_encoder_tests.cpp b/core/unit_tests/command_container/command_encoder_tests.cpp index 7ba1761cbf..123575c873 100644 --- a/core/unit_tests/command_container/command_encoder_tests.cpp +++ b/core/unit_tests/command_container/command_encoder_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/command_container/command_encoder.h" +#include "command_container/command_encoder.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" diff --git a/core/unit_tests/compiler_interface/compiler_cache_tests.cpp b/core/unit_tests/compiler_interface/compiler_cache_tests.cpp index 7b23f1b137..ea8adc4234 100644 --- a/core/unit_tests/compiler_interface/compiler_cache_tests.cpp +++ b/core/unit_tests/compiler_interface/compiler_cache_tests.cpp @@ -5,12 +5,12 @@ * */ -#include "core/compiler_interface/compiler_cache.h" -#include "core/compiler_interface/compiler_interface.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/hash.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/string.h" +#include "compiler_interface/compiler_cache.h" +#include "compiler_interface/compiler_interface.h" +#include "helpers/aligned_memory.h" +#include "helpers/hash.h" +#include "helpers/hw_info.h" +#include "helpers/string.h" #include "opencl/source/compiler_interface/default_cl_cache_config.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/global_environment.h" diff --git a/core/unit_tests/compiler_interface/compiler_interface_tests.cpp b/core/unit_tests/compiler_interface/compiler_interface_tests.cpp index b42eb24981..40e77768d3 100644 --- a/core/unit_tests/compiler_interface/compiler_interface_tests.cpp +++ b/core/unit_tests/compiler_interface/compiler_interface_tests.cpp @@ -5,11 +5,11 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/compiler_interface/compiler_interface.inl" -#include "core/helpers/file_io.h" -#include "core/helpers/hw_info.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "compiler_interface/compiler_interface.h" +#include "compiler_interface/compiler_interface.inl" +#include "helpers/file_io.h" +#include "helpers/hw_info.h" +#include "unit_tests/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/core/unit_tests/compiler_interface/intermediate_representations_tests.cpp b/core/unit_tests/compiler_interface/intermediate_representations_tests.cpp index 4d663e7b47..218be79b36 100644 --- a/core/unit_tests/compiler_interface/intermediate_representations_tests.cpp +++ b/core/unit_tests/compiler_interface/intermediate_representations_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/compiler_interface/intermediate_representations.h" +#include "compiler_interface/intermediate_representations.h" #include "test.h" TEST(HasSameMagic, WhenMagicIsMatchedThenReturnTrue) { diff --git a/core/unit_tests/compiler_interface/linker_mock.h b/core/unit_tests/compiler_interface/linker_mock.h index 7707d87542..c87329376a 100644 --- a/core/unit_tests/compiler_interface/linker_mock.h +++ b/core/unit_tests/compiler_interface/linker_mock.h @@ -7,7 +7,7 @@ #pragma once -#include "core/compiler_interface/linker.h" +#include "compiler_interface/linker.h" #include #include diff --git a/core/unit_tests/compiler_interface/linker_tests.cpp b/core/unit_tests/compiler_interface/linker_tests.cpp index 9563edf69e..090f2d5c47 100644 --- a/core/unit_tests/compiler_interface/linker_tests.cpp +++ b/core/unit_tests/compiler_interface/linker_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "RelocationInfo.h" #include "gmock/gmock.h" diff --git a/core/unit_tests/debug_settings/debug_settings_manager_fixture.h b/core/unit_tests/debug_settings/debug_settings_manager_fixture.h index ca02aa8c5c..85af2c9800 100644 --- a/core/unit_tests/debug_settings/debug_settings_manager_fixture.h +++ b/core/unit_tests/debug_settings/debug_settings_manager_fixture.h @@ -7,9 +7,9 @@ #pragma once -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/file_io.h" -#include "core/utilities/directory.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/file_io.h" +#include "utilities/directory.h" #include diff --git a/core/unit_tests/debug_settings/debug_settings_manager_tests.cpp b/core/unit_tests/debug_settings/debug_settings_manager_tests.cpp index c4b997aef3..3acf35e132 100644 --- a/core/unit_tests/debug_settings/debug_settings_manager_tests.cpp +++ b/core/unit_tests/debug_settings/debug_settings_manager_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/memory_manager/graphics_allocation.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/base_object_utils.h" -#include "core/utilities/debug_file_reader.h" +#include "memory_manager/graphics_allocation.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/utilities/base_object_utils.h" +#include "utilities/debug_file_reader.h" #include "test.h" #include "debug_settings_manager_fixture.h" diff --git a/core/unit_tests/device_binary_format/ar/ar_decoder_tests.cpp b/core/unit_tests/device_binary_format/ar/ar_decoder_tests.cpp index 4226bee017..f59be5c6fa 100644 --- a/core/unit_tests/device_binary_format/ar/ar_decoder_tests.cpp +++ b/core/unit_tests/device_binary_format/ar/ar_decoder_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/device_binary_format/ar/ar_decoder.h" +#include "device_binary_format/ar/ar_decoder.h" #include "test.h" using namespace NEO::Ar; diff --git a/core/unit_tests/device_binary_format/ar/ar_encoder_tests.cpp b/core/unit_tests/device_binary_format/ar/ar_encoder_tests.cpp index 3cedf16ac7..253b54f02a 100644 --- a/core/unit_tests/device_binary_format/ar/ar_encoder_tests.cpp +++ b/core/unit_tests/device_binary_format/ar/ar_encoder_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/compiler_interface/intermediate_representations.h" -#include "core/device_binary_format/ar/ar_encoder.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/string.h" +#include "compiler_interface/intermediate_representations.h" +#include "device_binary_format/ar/ar_encoder.h" +#include "helpers/ptr_math.h" +#include "helpers/string.h" #include "test.h" #include diff --git a/core/unit_tests/device_binary_format/device_binary_format_ar_tests.cpp b/core/unit_tests/device_binary_format/device_binary_format_ar_tests.cpp index 713906b5da..eae0094c5c 100644 --- a/core/unit_tests/device_binary_format/device_binary_format_ar_tests.cpp +++ b/core/unit_tests/device_binary_format/device_binary_format_ar_tests.cpp @@ -5,12 +5,12 @@ * */ -#include "core/device_binary_format/ar/ar.h" -#include "core/device_binary_format/ar/ar_decoder.h" -#include "core/device_binary_format/ar/ar_encoder.h" -#include "core/device_binary_format/device_binary_formats.h" -#include "core/helpers/hw_info.h" -#include "core/unit_tests/device_binary_format/patchtokens_tests.h" +#include "device_binary_format/ar/ar.h" +#include "device_binary_format/ar/ar_decoder.h" +#include "device_binary_format/ar/ar_encoder.h" +#include "device_binary_format/device_binary_formats.h" +#include "helpers/hw_info.h" +#include "unit_tests/device_binary_format/patchtokens_tests.h" #include "test.h" TEST(IsDeviceBinaryFormatAr, GivenValidBinaryReturnTrue) { diff --git a/core/unit_tests/device_binary_format/device_binary_format_ocl_elf_tests.cpp b/core/unit_tests/device_binary_format/device_binary_format_ocl_elf_tests.cpp index 76fa75b07d..92e14a19d9 100644 --- a/core/unit_tests/device_binary_format/device_binary_format_ocl_elf_tests.cpp +++ b/core/unit_tests/device_binary_format/device_binary_format_ocl_elf_tests.cpp @@ -5,13 +5,13 @@ * */ -#include "core/compiler_interface/intermediate_representations.h" -#include "core/device_binary_format/device_binary_formats.h" -#include "core/device_binary_format/elf/elf_decoder.h" -#include "core/device_binary_format/elf/elf_encoder.h" -#include "core/device_binary_format/elf/ocl_elf.h" -#include "core/program/program_info.h" -#include "core/unit_tests/device_binary_format/patchtokens_tests.h" +#include "compiler_interface/intermediate_representations.h" +#include "device_binary_format/device_binary_formats.h" +#include "device_binary_format/elf/elf_decoder.h" +#include "device_binary_format/elf/elf_encoder.h" +#include "device_binary_format/elf/ocl_elf.h" +#include "program/program_info.h" +#include "unit_tests/device_binary_format/patchtokens_tests.h" #include "test.h" #include diff --git a/core/unit_tests/device_binary_format/device_binary_format_patchtokens_tests.cpp b/core/unit_tests/device_binary_format/device_binary_format_patchtokens_tests.cpp index bca7dc029d..623178e477 100644 --- a/core/unit_tests/device_binary_format/device_binary_format_patchtokens_tests.cpp +++ b/core/unit_tests/device_binary_format/device_binary_format_patchtokens_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/device_binary_format/device_binary_formats.h" -#include "core/program/program_info.h" -#include "core/unit_tests/device_binary_format/patchtokens_tests.h" +#include "device_binary_format/device_binary_formats.h" +#include "program/program_info.h" +#include "unit_tests/device_binary_format/patchtokens_tests.h" #include "test.h" TEST(IsDeviceBinaryFormatPatchtokens, GivenValidBinaryReturnTrue) { diff --git a/core/unit_tests/device_binary_format/device_binary_formats_tests.cpp b/core/unit_tests/device_binary_format/device_binary_formats_tests.cpp index 8288f19b69..9d58cc6e03 100644 --- a/core/unit_tests/device_binary_format/device_binary_formats_tests.cpp +++ b/core/unit_tests/device_binary_format/device_binary_formats_tests.cpp @@ -5,12 +5,12 @@ * */ -#include "core/device_binary_format/ar/ar_encoder.h" -#include "core/device_binary_format/device_binary_formats.h" -#include "core/device_binary_format/elf/elf_encoder.h" -#include "core/device_binary_format/elf/ocl_elf.h" -#include "core/program/program_info.h" -#include "core/unit_tests/device_binary_format/patchtokens_tests.h" +#include "device_binary_format/ar/ar_encoder.h" +#include "device_binary_format/device_binary_formats.h" +#include "device_binary_format/elf/elf_encoder.h" +#include "device_binary_format/elf/ocl_elf.h" +#include "program/program_info.h" +#include "unit_tests/device_binary_format/patchtokens_tests.h" #include "test.h" TEST(DecodeError, WhenStringRepresentationIsNeededThenAsStringEncodesProperly) { diff --git a/core/unit_tests/device_binary_format/elf/elf_decoder_tests.cpp b/core/unit_tests/device_binary_format/elf/elf_decoder_tests.cpp index db5ce1d797..15f43c2cfd 100644 --- a/core/unit_tests/device_binary_format/elf/elf_decoder_tests.cpp +++ b/core/unit_tests/device_binary_format/elf/elf_decoder_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/device_binary_format/elf/elf_decoder.h" +#include "device_binary_format/elf/elf_decoder.h" #include "test.h" using namespace NEO::Elf; diff --git a/core/unit_tests/device_binary_format/elf/elf_encoder_tests.cpp b/core/unit_tests/device_binary_format/elf/elf_encoder_tests.cpp index b0e7f93397..1bd6b8548a 100644 --- a/core/unit_tests/device_binary_format/elf/elf_encoder_tests.cpp +++ b/core/unit_tests/device_binary_format/elf/elf_encoder_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/device_binary_format/elf/elf_encoder.h" -#include "core/utilities/range.h" +#include "device_binary_format/elf/elf_encoder.h" +#include "utilities/range.h" #include "test.h" using namespace NEO::Elf; diff --git a/core/unit_tests/device_binary_format/patchtokens_decoder_tests.cpp b/core/unit_tests/device_binary_format/patchtokens_decoder_tests.cpp index 7d8861bbd5..69a5e09ae4 100644 --- a/core/unit_tests/device_binary_format/patchtokens_decoder_tests.cpp +++ b/core/unit_tests/device_binary_format/patchtokens_decoder_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/device_binary_format/patchtokens_decoder.h" -#include "core/helpers/hash.h" +#include "device_binary_format/patchtokens_decoder.h" +#include "helpers/hash.h" #include "test.h" #include "patchtokens_tests.h" diff --git a/core/unit_tests/device_binary_format/patchtokens_dumper_tests.cpp b/core/unit_tests/device_binary_format/patchtokens_dumper_tests.cpp index 5b5deb58d7..d645495330 100644 --- a/core/unit_tests/device_binary_format/patchtokens_dumper_tests.cpp +++ b/core/unit_tests/device_binary_format/patchtokens_dumper_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/device_binary_format/patchtokens_decoder.h" -#include "core/device_binary_format/patchtokens_dumper.h" -#include "core/unit_tests/device_binary_format/patchtokens_tests.h" +#include "device_binary_format/patchtokens_decoder.h" +#include "device_binary_format/patchtokens_dumper.h" +#include "unit_tests/device_binary_format/patchtokens_tests.h" #include "test.h" #include @@ -126,8 +126,7 @@ TEST(ProgramDumper, GivenProgramWithPatchtokensThenProperlyCreatesDump) { std::string generated = NEO::PatchTokenBinary::asString(progWithConst); std::stringstream expected; - expected << - R"===(Program of size : )===" << progWithConst.blobs.programInfo.size() << R"===( decoded successfully + expected << R"===(Program of size : )===" << progWithConst.blobs.programInfo.size() << R"===( decoded successfully struct SProgramBinaryHeader { uint32_t Magic; // = 1229870147 uint32_t Version; // = )===" @@ -265,8 +264,7 @@ TEST(ProgramDumper, GivenProgramWithKernelThenProperlyCreatesDump) { PatchTokensTestData::ValidProgramWithKernelUsingSlm program; std::string generated = NEO::PatchTokenBinary::asString(program); std::stringstream expected; - expected << - R"===(Program of size : )===" << program.blobs.programInfo.size() << R"===( decoded successfully + expected << R"===(Program of size : )===" << program.blobs.programInfo.size() << R"===( decoded successfully struct SProgramBinaryHeader { uint32_t Magic; // = 1229870147 uint32_t Version; // = )===" @@ -347,8 +345,7 @@ TEST(ProgramDumper, GivenProgramWithMultipleKerneslThenProperlyCreatesDump) { program.kernels[2].name = ArrayRef(); std::string generated = NEO::PatchTokenBinary::asString(program); std::stringstream expected; - expected << - R"===(Program of size : )===" << program.blobs.programInfo.size() << R"===( decoded successfully + expected << R"===(Program of size : )===" << program.blobs.programInfo.size() << R"===( decoded successfully struct SProgramBinaryHeader { uint32_t Magic; // = 1229870147 uint32_t Version; // = )===" @@ -561,8 +558,7 @@ TEST(KernelDumper, GivenKernelWithNonCrossthreadDataPatchtokensThenProperlyCreat std::string generated = NEO::PatchTokenBinary::asString(kernel); std::stringstream expected; - expected << - R"===(Kernel of size : )===" << kernel.blobs.kernelInfo.size() << R"===( decoded successfully + expected << R"===(Kernel of size : )===" << kernel.blobs.kernelInfo.size() << R"===( decoded successfully struct SKernelBinaryHeader { uint32_t CheckSum;// = )===" << kernel.header->CheckSum << R"===( diff --git a/core/unit_tests/device_binary_format/patchtokens_tests.h b/core/unit_tests/device_binary_format/patchtokens_tests.h index 47798cc2cc..673afd3232 100644 --- a/core/unit_tests/device_binary_format/patchtokens_tests.h +++ b/core/unit_tests/device_binary_format/patchtokens_tests.h @@ -7,7 +7,7 @@ #pragma once -#include "core/device_binary_format/patchtokens_decoder.h" +#include "device_binary_format/patchtokens_decoder.h" #include "igfxfmid.h" diff --git a/core/unit_tests/device_binary_format/patchtokens_validator_tests.cpp b/core/unit_tests/device_binary_format/patchtokens_validator_tests.cpp index 5a1eeb3d9a..c24a6c8cac 100644 --- a/core/unit_tests/device_binary_format/patchtokens_validator_tests.cpp +++ b/core/unit_tests/device_binary_format/patchtokens_validator_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/device_binary_format/patchtokens_decoder.h" -#include "core/device_binary_format/patchtokens_validator.h" -#include "core/unit_tests/device_binary_format/patchtokens_tests.h" +#include "device_binary_format/patchtokens_decoder.h" +#include "device_binary_format/patchtokens_validator.h" +#include "unit_tests/device_binary_format/patchtokens_tests.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/direct_submission/direct_submission_tests.cpp b/core/unit_tests/direct_submission/direct_submission_tests.cpp index 2afbe7d0fa..345cc15fc8 100644 --- a/core/unit_tests/direct_submission/direct_submission_tests.cpp +++ b/core/unit_tests/direct_submission/direct_submission_tests.cpp @@ -5,14 +5,14 @@ * */ -#include "core/command_stream/submissions_aggregator.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/direct_submission/dispatchers/render_dispatcher.h" -#include "core/helpers/flush_stamp.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/ult_hw_config.h" -#include "core/unit_tests/mocks/mock_direct_submission_hw.h" +#include "command_stream/submissions_aggregator.h" +#include "debug_settings/debug_settings_manager.h" +#include "direct_submission/dispatchers/render_dispatcher.h" +#include "helpers/flush_stamp.h" +#include "os_interface/os_context.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/helpers/ult_hw_config.h" +#include "unit_tests/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/core/unit_tests/direct_submission/dispatchers/blitter_dispatcher_tests.cpp b/core/unit_tests/direct_submission/dispatchers/blitter_dispatcher_tests.cpp index 2ddf31a272..9422e4f8e2 100644 --- a/core/unit_tests/direct_submission/dispatchers/blitter_dispatcher_tests.cpp +++ b/core/unit_tests/direct_submission/dispatchers/blitter_dispatcher_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/direct_submission/dispatchers/blitter_dispatcher.h" -#include "core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h" +#include "direct_submission/dispatchers/blitter_dispatcher.h" +#include "unit_tests/direct_submission/dispatchers/dispatcher_fixture.h" #include "test.h" using BlitterDispatcheTest = Test; diff --git a/core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.cpp b/core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.cpp index bb48916c9f..401e93d01e 100644 --- a/core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.cpp +++ b/core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.cpp @@ -5,10 +5,10 @@ * */ -#include "core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h" +#include "unit_tests/direct_submission/dispatchers/dispatcher_fixture.h" -#include "core/helpers/aligned_memory.h" -#include "core/memory_manager/memory_constants.h" +#include "helpers/aligned_memory.h" +#include "memory_manager/memory_constants.h" void DispatcherFixture::SetUp() { DeviceFixture::SetUp(); diff --git a/core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h b/core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h index 3d228a1ae0..f15bd67b73 100644 --- a/core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h +++ b/core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h @@ -5,7 +5,7 @@ * */ -#include "core/command_stream/linear_stream.h" +#include "command_stream/linear_stream.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" class DispatcherFixture : public DeviceFixture { diff --git a/core/unit_tests/direct_submission/dispatchers/render_dispatcher_tests.cpp b/core/unit_tests/direct_submission/dispatchers/render_dispatcher_tests.cpp index 629ace6777..6529812338 100644 --- a/core/unit_tests/direct_submission/dispatchers/render_dispatcher_tests.cpp +++ b/core/unit_tests/direct_submission/dispatchers/render_dispatcher_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/direct_submission/dispatchers/render_dispatcher.h" -#include "core/unit_tests/direct_submission/dispatchers/dispatcher_fixture.h" -#include "core/unit_tests/fixtures/preemption_fixture.h" +#include "direct_submission/dispatchers/render_dispatcher.h" +#include "unit_tests/direct_submission/dispatchers/dispatcher_fixture.h" +#include "unit_tests/fixtures/preemption_fixture.h" #include "opencl/test/unit_test/helpers/hw_parse.h" #include "test.h" diff --git a/core/unit_tests/direct_submission/linux/drm_direct_submission_tests.cpp b/core/unit_tests/direct_submission/linux/drm_direct_submission_tests.cpp index 8a6954a3df..39f18512d5 100644 --- a/core/unit_tests/direct_submission/linux/drm_direct_submission_tests.cpp +++ b/core/unit_tests/direct_submission/linux/drm_direct_submission_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/direct_submission/dispatchers/render_dispatcher.h" -#include "core/direct_submission/linux/drm_direct_submission.h" -#include "core/os_interface/linux/os_context_linux.h" +#include "direct_submission/dispatchers/render_dispatcher.h" +#include "direct_submission/linux/drm_direct_submission.h" +#include "os_interface/linux/os_context_linux.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "test.h" diff --git a/core/unit_tests/direct_submission/windows/wddm_direct_submission_tests.cpp b/core/unit_tests/direct_submission/windows/wddm_direct_submission_tests.cpp index ca638f30ca..02d17a413f 100644 --- a/core/unit_tests/direct_submission/windows/wddm_direct_submission_tests.cpp +++ b/core/unit_tests/direct_submission/windows/wddm_direct_submission_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/direct_submission/dispatchers/render_dispatcher.h" -#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 "direct_submission/dispatchers/render_dispatcher.h" +#include "direct_submission/windows/wddm_direct_submission.h" +#include "os_interface/windows/os_context_win.h" +#include "os_interface/windows/wddm/wddm.h" #include "opencl/test/unit_test/helpers/hw_parse.h" #include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" diff --git a/core/unit_tests/encoders/test_encode_atomic.cpp b/core/unit_tests/encoders/test_encode_atomic.cpp index b913494262..5a3b302122 100644 --- a/core/unit_tests/encoders/test_encode_atomic.cpp +++ b/core/unit_tests/encoders/test_encode_atomic.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/ptr_math.h" -#include "core/unit_tests/fixtures/command_container_fixture.h" +#include "helpers/ptr_math.h" +#include "unit_tests/fixtures/command_container_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" using namespace NEO; diff --git a/core/unit_tests/encoders/test_encode_command_buffer.cpp b/core/unit_tests/encoders/test_encode_command_buffer.cpp index 8fe3963e0f..2ba17d7c83 100644 --- a/core/unit_tests/encoders/test_encode_command_buffer.cpp +++ b/core/unit_tests/encoders/test_encode_command_buffer.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_container/cmdcontainer.h" -#include "core/command_container/command_encoder.h" +#include "command_container/cmdcontainer.h" +#include "command_container/command_encoder.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "test.h" diff --git a/core/unit_tests/encoders/test_encode_dispatch_kernel.cpp b/core/unit_tests/encoders/test_encode_dispatch_kernel.cpp index 53496400ee..5dec30977f 100644 --- a/core/unit_tests/encoders/test_encode_dispatch_kernel.cpp +++ b/core/unit_tests/encoders/test_encode_dispatch_kernel.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/ptr_math.h" -#include "core/unit_tests/fixtures/command_container_fixture.h" -#include "core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.h" +#include "helpers/ptr_math.h" +#include "unit_tests/fixtures/command_container_fixture.h" +#include "unit_tests/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/core/unit_tests/encoders/test_encode_math.cpp b/core/unit_tests/encoders/test_encode_math.cpp index 166910ecba..7a9098d5e9 100644 --- a/core/unit_tests/encoders/test_encode_math.cpp +++ b/core/unit_tests/encoders/test_encode_math.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_container/command_encoder.h" -#include "core/helpers/register_offsets.h" +#include "command_container/command_encoder.h" +#include "helpers/register_offsets.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "test.h" diff --git a/core/unit_tests/encoders/test_encode_media_interface_descriptor.cpp b/core/unit_tests/encoders/test_encode_media_interface_descriptor.cpp index 07cf3200f7..2787b57fc9 100644 --- a/core/unit_tests/encoders/test_encode_media_interface_descriptor.cpp +++ b/core/unit_tests/encoders/test_encode_media_interface_descriptor.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/ptr_math.h" -#include "core/unit_tests/fixtures/command_container_fixture.h" +#include "helpers/ptr_math.h" +#include "unit_tests/fixtures/command_container_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" using namespace NEO; diff --git a/core/unit_tests/encoders/test_encode_semaphore.cpp b/core/unit_tests/encoders/test_encode_semaphore.cpp index 41eb90c9d5..248397528d 100644 --- a/core/unit_tests/encoders/test_encode_semaphore.cpp +++ b/core/unit_tests/encoders/test_encode_semaphore.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/linear_stream.h" -#include "core/helpers/ptr_math.h" -#include "core/unit_tests/fixtures/command_container_fixture.h" +#include "command_stream/linear_stream.h" +#include "helpers/ptr_math.h" +#include "unit_tests/fixtures/command_container_fixture.h" #include "opencl/test/unit_test/helpers/hw_parse.h" using namespace NEO; diff --git a/core/unit_tests/encoders/test_encode_set_mmio.cpp b/core/unit_tests/encoders/test_encode_set_mmio.cpp index 79301c3ce2..fe25e1c212 100644 --- a/core/unit_tests/encoders/test_encode_set_mmio.cpp +++ b/core/unit_tests/encoders/test_encode_set_mmio.cpp @@ -5,7 +5,7 @@ * */ -#include "core/command_container/command_encoder.h" +#include "command_container/command_encoder.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "test.h" diff --git a/core/unit_tests/encoders/test_encode_states.cpp b/core/unit_tests/encoders/test_encode_states.cpp index daaf49ba38..d178826de9 100644 --- a/core/unit_tests/encoders/test_encode_states.cpp +++ b/core/unit_tests/encoders/test_encode_states.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/ptr_math.h" -#include "core/unit_tests/fixtures/command_container_fixture.h" +#include "helpers/ptr_math.h" +#include "unit_tests/fixtures/command_container_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" using namespace NEO; diff --git a/core/unit_tests/fixtures/command_container_fixture.h b/core/unit_tests/fixtures/command_container_fixture.h index 135e5da6d5..f217591ffb 100644 --- a/core/unit_tests/fixtures/command_container_fixture.h +++ b/core/unit_tests/fixtures/command_container_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_container/command_encoder.h" +#include "command_container/command_encoder.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" diff --git a/core/unit_tests/fixtures/preemption_fixture.cpp b/core/unit_tests/fixtures/preemption_fixture.cpp index 75942cffbb..bfc5f1c693 100644 --- a/core/unit_tests/fixtures/preemption_fixture.cpp +++ b/core/unit_tests/fixtures/preemption_fixture.cpp @@ -5,10 +5,10 @@ * */ -#include "core/unit_tests/fixtures/preemption_fixture.h" +#include "unit_tests/fixtures/preemption_fixture.h" -#include "core/command_stream/preemption.h" -#include "core/helpers/hw_info.h" +#include "command_stream/preemption.h" +#include "helpers/hw_info.h" #include "opencl/source/command_queue/enqueue_common.h" #include "opencl/source/command_queue/enqueue_kernel.h" #include "opencl/source/command_queue/enqueue_marker.h" diff --git a/core/unit_tests/fixtures/preemption_fixture.h b/core/unit_tests/fixtures/preemption_fixture.h index c6fb8f46eb..f128625db6 100644 --- a/core/unit_tests/fixtures/preemption_fixture.h +++ b/core/unit_tests/fixtures/preemption_fixture.h @@ -7,7 +7,7 @@ #pragma once -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/fixtures/hello_world_fixture.h" #include "test.h" diff --git a/core/unit_tests/gen11/image_surface_state_tests_gen11.cpp b/core/unit_tests/gen11/image_surface_state_tests_gen11.cpp index 1b8bbd5fe8..98b4a09449 100644 --- a/core/unit_tests/gen11/image_surface_state_tests_gen11.cpp +++ b/core/unit_tests/gen11/image_surface_state_tests_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/unit_tests/image/image_surface_state_fixture.h" +#include "unit_tests/image/image_surface_state_fixture.h" using ImageSurfaceStateTestsGen11 = ImageSurfaceStateTests; diff --git a/core/unit_tests/gen11/preamble_tests_gen11.cpp b/core/unit_tests/gen11/preamble_tests_gen11.cpp index 0eb3fa1975..7eae069384 100644 --- a/core/unit_tests/gen11/preamble_tests_gen11.cpp +++ b/core/unit_tests/gen11/preamble_tests_gen11.cpp @@ -5,15 +5,15 @@ * */ -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/source_level_debugger/source_level_debugger_preamble_test.h" #include "gtest/gtest.h" using namespace NEO; typedef ICLFamily GfxFamily; -#include "core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.inl" +#include "unit_tests/source_level_debugger/source_level_debugger_preamble_test.inl" using PreambleTestGen11 = ::testing::Test; diff --git a/core/unit_tests/gen11/simd_helper_tests_gen11.cpp b/core/unit_tests/gen11/simd_helper_tests_gen11.cpp index ba5e1db451..dd1b01e32e 100644 --- a/core/unit_tests/gen11/simd_helper_tests_gen11.cpp +++ b/core/unit_tests/gen11/simd_helper_tests_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/unit_tests/helpers/simd_helper_tests.inl" +#include "unit_tests/helpers/simd_helper_tests.inl" using namespace NEO; diff --git a/core/unit_tests/gen11/test_preamble_gen11.cpp b/core/unit_tests/gen11/test_preamble_gen11.cpp index 2a5f75db87..03aa7ea546 100644 --- a/core/unit_tests/gen11/test_preamble_gen11.cpp +++ b/core/unit_tests/gen11/test_preamble_gen11.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/preamble/preamble_fixture.h" +#include "command_stream/preemption.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/preamble/preamble_fixture.h" #include "reg_configs_common.h" diff --git a/core/unit_tests/gen11/test_preemption_gen11.cpp b/core/unit_tests/gen11/test_preemption_gen11.cpp index 242f6a52bc..40205e502a 100644 --- a/core/unit_tests/gen11/test_preemption_gen11.cpp +++ b/core/unit_tests/gen11/test_preemption_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/hw_helper.h" -#include "core/unit_tests/fixtures/preemption_fixture.h" +#include "helpers/hw_helper.h" +#include "unit_tests/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/core/unit_tests/gen12lp/image_surface_state_tests_gen12lp.cpp b/core/unit_tests/gen12lp/image_surface_state_tests_gen12lp.cpp index 8b02b13267..5b088990f3 100644 --- a/core/unit_tests/gen12lp/image_surface_state_tests_gen12lp.cpp +++ b/core/unit_tests/gen12lp/image_surface_state_tests_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/unit_tests/image/image_surface_state_fixture.h" +#include "unit_tests/image/image_surface_state_fixture.h" using ImageSurfaceStateTestsGen12LP = ImageSurfaceStateTests; diff --git a/core/unit_tests/gen12lp/simd_helper_tests_gen12lp.cpp b/core/unit_tests/gen12lp/simd_helper_tests_gen12lp.cpp index c51f086dc3..c9ce615b76 100644 --- a/core/unit_tests/gen12lp/simd_helper_tests_gen12lp.cpp +++ b/core/unit_tests/gen12lp/simd_helper_tests_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/unit_tests/helpers/simd_helper_tests.inl" +#include "unit_tests/helpers/simd_helper_tests.inl" using namespace NEO; diff --git a/core/unit_tests/gen12lp/test_command_encoder_gen12lp.cpp b/core/unit_tests/gen12lp/test_command_encoder_gen12lp.cpp index 1714c4be99..a423082f9f 100644 --- a/core/unit_tests/gen12lp/test_command_encoder_gen12lp.cpp +++ b/core/unit_tests/gen12lp/test_command_encoder_gen12lp.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_container/cmdcontainer.h" -#include "core/command_container/command_encoder.h" +#include "command_container/cmdcontainer.h" +#include "command_container/command_encoder.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "test.h" diff --git a/core/unit_tests/gen12lp/test_preamble_gen12lp.cpp b/core/unit_tests/gen12lp/test_preamble_gen12lp.cpp index 86220ce63d..9526d596c9 100644 --- a/core/unit_tests/gen12lp/test_preamble_gen12lp.cpp +++ b/core/unit_tests/gen12lp/test_preamble_gen12lp.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/preamble/preamble_fixture.h" +#include "command_stream/preemption.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/preamble/preamble_fixture.h" #include "reg_configs_common.h" diff --git a/core/unit_tests/gen12lp/test_preemption_gen12lp.inl b/core/unit_tests/gen12lp/test_preemption_gen12lp.inl index 928d25a93b..f059caeb6c 100644 --- a/core/unit_tests/gen12lp/test_preemption_gen12lp.inl +++ b/core/unit_tests/gen12lp/test_preemption_gen12lp.inl @@ -5,7 +5,7 @@ * */ -#include "core/unit_tests/fixtures/preemption_fixture.h" +#include "unit_tests/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/core/unit_tests/gen8/image_surface_state_tests_gen8.cpp b/core/unit_tests/gen8/image_surface_state_tests_gen8.cpp index f89d088660..69c090629c 100644 --- a/core/unit_tests/gen8/image_surface_state_tests_gen8.cpp +++ b/core/unit_tests/gen8/image_surface_state_tests_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/unit_tests/image/image_surface_state_fixture.h" +#include "unit_tests/image/image_surface_state_fixture.h" using ImageSurfaceStateTestsGen8 = ImageSurfaceStateTests; diff --git a/core/unit_tests/gen8/simd_helper_tests_gen8.cpp b/core/unit_tests/gen8/simd_helper_tests_gen8.cpp index f8feec3b79..1783cae338 100644 --- a/core/unit_tests/gen8/simd_helper_tests_gen8.cpp +++ b/core/unit_tests/gen8/simd_helper_tests_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/unit_tests/helpers/simd_helper_tests.inl" +#include "unit_tests/helpers/simd_helper_tests.inl" using namespace NEO; diff --git a/core/unit_tests/gen8/test_preamble_gen8.cpp b/core/unit_tests/gen8/test_preamble_gen8.cpp index 7b922d9e3e..0876f71f09 100644 --- a/core/unit_tests/gen8/test_preamble_gen8.cpp +++ b/core/unit_tests/gen8/test_preamble_gen8.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/thread_arbitration_policy.h" -#include "core/helpers/preamble.h" -#include "core/unit_tests/preamble/preamble_fixture.h" +#include "command_stream/thread_arbitration_policy.h" +#include "helpers/preamble.h" +#include "unit_tests/preamble/preamble_fixture.h" #include "opencl/source/gen8/reg_configs.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" diff --git a/core/unit_tests/gen8/test_preemption_gen8.cpp b/core/unit_tests/gen8/test_preemption_gen8.cpp index 6d628d7ded..a6f576140e 100644 --- a/core/unit_tests/gen8/test_preemption_gen8.cpp +++ b/core/unit_tests/gen8/test_preemption_gen8.cpp @@ -5,11 +5,11 @@ * */ -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/preemption.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/memory_constants.h" -#include "core/unit_tests/fixtures/preemption_fixture.h" +#include "command_stream/linear_stream.h" +#include "command_stream/preemption.h" +#include "helpers/hw_helper.h" +#include "memory_manager/memory_constants.h" +#include "unit_tests/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/core/unit_tests/gen9/image_surface_state_tests_gen9.cpp b/core/unit_tests/gen9/image_surface_state_tests_gen9.cpp index 7efc2ee890..678a71347d 100644 --- a/core/unit_tests/gen9/image_surface_state_tests_gen9.cpp +++ b/core/unit_tests/gen9/image_surface_state_tests_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/unit_tests/image/image_surface_state_fixture.h" +#include "unit_tests/image/image_surface_state_fixture.h" using ImageSurfaceStateTestsGen9 = ImageSurfaceStateTests; diff --git a/core/unit_tests/gen9/preamble_tests_gen9.cpp b/core/unit_tests/gen9/preamble_tests_gen9.cpp index cb7b47dce3..9d36ce1390 100644 --- a/core/unit_tests/gen9/preamble_tests_gen9.cpp +++ b/core/unit_tests/gen9/preamble_tests_gen9.cpp @@ -5,15 +5,15 @@ * */ -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/source_level_debugger/source_level_debugger_preamble_test.h" #include "gtest/gtest.h" using namespace NEO; typedef SKLFamily GfxFamily; -#include "core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.inl" +#include "unit_tests/source_level_debugger/source_level_debugger_preamble_test.inl" using PreambleTestGen9 = ::testing::Test; diff --git a/core/unit_tests/gen9/simd_helper_tests_gen9.cpp b/core/unit_tests/gen9/simd_helper_tests_gen9.cpp index 92256ca0f5..9fe8655f0d 100644 --- a/core/unit_tests/gen9/simd_helper_tests_gen9.cpp +++ b/core/unit_tests/gen9/simd_helper_tests_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/unit_tests/helpers/simd_helper_tests.inl" +#include "unit_tests/helpers/simd_helper_tests.inl" using namespace NEO; diff --git a/core/unit_tests/gen9/skl/test_preamble_skl.cpp b/core/unit_tests/gen9/skl/test_preamble_skl.cpp index 03fcaf436d..5edc6f71c9 100644 --- a/core/unit_tests/gen9/skl/test_preamble_skl.cpp +++ b/core/unit_tests/gen9/skl/test_preamble_skl.cpp @@ -5,11 +5,11 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/command_stream/thread_arbitration_policy.h" -#include "core/helpers/preamble.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/preamble/preamble_fixture.h" +#include "command_stream/preemption.h" +#include "command_stream/thread_arbitration_policy.h" +#include "helpers/preamble.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/core/unit_tests/gen9/test_command_encoder_gen9.cpp b/core/unit_tests/gen9/test_command_encoder_gen9.cpp index 46644b188c..2dfc523aa7 100644 --- a/core/unit_tests/gen9/test_command_encoder_gen9.cpp +++ b/core/unit_tests/gen9/test_command_encoder_gen9.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_container/cmdcontainer.h" -#include "core/command_container/command_encoder.h" +#include "command_container/cmdcontainer.h" +#include "command_container/command_encoder.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "test.h" diff --git a/core/unit_tests/gen9/test_preemption_gen9.cpp b/core/unit_tests/gen9/test_preemption_gen9.cpp index 5d63e5fdfb..0cd1b23bea 100644 --- a/core/unit_tests/gen9/test_preemption_gen9.cpp +++ b/core/unit_tests/gen9/test_preemption_gen9.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/helpers/hw_helper.h" -#include "core/unit_tests/fixtures/preemption_fixture.h" +#include "command_stream/preemption.h" +#include "helpers/hw_helper.h" +#include "unit_tests/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/core/unit_tests/helpers/aligned_memory_tests.cpp b/core/unit_tests/helpers/aligned_memory_tests.cpp index 365c7b782d..5cd4d7c183 100644 --- a/core/unit_tests/helpers/aligned_memory_tests.cpp +++ b/core/unit_tests/helpers/aligned_memory_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/helpers/debug_manager_state_restore.h b/core/unit_tests/helpers/debug_manager_state_restore.h index d708004d02..994dc68074 100644 --- a/core/unit_tests/helpers/debug_manager_state_restore.h +++ b/core/unit_tests/helpers/debug_manager_state_restore.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/debug_settings/debug_settings_manager.h" -#include "core/utilities/debug_settings_reader.h" +#include "debug_settings/debug_settings_manager.h" +#include "utilities/debug_settings_reader.h" using namespace NEO; diff --git a/core/unit_tests/helpers/default_hw_info.inl b/core/unit_tests/helpers/default_hw_info.inl index ef499f6c2f..71d14b1b3d 100644 --- a/core/unit_tests/helpers/default_hw_info.inl +++ b/core/unit_tests/helpers/default_hw_info.inl @@ -5,8 +5,8 @@ * */ -#include "core/helpers/array_count.h" -#include "core/helpers/hw_cmds.h" +#include "helpers/array_count.h" +#include "helpers/hw_cmds.h" namespace NEO { static const HardwareInfo *DefaultPlatformDevices[] = { diff --git a/core/unit_tests/helpers/file_io_tests.cpp b/core/unit_tests/helpers/file_io_tests.cpp index f6899f8a18..d63b0c0f5d 100644 --- a/core/unit_tests/helpers/file_io_tests.cpp +++ b/core/unit_tests/helpers/file_io_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/file_io.h" -#include "core/helpers/stdio.h" +#include "helpers/file_io.h" +#include "helpers/stdio.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/helpers/hash_tests.cpp b/core/unit_tests/helpers/hash_tests.cpp index 882ec2304f..5679cfad72 100644 --- a/core/unit_tests/helpers/hash_tests.cpp +++ b/core/unit_tests/helpers/hash_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hash.h" +#include "helpers/hash.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/helpers/kernel_helpers_tests.cpp b/core/unit_tests/helpers/kernel_helpers_tests.cpp index 066c47ef60..5072bfd714 100644 --- a/core/unit_tests/helpers/kernel_helpers_tests.cpp +++ b/core/unit_tests/helpers/kernel_helpers_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/basic_math.h" -#include "core/helpers/kernel_helpers.h" +#include "helpers/basic_math.h" +#include "helpers/kernel_helpers.h" #include "test.h" using namespace NEO; diff --git a/core/unit_tests/helpers/memory_leak_listener.cpp b/core/unit_tests/helpers/memory_leak_listener.cpp index c013f3560c..f553417f98 100644 --- a/core/unit_tests/helpers/memory_leak_listener.cpp +++ b/core/unit_tests/helpers/memory_leak_listener.cpp @@ -7,7 +7,7 @@ #include "memory_leak_listener.h" -#include "core/unit_tests/helpers/memory_management.h" +#include "unit_tests/helpers/memory_management.h" using ::testing::TestInfo; using namespace NEO; diff --git a/core/unit_tests/helpers/memory_management.cpp b/core/unit_tests/helpers/memory_management.cpp index 7fe1cf8a30..d022b26721 100644 --- a/core/unit_tests/helpers/memory_management.cpp +++ b/core/unit_tests/helpers/memory_management.cpp @@ -5,7 +5,7 @@ * */ -#include "core/unit_tests/helpers/memory_management.h" +#include "unit_tests/helpers/memory_management.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/helpers/simd_helper_tests.inl b/core/unit_tests/helpers/simd_helper_tests.inl index 23da9493f6..78f779655d 100644 --- a/core/unit_tests/helpers/simd_helper_tests.inl +++ b/core/unit_tests/helpers/simd_helper_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/simd_helper.h" +#include "helpers/simd_helper.h" #include "test.h" namespace NEO { diff --git a/core/unit_tests/helpers/string_tests.cpp b/core/unit_tests/helpers/string_tests.cpp index 016ac8bc41..99df965ad8 100644 --- a/core/unit_tests/helpers/string_tests.cpp +++ b/core/unit_tests/helpers/string_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/hash.h" -#include "core/helpers/string.h" +#include "helpers/hash.h" +#include "helpers/string.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/helpers/string_to_hash_tests.cpp b/core/unit_tests/helpers/string_to_hash_tests.cpp index e9166fd18c..a0f2c127b7 100644 --- a/core/unit_tests/helpers/string_to_hash_tests.cpp +++ b/core/unit_tests/helpers/string_to_hash_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hash.h" +#include "helpers/hash.h" #include "opencl/source/helpers/string_helpers.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/helpers/ult_hw_config.inl b/core/unit_tests/helpers/ult_hw_config.inl index f58b21ddb2..fc9bc45bda 100644 --- a/core/unit_tests/helpers/ult_hw_config.inl +++ b/core/unit_tests/helpers/ult_hw_config.inl @@ -5,7 +5,7 @@ * */ -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "unit_tests/helpers/ult_hw_config.h" namespace NEO { UltHwConfig ultHwConfig{}; diff --git a/core/unit_tests/helpers/ult_hw_helper.h b/core/unit_tests/helpers/ult_hw_helper.h index 0874569b9e..5f81819e6c 100644 --- a/core/unit_tests/helpers/ult_hw_helper.h +++ b/core/unit_tests/helpers/ult_hw_helper.h @@ -7,7 +7,7 @@ #pragma once -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" namespace NEO { diff --git a/core/unit_tests/image/image_surface_state_fixture.h b/core/unit_tests/image/image_surface_state_fixture.h index 31f69ff095..86923ffc51 100644 --- a/core/unit_tests/image/image_surface_state_fixture.h +++ b/core/unit_tests/image/image_surface_state_fixture.h @@ -5,13 +5,13 @@ * */ -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/basic_math.h" -#include "core/image/image_surface_state.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/surface.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/aligned_memory.h" +#include "helpers/basic_math.h" +#include "image/image_surface_state.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/surface.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/image.h" diff --git a/core/unit_tests/image/image_surface_state_tests.cpp b/core/unit_tests/image/image_surface_state_tests.cpp index 27a3ba8a81..d174afabda 100644 --- a/core/unit_tests/image/image_surface_state_tests.cpp +++ b/core/unit_tests/image/image_surface_state_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/unit_tests/image/image_surface_state_fixture.h" +#include "unit_tests/image/image_surface_state_fixture.h" HWTEST_F(ImageSurfaceStateTests, givenImageInfoWhenSetImageSurfaceStateThenProperFieldsAreSet) { auto size = sizeof(typename FamilyType::RENDER_SURFACE_STATE); diff --git a/core/unit_tests/indirect_heap/indirect_heap_tests.cpp b/core/unit_tests/indirect_heap/indirect_heap_tests.cpp index f885f29fb7..8546d76644 100644 --- a/core/unit_tests/indirect_heap/indirect_heap_tests.cpp +++ b/core/unit_tests/indirect_heap/indirect_heap_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/indirect_heap/indirect_heap.h" -#include "core/memory_manager/graphics_allocation.h" +#include "indirect_heap/indirect_heap.h" +#include "memory_manager/graphics_allocation.h" #include "test.h" using namespace NEO; diff --git a/core/unit_tests/mocks/mock_direct_submission_hw.h b/core/unit_tests/mocks/mock_direct_submission_hw.h index 0ae64d43d9..e83bafa9aa 100644 --- a/core/unit_tests/mocks/mock_direct_submission_hw.h +++ b/core/unit_tests/mocks/mock_direct_submission_hw.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/direct_submission/direct_submission_hw.h" -#include "core/memory_manager/graphics_allocation.h" +#include "direct_submission/direct_submission_hw.h" +#include "memory_manager/graphics_allocation.h" namespace NEO { diff --git a/core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.cpp b/core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.cpp index bef59514bb..23012b62a7 100644 --- a/core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.cpp +++ b/core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.cpp @@ -5,7 +5,7 @@ * */ -#include "core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.h" +#include "unit_tests/mocks/mock_dispatch_kernel_encoder_interface.h" using namespace NEO; diff --git a/core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.h b/core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.h index c49555393b..0d7db2556d 100644 --- a/core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.h +++ b/core/unit_tests/mocks/mock_dispatch_kernel_encoder_interface.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/kernel/dispatch_kernel_encoder_interface.h" +#include "kernel/dispatch_kernel_encoder_interface.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "gmock/gmock.h" diff --git a/core/unit_tests/os_interface/aub_memory_operations_handler_tests.cpp b/core/unit_tests/os_interface/aub_memory_operations_handler_tests.cpp index 742c96fbdd..89900df708 100644 --- a/core/unit_tests/os_interface/aub_memory_operations_handler_tests.cpp +++ b/core/unit_tests/os_interface/aub_memory_operations_handler_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/unit_tests/os_interface/aub_memory_operations_handler_tests.h" +#include "unit_tests/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/core/unit_tests/os_interface/aub_memory_operations_handler_tests.h b/core/unit_tests/os_interface/aub_memory_operations_handler_tests.h index dafd1373f9..c0e408e5a0 100644 --- a/core/unit_tests/os_interface/aub_memory_operations_handler_tests.h +++ b/core/unit_tests/os_interface/aub_memory_operations_handler_tests.h @@ -7,10 +7,10 @@ #pragma once -#include "core/helpers/hw_info.h" -#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 "helpers/hw_info.h" +#include "os_interface/aub_memory_operations_handler.h" +#include "os_interface/device_factory.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/os_interface/linux/gmm_helper_tests_linux.cpp b/core/unit_tests/os_interface/linux/gmm_helper_tests_linux.cpp index 384ed7dc0b..76f46b432c 100644 --- a/core/unit_tests/os_interface/linux/gmm_helper_tests_linux.cpp +++ b/core/unit_tests/os_interface/linux/gmm_helper_tests_linux.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gmm_helper/gmm_helper.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "gmm_helper/gmm_helper.h" +#include "unit_tests/helpers/default_hw_info.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/os_interface/windows/gdi_interface_tests.cpp b/core/unit_tests/os_interface/windows/gdi_interface_tests.cpp index 7d0a971635..771d4e1702 100644 --- a/core/unit_tests/os_interface/windows/gdi_interface_tests.cpp +++ b/core/unit_tests/os_interface/windows/gdi_interface_tests.cpp @@ -6,9 +6,9 @@ */ #if defined(_WIN32) -#include "core/os_interface/os_library.h" -#include "core/os_interface/windows/gdi_interface.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "os_interface/os_library.h" +#include "os_interface/windows/gdi_interface.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" #include "test.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/os_interface/windows/gmm_helper_tests_win.cpp b/core/unit_tests/os_interface/windows/gmm_helper_tests_win.cpp index dc8921ab12..b4b766af7a 100644 --- a/core/unit_tests/os_interface/windows/gmm_helper_tests_win.cpp +++ b/core/unit_tests/os_interface/windows/gmm_helper_tests_win.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gmm_helper/gmm_helper.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "gmm_helper/gmm_helper.h" +#include "unit_tests/helpers/default_hw_info.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/os_interface/windows/mock_gdi_interface.h b/core/unit_tests/os_interface/windows/mock_gdi_interface.h index da34a93a40..e79b90fdba 100644 --- a/core/unit_tests/os_interface/windows/mock_gdi_interface.h +++ b/core/unit_tests/os_interface/windows/mock_gdi_interface.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/windows/gdi_interface.h" +#include "os_interface/windows/gdi_interface.h" namespace NEO { diff --git a/core/unit_tests/os_interface/windows/wddm_preemption_tests.cpp b/core/unit_tests/os_interface/windows/wddm_preemption_tests.cpp index 517750dc02..cd5def5f3d 100644 --- a/core/unit_tests/os_interface/windows/wddm_preemption_tests.cpp +++ b/core/unit_tests/os_interface/windows/wddm_preemption_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/hw_helper.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/preemption.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/hw_helper.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" #include "test.h" diff --git a/core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests.cpp b/core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests.cpp index f84e08be45..09ceb4f4d7 100644 --- a/core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests.cpp +++ b/core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/memory_manager/graphics_allocation.h" -#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 "memory_manager/graphics_allocation.h" +#include "memory_manager/unified_memory_manager.h" +#include "unified_memory/unified_memory.h" +#include "unit_tests/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/core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests_fixture.h b/core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests_fixture.h index 05af4d9aef..ece243a3f5 100644 --- a/core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests_fixture.h +++ b/core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests_fixture.h @@ -7,7 +7,7 @@ #pragma once -#include "core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" +#include "unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp b/core/unit_tests/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp index e2525b508b..b2c9344eb7 100644 --- a/core/unit_tests/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp +++ b/core/unit_tests/page_fault_manager/linux/cpu_page_fault_manager_linux_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/page_fault_manager/linux/cpu_page_fault_manager_linux.h" -#include "core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" +#include "page_fault_manager/linux/cpu_page_fault_manager_linux.h" +#include "unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h b/core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h index fe749a4630..b470da8152 100644 --- a/core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h +++ b/core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h @@ -7,7 +7,7 @@ #pragma once -#include "core/page_fault_manager/cpu_page_fault_manager.h" +#include "page_fault_manager/cpu_page_fault_manager.h" using namespace NEO; diff --git a/core/unit_tests/page_fault_manager/windows/cpu_page_fault_manager_windows_tests.cpp b/core/unit_tests/page_fault_manager/windows/cpu_page_fault_manager_windows_tests.cpp index 1e5933e1f7..ee20b6a01c 100644 --- a/core/unit_tests/page_fault_manager/windows/cpu_page_fault_manager_windows_tests.cpp +++ b/core/unit_tests/page_fault_manager/windows/cpu_page_fault_manager_windows_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/page_fault_manager/windows/cpu_page_fault_manager_windows.h" -#include "core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" +#include "page_fault_manager/windows/cpu_page_fault_manager_windows.h" +#include "unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" #include "gtest/gtest.h" #include diff --git a/core/unit_tests/preamble/preamble_fixture.h b/core/unit_tests/preamble/preamble_fixture.h index 256473ad1f..744903af03 100644 --- a/core/unit_tests/preamble/preamble_fixture.h +++ b/core/unit_tests/preamble/preamble_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/preamble.h" +#include "helpers/preamble.h" #include "opencl/test/unit_test/command_stream/linear_stream_fixture.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" diff --git a/core/unit_tests/preamble/preamble_tests.cpp b/core/unit_tests/preamble/preamble_tests.cpp index 3af5ee864f..5a8d978f5d 100644 --- a/core/unit_tests/preamble/preamble_tests.cpp +++ b/core/unit_tests/preamble/preamble_tests.cpp @@ -5,11 +5,11 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/helpers/flat_batch_buffer_helper_hw.h" -#include "core/helpers/preamble.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/utilities/stackvec.h" +#include "command_stream/preemption.h" +#include "helpers/flat_batch_buffer_helper_hw.h" +#include "helpers/preamble.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "utilities/stackvec.h" #include "opencl/source/gen11/reg_configs.h" #include "opencl/test/unit_test/helpers/hw_parse.h" #include "opencl/test/unit_test/mocks/mock_device.h" diff --git a/core/unit_tests/preemption/preemption_tests.cpp b/core/unit_tests/preemption/preemption_tests.cpp index bb6ec61fd6..e971cd3820 100644 --- a/core/unit_tests/preemption/preemption_tests.cpp +++ b/core/unit_tests/preemption/preemption_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/helpers/hw_helper.h" -#include "core/unit_tests/fixtures/preemption_fixture.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/preemption.h" +#include "helpers/hw_helper.h" +#include "unit_tests/fixtures/preemption_fixture.h" +#include "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 "opencl/test/unit_test/helpers/dispatch_flags_helper.h" diff --git a/core/unit_tests/program/program_info_from_patchtokens_tests.cpp b/core/unit_tests/program/program_info_from_patchtokens_tests.cpp index 1b52acec53..426d30b69a 100644 --- a/core/unit_tests/program/program_info_from_patchtokens_tests.cpp +++ b/core/unit_tests/program/program_info_from_patchtokens_tests.cpp @@ -5,12 +5,12 @@ * */ -#include "core/compiler_interface/linker.h" -#include "core/device_binary_format/patchtokens_decoder.h" -#include "core/program/program_info.h" -#include "core/program/program_info_from_patchtokens.h" -#include "core/unit_tests/compiler_interface/linker_mock.h" -#include "core/unit_tests/device_binary_format/patchtokens_tests.h" +#include "compiler_interface/linker.h" +#include "device_binary_format/patchtokens_decoder.h" +#include "program/program_info.h" +#include "program/program_info_from_patchtokens.h" +#include "unit_tests/compiler_interface/linker_mock.h" +#include "unit_tests/device_binary_format/patchtokens_tests.h" #include "opencl/source/program/kernel_info.h" #include "RelocationInfo.h" diff --git a/core/unit_tests/program/program_info_tests.cpp b/core/unit_tests/program/program_info_tests.cpp index dc3793de3d..da3262428b 100644 --- a/core/unit_tests/program/program_info_tests.cpp +++ b/core/unit_tests/program/program_info_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/program/program_info.h" +#include "program/program_info.h" #include "opencl/source/program/kernel_info.h" #include "gmock/gmock.h" diff --git a/core/unit_tests/program/program_initialization_tests.cpp b/core/unit_tests/program/program_initialization_tests.cpp index 71c0b5b4fb..f8d76bcdf4 100644 --- a/core/unit_tests/program/program_initialization_tests.cpp +++ b/core/unit_tests/program/program_initialization_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/program/program_initialization.h" -#include "core/unit_tests/compiler_interface/linker_mock.h" +#include "program/program_initialization.h" +#include "unit_tests/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/core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h b/core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h index d6d9ba1e7e..ae6822b1b6 100644 --- a/core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h +++ b/core/unit_tests/source_level_debugger/source_level_debugger_preamble_test.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/command_stream/preemption.h" -#include "core/helpers/preamble.h" +#include "command_stream/preemption.h" +#include "helpers/preamble.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_device.h" diff --git a/core/unit_tests/test_macros/test.h b/core/unit_tests/test_macros/test.h index f9519c3f8c..08ca2a3579 100644 --- a/core/unit_tests/test_macros/test.h +++ b/core/unit_tests/test_macros/test.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/hw_cmds.h" -#include "core/helpers/hw_info.h" +#include "helpers/hw_cmds.h" +#include "helpers/hw_info.h" #include "gtest/gtest.h" #include "igfxfmid.h" diff --git a/core/unit_tests/unified_memory/unified_memory_tests.cpp b/core/unit_tests/unified_memory/unified_memory_tests.cpp index ee766fba1b..093e504c59 100644 --- a/core/unit_tests/unified_memory/unified_memory_tests.cpp +++ b/core/unit_tests/unified_memory/unified_memory_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/unified_memory/unified_memory.h" +#include "unified_memory/unified_memory.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/utilities/const_stringref_tests.cpp b/core/unit_tests/utilities/const_stringref_tests.cpp index f60bb8cbee..57383b7e0c 100644 --- a/core/unit_tests/utilities/const_stringref_tests.cpp +++ b/core/unit_tests/utilities/const_stringref_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/const_stringref.h" +#include "utilities/const_stringref.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/utilities/containers_tests.cpp b/core/unit_tests/utilities/containers_tests.cpp index 3cba2481c7..5c7da6ba9d 100644 --- a/core/unit_tests/utilities/containers_tests.cpp +++ b/core/unit_tests/utilities/containers_tests.cpp @@ -5,12 +5,12 @@ * */ -#include "core/unit_tests/utilities/containers_tests_helpers.h" -#include "core/utilities/arrayref.h" -#include "core/utilities/idlist.h" -#include "core/utilities/iflist.h" -#include "core/utilities/range.h" -#include "core/utilities/stackvec.h" +#include "unit_tests/utilities/containers_tests_helpers.h" +#include "utilities/arrayref.h" +#include "utilities/idlist.h" +#include "utilities/iflist.h" +#include "utilities/range.h" +#include "utilities/stackvec.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/utilities/cpuinfo_tests.cpp b/core/unit_tests/utilities/cpuinfo_tests.cpp index cf8566eb79..c3e61a591a 100644 --- a/core/unit_tests/utilities/cpuinfo_tests.cpp +++ b/core/unit_tests/utilities/cpuinfo_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/cpu_info.h" +#include "utilities/cpu_info.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/utilities/cpuintrinsics.cpp b/core/unit_tests/utilities/cpuintrinsics.cpp index 8a0bc64669..860719d938 100644 --- a/core/unit_tests/utilities/cpuintrinsics.cpp +++ b/core/unit_tests/utilities/cpuintrinsics.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/cpuintrinsics.h" +#include "utilities/cpuintrinsics.h" #include #include diff --git a/core/unit_tests/utilities/cpuintrinsics_tests.cpp b/core/unit_tests/utilities/cpuintrinsics_tests.cpp index e8211d64bf..c96d779dc3 100644 --- a/core/unit_tests/utilities/cpuintrinsics_tests.cpp +++ b/core/unit_tests/utilities/cpuintrinsics_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/cpuintrinsics.h" +#include "utilities/cpuintrinsics.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/utilities/directory_tests.cpp b/core/unit_tests/utilities/directory_tests.cpp index 951b2c1b9a..c6a86ac760 100644 --- a/core/unit_tests/utilities/directory_tests.cpp +++ b/core/unit_tests/utilities/directory_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/directory.h" +#include "utilities/directory.h" #include "test.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/utilities/heap_allocator_tests.cpp b/core/unit_tests/utilities/heap_allocator_tests.cpp index 56f3423721..a7aa930537 100644 --- a/core/unit_tests/utilities/heap_allocator_tests.cpp +++ b/core/unit_tests/utilities/heap_allocator_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/heap_allocator.h" +#include "utilities/heap_allocator.h" #include "test.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/utilities/numeric_tests.cpp b/core/unit_tests/utilities/numeric_tests.cpp index eee1815559..e1a54db479 100644 --- a/core/unit_tests/utilities/numeric_tests.cpp +++ b/core/unit_tests/utilities/numeric_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/numeric.h" +#include "utilities/numeric.h" #include "test.h" #include diff --git a/core/unit_tests/utilities/perf_profiler.cpp b/core/unit_tests/utilities/perf_profiler.cpp index 879706f7b0..4eb3961487 100644 --- a/core/unit_tests/utilities/perf_profiler.cpp +++ b/core/unit_tests/utilities/perf_profiler.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/perf_profiler.h" +#include "utilities/perf_profiler.h" #include "test.h" diff --git a/core/unit_tests/utilities/reference_tracked_object_tests.cpp b/core/unit_tests/utilities/reference_tracked_object_tests.cpp index 52a764dc82..3cc92116a5 100644 --- a/core/unit_tests/utilities/reference_tracked_object_tests.cpp +++ b/core/unit_tests/utilities/reference_tracked_object_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/reference_tracked_object.h" +#include "utilities/reference_tracked_object.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/utilities/spinlock_tests.cpp b/core/unit_tests/utilities/spinlock_tests.cpp index 0b092b8a24..31f360e1e8 100644 --- a/core/unit_tests/utilities/spinlock_tests.cpp +++ b/core/unit_tests/utilities/spinlock_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/spinlock.h" +#include "utilities/spinlock.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/utilities/timer_util_tests.cpp b/core/unit_tests/utilities/timer_util_tests.cpp index ce13fdcf0c..b2048a37af 100644 --- a/core/unit_tests/utilities/timer_util_tests.cpp +++ b/core/unit_tests/utilities/timer_util_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/timer_util.h" +#include "utilities/timer_util.h" #include "test.h" #include "gtest/gtest.h" diff --git a/core/unit_tests/utilities/vec_tests.cpp b/core/unit_tests/utilities/vec_tests.cpp index 35e14c4201..9f7c7f9f9c 100644 --- a/core/unit_tests/utilities/vec_tests.cpp +++ b/core/unit_tests/utilities/vec_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/vec.h" +#include "helpers/vec.h" #include "gtest/gtest.h" diff --git a/core/utilities/cpuintrinsics.cpp b/core/utilities/cpuintrinsics.cpp index 23a86ae7e5..500185c505 100644 --- a/core/utilities/cpuintrinsics.cpp +++ b/core/utilities/cpuintrinsics.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/cpuintrinsics.h" +#include "utilities/cpuintrinsics.h" #include diff --git a/core/utilities/debug_file_reader.cpp b/core/utilities/debug_file_reader.cpp index 96140c5bf9..3f2a28ef14 100644 --- a/core/utilities/debug_file_reader.cpp +++ b/core/utilities/debug_file_reader.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/debug_file_reader.h" +#include "utilities/debug_file_reader.h" using namespace std; diff --git a/core/utilities/debug_file_reader.h b/core/utilities/debug_file_reader.h index 5c756c4a8e..ff6d6aa7af 100644 --- a/core/utilities/debug_file_reader.h +++ b/core/utilities/debug_file_reader.h @@ -7,7 +7,7 @@ #pragma once -#include "core/utilities/debug_settings_reader.h" +#include "utilities/debug_settings_reader.h" #include #include diff --git a/core/utilities/debug_settings_reader.cpp b/core/utilities/debug_settings_reader.cpp index 80974e0626..b9de507620 100644 --- a/core/utilities/debug_settings_reader.cpp +++ b/core/utilities/debug_settings_reader.cpp @@ -5,9 +5,9 @@ * */ -#include "core/utilities/debug_settings_reader.h" +#include "utilities/debug_settings_reader.h" -#include "core/utilities/debug_file_reader.h" +#include "utilities/debug_file_reader.h" namespace NEO { diff --git a/core/utilities/debug_settings_reader_creator.cpp b/core/utilities/debug_settings_reader_creator.cpp index c1a14155da..ae6517b71a 100644 --- a/core/utilities/debug_settings_reader_creator.cpp +++ b/core/utilities/debug_settings_reader_creator.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/debug_settings_reader_creator.h" +#include "utilities/debug_settings_reader_creator.h" namespace NEO { std::unique_ptr SettingsReaderCreator::create(const std::string ®Key) { diff --git a/core/utilities/debug_settings_reader_creator.h b/core/utilities/debug_settings_reader_creator.h index 33e0926571..5df2dd438d 100644 --- a/core/utilities/debug_settings_reader_creator.h +++ b/core/utilities/debug_settings_reader_creator.h @@ -7,7 +7,7 @@ #pragma once -#include "core/utilities/debug_settings_reader.h" +#include "utilities/debug_settings_reader.h" #include diff --git a/core/utilities/heap_allocator.cpp b/core/utilities/heap_allocator.cpp index 02db415470..3da2f90419 100644 --- a/core/utilities/heap_allocator.cpp +++ b/core/utilities/heap_allocator.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/heap_allocator.h" +#include "utilities/heap_allocator.h" namespace NEO { diff --git a/core/utilities/heap_allocator.h b/core/utilities/heap_allocator.h index 6d87cb329c..9343b2c007 100644 --- a/core/utilities/heap_allocator.h +++ b/core/utilities/heap_allocator.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/aligned_memory.h" -#include "core/helpers/debug_helpers.h" +#include "helpers/aligned_memory.h" +#include "helpers/debug_helpers.h" #include #include diff --git a/core/utilities/idlist.h b/core/utilities/idlist.h index 957eb3c3ab..fa06d70d88 100644 --- a/core/utilities/idlist.h +++ b/core/utilities/idlist.h @@ -7,7 +7,7 @@ #pragma once -#include "core/helpers/debug_helpers.h" +#include "helpers/debug_helpers.h" #include #include diff --git a/core/utilities/linux/cpu_info.cpp b/core/utilities/linux/cpu_info.cpp index 6e5e4edba6..3505fab001 100644 --- a/core/utilities/linux/cpu_info.cpp +++ b/core/utilities/linux/cpu_info.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/cpu_info.h" +#include "utilities/cpu_info.h" #include diff --git a/core/utilities/linux/directory.cpp b/core/utilities/linux/directory.cpp index b5204cb0e0..577904c286 100644 --- a/core/utilities/linux/directory.cpp +++ b/core/utilities/linux/directory.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/directory.h" +#include "utilities/directory.h" #include #include diff --git a/core/utilities/linux/timer_util.cpp b/core/utilities/linux/timer_util.cpp index bfe81c3537..a4ba5dd18c 100644 --- a/core/utilities/linux/timer_util.cpp +++ b/core/utilities/linux/timer_util.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/timer_util.h" +#include "utilities/timer_util.h" #include diff --git a/core/utilities/numeric.h b/core/utilities/numeric.h index 085d96d7cb..dee86305c8 100644 --- a/core/utilities/numeric.h +++ b/core/utilities/numeric.h @@ -7,7 +7,7 @@ #pragma once -#include "core/memory_manager/memory_constants.h" +#include "memory_manager/memory_constants.h" #include diff --git a/core/utilities/perf_profiler.cpp b/core/utilities/perf_profiler.cpp index 113e9dcb9c..1941bf6f87 100644 --- a/core/utilities/perf_profiler.cpp +++ b/core/utilities/perf_profiler.cpp @@ -5,9 +5,9 @@ * */ -#include "core/utilities/perf_profiler.h" +#include "utilities/perf_profiler.h" -#include "core/utilities/stackvec.h" +#include "utilities/stackvec.h" #include "os_inc.h" diff --git a/core/utilities/perf_profiler.h b/core/utilities/perf_profiler.h index 87ce55f076..c6f50d0179 100644 --- a/core/utilities/perf_profiler.h +++ b/core/utilities/perf_profiler.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/utilities/timer_util.h" +#include "utilities/timer_util.h" #include #include diff --git a/core/utilities/reference_tracked_object.h b/core/utilities/reference_tracked_object.h index cdfa103c2b..53dd72121c 100644 --- a/core/utilities/reference_tracked_object.h +++ b/core/utilities/reference_tracked_object.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/debug_helpers.h" +#include "helpers/debug_helpers.h" #include #include diff --git a/core/utilities/stackvec.h b/core/utilities/stackvec.h index b2989ba65c..4c60822e39 100644 --- a/core/utilities/stackvec.h +++ b/core/utilities/stackvec.h @@ -7,7 +7,7 @@ #pragma once -#include "core/helpers/debug_helpers.h" +#include "helpers/debug_helpers.h" #include #include diff --git a/core/utilities/tag_allocator.h b/core/utilities/tag_allocator.h index 0184015705..7be9e22b9f 100644 --- a/core/utilities/tag_allocator.h +++ b/core/utilities/tag_allocator.h @@ -6,10 +6,10 @@ */ #pragma once -#include "core/helpers/aligned_memory.h" -#include "core/helpers/debug_helpers.h" -#include "core/memory_manager/memory_manager.h" -#include "core/utilities/idlist.h" +#include "helpers/aligned_memory.h" +#include "helpers/debug_helpers.h" +#include "memory_manager/memory_manager.h" +#include "utilities/idlist.h" #include #include diff --git a/core/utilities/windows/cpu_info.cpp b/core/utilities/windows/cpu_info.cpp index 13e42b5229..7584d72705 100644 --- a/core/utilities/windows/cpu_info.cpp +++ b/core/utilities/windows/cpu_info.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/cpu_info.h" +#include "utilities/cpu_info.h" #include diff --git a/core/utilities/windows/directory.cpp b/core/utilities/windows/directory.cpp index 60d5bc8c9e..5aab492d31 100644 --- a/core/utilities/windows/directory.cpp +++ b/core/utilities/windows/directory.cpp @@ -5,9 +5,9 @@ * */ -#include "core/utilities/directory.h" +#include "utilities/directory.h" -#include "core/os_interface/windows/windows_wrapper.h" +#include "os_interface/windows/windows_wrapper.h" namespace NEO { diff --git a/core/utilities/windows/timer_util.cpp b/core/utilities/windows/timer_util.cpp index 873ec84511..88044f9d58 100644 --- a/core/utilities/windows/timer_util.cpp +++ b/core/utilities/windows/timer_util.cpp @@ -5,10 +5,10 @@ * */ -#include "core/utilities/timer_util.h" +#include "utilities/timer_util.h" -#include "core/helpers/debug_helpers.h" -#include "core/os_interface/windows/windows_wrapper.h" +#include "helpers/debug_helpers.h" +#include "os_interface/windows/windows_wrapper.h" namespace NEO { diff --git a/offline_compiler/decoder/binary_decoder.cpp b/offline_compiler/decoder/binary_decoder.cpp index cf815e0909..494fbc549b 100644 --- a/offline_compiler/decoder/binary_decoder.cpp +++ b/offline_compiler/decoder/binary_decoder.cpp @@ -7,10 +7,10 @@ #include "binary_decoder.h" -#include "core/device_binary_format/elf/elf_decoder.h" -#include "core/device_binary_format/elf/ocl_elf.h" -#include "core/helpers/file_io.h" -#include "core/helpers/ptr_math.h" +#include "device_binary_format/elf/elf_decoder.h" +#include "device_binary_format/elf/ocl_elf.h" +#include "helpers/file_io.h" +#include "helpers/ptr_math.h" #include "offline_compiler/offline_compiler.h" #include "helper.h" diff --git a/offline_compiler/decoder/binary_encoder.cpp b/offline_compiler/decoder/binary_encoder.cpp index fe0d5edeaf..6ee10b4602 100644 --- a/offline_compiler/decoder/binary_encoder.cpp +++ b/offline_compiler/decoder/binary_encoder.cpp @@ -7,11 +7,11 @@ #include "binary_encoder.h" -#include "core/device_binary_format/elf/elf_encoder.h" -#include "core/device_binary_format/elf/ocl_elf.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/file_io.h" -#include "core/helpers/hash.h" +#include "device_binary_format/elf/elf_encoder.h" +#include "device_binary_format/elf/ocl_elf.h" +#include "helpers/aligned_memory.h" +#include "helpers/file_io.h" +#include "helpers/hash.h" #include "offline_compiler/offline_compiler.h" #include "CL/cl.h" diff --git a/offline_compiler/decoder/helper.cpp b/offline_compiler/decoder/helper.cpp index 659b444ce4..f58a2b2b0b 100644 --- a/offline_compiler/decoder/helper.cpp +++ b/offline_compiler/decoder/helper.cpp @@ -7,8 +7,8 @@ #include "helper.h" -#include "core/helpers/hw_info.h" -#include "core/os_interface/os_library.h" +#include "helpers/hw_info.h" +#include "os_interface/os_library.h" #include "opencl/source/os_interface/os_inc_base.h" #include "igfxfmid.h" diff --git a/offline_compiler/decoder/helper.h b/offline_compiler/decoder/helper.h index 194c2f5c38..0c84e020da 100644 --- a/offline_compiler/decoder/helper.h +++ b/offline_compiler/decoder/helper.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "igfxfmid.h" diff --git a/offline_compiler/decoder/iga_wrapper.cpp b/offline_compiler/decoder/iga_wrapper.cpp index bc3286ba77..07ca653892 100644 --- a/offline_compiler/decoder/iga_wrapper.cpp +++ b/offline_compiler/decoder/iga_wrapper.cpp @@ -7,8 +7,8 @@ #include "iga_wrapper.h" -#include "core/helpers/hw_info.h" -#include "core/os_interface/os_library.h" +#include "helpers/hw_info.h" +#include "os_interface/os_library.h" #include "opencl/source/os_interface/os_inc_base.h" #include "helper.h" diff --git a/offline_compiler/extra_settings.cpp b/offline_compiler/extra_settings.cpp index ec29383766..f94b7f1da6 100644 --- a/offline_compiler/extra_settings.cpp +++ b/offline_compiler/extra_settings.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "offline_compiler/offline_compiler.h" #include "compiler_options.h" diff --git a/offline_compiler/main.cpp b/offline_compiler/main.cpp index a65c50af3a..1e2444e5ba 100644 --- a/offline_compiler/main.cpp +++ b/offline_compiler/main.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "offline_compiler/multi_command.h" #include "offline_compiler/ocloc_fatbinary.h" #include "offline_compiler/offline_compiler.h" diff --git a/offline_compiler/multi_command.h b/offline_compiler/multi_command.h index 57b3aba21c..90adb4e360 100644 --- a/offline_compiler/multi_command.h +++ b/offline_compiler/multi_command.h @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "offline_compiler/offline_compiler.h" #include "offline_compiler/utilities/get_current_dir.h" #include "offline_compiler/utilities/safety_caller.h" diff --git a/offline_compiler/ocloc_fatbinary.cpp b/offline_compiler/ocloc_fatbinary.cpp index 41391b771e..d0b8837acb 100644 --- a/offline_compiler/ocloc_fatbinary.cpp +++ b/offline_compiler/ocloc_fatbinary.cpp @@ -7,9 +7,9 @@ #include "offline_compiler/ocloc_fatbinary.h" -#include "core/device_binary_format/ar/ar_encoder.h" -#include "core/helpers/file_io.h" -#include "core/helpers/hw_info.h" +#include "device_binary_format/ar/ar_encoder.h" +#include "helpers/file_io.h" +#include "helpers/hw_info.h" #include "offline_compiler/offline_compiler.h" #include "offline_compiler/utilities/safety_caller.h" diff --git a/offline_compiler/ocloc_fatbinary.h b/offline_compiler/ocloc_fatbinary.h index 56da8bf4ce..76f24bdef9 100644 --- a/offline_compiler/ocloc_fatbinary.h +++ b/offline_compiler/ocloc_fatbinary.h @@ -7,7 +7,7 @@ #pragma once -#include "core/utilities/const_stringref.h" +#include "utilities/const_stringref.h" #include "igfxfmid.h" diff --git a/offline_compiler/offline_compiler.cpp b/offline_compiler/offline_compiler.cpp index ac4f5ca044..1c53b50236 100644 --- a/offline_compiler/offline_compiler.cpp +++ b/offline_compiler/offline_compiler.cpp @@ -7,15 +7,15 @@ #include "offline_compiler.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/device_binary_format/device_binary_formats.h" -#include "core/device_binary_format/elf/elf_encoder.h" -#include "core/device_binary_format/elf/ocl_elf.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/file_io.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/string.h" -#include "core/os_interface/os_library.h" +#include "debug_settings/debug_settings_manager.h" +#include "device_binary_format/device_binary_formats.h" +#include "device_binary_format/elf/elf_encoder.h" +#include "device_binary_format/elf/ocl_elf.h" +#include "helpers/debug_helpers.h" +#include "helpers/file_io.h" +#include "helpers/hw_info.h" +#include "helpers/string.h" +#include "os_interface/os_library.h" #include "opencl/source/helpers/validators.h" #include "opencl/source/os_interface/os_inc_base.h" #include "opencl/source/platform/extensions.h" diff --git a/offline_compiler/offline_compiler.h b/offline_compiler/offline_compiler.h index 3f30d4e20b..d824419f83 100644 --- a/offline_compiler/offline_compiler.h +++ b/offline_compiler/offline_compiler.h @@ -7,9 +7,9 @@ #pragma once -#include "core/os_interface/os_library.h" -#include "core/utilities/arrayref.h" -#include "core/utilities/const_stringref.h" +#include "os_interface/os_library.h" +#include "utilities/arrayref.h" +#include "utilities/const_stringref.h" #include "cif/common/cif_main.h" #include "ocl_igc_interface/fcl_ocl_device_ctx.h" diff --git a/offline_compiler/offline_compiler_helper.cpp b/offline_compiler/offline_compiler_helper.cpp index 50ab1bc407..d5ceccd3cc 100644 --- a/offline_compiler/offline_compiler_helper.cpp +++ b/offline_compiler/offline_compiler_helper.cpp @@ -5,9 +5,9 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/hw_info.h" -#include "core/utilities/debug_settings_reader_creator.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/hw_info.h" +#include "utilities/debug_settings_reader_creator.h" namespace NEO { diff --git a/offline_compiler/utilities/linux/safety_caller_linux.cpp b/offline_compiler/utilities/linux/safety_caller_linux.cpp index 23c33892f1..765c274da9 100644 --- a/offline_compiler/utilities/linux/safety_caller_linux.cpp +++ b/offline_compiler/utilities/linux/safety_caller_linux.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "offline_compiler/offline_compiler.h" #include "offline_compiler/utilities/linux/safety_guard_linux.h" diff --git a/offline_compiler/utilities/linux/safety_guard_linux.h b/offline_compiler/utilities/linux/safety_guard_linux.h index e095a8118b..2f163077aa 100644 --- a/offline_compiler/utilities/linux/safety_guard_linux.h +++ b/offline_compiler/utilities/linux/safety_guard_linux.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/abort.h" +#include "helpers/abort.h" #include #include diff --git a/offline_compiler/utilities/windows/safety_guard_windows.h b/offline_compiler/utilities/windows/safety_guard_windows.h index cee1d013ec..6d9735cfd5 100644 --- a/offline_compiler/utilities/windows/safety_guard_windows.h +++ b/offline_compiler/utilities/windows/safety_guard_windows.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/abort.h" +#include "helpers/abort.h" #include "offline_compiler/utilities/windows/seh_exception.h" #include diff --git a/offline_compiler/utilities/windows/seh_exception.cpp b/offline_compiler/utilities/windows/seh_exception.cpp index 5bf8c1ba97..e516e902da 100644 --- a/offline_compiler/utilities/windows/seh_exception.cpp +++ b/offline_compiler/utilities/windows/seh_exception.cpp @@ -7,7 +7,7 @@ #include "seh_exception.h" -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include #include diff --git a/opencl/source/accelerators/intel_accelerator.cpp b/opencl/source/accelerators/intel_accelerator.cpp index ece88e225c..829d5b1d9f 100644 --- a/opencl/source/accelerators/intel_accelerator.cpp +++ b/opencl/source/accelerators/intel_accelerator.cpp @@ -7,8 +7,8 @@ #include "opencl/source/accelerators/intel_accelerator.h" -#include "core/helpers/get_info.h" -#include "core/helpers/string.h" +#include "helpers/get_info.h" +#include "helpers/string.h" #include "opencl/source/context/context.h" #include "opencl/source/helpers/get_info_status_mapper.h" diff --git a/opencl/source/api/api.cpp b/opencl/source/api/api.cpp index d73d7cc628..c9e437e053 100644 --- a/opencl/source/api/api.cpp +++ b/opencl/source/api/api.cpp @@ -7,17 +7,17 @@ #include "api.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/get_info.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/kernel_helpers.h" -#include "core/memory_manager/unified_memory_manager.h" -#include "core/os_interface/os_context.h" -#include "core/utilities/api_intercept.h" -#include "core/utilities/stackvec.h" +#include "command_stream/command_stream_receiver.h" +#include "debug_settings/debug_settings_manager.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/aligned_memory.h" +#include "helpers/get_info.h" +#include "helpers/hw_info.h" +#include "helpers/kernel_helpers.h" +#include "memory_manager/unified_memory_manager.h" +#include "os_interface/os_context.h" +#include "utilities/api_intercept.h" +#include "utilities/stackvec.h" #include "opencl/source/accelerators/intel_motion_estimation.h" #include "opencl/source/api/additional_extensions.h" #include "opencl/source/aub/aub_center.h" diff --git a/opencl/source/api/api_enter.h b/opencl/source/api/api_enter.h index 9a8974c9ce..45f6a30fd2 100644 --- a/opencl/source/api/api_enter.h +++ b/opencl/source/api/api_enter.h @@ -5,7 +5,7 @@ * */ -#include "core/utilities/perf_profiler.h" +#include "utilities/perf_profiler.h" #include "opencl/source/utilities/logger.h" #define API_ENTER(retValPointer) \ diff --git a/opencl/source/api/dispatch.h b/opencl/source/api/dispatch.h index 6ea2aa3941..1957f6f262 100644 --- a/opencl/source/api/dispatch.h +++ b/opencl/source/api/dispatch.h @@ -19,7 +19,7 @@ #include "CL/cl_d3d11.h" #include "CL/cl_dx9_media_sharing.h" #define CL_DX9_MEDIA_SHARING_INTEL_EXT -#include "core/os_interface/windows/windows_wrapper.h" +#include "os_interface/windows/windows_wrapper.h" #include "CL/cl_dx9_media_sharing_intel.h" #else diff --git a/opencl/source/aub/aub_center.cpp b/opencl/source/aub/aub_center.cpp index f3db34b09b..a42f9cd366 100644 --- a/opencl/source/aub/aub_center.cpp +++ b/opencl/source/aub/aub_center.cpp @@ -7,9 +7,9 @@ #include "opencl/source/aub/aub_center.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/hw_info.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/hw_helper.h" +#include "helpers/hw_info.h" #include "opencl/source/aub/aub_helper.h" #include "third_party/aub_stream/headers/aub_manager.h" diff --git a/opencl/source/aub/aub_center.h b/opencl/source/aub/aub_center.h index bcc9f00425..4cfe667269 100644 --- a/opencl/source/aub/aub_center.h +++ b/opencl/source/aub/aub_center.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/options.h" +#include "helpers/options.h" #include "opencl/source/command_stream/aub_stream_provider.h" #include "opencl/source/command_stream/aub_subcapture.h" #include "opencl/source/memory_manager/address_mapper.h" diff --git a/opencl/source/aub/aub_helper.cpp b/opencl/source/aub/aub_helper.cpp index 76559e3397..27d8c6dd32 100644 --- a/opencl/source/aub/aub_helper.cpp +++ b/opencl/source/aub/aub_helper.cpp @@ -7,8 +7,8 @@ #include "opencl/source/aub/aub_helper.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/basic_math.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/basic_math.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" namespace NEO { diff --git a/opencl/source/aub/aub_helper.h b/opencl/source/aub/aub_helper.h index 68d6ff18dc..5b20a68fa9 100644 --- a/opencl/source/aub/aub_helper.h +++ b/opencl/source/aub/aub_helper.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/helpers/hw_info.h" -#include "core/helpers/non_copyable_or_moveable.h" -#include "core/memory_manager/graphics_allocation.h" +#include "helpers/hw_info.h" +#include "helpers/non_copyable_or_moveable.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/gen_common/aub_mapper_base.h" namespace NEO { diff --git a/opencl/source/aub/aub_helper_add_mmio.cpp b/opencl/source/aub/aub_helper_add_mmio.cpp index f38225dd85..d68179120f 100644 --- a/opencl/source/aub/aub_helper_add_mmio.cpp +++ b/opencl/source/aub/aub_helper_add_mmio.cpp @@ -5,7 +5,7 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include "opencl/source/aub/aub_helper.h" #include "third_party/aub_stream/headers/aubstream.h" diff --git a/opencl/source/aub_mem_dump/aub_alloc_dump.h b/opencl/source/aub_mem_dump/aub_alloc_dump.h index 5a7c6618d0..7d5fd3fa44 100644 --- a/opencl/source/aub_mem_dump/aub_alloc_dump.h +++ b/opencl/source/aub_mem_dump/aub_alloc_dump.h @@ -7,9 +7,9 @@ #pragma once -#include "core/debug_settings/debug_settings_manager.h" -#include "core/gmm_helper/resource_info.h" -#include "core/memory_manager/graphics_allocation.h" +#include "debug_settings/debug_settings_manager.h" +#include "gmm_helper/resource_info.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" using namespace NEO; diff --git a/opencl/source/aub_mem_dump/aub_alloc_dump.inl b/opencl/source/aub_mem_dump/aub_alloc_dump.inl index eabdf9e874..5623469e36 100644 --- a/opencl/source/aub_mem_dump/aub_alloc_dump.inl +++ b/opencl/source/aub_mem_dump/aub_alloc_dump.inl @@ -5,8 +5,8 @@ * */ -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" #include "opencl/source/aub_mem_dump/aub_alloc_dump.h" #include "third_party/aub_stream/headers/aubstream.h" diff --git a/opencl/source/aub_mem_dump/aub_mem_dump.cpp b/opencl/source/aub_mem_dump/aub_mem_dump.cpp index 4f487c4819..30d5f7185f 100644 --- a/opencl/source/aub_mem_dump/aub_mem_dump.cpp +++ b/opencl/source/aub_mem_dump/aub_mem_dump.cpp @@ -7,9 +7,9 @@ #include "aub_mem_dump.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/ptr_math.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/debug_helpers.h" +#include "helpers/ptr_math.h" #include "opencl/source/aub/aub_helper.h" namespace AubMemDump { diff --git a/opencl/source/aub_mem_dump/aub_mem_dump.inl b/opencl/source/aub_mem_dump/aub_mem_dump.inl index ad6d658710..6e9fef2753 100644 --- a/opencl/source/aub_mem_dump/aub_mem_dump.inl +++ b/opencl/source/aub_mem_dump/aub_mem_dump.inl @@ -5,9 +5,9 @@ * */ -#include "core/helpers/debug_helpers.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/memory_constants.h" +#include "helpers/debug_helpers.h" +#include "helpers/ptr_math.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/aub/aub_helper.h" #include "aub_mem_dump.h" diff --git a/opencl/source/built_ins/aux_translation_builtin.h b/opencl/source/built_ins/aux_translation_builtin.h index 92ef19f769..0100fadd85 100644 --- a/opencl/source/built_ins/aux_translation_builtin.h +++ b/opencl/source/built_ins/aux_translation_builtin.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/helpers/dispatch_info_builder.h" diff --git a/opencl/source/built_ins/built_ins.cpp b/opencl/source/built_ins/built_ins.cpp index 318e8b544b..0306464353 100644 --- a/opencl/source/built_ins/built_ins.cpp +++ b/opencl/source/built_ins/built_ins.cpp @@ -7,9 +7,9 @@ #include "opencl/source/built_ins/built_ins.h" -#include "core/compiler_interface/compiler_interface.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/debug_helpers.h" +#include "compiler_interface/compiler_interface.h" +#include "helpers/basic_math.h" +#include "helpers/debug_helpers.h" #include "opencl/source/built_ins/aux_translation_builtin.h" #include "opencl/source/built_ins/sip.h" #include "opencl/source/device/cl_device.h" diff --git a/opencl/source/built_ins/built_ins.h b/opencl/source/built_ins/built_ins.h index ac60d9b07f..9987869a4f 100644 --- a/opencl/source/built_ins/built_ins.h +++ b/opencl/source/built_ins/built_ins.h @@ -6,10 +6,10 @@ */ #pragma once -#include "core/built_ins/sip_kernel_type.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/non_copyable_or_moveable.h" -#include "core/helpers/vec.h" +#include "built_ins/sip_kernel_type.h" +#include "helpers/debug_helpers.h" +#include "helpers/non_copyable_or_moveable.h" +#include "helpers/vec.h" #include "CL/cl.h" #include "built_in_ops.h" diff --git a/opencl/source/built_ins/built_ins_storage.cpp b/opencl/source/built_ins/built_ins_storage.cpp index abb43147f8..b5838710fb 100644 --- a/opencl/source/built_ins/built_ins_storage.cpp +++ b/opencl/source/built_ins/built_ins_storage.cpp @@ -5,8 +5,8 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/device/device.h" +#include "debug_settings/debug_settings_manager.h" +#include "device/device.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" diff --git a/opencl/source/built_ins/builtins_dispatch_builder.cpp b/opencl/source/built_ins/builtins_dispatch_builder.cpp index a812739ab0..bbf93b39f7 100644 --- a/opencl/source/built_ins/builtins_dispatch_builder.cpp +++ b/opencl/source/built_ins/builtins_dispatch_builder.cpp @@ -7,9 +7,9 @@ #include "opencl/source/built_ins/builtins_dispatch_builder.h" -#include "core/compiler_interface/compiler_interface.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/debug_helpers.h" +#include "compiler_interface/compiler_interface.h" +#include "helpers/basic_math.h" +#include "helpers/debug_helpers.h" #include "opencl/source/built_ins/aux_translation_builtin.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/built_ins.inl" diff --git a/opencl/source/built_ins/builtins_dispatch_builder.h b/opencl/source/built_ins/builtins_dispatch_builder.h index 05002decfa..08478ac66e 100644 --- a/opencl/source/built_ins/builtins_dispatch_builder.h +++ b/opencl/source/built_ins/builtins_dispatch_builder.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/vec.h" +#include "helpers/vec.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/kernel/kernel.h" diff --git a/opencl/source/built_ins/sip.cpp b/opencl/source/built_ins/sip.cpp index c65e4c5515..e4455cb8fc 100644 --- a/opencl/source/built_ins/sip.cpp +++ b/opencl/source/built_ins/sip.cpp @@ -7,13 +7,13 @@ #include "opencl/source/built_ins/sip.h" -#include "core/device/device.h" -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/string.h" -#include "core/memory_manager/graphics_allocation.h" +#include "device/device.h" +#include "execution_environment/execution_environment.h" +#include "helpers/debug_helpers.h" +#include "helpers/hw_helper.h" +#include "helpers/ptr_math.h" +#include "helpers/string.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/program/kernel_info.h" #include "opencl/source/program/program.h" diff --git a/opencl/source/built_ins/sip.h b/opencl/source/built_ins/sip.h index a72195ee98..2c16d2a21b 100644 --- a/opencl/source/built_ins/sip.h +++ b/opencl/source/built_ins/sip.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/built_ins/sip_kernel_type.h" -#include "core/helpers/hw_info.h" +#include "built_ins/sip_kernel_type.h" +#include "helpers/hw_info.h" #include diff --git a/opencl/source/built_ins/vme_builtin.cpp b/opencl/source/built_ins/vme_builtin.cpp index a7a7e3078f..39ab2b6d91 100644 --- a/opencl/source/built_ins/vme_builtin.cpp +++ b/opencl/source/built_ins/vme_builtin.cpp @@ -7,7 +7,7 @@ #include "opencl/source/built_ins/vme_builtin.h" -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/built_ins/built_in_ops_vme.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" diff --git a/opencl/source/builtin_kernels_simulation/gen11/scheduler_simulation_gen11.cpp b/opencl/source/builtin_kernels_simulation/gen11/scheduler_simulation_gen11.cpp index 048602510f..97eda37bef 100644 --- a/opencl/source/builtin_kernels_simulation/gen11/scheduler_simulation_gen11.cpp +++ b/opencl/source/builtin_kernels_simulation/gen11/scheduler_simulation_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen11/hw_cmds.h" -#include "core/memory_manager/graphics_allocation.h" +#include "gen11/hw_cmds.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/builtin_kernels_simulation/opencl_c.h" #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h" #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.inl" diff --git a/opencl/source/builtin_kernels_simulation/gen12lp/scheduler_simulation_gen12lp.cpp b/opencl/source/builtin_kernels_simulation/gen12lp/scheduler_simulation_gen12lp.cpp index e63b223cd7..cd6dcf4c66 100644 --- a/opencl/source/builtin_kernels_simulation/gen12lp/scheduler_simulation_gen12lp.cpp +++ b/opencl/source/builtin_kernels_simulation/gen12lp/scheduler_simulation_gen12lp.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen12lp/hw_cmds.h" -#include "core/memory_manager/graphics_allocation.h" +#include "gen12lp/hw_cmds.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/builtin_kernels_simulation/opencl_c.h" #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h" #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.inl" diff --git a/opencl/source/builtin_kernels_simulation/gen8/scheduler_simulation_gen8.cpp b/opencl/source/builtin_kernels_simulation/gen8/scheduler_simulation_gen8.cpp index b9d4ecf9b8..b9d71866a2 100644 --- a/opencl/source/builtin_kernels_simulation/gen8/scheduler_simulation_gen8.cpp +++ b/opencl/source/builtin_kernels_simulation/gen8/scheduler_simulation_gen8.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen8/hw_cmds.h" -#include "core/memory_manager/graphics_allocation.h" +#include "gen8/hw_cmds.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/builtin_kernels_simulation/opencl_c.h" #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h" #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.inl" diff --git a/opencl/source/builtin_kernels_simulation/gen9/scheduler_simulation_gen9.cpp b/opencl/source/builtin_kernels_simulation/gen9/scheduler_simulation_gen9.cpp index b8b8a57e29..ffffaa1d51 100644 --- a/opencl/source/builtin_kernels_simulation/gen9/scheduler_simulation_gen9.cpp +++ b/opencl/source/builtin_kernels_simulation/gen9/scheduler_simulation_gen9.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen9/hw_cmds.h" -#include "core/memory_manager/graphics_allocation.h" +#include "gen9/hw_cmds.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/builtin_kernels_simulation/opencl_c.h" #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h" #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.inl" diff --git a/opencl/source/builtin_kernels_simulation/opencl_c.cpp b/opencl/source/builtin_kernels_simulation/opencl_c.cpp index c9f74836be..32a020b463 100644 --- a/opencl/source/builtin_kernels_simulation/opencl_c.cpp +++ b/opencl/source/builtin_kernels_simulation/opencl_c.cpp @@ -7,7 +7,7 @@ #include "opencl_c.h" -#include "core/helpers/string.h" +#include "helpers/string.h" namespace BuiltinKernelsSimulation { diff --git a/opencl/source/builtin_kernels_simulation/scheduler_simulation.inl b/opencl/source/builtin_kernels_simulation/scheduler_simulation.inl index 937443b206..19af873747 100644 --- a/opencl/source/builtin_kernels_simulation/scheduler_simulation.inl +++ b/opencl/source/builtin_kernels_simulation/scheduler_simulation.inl @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/graphics_allocation.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h" #include diff --git a/opencl/source/command_queue/command_queue.cpp b/opencl/source/command_queue/command_queue.cpp index db8f1c97fe..42cbdd9753 100644 --- a/opencl/source/command_queue/command_queue.cpp +++ b/opencl/source/command_queue/command_queue.cpp @@ -7,18 +7,18 @@ #include "opencl/source/command_queue/command_queue.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/array_count.h" -#include "core/helpers/engine_node_helper.h" -#include "core/helpers/get_info.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/string.h" -#include "core/helpers/timestamp_packet.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/os_interface/os_context.h" -#include "core/utilities/api_intercept.h" -#include "core/utilities/tag_allocator.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/aligned_memory.h" +#include "helpers/array_count.h" +#include "helpers/engine_node_helper.h" +#include "helpers/get_info.h" +#include "helpers/ptr_math.h" +#include "helpers/string.h" +#include "helpers/timestamp_packet.h" +#include "memory_manager/internal_allocation_storage.h" +#include "os_interface/os_context.h" +#include "utilities/api_intercept.h" +#include "utilities/tag_allocator.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" diff --git a/opencl/source/command_queue/command_queue.h b/opencl/source/command_queue/command_queue.h index ba8dd99b41..49b4efdd18 100644 --- a/opencl/source/command_queue/command_queue.h +++ b/opencl/source/command_queue/command_queue.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/engine_control.h" +#include "helpers/engine_control.h" #include "opencl/source/event/event.h" #include "opencl/source/helpers/base_object.h" #include "opencl/source/helpers/dispatch_info.h" diff --git a/opencl/source/command_queue/command_queue_hw.h b/opencl/source/command_queue/command_queue_hw.h index 260b0c20f1..e3b36c9408 100644 --- a/opencl/source/command_queue/command_queue_hw.h +++ b/opencl/source/command_queue/command_queue_hw.h @@ -6,11 +6,11 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/preemption.h" -#include "core/helpers/engine_control.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/graphics_allocation.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/preemption.h" +#include "helpers/engine_control.h" +#include "helpers/hw_helper.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/device/cl_device.h" diff --git a/opencl/source/command_queue/command_queue_hw_base.inl b/opencl/source/command_queue/command_queue_hw_base.inl index 864d5dceb0..b7c13db17f 100644 --- a/opencl/source/command_queue/command_queue_hw_base.inl +++ b/opencl/source/command_queue/command_queue_hw_base.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/blit_commands_helper.h" +#include "helpers/blit_commands_helper.h" #include "opencl/source/built_ins/aux_translation_builtin.h" #include "opencl/source/command_queue/enqueue_barrier.h" #include "opencl/source/command_queue/enqueue_copy_buffer.h" diff --git a/opencl/source/command_queue/cpu_data_transfer_handler.cpp b/opencl/source/command_queue/cpu_data_transfer_handler.cpp index 5708ff893c..9baab2d334 100644 --- a/opencl/source/command_queue/cpu_data_transfer_handler.cpp +++ b/opencl/source/command_queue/cpu_data_transfer_handler.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" -#include "core/helpers/get_info.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" +#include "helpers/get_info.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/event/event.h" diff --git a/opencl/source/command_queue/enqueue_barrier.h b/opencl/source/command_queue/enqueue_barrier.h index 584a614ec3..c8a207c8c6 100644 --- a/opencl/source/command_queue/enqueue_barrier.h +++ b/opencl/source/command_queue/enqueue_barrier.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" -#include "core/memory_manager/surface.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" +#include "memory_manager/surface.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/event.h" diff --git a/opencl/source/command_queue/enqueue_common.h b/opencl/source/command_queue/enqueue_common.h index f146efa240..84aa1caeff 100644 --- a/opencl/source/command_queue/enqueue_common.h +++ b/opencl/source/command_queue/enqueue_common.h @@ -6,16 +6,16 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/array_count.h" -#include "core/helpers/engine_node_helper.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_manager.h" -#include "core/memory_manager/surface.h" -#include "core/os_interface/os_context.h" -#include "core/program/sync_buffer_handler.h" -#include "core/utilities/range.h" -#include "core/utilities/tag_allocator.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/array_count.h" +#include "helpers/engine_node_helper.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_manager.h" +#include "memory_manager/surface.h" +#include "os_interface/os_context.h" +#include "program/sync_buffer_handler.h" +#include "utilities/range.h" +#include "utilities/tag_allocator.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/builtin_kernels_simulation/scheduler_simulation.h" diff --git a/opencl/source/command_queue/enqueue_copy_buffer.h b/opencl/source/command_queue/enqueue_copy_buffer.h index 9d5cde5199..2a1da97dbe 100644 --- a/opencl/source/command_queue/enqueue_copy_buffer.h +++ b/opencl/source/command_queue/enqueue_copy_buffer.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/enqueue_common.h" diff --git a/opencl/source/command_queue/enqueue_copy_buffer_rect.h b/opencl/source/command_queue/enqueue_copy_buffer_rect.h index 97137dc9dd..1a6938a8a0 100644 --- a/opencl/source/command_queue/enqueue_copy_buffer_rect.h +++ b/opencl/source/command_queue/enqueue_copy_buffer_rect.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/source/command_queue/enqueue_copy_buffer_to_image.h b/opencl/source/command_queue/enqueue_copy_buffer_to_image.h index 9353839125..40e55fa0a1 100644 --- a/opencl/source/command_queue/enqueue_copy_buffer_to_image.h +++ b/opencl/source/command_queue/enqueue_copy_buffer_to_image.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/source/command_queue/enqueue_copy_image.h b/opencl/source/command_queue/enqueue_copy_image.h index 2685db1663..ed2f0fe828 100644 --- a/opencl/source/command_queue/enqueue_copy_image.h +++ b/opencl/source/command_queue/enqueue_copy_image.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/basic_math.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/basic_math.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/source/command_queue/enqueue_copy_image_to_buffer.h b/opencl/source/command_queue/enqueue_copy_image_to_buffer.h index 36f669fbe7..459653b54e 100644 --- a/opencl/source/command_queue/enqueue_copy_image_to_buffer.h +++ b/opencl/source/command_queue/enqueue_copy_image_to_buffer.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/source/command_queue/enqueue_fill_buffer.h b/opencl/source/command_queue/enqueue_fill_buffer.h index 37208b2cc6..d91ea568d3 100644 --- a/opencl/source/command_queue/enqueue_fill_buffer.h +++ b/opencl/source/command_queue/enqueue_fill_buffer.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_manager.h" +#include "command_stream/command_stream_receiver.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/source/command_queue/enqueue_fill_image.h b/opencl/source/command_queue/enqueue_fill_image.h index 3428ce8bf5..9a9c090f5a 100644 --- a/opencl/source/command_queue/enqueue_fill_image.h +++ b/opencl/source/command_queue/enqueue_fill_image.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/basic_math.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/basic_math.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/source/command_queue/enqueue_kernel.h b/opencl/source/command_queue/enqueue_kernel.h index 7803d80c7a..a470f55892 100644 --- a/opencl/source/command_queue/enqueue_kernel.h +++ b/opencl/source/command_queue/enqueue_kernel.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/gpgpu_walker.h" diff --git a/opencl/source/command_queue/enqueue_marker.h b/opencl/source/command_queue/enqueue_marker.h index 06c5cf10c0..87756199cd 100644 --- a/opencl/source/command_queue/enqueue_marker.h +++ b/opencl/source/command_queue/enqueue_marker.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/event/event.h" diff --git a/opencl/source/command_queue/enqueue_migrate_mem_objects.h b/opencl/source/command_queue/enqueue_migrate_mem_objects.h index e35b13cb46..3aab0df243 100644 --- a/opencl/source/command_queue/enqueue_migrate_mem_objects.h +++ b/opencl/source/command_queue/enqueue_migrate_mem_objects.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" -#include "core/memory_manager/surface.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" +#include "memory_manager/surface.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/event/event.h" diff --git a/opencl/source/command_queue/enqueue_read_buffer.h b/opencl/source/command_queue/enqueue_read_buffer.h index 8969caa096..94349cf837 100644 --- a/opencl/source/command_queue/enqueue_read_buffer.h +++ b/opencl/source/command_queue/enqueue_read_buffer.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/cache_policy.h" -#include "core/memory_manager/unified_memory_manager.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/cache_policy.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/enqueue_common.h" diff --git a/opencl/source/command_queue/enqueue_read_buffer_rect.h b/opencl/source/command_queue/enqueue_read_buffer_rect.h index 3adbc234af..731a0793ca 100644 --- a/opencl/source/command_queue/enqueue_read_buffer_rect.h +++ b/opencl/source/command_queue/enqueue_read_buffer_rect.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/enqueue_common.h" diff --git a/opencl/source/command_queue/enqueue_read_image.h b/opencl/source/command_queue/enqueue_read_image.h index 8bd43b118a..4a925c5d6a 100644 --- a/opencl/source/command_queue/enqueue_read_image.h +++ b/opencl/source/command_queue/enqueue_read_image.h @@ -6,10 +6,10 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/cache_policy.h" -#include "core/memory_manager/graphics_allocation.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/basic_math.h" +#include "helpers/cache_policy.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/context/context.h" diff --git a/opencl/source/command_queue/enqueue_svm.h b/opencl/source/command_queue/enqueue_svm.h index 47f2560bce..0ff734d849 100644 --- a/opencl/source/command_queue/enqueue_svm.h +++ b/opencl/source/command_queue/enqueue_svm.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/memory_manager/surface.h" -#include "core/memory_manager/unified_memory_manager.h" +#include "memory_manager/surface.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/enqueue_common.h" diff --git a/opencl/source/command_queue/enqueue_write_buffer.h b/opencl/source/command_queue/enqueue_write_buffer.h index e7f3a37732..53ae7f4e8c 100644 --- a/opencl/source/command_queue/enqueue_write_buffer.h +++ b/opencl/source/command_queue/enqueue_write_buffer.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/string.h" -#include "core/memory_manager/unified_memory_manager.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/string.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/source/command_queue/enqueue_write_buffer_rect.h b/opencl/source/command_queue/enqueue_write_buffer_rect.h index 1ffcbfe7a8..46f4c6aa37 100644 --- a/opencl/source/command_queue/enqueue_write_buffer_rect.h +++ b/opencl/source/command_queue/enqueue_write_buffer_rect.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/source/command_queue/enqueue_write_image.h b/opencl/source/command_queue/enqueue_write_image.h index 416a72ddc3..a2c71aec16 100644 --- a/opencl/source/command_queue/enqueue_write_image.h +++ b/opencl/source/command_queue/enqueue_write_image.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/basic_math.h" -#include "core/memory_manager/graphics_allocation.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/basic_math.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/source/command_queue/finish.h b/opencl/source/command_queue/finish.h index 3dbd0b1165..22c2b684c6 100644 --- a/opencl/source/command_queue/finish.h +++ b/opencl/source/command_queue/finish.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include "opencl/source/command_queue/command_queue_hw.h" namespace NEO { diff --git a/opencl/source/command_queue/gpgpu_walker.h b/opencl/source/command_queue/gpgpu_walker.h index d24b2eb944..64cbcbd2c8 100644 --- a/opencl/source/command_queue/gpgpu_walker.h +++ b/opencl/source/command_queue/gpgpu_walker.h @@ -7,13 +7,13 @@ #pragma once -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/preemption.h" -#include "core/helpers/register_offsets.h" -#include "core/helpers/timestamp_packet.h" -#include "core/helpers/vec.h" -#include "core/indirect_heap/indirect_heap.h" -#include "core/utilities/tag_allocator.h" +#include "command_stream/linear_stream.h" +#include "command_stream/preemption.h" +#include "helpers/register_offsets.h" +#include "helpers/timestamp_packet.h" +#include "helpers/vec.h" +#include "indirect_heap/indirect_heap.h" +#include "utilities/tag_allocator.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" diff --git a/opencl/source/command_queue/gpgpu_walker_base.inl b/opencl/source/command_queue/gpgpu_walker_base.inl index 5d388fb24d..1bc9ca1aa5 100644 --- a/opencl/source/command_queue/gpgpu_walker_base.inl +++ b/opencl/source/command_queue/gpgpu_walker_base.inl @@ -6,15 +6,15 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/engine_node_helper.h" -#include "core/helpers/hw_helper.h" -#include "core/indirect_heap/indirect_heap.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/os_interface/os_context.h" -#include "core/utilities/tag_allocator.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/aligned_memory.h" +#include "helpers/debug_helpers.h" +#include "helpers/engine_node_helper.h" +#include "helpers/hw_helper.h" +#include "indirect_heap/indirect_heap.h" +#include "memory_manager/graphics_allocation.h" +#include "os_interface/os_context.h" +#include "utilities/tag_allocator.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/command_queue/local_id_gen.h" diff --git a/opencl/source/command_queue/gpgpu_walker_bdw_plus.inl b/opencl/source/command_queue/gpgpu_walker_bdw_plus.inl index 01c132d319..7f2b8b2b7b 100644 --- a/opencl/source/command_queue/gpgpu_walker_bdw_plus.inl +++ b/opencl/source/command_queue/gpgpu_walker_bdw_plus.inl @@ -6,8 +6,8 @@ */ #pragma once -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/simd_helper.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/simd_helper.h" #include "opencl/source/command_queue/gpgpu_walker_base.inl" #include "opencl/source/device/cl_device.h" diff --git a/opencl/source/command_queue/hardware_interface.h b/opencl/source/command_queue/hardware_interface.h index 06d4af0df1..5b4640e5d2 100644 --- a/opencl/source/command_queue/hardware_interface.h +++ b/opencl/source/command_queue/hardware_interface.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/preemption_mode.h" +#include "command_stream/preemption_mode.h" #include "CL/cl.h" diff --git a/opencl/source/command_queue/hardware_interface_base.inl b/opencl/source/command_queue/hardware_interface_base.inl index 2775f03648..2b43bc3c01 100644 --- a/opencl/source/command_queue/hardware_interface_base.inl +++ b/opencl/source/command_queue/hardware_interface_base.inl @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/internal_allocation_storage.h" +#include "memory_manager/internal_allocation_storage.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/command_queue/hardware_interface.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/source/command_queue/hardware_interface_bdw_plus.inl b/opencl/source/command_queue/hardware_interface_bdw_plus.inl index b3ce083115..a379460048 100644 --- a/opencl/source/command_queue/hardware_interface_bdw_plus.inl +++ b/opencl/source/command_queue/hardware_interface_bdw_plus.inl @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/engine_node_helper.h" -#include "core/os_interface/os_context.h" +#include "helpers/engine_node_helper.h" +#include "os_interface/os_context.h" #include "opencl/source/command_queue/hardware_interface_base.inl" namespace NEO { diff --git a/opencl/source/command_queue/local_id_gen.cpp b/opencl/source/command_queue/local_id_gen.cpp index a3d710f82d..643ef5dd7c 100644 --- a/opencl/source/command_queue/local_id_gen.cpp +++ b/opencl/source/command_queue/local_id_gen.cpp @@ -7,8 +7,8 @@ #include "opencl/source/command_queue/local_id_gen.h" -#include "core/helpers/aligned_memory.h" -#include "core/utilities/cpu_info.h" +#include "helpers/aligned_memory.h" +#include "utilities/cpu_info.h" #include diff --git a/opencl/source/command_queue/local_id_gen.h b/opencl/source/command_queue/local_id_gen.h index 72e98d5fa9..19d23dabfb 100644 --- a/opencl/source/command_queue/local_id_gen.h +++ b/opencl/source/command_queue/local_id_gen.h @@ -7,7 +7,7 @@ #pragma once -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include #include diff --git a/opencl/source/command_queue/local_work_size.cpp b/opencl/source/command_queue/local_work_size.cpp index fd380a57b2..af7ce8a31f 100644 --- a/opencl/source/command_queue/local_work_size.cpp +++ b/opencl/source/command_queue/local_work_size.cpp @@ -5,10 +5,10 @@ * */ -#include "core/device/device.h" -#include "core/helpers/array_count.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/debug_helpers.h" +#include "device/device.h" +#include "helpers/array_count.h" +#include "helpers/basic_math.h" +#include "helpers/debug_helpers.h" #include "opencl/source/context/context.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/kernel/kernel.h" diff --git a/opencl/source/command_stream/aub_command_stream_receiver.cpp b/opencl/source/command_stream/aub_command_stream_receiver.cpp index c4c6a4bf60..f8376bbbdf 100644 --- a/opencl/source/command_stream/aub_command_stream_receiver.cpp +++ b/opencl/source/command_stream/aub_command_stream_receiver.cpp @@ -7,12 +7,12 @@ #include "opencl/source/command_stream/aub_command_stream_receiver.h" -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/options.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/debug_helpers.h" +#include "helpers/hw_helper.h" +#include "helpers/hw_info.h" +#include "helpers/options.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/os_interface/os_inc_base.h" diff --git a/opencl/source/command_stream/aub_command_stream_receiver_hw.h b/opencl/source/command_stream/aub_command_stream_receiver_hw.h index db623654c8..35b082a5cd 100644 --- a/opencl/source/command_stream/aub_command_stream_receiver_hw.h +++ b/opencl/source/command_stream/aub_command_stream_receiver_hw.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/array_count.h" -#include "core/utilities/spinlock.h" +#include "helpers/array_count.h" +#include "utilities/spinlock.h" #include "opencl/source/aub/aub_center.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/gen_common/aub_mapper.h" diff --git a/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl b/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl index fe3bfeee9d..0104d9768a 100644 --- a/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl +++ b/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl @@ -5,19 +5,19 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/engine_node_helper.h" -#include "core/helpers/hash.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/string.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/memory_constants.h" -#include "core/os_interface/os_context.h" +#include "command_stream/command_stream_receiver.h" +#include "debug_settings/debug_settings_manager.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/aligned_memory.h" +#include "helpers/debug_helpers.h" +#include "helpers/engine_node_helper.h" +#include "helpers/hash.h" +#include "helpers/ptr_math.h" +#include "helpers/string.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/memory_constants.h" +#include "os_interface/os_context.h" #include "opencl/source/aub/aub_helper.h" #include "opencl/source/aub_mem_dump/aub_alloc_dump.h" #include "opencl/source/aub_mem_dump/aub_alloc_dump.inl" diff --git a/opencl/source/command_stream/aub_subcapture.cpp b/opencl/source/command_stream/aub_subcapture.cpp index 2c1362e071..fa856f2530 100644 --- a/opencl/source/command_stream/aub_subcapture.cpp +++ b/opencl/source/command_stream/aub_subcapture.cpp @@ -7,7 +7,7 @@ #include "opencl/source/command_stream/aub_subcapture.h" -#include "core/utilities/debug_settings_reader.h" +#include "utilities/debug_settings_reader.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/os_interface/ocl_reg_path.h" diff --git a/opencl/source/command_stream/aub_subcapture.h b/opencl/source/command_stream/aub_subcapture.h index 927887162f..e0deba014a 100644 --- a/opencl/source/command_stream/aub_subcapture.h +++ b/opencl/source/command_stream/aub_subcapture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/aub_subcapture_status.h" +#include "command_stream/aub_subcapture_status.h" #include #include diff --git a/opencl/source/command_stream/command_stream_receiver_simulated_common_hw.h b/opencl/source/command_stream/command_stream_receiver_simulated_common_hw.h index 94ec6d48bb..905292a632 100644 --- a/opencl/source/command_stream/command_stream_receiver_simulated_common_hw.h +++ b/opencl/source/command_stream/command_stream_receiver_simulated_common_hw.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver_hw.h" +#include "command_stream/command_stream_receiver_hw.h" #include "opencl/source/gen_common/aub_mapper.h" #include "opencl/source/memory_manager/memory_banks.h" diff --git a/opencl/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl b/opencl/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl index b1e6275105..91f7e2db07 100644 --- a/opencl/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl +++ b/opencl/source/command_stream/command_stream_receiver_simulated_common_hw_base.inl @@ -5,12 +5,12 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/resource_info.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/os_context.h" +#include "debug_settings/debug_settings_manager.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/resource_info.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/os_context.h" #include "opencl/source/aub/aub_helper.h" #include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/command_stream_receiver_simulated_common_hw.h" diff --git a/opencl/source/command_stream/command_stream_receiver_with_aub_dump.h b/opencl/source/command_stream/command_stream_receiver_with_aub_dump.h index 79c16b3ecf..f463b82e60 100644 --- a/opencl/source/command_stream/command_stream_receiver_with_aub_dump.h +++ b/opencl/source/command_stream/command_stream_receiver_with_aub_dump.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include diff --git a/opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl b/opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl index 5b4a7afdaf..4477cb6002 100644 --- a/opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl +++ b/opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl @@ -5,8 +5,8 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" #include "opencl/source/aub/aub_center.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" diff --git a/opencl/source/command_stream/create_command_stream_impl.cpp b/opencl/source/command_stream/create_command_stream_impl.cpp index a65b523d23..e6d5f573ae 100644 --- a/opencl/source/command_stream/create_command_stream_impl.cpp +++ b/opencl/source/command_stream/create_command_stream_impl.cpp @@ -5,9 +5,9 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/os_interface/device_factory.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "os_interface/device_factory.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.h" diff --git a/opencl/source/command_stream/create_command_stream_impl.h b/opencl/source/command_stream/create_command_stream_impl.h index 6ff2a12ff1..8ceae33087 100644 --- a/opencl/source/command_stream/create_command_stream_impl.h +++ b/opencl/source/command_stream/create_command_stream_impl.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" namespace NEO { class ExecutionEnvironment; diff --git a/opencl/source/command_stream/device_command_stream.h b/opencl/source/command_stream/device_command_stream.h index f890d358ee..c8cbeda18b 100644 --- a/opencl/source/command_stream/device_command_stream.h +++ b/opencl/source/command_stream/device_command_stream.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver_hw.h" +#include "command_stream/command_stream_receiver_hw.h" namespace NEO { diff --git a/opencl/source/command_stream/per_dss_backed_buffer.cpp b/opencl/source/command_stream/per_dss_backed_buffer.cpp index f2d916b5ba..5f0c4190b6 100644 --- a/opencl/source/command_stream/per_dss_backed_buffer.cpp +++ b/opencl/source/command_stream/per_dss_backed_buffer.cpp @@ -5,7 +5,7 @@ * */ -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" namespace NEO { diff --git a/opencl/source/command_stream/tbx_command_stream_receiver.cpp b/opencl/source/command_stream/tbx_command_stream_receiver.cpp index 966610b0f5..d2f81f2d4d 100644 --- a/opencl/source/command_stream/tbx_command_stream_receiver.cpp +++ b/opencl/source/command_stream/tbx_command_stream_receiver.cpp @@ -7,9 +7,9 @@ #include "opencl/source/command_stream/tbx_command_stream_receiver.h" -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/hw_info.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/hw_info.h" #include diff --git a/opencl/source/command_stream/tbx_command_stream_receiver_hw.inl b/opencl/source/command_stream/tbx_command_stream_receiver_hw.inl index f654973717..0b847b7ce4 100644 --- a/opencl/source/command_stream/tbx_command_stream_receiver_hw.inl +++ b/opencl/source/command_stream/tbx_command_stream_receiver_hw.inl @@ -5,16 +5,16 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/memory_constants.h" -#include "core/os_interface/os_context.h" +#include "debug_settings/debug_settings_manager.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/aligned_memory.h" +#include "helpers/debug_helpers.h" +#include "helpers/hw_helper.h" +#include "helpers/ptr_math.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/memory_constants.h" +#include "os_interface/os_context.h" #include "opencl/source/aub/aub_center.h" #include "opencl/source/aub/aub_helper.h" #include "opencl/source/aub_mem_dump/page_table_entry_bits.h" diff --git a/opencl/source/command_stream/tbx_stream.cpp b/opencl/source/command_stream/tbx_stream.cpp index 74ec66e2f8..c4e851e1b0 100644 --- a/opencl/source/command_stream/tbx_stream.cpp +++ b/opencl/source/command_stream/tbx_stream.cpp @@ -5,8 +5,8 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/debug_helpers.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/debug_helpers.h" #include "opencl/source/aub/aub_helper.h" #include "opencl/source/command_stream/tbx_command_stream_receiver.h" #include "opencl/source/tbx/tbx_sockets.h" diff --git a/opencl/source/compiler_interface/default_cache_config.cpp b/opencl/source/compiler_interface/default_cache_config.cpp index c1c1bbb82c..1254930317 100644 --- a/opencl/source/compiler_interface/default_cache_config.cpp +++ b/opencl/source/compiler_interface/default_cache_config.cpp @@ -5,7 +5,7 @@ * */ -#include "core/compiler_interface/default_cache_config.h" +#include "compiler_interface/default_cache_config.h" #include "opencl/source/compiler_interface/default_cl_cache_config.h" diff --git a/opencl/source/compiler_interface/default_cl_cache_config.cpp b/opencl/source/compiler_interface/default_cl_cache_config.cpp index 3cd2bb527b..e68c567b44 100644 --- a/opencl/source/compiler_interface/default_cl_cache_config.cpp +++ b/opencl/source/compiler_interface/default_cl_cache_config.cpp @@ -7,7 +7,7 @@ #include "default_cl_cache_config.h" -#include "core/utilities/debug_settings_reader.h" +#include "utilities/debug_settings_reader.h" #include "opencl/source/os_interface/ocl_reg_path.h" #include "config.h" diff --git a/opencl/source/compiler_interface/default_cl_cache_config.h b/opencl/source/compiler_interface/default_cl_cache_config.h index c4db54c235..ec0ae09016 100644 --- a/opencl/source/compiler_interface/default_cl_cache_config.h +++ b/opencl/source/compiler_interface/default_cl_cache_config.h @@ -7,7 +7,7 @@ #pragma once -#include "core/compiler_interface/compiler_cache.h" +#include "compiler_interface/compiler_cache.h" namespace NEO { diff --git a/opencl/source/context/context.cpp b/opencl/source/context/context.cpp index 64e90c0f6d..b557fe59ef 100644 --- a/opencl/source/context/context.cpp +++ b/opencl/source/context/context.cpp @@ -7,15 +7,15 @@ #include "opencl/source/context/context.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/compiler_interface/compiler_interface.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/get_info.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/string.h" -#include "core/memory_manager/deferred_deleter.h" -#include "core/memory_manager/memory_manager.h" -#include "core/memory_manager/unified_memory_manager.h" +#include "command_stream/command_stream_receiver.h" +#include "compiler_interface/compiler_interface.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/get_info.h" +#include "helpers/ptr_math.h" +#include "helpers/string.h" +#include "memory_manager/deferred_deleter.h" +#include "memory_manager/memory_manager.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/device/cl_device.h" diff --git a/opencl/source/context/context.h b/opencl/source/context/context.h index 1795ad06fa..c27e2b93c0 100644 --- a/opencl/source/context/context.h +++ b/opencl/source/context/context.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include "opencl/source/context/context_type.h" #include "opencl/source/context/driver_diagnostics.h" #include "opencl/source/device/cl_device_vector.h" diff --git a/opencl/source/context/context_extra.cpp b/opencl/source/context/context_extra.cpp index 6eefb39d0b..6f74a5d145 100644 --- a/opencl/source/context/context_extra.cpp +++ b/opencl/source/context/context_extra.cpp @@ -5,7 +5,7 @@ * */ -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include "opencl/source/context/context.h" #include "opencl/source/mem_obj/mem_obj.h" diff --git a/opencl/source/context/driver_diagnostics.cpp b/opencl/source/context/driver_diagnostics.cpp index 48733b217d..fdabaa7b83 100644 --- a/opencl/source/context/driver_diagnostics.cpp +++ b/opencl/source/context/driver_diagnostics.cpp @@ -7,7 +7,7 @@ #include "driver_diagnostics.h" -#include "core/helpers/debug_helpers.h" +#include "helpers/debug_helpers.h" namespace NEO { diff --git a/opencl/source/device/cl_device.cpp b/opencl/source/device/cl_device.cpp index 7528935cb6..ff8c9b85d3 100644 --- a/opencl/source/device/cl_device.cpp +++ b/opencl/source/device/cl_device.cpp @@ -7,11 +7,11 @@ #include "opencl/source/device/cl_device.h" -#include "core/device/device.h" -#include "core/device/sub_device.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/os_interface/os_interface.h" -#include "core/program/sync_buffer_handler.h" +#include "device/device.h" +#include "device/sub_device.h" +#include "execution_environment/root_device_environment.h" +#include "os_interface/os_interface.h" +#include "program/sync_buffer_handler.h" #include "opencl/source/platform/extensions.h" #include "opencl/source/platform/platform.h" #include "opencl/source/source_level_debugger/source_level_debugger.h" diff --git a/opencl/source/device/cl_device.h b/opencl/source/device/cl_device.h index bccbb0171b..871dd27d79 100644 --- a/opencl/source/device/cl_device.h +++ b/opencl/source/device/cl_device.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/command_stream/preemption_mode.h" -#include "core/utilities/reference_tracked_object.h" +#include "command_stream/preemption_mode.h" +#include "utilities/reference_tracked_object.h" #include "opencl/source/api/cl_types.h" #include "opencl/source/device/device_info_map.h" #include "opencl/source/helpers/base_object.h" diff --git a/opencl/source/device/device_caps.cpp b/opencl/source/device/device_caps.cpp index 73e8050fc0..240d3626dd 100644 --- a/opencl/source/device/device_caps.cpp +++ b/opencl/source/device/device_caps.cpp @@ -5,13 +5,13 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/hw_info_config.h" -#include "core/os_interface/os_interface.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" +#include "helpers/basic_math.h" +#include "helpers/hw_helper.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/hw_info_config.h" +#include "os_interface/os_interface.h" #include "opencl/source/device/driver_info.h" #include "opencl/source/platform/extensions.h" #include "opencl/source/sharings/sharing_factory.h" diff --git a/opencl/source/device/device_info.cpp b/opencl/source/device/device_info.cpp index 0015ae8364..ee10939821 100644 --- a/opencl/source/device/device_info.cpp +++ b/opencl/source/device/device_info.cpp @@ -7,9 +7,9 @@ #include "opencl/source/device/device_info.h" -#include "core/device/device.h" -#include "core/helpers/get_info.h" -#include "core/os_interface/os_time.h" +#include "device/device.h" +#include "helpers/get_info.h" +#include "os_interface/os_time.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/device/cl_device_vector.h" #include "opencl/source/device/device_info_map.h" diff --git a/opencl/source/device/linux/fp64_override.cpp b/opencl/source/device/linux/fp64_override.cpp index 5bf18f6681..1dfb7172a7 100644 --- a/opencl/source/device/linux/fp64_override.cpp +++ b/opencl/source/device/linux/fp64_override.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/debug_settings_reader_creator.h" +#include "utilities/debug_settings_reader_creator.h" #include "opencl/source/os_interface/ocl_reg_path.h" namespace NEO { diff --git a/opencl/source/device_queue/device_queue.cpp b/opencl/source/device_queue/device_queue.cpp index 5feeb33b92..d234da0406 100644 --- a/opencl/source/device_queue/device_queue.cpp +++ b/opencl/source/device_queue/device_queue.cpp @@ -7,8 +7,8 @@ #include "opencl/source/device_queue/device_queue.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/memory_manager.h" +#include "helpers/hw_helper.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/device_queue/device_queue_hw.h" diff --git a/opencl/source/device_queue/device_queue.h b/opencl/source/device_queue/device_queue.h index a7095c6991..f083488617 100644 --- a/opencl/source/device_queue/device_queue.h +++ b/opencl/source/device_queue/device_queue.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/helpers/hw_info.h" -#include "core/indirect_heap/indirect_heap.h" -#include "core/memory_manager/graphics_allocation.h" +#include "helpers/hw_info.h" +#include "indirect_heap/indirect_heap.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/api/cl_types.h" #include "opencl/source/execution_model/device_enqueue.h" #include "opencl/source/helpers/base_object.h" diff --git a/opencl/source/device_queue/device_queue_hw.h b/opencl/source/device_queue/device_queue_hw.h index 9a8728d5ce..5de6403c2a 100644 --- a/opencl/source/device_queue/device_queue_hw.h +++ b/opencl/source/device_queue/device_queue_hw.h @@ -6,10 +6,10 @@ */ #pragma once -#include "core/command_stream/linear_stream.h" -#include "core/helpers/hw_cmds.h" -#include "core/helpers/ptr_math.h" -#include "core/indirect_heap/indirect_heap.h" +#include "command_stream/linear_stream.h" +#include "helpers/hw_cmds.h" +#include "helpers/ptr_math.h" +#include "indirect_heap/indirect_heap.h" #include "opencl/source/device_queue/device_queue.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/program/program.h" diff --git a/opencl/source/device_queue/device_queue_hw_base.inl b/opencl/source/device_queue/device_queue_hw_base.inl index caad4b52f9..2c1b2d501c 100644 --- a/opencl/source/device_queue/device_queue_hw_base.inl +++ b/opencl/source/device_queue/device_queue_hw_base.inl @@ -6,11 +6,11 @@ */ #pragma once -#include "core/helpers/hw_helper.h" -#include "core/helpers/preamble.h" -#include "core/helpers/string.h" -#include "core/memory_manager/memory_manager.h" -#include "core/utilities/tag_allocator.h" +#include "helpers/hw_helper.h" +#include "helpers/preamble.h" +#include "helpers/string.h" +#include "memory_manager/memory_manager.h" +#include "utilities/tag_allocator.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/source/dll/create_command_stream.cpp b/opencl/source/dll/create_command_stream.cpp index e309b5c666..84ac2908ac 100644 --- a/opencl/source/dll/create_command_stream.cpp +++ b/opencl/source/dll/create_command_stream.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.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/create_command_stream_impl.h" diff --git a/opencl/source/dll/create_deferred_deleter.cpp b/opencl/source/dll/create_deferred_deleter.cpp index 777c2e5245..76b8e335be 100644 --- a/opencl/source/dll/create_deferred_deleter.cpp +++ b/opencl/source/dll/create_deferred_deleter.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/deferred_deleter.h" +#include "memory_manager/deferred_deleter.h" namespace NEO { std::unique_ptr createDeferredDeleter() { diff --git a/opencl/source/dll/debug_manager.cpp b/opencl/source/dll/debug_manager.cpp index ce12095ef6..bfaf81835d 100644 --- a/opencl/source/dll/debug_manager.cpp +++ b/opencl/source/dll/debug_manager.cpp @@ -5,7 +5,7 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include "opencl/source/os_interface/ocl_reg_path.h" using namespace std; diff --git a/opencl/source/dll/debugger.cpp b/opencl/source/dll/debugger.cpp index f6cc21d76c..e29c200e4a 100644 --- a/opencl/source/dll/debugger.cpp +++ b/opencl/source/dll/debugger.cpp @@ -5,10 +5,10 @@ * */ -#include "core/debugger/debugger.h" +#include "debugger/debugger.h" -#include "core/built_ins/sip_kernel_type.h" -#include "core/helpers/hw_info.h" +#include "built_ins/sip_kernel_type.h" +#include "helpers/hw_info.h" #include "opencl/source/built_ins/sip.h" #include "opencl/source/source_level_debugger/source_level_debugger.h" diff --git a/opencl/source/dll/get_devices.cpp b/opencl/source/dll/get_devices.cpp index d47c689572..523798a8dd 100644 --- a/opencl/source/dll/get_devices.cpp +++ b/opencl/source/dll/get_devices.cpp @@ -5,8 +5,8 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/os_interface/device_factory.h" +#include "execution_environment/execution_environment.h" +#include "os_interface/device_factory.h" #include "opencl/source/command_stream/create_command_stream_impl.h" namespace NEO { diff --git a/opencl/source/dll/linux/allocator_helper.cpp b/opencl/source/dll/linux/allocator_helper.cpp index 68dfb33599..3d7b3ca61c 100644 --- a/opencl/source/dll/linux/allocator_helper.cpp +++ b/opencl/source/dll/linux/allocator_helper.cpp @@ -5,10 +5,10 @@ * */ -#include "core/os_interface/linux/allocator_helper.h" +#include "os_interface/linux/allocator_helper.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/basic_math.h" +#include "helpers/aligned_memory.h" +#include "helpers/basic_math.h" namespace NEO { diff --git a/opencl/source/dll/linux/create_drm_memory_manager.cpp b/opencl/source/dll/linux/create_drm_memory_manager.cpp index 277de635f3..07372d8d7e 100644 --- a/opencl/source/dll/linux/create_drm_memory_manager.cpp +++ b/opencl/source/dll/linux/create_drm_memory_manager.cpp @@ -5,11 +5,11 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/linux/drm_memory_manager.h" -#include "core/os_interface/linux/os_interface.h" -#include "core/os_interface/os_interface.h" +#include "execution_environment/execution_environment.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/linux/drm_memory_manager.h" +#include "os_interface/linux/os_interface.h" +#include "os_interface/os_interface.h" namespace NEO { std::unique_ptr MemoryManager::createMemoryManager(ExecutionEnvironment &executionEnvironment) { diff --git a/opencl/source/dll/linux/drm_neo_create.cpp b/opencl/source/dll/linux/drm_neo_create.cpp index 5953824851..e530c18384 100644 --- a/opencl/source/dll/linux/drm_neo_create.cpp +++ b/opencl/source/dll/linux/drm_neo_create.cpp @@ -5,15 +5,15 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/hw_cmds.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/hw_info.h" -#include "core/os_interface/linux/drm_neo.h" -#include "core/os_interface/linux/drm_null_device.h" +#include "debug_settings/debug_settings_manager.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/hw_cmds.h" +#include "helpers/hw_helper.h" +#include "helpers/hw_info.h" +#include "os_interface/linux/drm_neo.h" +#include "os_interface/linux/drm_null_device.h" #include "drm/i915_drm.h" diff --git a/opencl/source/dll/linux/options_linux.cpp b/opencl/source/dll/linux/options_linux.cpp index 210dc73a98..9c7316aa26 100644 --- a/opencl/source/dll/linux/options_linux.cpp +++ b/opencl/source/dll/linux/options_linux.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "External/Common/GmmLibDllName.h" #include "igc.opencl.h" diff --git a/opencl/source/dll/linux/os_interface.cpp b/opencl/source/dll/linux/os_interface.cpp index 79c4b0f2a4..7771bc93fd 100644 --- a/opencl/source/dll/linux/os_interface.cpp +++ b/opencl/source/dll/linux/os_interface.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/os_interface.h" +#include "os_interface/linux/os_interface.h" namespace NEO { diff --git a/opencl/source/dll/windows/create_wddm_memory_manager.cpp b/opencl/source/dll/windows/create_wddm_memory_manager.cpp index 5995633644..2d26382b34 100644 --- a/opencl/source/dll/windows/create_wddm_memory_manager.cpp +++ b/opencl/source/dll/windows/create_wddm_memory_manager.cpp @@ -5,12 +5,12 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/execution_environment/execution_environment.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/os_interface.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm_memory_manager.h" +#include "debug_settings/debug_settings_manager.h" +#include "execution_environment/execution_environment.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/os_interface.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm_memory_manager.h" namespace NEO { std::unique_ptr MemoryManager::createMemoryManager(ExecutionEnvironment &executionEnvironment) { diff --git a/opencl/source/dll/windows/environment_variables.cpp b/opencl/source/dll/windows/environment_variables.cpp index 02ad054dfa..e3c67c2e8b 100644 --- a/opencl/source/dll/windows/environment_variables.cpp +++ b/opencl/source/dll/windows/environment_variables.cpp @@ -7,7 +7,7 @@ #include "opencl/source/os_interface/windows/environment_variables.h" -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include diff --git a/opencl/source/dll/windows/os_interface.cpp b/opencl/source/dll/windows/os_interface.cpp index 91e845e73b..0e9c62bc69 100644 --- a/opencl/source/dll/windows/os_interface.cpp +++ b/opencl/source/dll/windows/os_interface.cpp @@ -5,9 +5,9 @@ * */ -#include "core/os_interface/windows/os_interface.h" +#include "os_interface/windows/os_interface.h" -#include "core/memory_manager/memory_constants.h" +#include "memory_manager/memory_constants.h" namespace NEO { bool OSInterface::osEnableLocalMemory = true; diff --git a/opencl/source/event/async_events_handler.cpp b/opencl/source/event/async_events_handler.cpp index 21ba5a45ea..bb179353ca 100644 --- a/opencl/source/event/async_events_handler.cpp +++ b/opencl/source/event/async_events_handler.cpp @@ -7,8 +7,8 @@ #include "opencl/source/event/async_events_handler.h" -#include "core/helpers/timestamp_packet.h" -#include "core/os_interface/os_thread.h" +#include "helpers/timestamp_packet.h" +#include "os_interface/os_thread.h" #include "opencl/source/event/event.h" #include diff --git a/opencl/source/event/event.cpp b/opencl/source/event/event.cpp index 6e5f4fa963..56faf1fcd2 100644 --- a/opencl/source/event/event.cpp +++ b/opencl/source/event/event.cpp @@ -7,15 +7,15 @@ #include "opencl/source/event/event.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/get_info.h" -#include "core/helpers/timestamp_packet.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/utilities/range.h" -#include "core/utilities/stackvec.h" -#include "core/utilities/tag_allocator.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" +#include "helpers/aligned_memory.h" +#include "helpers/get_info.h" +#include "helpers/timestamp_packet.h" +#include "memory_manager/internal_allocation_storage.h" +#include "utilities/range.h" +#include "utilities/stackvec.h" +#include "utilities/tag_allocator.h" #include "opencl/source/api/cl_types.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" diff --git a/opencl/source/event/event.h b/opencl/source/event/event.h index b6341c43c0..bf3eae05e3 100644 --- a/opencl/source/event/event.h +++ b/opencl/source/event/event.h @@ -6,11 +6,11 @@ */ #pragma once -#include "core/helpers/flush_stamp.h" -#include "core/os_interface/os_time.h" -#include "core/utilities/arrayref.h" -#include "core/utilities/idlist.h" -#include "core/utilities/iflist.h" +#include "helpers/flush_stamp.h" +#include "os_interface/os_time.h" +#include "utilities/arrayref.h" +#include "utilities/idlist.h" +#include "utilities/iflist.h" #include "opencl/source/api/cl_types.h" #include "opencl/source/event/hw_timestamps.h" #include "opencl/source/helpers/base_object.h" diff --git a/opencl/source/event/event_builder.cpp b/opencl/source/event/event_builder.cpp index edf21eb03b..08999b94e6 100644 --- a/opencl/source/event/event_builder.cpp +++ b/opencl/source/event/event_builder.cpp @@ -7,8 +7,8 @@ #include "opencl/source/event/event_builder.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/timestamp_packet.h" +#include "helpers/debug_helpers.h" +#include "helpers/timestamp_packet.h" #include "opencl/source/api/cl_types.h" #include "opencl/source/context/context.h" #include "opencl/source/event/user_event.h" diff --git a/opencl/source/event/event_builder.h b/opencl/source/event/event_builder.h index 6478c3d6ff..e238dd0c1f 100644 --- a/opencl/source/event/event_builder.h +++ b/opencl/source/event/event_builder.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/utilities/arrayref.h" -#include "core/utilities/stackvec.h" +#include "utilities/arrayref.h" +#include "utilities/stackvec.h" #include "CL/cl.h" diff --git a/opencl/source/event/event_tracker.h b/opencl/source/event/event_tracker.h index 71a3de9b19..0e8a525cb9 100644 --- a/opencl/source/event/event_tracker.h +++ b/opencl/source/event/event_tracker.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/utilities/iflist.h" +#include "utilities/iflist.h" #include "opencl/source/event/event.h" #include diff --git a/opencl/source/event/hw_timestamps.h b/opencl/source/event/hw_timestamps.h index b3fb5cd024..ae447f2244 100644 --- a/opencl/source/event/hw_timestamps.h +++ b/opencl/source/event/hw_timestamps.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/graphics_allocation.h" +#include "memory_manager/graphics_allocation.h" #include diff --git a/opencl/source/event/perf_counter.h b/opencl/source/event/perf_counter.h index 646d6ba02a..1822598b36 100644 --- a/opencl/source/event/perf_counter.h +++ b/opencl/source/event/perf_counter.h @@ -7,7 +7,7 @@ #pragma once -#include "core/memory_manager/graphics_allocation.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/event/hw_timestamps.h" namespace NEO { diff --git a/opencl/source/event/user_event.cpp b/opencl/source/event/user_event.cpp index 804f5515d7..ba430282e8 100644 --- a/opencl/source/event/user_event.cpp +++ b/opencl/source/event/user_event.cpp @@ -7,8 +7,8 @@ #include "user_event.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" diff --git a/opencl/source/gen11/aub_command_stream_receiver_gen11.cpp b/opencl/source/gen11/aub_command_stream_receiver_gen11.cpp index 9637faadc7..49b0a643bc 100644 --- a/opencl/source/gen11/aub_command_stream_receiver_gen11.cpp +++ b/opencl/source/gen11/aub_command_stream_receiver_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/array_count.h" +#include "helpers/array_count.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw_bdw_plus.inl" #include "opencl/source/helpers/base_object.h" diff --git a/opencl/source/gen11/aub_mapper.h b/opencl/source/gen11/aub_mapper.h index 2513aae2a9..92568c3fd0 100644 --- a/opencl/source/gen11/aub_mapper.h +++ b/opencl/source/gen11/aub_mapper.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/memory_constants.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/gen_common/aub_mapper_base.h" #include "engine_node.h" diff --git a/opencl/source/gen11/aub_mem_dump_gen11.cpp b/opencl/source/gen11/aub_mem_dump_gen11.cpp index df9d463007..646198b0f4 100644 --- a/opencl/source/gen11/aub_mem_dump_gen11.cpp +++ b/opencl/source/gen11/aub_mem_dump_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/completion_stamp.h" -#include "core/helpers/hw_helper.h" +#include "helpers/completion_stamp.h" +#include "helpers/hw_helper.h" #include "opencl/source/aub_mem_dump/aub_alloc_dump.inl" #include "opencl/source/aub_mem_dump/aub_mem_dump.inl" diff --git a/opencl/source/gen11/buffer_gen11.cpp b/opencl/source/gen11/buffer_gen11.cpp index e6ac140eb4..5d471ac784 100644 --- a/opencl/source/gen11/buffer_gen11.cpp +++ b/opencl/source/gen11/buffer_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen11/hw_cmds.h" +#include "gen11/hw_cmds.h" #include "opencl/source/mem_obj/buffer_bdw_plus.inl" namespace NEO { diff --git a/opencl/source/gen11/command_queue_gen11.cpp b/opencl/source/gen11/command_queue_gen11.cpp index 890890b5e7..6d675f2b1e 100644 --- a/opencl/source/gen11/command_queue_gen11.cpp +++ b/opencl/source/gen11/command_queue_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/unified_memory_manager.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/command_queue_hw_bdw_plus.inl" #include "opencl/source/command_queue/enqueue_resource_barrier.h" diff --git a/opencl/source/gen11/command_stream_receiver_hw_gen11.cpp b/opencl/source/gen11/command_stream_receiver_hw_gen11.cpp index b1d2fe15fa..65d59f87ec 100644 --- a/opencl/source/gen11/command_stream_receiver_hw_gen11.cpp +++ b/opencl/source/gen11/command_stream_receiver_hw_gen11.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver_hw_bdw_plus.inl" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/blit_commands_helper_bdw_plus.inl" +#include "command_stream/command_stream_receiver_hw_bdw_plus.inl" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/blit_commands_helper_bdw_plus.inl" #include "opencl/source/command_stream/device_command_stream.h" #include "opencl/source/gen11/reg_configs.h" diff --git a/opencl/source/gen11/device_queue_gen11.cpp b/opencl/source/gen11/device_queue_gen11.cpp index 21f5dc18eb..b5c17d210d 100644 --- a/opencl/source/gen11/device_queue_gen11.cpp +++ b/opencl/source/gen11/device_queue_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen11/hw_cmds.h" +#include "gen11/hw_cmds.h" #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/source/device_queue/device_queue_hw_bdw_plus.inl" #include "opencl/source/device_queue/device_queue_hw_profiling.inl" diff --git a/opencl/source/gen11/enable_family_full_ocl_gen11.cpp b/opencl/source/gen11/enable_family_full_ocl_gen11.cpp index 931e165112..b2d151425b 100644 --- a/opencl/source/gen11/enable_family_full_ocl_gen11.cpp +++ b/opencl/source/gen11/enable_family_full_ocl_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" +#include "command_stream/command_stream_receiver_hw.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" diff --git a/opencl/source/gen11/experimental_command_buffer_gen11.cpp b/opencl/source/gen11/experimental_command_buffer_gen11.cpp index b8ff110d66..9d0f60b730 100644 --- a/opencl/source/gen11/experimental_command_buffer_gen11.cpp +++ b/opencl/source/gen11/experimental_command_buffer_gen11.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/experimental_command_buffer.h" -#include "core/command_stream/experimental_command_buffer.inl" -#include "core/helpers/hw_helper.h" +#include "command_stream/experimental_command_buffer.h" +#include "command_stream/experimental_command_buffer.inl" +#include "helpers/hw_helper.h" namespace NEO { typedef ICLFamily GfxFamily; diff --git a/opencl/source/gen11/gpgpu_walker_gen11.cpp b/opencl/source/gen11/gpgpu_walker_gen11.cpp index 9fce79e53f..bc76b5c73f 100644 --- a/opencl/source/gen11/gpgpu_walker_gen11.cpp +++ b/opencl/source/gen11/gpgpu_walker_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen11/hw_info.h" +#include "gen11/hw_info.h" #include "opencl/source/command_queue/gpgpu_walker_bdw_plus.inl" #include "opencl/source/command_queue/hardware_interface_bdw_plus.inl" diff --git a/opencl/source/gen11/hardware_commands_helper_gen11.cpp b/opencl/source/gen11/hardware_commands_helper_gen11.cpp index e54b70dbf4..44b0d30143 100644 --- a/opencl/source/gen11/hardware_commands_helper_gen11.cpp +++ b/opencl/source/gen11/hardware_commands_helper_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/gen11/hw_cmds.h" +#include "debug_settings/debug_settings_manager.h" +#include "gen11/hw_cmds.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/helpers/hardware_commands_helper.inl" #include "opencl/source/helpers/hardware_commands_helper_base.inl" diff --git a/opencl/source/gen11/hw_helper_gen11.cpp b/opencl/source/gen11/hw_helper_gen11.cpp index 1cc4198f4a..60ed297f82 100644 --- a/opencl/source/gen11/hw_helper_gen11.cpp +++ b/opencl/source/gen11/hw_helper_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/flat_batch_buffer_helper_hw.inl" -#include "core/helpers/hw_helper_bdw_plus.inl" +#include "helpers/flat_batch_buffer_helper_hw.inl" +#include "helpers/hw_helper_bdw_plus.inl" #include "opencl/source/aub/aub_helper_bdw_plus.inl" namespace NEO { diff --git a/opencl/source/gen11/hw_info_ehl.inl b/opencl/source/gen11/hw_info_ehl.inl index e9752eb843..732b9b239a 100644 --- a/opencl/source/gen11/hw_info_ehl.inl +++ b/opencl/source/gen11/hw_info_ehl.inl @@ -5,8 +5,8 @@ * */ -#include "core/gen11/hw_cmds.h" -#include "core/memory_manager/memory_constants.h" +#include "gen11/hw_cmds.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/aub_mem_dump/aub_services.h" #include "engine_node.h" diff --git a/opencl/source/gen11/hw_info_icllp.inl b/opencl/source/gen11/hw_info_icllp.inl index c770a22383..619b674d67 100644 --- a/opencl/source/gen11/hw_info_icllp.inl +++ b/opencl/source/gen11/hw_info_icllp.inl @@ -5,8 +5,8 @@ * */ -#include "core/gen11/hw_cmds.h" -#include "core/memory_manager/memory_constants.h" +#include "gen11/hw_cmds.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/aub_mem_dump/aub_services.h" #include "engine_node.h" diff --git a/opencl/source/gen11/hw_info_lkf.inl b/opencl/source/gen11/hw_info_lkf.inl index 5fce42df13..b93c783827 100644 --- a/opencl/source/gen11/hw_info_lkf.inl +++ b/opencl/source/gen11/hw_info_lkf.inl @@ -5,8 +5,8 @@ * */ -#include "core/gen11/hw_cmds_lkf.h" -#include "core/memory_manager/memory_constants.h" +#include "gen11/hw_cmds_lkf.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/aub_mem_dump/aub_services.h" #include "engine_node.h" diff --git a/opencl/source/gen11/image_gen11.cpp b/opencl/source/gen11/image_gen11.cpp index 2cfab0a7b4..ebbe89e348 100644 --- a/opencl/source/gen11/image_gen11.cpp +++ b/opencl/source/gen11/image_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen11/hw_cmds_base.h" +#include "gen11/hw_cmds_base.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/mem_obj/image.inl" diff --git a/opencl/source/gen11/linux/hw_info_config_ehl.inl b/opencl/source/gen11/linux/hw_info_config_ehl.inl index fa7ad0f4c9..cee6da303f 100644 --- a/opencl/source/gen11/linux/hw_info_config_ehl.inl +++ b/opencl/source/gen11/linux/hw_info_config_ehl.inl @@ -5,8 +5,8 @@ * */ -#include "core/helpers/hw_info.h" -#include "core/os_interface/hw_info_config.h" +#include "helpers/hw_info.h" +#include "os_interface/hw_info_config.h" namespace NEO { diff --git a/opencl/source/gen11/linux/hw_info_config_gen11.cpp b/opencl/source/gen11/linux/hw_info_config_gen11.cpp index 942fed9eb9..518a2b5c57 100644 --- a/opencl/source/gen11/linux/hw_info_config_gen11.cpp +++ b/opencl/source/gen11/linux/hw_info_config_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "core/os_interface/hw_info_config.inl" -#include "core/os_interface/hw_info_config_bdw_plus.inl" +#include "os_interface/hw_info_config.inl" +#include "os_interface/hw_info_config_bdw_plus.inl" #ifdef SUPPORT_ICLLP #include "hw_info_config_icllp.inl" diff --git a/opencl/source/gen11/linux/hw_info_config_icllp.inl b/opencl/source/gen11/linux/hw_info_config_icllp.inl index 2bd5caed1a..343ad1c055 100644 --- a/opencl/source/gen11/linux/hw_info_config_icllp.inl +++ b/opencl/source/gen11/linux/hw_info_config_icllp.inl @@ -5,8 +5,8 @@ * */ -#include "core/helpers/hw_info.h" -#include "core/os_interface/hw_info_config.h" +#include "helpers/hw_info.h" +#include "os_interface/hw_info_config.h" namespace NEO { diff --git a/opencl/source/gen11/linux/hw_info_config_lkf.inl b/opencl/source/gen11/linux/hw_info_config_lkf.inl index 2ff9be4a09..d7599cb107 100644 --- a/opencl/source/gen11/linux/hw_info_config_lkf.inl +++ b/opencl/source/gen11/linux/hw_info_config_lkf.inl @@ -5,8 +5,8 @@ * */ -#include "core/helpers/hw_info.h" -#include "core/os_interface/hw_info_config.h" +#include "helpers/hw_info.h" +#include "os_interface/hw_info_config.h" namespace NEO { diff --git a/opencl/source/gen11/reg_configs.h b/opencl/source/gen11/reg_configs.h index 04b617aa92..8305635b85 100644 --- a/opencl/source/gen11/reg_configs.h +++ b/opencl/source/gen11/reg_configs.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/preamble.h" +#include "helpers/preamble.h" namespace NEO { diff --git a/opencl/source/gen11/sampler_gen11.cpp b/opencl/source/gen11/sampler_gen11.cpp index f31a2a620a..c6d9413832 100644 --- a/opencl/source/gen11/sampler_gen11.cpp +++ b/opencl/source/gen11/sampler_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen11/hw_cmds.h" +#include "gen11/hw_cmds.h" #include "opencl/source/sampler/sampler.h" #include "opencl/source/sampler/sampler.inl" diff --git a/opencl/source/gen11/state_base_address_gen11.cpp b/opencl/source/gen11/state_base_address_gen11.cpp index 3ecc042b57..28ce7f1683 100644 --- a/opencl/source/gen11/state_base_address_gen11.cpp +++ b/opencl/source/gen11/state_base_address_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/state_base_address.h" -#include "core/helpers/state_base_address_bdw_plus.inl" +#include "helpers/state_base_address.h" +#include "helpers/state_base_address_bdw_plus.inl" namespace NEO { template struct StateBaseAddressHelper; diff --git a/opencl/source/gen11/tbx_command_stream_receiver_gen11.cpp b/opencl/source/gen11/tbx_command_stream_receiver_gen11.cpp index d618302e9f..278edb0609 100644 --- a/opencl/source/gen11/tbx_command_stream_receiver_gen11.cpp +++ b/opencl/source/gen11/tbx_command_stream_receiver_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen11/hw_cmds.h" -#include "core/helpers/array_count.h" +#include "gen11/hw_cmds.h" +#include "helpers/array_count.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.inl" diff --git a/opencl/source/gen11/windows/gmm_callbacks_gen11.cpp b/opencl/source/gen11/windows/gmm_callbacks_gen11.cpp index a363c84055..6e37170a93 100644 --- a/opencl/source/gen11/windows/gmm_callbacks_gen11.cpp +++ b/opencl/source/gen11/windows/gmm_callbacks_gen11.cpp @@ -5,9 +5,9 @@ * */ -#include "core/gen11/hw_cmds.h" -#include "core/helpers/windows/gmm_callbacks.h" -#include "core/helpers/windows/gmm_callbacks.inl" +#include "gen11/hw_cmds.h" +#include "helpers/windows/gmm_callbacks.h" +#include "helpers/windows/gmm_callbacks.inl" using namespace NEO; diff --git a/opencl/source/gen11/windows/hw_info_config_gen11.cpp b/opencl/source/gen11/windows/hw_info_config_gen11.cpp index f88be48d7a..82ca527ce9 100644 --- a/opencl/source/gen11/windows/hw_info_config_gen11.cpp +++ b/opencl/source/gen11/windows/hw_info_config_gen11.cpp @@ -5,10 +5,10 @@ * */ -#include "core/helpers/hw_info.h" -#include "core/os_interface/hw_info_config.h" -#include "core/os_interface/hw_info_config.inl" -#include "core/os_interface/hw_info_config_bdw_plus.inl" +#include "helpers/hw_info.h" +#include "os_interface/hw_info_config.h" +#include "os_interface/hw_info_config.inl" +#include "os_interface/hw_info_config_bdw_plus.inl" namespace NEO { diff --git a/opencl/source/gen12lp/aub_command_stream_receiver_gen12lp.cpp b/opencl/source/gen12lp/aub_command_stream_receiver_gen12lp.cpp index 126e8ae574..017a7cf95f 100644 --- a/opencl/source/gen12lp/aub_command_stream_receiver_gen12lp.cpp +++ b/opencl/source/gen12lp/aub_command_stream_receiver_gen12lp.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/array_count.h" -#include "core/memory_manager/memory_pool.h" +#include "helpers/array_count.h" +#include "memory_manager/memory_pool.h" #include "opencl/source/aub_mem_dump/aub_alloc_dump.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw_bdw_plus.inl" diff --git a/opencl/source/gen12lp/aub_mapper.h b/opencl/source/gen12lp/aub_mapper.h index 4bb7817a08..c8627620f4 100644 --- a/opencl/source/gen12lp/aub_mapper.h +++ b/opencl/source/gen12lp/aub_mapper.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/memory_constants.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/gen_common/aub_mapper_base.h" #include "engine_node.h" diff --git a/opencl/source/gen12lp/aub_mem_dump_gen12lp.cpp b/opencl/source/gen12lp/aub_mem_dump_gen12lp.cpp index e8083486e8..dbc7fe17f4 100644 --- a/opencl/source/gen12lp/aub_mem_dump_gen12lp.cpp +++ b/opencl/source/gen12lp/aub_mem_dump_gen12lp.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/completion_stamp.h" -#include "core/helpers/hw_helper.h" +#include "helpers/completion_stamp.h" +#include "helpers/hw_helper.h" #include "opencl/source/aub_mem_dump/aub_alloc_dump.inl" #include "opencl/source/aub_mem_dump/aub_mem_dump.inl" diff --git a/opencl/source/gen12lp/buffer_gen12lp.cpp b/opencl/source/gen12lp/buffer_gen12lp.cpp index a2d7d37d4f..eb36064f2a 100644 --- a/opencl/source/gen12lp/buffer_gen12lp.cpp +++ b/opencl/source/gen12lp/buffer_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen12lp/hw_cmds.h" +#include "gen12lp/hw_cmds.h" #include "opencl/source/mem_obj/buffer_bdw_plus.inl" namespace NEO { diff --git a/opencl/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp b/opencl/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp index 68eed0138f..56e1e4a8ec 100644 --- a/opencl/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp +++ b/opencl/source/gen12lp/command_stream_receiver_hw_gen12lp.cpp @@ -5,13 +5,13 @@ * */ -#include "core/gen12lp/hw_cmds.h" +#include "gen12lp/hw_cmds.h" using Family = NEO::TGLLPFamily; -#include "core/command_stream/command_stream_receiver_hw_bdw_plus.inl" -#include "core/command_stream/command_stream_receiver_hw_tgllp_plus.inl" -#include "core/helpers/blit_commands_helper_bdw_plus.inl" +#include "command_stream/command_stream_receiver_hw_bdw_plus.inl" +#include "command_stream/command_stream_receiver_hw_tgllp_plus.inl" +#include "helpers/blit_commands_helper_bdw_plus.inl" #include "opencl/source/command_stream/device_command_stream.h" #include "opencl/source/gen12lp/helpers_gen12lp.h" diff --git a/opencl/source/gen12lp/device_queue_gen12lp.cpp b/opencl/source/gen12lp/device_queue_gen12lp.cpp index 7504b88fb1..c5cc9825ab 100644 --- a/opencl/source/gen12lp/device_queue_gen12lp.cpp +++ b/opencl/source/gen12lp/device_queue_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen12lp/hw_cmds.h" +#include "gen12lp/hw_cmds.h" #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/source/device_queue/device_queue_hw_bdw_plus.inl" #include "opencl/source/device_queue/device_queue_hw_profiling.inl" diff --git a/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp b/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp index ccdf119a7b..dd01adb495 100644 --- a/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp +++ b/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" +#include "command_stream/command_stream_receiver_hw.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" diff --git a/opencl/source/gen12lp/experimental_command_buffer_gen12lp.cpp b/opencl/source/gen12lp/experimental_command_buffer_gen12lp.cpp index ea9ef24a07..67a5d41bf4 100644 --- a/opencl/source/gen12lp/experimental_command_buffer_gen12lp.cpp +++ b/opencl/source/gen12lp/experimental_command_buffer_gen12lp.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/experimental_command_buffer.h" -#include "core/command_stream/experimental_command_buffer.inl" -#include "core/helpers/hw_helper.h" +#include "command_stream/experimental_command_buffer.h" +#include "command_stream/experimental_command_buffer.inl" +#include "helpers/hw_helper.h" namespace NEO { typedef TGLLPFamily GfxFamily; diff --git a/opencl/source/gen12lp/gpgpu_walker_gen12lp.cpp b/opencl/source/gen12lp/gpgpu_walker_gen12lp.cpp index 93e46c82ae..9ed52bd399 100644 --- a/opencl/source/gen12lp/gpgpu_walker_gen12lp.cpp +++ b/opencl/source/gen12lp/gpgpu_walker_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen12lp/hw_info.h" +#include "gen12lp/hw_info.h" #include "opencl/source/command_queue/gpgpu_walker_bdw_plus.inl" #include "opencl/source/command_queue/hardware_interface_bdw_plus.inl" diff --git a/opencl/source/gen12lp/hardware_commands_helper_gen12lp.cpp b/opencl/source/gen12lp/hardware_commands_helper_gen12lp.cpp index 88bf6d27ed..a5cf342bd6 100644 --- a/opencl/source/gen12lp/hardware_commands_helper_gen12lp.cpp +++ b/opencl/source/gen12lp/hardware_commands_helper_gen12lp.cpp @@ -7,7 +7,7 @@ #include "hardware_commands_helper_gen12lp.inl" -#include "core/gen12lp/hw_cmds.h" +#include "gen12lp/hw_cmds.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/gen12lp/helpers_gen12lp.h" #include "opencl/source/helpers/hardware_commands_helper.h" diff --git a/opencl/source/gen12lp/helpers_gen12lp.cpp b/opencl/source/gen12lp/helpers_gen12lp.cpp index b3f2369269..bb5ee0613e 100644 --- a/opencl/source/gen12lp/helpers_gen12lp.cpp +++ b/opencl/source/gen12lp/helpers_gen12lp.cpp @@ -7,7 +7,7 @@ #include "opencl/source/gen12lp/helpers_gen12lp.h" -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include "opencl/source/command_stream/command_stream_receiver_simulated_common_hw.h" namespace NEO { diff --git a/opencl/source/gen12lp/helpers_gen12lp.h b/opencl/source/gen12lp/helpers_gen12lp.h index 92c89fe99f..536a1c6a98 100644 --- a/opencl/source/gen12lp/helpers_gen12lp.h +++ b/opencl/source/gen12lp/helpers_gen12lp.h @@ -7,7 +7,7 @@ #pragma once -#include "core/gen12lp/hw_cmds_base.h" +#include "gen12lp/hw_cmds_base.h" namespace AubMemDump { struct AubStream; diff --git a/opencl/source/gen12lp/hw_helper_gen12lp.cpp b/opencl/source/gen12lp/hw_helper_gen12lp.cpp index 4236912546..39d0fae938 100644 --- a/opencl/source/gen12lp/hw_helper_gen12lp.cpp +++ b/opencl/source/gen12lp/hw_helper_gen12lp.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_container/command_encoder.h" -#include "core/helpers/flat_batch_buffer_helper_hw.inl" -#include "core/helpers/hw_helper_bdw_plus.inl" +#include "command_container/command_encoder.h" +#include "helpers/flat_batch_buffer_helper_hw.inl" +#include "helpers/hw_helper_bdw_plus.inl" #include "opencl/source/aub/aub_helper_bdw_plus.inl" #include "opencl/source/gen12lp/helpers_gen12lp.h" diff --git a/opencl/source/gen12lp/hw_info_tgllp.inl b/opencl/source/gen12lp/hw_info_tgllp.inl index 82785c29a8..c4c46accb4 100644 --- a/opencl/source/gen12lp/hw_info_tgllp.inl +++ b/opencl/source/gen12lp/hw_info_tgllp.inl @@ -5,8 +5,8 @@ * */ -#include "core/gen12lp/hw_cmds.h" -#include "core/memory_manager/memory_constants.h" +#include "gen12lp/hw_cmds.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/aub_mem_dump/aub_services.h" #include "engine_node.h" diff --git a/opencl/source/gen12lp/image_gen12lp.cpp b/opencl/source/gen12lp/image_gen12lp.cpp index 7eec7e7a43..d58fe8a4bf 100644 --- a/opencl/source/gen12lp/image_gen12lp.cpp +++ b/opencl/source/gen12lp/image_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen12lp/hw_cmds.h" +#include "gen12lp/hw_cmds.h" #include "opencl/source/gen12lp/helpers_gen12lp.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/mem_obj/image.inl" diff --git a/opencl/source/gen12lp/linux/hw_info_config_gen12lp.cpp b/opencl/source/gen12lp/linux/hw_info_config_gen12lp.cpp index da87e88d85..0592f2cdef 100644 --- a/opencl/source/gen12lp/linux/hw_info_config_gen12lp.cpp +++ b/opencl/source/gen12lp/linux/hw_info_config_gen12lp.cpp @@ -5,8 +5,8 @@ * */ -#include "core/os_interface/hw_info_config.inl" -#include "core/os_interface/hw_info_config_bdw_plus.inl" +#include "os_interface/hw_info_config.inl" +#include "os_interface/hw_info_config_bdw_plus.inl" #ifdef SUPPORT_TGLLP #include "hw_info_config_tgllp.inl" diff --git a/opencl/source/gen12lp/linux/hw_info_config_tgllp.inl b/opencl/source/gen12lp/linux/hw_info_config_tgllp.inl index c46f987b81..43c64e1fe7 100644 --- a/opencl/source/gen12lp/linux/hw_info_config_tgllp.inl +++ b/opencl/source/gen12lp/linux/hw_info_config_tgllp.inl @@ -5,8 +5,8 @@ * */ -#include "core/helpers/hw_info.h" -#include "core/os_interface/hw_info_config.h" +#include "helpers/hw_info.h" +#include "os_interface/hw_info_config.h" namespace NEO { diff --git a/opencl/source/gen12lp/reg_configs.h b/opencl/source/gen12lp/reg_configs.h index 471f8c5d5f..7c19d66e3c 100644 --- a/opencl/source/gen12lp/reg_configs.h +++ b/opencl/source/gen12lp/reg_configs.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/preamble.h" +#include "helpers/preamble.h" namespace NEO { diff --git a/opencl/source/gen12lp/sampler_gen12lp.cpp b/opencl/source/gen12lp/sampler_gen12lp.cpp index 0a9865719e..5e19fe9fcd 100644 --- a/opencl/source/gen12lp/sampler_gen12lp.cpp +++ b/opencl/source/gen12lp/sampler_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen12lp/hw_cmds_base.h" +#include "gen12lp/hw_cmds_base.h" using Family = NEO::TGLLPFamily; constexpr static auto gfxCore = IGFX_GEN12LP_CORE; #include "opencl/source/sampler/sampler_tgllp_plus.inl" diff --git a/opencl/source/gen12lp/state_base_address_gen12lp.cpp b/opencl/source/gen12lp/state_base_address_gen12lp.cpp index 452e88e32e..1ecd9f3b34 100644 --- a/opencl/source/gen12lp/state_base_address_gen12lp.cpp +++ b/opencl/source/gen12lp/state_base_address_gen12lp.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/state_base_address.h" -#include "core/helpers/state_base_address_bdw_plus.inl" +#include "helpers/state_base_address.h" +#include "helpers/state_base_address_bdw_plus.inl" namespace NEO { template struct StateBaseAddressHelper; diff --git a/opencl/source/gen12lp/state_compute_mode_helper_gen12lp.cpp b/opencl/source/gen12lp/state_compute_mode_helper_gen12lp.cpp index 0fefc8d13b..4e466e3ec9 100644 --- a/opencl/source/gen12lp/state_compute_mode_helper_gen12lp.cpp +++ b/opencl/source/gen12lp/state_compute_mode_helper_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/state_compute_mode_helper.h" +#include "helpers/state_compute_mode_helper.h" namespace NEO { template <> diff --git a/opencl/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp b/opencl/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp index 69b494ac2c..508aa0ad5c 100644 --- a/opencl/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp +++ b/opencl/source/gen12lp/tbx_command_stream_receiver_gen12lp.cpp @@ -5,9 +5,9 @@ * */ -#include "core/gen12lp/hw_cmds.h" -#include "core/helpers/array_count.h" -#include "core/memory_manager/memory_pool.h" +#include "gen12lp/hw_cmds.h" +#include "helpers/array_count.h" +#include "memory_manager/memory_pool.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" diff --git a/opencl/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp b/opencl/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp index 29087c4a95..11746058e1 100644 --- a/opencl/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp +++ b/opencl/source/gen12lp/windows/gmm_callbacks_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen12lp/hw_cmds.h" +#include "gen12lp/hw_cmds.h" #include "opencl/source/helpers/windows/gmm_callbacks_tgllp_plus.inl" using namespace NEO; diff --git a/opencl/source/gen12lp/windows/hw_info_config_gen12lp.cpp b/opencl/source/gen12lp/windows/hw_info_config_gen12lp.cpp index fe18e1f6ae..4d1f04f315 100644 --- a/opencl/source/gen12lp/windows/hw_info_config_gen12lp.cpp +++ b/opencl/source/gen12lp/windows/hw_info_config_gen12lp.cpp @@ -5,11 +5,11 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/hw_info.h" -#include "core/os_interface/hw_info_config.h" -#include "core/os_interface/hw_info_config.inl" -#include "core/os_interface/hw_info_config_bdw_plus.inl" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/hw_info.h" +#include "os_interface/hw_info_config.h" +#include "os_interface/hw_info_config.inl" +#include "os_interface/hw_info_config_bdw_plus.inl" namespace NEO { diff --git a/opencl/source/gen8/aub_command_stream_receiver_gen8.cpp b/opencl/source/gen8/aub_command_stream_receiver_gen8.cpp index c15cbce93f..5e0a974295 100644 --- a/opencl/source/gen8/aub_command_stream_receiver_gen8.cpp +++ b/opencl/source/gen8/aub_command_stream_receiver_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/array_count.h" +#include "helpers/array_count.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw_bdw_plus.inl" #include "opencl/source/helpers/base_object.h" diff --git a/opencl/source/gen8/aub_mapper.h b/opencl/source/gen8/aub_mapper.h index f4a4ed6d0c..184b7c4d83 100644 --- a/opencl/source/gen8/aub_mapper.h +++ b/opencl/source/gen8/aub_mapper.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/memory_constants.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/gen_common/aub_mapper_base.h" #include "engine_node.h" diff --git a/opencl/source/gen8/aub_mem_dump_gen8.cpp b/opencl/source/gen8/aub_mem_dump_gen8.cpp index f534331124..23e7d44597 100644 --- a/opencl/source/gen8/aub_mem_dump_gen8.cpp +++ b/opencl/source/gen8/aub_mem_dump_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" #include "opencl/source/aub_mem_dump/aub_alloc_dump.inl" #include "opencl/source/aub_mem_dump/aub_mem_dump.inl" diff --git a/opencl/source/gen8/buffer_gen8.cpp b/opencl/source/gen8/buffer_gen8.cpp index f48c09b945..98d11de0b8 100644 --- a/opencl/source/gen8/buffer_gen8.cpp +++ b/opencl/source/gen8/buffer_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen8/hw_cmds.h" +#include "gen8/hw_cmds.h" #include "opencl/source/mem_obj/buffer_bdw_plus.inl" namespace NEO { diff --git a/opencl/source/gen8/command_queue_gen8.cpp b/opencl/source/gen8/command_queue_gen8.cpp index 4e84b1218f..2c1f80e401 100644 --- a/opencl/source/gen8/command_queue_gen8.cpp +++ b/opencl/source/gen8/command_queue_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/unified_memory_manager.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/command_queue_hw_bdw_plus.inl" #include "opencl/source/command_queue/enqueue_resource_barrier.h" diff --git a/opencl/source/gen8/command_stream_receiver_hw_gen8.cpp b/opencl/source/gen8/command_stream_receiver_hw_gen8.cpp index ec9b6a6ce1..aed95bdbd4 100644 --- a/opencl/source/gen8/command_stream_receiver_hw_gen8.cpp +++ b/opencl/source/gen8/command_stream_receiver_hw_gen8.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver_hw_bdw_plus.inl" -#include "core/gen8/hw_cmds.h" -#include "core/helpers/blit_commands_helper_bdw_plus.inl" +#include "command_stream/command_stream_receiver_hw_bdw_plus.inl" +#include "gen8/hw_cmds.h" +#include "helpers/blit_commands_helper_bdw_plus.inl" #include "opencl/source/command_stream/device_command_stream.h" namespace NEO { diff --git a/opencl/source/gen8/device_queue_gen8.cpp b/opencl/source/gen8/device_queue_gen8.cpp index 785b9ced20..b2b46f0286 100644 --- a/opencl/source/gen8/device_queue_gen8.cpp +++ b/opencl/source/gen8/device_queue_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen8/hw_cmds.h" +#include "gen8/hw_cmds.h" #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/source/device_queue/device_queue_hw_bdw_plus.inl" diff --git a/opencl/source/gen8/enable_family_full_ocl_gen8.cpp b/opencl/source/gen8/enable_family_full_ocl_gen8.cpp index d81a0a16bd..6508baa654 100644 --- a/opencl/source/gen8/enable_family_full_ocl_gen8.cpp +++ b/opencl/source/gen8/enable_family_full_ocl_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" +#include "command_stream/command_stream_receiver_hw.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" diff --git a/opencl/source/gen8/experimental_command_buffer_gen8.cpp b/opencl/source/gen8/experimental_command_buffer_gen8.cpp index e486d7ceb4..81dbe5c619 100644 --- a/opencl/source/gen8/experimental_command_buffer_gen8.cpp +++ b/opencl/source/gen8/experimental_command_buffer_gen8.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/experimental_command_buffer.h" -#include "core/command_stream/experimental_command_buffer.inl" -#include "core/helpers/hw_helper.h" +#include "command_stream/experimental_command_buffer.h" +#include "command_stream/experimental_command_buffer.inl" +#include "helpers/hw_helper.h" namespace NEO { typedef BDWFamily GfxFamily; diff --git a/opencl/source/gen8/gpgpu_walker_gen8.cpp b/opencl/source/gen8/gpgpu_walker_gen8.cpp index 9cc0c7e09b..4997afd676 100644 --- a/opencl/source/gen8/gpgpu_walker_gen8.cpp +++ b/opencl/source/gen8/gpgpu_walker_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen8/hw_info.h" +#include "gen8/hw_info.h" #include "opencl/source/command_queue/gpgpu_walker_bdw_plus.inl" #include "opencl/source/command_queue/hardware_interface_bdw_plus.inl" diff --git a/opencl/source/gen8/hardware_commands_helper_gen8.cpp b/opencl/source/gen8/hardware_commands_helper_gen8.cpp index 2d734de987..c89f00d082 100644 --- a/opencl/source/gen8/hardware_commands_helper_gen8.cpp +++ b/opencl/source/gen8/hardware_commands_helper_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen8/hw_cmds.h" +#include "gen8/hw_cmds.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/helpers/hardware_commands_helper.inl" #include "opencl/source/helpers/hardware_commands_helper_base.inl" diff --git a/opencl/source/gen8/hw_helper_gen8.cpp b/opencl/source/gen8/hw_helper_gen8.cpp index 27f482599a..d3b86de38c 100644 --- a/opencl/source/gen8/hw_helper_gen8.cpp +++ b/opencl/source/gen8/hw_helper_gen8.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/flat_batch_buffer_helper_hw.inl" -#include "core/helpers/hw_helper_bdw_plus.inl" -#include "core/memory_manager/memory_constants.h" +#include "helpers/flat_batch_buffer_helper_hw.inl" +#include "helpers/hw_helper_bdw_plus.inl" +#include "memory_manager/memory_constants.h" #include "opencl/source/aub/aub_helper_bdw_plus.inl" namespace NEO { diff --git a/opencl/source/gen8/hw_info_bdw.inl b/opencl/source/gen8/hw_info_bdw.inl index 81430e6349..cc8f5113e5 100644 --- a/opencl/source/gen8/hw_info_bdw.inl +++ b/opencl/source/gen8/hw_info_bdw.inl @@ -5,8 +5,8 @@ * */ -#include "core/gen8/hw_cmds.h" -#include "core/memory_manager/memory_constants.h" +#include "gen8/hw_cmds.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/aub_mem_dump/aub_services.h" #include "engine_node.h" diff --git a/opencl/source/gen8/image_gen8.cpp b/opencl/source/gen8/image_gen8.cpp index 90fbac3e16..1937e1b6f8 100644 --- a/opencl/source/gen8/image_gen8.cpp +++ b/opencl/source/gen8/image_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen8/hw_cmds.h" +#include "gen8/hw_cmds.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/mem_obj/image.inl" diff --git a/opencl/source/gen8/linux/hw_info_config_bdw.inl b/opencl/source/gen8/linux/hw_info_config_bdw.inl index 8abe2aa339..df71d83a6a 100644 --- a/opencl/source/gen8/linux/hw_info_config_bdw.inl +++ b/opencl/source/gen8/linux/hw_info_config_bdw.inl @@ -5,8 +5,8 @@ * */ -#include "core/helpers/hw_info.h" -#include "core/os_interface/hw_info_config.h" +#include "helpers/hw_info.h" +#include "os_interface/hw_info_config.h" namespace NEO { diff --git a/opencl/source/gen8/linux/hw_info_config_gen8.cpp b/opencl/source/gen8/linux/hw_info_config_gen8.cpp index 9f7f037a3d..1ea72230e7 100644 --- a/opencl/source/gen8/linux/hw_info_config_gen8.cpp +++ b/opencl/source/gen8/linux/hw_info_config_gen8.cpp @@ -5,8 +5,8 @@ * */ -#include "core/os_interface/hw_info_config.inl" -#include "core/os_interface/hw_info_config_bdw_plus.inl" +#include "os_interface/hw_info_config.inl" +#include "os_interface/hw_info_config_bdw_plus.inl" #ifdef SUPPORT_BDW #include "hw_info_config_bdw.inl" diff --git a/opencl/source/gen8/reg_configs.h b/opencl/source/gen8/reg_configs.h index 6749840f48..00103cd9b1 100644 --- a/opencl/source/gen8/reg_configs.h +++ b/opencl/source/gen8/reg_configs.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/preamble.h" +#include "helpers/preamble.h" namespace NEO { diff --git a/opencl/source/gen8/sampler_gen8.cpp b/opencl/source/gen8/sampler_gen8.cpp index f0483fac0b..612a9a1544 100644 --- a/opencl/source/gen8/sampler_gen8.cpp +++ b/opencl/source/gen8/sampler_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen8/hw_cmds.h" +#include "gen8/hw_cmds.h" #include "opencl/source/sampler/sampler.h" #include "opencl/source/sampler/sampler.inl" diff --git a/opencl/source/gen8/state_base_address_gen8.cpp b/opencl/source/gen8/state_base_address_gen8.cpp index 5b9c9fcb4a..1cee82a74b 100644 --- a/opencl/source/gen8/state_base_address_gen8.cpp +++ b/opencl/source/gen8/state_base_address_gen8.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/state_base_address.h" -#include "core/helpers/state_base_address_bdw_plus.inl" +#include "helpers/state_base_address.h" +#include "helpers/state_base_address_bdw_plus.inl" namespace NEO { template struct StateBaseAddressHelper; diff --git a/opencl/source/gen8/tbx_command_stream_receiver_gen8.cpp b/opencl/source/gen8/tbx_command_stream_receiver_gen8.cpp index f527b7e330..fa2111eaf2 100644 --- a/opencl/source/gen8/tbx_command_stream_receiver_gen8.cpp +++ b/opencl/source/gen8/tbx_command_stream_receiver_gen8.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen8/hw_cmds.h" -#include "core/helpers/array_count.h" +#include "gen8/hw_cmds.h" +#include "helpers/array_count.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.inl" diff --git a/opencl/source/gen8/windows/gmm_callbacks_gen8.cpp b/opencl/source/gen8/windows/gmm_callbacks_gen8.cpp index c96c51a884..7b35ed68b0 100644 --- a/opencl/source/gen8/windows/gmm_callbacks_gen8.cpp +++ b/opencl/source/gen8/windows/gmm_callbacks_gen8.cpp @@ -5,9 +5,9 @@ * */ -#include "core/gen8/hw_cmds.h" -#include "core/helpers/windows/gmm_callbacks.h" -#include "core/helpers/windows/gmm_callbacks.inl" +#include "gen8/hw_cmds.h" +#include "helpers/windows/gmm_callbacks.h" +#include "helpers/windows/gmm_callbacks.inl" using namespace NEO; diff --git a/opencl/source/gen8/windows/hw_info_config_gen8.cpp b/opencl/source/gen8/windows/hw_info_config_gen8.cpp index b1a20bad45..62b2854294 100644 --- a/opencl/source/gen8/windows/hw_info_config_gen8.cpp +++ b/opencl/source/gen8/windows/hw_info_config_gen8.cpp @@ -5,10 +5,10 @@ * */ -#include "core/helpers/hw_info.h" -#include "core/os_interface/hw_info_config.h" -#include "core/os_interface/hw_info_config.inl" -#include "core/os_interface/hw_info_config_bdw_plus.inl" +#include "helpers/hw_info.h" +#include "os_interface/hw_info_config.h" +#include "os_interface/hw_info_config.inl" +#include "os_interface/hw_info_config_bdw_plus.inl" namespace NEO { diff --git a/opencl/source/gen9/aub_command_stream_receiver_gen9.cpp b/opencl/source/gen9/aub_command_stream_receiver_gen9.cpp index 907431ca9b..175d46bfd5 100644 --- a/opencl/source/gen9/aub_command_stream_receiver_gen9.cpp +++ b/opencl/source/gen9/aub_command_stream_receiver_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/array_count.h" +#include "helpers/array_count.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw_bdw_plus.inl" #include "opencl/source/helpers/base_object.h" diff --git a/opencl/source/gen9/aub_mapper.h b/opencl/source/gen9/aub_mapper.h index 9d0aa65854..6dec87a5ea 100644 --- a/opencl/source/gen9/aub_mapper.h +++ b/opencl/source/gen9/aub_mapper.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/memory_constants.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/gen_common/aub_mapper_base.h" #include "engine_node.h" diff --git a/opencl/source/gen9/aub_mem_dump_gen9.cpp b/opencl/source/gen9/aub_mem_dump_gen9.cpp index 87ec4af414..4f93d28e5e 100644 --- a/opencl/source/gen9/aub_mem_dump_gen9.cpp +++ b/opencl/source/gen9/aub_mem_dump_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" #include "opencl/source/aub_mem_dump/aub_alloc_dump.inl" #include "opencl/source/aub_mem_dump/aub_mem_dump.inl" diff --git a/opencl/source/gen9/buffer_gen9.cpp b/opencl/source/gen9/buffer_gen9.cpp index 25f07a8317..5ce674a6bd 100644 --- a/opencl/source/gen9/buffer_gen9.cpp +++ b/opencl/source/gen9/buffer_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen9/hw_cmds.h" +#include "gen9/hw_cmds.h" #include "opencl/source/mem_obj/buffer_bdw_plus.inl" namespace NEO { diff --git a/opencl/source/gen9/command_queue_gen9.cpp b/opencl/source/gen9/command_queue_gen9.cpp index cd8894aa61..010dd05daf 100644 --- a/opencl/source/gen9/command_queue_gen9.cpp +++ b/opencl/source/gen9/command_queue_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/unified_memory_manager.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/command_queue_hw_bdw_plus.inl" #include "opencl/source/command_queue/enqueue_resource_barrier.h" diff --git a/opencl/source/gen9/command_stream_receiver_hw_gen9.cpp b/opencl/source/gen9/command_stream_receiver_hw_gen9.cpp index ea0b4579cc..88d1af68da 100644 --- a/opencl/source/gen9/command_stream_receiver_hw_gen9.cpp +++ b/opencl/source/gen9/command_stream_receiver_hw_gen9.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver_hw_bdw_plus.inl" -#include "core/gen9/hw_cmds.h" -#include "core/helpers/blit_commands_helper_bdw_plus.inl" +#include "command_stream/command_stream_receiver_hw_bdw_plus.inl" +#include "gen9/hw_cmds.h" +#include "helpers/blit_commands_helper_bdw_plus.inl" #include "opencl/source/command_stream/device_command_stream.h" namespace NEO { diff --git a/opencl/source/gen9/device_queue_gen9.cpp b/opencl/source/gen9/device_queue_gen9.cpp index 2ea817ca30..f1fa7af3c5 100644 --- a/opencl/source/gen9/device_queue_gen9.cpp +++ b/opencl/source/gen9/device_queue_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen9/hw_cmds.h" +#include "gen9/hw_cmds.h" #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/source/device_queue/device_queue_hw_bdw_plus.inl" #include "opencl/source/device_queue/device_queue_hw_profiling.inl" diff --git a/opencl/source/gen9/enable_family_full_ocl_gen9.cpp b/opencl/source/gen9/enable_family_full_ocl_gen9.cpp index 79e47e6a1c..a71ec08741 100644 --- a/opencl/source/gen9/enable_family_full_ocl_gen9.cpp +++ b/opencl/source/gen9/enable_family_full_ocl_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" +#include "command_stream/command_stream_receiver_hw.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" diff --git a/opencl/source/gen9/experimental_command_buffer_gen9.cpp b/opencl/source/gen9/experimental_command_buffer_gen9.cpp index 0f043ce6f3..1d703f3272 100644 --- a/opencl/source/gen9/experimental_command_buffer_gen9.cpp +++ b/opencl/source/gen9/experimental_command_buffer_gen9.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/experimental_command_buffer.h" -#include "core/command_stream/experimental_command_buffer.inl" -#include "core/helpers/hw_helper.h" +#include "command_stream/experimental_command_buffer.h" +#include "command_stream/experimental_command_buffer.inl" +#include "helpers/hw_helper.h" namespace NEO { typedef SKLFamily GfxFamily; diff --git a/opencl/source/gen9/gpgpu_walker_gen9.cpp b/opencl/source/gen9/gpgpu_walker_gen9.cpp index 900e475133..4922c007d7 100644 --- a/opencl/source/gen9/gpgpu_walker_gen9.cpp +++ b/opencl/source/gen9/gpgpu_walker_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen9/hw_cmds_base.h" +#include "gen9/hw_cmds_base.h" #include "opencl/source/command_queue/gpgpu_walker_bdw_plus.inl" #include "opencl/source/command_queue/hardware_interface_bdw_plus.inl" diff --git a/opencl/source/gen9/hardware_commands_helper_gen9.cpp b/opencl/source/gen9/hardware_commands_helper_gen9.cpp index 998abbc263..527344c50d 100644 --- a/opencl/source/gen9/hardware_commands_helper_gen9.cpp +++ b/opencl/source/gen9/hardware_commands_helper_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen9/hw_cmds.h" +#include "gen9/hw_cmds.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/helpers/hardware_commands_helper.inl" #include "opencl/source/helpers/hardware_commands_helper_base.inl" diff --git a/opencl/source/gen9/hw_helper_gen9.cpp b/opencl/source/gen9/hw_helper_gen9.cpp index 42fd773b9c..c6c9d56126 100644 --- a/opencl/source/gen9/hw_helper_gen9.cpp +++ b/opencl/source/gen9/hw_helper_gen9.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/flat_batch_buffer_helper_hw.inl" -#include "core/helpers/hw_helper_bdw_plus.inl" +#include "helpers/flat_batch_buffer_helper_hw.inl" +#include "helpers/hw_helper_bdw_plus.inl" #include "opencl/source/aub/aub_helper_bdw_plus.inl" namespace NEO { diff --git a/opencl/source/gen9/hw_info_bxt.inl b/opencl/source/gen9/hw_info_bxt.inl index bd29ecbd97..eeb7cd3d43 100644 --- a/opencl/source/gen9/hw_info_bxt.inl +++ b/opencl/source/gen9/hw_info_bxt.inl @@ -5,8 +5,8 @@ * */ -#include "core/gen9/hw_cmds.h" -#include "core/memory_manager/memory_constants.h" +#include "gen9/hw_cmds.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/aub_mem_dump/aub_services.h" #include "engine_node.h" diff --git a/opencl/source/gen9/hw_info_cfl.inl b/opencl/source/gen9/hw_info_cfl.inl index 508736fb2c..2f619211ba 100644 --- a/opencl/source/gen9/hw_info_cfl.inl +++ b/opencl/source/gen9/hw_info_cfl.inl @@ -5,8 +5,8 @@ * */ -#include "core/gen9/hw_cmds.h" -#include "core/memory_manager/memory_constants.h" +#include "gen9/hw_cmds.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/aub_mem_dump/aub_services.h" #include "engine_node.h" diff --git a/opencl/source/gen9/hw_info_glk.inl b/opencl/source/gen9/hw_info_glk.inl index 122f030a5d..77af3d55be 100644 --- a/opencl/source/gen9/hw_info_glk.inl +++ b/opencl/source/gen9/hw_info_glk.inl @@ -5,8 +5,8 @@ * */ -#include "core/gen9/hw_cmds.h" -#include "core/memory_manager/memory_constants.h" +#include "gen9/hw_cmds.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/aub_mem_dump/aub_services.h" #include "engine_node.h" diff --git a/opencl/source/gen9/hw_info_kbl.inl b/opencl/source/gen9/hw_info_kbl.inl index e611373773..c7bdec56c6 100644 --- a/opencl/source/gen9/hw_info_kbl.inl +++ b/opencl/source/gen9/hw_info_kbl.inl @@ -5,8 +5,8 @@ * */ -#include "core/gen9/hw_cmds.h" -#include "core/memory_manager/memory_constants.h" +#include "gen9/hw_cmds.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/aub_mem_dump/aub_services.h" #include "engine_node.h" diff --git a/opencl/source/gen9/hw_info_skl.inl b/opencl/source/gen9/hw_info_skl.inl index 51d8481e44..c0302cb697 100644 --- a/opencl/source/gen9/hw_info_skl.inl +++ b/opencl/source/gen9/hw_info_skl.inl @@ -5,8 +5,8 @@ * */ -#include "core/gen9/hw_cmds.h" -#include "core/memory_manager/memory_constants.h" +#include "gen9/hw_cmds.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/aub_mem_dump/aub_services.h" #include "engine_node.h" diff --git a/opencl/source/gen9/image_gen9.cpp b/opencl/source/gen9/image_gen9.cpp index eaa47d57c1..c2f613e65f 100644 --- a/opencl/source/gen9/image_gen9.cpp +++ b/opencl/source/gen9/image_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen9/hw_cmds.h" +#include "gen9/hw_cmds.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/mem_obj/image.inl" diff --git a/opencl/source/gen9/linux/hw_info_config_bxt.inl b/opencl/source/gen9/linux/hw_info_config_bxt.inl index 11c0a0f997..dc359713a0 100644 --- a/opencl/source/gen9/linux/hw_info_config_bxt.inl +++ b/opencl/source/gen9/linux/hw_info_config_bxt.inl @@ -5,10 +5,10 @@ * */ -#include "core/helpers/hw_info.h" -#include "core/os_interface/hw_info_config.h" -#include "core/os_interface/linux/drm_neo.h" -#include "core/os_interface/linux/os_interface.h" +#include "helpers/hw_info.h" +#include "os_interface/hw_info_config.h" +#include "os_interface/linux/drm_neo.h" +#include "os_interface/linux/os_interface.h" namespace NEO { diff --git a/opencl/source/gen9/linux/hw_info_config_cfl.inl b/opencl/source/gen9/linux/hw_info_config_cfl.inl index 9d1e542807..6c12c322e0 100644 --- a/opencl/source/gen9/linux/hw_info_config_cfl.inl +++ b/opencl/source/gen9/linux/hw_info_config_cfl.inl @@ -5,8 +5,8 @@ * */ -#include "core/helpers/hw_info.h" -#include "core/os_interface/hw_info_config.h" +#include "helpers/hw_info.h" +#include "os_interface/hw_info_config.h" namespace NEO { diff --git a/opencl/source/gen9/linux/hw_info_config_gen9.cpp b/opencl/source/gen9/linux/hw_info_config_gen9.cpp index 06152ce190..116482bde5 100644 --- a/opencl/source/gen9/linux/hw_info_config_gen9.cpp +++ b/opencl/source/gen9/linux/hw_info_config_gen9.cpp @@ -5,8 +5,8 @@ * */ -#include "core/os_interface/hw_info_config.inl" -#include "core/os_interface/hw_info_config_bdw_plus.inl" +#include "os_interface/hw_info_config.inl" +#include "os_interface/hw_info_config_bdw_plus.inl" #ifdef SUPPORT_BXT #include "hw_info_config_bxt.inl" diff --git a/opencl/source/gen9/linux/hw_info_config_glk.inl b/opencl/source/gen9/linux/hw_info_config_glk.inl index 9b31959876..c6eaccd6cf 100644 --- a/opencl/source/gen9/linux/hw_info_config_glk.inl +++ b/opencl/source/gen9/linux/hw_info_config_glk.inl @@ -5,10 +5,10 @@ * */ -#include "core/helpers/hw_info.h" -#include "core/os_interface/hw_info_config.h" -#include "core/os_interface/linux/drm_neo.h" -#include "core/os_interface/linux/os_interface.h" +#include "helpers/hw_info.h" +#include "os_interface/hw_info_config.h" +#include "os_interface/linux/drm_neo.h" +#include "os_interface/linux/os_interface.h" namespace NEO { diff --git a/opencl/source/gen9/linux/hw_info_config_kbl.inl b/opencl/source/gen9/linux/hw_info_config_kbl.inl index afedb8946f..4ce0c75987 100644 --- a/opencl/source/gen9/linux/hw_info_config_kbl.inl +++ b/opencl/source/gen9/linux/hw_info_config_kbl.inl @@ -5,8 +5,8 @@ * */ -#include "core/helpers/hw_info.h" -#include "core/os_interface/hw_info_config.h" +#include "helpers/hw_info.h" +#include "os_interface/hw_info_config.h" namespace NEO { diff --git a/opencl/source/gen9/linux/hw_info_config_skl.inl b/opencl/source/gen9/linux/hw_info_config_skl.inl index ff037ed92f..7683e6601e 100644 --- a/opencl/source/gen9/linux/hw_info_config_skl.inl +++ b/opencl/source/gen9/linux/hw_info_config_skl.inl @@ -5,9 +5,9 @@ * */ -#include "core/helpers/hw_cmds.h" -#include "core/helpers/hw_info.h" -#include "core/os_interface/hw_info_config.h" +#include "helpers/hw_cmds.h" +#include "helpers/hw_info.h" +#include "os_interface/hw_info_config.h" namespace NEO { diff --git a/opencl/source/gen9/reg_configs.h b/opencl/source/gen9/reg_configs.h index 9f9135cc45..7310115be3 100644 --- a/opencl/source/gen9/reg_configs.h +++ b/opencl/source/gen9/reg_configs.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/command_stream/thread_arbitration_policy.h" -#include "core/helpers/preamble.h" +#include "command_stream/thread_arbitration_policy.h" +#include "helpers/preamble.h" namespace NEO { struct SKLFamily; diff --git a/opencl/source/gen9/sampler_gen9.cpp b/opencl/source/gen9/sampler_gen9.cpp index 2ff86e62ea..7d7124e6aa 100644 --- a/opencl/source/gen9/sampler_gen9.cpp +++ b/opencl/source/gen9/sampler_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen9/hw_cmds.h" +#include "gen9/hw_cmds.h" #include "opencl/source/sampler/sampler.h" #include "opencl/source/sampler/sampler.inl" diff --git a/opencl/source/gen9/state_base_address_gen9.cpp b/opencl/source/gen9/state_base_address_gen9.cpp index e668157590..e369de327a 100644 --- a/opencl/source/gen9/state_base_address_gen9.cpp +++ b/opencl/source/gen9/state_base_address_gen9.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/state_base_address.h" -#include "core/helpers/state_base_address_bdw_plus.inl" +#include "helpers/state_base_address.h" +#include "helpers/state_base_address_bdw_plus.inl" namespace NEO { template struct StateBaseAddressHelper; diff --git a/opencl/source/gen9/tbx_command_stream_receiver_gen9.cpp b/opencl/source/gen9/tbx_command_stream_receiver_gen9.cpp index 6b1013fa03..2f15f7cd6e 100644 --- a/opencl/source/gen9/tbx_command_stream_receiver_gen9.cpp +++ b/opencl/source/gen9/tbx_command_stream_receiver_gen9.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gen9/hw_cmds.h" -#include "core/helpers/array_count.h" +#include "gen9/hw_cmds.h" +#include "helpers/array_count.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.inl" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.inl" diff --git a/opencl/source/gen9/windows/gmm_callbacks_gen9.cpp b/opencl/source/gen9/windows/gmm_callbacks_gen9.cpp index bf3d196b19..f8bdda9650 100644 --- a/opencl/source/gen9/windows/gmm_callbacks_gen9.cpp +++ b/opencl/source/gen9/windows/gmm_callbacks_gen9.cpp @@ -5,9 +5,9 @@ * */ -#include "core/gen9/hw_cmds.h" -#include "core/helpers/windows/gmm_callbacks.h" -#include "core/helpers/windows/gmm_callbacks.inl" +#include "gen9/hw_cmds.h" +#include "helpers/windows/gmm_callbacks.h" +#include "helpers/windows/gmm_callbacks.inl" using namespace NEO; diff --git a/opencl/source/gen9/windows/hw_info_config_gen9.cpp b/opencl/source/gen9/windows/hw_info_config_gen9.cpp index 0374cd28c5..0cff534edd 100644 --- a/opencl/source/gen9/windows/hw_info_config_gen9.cpp +++ b/opencl/source/gen9/windows/hw_info_config_gen9.cpp @@ -5,10 +5,10 @@ * */ -#include "core/helpers/hw_info.h" -#include "core/os_interface/hw_info_config.h" -#include "core/os_interface/hw_info_config.inl" -#include "core/os_interface/hw_info_config_bdw_plus.inl" +#include "helpers/hw_info.h" +#include "os_interface/hw_info_config.h" +#include "os_interface/hw_info_config.inl" +#include "os_interface/hw_info_config_bdw_plus.inl" namespace NEO { diff --git a/opencl/source/gen_common/aub_mapper_base.h b/opencl/source/gen_common/aub_mapper_base.h index a87bb10a41..fec5f8cbba 100644 --- a/opencl/source/gen_common/aub_mapper_base.h +++ b/opencl/source/gen_common/aub_mapper_base.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/completion_stamp.h" +#include "helpers/completion_stamp.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" #include diff --git a/opencl/source/gtpin/gtpin_callbacks.cpp b/opencl/source/gtpin/gtpin_callbacks.cpp index 5881fa2168..225abe590f 100644 --- a/opencl/source/gtpin/gtpin_callbacks.cpp +++ b/opencl/source/gtpin/gtpin_callbacks.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/memory_manager/surface.h" -#include "core/utilities/spinlock.h" +#include "command_stream/command_stream_receiver.h" +#include "memory_manager/surface.h" +#include "utilities/spinlock.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" diff --git a/opencl/source/gtpin/gtpin_helpers.cpp b/opencl/source/gtpin/gtpin_helpers.cpp index 2eb90d31c6..07c88a9b15 100644 --- a/opencl/source/gtpin/gtpin_helpers.cpp +++ b/opencl/source/gtpin/gtpin_helpers.cpp @@ -7,7 +7,7 @@ #include "gtpin_helpers.h" -#include "core/memory_manager/memory_manager.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/context/context.h" #include "opencl/source/helpers/validators.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/source/gtpin/gtpin_hw_helper.h b/opencl/source/gtpin/gtpin_hw_helper.h index b044b23fc7..b3c5a975fe 100644 --- a/opencl/source/gtpin/gtpin_hw_helper.h +++ b/opencl/source/gtpin/gtpin_hw_helper.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/hw_cmds.h" +#include "helpers/hw_cmds.h" namespace NEO { class Kernel; diff --git a/opencl/source/gtpin/gtpin_hw_helper.inl b/opencl/source/gtpin/gtpin_hw_helper.inl index e906b26596..d3ca729be3 100644 --- a/opencl/source/gtpin/gtpin_hw_helper.inl +++ b/opencl/source/gtpin/gtpin_hw_helper.inl @@ -5,8 +5,8 @@ * */ -#include "core/helpers/hw_cmds.h" -#include "core/helpers/string.h" +#include "helpers/hw_cmds.h" +#include "helpers/string.h" #include "opencl/source/gtpin/gtpin_hw_helper.h" #include "opencl/source/kernel/kernel.h" diff --git a/opencl/source/gtpin/gtpin_init.cpp b/opencl/source/gtpin/gtpin_init.cpp index c46ecf5657..0849db8688 100644 --- a/opencl/source/gtpin/gtpin_init.cpp +++ b/opencl/source/gtpin/gtpin_init.cpp @@ -7,7 +7,7 @@ #include "gtpin_init.h" -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/device/device_info.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/source/helpers/base_object.h b/opencl/source/helpers/base_object.h index 3988c0a67c..5a096ee7aa 100644 --- a/opencl/source/helpers/base_object.h +++ b/opencl/source/helpers/base_object.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/helpers/abort.h" -#include "core/helpers/debug_helpers.h" -#include "core/utilities/reference_tracked_object.h" +#include "helpers/abort.h" +#include "helpers/debug_helpers.h" +#include "utilities/reference_tracked_object.h" #include "opencl/source/api/dispatch.h" #include "CL/cl.h" diff --git a/opencl/source/helpers/built_ins_helper.cpp b/opencl/source/helpers/built_ins_helper.cpp index 28adaa2dd3..585f259370 100644 --- a/opencl/source/helpers/built_ins_helper.cpp +++ b/opencl/source/helpers/built_ins_helper.cpp @@ -7,7 +7,7 @@ #include "opencl/source/helpers/built_ins_helper.h" -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/program/program.h" namespace NEO { diff --git a/opencl/source/helpers/built_ins_helper.h b/opencl/source/helpers/built_ins_helper.h index 7a5aa02c2e..9e8e84b8ff 100644 --- a/opencl/source/helpers/built_ins_helper.h +++ b/opencl/source/helpers/built_ins_helper.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/execution_environment/execution_environment.h" +#include "execution_environment/execution_environment.h" #include "opencl/source/built_ins/built_ins.h" namespace NEO { diff --git a/opencl/source/helpers/cache_policy.cpp b/opencl/source/helpers/cache_policy.cpp index 2fd0c335b3..fcde1a06b9 100644 --- a/opencl/source/helpers/cache_policy.cpp +++ b/opencl/source/helpers/cache_policy.cpp @@ -5,10 +5,10 @@ * */ -#include "core/helpers/cache_policy.h" +#include "helpers/cache_policy.h" -#include "core/helpers/aligned_memory.h" -#include "core/memory_manager/graphics_allocation.h" +#include "helpers/aligned_memory.h" +#include "memory_manager/graphics_allocation.h" namespace NEO { diff --git a/opencl/source/helpers/cl_blit_properties.h b/opencl/source/helpers/cl_blit_properties.h index 0f2c5f80cc..cca1524851 100644 --- a/opencl/source/helpers/cl_blit_properties.h +++ b/opencl/source/helpers/cl_blit_properties.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/blit_commands_helper.h" +#include "helpers/blit_commands_helper.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "CL/cl.h" diff --git a/opencl/source/helpers/convert_color.h b/opencl/source/helpers/convert_color.h index 24dc576523..f4983544fc 100644 --- a/opencl/source/helpers/convert_color.h +++ b/opencl/source/helpers/convert_color.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/basic_math.h" +#include "helpers/basic_math.h" #include "CL/cl.h" diff --git a/opencl/source/helpers/csr_deps.cpp b/opencl/source/helpers/csr_deps.cpp index d173773199..03811f70b3 100644 --- a/opencl/source/helpers/csr_deps.cpp +++ b/opencl/source/helpers/csr_deps.cpp @@ -5,7 +5,7 @@ * */ -#include "core/command_stream/csr_deps.h" +#include "command_stream/csr_deps.h" #include "opencl/source/helpers/timestamp_packet.h" diff --git a/opencl/source/helpers/dispatch_info.h b/opencl/source/helpers/dispatch_info.h index 0c1bd2eeb0..a6096d3eb5 100644 --- a/opencl/source/helpers/dispatch_info.h +++ b/opencl/source/helpers/dispatch_info.h @@ -7,10 +7,10 @@ #pragma once -#include "core/helpers/registered_method_dispatcher.h" -#include "core/helpers/vec.h" -#include "core/memory_manager/surface.h" -#include "core/utilities/stackvec.h" +#include "helpers/registered_method_dispatcher.h" +#include "helpers/vec.h" +#include "memory_manager/surface.h" +#include "utilities/stackvec.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/mem_obj/mem_obj.h" diff --git a/opencl/source/helpers/enable_product.inl b/opencl/source/helpers/enable_product.inl index 9ffb3bf9d7..6a28ff8afa 100644 --- a/opencl/source/helpers/enable_product.inl +++ b/opencl/source/helpers/enable_product.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" namespace NEO { template diff --git a/opencl/source/helpers/enqueue_properties.h b/opencl/source/helpers/enqueue_properties.h index b7c59b80b2..39418e76a7 100644 --- a/opencl/source/helpers/enqueue_properties.h +++ b/opencl/source/helpers/enqueue_properties.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/blit_commands_helper.h" +#include "helpers/blit_commands_helper.h" namespace NEO { diff --git a/opencl/source/helpers/get_info_status_mapper.h b/opencl/source/helpers/get_info_status_mapper.h index 293d65032c..587c114945 100644 --- a/opencl/source/helpers/get_info_status_mapper.h +++ b/opencl/source/helpers/get_info_status_mapper.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/get_info_status.h" +#include "helpers/get_info_status.h" #include diff --git a/opencl/source/helpers/hardware_commands_helper.h b/opencl/source/helpers/hardware_commands_helper.h index 85429180dc..80006ab877 100644 --- a/opencl/source/helpers/hardware_commands_helper.h +++ b/opencl/source/helpers/hardware_commands_helper.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/indirect_heap/indirect_heap.h" +#include "indirect_heap/indirect_heap.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/helpers/per_thread_data.h" #include "opencl/source/kernel/kernel.h" diff --git a/opencl/source/helpers/hardware_commands_helper.inl b/opencl/source/helpers/hardware_commands_helper.inl index b15a66e7ec..bcb0aa5a94 100644 --- a/opencl/source/helpers/hardware_commands_helper.inl +++ b/opencl/source/helpers/hardware_commands_helper.inl @@ -5,16 +5,16 @@ * */ -#include "core/command_container/command_encoder.h" -#include "core/command_stream/csr_definitions.h" -#include "core/command_stream/preemption.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/address_patch.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/string.h" -#include "core/indirect_heap/indirect_heap.h" +#include "command_container/command_encoder.h" +#include "command_stream/csr_definitions.h" +#include "command_stream/preemption.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/address_patch.h" +#include "helpers/aligned_memory.h" +#include "helpers/basic_math.h" +#include "helpers/ptr_math.h" +#include "helpers/string.h" +#include "indirect_heap/indirect_heap.h" #include "opencl/source/command_queue/local_id_gen.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" diff --git a/opencl/source/helpers/hardware_commands_helper_base.inl b/opencl/source/helpers/hardware_commands_helper_base.inl index 7927c63d81..7b56b3fc84 100644 --- a/opencl/source/helpers/hardware_commands_helper_base.inl +++ b/opencl/source/helpers/hardware_commands_helper_base.inl @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/kernel/kernel.h" diff --git a/opencl/source/helpers/hardware_context_controller.cpp b/opencl/source/helpers/hardware_context_controller.cpp index 4e5caed5c8..d1294fc9fb 100644 --- a/opencl/source/helpers/hardware_context_controller.cpp +++ b/opencl/source/helpers/hardware_context_controller.cpp @@ -7,8 +7,8 @@ #include "opencl/source/helpers/hardware_context_controller.h" -#include "core/memory_manager/memory_constants.h" -#include "core/os_interface/os_context.h" +#include "memory_manager/memory_constants.h" +#include "os_interface/os_context.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" using namespace NEO; diff --git a/opencl/source/helpers/linux/kmd_notify_properties_linux.cpp b/opencl/source/helpers/linux/kmd_notify_properties_linux.cpp index d8aa6ecda3..6c6fbc65cc 100644 --- a/opencl/source/helpers/linux/kmd_notify_properties_linux.cpp +++ b/opencl/source/helpers/linux/kmd_notify_properties_linux.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/kmd_notify_properties.h" +#include "helpers/kmd_notify_properties.h" using namespace NEO; diff --git a/opencl/source/helpers/mem_properties_parser_helper.h b/opencl/source/helpers/mem_properties_parser_helper.h index 0f43304df8..aa89cf7059 100644 --- a/opencl/source/helpers/mem_properties_parser_helper.h +++ b/opencl/source/helpers/mem_properties_parser_helper.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/bit_helpers.h" -#include "core/memory_manager/allocation_properties.h" +#include "helpers/bit_helpers.h" +#include "memory_manager/allocation_properties.h" #include "opencl/source/extensions/public/cl_ext_private.h" #include "memory_properties_flags.h" diff --git a/opencl/source/helpers/memory_properties_flags_helpers_base.inl b/opencl/source/helpers/memory_properties_flags_helpers_base.inl index 4075c8a543..b5b12b57b9 100644 --- a/opencl/source/helpers/memory_properties_flags_helpers_base.inl +++ b/opencl/source/helpers/memory_properties_flags_helpers_base.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/bit_helpers.h" +#include "helpers/bit_helpers.h" #include "opencl/source/extensions/public/cl_ext_private.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" diff --git a/opencl/source/helpers/mipmap.cpp b/opencl/source/helpers/mipmap.cpp index fc7b81e8be..fd5c28328b 100644 --- a/opencl/source/helpers/mipmap.cpp +++ b/opencl/source/helpers/mipmap.cpp @@ -7,8 +7,8 @@ #include "opencl/source/helpers/mipmap.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/resource_info.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/resource_info.h" #include "opencl/source/mem_obj/image.h" #include diff --git a/opencl/source/helpers/per_thread_data.cpp b/opencl/source/helpers/per_thread_data.cpp index 2f62dfdc99..9916a90bcf 100644 --- a/opencl/source/helpers/per_thread_data.cpp +++ b/opencl/source/helpers/per_thread_data.cpp @@ -7,8 +7,8 @@ #include "opencl/source/helpers/per_thread_data.h" -#include "core/command_stream/linear_stream.h" -#include "core/helpers/debug_helpers.h" +#include "command_stream/linear_stream.h" +#include "helpers/debug_helpers.h" #include diff --git a/opencl/source/helpers/properties_helper.cpp b/opencl/source/helpers/properties_helper.cpp index cc4d8a40ec..2ce53f8f4b 100644 --- a/opencl/source/helpers/properties_helper.cpp +++ b/opencl/source/helpers/properties_helper.cpp @@ -7,8 +7,8 @@ #include "opencl/source/helpers/properties_helper.h" -#include "core/helpers/timestamp_packet.h" -#include "core/memory_manager/memory_manager.h" +#include "helpers/timestamp_packet.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/helpers/mipmap.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/source/helpers/properties_helper.h b/opencl/source/helpers/properties_helper.h index 6c8890b613..675cc02b41 100644 --- a/opencl/source/helpers/properties_helper.h +++ b/opencl/source/helpers/properties_helper.h @@ -7,8 +7,8 @@ #pragma once -#include "core/command_stream/csr_deps.h" -#include "core/command_stream/queue_throttle.h" +#include "command_stream/csr_deps.h" +#include "command_stream/queue_throttle.h" #include "opencl/source/api/cl_types.h" #include diff --git a/opencl/source/helpers/queue_helpers.h b/opencl/source/helpers/queue_helpers.h index c966854dbe..6729663857 100644 --- a/opencl/source/helpers/queue_helpers.h +++ b/opencl/source/helpers/queue_helpers.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/device/device.h" -#include "core/helpers/get_info.h" +#include "device/device.h" +#include "helpers/get_info.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/device_queue/device_queue.h" diff --git a/opencl/source/helpers/string_helpers.h b/opencl/source/helpers/string_helpers.h index 7d1ef1c695..87ddcfa5ed 100644 --- a/opencl/source/helpers/string_helpers.h +++ b/opencl/source/helpers/string_helpers.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/utilities/stackvec.h" +#include "utilities/stackvec.h" #include "CL/cl.h" diff --git a/opencl/source/helpers/surface_formats.cpp b/opencl/source/helpers/surface_formats.cpp index e160dcf11e..f447f04a5e 100644 --- a/opencl/source/helpers/surface_formats.cpp +++ b/opencl/source/helpers/surface_formats.cpp @@ -7,8 +7,8 @@ #include "surface_formats.h" -#include "core/gmm_helper/gmm_lib.h" -#include "core/helpers/array_count.h" +#include "gmm_helper/gmm_lib.h" +#include "helpers/array_count.h" #include "opencl/source/api/cl_types.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/source/helpers/surface_formats.h b/opencl/source/helpers/surface_formats.h index 01ecfcf5cf..a1111b86e5 100644 --- a/opencl/source/helpers/surface_formats.h +++ b/opencl/source/helpers/surface_formats.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/gmm_helper/gmm_lib.h" -#include "core/helpers/surface_format_info.h" -#include "core/utilities/arrayref.h" +#include "gmm_helper/gmm_lib.h" +#include "helpers/surface_format_info.h" +#include "utilities/arrayref.h" #include "CL/cl.h" diff --git a/opencl/source/helpers/task_information.cpp b/opencl/source/helpers/task_information.cpp index 8687f113e9..714e698943 100644 --- a/opencl/source/helpers/task_information.cpp +++ b/opencl/source/helpers/task_information.cpp @@ -7,15 +7,15 @@ #include "opencl/source/helpers/task_information.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/csr_deps.h" -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/preemption.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/engine_node_helper.h" -#include "core/helpers/string.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/surface.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/csr_deps.h" +#include "command_stream/linear_stream.h" +#include "command_stream/preemption.h" +#include "helpers/aligned_memory.h" +#include "helpers/engine_node_helper.h" +#include "helpers/string.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/surface.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/command_queue/enqueue_common.h" diff --git a/opencl/source/helpers/task_information.h b/opencl/source/helpers/task_information.h index 6cea56f4e6..c6813b2060 100644 --- a/opencl/source/helpers/task_information.h +++ b/opencl/source/helpers/task_information.h @@ -6,13 +6,13 @@ */ #pragma once -#include "core/command_stream/linear_stream.h" -#include "core/helpers/blit_commands_helper.h" -#include "core/helpers/completion_stamp.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/timestamp_packet.h" -#include "core/indirect_heap/indirect_heap.h" -#include "core/utilities/iflist.h" +#include "command_stream/linear_stream.h" +#include "helpers/blit_commands_helper.h" +#include "helpers/completion_stamp.h" +#include "helpers/hw_info.h" +#include "helpers/timestamp_packet.h" +#include "indirect_heap/indirect_heap.h" +#include "utilities/iflist.h" #include "opencl/source/helpers/properties_helper.h" #include diff --git a/opencl/source/helpers/uint16_avx2.h b/opencl/source/helpers/uint16_avx2.h index 54a0edab93..e755c80faa 100644 --- a/opencl/source/helpers/uint16_avx2.h +++ b/opencl/source/helpers/uint16_avx2.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/aligned_memory.h" -#include "core/helpers/debug_helpers.h" +#include "helpers/aligned_memory.h" +#include "helpers/debug_helpers.h" #include #include diff --git a/opencl/source/helpers/uint16_sse4.h b/opencl/source/helpers/uint16_sse4.h index 8c389a16ab..dadaa571a6 100644 --- a/opencl/source/helpers/uint16_sse4.h +++ b/opencl/source/helpers/uint16_sse4.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/aligned_memory.h" -#include "core/helpers/debug_helpers.h" +#include "helpers/aligned_memory.h" +#include "helpers/debug_helpers.h" #include #include diff --git a/opencl/source/helpers/windows/gl_helper.h b/opencl/source/helpers/windows/gl_helper.h index f822012a0c..29fc4508a2 100644 --- a/opencl/source/helpers/windows/gl_helper.h +++ b/opencl/source/helpers/windows/gl_helper.h @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "GL/gl.h" diff --git a/opencl/source/helpers/windows/gmm_callbacks_tgllp_plus.inl b/opencl/source/helpers/windows/gmm_callbacks_tgllp_plus.inl index 4dcd8b2133..5aac67405a 100644 --- a/opencl/source/helpers/windows/gmm_callbacks_tgllp_plus.inl +++ b/opencl/source/helpers/windows/gmm_callbacks_tgllp_plus.inl @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/windows/gmm_callbacks.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "helpers/hw_helper.h" +#include "helpers/windows/gmm_callbacks.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/source/helpers/windows/kmd_notify_properties_windows.cpp b/opencl/source/helpers/windows/kmd_notify_properties_windows.cpp index f4dc645afe..d41f68834e 100644 --- a/opencl/source/helpers/windows/kmd_notify_properties_windows.cpp +++ b/opencl/source/helpers/windows/kmd_notify_properties_windows.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/kmd_notify_properties.h" -#include "core/os_interface/windows/sys_calls.h" +#include "helpers/kmd_notify_properties.h" +#include "os_interface/windows/sys_calls.h" using namespace NEO; diff --git a/opencl/source/kernel/image_transformer.cpp b/opencl/source/kernel/image_transformer.cpp index a33603ffdb..4f0584d7e0 100644 --- a/opencl/source/kernel/image_transformer.cpp +++ b/opencl/source/kernel/image_transformer.cpp @@ -7,7 +7,7 @@ #include "opencl/source/kernel/image_transformer.h" -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/program/kernel_info.h" diff --git a/opencl/source/kernel/kernel.cpp b/opencl/source/kernel/kernel.cpp index 7d5baae0ff..a8dea8f9ab 100644 --- a/opencl/source/kernel/kernel.cpp +++ b/opencl/source/kernel/kernel.cpp @@ -7,18 +7,18 @@ #include "opencl/source/kernel/kernel.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/get_info.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/kernel_helpers.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/memory_manager.h" -#include "core/memory_manager/unified_memory_manager.h" +#include "command_stream/command_stream_receiver.h" +#include "debug_settings/debug_settings_manager.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/aligned_memory.h" +#include "helpers/basic_math.h" +#include "helpers/debug_helpers.h" +#include "helpers/get_info.h" +#include "helpers/hw_helper.h" +#include "helpers/kernel_helpers.h" +#include "helpers/ptr_math.h" +#include "memory_manager/memory_manager.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/accelerators/intel_accelerator.h" #include "opencl/source/accelerators/intel_motion_estimation.h" #include "opencl/source/built_ins/built_ins.h" diff --git a/opencl/source/kernel/kernel.h b/opencl/source/kernel/kernel.h index 5435a46d89..6d67937d0b 100644 --- a/opencl/source/kernel/kernel.h +++ b/opencl/source/kernel/kernel.h @@ -6,14 +6,14 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/command_stream/thread_arbitration_policy.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/device/device.h" -#include "core/helpers/address_patch.h" -#include "core/helpers/preamble.h" -#include "core/unified_memory/unified_memory.h" -#include "core/utilities/stackvec.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "command_stream/thread_arbitration_policy.h" +#include "debug_settings/debug_settings_manager.h" +#include "device/device.h" +#include "helpers/address_patch.h" +#include "helpers/preamble.h" +#include "unified_memory/unified_memory.h" +#include "utilities/stackvec.h" #include "opencl/source/api/cl_types.h" #include "opencl/source/device_queue/device_queue.h" #include "opencl/source/extensions/public/cl_ext_private.h" diff --git a/opencl/source/kernel/kernel_extra.cpp b/opencl/source/kernel/kernel_extra.cpp index 1f7b8b4ba8..03ce82111a 100644 --- a/opencl/source/kernel/kernel_extra.cpp +++ b/opencl/source/kernel/kernel_extra.cpp @@ -5,7 +5,7 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include "opencl/source/kernel/kernel.h" namespace NEO { diff --git a/opencl/source/mem_obj/buffer.cpp b/opencl/source/mem_obj/buffer.cpp index 3592447979..be62d26ff3 100644 --- a/opencl/source/mem_obj/buffer.cpp +++ b/opencl/source/mem_obj/buffer.cpp @@ -7,21 +7,21 @@ #include "opencl/source/mem_obj/buffer.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/string.h" -#include "core/helpers/timestamp_packet.h" -#include "core/memory_manager/host_ptr_manager.h" -#include "core/memory_manager/memory_manager.h" -#include "core/memory_manager/memory_operations_handler.h" -#include "core/memory_manager/unified_memory_manager.h" +#include "command_stream/command_stream_receiver.h" +#include "debug_settings/debug_settings_manager.h" +#include "execution_environment/root_device_environment.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/aligned_memory.h" +#include "helpers/hw_helper.h" +#include "helpers/hw_info.h" +#include "helpers/ptr_math.h" +#include "helpers/string.h" +#include "helpers/timestamp_packet.h" +#include "memory_manager/host_ptr_manager.h" +#include "memory_manager/memory_manager.h" +#include "memory_manager/memory_operations_handler.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" diff --git a/opencl/source/mem_obj/buffer.h b/opencl/source/mem_obj/buffer.h index 1d3a95d938..9fc10270df 100644 --- a/opencl/source/mem_obj/buffer.h +++ b/opencl/source/mem_obj/buffer.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/basic_math.h" -#include "core/memory_manager/memory_constants.h" +#include "helpers/basic_math.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/context/context_type.h" #include "opencl/source/extensions/public/cl_ext_private.h" #include "opencl/source/mem_obj/mem_obj.h" diff --git a/opencl/source/mem_obj/buffer_base.inl b/opencl/source/mem_obj/buffer_base.inl index 46251c38e9..f8f4155fa3 100644 --- a/opencl/source/mem_obj/buffer_base.inl +++ b/opencl/source/mem_obj/buffer_base.inl @@ -5,12 +5,12 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/bit_helpers.h" -#include "core/helpers/hw_cmds.h" +#include "execution_environment/execution_environment.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/resource_info.h" +#include "helpers/aligned_memory.h" +#include "helpers/bit_helpers.h" +#include "helpers/hw_cmds.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/source/mem_obj/image.cpp b/opencl/source/mem_obj/image.cpp index 3c277872d2..c659b21602 100644 --- a/opencl/source/mem_obj/image.cpp +++ b/opencl/source/mem_obj/image.cpp @@ -7,19 +7,19 @@ #include "opencl/source/mem_obj/image.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_types_converter.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/get_info.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/string.h" -#include "core/memory_manager/memory_manager.h" -#include "core/utilities/compiler_support.h" +#include "debug_settings/debug_settings_manager.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_types_converter.h" +#include "gmm_helper/resource_info.h" +#include "helpers/aligned_memory.h" +#include "helpers/basic_math.h" +#include "helpers/get_info.h" +#include "helpers/hw_helper.h" +#include "helpers/hw_info.h" +#include "helpers/ptr_math.h" +#include "helpers/string.h" +#include "memory_manager/memory_manager.h" +#include "utilities/compiler_support.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" diff --git a/opencl/source/mem_obj/image.h b/opencl/source/mem_obj/image.h index 756e6423c8..b4088615ca 100644 --- a/opencl/source/mem_obj/image.h +++ b/opencl/source/mem_obj/image.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/string.h" -#include "core/image/image_surface_state.h" +#include "helpers/string.h" +#include "image/image_surface_state.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/helpers/validators.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/source/mem_obj/image.inl b/opencl/source/mem_obj/image.inl index 6acb22600b..6daf9266f6 100644 --- a/opencl/source/mem_obj/image.inl +++ b/opencl/source/mem_obj/image.inl @@ -5,12 +5,12 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/hw_cmds.h" +#include "execution_environment/execution_environment.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/resource_info.h" +#include "helpers/aligned_memory.h" +#include "helpers/hw_cmds.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/source/mem_obj/map_operations_handler.cpp b/opencl/source/mem_obj/map_operations_handler.cpp index dc0fdbf44d..1edab6b9dd 100644 --- a/opencl/source/mem_obj/map_operations_handler.cpp +++ b/opencl/source/mem_obj/map_operations_handler.cpp @@ -7,7 +7,7 @@ #include "opencl/source/mem_obj/map_operations_handler.h" -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" using namespace NEO; diff --git a/opencl/source/mem_obj/mem_obj.cpp b/opencl/source/mem_obj/mem_obj.cpp index 6cf45b7402..715ca83c9a 100644 --- a/opencl/source/mem_obj/mem_obj.cpp +++ b/opencl/source/mem_obj/mem_obj.cpp @@ -7,16 +7,16 @@ #include "opencl/source/mem_obj/mem_obj.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/bit_helpers.h" -#include "core/helpers/get_info.h" -#include "core/memory_manager/deferred_deleter.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/os_context.h" +#include "command_stream/command_stream_receiver.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/resource_info.h" +#include "helpers/aligned_memory.h" +#include "helpers/bit_helpers.h" +#include "helpers/get_info.h" +#include "memory_manager/deferred_deleter.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/os_context.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" diff --git a/opencl/source/mem_obj/mem_obj.h b/opencl/source/mem_obj/mem_obj.h index 190bfc9dc6..79c3d89a61 100644 --- a/opencl/source/mem_obj/mem_obj.h +++ b/opencl/source/mem_obj/mem_obj.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include "opencl/source/api/cl_types.h" #include "opencl/source/extensions/public/cl_ext_private.h" #include "opencl/source/helpers/base_object.h" diff --git a/opencl/source/mem_obj/mem_obj_helper.h b/opencl/source/mem_obj/mem_obj_helper.h index 14c4eebfe4..c0c71ad026 100644 --- a/opencl/source/mem_obj/mem_obj_helper.h +++ b/opencl/source/mem_obj/mem_obj_helper.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/helpers/bit_helpers.h" -#include "core/memory_manager/memory_manager.h" -#include "core/memory_manager/unified_memory_manager.h" +#include "helpers/bit_helpers.h" +#include "memory_manager/memory_manager.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/extensions/public/cl_ext_private.h" #include "opencl/source/helpers/mem_properties_parser_helper.h" #include "opencl/source/mem_obj/mem_obj.h" diff --git a/opencl/source/mem_obj/pipe.cpp b/opencl/source/mem_obj/pipe.cpp index 4b5bf8289c..32b9d7e05b 100644 --- a/opencl/source/mem_obj/pipe.cpp +++ b/opencl/source/mem_obj/pipe.cpp @@ -7,8 +7,8 @@ #include "opencl/source/mem_obj/pipe.h" -#include "core/helpers/get_info.h" -#include "core/memory_manager/memory_manager.h" +#include "helpers/get_info.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/get_info_status_mapper.h" diff --git a/opencl/source/memory_manager/address_mapper.cpp b/opencl/source/memory_manager/address_mapper.cpp index f519f0748c..afd07c8774 100644 --- a/opencl/source/memory_manager/address_mapper.cpp +++ b/opencl/source/memory_manager/address_mapper.cpp @@ -7,7 +7,7 @@ #include "opencl/source/memory_manager/address_mapper.h" -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include #include diff --git a/opencl/source/memory_manager/cpu_page_fault_manager_memory_sync.cpp b/opencl/source/memory_manager/cpu_page_fault_manager_memory_sync.cpp index dc00f93289..e9377bebf4 100644 --- a/opencl/source/memory_manager/cpu_page_fault_manager_memory_sync.cpp +++ b/opencl/source/memory_manager/cpu_page_fault_manager_memory_sync.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/debug_helpers.h" -#include "core/memory_manager/unified_memory_manager.h" -#include "core/page_fault_manager/cpu_page_fault_manager.h" +#include "helpers/debug_helpers.h" +#include "memory_manager/unified_memory_manager.h" +#include "page_fault_manager/cpu_page_fault_manager.h" #include "opencl/source/command_queue/command_queue.h" namespace NEO { diff --git a/opencl/source/memory_manager/mem_obj_surface.h b/opencl/source/memory_manager/mem_obj_surface.h index fb11ac4e49..2dc4984ad5 100644 --- a/opencl/source/memory_manager/mem_obj_surface.h +++ b/opencl/source/memory_manager/mem_obj_surface.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/surface.h" +#include "memory_manager/surface.h" #include "opencl/source/mem_obj/mem_obj.h" namespace NEO { diff --git a/opencl/source/memory_manager/memory_manager_banks_count.cpp b/opencl/source/memory_manager/memory_manager_banks_count.cpp index 1a2f8999a7..2b94ec6dcd 100644 --- a/opencl/source/memory_manager/memory_manager_banks_count.cpp +++ b/opencl/source/memory_manager/memory_manager_banks_count.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/memory_manager.h" +#include "memory_manager/memory_manager.h" namespace NEO { uint32_t MemoryManager::getBanksCount() { diff --git a/opencl/source/memory_manager/os_agnostic_memory_manager.cpp b/opencl/source/memory_manager/os_agnostic_memory_manager.cpp index dcec73fd50..14f1d93ad7 100644 --- a/opencl/source/memory_manager/os_agnostic_memory_manager.cpp +++ b/opencl/source/memory_manager/os_agnostic_memory_manager.cpp @@ -7,18 +7,18 @@ #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/host_ptr_manager.h" -#include "core/memory_manager/residency.h" -#include "core/os_interface/os_memory.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/resource_info.h" +#include "helpers/aligned_memory.h" +#include "helpers/basic_math.h" +#include "helpers/hw_info.h" +#include "helpers/ptr_math.h" +#include "memory_manager/host_ptr_manager.h" +#include "memory_manager/residency.h" +#include "os_interface/os_memory.h" #include "opencl/source/aub/aub_center.h" #include "opencl/source/helpers/surface_formats.h" diff --git a/opencl/source/memory_manager/os_agnostic_memory_manager.h b/opencl/source/memory_manager/os_agnostic_memory_manager.h index 32127e1138..cadeafd260 100644 --- a/opencl/source/memory_manager/os_agnostic_memory_manager.h +++ b/opencl/source/memory_manager/os_agnostic_memory_manager.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/basic_math.h" -#include "core/memory_manager/memory_manager.h" +#include "helpers/basic_math.h" +#include "memory_manager/memory_manager.h" namespace NEO { constexpr size_t bigAllocation = 1 * MB; diff --git a/opencl/source/memory_manager/page_table.h b/opencl/source/memory_manager/page_table.h index c7b15551f6..d6da1d09eb 100644 --- a/opencl/source/memory_manager/page_table.h +++ b/opencl/source/memory_manager/page_table.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/basic_math.h" +#include "helpers/basic_math.h" #include "opencl/source/memory_manager/physical_address_allocator.h" #include diff --git a/opencl/source/memory_manager/physical_address_allocator.h b/opencl/source/memory_manager/physical_address_allocator.h index 72b0e5fbe2..20035cb3ce 100644 --- a/opencl/source/memory_manager/physical_address_allocator.h +++ b/opencl/source/memory_manager/physical_address_allocator.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/helpers/aligned_memory.h" -#include "core/helpers/debug_helpers.h" -#include "core/memory_manager/memory_constants.h" +#include "helpers/aligned_memory.h" +#include "helpers/debug_helpers.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/memory_manager/memory_banks.h" #include diff --git a/opencl/source/os_interface/linux/api_linux.cpp b/opencl/source/os_interface/linux/api_linux.cpp index dbab17f7b8..91d4fb5732 100644 --- a/opencl/source/os_interface/linux/api_linux.cpp +++ b/opencl/source/os_interface/linux/api_linux.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/get_info.h" +#include "helpers/get_info.h" #include "opencl/source/api/api.h" #include "opencl/source/api/dispatch.h" #include "opencl/source/context/context.h" diff --git a/opencl/source/os_interface/linux/drm_command_stream.h b/opencl/source/os_interface/linux/drm_command_stream.h index 9c00bf6327..bee806c8fe 100644 --- a/opencl/source/os_interface/linux/drm_command_stream.h +++ b/opencl/source/os_interface/linux/drm_command_stream.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/linux/drm_gem_close_worker.h" +#include "os_interface/linux/drm_gem_close_worker.h" #include "opencl/source/command_stream/device_command_stream.h" #include "drm/i915_drm.h" diff --git a/opencl/source/os_interface/linux/drm_command_stream.inl b/opencl/source/os_interface/linux/drm_command_stream.inl index 1a4316d57c..c98f826acb 100644 --- a/opencl/source/os_interface/linux/drm_command_stream.inl +++ b/opencl/source/os_interface/linux/drm_command_stream.inl @@ -5,21 +5,21 @@ * */ -#include "core/command_stream/linear_stream.h" -#include "core/execution_environment/execution_environment.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/page_table_mngr.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/flush_stamp.h" -#include "core/helpers/preamble.h" -#include "core/memory_manager/residency.h" -#include "core/os_interface/linux/drm_allocation.h" -#include "core/os_interface/linux/drm_buffer_object.h" -#include "core/os_interface/linux/drm_engine_mapper.h" -#include "core/os_interface/linux/drm_memory_manager.h" -#include "core/os_interface/linux/drm_neo.h" -#include "core/os_interface/linux/os_context_linux.h" -#include "core/os_interface/linux/os_interface.h" +#include "command_stream/linear_stream.h" +#include "execution_environment/execution_environment.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/page_table_mngr.h" +#include "helpers/aligned_memory.h" +#include "helpers/flush_stamp.h" +#include "helpers/preamble.h" +#include "memory_manager/residency.h" +#include "os_interface/linux/drm_allocation.h" +#include "os_interface/linux/drm_buffer_object.h" +#include "os_interface/linux/drm_engine_mapper.h" +#include "os_interface/linux/drm_memory_manager.h" +#include "os_interface/linux/drm_neo.h" +#include "os_interface/linux/os_context_linux.h" +#include "os_interface/linux/os_interface.h" #include "opencl/source/os_interface/linux/drm_command_stream.h" #include diff --git a/opencl/source/os_interface/linux/drm_command_stream_bdw_plus.inl b/opencl/source/os_interface/linux/drm_command_stream_bdw_plus.inl index 93cb0ade73..7d2f17aa76 100644 --- a/opencl/source/os_interface/linux/drm_command_stream_bdw_plus.inl +++ b/opencl/source/os_interface/linux/drm_command_stream_bdw_plus.inl @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_allocation.h" +#include "os_interface/linux/drm_allocation.h" #include "opencl/source/os_interface/linux/drm_command_stream.h" namespace NEO { diff --git a/opencl/source/os_interface/linux/performance_counters_linux.cpp b/opencl/source/os_interface/linux/performance_counters_linux.cpp index 36faabad01..d6c9a37d8a 100644 --- a/opencl/source/os_interface/linux/performance_counters_linux.cpp +++ b/opencl/source/os_interface/linux/performance_counters_linux.cpp @@ -7,8 +7,8 @@ #include "performance_counters_linux.h" -#include "core/device/device.h" -#include "core/helpers/hw_helper.h" +#include "device/device.h" +#include "helpers/hw_helper.h" namespace NEO { //////////////////////////////////////////////////// diff --git a/opencl/source/os_interface/metrics_library.cpp b/opencl/source/os_interface/metrics_library.cpp index 53bce914de..68b4a96f87 100644 --- a/opencl/source/os_interface/metrics_library.cpp +++ b/opencl/source/os_interface/metrics_library.cpp @@ -7,7 +7,7 @@ #include "opencl/source/os_interface/metrics_library.h" -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" #include "opencl/source/os_interface/os_inc_base.h" namespace NEO { diff --git a/opencl/source/os_interface/metrics_library.h b/opencl/source/os_interface/metrics_library.h index 540bd9e9c5..449614be28 100644 --- a/opencl/source/os_interface/metrics_library.h +++ b/opencl/source/os_interface/metrics_library.h @@ -7,7 +7,7 @@ #pragma once -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "instrumentation.h" diff --git a/opencl/source/os_interface/os_inc_base.h b/opencl/source/os_interface/os_inc_base.h index aa18a2bcae..4bbb48094b 100644 --- a/opencl/source/os_interface/os_inc_base.h +++ b/opencl/source/os_interface/os_inc_base.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" namespace Os { // Compiler library names diff --git a/opencl/source/os_interface/performance_counters.cpp b/opencl/source/os_interface/performance_counters.cpp index 6603f9e998..5959be587f 100644 --- a/opencl/source/os_interface/performance_counters.cpp +++ b/opencl/source/os_interface/performance_counters.cpp @@ -7,7 +7,7 @@ #include "opencl/source/os_interface/performance_counters.h" -#include "core/utilities/tag_allocator.h" +#include "utilities/tag_allocator.h" using namespace MetricsLibraryApi; diff --git a/opencl/source/os_interface/windows/api_win.cpp b/opencl/source/os_interface/windows/api_win.cpp index a193fc539a..bc50f67167 100644 --- a/opencl/source/os_interface/windows/api_win.cpp +++ b/opencl/source/os_interface/windows/api_win.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/get_info.h" -#include "core/helpers/hw_info.h" -#include "core/utilities/api_intercept.h" +#include "helpers/get_info.h" +#include "helpers/hw_info.h" +#include "utilities/api_intercept.h" #include "opencl/source/api/api.h" #include "opencl/source/api/dispatch.h" #include "opencl/source/command_queue/command_queue.h" diff --git a/opencl/source/os_interface/windows/d3d_sharing_functions.h b/opencl/source/os_interface/windows/d3d_sharing_functions.h index 5ab92e903e..f56cde7e0f 100644 --- a/opencl/source/os_interface/windows/d3d_sharing_functions.h +++ b/opencl/source/os_interface/windows/d3d_sharing_functions.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/array_count.h" -#include "core/helpers/debug_helpers.h" +#include "helpers/array_count.h" +#include "helpers/debug_helpers.h" #include "opencl/source/api/dispatch.h" #include "opencl/source/sharings/sharing.h" diff --git a/opencl/source/os_interface/windows/device_caps_init_win.cpp b/opencl/source/os_interface/windows/device_caps_init_win.cpp index f0e1cd254e..75c8ba275c 100644 --- a/opencl/source/os_interface/windows/device_caps_init_win.cpp +++ b/opencl/source/os_interface/windows/device_caps_init_win.cpp @@ -7,7 +7,7 @@ #ifdef _WIN32 -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/device/cl_device.h" namespace NEO { diff --git a/opencl/source/os_interface/windows/device_command_stream.inl b/opencl/source/os_interface/windows/device_command_stream.inl index 5c14e393d4..1338eee458 100644 --- a/opencl/source/os_interface/windows/device_command_stream.inl +++ b/opencl/source/os_interface/windows/device_command_stream.inl @@ -9,7 +9,7 @@ // Current order must be preserved due to two versions of igfxfmid.h #pragma warning(push) #pragma warning(disable : 4005) -#include "core/helpers/hw_cmds.h" +#include "helpers/hw_cmds.h" #include "opencl/source/command_stream/command_stream_receiver_with_aub_dump.h" #include "opencl/source/command_stream/device_command_stream.h" #include "opencl/source/os_interface/windows/wddm_device_command_stream.h" diff --git a/opencl/source/os_interface/windows/driver_info.cpp b/opencl/source/os_interface/windows/driver_info.cpp index e287d3f9ef..77f3fd6287 100644 --- a/opencl/source/os_interface/windows/driver_info.cpp +++ b/opencl/source/os_interface/windows/driver_info.cpp @@ -7,9 +7,9 @@ #include "opencl/source/device/driver_info.h" -#include "core/os_interface/windows/debug_registry_reader.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/debug_registry_reader.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm/wddm.h" #include "opencl/source/os_interface/windows/driver_info.h" namespace NEO { diff --git a/opencl/source/os_interface/windows/gl/gl_arb_sync_event_os.cpp b/opencl/source/os_interface/windows/gl/gl_arb_sync_event_os.cpp index 20ccd07d9f..25e180b468 100644 --- a/opencl/source/os_interface/windows/gl/gl_arb_sync_event_os.cpp +++ b/opencl/source/os_interface/windows/gl/gl_arb_sync_event_os.cpp @@ -5,13 +5,13 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/timestamp_packet.h" -#include "core/os_interface/os_interface.h" -#include "core/os_interface/windows/gdi_interface.h" -#include "core/os_interface/windows/os_context_win.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm/wddm.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/timestamp_packet.h" +#include "os_interface/os_interface.h" +#include "os_interface/windows/gdi_interface.h" +#include "os_interface/windows/os_context_win.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm/wddm.h" #include "opencl/source/context/context.h" #include "opencl/source/extensions/public/cl_gl_private_intel.h" #include "opencl/source/sharings/gl/gl_arb_sync_event.h" diff --git a/opencl/source/os_interface/windows/gl/gl_sharing_os.h b/opencl/source/os_interface/windows/gl/gl_sharing_os.h index ee448089f6..0d613b6a13 100644 --- a/opencl/source/os_interface/windows/gl/gl_sharing_os.h +++ b/opencl/source/os_interface/windows/gl/gl_sharing_os.h @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/windows_wrapper.h" +#include "os_interface/windows/windows_wrapper.h" #include diff --git a/opencl/source/os_interface/windows/gl/gl_sharing_win.cpp b/opencl/source/os_interface/windows/gl/gl_sharing_win.cpp index 508d3098e0..125072a2be 100644 --- a/opencl/source/os_interface/windows/gl/gl_sharing_win.cpp +++ b/opencl/source/os_interface/windows/gl/gl_sharing_win.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/timestamp_packet.h" -#include "core/os_interface/windows/windows_wrapper.h" +#include "helpers/timestamp_packet.h" +#include "os_interface/windows/windows_wrapper.h" #include "opencl/source/helpers/windows/gl_helper.h" #include "opencl/source/sharings/gl/gl_arb_sync_event.h" #include "opencl/source/sharings/gl/windows/gl_sharing_windows.h" diff --git a/opencl/source/os_interface/windows/performance_counters_win.cpp b/opencl/source/os_interface/windows/performance_counters_win.cpp index ad88f95744..733f3c68d0 100644 --- a/opencl/source/os_interface/windows/performance_counters_win.cpp +++ b/opencl/source/os_interface/windows/performance_counters_win.cpp @@ -7,10 +7,10 @@ #include "performance_counters_win.h" -#include "core/device/device.h" -#include "core/helpers/hw_helper.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/os_time_win.h" +#include "device/device.h" +#include "helpers/hw_helper.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/os_time_win.h" namespace NEO { ///////////////////////////////////////////////////// diff --git a/opencl/source/os_interface/windows/wddm_device_command_stream.inl b/opencl/source/os_interface/windows/wddm_device_command_stream.inl index 306e6d3d55..1aef3daa6d 100644 --- a/opencl/source/os_interface/windows/wddm_device_command_stream.inl +++ b/opencl/source/os_interface/windows/wddm_device_command_stream.inl @@ -9,24 +9,24 @@ // Current order must be preserved due to two versions of igfxfmid.h #pragma warning(push) #pragma warning(disable : 4005) -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/preemption.h" -#include "core/direct_submission/dispatchers/blitter_dispatcher.h" -#include "core/direct_submission/dispatchers/render_dispatcher.h" -#include "core/direct_submission/windows/wddm_direct_submission.h" -#include "core/gmm_helper/page_table_mngr.h" -#include "core/helpers/flush_stamp.h" -#include "core/helpers/hw_cmds.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/windows/gmm_callbacks.h" -#include "core/os_interface/windows/wddm/wddm.h" +#include "command_stream/linear_stream.h" +#include "command_stream/preemption.h" +#include "direct_submission/dispatchers/blitter_dispatcher.h" +#include "direct_submission/dispatchers/render_dispatcher.h" +#include "direct_submission/windows/wddm_direct_submission.h" +#include "gmm_helper/page_table_mngr.h" +#include "helpers/flush_stamp.h" +#include "helpers/hw_cmds.h" +#include "helpers/ptr_math.h" +#include "helpers/windows/gmm_callbacks.h" +#include "os_interface/windows/wddm/wddm.h" #include "opencl/source/os_interface/windows/wddm_device_command_stream.h" #pragma warning(pop) -#include "core/os_interface/windows/gdi_interface.h" -#include "core/os_interface/windows/os_context_win.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm_memory_manager.h" +#include "os_interface/windows/gdi_interface.h" +#include "os_interface/windows/os_context_win.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm_memory_manager.h" namespace NEO { diff --git a/opencl/source/platform/extensions.cpp b/opencl/source/platform/extensions.cpp index 0ab29fdb90..c19e3ebd85 100644 --- a/opencl/source/platform/extensions.cpp +++ b/opencl/source/platform/extensions.cpp @@ -7,7 +7,7 @@ #include "opencl/source/platform/extensions.h" -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" #include diff --git a/opencl/source/platform/extensions.h b/opencl/source/platform/extensions.h index b6e33803b0..22721bd399 100644 --- a/opencl/source/platform/extensions.h +++ b/opencl/source/platform/extensions.h @@ -7,7 +7,7 @@ #pragma once -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" #include diff --git a/opencl/source/platform/platform.cpp b/opencl/source/platform/platform.cpp index 2f4a935355..d5df8e6466 100644 --- a/opencl/source/platform/platform.cpp +++ b/opencl/source/platform/platform.cpp @@ -7,19 +7,19 @@ #include "platform.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/compiler_interface/compiler_interface.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/device/root_device.h" -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/get_info.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/string.h" -#include "core/os_interface/device_factory.h" -#include "core/os_interface/os_interface.h" +#include "command_stream/command_stream_receiver.h" +#include "compiler_interface/compiler_interface.h" +#include "debug_settings/debug_settings_manager.h" +#include "device/root_device.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/debug_helpers.h" +#include "helpers/get_info.h" +#include "helpers/hw_helper.h" +#include "helpers/string.h" +#include "os_interface/device_factory.h" +#include "os_interface/os_interface.h" #include "opencl/source/api/api.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/event/async_events_handler.h" diff --git a/opencl/source/program/block_kernel_manager.cpp b/opencl/source/program/block_kernel_manager.cpp index 65fe41f909..911be11c25 100644 --- a/opencl/source/program/block_kernel_manager.cpp +++ b/opencl/source/program/block_kernel_manager.cpp @@ -7,8 +7,8 @@ #include "opencl/source/program/block_kernel_manager.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/debug_helpers.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/debug_helpers.h" #include "opencl/source/program/kernel_info.h" namespace NEO { diff --git a/opencl/source/program/build.cpp b/opencl/source/program/build.cpp index 6b3a13e6df..b4c3ffde44 100644 --- a/opencl/source/program/build.cpp +++ b/opencl/source/program/build.cpp @@ -5,11 +5,11 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/device/device.h" -#include "core/device_binary_format/device_binary_formats.h" -#include "core/execution_environment/execution_environment.h" -#include "core/utilities/time_measure_wrapper.h" +#include "compiler_interface/compiler_interface.h" +#include "device/device.h" +#include "device_binary_format/device_binary_formats.h" +#include "execution_environment/execution_environment.h" +#include "utilities/time_measure_wrapper.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/gtpin/gtpin_notify.h" #include "opencl/source/helpers/validators.h" diff --git a/opencl/source/program/compile.cpp b/opencl/source/program/compile.cpp index 7f77981d60..11a7384916 100644 --- a/opencl/source/program/compile.cpp +++ b/opencl/source/program/compile.cpp @@ -5,12 +5,12 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/device/device.h" -#include "core/device_binary_format/elf/elf.h" -#include "core/device_binary_format/elf/elf_encoder.h" -#include "core/device_binary_format/elf/ocl_elf.h" -#include "core/execution_environment/execution_environment.h" +#include "compiler_interface/compiler_interface.h" +#include "device/device.h" +#include "device_binary_format/elf/elf.h" +#include "device_binary_format/elf/elf_encoder.h" +#include "device_binary_format/elf/ocl_elf.h" +#include "execution_environment/execution_environment.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/validators.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/source/program/create.inl b/opencl/source/program/create.inl index d349b8bbee..091fab57c2 100644 --- a/opencl/source/program/create.inl +++ b/opencl/source/program/create.inl @@ -5,9 +5,9 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/device/device.h" -#include "core/memory_manager/memory_constants.h" +#include "debug_settings/debug_settings_manager.h" +#include "device/device.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/string_helpers.h" diff --git a/opencl/source/program/get_info.cpp b/opencl/source/program/get_info.cpp index f55cef6e8a..75e99c418d 100644 --- a/opencl/source/program/get_info.cpp +++ b/opencl/source/program/get_info.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/get_info.h" +#include "helpers/get_info.h" -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/base_object.h" diff --git a/opencl/source/program/kernel_arg_info.h b/opencl/source/program/kernel_arg_info.h index 279403192e..698c44daec 100644 --- a/opencl/source/program/kernel_arg_info.h +++ b/opencl/source/program/kernel_arg_info.h @@ -7,8 +7,8 @@ #pragma once -#include "core/compiler_interface/compiler_options/compiler_options_base.h" -#include "core/utilities/const_stringref.h" +#include "compiler_interface/compiler_options/compiler_options_base.h" +#include "utilities/const_stringref.h" #include #include diff --git a/opencl/source/program/kernel_info.cpp b/opencl/source/program/kernel_info.cpp index e9f7cf4920..713dd64c29 100644 --- a/opencl/source/program/kernel_info.cpp +++ b/opencl/source/program/kernel_info.cpp @@ -5,12 +5,12 @@ * */ -#include "core/device_binary_format/patchtokens_decoder.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/hw_cmds.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/string.h" -#include "core/memory_manager/memory_manager.h" +#include "device_binary_format/patchtokens_decoder.h" +#include "helpers/aligned_memory.h" +#include "helpers/hw_cmds.h" +#include "helpers/ptr_math.h" +#include "helpers/string.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/kernel/kernel.h" diff --git a/opencl/source/program/kernel_info.h b/opencl/source/program/kernel_info.h index 089693c744..d46cd14734 100644 --- a/opencl/source/program/kernel_info.h +++ b/opencl/source/program/kernel_info.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/helpers/hw_info.h" -#include "core/utilities/arrayref.h" -#include "core/utilities/const_stringref.h" +#include "helpers/hw_info.h" +#include "utilities/arrayref.h" +#include "utilities/const_stringref.h" #include "opencl/source/program/heap_info.h" #include "opencl/source/program/kernel_arg_info.h" diff --git a/opencl/source/program/kernel_info_from_patchtokens.cpp b/opencl/source/program/kernel_info_from_patchtokens.cpp index c9603cb2c7..5c7959af3d 100644 --- a/opencl/source/program/kernel_info_from_patchtokens.cpp +++ b/opencl/source/program/kernel_info_from_patchtokens.cpp @@ -7,7 +7,7 @@ #include "opencl/source/program/kernel_info_from_patchtokens.h" -#include "core/device_binary_format/patchtokens_decoder.h" +#include "device_binary_format/patchtokens_decoder.h" #include "opencl/source/program/kernel_info.h" #include diff --git a/opencl/source/program/link.cpp b/opencl/source/program/link.cpp index bae085a33c..8d008cdb67 100644 --- a/opencl/source/program/link.cpp +++ b/opencl/source/program/link.cpp @@ -5,13 +5,13 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/device/device.h" -#include "core/device_binary_format/elf/elf.h" -#include "core/device_binary_format/elf/elf_encoder.h" -#include "core/device_binary_format/elf/ocl_elf.h" -#include "core/execution_environment/execution_environment.h" -#include "core/utilities/stackvec.h" +#include "compiler_interface/compiler_interface.h" +#include "device/device.h" +#include "device_binary_format/elf/elf.h" +#include "device_binary_format/elf/elf_encoder.h" +#include "device_binary_format/elf/ocl_elf.h" +#include "execution_environment/execution_environment.h" +#include "utilities/stackvec.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/validators.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/source/program/printf_handler.cpp b/opencl/source/program/printf_handler.cpp index 4a06cbdfc1..315924596c 100644 --- a/opencl/source/program/printf_handler.cpp +++ b/opencl/source/program/printf_handler.cpp @@ -7,10 +7,10 @@ #include "printf_handler.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/memory_manager.h" -#include "core/program/print_formatter.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" +#include "memory_manager/memory_manager.h" +#include "program/print_formatter.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/kernel/kernel.h" diff --git a/opencl/source/program/printf_handler.h b/opencl/source/program/printf_handler.h index 1ab6d0db72..b38590aaa6 100644 --- a/opencl/source/program/printf_handler.h +++ b/opencl/source/program/printf_handler.h @@ -7,7 +7,7 @@ #pragma once -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include "opencl/source/kernel/kernel.h" namespace NEO { diff --git a/opencl/source/program/process_device_binary.cpp b/opencl/source/program/process_device_binary.cpp index 1fbbf7d2f1..0bb33f273f 100644 --- a/opencl/source/program/process_device_binary.cpp +++ b/opencl/source/program/process_device_binary.cpp @@ -5,15 +5,15 @@ * */ -#include "core/device_binary_format/device_binary_formats.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/string.h" -#include "core/memory_manager/memory_manager.h" -#include "core/memory_manager/unified_memory_manager.h" -#include "core/program/program_info.h" -#include "core/program/program_initialization.h" +#include "device_binary_format/device_binary_formats.h" +#include "helpers/aligned_memory.h" +#include "helpers/debug_helpers.h" +#include "helpers/ptr_math.h" +#include "helpers/string.h" +#include "memory_manager/memory_manager.h" +#include "memory_manager/unified_memory_manager.h" +#include "program/program_info.h" +#include "program/program_initialization.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/gtpin/gtpin_notify.h" diff --git a/opencl/source/program/program.cpp b/opencl/source/program/program.cpp index a98abb346d..dab4aee540 100644 --- a/opencl/source/program/program.cpp +++ b/opencl/source/program/program.cpp @@ -7,18 +7,18 @@ #include "program.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/compiler_interface/compiler_interface.h" -#include "core/compiler_interface/intermediate_representations.h" -#include "core/device_binary_format/device_binary_formats.h" -#include "core/device_binary_format/elf/elf_encoder.h" -#include "core/device_binary_format/elf/ocl_elf.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/string.h" -#include "core/memory_manager/memory_manager.h" -#include "core/memory_manager/unified_memory_manager.h" -#include "core/os_interface/os_context.h" +#include "command_stream/command_stream_receiver.h" +#include "compiler_interface/compiler_interface.h" +#include "compiler_interface/intermediate_representations.h" +#include "device_binary_format/device_binary_formats.h" +#include "device_binary_format/elf/elf_encoder.h" +#include "device_binary_format/elf/ocl_elf.h" +#include "helpers/debug_helpers.h" +#include "helpers/hw_helper.h" +#include "helpers/string.h" +#include "memory_manager/memory_manager.h" +#include "memory_manager/unified_memory_manager.h" +#include "os_interface/os_context.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/source/program/program.h b/opencl/source/program/program.h index 8210ee91d3..e32732edfa 100644 --- a/opencl/source/program/program.h +++ b/opencl/source/program/program.h @@ -6,11 +6,11 @@ */ #pragma once -#include "core/compiler_interface/compiler_interface.h" -#include "core/compiler_interface/linker.h" -#include "core/device_binary_format/elf/elf_encoder.h" -#include "core/program/program_info.h" -#include "core/utilities/const_stringref.h" +#include "compiler_interface/compiler_interface.h" +#include "compiler_interface/linker.h" +#include "device_binary_format/elf/elf_encoder.h" +#include "program/program_info.h" +#include "utilities/const_stringref.h" #include "opencl/source/api/cl_types.h" #include "opencl/source/helpers/base_object.h" diff --git a/opencl/source/sampler/sampler.cpp b/opencl/source/sampler/sampler.cpp index f57eadd3e9..e39cc88aab 100644 --- a/opencl/source/sampler/sampler.cpp +++ b/opencl/source/sampler/sampler.cpp @@ -7,8 +7,8 @@ #include "opencl/source/sampler/sampler.h" -#include "core/helpers/get_info.h" -#include "core/helpers/hw_info.h" +#include "helpers/get_info.h" +#include "helpers/hw_info.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/get_info_status_mapper.h" diff --git a/opencl/source/sampler/sampler.inl b/opencl/source/sampler/sampler.inl index d69c75195e..57327d1cc1 100644 --- a/opencl/source/sampler/sampler.inl +++ b/opencl/source/sampler/sampler.inl @@ -5,7 +5,7 @@ * */ -#include "core/utilities/numeric.h" +#include "utilities/numeric.h" #include diff --git a/opencl/source/sampler/sampler_tgllp_plus.inl b/opencl/source/sampler/sampler_tgllp_plus.inl index c87fda1e28..0ca604ae35 100644 --- a/opencl/source/sampler/sampler_tgllp_plus.inl +++ b/opencl/source/sampler/sampler_tgllp_plus.inl @@ -5,7 +5,7 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include "opencl/source/sampler/sampler.h" #include "opencl/source/sampler/sampler.inl" diff --git a/opencl/source/scheduler/scheduler_kernel.cpp b/opencl/source/scheduler/scheduler_kernel.cpp index e73166b5e5..859b7b1add 100644 --- a/opencl/source/scheduler/scheduler_kernel.cpp +++ b/opencl/source/scheduler/scheduler_kernel.cpp @@ -7,8 +7,8 @@ #include "opencl/source/scheduler/scheduler_kernel.h" -#include "core/device/device.h" -#include "core/helpers/hw_helper.h" +#include "device/device.h" +#include "helpers/hw_helper.h" #include "opencl/source/device/cl_device.h" #include diff --git a/opencl/source/sharings/d3d/d3d_buffer.h b/opencl/source/sharings/d3d/d3d_buffer.h index 6619c402ce..bffffe81af 100644 --- a/opencl/source/sharings/d3d/d3d_buffer.h +++ b/opencl/source/sharings/d3d/d3d_buffer.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/memory_manager.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/sharings/d3d/d3d_sharing.h" diff --git a/opencl/source/sharings/d3d/d3d_sharing.cpp b/opencl/source/sharings/d3d/d3d_sharing.cpp index 9f6f98d571..5ff3dc5643 100644 --- a/opencl/source/sharings/d3d/d3d_sharing.cpp +++ b/opencl/source/sharings/d3d/d3d_sharing.cpp @@ -7,7 +7,7 @@ #include "opencl/source/sharings/d3d/d3d_sharing.h" -#include "core/gmm_helper/gmm.h" +#include "gmm_helper/gmm.h" #include "opencl/source/context/context.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/source/sharings/d3d/d3d_surface.cpp b/opencl/source/sharings/d3d/d3d_surface.cpp index aab52f968d..7b8da08634 100644 --- a/opencl/source/sharings/d3d/d3d_surface.cpp +++ b/opencl/source/sharings/d3d/d3d_surface.cpp @@ -7,10 +7,10 @@ #include "opencl/source/sharings/d3d/d3d_surface.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_types_converter.h" -#include "core/helpers/get_info.h" -#include "core/memory_manager/memory_manager.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_types_converter.h" +#include "helpers/get_info.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" diff --git a/opencl/source/sharings/d3d/d3d_texture.cpp b/opencl/source/sharings/d3d/d3d_texture.cpp index a3ab3675ce..ea78170688 100644 --- a/opencl/source/sharings/d3d/d3d_texture.cpp +++ b/opencl/source/sharings/d3d/d3d_texture.cpp @@ -7,13 +7,13 @@ #include "opencl/source/sharings/d3d/d3d_texture.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_types_converter.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/get_info.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/memory_manager.h" +#include "execution_environment/root_device_environment.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_types_converter.h" +#include "gmm_helper/resource_info.h" +#include "helpers/get_info.h" +#include "helpers/hw_helper.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/source/sharings/gl/gl_sharing.cpp b/opencl/source/sharings/gl/gl_sharing.cpp index 0666361214..23688b5ba7 100644 --- a/opencl/source/sharings/gl/gl_sharing.cpp +++ b/opencl/source/sharings/gl/gl_sharing.cpp @@ -7,8 +7,8 @@ #include "opencl/source/sharings/gl/gl_sharing.h" -#include "core/helpers/string.h" -#include "core/helpers/timestamp_packet.h" +#include "helpers/string.h" +#include "helpers/timestamp_packet.h" #include "opencl/source/context/context.inl" #include "opencl/source/sharings/gl/gl_context_guard.h" #include "opencl/source/sharings/sharing_factory.h" diff --git a/opencl/source/sharings/gl/gl_sharing.h b/opencl/source/sharings/gl/gl_sharing.h index 2c69ed2b80..0e8b7d8258 100644 --- a/opencl/source/sharings/gl/gl_sharing.h +++ b/opencl/source/sharings/gl/gl_sharing.h @@ -7,7 +7,7 @@ #pragma once -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "opencl/source/sharings/sharing.h" #include "CL/cl.h" diff --git a/opencl/source/sharings/gl/windows/cl_gl_api.cpp b/opencl/source/sharings/gl/windows/cl_gl_api.cpp index 97cc6a476d..cf5a5ab725 100644 --- a/opencl/source/sharings/gl/windows/cl_gl_api.cpp +++ b/opencl/source/sharings/gl/windows/cl_gl_api.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/get_info.h" -#include "core/utilities/api_intercept.h" +#include "helpers/get_info.h" +#include "utilities/api_intercept.h" #include "opencl/source/api/api.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" diff --git a/opencl/source/sharings/gl/windows/gl_arb_sync_event_windows.cpp b/opencl/source/sharings/gl/windows/gl_arb_sync_event_windows.cpp index ca398bf902..8b06972b33 100644 --- a/opencl/source/sharings/gl/windows/gl_arb_sync_event_windows.cpp +++ b/opencl/source/sharings/gl/windows/gl_arb_sync_event_windows.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/extensions/public/cl_gl_private_intel.h" diff --git a/opencl/source/sharings/gl/windows/gl_buffer_windows.cpp b/opencl/source/sharings/gl/windows/gl_buffer_windows.cpp index f72f345f2b..905ca8b1c3 100644 --- a/opencl/source/sharings/gl/windows/gl_buffer_windows.cpp +++ b/opencl/source/sharings/gl/windows/gl_buffer_windows.cpp @@ -5,9 +5,9 @@ * */ -#include "core/gmm_helper/gmm.h" -#include "core/helpers/get_info.h" -#include "core/memory_manager/memory_manager.h" +#include "gmm_helper/gmm.h" +#include "helpers/get_info.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/extensions/public/cl_gl_private_intel.h" diff --git a/opencl/source/sharings/gl/windows/gl_sync_event_windows.cpp b/opencl/source/sharings/gl/windows/gl_sync_event_windows.cpp index 6cf36c2922..c86a4c4032 100644 --- a/opencl/source/sharings/gl/windows/gl_sync_event_windows.cpp +++ b/opencl/source/sharings/gl/windows/gl_sync_event_windows.cpp @@ -5,10 +5,10 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" -#include "core/helpers/get_info.h" -#include "core/helpers/timestamp_packet.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" +#include "helpers/get_info.h" +#include "helpers/timestamp_packet.h" #include "opencl/source/context/context.h" #include "opencl/source/event/async_events_handler.h" #include "opencl/source/event/event_builder.h" diff --git a/opencl/source/sharings/gl/windows/gl_texture_windows.cpp b/opencl/source/sharings/gl/windows/gl_texture_windows.cpp index b1e8a314c7..b0004d34f7 100644 --- a/opencl/source/sharings/gl/windows/gl_texture_windows.cpp +++ b/opencl/source/sharings/gl/windows/gl_texture_windows.cpp @@ -5,15 +5,15 @@ * */ -#include "core/execution_environment/root_device_environment.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/gmm_types_converter.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/get_info.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/hw_info.h" -#include "core/memory_manager/memory_manager.h" +#include "execution_environment/root_device_environment.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/gmm_types_converter.h" +#include "gmm_helper/resource_info.h" +#include "helpers/get_info.h" +#include "helpers/hw_helper.h" +#include "helpers/hw_info.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/extensions/public/cl_gl_private_intel.h" diff --git a/opencl/source/sharings/gl/windows/win_enable_gl.cpp b/opencl/source/sharings/gl/windows/win_enable_gl.cpp index 64cb6d3ae5..f83339d048 100644 --- a/opencl/source/sharings/gl/windows/win_enable_gl.cpp +++ b/opencl/source/sharings/gl/windows/win_enable_gl.cpp @@ -7,7 +7,7 @@ #include "opencl/source/sharings/gl/windows/win_enable_gl.h" -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include "opencl/source/context/context.h" #include "opencl/source/context/context.inl" #include "opencl/source/sharings/gl/cl_gl_api_intel.h" diff --git a/opencl/source/sharings/sharing.h b/opencl/source/sharings/sharing.h index 8a184a16b3..8356fa5d61 100644 --- a/opencl/source/sharings/sharing.h +++ b/opencl/source/sharings/sharing.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/graphics_allocation.h" +#include "memory_manager/graphics_allocation.h" namespace NEO { class Context; diff --git a/opencl/source/sharings/sharing_factory.cpp b/opencl/source/sharings/sharing_factory.cpp index 0d9f1415b9..e0e72eba98 100644 --- a/opencl/source/sharings/sharing_factory.cpp +++ b/opencl/source/sharings/sharing_factory.cpp @@ -7,7 +7,7 @@ #include "sharing_factory.h" -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include "opencl/source/platform/extensions.h" namespace NEO { diff --git a/opencl/source/sharings/unified/enable_unified.cpp b/opencl/source/sharings/unified/enable_unified.cpp index 999775a1e0..0524f75bd5 100644 --- a/opencl/source/sharings/unified/enable_unified.cpp +++ b/opencl/source/sharings/unified/enable_unified.cpp @@ -7,7 +7,7 @@ #include "opencl/source/sharings/unified/enable_unified.h" -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include "opencl/source/context/context.h" #include "opencl/source/context/context.inl" #include "opencl/source/sharings/sharing_factory.h" diff --git a/opencl/source/sharings/unified/unified_buffer.cpp b/opencl/source/sharings/unified/unified_buffer.cpp index e3a0577b9e..fe15e778c3 100644 --- a/opencl/source/sharings/unified/unified_buffer.cpp +++ b/opencl/source/sharings/unified/unified_buffer.cpp @@ -7,9 +7,9 @@ #include "unified_buffer.h" -#include "core/gmm_helper/gmm.h" -#include "core/helpers/get_info.h" -#include "core/memory_manager/memory_manager.h" +#include "gmm_helper/gmm.h" +#include "helpers/get_info.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/context/context.h" #include "opencl/source/mem_obj/buffer.h" diff --git a/opencl/source/sharings/unified/unified_image.cpp b/opencl/source/sharings/unified/unified_image.cpp index d47258582a..8e845a4bd1 100644 --- a/opencl/source/sharings/unified/unified_image.cpp +++ b/opencl/source/sharings/unified/unified_image.cpp @@ -7,13 +7,13 @@ #include "unified_image.h" -#include "core/execution_environment/execution_environment.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/get_info.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/memory_manager.h" +#include "execution_environment/execution_environment.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/resource_info.h" +#include "helpers/get_info.h" +#include "helpers/hw_helper.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/source/sharings/unified/unified_sharing.cpp b/opencl/source/sharings/unified/unified_sharing.cpp index 634f442d80..dbd141f5be 100644 --- a/opencl/source/sharings/unified/unified_sharing.cpp +++ b/opencl/source/sharings/unified/unified_sharing.cpp @@ -7,8 +7,8 @@ #include "opencl/source/sharings/unified/unified_sharing.h" -#include "core/helpers/string.h" -#include "core/helpers/timestamp_packet.h" +#include "helpers/string.h" +#include "helpers/timestamp_packet.h" #include "opencl/source/context/context.h" #include "opencl/source/sharings/sharing_factory.h" diff --git a/opencl/source/sharings/unified/unified_sharing.h b/opencl/source/sharings/unified/unified_sharing.h index 23b78fff85..767a1ee1ca 100644 --- a/opencl/source/sharings/unified/unified_sharing.h +++ b/opencl/source/sharings/unified/unified_sharing.h @@ -7,7 +7,7 @@ #pragma once -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "opencl/source/mem_obj/mem_obj.h" #include "opencl/source/sharings/sharing.h" #include "opencl/source/sharings/unified/unified_sharing_types.h" diff --git a/opencl/source/sharings/va/cl_va_api.cpp b/opencl/source/sharings/va/cl_va_api.cpp index 8481551a33..6eb62448c9 100644 --- a/opencl/source/sharings/va/cl_va_api.cpp +++ b/opencl/source/sharings/va/cl_va_api.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/get_info.h" -#include "core/utilities/api_intercept.h" +#include "helpers/get_info.h" +#include "utilities/api_intercept.h" #include "opencl/source/api/api.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" diff --git a/opencl/source/sharings/va/va_sharing_functions.cpp b/opencl/source/sharings/va/va_sharing_functions.cpp index 026fb41319..383d8165d3 100644 --- a/opencl/source/sharings/va/va_sharing_functions.cpp +++ b/opencl/source/sharings/va/va_sharing_functions.cpp @@ -7,7 +7,7 @@ #include "va_sharing_functions.h" -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include "opencl/source/sharings/va/va_surface.h" #include diff --git a/opencl/source/sharings/va/va_surface.cpp b/opencl/source/sharings/va/va_surface.cpp index 3dd6b720aa..04b606672e 100644 --- a/opencl/source/sharings/va/va_surface.cpp +++ b/opencl/source/sharings/va/va_surface.cpp @@ -7,9 +7,9 @@ #include "opencl/source/sharings/va/va_surface.h" -#include "core/gmm_helper/gmm.h" -#include "core/helpers/get_info.h" -#include "core/memory_manager/memory_manager.h" +#include "gmm_helper/gmm.h" +#include "helpers/get_info.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/source/source_level_debugger/source_level_debugger.cpp b/opencl/source/source_level_debugger/source_level_debugger.cpp index b7d640e22a..3c94efad43 100644 --- a/opencl/source/source_level_debugger/source_level_debugger.cpp +++ b/opencl/source/source_level_debugger/source_level_debugger.cpp @@ -7,9 +7,9 @@ #include "opencl/source/source_level_debugger/source_level_debugger.h" -#include "core/debugger/debugger.h" -#include "core/helpers/debug_helpers.h" -#include "core/os_interface/os_interface.h" +#include "debugger/debugger.h" +#include "helpers/debug_helpers.h" +#include "os_interface/os_interface.h" #include "opencl/source/program/kernel_info.h" #include "igfx_debug_interchange_types.h" diff --git a/opencl/source/source_level_debugger/source_level_debugger.h b/opencl/source/source_level_debugger/source_level_debugger.h index c75113eeb3..f7408321dc 100644 --- a/opencl/source/source_level_debugger/source_level_debugger.h +++ b/opencl/source/source_level_debugger/source_level_debugger.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/debugger/debugger.h" -#include "core/os_interface/os_library.h" +#include "debugger/debugger.h" +#include "os_interface/os_library.h" #include #include diff --git a/opencl/source/tbx/tbx_sockets_imp.cpp b/opencl/source/tbx/tbx_sockets_imp.cpp index b0c116fe74..3d5e62dc3a 100644 --- a/opencl/source/tbx/tbx_sockets_imp.cpp +++ b/opencl/source/tbx/tbx_sockets_imp.cpp @@ -7,8 +7,8 @@ #include "opencl/source/tbx/tbx_sockets_imp.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/string.h" +#include "helpers/debug_helpers.h" +#include "helpers/string.h" #ifdef WIN32 #ifndef WIN32_LEAN_AND_MEAN diff --git a/opencl/source/tracing/tracing_handle.h b/opencl/source/tracing/tracing_handle.h index 9bbfd569cd..2245b981ec 100644 --- a/opencl/source/tracing/tracing_handle.h +++ b/opencl/source/tracing/tracing_handle.h @@ -7,7 +7,7 @@ #pragma once -#include "core/helpers/debug_helpers.h" +#include "helpers/debug_helpers.h" #include "opencl/source/tracing/tracing_types.h" #include diff --git a/opencl/source/tracing/tracing_notify.h b/opencl/source/tracing/tracing_notify.h index 31f5e67491..e63fb4cb63 100644 --- a/opencl/source/tracing/tracing_notify.h +++ b/opencl/source/tracing/tracing_notify.h @@ -7,7 +7,7 @@ #pragma once -#include "core/utilities/cpuintrinsics.h" +#include "utilities/cpuintrinsics.h" #include "opencl/source/tracing/tracing_handle.h" #include diff --git a/opencl/source/utilities/logger.cpp b/opencl/source/utilities/logger.cpp index cf54276c01..3206eae50f 100644 --- a/opencl/source/utilities/logger.cpp +++ b/opencl/source/utilities/logger.cpp @@ -7,8 +7,8 @@ #include "opencl/source/utilities/logger.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/timestamp_packet.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/timestamp_packet.h" #include "opencl/source/event/event.h" #include "opencl/source/helpers/dispatch_info.h" #include "opencl/source/kernel/kernel.h" diff --git a/opencl/source/utilities/logger.h b/opencl/source/utilities/logger.h index 65311b08a4..7d23b358fe 100644 --- a/opencl/source/utilities/logger.h +++ b/opencl/source/utilities/logger.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include #include diff --git a/opencl/test/unit_test/abort.cpp b/opencl/test/unit_test/abort.cpp index 8d94d2018f..1d64c0db75 100644 --- a/opencl/test/unit_test/abort.cpp +++ b/opencl/test/unit_test/abort.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/abort.h" +#include "helpers/abort.h" #include diff --git a/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp b/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp index 6237f9b5b0..65d2b27a16 100644 --- a/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp +++ b/opencl/test/unit_test/accelerators/media_image_arg_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/surface.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" +#include "memory_manager/surface.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl b/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl index 20673b9e0c..29a33b6d01 100644 --- a/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl +++ b/opencl/test/unit_test/api/cl_add_comment_to_aub_tests.inl @@ -5,8 +5,8 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" #include "opencl/source/context/context.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/test/unit_test/api/cl_api_tests.h b/opencl/test/unit_test/api/cl_api_tests.h index 131656d5b8..593b27cf87 100644 --- a/opencl/test/unit_test/api/cl_api_tests.h +++ b/opencl/test/unit_test/api/cl_api_tests.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/execution_environment/root_device_environment.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "execution_environment/root_device_environment.h" +#include "unit_tests/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_build_program_tests.inl b/opencl/test/unit_test/api/cl_build_program_tests.inl index 780c1b286d..3b657e7224 100644 --- a/opencl/test/unit_test/api/cl_build_program_tests.inl +++ b/opencl/test/unit_test/api/cl_build_program_tests.inl @@ -5,9 +5,9 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/device/device.h" -#include "core/helpers/file_io.h" +#include "compiler_interface/compiler_interface.h" +#include "device/device.h" +#include "helpers/file_io.h" #include "opencl/source/context/context.h" #include "opencl/source/program/kernel_info.h" #include "opencl/source/program/program.h" diff --git a/opencl/test/unit_test/api/cl_clone_kernel_tests.inl b/opencl/test/unit_test/api/cl_clone_kernel_tests.inl index e0aef61d2f..77577805a9 100644 --- a/opencl/test/unit_test/api/cl_clone_kernel_tests.inl +++ b/opencl/test/unit_test/api/cl_clone_kernel_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/file_io.h" +#include "helpers/file_io.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/helpers/test_files.h" diff --git a/opencl/test/unit_test/api/cl_compile_program_tests.inl b/opencl/test/unit_test/api/cl_compile_program_tests.inl index da3cfccefc..d1e9d0a1bc 100644 --- a/opencl/test/unit_test/api/cl_compile_program_tests.inl +++ b/opencl/test/unit_test/api/cl_compile_program_tests.inl @@ -5,8 +5,8 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/helpers/file_io.h" +#include "compiler_interface/compiler_interface.h" +#include "helpers/file_io.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" #include "opencl/test/unit_test/helpers/test_files.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 50c7be4f4d..9aa8c7b1d8 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 @@ -5,8 +5,8 @@ * */ -#include "core/device/device.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "device/device.h" +#include "unit_tests/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 b5be570919..1cc953a9b4 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 @@ -5,10 +5,10 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/hw_helper.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/hw_helper.h" +#include "os_interface/os_context.h" +#include "unit_tests/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_context_tests.inl b/opencl/test/unit_test/api/cl_create_context_tests.inl index 03a2ab5100..b9ffe59f1e 100644 --- a/opencl/test/unit_test/api/cl_create_context_tests.inl +++ b/opencl/test/unit_test/api/cl_create_context_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/test/unit_test/api/cl_api_tests.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/api/cl_create_image_tests.cpp b/opencl/test/unit_test/api/cl_create_image_tests.cpp index 5a007ab6d2..d772586eda 100644 --- a/opencl/test/unit_test/api/cl_create_image_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_image_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "opencl/test/unit_test/mocks/mock_device.h" diff --git a/opencl/test/unit_test/api/cl_create_kernel_tests.inl b/opencl/test/unit_test/api/cl_create_kernel_tests.inl index 097501e593..2ca4835b09 100644 --- a/opencl/test/unit_test/api/cl_create_kernel_tests.inl +++ b/opencl/test/unit_test/api/cl_create_kernel_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/file_io.h" +#include "helpers/file_io.h" #include "opencl/source/context/context.h" #include "opencl/source/program/kernel_info.h" #include "opencl/test/unit_test/helpers/test_files.h" diff --git a/opencl/test/unit_test/api/cl_create_kernels_in_program_tests.inl b/opencl/test/unit_test/api/cl_create_kernels_in_program_tests.inl index 434f2311bf..e22d927454 100644 --- a/opencl/test/unit_test/api/cl_create_kernels_in_program_tests.inl +++ b/opencl/test/unit_test/api/cl_create_kernels_in_program_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/file_io.h" +#include "helpers/file_io.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/helpers/test_files.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 10422c12b9..ec2c0a02be 100644 --- a/opencl/test/unit_test/api/cl_create_pipe_tests.inl +++ b/opencl/test/unit_test/api/cl_create_pipe_tests.inl @@ -5,8 +5,8 @@ * */ -#include "core/device/device.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "device/device.h" +#include "unit_tests/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_program_with_binary_tests.inl b/opencl/test/unit_test/api/cl_create_program_with_binary_tests.inl index dfd26aa949..1e9cb431e2 100644 --- a/opencl/test/unit_test/api/cl_create_program_with_binary_tests.inl +++ b/opencl/test/unit_test/api/cl_create_program_with_binary_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/file_io.h" +#include "helpers/file_io.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/helpers/test_files.h" diff --git a/opencl/test/unit_test/api/cl_create_program_with_built_in_kernels_tests.cpp b/opencl/test/unit_test/api/cl_create_program_with_built_in_kernels_tests.cpp index 50add1e052..b1d547cbef 100644 --- a/opencl/test/unit_test/api/cl_create_program_with_built_in_kernels_tests.cpp +++ b/opencl/test/unit_test/api/cl_create_program_with_built_in_kernels_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/device/device.h" +#include "compiler_interface/compiler_interface.h" +#include "device/device.h" #include "opencl/source/built_ins/built_in_ops_vme.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/vme_builtin.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 e798a620d7..a034d909e3 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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_enqueue_copy_buffer_rect_tests.inl b/opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl index b4030b53f8..81a2ac1e2a 100644 --- a/opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_copy_buffer_rect_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/test/unit_test/mocks/mock_buffer.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_copy_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_copy_image_tests.inl index 51b8989c0e..cf43b2443b 100644 --- a/opencl/test/unit_test/api/cl_enqueue_copy_image_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_copy_image_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/helpers/surface_formats.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_fill_buffer_tests.inl b/opencl/test/unit_test/api/cl_enqueue_fill_buffer_tests.inl index 7d68f1fc97..c3013602e2 100644 --- a/opencl/test/unit_test/api/cl_enqueue_fill_buffer_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_fill_buffer_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/command_queue/command_queue.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_fill_image_tests.inl b/opencl/test/unit_test/api/cl_enqueue_fill_image_tests.inl index 253126eebf..d4036e5500 100644 --- a/opencl/test/unit_test/api/cl_enqueue_fill_image_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_fill_image_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl b/opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl index 993bed4aa2..a4eea3953d 100644 --- a/opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_read_buffer_rect_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl b/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl index f467e25f48..799da4cb1d 100644 --- a/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_read_buffer_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/device/device_info.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl index ee3063a716..838e2b5728 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_svm_free_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" #include "opencl/source/event/user_event.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl index a27937b057..6bacce634b 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_svm_map_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl index 0c4f038c5b..c312d16e76 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_svm_mem_fill_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl index ec83b37c6b..96943f0702 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_svm_memcpy_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp b/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp index 6ca044f6ab..252abe0cbd 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp +++ b/opencl/test/unit_test/api/cl_enqueue_svm_migrate_mem_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/device/device.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/unified_memory_manager.h" +#include "device/device.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl b/opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl index f5aba5f797..de0d746874 100644 --- a/opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_svm_unmap_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_write_buffer_rect_tests.inl b/opencl/test/unit_test/api/cl_enqueue_write_buffer_rect_tests.inl index 191bc68f7f..16d615d915 100644 --- a/opencl/test/unit_test/api/cl_enqueue_write_buffer_rect_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_write_buffer_rect_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/context/context.h" diff --git a/opencl/test/unit_test/api/cl_enqueue_write_buffer_tests.inl b/opencl/test/unit_test/api/cl_enqueue_write_buffer_tests.inl index 6acf919e02..2995a6fdcc 100644 --- a/opencl/test/unit_test/api/cl_enqueue_write_buffer_tests.inl +++ b/opencl/test/unit_test/api/cl_enqueue_write_buffer_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/command_queue/command_queue.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_get_context_info_tests.inl b/opencl/test/unit_test/api/cl_get_context_info_tests.inl index e97cae3597..88ec385bec 100644 --- a/opencl/test/unit_test/api/cl_get_context_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_context_info_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/context/context.h" #include "cl_api_tests.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 a7f4de6f28..17d2c49f8c 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 "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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_device_info_tests.inl b/opencl/test/unit_test/api/cl_get_device_info_tests.inl index 7406b362cb..256700113e 100644 --- a/opencl/test/unit_test/api/cl_get_device_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_device_info_tests.inl @@ -5,8 +5,8 @@ * */ -#include "core/device/device.h" -#include "core/helpers/hw_info.h" +#include "device/device.h" +#include "helpers/hw_info.h" #include "cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_get_image_info_tests.inl b/opencl/test/unit_test/api/cl_get_image_info_tests.inl index 31b5506400..dbc299c747 100644 --- a/opencl/test/unit_test/api/cl_get_image_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_image_info_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" #include "opencl/source/context/context.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/mocks/mock_device.h" diff --git a/opencl/test/unit_test/api/cl_get_image_params_tests.inl b/opencl/test/unit_test/api/cl_get_image_params_tests.inl index 2469e5f659..1fd99d785d 100644 --- a/opencl/test/unit_test/api/cl_get_image_params_tests.inl +++ b/opencl/test/unit_test/api/cl_get_image_params_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.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_get_kernel_arg_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_arg_info_tests.inl index 417947fa32..1119587411 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_arg_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_arg_info_tests.inl @@ -5,9 +5,9 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/device/device.h" -#include "core/helpers/file_io.h" +#include "compiler_interface/compiler_interface.h" +#include "device/device.h" +#include "helpers/file_io.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" #include "opencl/test/unit_test/helpers/test_files.h" diff --git a/opencl/test/unit_test/api/cl_get_kernel_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_info_tests.inl index c39f22fe6a..3a3dfcb47f 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_info_tests.inl @@ -5,9 +5,9 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/device/device.h" -#include "core/helpers/file_io.h" +#include "compiler_interface/compiler_interface.h" +#include "device/device.h" +#include "helpers/file_io.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" #include "opencl/test/unit_test/helpers/test_files.h" diff --git a/opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl b/opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl index c67e2295ae..e204e20d9e 100644 --- a/opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_kernel_work_group_info_tests.inl @@ -5,9 +5,9 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/device/device.h" -#include "core/helpers/file_io.h" +#include "compiler_interface/compiler_interface.h" +#include "device/device.h" +#include "helpers/file_io.h" #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" #include "opencl/test/unit_test/helpers/test_files.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" diff --git a/opencl/test/unit_test/api/cl_get_mem_object_info_tests.inl b/opencl/test/unit_test/api/cl_get_mem_object_info_tests.inl index 7f4cd268ac..4d2a4cca33 100644 --- a/opencl/test/unit_test/api/cl_get_mem_object_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_mem_object_info_tests.inl @@ -5,9 +5,9 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/device/device.h" -#include "core/helpers/file_io.h" +#include "compiler_interface/compiler_interface.h" +#include "device/device.h" +#include "helpers/file_io.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/helpers/test_files.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 b531e9710f..c83d912058 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 "core/unit_tests/helpers/ult_hw_config.h" +#include "unit_tests/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_platform_info_tests.inl b/opencl/test/unit_test/api/cl_get_platform_info_tests.inl index b38e9ca137..b4d3b55d8f 100644 --- a/opencl/test/unit_test/api/cl_get_platform_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_platform_info_tests.inl @@ -5,8 +5,8 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/device/device.h" +#include "debug_settings/debug_settings_manager.h" +#include "device/device.h" #include "opencl/source/platform/platform.h" #include "test.h" diff --git a/opencl/test/unit_test/api/cl_get_program_build_info_tests.inl b/opencl/test/unit_test/api/cl_get_program_build_info_tests.inl index 6310567003..890a8a6333 100644 --- a/opencl/test/unit_test/api/cl_get_program_build_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_program_build_info_tests.inl @@ -5,13 +5,13 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/compiler_interface/intermediate_representations.h" -#include "core/device/device.h" -#include "core/device_binary_format/elf/elf.h" -#include "core/device_binary_format/elf/elf_encoder.h" -#include "core/device_binary_format/elf/ocl_elf.h" -#include "core/helpers/file_io.h" +#include "compiler_interface/compiler_interface.h" +#include "compiler_interface/intermediate_representations.h" +#include "device/device.h" +#include "device_binary_format/elf/elf.h" +#include "device_binary_format/elf/elf_encoder.h" +#include "device_binary_format/elf/ocl_elf.h" +#include "helpers/file_io.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" #include "opencl/test/unit_test/helpers/test_files.h" diff --git a/opencl/test/unit_test/api/cl_get_program_info_tests.inl b/opencl/test/unit_test/api/cl_get_program_info_tests.inl index 8c2f24760c..da5a5b5c79 100644 --- a/opencl/test/unit_test/api/cl_get_program_info_tests.inl +++ b/opencl/test/unit_test/api/cl_get_program_info_tests.inl @@ -5,9 +5,9 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/device/device.h" -#include "core/helpers/file_io.h" +#include "compiler_interface/compiler_interface.h" +#include "device/device.h" +#include "helpers/file_io.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" #include "opencl/test/unit_test/helpers/test_files.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 706b9ffe5e..095dd3e9ce 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 @@ -5,8 +5,8 @@ * */ -#include "core/device/device.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "device/device.h" +#include "unit_tests/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_icd_get_platform_ids_khr_tests.inl b/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl index 2d1784d966..8284c38d56 100644 --- a/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl +++ b/opencl/test/unit_test/api/cl_icd_get_platform_ids_khr_tests.inl @@ -6,10 +6,10 @@ */ #if defined(_WIN32) -#include "core/os_interface/windows/windows_wrapper.h" +#include "os_interface/windows/windows_wrapper.h" #endif -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/api/cl_api_tests.h" diff --git a/opencl/test/unit_test/api/cl_link_program_tests.inl b/opencl/test/unit_test/api/cl_link_program_tests.inl index 6d34911c8c..04f9732424 100644 --- a/opencl/test/unit_test/api/cl_link_program_tests.inl +++ b/opencl/test/unit_test/api/cl_link_program_tests.inl @@ -5,8 +5,8 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/helpers/file_io.h" +#include "compiler_interface/compiler_interface.h" +#include "helpers/file_io.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/helpers/test_files.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 b6047f358a..f39f3d9ec3 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 @@ -5,12 +5,12 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/hw_cmds.h" -#include "core/helpers/state_base_address.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/hw_cmds.h" +#include "helpers/state_base_address.h" +#include "unit_tests/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_release_kernel_tests.inl b/opencl/test/unit_test/api/cl_release_kernel_tests.inl index 6b2b50cdc5..d6e358860a 100644 --- a/opencl/test/unit_test/api/cl_release_kernel_tests.inl +++ b/opencl/test/unit_test/api/cl_release_kernel_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/file_io.h" +#include "helpers/file_io.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/helpers/test_files.h" diff --git a/opencl/test/unit_test/api/cl_set_default_device_command_queue_tests.inl b/opencl/test/unit_test/api/cl_set_default_device_command_queue_tests.inl index 05ab22f122..3b95133e0d 100644 --- a/opencl/test/unit_test/api/cl_set_default_device_command_queue_tests.inl +++ b/opencl/test/unit_test/api/cl_set_default_device_command_queue_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/context/context.h" #include "opencl/source/device_queue/device_queue.h" #include "test.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 f2bba521ff..340b64372f 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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_set_kernel_arg_svm_pointer_tests.inl b/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl index 3f1b504578..d21448c3e9 100644 --- a/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl +++ b/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/unified_memory_manager.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.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 df736261ee..e255b7f7df 100644 --- a/opencl/test/unit_test/api/cl_svm_alloc_tests.inl +++ b/opencl/test/unit_test/api/cl_svm_alloc_tests.inl @@ -5,8 +5,8 @@ * */ -#include "core/device/device.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "device/device.h" +#include "unit_tests/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 fd0bb18eea..22b4cc4b35 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 @@ -5,8 +5,8 @@ * */ -#include "core/memory_manager/unified_memory_manager.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "memory_manager/unified_memory_manager.h" +#include "unit_tests/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/api/gl/cl_get_gl_context_info_khr_tests.cpp b/opencl/test/unit_test/api/gl/cl_get_gl_context_info_khr_tests.cpp index 4a779c0b33..eb15d63649 100644 --- a/opencl/test/unit_test/api/gl/cl_get_gl_context_info_khr_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_get_gl_context_info_khr_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" #include "opencl/source/device/cl_device.h" #include "opencl/test/unit_test/api/cl_api_tests.h" #include "opencl/test/unit_test/os_interface/windows/gl/gl_dll_helper.h" diff --git a/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp b/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp index 1ae2f3d723..e4b6b44a7e 100644 --- a/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp +++ b/opencl/test/unit_test/api/gl/cl_get_gl_device_info_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/device/device.h" -#include "core/helpers/hw_info.h" +#include "device/device.h" +#include "helpers/hw_info.h" #include "opencl/test/unit_test/api/cl_api_tests.h" #include diff --git a/opencl/test/unit_test/aub/aub_center_tests.cpp b/opencl/test/unit_test/aub/aub_center_tests.cpp index 1a95e2ba17..3dc52f82e7 100644 --- a/opencl/test/unit_test/aub/aub_center_tests.cpp +++ b/opencl/test/unit_test/aub/aub_center_tests.cpp @@ -5,11 +5,11 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/hw_info.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/basic_math.h" +#include "helpers/hw_info.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 baa21a2f4a..3b1ff9f135 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 @@ -5,11 +5,11 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/options.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/hw_info.h" +#include "helpers/options.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 c894684ba7..df485398d5 100644 --- a/opencl/test/unit_test/aub/aub_helper_tests.inl +++ b/opencl/test/unit_test/aub/aub_helper_tests.inl @@ -5,8 +5,8 @@ * */ -#include "core/helpers/basic_math.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "helpers/basic_math.h" +#include "unit_tests/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 2a83fd8104..4536ab97e1 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 @@ -5,9 +5,9 @@ * */ -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "unit_tests/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_copy_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp index 8cd471f3b7..9898a51038 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/ptr_math.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_copy_buffer_rect_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp index 9a9840db2f..9fe20cff9e 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/ptr_math.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_copy_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp index df900bb80e..ee5c085680 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/ptr_math.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_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 be4af78946..ce45177663 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 @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/ptr_math.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/ptr_math.h" +#include "unit_tests/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_fill_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp index 576e58e5b5..5eb23d5055 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.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 e65e654263..99499067c9 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 @@ -5,8 +5,8 @@ * */ -#include "core/helpers/ptr_math.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "helpers/ptr_math.h" +#include "unit_tests/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_map_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp index 2fd2f35c41..07f3ed068a 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp index bcdc991c11..7fe1fe424e 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_aub_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/ptr_math.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/aub_tests_configuration.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp index 6b7d8f5106..a1fd05f5b9 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.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_read_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp index e16a85d215..18401a2a96 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.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 73018605d2..33535d3eb1 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 @@ -5,9 +5,9 @@ * */ -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" +#include "unit_tests/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 131d4d096c..cd551ba5fe 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 @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/command_stream_receiver.h" +#include "unit_tests/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_queue/enqueue_verify_memory_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp index 0d1a776c7c..b6b9dd6980 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.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/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp index 7436c1c790..dec28ed6f0 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_aub_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" +#include "helpers/ptr_math.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_write_buffer_rect_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp index 4b46fd8bb0..46a55ebbf1 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.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_write_copy_read_buffer_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp index 121e489010..ba18347f69 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h" -#include "core/memory_manager/allocations_list.h" +#include "memory_manager/allocations_list.h" #include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h index 2ebe000806..e43d9cf35a 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/ptr_math.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp index e5465c7867..bc96a3bb78 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.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 e34039ac07..1e2aec3956 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 @@ -7,11 +7,11 @@ #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" -#include "core/helpers/hw_helper.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/memory_management.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" +#include "helpers/hw_helper.h" +#include "os_interface/os_context.h" +#include "unit_tests/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_command_stream_fixture.h b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h index b139cc3fc0..7f0a0f79b2 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/os_interface/os_context.h" +#include "memory_manager/internal_allocation_storage.h" +#include "os_interface/os_context.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" #include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp index 08e36cf45b..0966db8f2d 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/helpers/ptr_math.h" -#include "core/os_interface/os_context.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "helpers/ptr_math.h" +#include "os_interface/os_context.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/device_fixture.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 7a7ef0cae2..de9ca2dfcf 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 @@ -7,8 +7,8 @@ #include "aub_mem_dump_tests.h" -#include "core/helpers/hw_helper.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "helpers/hw_helper.h" +#include "unit_tests/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/command_stream/aub_mem_dump_tests.h b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h index f59add9b1a..51f5989ea1 100644 --- a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h +++ b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/device/device.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" +#include "device/device.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/gen_common/aub_mapper.h" diff --git a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.cpp b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.cpp index 4331dab4d9..60ad4e90b6 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.cpp +++ b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.cpp @@ -7,9 +7,9 @@ #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_manager.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_manager.h" namespace NEO { diff --git a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h index 38d5f2d4a1..3e9a48e345 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/hw_helper.h" -#include "core/os_interface/os_interface.h" +#include "helpers/hw_helper.h" +#include "os_interface/os_interface.h" #include "opencl/source/aub_mem_dump/aub_mem_dump.h" #include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" diff --git a/opencl/test/unit_test/aub_tests/fixtures/fixture_tests.cpp b/opencl/test/unit_test/aub_tests/fixtures/fixture_tests.cpp index 8b6d5a4823..63185e535e 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/fixture_tests.cpp +++ b/opencl/test/unit_test/aub_tests/fixtures/fixture_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/ptr_math.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h index 891950fa88..271eb7cad3 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/run_kernel_fixture.h @@ -7,8 +7,8 @@ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/file_io.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/file_io.h" #include "opencl/source/program/program.h" #include "opencl/test/unit_test/aub_tests/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h index 3103c2fe89..6c6d140ed1 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/simple_arg_fixture.h @@ -7,7 +7,7 @@ #pragma once -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include "opencl/test/unit_test/aub_tests/command_stream/aub_command_stream_fixture.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/command_stream/command_stream_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h b/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h index 86fcff5a7b..3489e13683 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h +++ b/opencl/test/unit_test/aub_tests/fixtures/unified_memory_fixture.h @@ -7,7 +7,7 @@ #pragma once -#include "core/memory_manager/memory_constants.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/api/api.h" #include "opencl/test/unit_test/aub_tests/fixtures/aub_fixture.h" diff --git a/opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp b/opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp index 8745a0d406..66760466db 100644 --- a/opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp +++ b/opencl/test/unit_test/aub_tests/gen11/aub_tests_configuration_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_cmds.h" +#include "helpers/hw_cmds.h" #include "opencl/test/unit_test/aub_tests/aub_tests_configuration.inl" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp b/opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp index a5d924678b..29478114f5 100644 --- a/opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp +++ b/opencl/test/unit_test/aub_tests/gen12lp/aub_tests_configuration_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_cmds.h" +#include "helpers/hw_cmds.h" #include "opencl/test/unit_test/aub_tests/aub_tests_configuration.h" using namespace NEO; 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 f19b54cbb7..6cae84257d 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 @@ -7,9 +7,9 @@ #include "aub_batch_buffer_tests_gen12lp.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/utilities/tag_allocator.h" +#include "memory_manager/graphics_allocation.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "utilities/tag_allocator.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/aub_tests/gen8/aub_tests_configuration_gen8.cpp b/opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp index 8878c476f2..5e99505f51 100644 --- a/opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp +++ b/opencl/test/unit_test/aub_tests/gen8/aub_tests_configuration_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_cmds.h" +#include "helpers/hw_cmds.h" #include "opencl/test/unit_test/aub_tests/aub_tests_configuration.inl" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp b/opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp index 04019a0d1d..f45fbb9cd1 100644 --- a/opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp +++ b/opencl/test/unit_test/aub_tests/gen9/aub_tests_configuration_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_cmds.h" +#include "helpers/hw_cmds.h" #include "opencl/test/unit_test/aub_tests/aub_tests_configuration.inl" using namespace NEO; diff --git a/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp b/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp index 7a21c3f230..162a002007 100644 --- a/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp +++ b/opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/platform/platform.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 593ae82319..a56b408497 100644 --- a/opencl/test/unit_test/built_ins/built_in_tests.cpp +++ b/opencl/test/unit_test/built_ins/built_in_tests.cpp @@ -5,14 +5,14 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/file_io.h" -#include "core/helpers/hash.h" -#include "core/helpers/string.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "debug_settings/debug_settings_manager.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/file_io.h" +#include "helpers/hash.h" +#include "helpers/string.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 2f770fbd63..ad7c83dfa0 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 "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/buffer_operations_fixture.h b/opencl/test/unit_test/command_queue/buffer_operations_fixture.h index 23aab14da9..b9e6165a5d 100644 --- a/opencl/test/unit_test/command_queue/buffer_operations_fixture.h +++ b/opencl/test/unit_test/command_queue/buffer_operations_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" diff --git a/opencl/test/unit_test/command_queue/command_queue_fixture.cpp b/opencl/test/unit_test/command_queue/command_queue_fixture.cpp index 3716513124..dadd276075 100644 --- a/opencl/test/unit_test/command_queue/command_queue_fixture.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_fixture.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/mocks/mock_device.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 8855246eae..cdaa09e05b 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 "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 657ebc0554..229bd1b5a6 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp @@ -5,12 +5,12 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/timestamp_packet.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_manager.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/basic_math.h" +#include "helpers/timestamp_packet.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_manager.h" +#include "unit_tests/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 402d6ba35f..6e85f748f5 100644 --- a/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp +++ b/opencl/test/unit_test/command_queue/dispatch_walker_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/helpers/aligned_memory.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/utilities/tag_allocator.h" +#include "helpers/aligned_memory.h" +#include "memory_manager/internal_allocation_storage.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "utilities/tag_allocator.h" #include "opencl/source/built_ins/aux_translation_builtin.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/command_queue/hardware_interface.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp index 2b7bf7bc9e..01f52fb42c 100644 --- a/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_barrier_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.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/command_queue/enqueue_command_without_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp index 43be64d3eb..416dd8c72b 100644 --- a/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_command_without_kernel_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/timestamp_packet.h" -#include "core/memory_manager/surface.h" -#include "core/os_interface/os_context.h" +#include "helpers/timestamp_packet.h" +#include "memory_manager/surface.h" +#include "os_interface/os_context.h" #include "opencl/source/event/event_builder.h" #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/enqueue_properties.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h index 3537920b7e..cbd6806833 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h index 364e1e6587..df68788a8a 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp index 8e1ebe2176..5adc83d17b 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_rect_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/memory_constants.h" +#include "memory_manager/memory_constants.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_copy_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp index 63d4ba29d3..6af5358338 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/built_ins/built_ins.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/command_queue/enqueue_copy_buffer_to_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h index 733ac2f4ec..877f9a7cd9 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h index 1823e4e973..60d879c31d 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/built_in_fixture.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h index 981aa0b857..b30c569f2b 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp index bfcc87afbd..fca8e36074 100644 --- a/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_debug_kernel_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_context.h" +#include "os_interface/os_context.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/program/program.h" #include "opencl/source/source_level_debugger/source_level_debugger.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp index cae9caad12..b0af891820 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_negative_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/test/unit_test/command_queue/enqueue_fill_buffer_fixture.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp index 27c3b3da82..c310fcceca 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp @@ -5,12 +5,12 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/allocations_list.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/os_context.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" +#include "memory_manager/allocations_list.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/os_context.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/command_queue/command_queue.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_fixture.cpp b/opencl/test/unit_test/command_queue/enqueue_fixture.cpp index af3234446f..344b027ebe 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fixture.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fixture.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" // clang-format off // EnqueueTraits diff --git a/opencl/test/unit_test/command_queue/enqueue_fixture.h b/opencl/test/unit_test/command_queue/enqueue_fixture.h index 9c4a1e78ff..86d204e8fa 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/graphics_allocation.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/event/user_event.h" #include "opencl/source/kernel/kernel.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 c867f20a49..1d0138f9e1 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 16469e129a..1f3f3f50f9 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 cc00226a14..6159c764c8 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 @@ -5,11 +5,11 @@ * */ -#include "core/command_stream/scratch_space_controller.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/allocations_list.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "command_stream/scratch_space_controller.h" +#include "helpers/hw_helper.h" +#include "memory_manager/allocations_list.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 364c2042da..2d57743532 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 @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/aligned_memory.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/aligned_memory.h" +#include "unit_tests/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 05371ea914..3172140441 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 @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/command_stream_receiver.h" +#include "os_interface/os_context.h" +#include "unit_tests/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_marker_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp index 723e98b798..222d990312 100644 --- a/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_marker_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include "opencl/source/event/user_event.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp index 79a5f120eb..43d1791b34 100644 --- a/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_migrate_mem_objects_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.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_stream/command_stream_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 220b189ff0..5386daa249 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h index efce187072..fc96b8e86b 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_fixture.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp index ee4940214d..b5cd60b4de 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_rect_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/memory_constants.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/source/event/event.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 6d759b8a77..395b52ec85 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 @@ -5,10 +5,10 @@ * */ -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/cache_policy.h" -#include "core/memory_manager/allocations_list.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/cache_policy.h" +#include "memory_manager/allocations_list.h" +#include "unit_tests/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_fixture.h b/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h index 05647752fe..4a8fdbc158 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.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 81b2867af6..83c270eb33 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 @@ -5,8 +5,8 @@ * */ -#include "core/memory_manager/allocations_list.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "memory_manager/allocations_list.h" +#include "unit_tests/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_mem_copy_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp index 3629f64aa7..b2b49212aa 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_copy_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/memory_manager/allocations_list.h" -#include "core/memory_manager/unified_memory_manager.h" +#include "memory_manager/allocations_list.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp index 984fb44ca5..512f68ee23 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_mem_fill_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/unified_memory_manager.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.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 cb6bb1f1b0..e2bc0bba19 100644 --- a/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp @@ -5,15 +5,15 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/aligned_memory.h" -#include "core/memory_manager/allocations_list.h" -#include "core/memory_manager/surface.h" -#include "core/memory_manager/unified_memory_manager.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "command_stream/command_stream_receiver.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/aligned_memory.h" +#include "memory_manager/allocations_list.h" +#include "memory_manager/surface.h" +#include "memory_manager/unified_memory_manager.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" +#include "unit_tests/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_thread_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp index 4d815be625..e37722b43b 100644 --- a/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_thread_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/helpers/aligned_memory.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "helpers/aligned_memory.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/kernel/kernel.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 3f275cae33..2f270cd90c 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 @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/command_stream_receiver.h" +#include "unit_tests/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 afc6571c13..44feb21719 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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_rect_fixture.h b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h index 6c2fa62d48..1a92625b97 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_rect_fixture.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_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 ef1f567064..398b348e0a 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 @@ -5,8 +5,8 @@ * */ -#include "core/memory_manager/allocations_list.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "memory_manager/allocations_list.h" +#include "unit_tests/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_write_image_fixture.h b/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h index 1155d4a91c..c63614c969 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/test/unit_test/command_queue/command_enqueue_fixture.h" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp index 69500b30ec..56eff98815 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/memory_manager/allocations_list.h" -#include "core/memory_manager/memory_manager.h" +#include "memory_manager/allocations_list.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" #include "opencl/test/unit_test/command_queue/enqueue_write_image_fixture.h" #include "opencl/test/unit_test/gen_common/gen_commands_common_validation.h" diff --git a/opencl/test/unit_test/command_queue/finish_tests.cpp b/opencl/test/unit_test/command_queue/finish_tests.cpp index b592613f2a..4285d68cdd 100644 --- a/opencl/test/unit_test/command_queue/finish_tests.cpp +++ b/opencl/test/unit_test/command_queue/finish_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/command_stream/command_stream_fixture.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" diff --git a/opencl/test/unit_test/command_queue/flattened_id_tests.cpp b/opencl/test/unit_test/command_queue/flattened_id_tests.cpp index d76f3d8062..670a8599a3 100644 --- a/opencl/test/unit_test/command_queue/flattened_id_tests.cpp +++ b/opencl/test/unit_test/command_queue/flattened_id_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/basic_math.h" -#include "core/helpers/string.h" +#include "helpers/basic_math.h" +#include "helpers/string.h" #include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "test.h" diff --git a/opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp b/opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp index 57aa51ae06..d51372721d 100644 --- a/opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp +++ b/opencl/test/unit_test/command_queue/gl/windows/enqueue_kernel_gl_tests_windows.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/preamble.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/memory_constants.h" +#include "helpers/preamble.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/sharings/gl/gl_buffer.h" #include "opencl/test/unit_test/command_queue/enqueue_fixture.h" diff --git a/opencl/test/unit_test/command_queue/local_id_tests.cpp b/opencl/test/unit_test/command_queue/local_id_tests.cpp index c230fbaeee..688fae60f9 100644 --- a/opencl/test/unit_test/command_queue/local_id_tests.cpp +++ b/opencl/test/unit_test/command_queue/local_id_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/aligned_memory.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/ptr_math.h" +#include "helpers/aligned_memory.h" +#include "helpers/basic_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/command_queue/local_id_gen.h" #include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "test.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 290c1081ee..0ec53b4e86 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/oom_buffer_tests.cpp b/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp index 4249a2021c..fdbe826ddd 100644 --- a/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_buffer_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/memory_manager.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" diff --git a/opencl/test/unit_test/command_queue/oom_image_tests.cpp b/opencl/test/unit_test/command_queue/oom_image_tests.cpp index 1cc58e9f93..aba35bb74d 100644 --- a/opencl/test/unit_test/command_queue/oom_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_image_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/memory_manager.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" diff --git a/opencl/test/unit_test/command_queue/oom_tests.cpp b/opencl/test/unit_test/command_queue/oom_tests.cpp index b8f1f66322..542a4144f2 100644 --- a/opencl/test/unit_test/command_queue/oom_tests.cpp +++ b/opencl/test/unit_test/command_queue/oom_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/indirect_heap/indirect_heap.h" -#include "core/memory_manager/memory_manager.h" +#include "indirect_heap/indirect_heap.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" diff --git a/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp b/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp index 0fc04282fe..e767a090bd 100644 --- a/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp +++ b/opencl/test/unit_test/command_queue/read_write_buffer_cpu_copy.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gmm_helper/gmm.h" -#include "core/helpers/basic_math.h" +#include "gmm_helper/gmm.h" +#include "helpers/basic_math.h" #include "opencl/test/unit_test/command_queue/enqueue_read_buffer_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.h" #include "test.h" diff --git a/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp b/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp index 7f072ed431..6fdc3cfa18 100644 --- a/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp +++ b/opencl/test/unit_test/command_queue/sync_buffer_handler_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/program/sync_buffer_handler.h" +#include "program/sync_buffer_handler.h" #include "opencl/source/api/api.h" #include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.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 5166120ae9..9e0ad1be47 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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_queue/zero_size_enqueue_tests.cpp b/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp index 49cdb945a0..8a037e0176 100644 --- a/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp +++ b/opencl/test/unit_test/command_queue/zero_size_enqueue_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/unified_memory_manager.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/event/event.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.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 e5878f5454..94bc74f6f7 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 @@ -5,9 +5,9 @@ * */ -#include "core/helpers/hw_helper.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "helpers/hw_helper.h" +#include "os_interface/os_context.h" +#include "unit_tests/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 34a39eb8f5..61b1cc2541 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 @@ -5,8 +5,8 @@ * */ -#include "core/helpers/hw_helper.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "helpers/hw_helper.h" +#include "unit_tests/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 b7ddd90efb..8fc562fa9c 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 @@ -5,8 +5,8 @@ * */ -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "os_interface/os_context.h" +#include "unit_tests/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 3d0f916293..3a7037966c 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 9fb42e8e9c..083a849710 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 @@ -5,10 +5,10 @@ * */ -#include "core/gmm_helper/gmm_helper.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/ult_hw_helper.h" +#include "gmm_helper/gmm_helper.h" +#include "os_interface/os_context.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 f1517b9853..d49f169d6f 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 @@ -5,14 +5,14 @@ * */ -#include "core/command_stream/csr_definitions.h" -#include "core/command_stream/scratch_space_controller.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/state_base_address.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/csr_definitions.h" +#include "command_stream/scratch_space_controller.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/hw_helper.h" +#include "helpers/state_base_address.h" +#include "memory_manager/internal_allocation_storage.h" +#include "os_interface/os_context.h" +#include "unit_tests/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 d70799979f..225da29b13 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 @@ -5,9 +5,9 @@ * */ -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_manager.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_manager.h" +#include "unit_tests/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 06a476eb64..cf09d1f77e 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 @@ -5,20 +5,20 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/preemption.h" -#include "core/command_stream/scratch_space_controller.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/cache_policy.h" -#include "core/helpers/preamble.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/linux/debug_env_reader.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/ult_hw_helper.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/linear_stream.h" +#include "command_stream/preemption.h" +#include "command_stream/scratch_space_controller.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/aligned_memory.h" +#include "helpers/cache_policy.h" +#include "helpers/preamble.h" +#include "helpers/ptr_math.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/linux/debug_env_reader.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 7f95d16136..dc3392ccdd 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 @@ -5,23 +5,23 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/preemption.h" -#include "core/command_stream/scratch_space_controller.h" -#include "core/command_stream/scratch_space_controller_base.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/cache_policy.h" -#include "core/helpers/preamble.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/memory_manager.h" -#include "core/memory_manager/unified_memory_manager.h" -#include "core/os_interface/linux/debug_env_reader.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/linear_stream.h" +#include "command_stream/preemption.h" +#include "command_stream/scratch_space_controller.h" +#include "command_stream/scratch_space_controller_base.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/aligned_memory.h" +#include "helpers/cache_policy.h" +#include "helpers/preamble.h" +#include "helpers/ptr_math.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/memory_manager.h" +#include "memory_manager/unified_memory_manager.h" +#include "os_interface/linux/debug_env_reader.h" +#include "os_interface/os_context.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 4ee39ebac9..0ab9ebb03f 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 @@ -5,20 +5,20 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/preemption.h" -#include "core/command_stream/scratch_space_controller.h" -#include "core/gmm_helper/page_table_mngr.h" -#include "core/helpers/cache_policy.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/timestamp_packet.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_manager.h" -#include "core/memory_manager/surface.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/utilities/tag_allocator.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/linear_stream.h" +#include "command_stream/preemption.h" +#include "command_stream/scratch_space_controller.h" +#include "gmm_helper/page_table_mngr.h" +#include "helpers/cache_policy.h" +#include "helpers/hw_helper.h" +#include "helpers/timestamp_packet.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_manager.h" +#include "memory_manager/surface.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "utilities/tag_allocator.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp index cf78895f08..4f4f0812dc 100644 --- a/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp +++ b/opencl/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp @@ -5,13 +5,13 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/flush_stamp.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/timestamp_packet.h" -#include "core/os_interface/os_context.h" -#include "core/utilities/tag_allocator.h" +#include "command_stream/preemption.h" +#include "execution_environment/execution_environment.h" +#include "helpers/flush_stamp.h" +#include "helpers/hw_helper.h" +#include "helpers/timestamp_packet.h" +#include "os_interface/os_context.h" +#include "utilities/tag_allocator.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/command_stream/command_stream_receiver_with_aub_dump.inl" diff --git a/opencl/test/unit_test/command_stream/compute_mode_tests.h b/opencl/test/unit_test/command_stream/compute_mode_tests.h index 8b53fe64f3..78ecd42563 100644 --- a/opencl/test/unit_test/command_stream/compute_mode_tests.h +++ b/opencl/test/unit_test/command_stream/compute_mode_tests.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/helpers/hw_helper.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "helpers/hw_helper.h" #include "opencl/test/unit_test/helpers/hw_parse.h" #include "opencl/test/unit_test/mocks/mock_device.h" #include "test.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 28bfc26693..9bf181bcc6 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 @@ -5,10 +5,10 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/execution_environment/execution_environment.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "command_stream/command_stream_receiver.h" +#include "execution_environment/execution_environment.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 7de0d3aedc..79a72d99f7 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 @@ -5,10 +5,10 @@ * */ -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_constants.h" -#include "core/memory_manager/memory_manager.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_constants.h" +#include "memory_manager/memory_manager.h" +#include "unit_tests/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 de254f852a..0dbbdd6fa7 100644 --- a/opencl/test/unit_test/command_stream/get_devices_tests.cpp +++ b/opencl/test/unit_test/command_stream/get_devices_tests.cpp @@ -5,12 +5,12 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/execution_environment/execution_environment.h" -#include "core/os_interface/device_factory.h" -#include "core/os_interface/hw_info_config.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "command_stream/command_stream_receiver.h" +#include "execution_environment/execution_environment.h" +#include "os_interface/device_factory.h" +#include "os_interface/hw_info_config.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/linear_stream_fixture.h b/opencl/test/unit_test/command_stream/linear_stream_fixture.h index 8c1ec4c97b..8c5e383a1f 100644 --- a/opencl/test/unit_test/command_stream/linear_stream_fixture.h +++ b/opencl/test/unit_test/command_stream/linear_stream_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/linear_stream.h" +#include "command_stream/linear_stream.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" diff --git a/opencl/test/unit_test/command_stream/linear_stream_tests.cpp b/opencl/test/unit_test/command_stream/linear_stream_tests.cpp index a2ee6fd278..412a18a650 100644 --- a/opencl/test/unit_test/command_stream/linear_stream_tests.cpp +++ b/opencl/test/unit_test/command_stream/linear_stream_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/linear_stream.h" -#include "core/memory_manager/graphics_allocation.h" +#include "command_stream/linear_stream.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/test/unit_test/command_stream/linear_stream_fixture.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" diff --git a/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp b/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp index f5bda328a2..21d842c77b 100644 --- a/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp +++ b/opencl/test/unit_test/command_stream/submissions_aggregator_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/submissions_aggregator.h" -#include "core/helpers/flush_stamp.h" +#include "command_stream/submissions_aggregator.h" +#include "helpers/flush_stamp.h" #include "opencl/source/event/event.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/command_stream/tbx_command_stream_fixture.cpp b/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp index 304a949b79..2511c6f3a0 100644 --- a/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp +++ b/opencl/test/unit_test/command_stream/tbx_command_stream_fixture.cpp @@ -7,8 +7,8 @@ #include "opencl/test/unit_test/command_stream/tbx_command_stream_fixture.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "opencl/test/unit_test/mocks/mock_device.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 c6190d8f10..772899319c 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 @@ -5,12 +5,12 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/ptr_math.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/hw_helper.h" +#include "helpers/ptr_math.h" +#include "os_interface/os_context.h" +#include "unit_tests/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/command_stream/thread_arbitration_policy_helper.cpp b/opencl/test/unit_test/command_stream/thread_arbitration_policy_helper.cpp index 30227612cd..7c2eca8af4 100644 --- a/opencl/test/unit_test/command_stream/thread_arbitration_policy_helper.cpp +++ b/opencl/test/unit_test/command_stream/thread_arbitration_policy_helper.cpp @@ -5,7 +5,7 @@ * */ -#include "core/command_stream/thread_arbitration_policy.h" +#include "command_stream/thread_arbitration_policy.h" #include "opencl/source/extensions/public/cl_ext_private.h" #include diff --git a/opencl/test/unit_test/context/context_multi_device_tests.cpp b/opencl/test/unit_test/context/context_multi_device_tests.cpp index 13056e375d..bf1a4b9fe3 100644 --- a/opencl/test/unit_test/context/context_multi_device_tests.cpp +++ b/opencl/test/unit_test/context/context_multi_device_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/array_count.h" +#include "helpers/array_count.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/context/context_tests.cpp b/opencl/test/unit_test/context/context_tests.cpp index 6706a2dcce..c1a3cdfac0 100644 --- a/opencl/test/unit_test/context/context_tests.cpp +++ b/opencl/test/unit_test/context/context_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/device/device.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "device/device.h" +#include "unit_tests/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 f9ac8c435e..75522867ac 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp +++ b/opencl/test/unit_test/context/driver_diagnostics_enqueue_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/memory_manager/unified_memory_manager.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "memory_manager/unified_memory_manager.h" +#include "unit_tests/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 629922b2a2..a10e41f482 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/context/driver_diagnostics_tests.h b/opencl/test/unit_test/context/driver_diagnostics_tests.h index 31afe36883..ade65acb19 100644 --- a/opencl/test/unit_test/context/driver_diagnostics_tests.h +++ b/opencl/test/unit_test/context/driver_diagnostics_tests.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/context/context.h" #include "opencl/source/kernel/kernel.h" diff --git a/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp b/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp index 1fca51fc7d..be6cd39ad4 100644 --- a/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp +++ b/opencl/test/unit_test/d3d_sharing/cl_dx_sharing_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/arrayref.h" +#include "utilities/arrayref.h" #include "opencl/source/sharings/d3d/cl_d3d_api.h" #include "opencl/source/sharings/d3d/d3d_buffer.h" #include "opencl/source/sharings/d3d/d3d_sharing.h" diff --git a/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp b/opencl/test/unit_test/d3d_sharing/d3d9_tests.cpp index e49fce3532..7c29a18bc8 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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_aux_tests.cpp b/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp index 87de3354b5..8318d97a99 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/arrayref.h" +#include "utilities/arrayref.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 cf6294037b..e53a99eae5 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_tests_part1.cpp @@ -5,8 +5,8 @@ * */ -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/utilities/arrayref.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "utilities/arrayref.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_part2.cpp b/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp index abcce090ab..1007006e92 100644 --- a/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp +++ b/opencl/test/unit_test/d3d_sharing/d3d_tests_part2.cpp @@ -5,8 +5,8 @@ * */ -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/utilities/arrayref.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "utilities/arrayref.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/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp index ef7dbe23fe..f92d368537 100644 --- a/opencl/test/unit_test/device/device_caps_tests.cpp +++ b/opencl/test/unit_test/device/device_caps_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/os_interface/os_interface.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/command_stream_receiver.h" +#include "os_interface/os_interface.h" +#include "unit_tests/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 5796c83833..4abca800e2 100644 --- a/opencl/test/unit_test/device/device_get_engine_tests.cpp +++ b/opencl/test/unit_test/device/device_get_engine_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/options.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "helpers/options.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 0bbea88228..5a6f778f94 100644 --- a/opencl/test/unit_test/device/device_tests.cpp +++ b/opencl/test/unit_test/device/device_tests.cpp @@ -5,12 +5,12 @@ * */ -#include "core/device/device.h" -#include "core/helpers/hw_helper.h" -#include "core/indirect_heap/indirect_heap.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "device/device.h" +#include "helpers/hw_helper.h" +#include "indirect_heap/indirect_heap.h" +#include "os_interface/os_context.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/device_win_timers_tests.cpp b/opencl/test/unit_test/device/device_win_timers_tests.cpp index 0010d45821..746bd4a7b5 100644 --- a/opencl/test/unit_test/device/device_win_timers_tests.cpp +++ b/opencl/test/unit_test/device/device_win_timers_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/execution_environment/root_device_environment.h" +#include "execution_environment/root_device_environment.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_ostime.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 a5467ed253..44b8afc5c1 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 @@ -5,10 +5,10 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/hw_info.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/basic_math.h" +#include "helpers/hw_info.h" +#include "unit_tests/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 e86e5dbc78..fe61653f50 100644 --- a/opencl/test/unit_test/device/sub_device_tests.cpp +++ b/opencl/test/unit_test/device/sub_device_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/device/sub_device.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "device/sub_device.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 2eee741bed..d1098a46e9 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 @@ -5,9 +5,9 @@ * */ -#include "core/helpers/hw_cmds.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/utilities/tag_allocator.h" +#include "helpers/hw_cmds.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "utilities/tag_allocator.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" 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 7d85728228..ef4efa7e89 100644 --- a/opencl/test/unit_test/event/async_events_handler_tests.cpp +++ b/opencl/test/unit_test/event/async_events_handler_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/timestamp_packet.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "helpers/timestamp_packet.h" +#include "unit_tests/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_builder_tests.cpp b/opencl/test/unit_test/event/event_builder_tests.cpp index 283f21e2c0..7ad466cdf2 100644 --- a/opencl/test/unit_test/event/event_builder_tests.cpp +++ b/opencl/test/unit_test/event/event_builder_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/utilities/arrayref.h" +#include "memory_manager/internal_allocation_storage.h" +#include "utilities/arrayref.h" #include "opencl/source/event/event_builder.h" #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/task_information.h" diff --git a/opencl/test/unit_test/event/event_fixture.h b/opencl/test/unit_test/event/event_fixture.h index 46003f60f8..c050876c21 100644 --- a/opencl/test/unit_test/event/event_fixture.h +++ b/opencl/test/unit_test/event/event_fixture.h @@ -7,9 +7,9 @@ #pragma once -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" +#include "unit_tests/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 735da0901c..cfc7e0939d 100644 --- a/opencl/test/unit_test/event/event_tests.cpp +++ b/opencl/test/unit_test/event/event_tests.cpp @@ -5,12 +5,12 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/hw_info.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/os_interface/os_interface.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/utilities/tag_allocator.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/hw_info.h" +#include "memory_manager/internal_allocation_storage.h" +#include "os_interface/os_interface.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "utilities/tag_allocator.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/perf_counter.h" #include "opencl/source/helpers/task_information.h" diff --git a/opencl/test/unit_test/event/event_tests_mt.cpp b/opencl/test/unit_test/event/event_tests_mt.cpp index c16932f93f..23e58f1b51 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 3491dc44a6..d3153098bd 100644 --- a/opencl/test/unit_test/event/event_tracker_tests.cpp +++ b/opencl/test/unit_test/event/event_tracker_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/file_io.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "helpers/file_io.h" +#include "unit_tests/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 ad8fb6abc1..c3b3d8d277 100644 --- a/opencl/test/unit_test/event/user_events_tests.cpp +++ b/opencl/test/unit_test/event/user_events_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/os_context.h" +#include "unit_tests/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/event/user_events_tests_mt.cpp b/opencl/test/unit_test/event/user_events_tests_mt.cpp index 884b9a240c..4918a19de0 100644 --- a/opencl/test/unit_test/event/user_events_tests_mt.cpp +++ b/opencl/test/unit_test/event/user_events_tests_mt.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/memory_manager.h" +#include "memory_manager/memory_manager.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/mocks/mock_command_queue.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 41614a4e3d..38cfa0ff2f 100644 --- a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp +++ b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp @@ -5,15 +5,15 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/compiler_interface/compiler_interface.h" -#include "core/device/device.h" -#include "core/execution_environment/execution_environment.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/hw_helper.h" -#include "core/os_interface/os_interface.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/destructor_counted.h" +#include "command_stream/preemption.h" +#include "compiler_interface/compiler_interface.h" +#include "device/device.h" +#include "execution_environment/execution_environment.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/hw_helper.h" +#include "os_interface/os_interface.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 b9b9d184c5..76988c6bf1 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 @@ -5,9 +5,9 @@ * */ -#include "core/helpers/engine_node_helper.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "helpers/engine_node_helper.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 fdfe43b2d3..9949832aae 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 9b91e555b0..3447ae63e5 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/execution_model/submit_blocked_parent_kernel_tests.cpp b/opencl/test/unit_test/execution_model/submit_blocked_parent_kernel_tests.cpp index 8ab240290c..c02c4e7126 100644 --- a/opencl/test/unit_test/execution_model/submit_blocked_parent_kernel_tests.cpp +++ b/opencl/test/unit_test/execution_model/submit_blocked_parent_kernel_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/tag_allocator.h" +#include "utilities/tag_allocator.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/command_queue/hardware_interface.h" #include "opencl/source/event/hw_timestamps.h" diff --git a/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h b/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h index b72cc28c02..b65654171f 100644 --- a/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h +++ b/opencl/test/unit_test/fixtures/buffer_enqueue_fixture.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/hw_info.h" -#include "core/memory_manager/internal_allocation_storage.h" +#include "helpers/hw_info.h" +#include "memory_manager/internal_allocation_storage.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" #include "opencl/test/unit_test/helpers/execution_environment_helper.h" #include "opencl/test/unit_test/helpers/hw_parse.h" diff --git a/opencl/test/unit_test/fixtures/built_in_fixture.cpp b/opencl/test/unit_test/fixtures/built_in_fixture.cpp index 83b6f2294c..a35d952b3e 100644 --- a/opencl/test/unit_test/fixtures/built_in_fixture.cpp +++ b/opencl/test/unit_test/fixtures/built_in_fixture.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/fixtures/built_in_fixture.h" -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/test/unit_test/global_environment.h" #include "opencl/test/unit_test/helpers/kernel_binary_helper.h" diff --git a/opencl/test/unit_test/fixtures/d3d_test_fixture.h b/opencl/test/unit_test/fixtures/d3d_test_fixture.h index 04fdc03dd1..f42f96a40a 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 649166c05b..45026ff87e 100644 --- a/opencl/test/unit_test/fixtures/dispatch_flags_fixture.h +++ b/opencl/test/unit_test/fixtures/dispatch_flags_fixture.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "os_interface/os_context.h" +#include "unit_tests/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 556eb5f21c..f9ab2264d8 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/hello_world_fixture.h b/opencl/test/unit_test/fixtures/hello_world_fixture.h index 34c7334a38..ecb2e8ac4e 100644 --- a/opencl/test/unit_test/fixtures/hello_world_fixture.h +++ b/opencl/test/unit_test/fixtures/hello_world_fixture.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/helpers/aligned_memory.h" -#include "core/memory_manager/memory_manager.h" +#include "command_stream/command_stream_receiver.h" +#include "helpers/aligned_memory.h" +#include "memory_manager/memory_manager.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/command_stream/command_stream_fixture.h" #include "opencl/test/unit_test/fixtures/buffer_fixture.h" diff --git a/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h b/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h index eac26d4851..b56d4737ed 100644 --- a/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/hello_world_kernel_fixture.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/device/device.h" -#include "core/helpers/file_io.h" +#include "device/device.h" +#include "helpers/file_io.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/platform/platform.h" #include "opencl/source/program/program.h" diff --git a/opencl/test/unit_test/fixtures/image_fixture.h b/opencl/test/unit_test/fixtures/image_fixture.h index 606aa6b2d4..13a39548c3 100644 --- a/opencl/test/unit_test/fixtures/image_fixture.h +++ b/opencl/test/unit_test/fixtures/image_fixture.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/hw_info.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "execution_environment/execution_environment.h" +#include "helpers/hw_info.h" +#include "unit_tests/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/kernel_data_fixture.cpp b/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp index 0eeae51434..58c88b53a5 100644 --- a/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp +++ b/opencl/test/unit_test/fixtures/kernel_data_fixture.cpp @@ -7,11 +7,11 @@ #include "opencl/test/unit_test/fixtures/kernel_data_fixture.h" -#include "core/device_binary_format/patchtokens_decoder.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/string.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/program/program_info_from_patchtokens.h" +#include "device_binary_format/patchtokens_decoder.h" +#include "helpers/aligned_memory.h" +#include "helpers/string.h" +#include "memory_manager/graphics_allocation.h" +#include "program/program_info_from_patchtokens.h" void KernelDataTest::buildAndDecode() { cl_int error = CL_SUCCESS; diff --git a/opencl/test/unit_test/fixtures/kernel_data_fixture.h b/opencl/test/unit_test/fixtures/kernel_data_fixture.h index 7e9a943335..b4898cfa9d 100644 --- a/opencl/test/unit_test/fixtures/kernel_data_fixture.h +++ b/opencl/test/unit_test/fixtures/kernel_data_fixture.h @@ -7,7 +7,7 @@ #pragma once -#include "core/memory_manager/memory_manager.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/program/kernel_info.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/fixtures/memory_allocator_fixture.h b/opencl/test/unit_test/fixtures/memory_allocator_fixture.h index 4ce660ce0c..641863b17e 100644 --- a/opencl/test/unit_test/fixtures/memory_allocator_fixture.h +++ b/opencl/test/unit_test/fixtures/memory_allocator_fixture.h @@ -7,9 +7,9 @@ #pragma once -#include "core/command_stream/preemption.h" -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/hw_helper.h" +#include "command_stream/preemption.h" +#include "execution_environment/execution_environment.h" +#include "helpers/hw_helper.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "opencl/test/unit_test/mocks/mock_device.h" 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 5d5c251493..af7a08423c 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 @@ -7,9 +7,9 @@ #pragma once -#include "core/execution_environment/execution_environment.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "execution_environment/execution_environment.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 eb8925d680..092b267489 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 "core/unit_tests/helpers/memory_leak_listener.h" -#include "core/unit_tests/helpers/memory_management.h" +#include "unit_tests/helpers/memory_leak_listener.h" +#include "unit_tests/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 3af13369b2..0190b1c118 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 "core/unit_tests/helpers/memory_management.h" +#include "unit_tests/helpers/memory_management.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/fixtures/memory_manager_fixture.cpp b/opencl/test/unit_test/fixtures/memory_manager_fixture.cpp index d4ebaa7b53..a5d3824b48 100644 --- a/opencl/test/unit_test/fixtures/memory_manager_fixture.cpp +++ b/opencl/test/unit_test/fixtures/memory_manager_fixture.cpp @@ -7,9 +7,9 @@ #include "opencl/test/unit_test/fixtures/memory_manager_fixture.h" -#include "core/command_stream/preemption.h" -#include "core/helpers/hw_helper.h" -#include "core/os_interface/os_context.h" +#include "command_stream/preemption.h" +#include "helpers/hw_helper.h" +#include "os_interface/os_context.h" #include "opencl/test/unit_test/mocks/mock_csr.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" diff --git a/opencl/test/unit_test/fixtures/memory_manager_fixture.h b/opencl/test/unit_test/fixtures/memory_manager_fixture.h index a6640b54e9..88a04e0918 100644 --- a/opencl/test/unit_test/fixtures/memory_manager_fixture.h +++ b/opencl/test/unit_test/fixtures/memory_manager_fixture.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/options.h" +#include "execution_environment/execution_environment.h" +#include "helpers/options.h" using namespace NEO; 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 be1610e55c..974882d62c 100644 --- a/opencl/test/unit_test/fixtures/mock_aub_center_fixture.h +++ b/opencl/test/unit_test/fixtures/mock_aub_center_fixture.h @@ -7,8 +7,8 @@ #pragma once -#include "core/execution_environment/root_device_environment.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "execution_environment/root_device_environment.h" +#include "unit_tests/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 c47097dff8..8892ecda5c 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/program_fixture.h b/opencl/test/unit_test/fixtures/program_fixture.h index eaed26b038..dc94d17dd2 100644 --- a/opencl/test/unit_test/fixtures/program_fixture.h +++ b/opencl/test/unit_test/fixtures/program_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/file_io.h" +#include "helpers/file_io.h" #include "opencl/source/program/program.h" #include "opencl/test/unit_test/helpers/test_files.h" #include "opencl/test/unit_test/mocks/mock_program.h" diff --git a/opencl/test/unit_test/fixtures/scenario_test_fixture.h b/opencl/test/unit_test/fixtures/scenario_test_fixture.h index 084b7f1d50..92f87098a2 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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_fixture.h b/opencl/test/unit_test/fixtures/simple_arg_fixture.h index e0a58af8a1..8c2472fd6b 100644 --- a/opencl/test/unit_test/fixtures/simple_arg_fixture.h +++ b/opencl/test/unit_test/fixtures/simple_arg_fixture.h @@ -7,7 +7,7 @@ #pragma once -#include "core/command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/command_stream/command_stream_fixture.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.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 2965e84a06..5f1c43c037 100644 --- a/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h +++ b/opencl/test/unit_test/fixtures/simple_arg_kernel_fixture.h @@ -6,10 +6,10 @@ */ #pragma once -#include "core/device/device.h" -#include "core/helpers/array_count.h" -#include "core/helpers/file_io.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "device/device.h" +#include "helpers/array_count.h" +#include "helpers/file_io.h" +#include "unit_tests/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 90a55e02df..ab17b2f1c4 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 "core/unit_tests/helpers/default_hw_info.h" +#include "unit_tests/helpers/default_hw_info.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "test.h" diff --git a/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h b/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h index bacf7c68a2..6b981edc42 100644 --- a/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h +++ b/opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h @@ -6,12 +6,12 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/preemption.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/cache_policy.h" -#include "core/memory_manager/graphics_allocation.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/linear_stream.h" +#include "command_stream/preemption.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/cache_policy.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/helpers/hw_parse.h" #include "opencl/test/unit_test/helpers/unit_test_helper.h" diff --git a/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp b/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp index d5735582ff..dd7c7a125f 100644 --- a/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/coherency_tests_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/helpers/hw_helper.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "helpers/hw_helper.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/gen11/command_stream_receiver_hw_tests_gen11.cpp b/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp index 439ee74582..88565751d3 100644 --- a/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/command_stream_receiver_hw_tests_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/linear_stream.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/linear_stream.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/helpers/hw_parse.h" diff --git a/opencl/test/unit_test/gen11/ehl/linux/dll/device_id_tests_ehl.cpp b/opencl/test/unit_test/gen11/ehl/linux/dll/device_id_tests_ehl.cpp index edb0e810d0..a139b74f2a 100644 --- a/opencl/test/unit_test/gen11/ehl/linux/dll/device_id_tests_ehl.cpp +++ b/opencl/test/unit_test/gen11/ehl/linux/dll/device_id_tests_ehl.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_neo.h" +#include "os_interface/linux/drm_neo.h" #include "test.h" #include diff --git a/opencl/test/unit_test/gen11/ehl/windows/hw_info_config_tests_ehl.cpp b/opencl/test/unit_test/gen11/ehl/windows/hw_info_config_tests_ehl.cpp index 94a5226d02..c0c26276e0 100644 --- a/opencl/test/unit_test/gen11/ehl/windows/hw_info_config_tests_ehl.cpp +++ b/opencl/test/unit_test/gen11/ehl/windows/hw_info_config_tests_ehl.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/os_interface.h" +#include "os_interface/windows/os_interface.h" #include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp b/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp index 4ff7450cef..32ddae39f3 100644 --- a/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp +++ b/opencl/test/unit_test/gen11/enqueue_media_kernel_gen11.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/pipeline_select_helper.h" -#include "core/helpers/preamble.h" +#include "helpers/pipeline_select_helper.h" +#include "helpers/preamble.h" #include "opencl/test/unit_test/fixtures/media_kernel_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/gen11/icllp/linux/dll/device_id_tests_icllp.cpp b/opencl/test/unit_test/gen11/icllp/linux/dll/device_id_tests_icllp.cpp index f5eadc7330..e23601943e 100644 --- a/opencl/test/unit_test/gen11/icllp/linux/dll/device_id_tests_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/linux/dll/device_id_tests_icllp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_neo.h" +#include "os_interface/linux/drm_neo.h" #include "test.h" #include diff --git a/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp b/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp index 53770c1d28..4309ceb8b7 100644 --- a/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/test_media_kernel_icllp.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/pipeline_select_helper.h" -#include "core/helpers/preamble.h" +#include "helpers/pipeline_select_helper.h" +#include "helpers/preamble.h" #include "opencl/test/unit_test/fixtures/media_kernel_fixture.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 a46fe5b550..a5aa163d67 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 @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/helpers/hw_helper.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "helpers/hw_helper.h" +#include "unit_tests/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/gen11/icllp/windows/hw_info_config_tests_icllp.cpp b/opencl/test/unit_test/gen11/icllp/windows/hw_info_config_tests_icllp.cpp index b073aa6da5..d2b1547e57 100644 --- a/opencl/test/unit_test/gen11/icllp/windows/hw_info_config_tests_icllp.cpp +++ b/opencl/test/unit_test/gen11/icllp/windows/hw_info_config_tests_icllp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/os_interface.h" +#include "os_interface/windows/os_interface.h" #include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/image_tests_gen11.cpp b/opencl/test/unit_test/gen11/image_tests_gen11.cpp index 4a5d96fdd5..d886adb2fb 100644 --- a/opencl/test/unit_test/gen11/image_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/image_tests_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/image/image_surface_state.h" +#include "image/image_surface_state.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/gen11/lkf/linux/dll/device_id_tests_lkf.cpp b/opencl/test/unit_test/gen11/lkf/linux/dll/device_id_tests_lkf.cpp index a8fd614346..450a742746 100644 --- a/opencl/test/unit_test/gen11/lkf/linux/dll/device_id_tests_lkf.cpp +++ b/opencl/test/unit_test/gen11/lkf/linux/dll/device_id_tests_lkf.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_neo.h" +#include "os_interface/linux/drm_neo.h" #include "test.h" #include diff --git a/opencl/test/unit_test/gen11/lkf/windows/hw_info_config_tests_lkf.cpp b/opencl/test/unit_test/gen11/lkf/windows/hw_info_config_tests_lkf.cpp index 6b6660d8ee..cd021041f2 100644 --- a/opencl/test/unit_test/gen11/lkf/windows/hw_info_config_tests_lkf.cpp +++ b/opencl/test/unit_test/gen11/lkf/windows/hw_info_config_tests_lkf.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/os_interface.h" +#include "os_interface/windows/os_interface.h" #include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen11/scheduler_source_tests_gen11.cpp b/opencl/test/unit_test/gen11/scheduler_source_tests_gen11.cpp index 349e71d461..d00d57e009 100644 --- a/opencl/test/unit_test/gen11/scheduler_source_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/scheduler_source_tests_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen11/hw_cmds.h" +#include "gen11/hw_cmds.h" #include "opencl/source/device_queue/device_queue_hw.h" // Keep the order of device_enqueue.h and scheduler_definitions.h as the latter uses defines from the first one diff --git a/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp b/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp index cb566501c4..b32262e113 100644 --- a/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp +++ b/opencl/test/unit_test/gen11/test_device_caps_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/gen11/unit_test_helper_gen11.cpp b/opencl/test/unit_test/gen11/unit_test_helper_gen11.cpp index 01cd489a7c..e64e6780ac 100644 --- a/opencl/test/unit_test/gen11/unit_test_helper_gen11.cpp +++ b/opencl/test/unit_test/gen11/unit_test_helper_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen11/hw_info.h" +#include "gen11/hw_info.h" #include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "opencl/test/unit_test/helpers/unit_test_helper.inl" diff --git a/opencl/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp b/opencl/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp index 57c46716fa..6d6ec5c93c 100644 --- a/opencl/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp +++ b/opencl/test/unit_test/gen11/windows/gmm_callbacks_tests_gen11.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/windows/gmm_callbacks.h" +#include "helpers/windows/gmm_callbacks.h" #include "test.h" using namespace NEO; 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 74de57f132..418ddb4f64 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 @@ -5,8 +5,8 @@ * */ -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "os_interface/os_context.h" +#include "unit_tests/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/coherency_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl index 2284712147..5ffe604805 100644 --- a/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/coherency_tests_gen12lp.inl @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "helpers/hw_helper.h" +#include "helpers/ptr_math.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/helpers/hw_parse.h" #include "opencl/test/unit_test/mocks/mock_device.h" diff --git a/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl index 27a14dd445..837d697a18 100644 --- a/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/command_stream_receiver_hw_tests_gen12lp.inl @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/linear_stream.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/linear_stream.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_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 490693da6a..5266ed8ace 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 52b87f8314..327bca5a22 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 "core/unit_tests/gen12lp/test_preemption_gen12lp.inl" +#include "unit_tests/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/hw_helper_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl index a03ef3e917..e2a0a02504 100644 --- a/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl @@ -5,7 +5,7 @@ * */ -#include "core/command_container/command_encoder.h" +#include "command_container/command_encoder.h" #include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h" #include "opencl/test/unit_test/helpers/hw_helper_tests.h" #include "opencl/test/unit_test/helpers/raii_hw_helper.h" diff --git a/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl index 1053465dc2..cbc9d5704c 100644 --- a/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/image_tests_gen12lp.inl @@ -5,9 +5,9 @@ * */ -#include "core/gmm_helper/gmm_helper.h" -#include "core/image/image_surface_state.h" -#include "core/memory_manager/memory_manager.h" +#include "gmm_helper/gmm_helper.h" +#include "image/image_surface_state.h" +#include "memory_manager/memory_manager.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h" diff --git a/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl index e5e70ca6e7..d959b82fc1 100644 --- a/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/sampler_tests_gen12lp.inl @@ -5,9 +5,9 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "debug_settings/debug_settings_manager.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/scheduler_source_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/scheduler_source_tests_gen12lp.inl index 445b4bb6ce..adb1e7c085 100644 --- a/opencl/test/unit_test/gen12lp/scheduler_source_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/scheduler_source_tests_gen12lp.inl @@ -5,7 +5,7 @@ * */ -#include "core/gen12lp/hw_cmds.h" +#include "gen12lp/hw_cmds.h" #include "opencl/source/device_queue/device_queue_hw.h" // Keep the order of device_enqueue.h and scheduler_definitions.h as the latter uses defines from the first one diff --git a/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp b/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp index 38b8401cae..b5dd76cf90 100644 --- a/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h" -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" namespace NEO { diff --git a/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl index 4198a0902e..019ef6e4f6 100644 --- a/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/gen12lp/test_device_queue_hw_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_device_queue_hw_gen12lp.inl index 9b45e5df4c..9482f77797 100644 --- a/opencl/test/unit_test/gen12lp/test_device_queue_hw_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/test_device_queue_hw_gen12lp.inl @@ -5,7 +5,7 @@ * */ -#include "core/utilities/tag_allocator.h" +#include "utilities/tag_allocator.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/context/context.h" #include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" diff --git a/opencl/test/unit_test/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp index 8d60be85b0..1844e2bc88 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_neo.h" +#include "os_interface/linux/drm_neo.h" #include "test.h" #include 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 81724791f5..0dd06d4eb7 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 @@ -5,8 +5,8 @@ * */ -#include "core/os_interface/device_factory.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "os_interface/device_factory.h" +#include "unit_tests/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/tgllp/windows/hw_info_config_tests_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp index 29a01eb2c2..44814c3243 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/os_interface.h" +#include "os_interface/windows/os_interface.h" #include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen12lp/unit_test_helper_gen12lp.cpp b/opencl/test/unit_test/gen12lp/unit_test_helper_gen12lp.cpp index feda09426d..a6f065b7bf 100644 --- a/opencl/test/unit_test/gen12lp/unit_test_helper_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/unit_test_helper_gen12lp.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen12lp/hw_info.h" +#include "gen12lp/hw_info.h" #include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h" #include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "opencl/test/unit_test/helpers/unit_test_helper.inl" 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 db1f53b314..d2811806f4 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 @@ -5,12 +5,12 @@ * */ -#include "core/command_stream/linear_stream.h" -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/windows/gmm_callbacks.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "command_stream/linear_stream.h" +#include "execution_environment/execution_environment.h" +#include "helpers/hw_helper.h" +#include "helpers/windows/gmm_callbacks.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 63a94b55a6..48be44efc5 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 @@ -5,8 +5,8 @@ * */ -#include "core/os_interface/windows/os_interface.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "os_interface/windows/os_interface.h" +#include "unit_tests/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/gen12lp/windows/wddm_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp index 7b64d87563..c7a0dc61f4 100644 --- a/opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/windows/wddm_tests_gen12lp.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/os_interface/windows/gdi_interface.h" +#include "command_stream/preemption.h" +#include "execution_environment/root_device_environment.h" +#include "os_interface/windows/gdi_interface.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_wddm.h" #include "opencl/test/unit_test/os_interface/windows/gdi_dll_fixture.h" diff --git a/opencl/test/unit_test/gen8/bdw/linux/dll/device_id_tests_bdw.cpp b/opencl/test/unit_test/gen8/bdw/linux/dll/device_id_tests_bdw.cpp index 92c874b901..5f26587f11 100644 --- a/opencl/test/unit_test/gen8/bdw/linux/dll/device_id_tests_bdw.cpp +++ b/opencl/test/unit_test/gen8/bdw/linux/dll/device_id_tests_bdw.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_neo.h" +#include "os_interface/linux/drm_neo.h" #include "test.h" #include diff --git a/opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp b/opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp index a0ee4deac1..cb1c184515 100644 --- a/opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp +++ b/opencl/test/unit_test/gen8/bdw/test_device_caps_bdw.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/gen8/bdw/windows/hw_info_config_tests_bdw.cpp b/opencl/test/unit_test/gen8/bdw/windows/hw_info_config_tests_bdw.cpp index c84193727c..d9c9d57fdd 100644 --- a/opencl/test/unit_test/gen8/bdw/windows/hw_info_config_tests_bdw.cpp +++ b/opencl/test/unit_test/gen8/bdw/windows/hw_info_config_tests_bdw.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/os_interface.h" +#include "os_interface/windows/os_interface.h" #include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen8/bdw/windows/test_device_caps_bdw_windows.cpp b/opencl/test/unit_test/gen8/bdw/windows/test_device_caps_bdw_windows.cpp index f2be168205..7449856b21 100644 --- a/opencl/test/unit_test/gen8/bdw/windows/test_device_caps_bdw_windows.cpp +++ b/opencl/test/unit_test/gen8/bdw/windows/test_device_caps_bdw_windows.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/gen8/coherency_tests_gen8.cpp b/opencl/test/unit_test/gen8/coherency_tests_gen8.cpp index edfdf75b66..726589f19f 100644 --- a/opencl/test/unit_test/gen8/coherency_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/coherency_tests_gen8.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/execution_environment/execution_environment.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "execution_environment/execution_environment.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" #include "test.h" diff --git a/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp b/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp index e7ead83661..601cb9a41e 100644 --- a/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/command_stream_receiver_hw_tests_gen8.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/linear_stream.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/linear_stream.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" diff --git a/opencl/test/unit_test/gen8/hw_helper_tests_gen8.cpp b/opencl/test/unit_test/gen8/hw_helper_tests_gen8.cpp index 66af040124..a973e50622 100644 --- a/opencl/test/unit_test/gen8/hw_helper_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/hw_helper_tests_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/memory_constants.h" +#include "memory_manager/memory_constants.h" #include "opencl/test/unit_test/helpers/get_gpgpu_engines_tests.inl" #include "opencl/test/unit_test/helpers/hw_helper_tests.h" diff --git a/opencl/test/unit_test/gen8/scheduler_source_tests_gen8.cpp b/opencl/test/unit_test/gen8/scheduler_source_tests_gen8.cpp index f8ab17b4bd..4dded70e42 100644 --- a/opencl/test/unit_test/gen8/scheduler_source_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/scheduler_source_tests_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen8/hw_cmds.h" +#include "gen8/hw_cmds.h" #include "opencl/source/device_queue/device_queue_hw.h" // Keep the order of device_enqueue.h and scheduler_definitions.h as the latter uses defines from the first one diff --git a/opencl/test/unit_test/gen8/test_device_caps_gen8.cpp b/opencl/test/unit_test/gen8/test_device_caps_gen8.cpp index b7179d5c7f..3cc712ced4 100644 --- a/opencl/test/unit_test/gen8/test_device_caps_gen8.cpp +++ b/opencl/test/unit_test/gen8/test_device_caps_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/gen8/unit_test_helper_gen8.cpp b/opencl/test/unit_test/gen8/unit_test_helper_gen8.cpp index 9139f8f90f..b62065e23c 100644 --- a/opencl/test/unit_test/gen8/unit_test_helper_gen8.cpp +++ b/opencl/test/unit_test/gen8/unit_test_helper_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen8/hw_info.h" +#include "gen8/hw_info.h" #include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "opencl/test/unit_test/helpers/unit_test_helper.inl" diff --git a/opencl/test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp b/opencl/test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp index 57d9e2fcd7..2400fe062f 100644 --- a/opencl/test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp +++ b/opencl/test/unit_test/gen8/windows/gmm_callbacks_tests_gen8.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/windows/gmm_callbacks.h" +#include "helpers/windows/gmm_callbacks.h" #include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/bxt/linux/dll/device_id_tests.cpp b/opencl/test/unit_test/gen9/bxt/linux/dll/device_id_tests.cpp index 67528288a4..609676a70a 100644 --- a/opencl/test/unit_test/gen9/bxt/linux/dll/device_id_tests.cpp +++ b/opencl/test/unit_test/gen9/bxt/linux/dll/device_id_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_neo.h" +#include "os_interface/linux/drm_neo.h" #include "test.h" #include diff --git a/opencl/test/unit_test/gen9/bxt/windows/hw_info_config_tests_bxt.cpp b/opencl/test/unit_test/gen9/bxt/windows/hw_info_config_tests_bxt.cpp index 298baacdd8..b4f2994b94 100644 --- a/opencl/test/unit_test/gen9/bxt/windows/hw_info_config_tests_bxt.cpp +++ b/opencl/test/unit_test/gen9/bxt/windows/hw_info_config_tests_bxt.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/os_interface.h" +#include "os_interface/windows/os_interface.h" #include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/cfl/linux/dll/device_id_tests_cfl.cpp b/opencl/test/unit_test/gen9/cfl/linux/dll/device_id_tests_cfl.cpp index 285286d1d4..38f5efcb27 100644 --- a/opencl/test/unit_test/gen9/cfl/linux/dll/device_id_tests_cfl.cpp +++ b/opencl/test/unit_test/gen9/cfl/linux/dll/device_id_tests_cfl.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_neo.h" +#include "os_interface/linux/drm_neo.h" #include "test.h" #include diff --git a/opencl/test/unit_test/gen9/cfl/windows/hw_info_config_tests_cfl.cpp b/opencl/test/unit_test/gen9/cfl/windows/hw_info_config_tests_cfl.cpp index 35415fa0e3..9dd54bdfbb 100644 --- a/opencl/test/unit_test/gen9/cfl/windows/hw_info_config_tests_cfl.cpp +++ b/opencl/test/unit_test/gen9/cfl/windows/hw_info_config_tests_cfl.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/os_interface.h" +#include "os_interface/windows/os_interface.h" #include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp b/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp index 4d022f775d..88f195eb68 100644 --- a/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/coherency_tests_gen9.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/execution_environment/execution_environment.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "execution_environment/execution_environment.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/helpers/dispatch_flags_helper.h" #include "test.h" diff --git a/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp b/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp index d08cbe5577..39b4f5356a 100644 --- a/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/command_stream_receiver_hw_tests_gen9.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/linear_stream.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/linear_stream.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/event/user_event.h" diff --git a/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp b/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp index 27368b49a8..6ad3cc28dd 100644 --- a/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp +++ b/opencl/test/unit_test/gen9/enqueue_media_kernel_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/preamble.h" +#include "helpers/preamble.h" #include "opencl/test/unit_test/fixtures/media_kernel_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/gen9/glk/linux/dll/device_id_tests_glk.cpp b/opencl/test/unit_test/gen9/glk/linux/dll/device_id_tests_glk.cpp index 58bc6e38c0..87c5863688 100644 --- a/opencl/test/unit_test/gen9/glk/linux/dll/device_id_tests_glk.cpp +++ b/opencl/test/unit_test/gen9/glk/linux/dll/device_id_tests_glk.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_neo.h" +#include "os_interface/linux/drm_neo.h" #include "test.h" #include diff --git a/opencl/test/unit_test/gen9/glk/windows/hw_info_config_tests_glk.cpp b/opencl/test/unit_test/gen9/glk/windows/hw_info_config_tests_glk.cpp index 4676fff910..f7553e5969 100644 --- a/opencl/test/unit_test/gen9/glk/windows/hw_info_config_tests_glk.cpp +++ b/opencl/test/unit_test/gen9/glk/windows/hw_info_config_tests_glk.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/os_interface.h" +#include "os_interface/windows/os_interface.h" #include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/kbl/linux/dll/device_id_tests_kbl.cpp b/opencl/test/unit_test/gen9/kbl/linux/dll/device_id_tests_kbl.cpp index 065deacddf..656cf9b818 100644 --- a/opencl/test/unit_test/gen9/kbl/linux/dll/device_id_tests_kbl.cpp +++ b/opencl/test/unit_test/gen9/kbl/linux/dll/device_id_tests_kbl.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_neo.h" +#include "os_interface/linux/drm_neo.h" #include "test.h" #include diff --git a/opencl/test/unit_test/gen9/kbl/windows/hw_info_config_tests_kbl.cpp b/opencl/test/unit_test/gen9/kbl/windows/hw_info_config_tests_kbl.cpp index 2cde12b8bd..bd95749cda 100644 --- a/opencl/test/unit_test/gen9/kbl/windows/hw_info_config_tests_kbl.cpp +++ b/opencl/test/unit_test/gen9/kbl/windows/hw_info_config_tests_kbl.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/os_interface.h" +#include "os_interface/windows/os_interface.h" #include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/scheduler_source_tests_gen9.cpp b/opencl/test/unit_test/gen9/scheduler_source_tests_gen9.cpp index 608de63061..28cc8e59e4 100644 --- a/opencl/test/unit_test/gen9/scheduler_source_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/scheduler_source_tests_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen9/hw_cmds.h" +#include "gen9/hw_cmds.h" #include "opencl/source/device_queue/device_queue_hw.h" // Keep the order of device_enqueue.h and scheduler_definitions.h as the latter uses defines from the first one diff --git a/opencl/test/unit_test/gen9/skl/linux/dll/device_id_tests_skl.cpp b/opencl/test/unit_test/gen9/skl/linux/dll/device_id_tests_skl.cpp index d6dc165def..06e557719f 100644 --- a/opencl/test/unit_test/gen9/skl/linux/dll/device_id_tests_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/linux/dll/device_id_tests_skl.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_neo.h" +#include "os_interface/linux/drm_neo.h" #include "test.h" #include diff --git a/opencl/test/unit_test/gen9/skl/windows/hw_info_config_tests_skl.cpp b/opencl/test/unit_test/gen9/skl/windows/hw_info_config_tests_skl.cpp index f381b34e45..2961e1caea 100644 --- a/opencl/test/unit_test/gen9/skl/windows/hw_info_config_tests_skl.cpp +++ b/opencl/test/unit_test/gen9/skl/windows/hw_info_config_tests_skl.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/os_interface.h" +#include "os_interface/windows/os_interface.h" #include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp index 4168a1ef01..65d0ebd2d6 100644 --- a/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_device_caps_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp b/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp index 6988274a59..6329622a6c 100644 --- a/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp +++ b/opencl/test/unit_test/gen9/test_platform_caps_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/device/device.h" +#include "device/device.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/gen9/unit_test_helper_gen9.cpp b/opencl/test/unit_test/gen9/unit_test_helper_gen9.cpp index f999f6e460..fb7d9347f6 100644 --- a/opencl/test/unit_test/gen9/unit_test_helper_gen9.cpp +++ b/opencl/test/unit_test/gen9/unit_test_helper_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gen9/hw_info.h" +#include "gen9/hw_info.h" #include "opencl/test/unit_test/helpers/unit_test_helper.h" #include "opencl/test/unit_test/helpers/unit_test_helper.inl" diff --git a/opencl/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp b/opencl/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp index 1e0650cd2f..3adf6b43ce 100644 --- a/opencl/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp +++ b/opencl/test/unit_test/gen9/windows/gmm_callbacks_tests_gen9.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/windows/gmm_callbacks.h" +#include "helpers/windows/gmm_callbacks.h" #include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_declare.cpp b/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_declare.cpp index 123fba615c..12c723ad59 100644 --- a/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_declare.cpp +++ b/opencl/test/unit_test/gen_common/exclude_tests/exclude_test_declare.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" #include "test.h" #include diff --git a/opencl/test/unit_test/gen_common/gen_cmd_parse.h b/opencl/test/unit_test/gen_common/gen_cmd_parse.h index 4e077f7582..a3ec80e13e 100644 --- a/opencl/test/unit_test/gen_common/gen_cmd_parse.h +++ b/opencl/test/unit_test/gen_common/gen_cmd_parse.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/hw_cmds.h" +#include "helpers/hw_cmds.h" #include #include diff --git a/opencl/test/unit_test/gen_common/gen_commands_common_validation.h b/opencl/test/unit_test/gen_common/gen_commands_common_validation.h index 9ad9ffb8dc..3c11549e31 100644 --- a/opencl/test/unit_test/gen_common/gen_commands_common_validation.h +++ b/opencl/test/unit_test/gen_common/gen_commands_common_validation.h @@ -7,8 +7,8 @@ #pragma once -#include "core/indirect_heap/indirect_heap.h" -#include "core/memory_manager/memory_constants.h" +#include "indirect_heap/indirect_heap.h" +#include "memory_manager/memory_constants.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "opencl/test/unit_test/helpers/unit_test_helper.h" diff --git a/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp b/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp index 3a059bf458..fc02b5f58a 100644 --- a/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp +++ b/opencl/test/unit_test/gen_common/hw_cmds_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_cmds.h" +#include "helpers/hw_cmds.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/test/unit_test/mocks/mock_device.h" #include "test.h" diff --git a/opencl/test/unit_test/global_environment.cpp b/opencl/test/unit_test/global_environment.cpp index 849a97042b..e3bb02c37b 100644 --- a/opencl/test/unit_test/global_environment.cpp +++ b/opencl/test/unit_test/global_environment.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/global_environment.h" -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" #include "opencl/source/os_interface/os_inc_base.h" TestEnvironment::TestEnvironment(void) diff --git a/opencl/test/unit_test/global_environment.h b/opencl/test/unit_test/global_environment.h index f377685e71..c77d10bfcd 100644 --- a/opencl/test/unit_test/global_environment.h +++ b/opencl/test/unit_test/global_environment.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/hw_info.h" -#include "core/os_interface/os_library.h" +#include "helpers/hw_info.h" +#include "os_interface/os_library.h" #include "opencl/test/unit_test/mocks/mock_compilers.h" #include "gtest/gtest.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 786427708d..d93aae46ae 100644 --- a/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp +++ b/opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp @@ -5,13 +5,13 @@ * */ -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/gmm_types_converter.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/ptr_math.h" -#include "core/sku_info/operations/sku_info_transfer.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/gmm_types_converter.h" +#include "helpers/hw_info.h" +#include "helpers/ptr_math.h" +#include "sku_info/operations/sku_info_transfer.h" +#include "unit_tests/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 8cdad8506b..bec4203ce6 100644 --- a/opencl/test/unit_test/gtpin/gtpin_tests.cpp +++ b/opencl/test/unit_test/gtpin/gtpin_tests.cpp @@ -5,14 +5,14 @@ * */ -#include "core/device/device.h" -#include "core/device_binary_format/patchtokens_decoder.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/file_io.h" -#include "core/helpers/hash.h" -#include "core/memory_manager/surface.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/device_binary_format/patchtokens_tests.h" +#include "device/device.h" +#include "device_binary_format/patchtokens_decoder.h" +#include "helpers/basic_math.h" +#include "helpers/file_io.h" +#include "helpers/hash.h" +#include "memory_manager/surface.h" +#include "os_interface/os_context.h" +#include "unit_tests/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/array_count_tests.cpp b/opencl/test/unit_test/helpers/array_count_tests.cpp index 528ce938f7..aa5f5635b2 100644 --- a/opencl/test/unit_test/helpers/array_count_tests.cpp +++ b/opencl/test/unit_test/helpers/array_count_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/array_count.h" +#include "helpers/array_count.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/basic_math_tests.cpp b/opencl/test/unit_test/helpers/basic_math_tests.cpp index 9285ddee68..3b6c8a833d 100644 --- a/opencl/test/unit_test/helpers/basic_math_tests.cpp +++ b/opencl/test/unit_test/helpers/basic_math_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/basic_math.h" +#include "helpers/basic_math.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/bit_helpers_tests.cpp b/opencl/test/unit_test/helpers/bit_helpers_tests.cpp index e8528c1e4d..72d0c1e1a5 100644 --- a/opencl/test/unit_test/helpers/bit_helpers_tests.cpp +++ b/opencl/test/unit_test/helpers/bit_helpers_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/bit_helpers.h" +#include "helpers/bit_helpers.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/built_ins_helper.cpp b/opencl/test/unit_test/helpers/built_ins_helper.cpp index 46a13a1689..762dedf800 100644 --- a/opencl/test/unit_test/helpers/built_ins_helper.cpp +++ b/opencl/test/unit_test/helpers/built_ins_helper.cpp @@ -7,7 +7,7 @@ #include "opencl/source/helpers/built_ins_helper.h" -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/compiler_interface/default_cl_cache_config.h" #include "opencl/test/unit_test/mocks/mock_builtins.h" #include "opencl/test/unit_test/mocks/mock_compilers.h" diff --git a/opencl/test/unit_test/helpers/cmd_buffer_validator.h b/opencl/test/unit_test/helpers/cmd_buffer_validator.h index 7cd8df038d..4078b1f88e 100644 --- a/opencl/test/unit_test/helpers/cmd_buffer_validator.h +++ b/opencl/test/unit_test/helpers/cmd_buffer_validator.h @@ -7,7 +7,7 @@ #pragma once -#include "core/utilities/stackvec.h" +#include "utilities/stackvec.h" #include "opencl/test/unit_test/helpers/hw_parse.h" #include diff --git a/opencl/test/unit_test/helpers/debug_helpers.cpp b/opencl/test/unit_test/helpers/debug_helpers.cpp index f7545bd5c9..e31a54a1d0 100644 --- a/opencl/test/unit_test/helpers/debug_helpers.cpp +++ b/opencl/test/unit_test/helpers/debug_helpers.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/debug_helpers.h" +#include "helpers/debug_helpers.h" #include #include diff --git a/opencl/test/unit_test/helpers/debug_helpers_tests.cpp b/opencl/test/unit_test/helpers/debug_helpers_tests.cpp index d0b23933da..f0dabf61f5 100644 --- a/opencl/test/unit_test/helpers/debug_helpers_tests.cpp +++ b/opencl/test/unit_test/helpers/debug_helpers_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/debug_helpers.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/debug_helpers.h" #include "gtest/gtest.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 2b99b43764..8a94ee56e6 100644 --- a/opencl/test/unit_test/helpers/deferred_deleter_helpers_tests.cpp +++ b/opencl/test/unit_test/helpers/deferred_deleter_helpers_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/deferred_deleter_helper.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "helpers/deferred_deleter_helper.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/dirty_state_helpers_tests.cpp b/opencl/test/unit_test/helpers/dirty_state_helpers_tests.cpp index 9095731078..7a846e5e3b 100644 --- a/opencl/test/unit_test/helpers/dirty_state_helpers_tests.cpp +++ b/opencl/test/unit_test/helpers/dirty_state_helpers_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/helpers/dirty_state_helpers.h" -#include "core/helpers/ptr_math.h" -#include "core/indirect_heap/indirect_heap.h" -#include "core/memory_manager/graphics_allocation.h" +#include "helpers/dirty_state_helpers.h" +#include "helpers/ptr_math.h" +#include "indirect_heap/indirect_heap.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/dispatch_flags_helper.h b/opencl/test/unit_test/helpers/dispatch_flags_helper.h index 406fa2c50d..f5cbe3ef81 100644 --- a/opencl/test/unit_test/helpers/dispatch_flags_helper.h +++ b/opencl/test/unit_test/helpers/dispatch_flags_helper.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/csr_definitions.h" +#include "command_stream/csr_definitions.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/execution_environment_helper.cpp b/opencl/test/unit_test/helpers/execution_environment_helper.cpp index a3c5271ed7..5d623ecc3e 100644 --- a/opencl/test/unit_test/helpers/execution_environment_helper.cpp +++ b/opencl/test/unit_test/helpers/execution_environment_helper.cpp @@ -7,8 +7,8 @@ #include "opencl/test/unit_test/helpers/execution_environment_helper.h" -#include "core/os_interface/device_factory.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "os_interface/device_factory.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/source/platform/platform.h" namespace NEO { diff --git a/opencl/test/unit_test/helpers/execution_environment_helper.h b/opencl/test/unit_test/helpers/execution_environment_helper.h index f5fe18fda0..fa23348b9b 100644 --- a/opencl/test/unit_test/helpers/execution_environment_helper.h +++ b/opencl/test/unit_test/helpers/execution_environment_helper.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/execution_environment/execution_environment.h" +#include "execution_environment/execution_environment.h" #include "CL/cl.h" diff --git a/opencl/test/unit_test/helpers/extendable_enum_tests.cpp b/opencl/test/unit_test/helpers/extendable_enum_tests.cpp index 80d58be529..d6b9d43d5b 100644 --- a/opencl/test/unit_test/helpers/extendable_enum_tests.cpp +++ b/opencl/test/unit_test/helpers/extendable_enum_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/extendable_enum.h" +#include "helpers/extendable_enum.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/flush_stamp_tests.cpp b/opencl/test/unit_test/helpers/flush_stamp_tests.cpp index c399c099df..adc1167714 100644 --- a/opencl/test/unit_test/helpers/flush_stamp_tests.cpp +++ b/opencl/test/unit_test/helpers/flush_stamp_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/flush_stamp.h" +#include "helpers/flush_stamp.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/get_gpgpu_engines_tests.inl b/opencl/test/unit_test/helpers/get_gpgpu_engines_tests.inl index 48520e988b..89bde7de5b 100644 --- a/opencl/test/unit_test/helpers/get_gpgpu_engines_tests.inl +++ b/opencl/test/unit_test/helpers/get_gpgpu_engines_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" #include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/helpers/get_info_tests.cpp b/opencl/test/unit_test/helpers/get_info_tests.cpp index cb07d0ec12..88307d12ae 100644 --- a/opencl/test/unit_test/helpers/get_info_tests.cpp +++ b/opencl/test/unit_test/helpers/get_info_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/get_info.h" +#include "helpers/get_info.h" #include "gtest/gtest.h" 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 4cff55358b..ebaf4d083f 100644 --- a/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/hardware_commands_helper_tests.cpp @@ -7,11 +7,11 @@ #include "opencl/test/unit_test/helpers/hardware_commands_helper_tests.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/engine_node_helper.h" -#include "core/memory_manager/unified_memory_manager.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "helpers/basic_math.h" +#include "helpers/engine_node_helper.h" +#include "memory_manager/unified_memory_manager.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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_default_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_default_tests.cpp index 018b318a2a..6d3bb5abe8 100644 --- a/opencl/test/unit_test/helpers/hw_helper_default_tests.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_default_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" #include "opencl/test/unit_test/helpers/hw_helper_tests.h" void testDefaultImplementationOfSetupHardwareCapabilities(HwHelper &hwHelper, const HardwareInfo &hwInfo) { diff --git a/opencl/test/unit_test/helpers/hw_helper_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_tests.cpp index cf6b79ffb5..05b4f2965e 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests.cpp @@ -7,15 +7,15 @@ #include "opencl/test/unit_test/helpers/hw_helper_tests.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/string.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/os_interface/hw_info_config.h" -#include "core/os_interface/os_interface.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/resource_info.h" +#include "helpers/aligned_memory.h" +#include "helpers/string.h" +#include "memory_manager/graphics_allocation.h" +#include "os_interface/hw_info_config.h" +#include "os_interface/os_interface.h" +#include "unit_tests/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/hw_helper_tests.h b/opencl/test/unit_test/helpers/hw_helper_tests.h index 1b23aee8dd..ab16288fed 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests.h +++ b/opencl/test/unit_test/helpers/hw_helper_tests.h @@ -7,8 +7,8 @@ #pragma once -#include "core/device/device.h" -#include "core/helpers/hw_helper.h" +#include "device/device.h" +#include "helpers/hw_helper.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/helpers/hw_parse.h b/opencl/test/unit_test/helpers/hw_parse.h index 76eb86dc10..bcf772e5c9 100644 --- a/opencl/test/unit_test/helpers/hw_parse.h +++ b/opencl/test/unit_test/helpers/hw_parse.h @@ -6,10 +6,10 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/linear_stream.h" -#include "core/helpers/pipeline_select_helper.h" -#include "core/helpers/ptr_math.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/linear_stream.h" +#include "helpers/pipeline_select_helper.h" +#include "helpers/ptr_math.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" diff --git a/opencl/test/unit_test/helpers/kmd_notify_tests.cpp b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp index 3f047fcea4..ef6c0f8803 100644 --- a/opencl/test/unit_test/helpers/kmd_notify_tests.cpp +++ b/opencl/test/unit_test/helpers/kmd_notify_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "os_interface/os_context.h" +#include "unit_tests/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 70d2c0a870..eeb82e0464 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 @@ -5,8 +5,8 @@ * */ -#include "core/helpers/kmd_notify_properties.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "helpers/kmd_notify_properties.h" +#include "unit_tests/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 329c0c779c..4690b207fe 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 "core/unit_tests/helpers/memory_management.h" +#include "unit_tests/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/per_thread_data_tests.cpp b/opencl/test/unit_test/helpers/per_thread_data_tests.cpp index 4611f075ac..e32f2c97cf 100644 --- a/opencl/test/unit_test/helpers/per_thread_data_tests.cpp +++ b/opencl/test/unit_test/helpers/per_thread_data_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/linear_stream.h" -#include "core/helpers/aligned_memory.h" +#include "command_stream/linear_stream.h" +#include "helpers/aligned_memory.h" #include "opencl/source/command_queue/local_id_gen.h" #include "opencl/source/helpers/per_thread_data.h" #include "opencl/source/program/kernel_info.h" diff --git a/opencl/test/unit_test/helpers/ptr_math_tests.cpp b/opencl/test/unit_test/helpers/ptr_math_tests.cpp index 1cf9833737..a76cc64a36 100644 --- a/opencl/test/unit_test/helpers/ptr_math_tests.cpp +++ b/opencl/test/unit_test/helpers/ptr_math_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/raii_hw_helper.h b/opencl/test/unit_test/helpers/raii_hw_helper.h index ac69ff13cf..c0e022975f 100644 --- a/opencl/test/unit_test/helpers/raii_hw_helper.h +++ b/opencl/test/unit_test/helpers/raii_hw_helper.h @@ -7,7 +7,7 @@ #pragma once -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" namespace NEO { extern HwHelper *hwHelperFactory[IGFX_MAX_CORE]; diff --git a/opencl/test/unit_test/helpers/task_information_tests.cpp b/opencl/test/unit_test/helpers/task_information_tests.cpp index f3e0d514db..e6543b0f79 100644 --- a/opencl/test/unit_test/helpers/task_information_tests.cpp +++ b/opencl/test/unit_test/helpers/task_information_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/internal_allocation_storage.h" +#include "memory_manager/internal_allocation_storage.h" #include "opencl/source/event/user_event.h" #include "opencl/source/helpers/task_information.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" diff --git a/opencl/test/unit_test/helpers/test_files.cpp b/opencl/test/unit_test/helpers/test_files.cpp index d7ca24683e..94a193c6f3 100644 --- a/opencl/test/unit_test/helpers/test_files.cpp +++ b/opencl/test/unit_test/helpers/test_files.cpp @@ -7,7 +7,7 @@ #include "test_files.h" -#include "core/helpers/file_io.h" +#include "helpers/file_io.h" #include "config.h" diff --git a/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp b/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp index f345b1a50e..b63c15926d 100644 --- a/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp +++ b/opencl/test/unit_test/helpers/timestamp_packet_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/helpers/timestamp_packet.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/base_object_utils.h" -#include "core/utilities/tag_allocator.h" +#include "helpers/timestamp_packet.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/utilities/base_object_utils.h" +#include "utilities/tag_allocator.h" #include "opencl/source/command_queue/gpgpu_walker.h" #include "opencl/source/command_queue/hardware_interface.h" #include "opencl/source/event/user_event.h" diff --git a/opencl/test/unit_test/helpers/transfer_properties_tests.cpp b/opencl/test/unit_test/helpers/transfer_properties_tests.cpp index b89fd90339..45eafba6d0 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/uint16_sse4_tests.cpp b/opencl/test/unit_test/helpers/uint16_sse4_tests.cpp index 420a1ec0e3..00b84e3975 100644 --- a/opencl/test/unit_test/helpers/uint16_sse4_tests.cpp +++ b/opencl/test/unit_test/helpers/uint16_sse4_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include "opencl/source/helpers/uint16_sse4.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/helpers/unit_test_helper.h b/opencl/test/unit_test/helpers/unit_test_helper.h index f7c94e4d5a..07f5d90512 100644 --- a/opencl/test/unit_test/helpers/unit_test_helper.h +++ b/opencl/test/unit_test/helpers/unit_test_helper.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/aux_translation.h" -#include "core/helpers/hw_cmds.h" +#include "helpers/aux_translation.h" +#include "helpers/hw_cmds.h" #include "opencl/source/helpers/properties_helper.h" namespace NEO { diff --git a/opencl/test/unit_test/helpers/validator_tests.cpp b/opencl/test/unit_test/helpers/validator_tests.cpp index 0b3d9dabb8..6b4e54b78c 100644 --- a/opencl/test/unit_test/helpers/validator_tests.cpp +++ b/opencl/test/unit_test/helpers/validator_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/api/cl_types.h" #include "opencl/source/helpers/base_object.h" #include "opencl/source/helpers/error_mappers.h" diff --git a/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp b/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp index d8f4a7fd5b..a695501677 100644 --- a/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/windows/gl_helper_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/os_interface/os_library.h" -#include "core/os_interface/windows/windows_wrapper.h" +#include "os_interface/os_library.h" +#include "os_interface/windows/windows_wrapper.h" #include "opencl/source/helpers/windows/gl_helper.h" #include "opencl/test/unit_test/helpers/windows/mock_function.h" #include "test.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 b5537c04a6..277d1b8706 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 @@ -5,9 +5,9 @@ * */ -#include "core/helpers/kmd_notify_properties.h" -#include "core/os_interface/windows/sys_calls.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "helpers/kmd_notify_properties.h" +#include "os_interface/windows/sys_calls.h" +#include "unit_tests/helpers/default_hw_info.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "test.h" diff --git a/opencl/test/unit_test/igdrcl_tests_pch.h b/opencl/test/unit_test/igdrcl_tests_pch.h index 60e34758f9..e6fcf4aed3 100644 --- a/opencl/test/unit_test/igdrcl_tests_pch.h +++ b/opencl/test/unit_test/igdrcl_tests_pch.h @@ -5,16 +5,16 @@ * */ -#include "core/gmm_helper/gmm_lib.h" -#include "core/helpers/abort.h" -#include "core/helpers/completion_stamp.h" -#include "core/helpers/debug_helpers.h" -#include "core/helpers/hw_cmds.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/kmd_notify_properties.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/memory_constants.h" -#include "core/sku_info/sku_info_base.h" +#include "gmm_helper/gmm_lib.h" +#include "helpers/abort.h" +#include "helpers/completion_stamp.h" +#include "helpers/debug_helpers.h" +#include "helpers/hw_cmds.h" +#include "helpers/hw_info.h" +#include "helpers/kmd_notify_properties.h" +#include "helpers/ptr_math.h" +#include "memory_manager/memory_constants.h" +#include "sku_info/sku_info_base.h" #include "opencl/test/unit_test/gen_common/gen_cmd_parse.h" #include "test.h" diff --git a/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h b/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h index ed64a28198..76f077aeea 100644 --- a/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h +++ b/opencl/test/unit_test/indirect_heap/indirect_heap_fixture.h @@ -7,7 +7,7 @@ #pragma once -#include "core/indirect_heap/indirect_heap.h" +#include "indirect_heap/indirect_heap.h" namespace NEO { diff --git a/opencl/test/unit_test/kernel/clone_kernel_tests.cpp b/opencl/test/unit_test/kernel/clone_kernel_tests.cpp index a832632663..8de14142a7 100644 --- a/opencl/test/unit_test/kernel/clone_kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/clone_kernel_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/unified_memory_manager.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/accelerators/intel_accelerator.h" #include "opencl/source/accelerators/intel_motion_estimation.h" #include "opencl/source/helpers/sampler_helpers.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 94783960cd..d0e45d46f3 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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_image_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp index 7ec957db8b..6c6962de62 100644 --- a/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_image_arg_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/fixtures/kernel_arg_fixture.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 c5c2f7f361..9ec72f5e58 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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_slm_arg_tests.cpp b/opencl/test/unit_test/kernel/kernel_slm_arg_tests.cpp index 879ae8dc18..2ab6bba452 100644 --- a/opencl/test/unit_test/kernel/kernel_slm_arg_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_slm_arg_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/basic_math.h" -#include "core/helpers/ptr_math.h" +#include "helpers/basic_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/kernel/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/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp index 3e6c872c5c..7002181033 100644 --- a/opencl/test/unit_test/kernel/kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_tests.cpp @@ -5,17 +5,17 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/flush_stamp.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/allocations_list.h" -#include "core/memory_manager/unified_memory_manager.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "debug_settings/debug_settings_manager.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/flush_stamp.h" +#include "helpers/hw_helper.h" +#include "memory_manager/allocations_list.h" +#include "memory_manager/unified_memory_manager.h" +#include "os_interface/os_context.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" +#include "unit_tests/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/kernel/substitute_kernel_heap_tests.cpp b/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp index 96280c0986..169905cf47 100644 --- a/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp +++ b/opencl/test/unit_test/kernel/substitute_kernel_heap_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/os_interface/os_context.h" +#include "memory_manager/internal_allocation_storage.h" +#include "os_interface/os_context.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" #include "test.h" diff --git a/opencl/test/unit_test/libult/create_command_stream.cpp b/opencl/test/unit_test/libult/create_command_stream.cpp index 1a94042c85..f7243d2b0e 100644 --- a/opencl/test/unit_test/libult/create_command_stream.cpp +++ b/opencl/test/unit_test/libult/create_command_stream.cpp @@ -7,10 +7,10 @@ #include "opencl/test/unit_test/libult/create_command_stream.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/unit_tests/helpers/default_hw_info.h" -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "command_stream/command_stream_receiver.h" +#include "execution_environment/root_device_environment.h" +#include "unit_tests/helpers/default_hw_info.h" +#include "unit_tests/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/debug_manager.cpp b/opencl/test/unit_test/libult/debug_manager.cpp index ce12095ef6..bfaf81835d 100644 --- a/opencl/test/unit_test/libult/debug_manager.cpp +++ b/opencl/test/unit_test/libult/debug_manager.cpp @@ -5,7 +5,7 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include "opencl/source/os_interface/ocl_reg_path.h" using namespace std; diff --git a/opencl/test/unit_test/libult/os_interface.cpp b/opencl/test/unit_test/libult/os_interface.cpp index a370298635..56ca22e65d 100644 --- a/opencl/test/unit_test/libult/os_interface.cpp +++ b/opencl/test/unit_test/libult/os_interface.cpp @@ -5,9 +5,9 @@ * */ -#include "core/os_interface/os_interface.h" +#include "os_interface/os_interface.h" -#include "core/memory_manager/memory_constants.h" +#include "memory_manager/memory_constants.h" namespace NEO { diff --git a/opencl/test/unit_test/libult/source_level_debugger_library.cpp b/opencl/test/unit_test/libult/source_level_debugger_library.cpp index a2643fa7e2..75eb707fc1 100644 --- a/opencl/test/unit_test/libult/source_level_debugger_library.cpp +++ b/opencl/test/unit_test/libult/source_level_debugger_library.cpp @@ -7,7 +7,7 @@ #include "source_level_debugger_library.h" -#include "core/helpers/string.h" +#include "helpers/string.h" using namespace NEO; diff --git a/opencl/test/unit_test/libult/source_level_debugger_library.h b/opencl/test/unit_test/libult/source_level_debugger_library.h index 44d628b006..e56b854708 100644 --- a/opencl/test/unit_test/libult/source_level_debugger_library.h +++ b/opencl/test/unit_test/libult/source_level_debugger_library.h @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "igfx_debug_interchange_types.h" diff --git a/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h b/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h index ccc51a6a57..3d2f1b37de 100644 --- a/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h +++ b/opencl/test/unit_test/libult/ult_aub_command_stream_receiver.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/execution_environment/execution_environment.h" +#include "execution_environment/execution_environment.h" #include "opencl/source/command_stream/aub_command_stream_receiver_hw.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_experimental_command_buffer.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 4430d6ae1d..9f5c5fef87 100644 --- a/opencl/test/unit_test/libult/ult_command_stream_receiver.h +++ b/opencl/test/unit_test/libult/ult_command_stream_receiver.h @@ -6,12 +6,12 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/device/device.h" -#include "core/direct_submission/direct_submission_hw.h" -#include "core/execution_environment/execution_environment.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "device/device.h" +#include "direct_submission/direct_submission_hw.h" +#include "execution_environment/execution_environment.h" +#include "os_interface/os_context.h" +#include "unit_tests/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 365b9274a9..a8bcf7e9a1 100644 --- a/opencl/test/unit_test/linux/drm_null_device_tests.cpp +++ b/opencl/test/unit_test/linux/drm_null_device_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/os_interface/linux/drm_null_device.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "execution_environment/execution_environment.h" +#include "os_interface/linux/drm_null_device.h" +#include "unit_tests/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/drm_wrap.h b/opencl/test/unit_test/linux/drm_wrap.h index 4f32eab01c..96be4fdd5d 100644 --- a/opencl/test/unit_test/linux/drm_wrap.h +++ b/opencl/test/unit_test/linux/drm_wrap.h @@ -7,8 +7,8 @@ #pragma once -#include "core/os_interface/linux/drm_neo.h" -#include "core/os_interface/os_interface.h" +#include "os_interface/linux/drm_neo.h" +#include "os_interface/os_interface.h" #include "drm/i915_drm.h" diff --git a/opencl/test/unit_test/linux/main_linux_dll.cpp b/opencl/test/unit_test/linux/main_linux_dll.cpp index 7cca768270..c52a42b0cc 100644 --- a/opencl/test/unit_test/linux/main_linux_dll.cpp +++ b/opencl/test/unit_test/linux/main_linux_dll.cpp @@ -5,15 +5,15 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/basic_math.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/linux/allocator_helper.h" -#include "core/os_interface/linux/os_interface.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/default_hw_info.inl" -#include "core/unit_tests/helpers/ult_hw_config.inl" +#include "execution_environment/execution_environment.h" +#include "helpers/aligned_memory.h" +#include "helpers/basic_math.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/linux/allocator_helper.h" +#include "os_interface/linux/os_interface.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/helpers/default_hw_info.inl" +#include "unit_tests/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/linux/mock_os_layer.h b/opencl/test/unit_test/linux/mock_os_layer.h index e54b00895b..1928518c94 100644 --- a/opencl/test/unit_test/linux/mock_os_layer.h +++ b/opencl/test/unit_test/linux/mock_os_layer.h @@ -7,7 +7,7 @@ #pragma once -#include "core/os_interface/linux/drm_neo.h" +#include "os_interface/linux/drm_neo.h" #include "drm/i915_drm.h" diff --git a/opencl/test/unit_test/main.cpp b/opencl/test/unit_test/main.cpp index 9187d315ad..b5543436a6 100644 --- a/opencl/test/unit_test/main.cpp +++ b/opencl/test/unit_test/main.cpp @@ -5,15 +5,15 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/gmm_interface.h" -#include "core/gmm_helper/resource_info.h" -#include "core/os_interface/hw_info_config.h" -#include "core/unit_tests/helpers/default_hw_info.inl" -#include "core/unit_tests/helpers/memory_leak_listener.h" -#include "core/unit_tests/helpers/ult_hw_config.inl" -#include "core/utilities/debug_settings_reader.h" +#include "debug_settings/debug_settings_manager.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/gmm_interface.h" +#include "gmm_helper/resource_info.h" +#include "os_interface/hw_info_config.h" +#include "unit_tests/helpers/default_hw_info.inl" +#include "unit_tests/helpers/memory_leak_listener.h" +#include "unit_tests/helpers/ult_hw_config.inl" +#include "utilities/debug_settings_reader.h" #include "opencl/source/os_interface/ocl_reg_path.h" #include "opencl/test/unit_test/custom_event_listener.h" #include "opencl/test/unit_test/global_environment.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 92ccf6335a..007534ded5 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 @@ -5,12 +5,12 @@ * */ -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/surface.h" -#include "core/memory_manager/unified_memory_manager.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/ptr_math.h" +#include "memory_manager/surface.h" +#include "memory_manager/unified_memory_manager.h" +#include "unit_tests/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 7dfa8f89dc..1397a5f114 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp @@ -5,18 +5,18 @@ * */ -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/array_count.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/allocations_list.h" -#include "core/memory_manager/memory_operations_handler.h" -#include "core/memory_manager/unified_memory_manager.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/ult_hw_config.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/resource_info.h" +#include "helpers/array_count.h" +#include "helpers/hw_helper.h" +#include "memory_manager/allocations_list.h" +#include "memory_manager/memory_operations_handler.h" +#include "memory_manager/unified_memory_manager.h" +#include "os_interface/os_context.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/helpers/ult_hw_config.h" +#include "unit_tests/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_subbuffer_tests.cpp b/opencl/test/unit_test/mem_obj/get_mem_object_info_subbuffer_tests.cpp index 8d4563ff28..58a3953533 100644 --- a/opencl/test/unit_test/mem_obj/get_mem_object_info_subbuffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/get_mem_object_info_subbuffer_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/mocks/mock_context.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 dd604a2349..1e11a08658 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 @@ -5,10 +5,10 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" +#include "unit_tests/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/image2d_from_buffer_tests.cpp b/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp index f533d87e9c..382825c8f3 100644 --- a/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image2d_from_buffer_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/aligned_memory.h" -#include "core/helpers/hw_helper.h" +#include "helpers/aligned_memory.h" +#include "helpers/hw_helper.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/mem_obj/image3d_tests.cpp b/opencl/test/unit_test/mem_obj/image3d_tests.cpp index 0b3d524434..40144606df 100644 --- a/opencl/test/unit_test/mem_obj/image3d_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image3d_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" diff --git a/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp b/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp index e88c77c57f..a9f1e527d2 100644 --- a/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_array_size_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/fixtures/device_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 762f45f542..5b27a6d9e2 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 "core/unit_tests/utilities/base_object_utils.h" +#include "unit_tests/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_from_subbuffer_tests.cpp b/opencl/test/unit_test/mem_obj/image_from_subbuffer_tests.cpp index 2cc7d22fd8..824ff22f9d 100644 --- a/opencl/test/unit_test/mem_obj/image_from_subbuffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_from_subbuffer_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp b/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp index 351d1ef96a..aae1f9bca4 100644 --- a/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_redescribe_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.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/image_set_arg_tests.cpp b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp index d769629c32..bf7f9e51bf 100644 --- a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp @@ -5,13 +5,13 @@ * */ -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/surface.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/aligned_memory.h" +#include "helpers/basic_math.h" +#include "helpers/ptr_math.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/surface.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/mem_obj/image.h" diff --git a/opencl/test/unit_test/mem_obj/image_tests.cpp b/opencl/test/unit_test/mem_obj/image_tests.cpp index 57f1146a39..8d42194be5 100644 --- a/opencl/test/unit_test/mem_obj/image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_tests.cpp @@ -5,11 +5,11 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/helpers/aligned_memory.h" -#include "core/image/image_surface_state.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "compiler_interface/compiler_interface.h" +#include "helpers/aligned_memory.h" +#include "image/image_surface_state.h" +#include "os_interface/os_context.h" +#include "unit_tests/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_tiled_tests.cpp b/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp index adeb95b0da..d14285c3c1 100644 --- a/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_tiled_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/command_queue/command_queue_fixture.h" #include "opencl/test/unit_test/fixtures/device_fixture.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 bf5a979d97..c774ad22c0 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/image_validate_tests.cpp b/opencl/test/unit_test/mem_obj/image_validate_tests.cpp index 60b449acd1..e62e8799ad 100644 --- a/opencl/test/unit_test/mem_obj/image_validate_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_validate_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/helpers/convert_color.h" #include "opencl/source/helpers/surface_formats.h" diff --git a/opencl/test/unit_test/mem_obj/map_operations_handler_tests.cpp b/opencl/test/unit_test/mem_obj/map_operations_handler_tests.cpp index 57b46df20c..83708772c4 100644 --- a/opencl/test/unit_test/mem_obj/map_operations_handler_tests.cpp +++ b/opencl/test/unit_test/mem_obj/map_operations_handler_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/mem_obj/map_operations_handler.h" #include "test.h" diff --git a/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp index ff546741b8..47cfdfd16f 100644 --- a/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp +++ b/opencl/test/unit_test/mem_obj/mem_obj_destruction_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/memory_manager/allocations_list.h" -#include "core/memory_manager/unified_memory_manager.h" -#include "core/os_interface/os_context.h" +#include "memory_manager/allocations_list.h" +#include "memory_manager/unified_memory_manager.h" +#include "os_interface/os_context.h" #include "opencl/source/api/api.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/mem_obj.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 447c7b5bc8..30c9f3133f 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 "core/unit_tests/utilities/base_object_utils.h" +#include "unit_tests/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/mem_obj_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp index 95e6ceebb1..1d759455d6 100644 --- a/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp +++ b/opencl/test/unit_test/mem_obj/mem_obj_tests.cpp @@ -5,11 +5,11 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" -#include "core/gmm_helper/gmm.h" -#include "core/memory_manager/allocations_list.h" -#include "core/os_interface/os_context.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" +#include "gmm_helper/gmm.h" +#include "memory_manager/allocations_list.h" +#include "os_interface/os_context.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/helpers/properties_helper.h" #include "opencl/source/mem_obj/mem_obj.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 0b8b87c757..cd9cee82a8 100644 --- a/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/nv12_image_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/gmm_helper/gmm.h" -#include "core/helpers/aligned_memory.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "gmm_helper/gmm.h" +#include "helpers/aligned_memory.h" +#include "unit_tests/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/packed_yuv_image_tests.cpp b/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp index 0cb43244e8..2432573268 100644 --- a/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp +++ b/opencl/test/unit_test/mem_obj/packed_yuv_image_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/helpers/validators.h" diff --git a/opencl/test/unit_test/mem_obj/sub_buffer_tests.cpp b/opencl/test/unit_test/mem_obj/sub_buffer_tests.cpp index 19ef5df3c9..55ac9f57e7 100644 --- a/opencl/test/unit_test/mem_obj/sub_buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/sub_buffer_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/memory_constants.h" +#include "helpers/ptr_math.h" +#include "memory_manager/memory_constants.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/fixtures/device_fixture.h" #include "opencl/test/unit_test/mocks/mock_buffer.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 c8815701d1..c35b6721f0 100644 --- a/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp +++ b/opencl/test/unit_test/mem_obj/zero_copy_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/aligned_memory.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "helpers/aligned_memory.h" +#include "unit_tests/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/address_mapper_tests.cpp b/opencl/test/unit_test/memory_manager/address_mapper_tests.cpp index 6848e6d66e..c05bef0e27 100644 --- a/opencl/test/unit_test/memory_manager/address_mapper_tests.cpp +++ b/opencl/test/unit_test/memory_manager/address_mapper_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include "opencl/source/memory_manager/address_mapper.h" #include "test.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 4b76016015..5dc5fd1ac5 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 "core/unit_tests/page_fault_manager/cpu_page_fault_manager_tests_fixture.h" +#include "unit_tests/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/deferrable_allocation_deletion_tests.cpp b/opencl/test/unit_test/memory_manager/deferrable_allocation_deletion_tests.cpp index 4ff3096982..63fcf72b1a 100644 --- a/opencl/test/unit_test/memory_manager/deferrable_allocation_deletion_tests.cpp +++ b/opencl/test/unit_test/memory_manager/deferrable_allocation_deletion_tests.cpp @@ -5,11 +5,11 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" -#include "core/memory_manager/deferrable_allocation_deletion.h" -#include "core/memory_manager/deferred_deleter.h" -#include "core/os_interface/os_context.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" +#include "memory_manager/deferrable_allocation_deletion.h" +#include "memory_manager/deferred_deleter.h" +#include "os_interface/os_context.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" diff --git a/opencl/test/unit_test/memory_manager/gfx_partition_tests.inl b/opencl/test/unit_test/memory_manager/gfx_partition_tests.inl index 5601acad1b..91b7b48b17 100644 --- a/opencl/test/unit_test/memory_manager/gfx_partition_tests.inl +++ b/opencl/test/unit_test/memory_manager/gfx_partition_tests.inl @@ -5,10 +5,10 @@ * */ -#include "core/helpers/aligned_memory.h" -#include "core/helpers/basic_math.h" -#include "core/helpers/ptr_math.h" -#include "core/os_interface/os_memory.h" +#include "helpers/aligned_memory.h" +#include "helpers/basic_math.h" +#include "helpers/ptr_math.h" +#include "os_interface/os_memory.h" #include "opencl/test/unit_test/mocks/mock_gfx_partition.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp b/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp index ab7fc639ca..147aa52386 100644 --- a/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/host_ptr_manager_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/memory_constants.h" +#include "execution_environment/execution_environment.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" +#include "memory_manager/memory_constants.h" #include "opencl/test/unit_test/fixtures/memory_manager_fixture.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" #include "opencl/test/unit_test/mocks/mock_csr.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 4b1101b46c..08b1d10a9e 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 @@ -5,10 +5,10 @@ * */ -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/containers_tests_helpers.h" +#include "memory_manager/internal_allocation_storage.h" +#include "os_interface/os_context.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/local_memory_usage_tests.cpp b/opencl/test/unit_test/memory_manager/local_memory_usage_tests.cpp index 69b146be38..922fd6b9d9 100644 --- a/opencl/test/unit_test/memory_manager/local_memory_usage_tests.cpp +++ b/opencl/test/unit_test/memory_manager/local_memory_usage_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/basic_math.h" -#include "core/memory_manager/local_memory_usage.h" +#include "helpers/basic_math.h" +#include "memory_manager/local_memory_usage.h" #include "third_party/gtest/gtest/gtest.h" diff --git a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp index be4a11f1d7..300e02c474 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.inl" -#include "core/helpers/array_count.h" +#include "helpers/array_count.h" TEST(MemoryManagerTest, givenNotSetUseSystemMemoryWhenGraphicsAllocationInDevicePoolIsAllocatedThenAllocationIsReturned) { MockExecutionEnvironment executionEnvironment(*platformDevices); diff --git a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.inl b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.inl index dc3cfe79a6..4b8fe80cce 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.inl +++ b/opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/execution_environment/execution_environment.h" +#include "execution_environment/execution_environment.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/mem_obj_helper.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.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 6712629da0..90cf9291b1 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 @@ -5,9 +5,9 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/execution_environment/execution_environment.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "debug_settings/debug_settings_manager.h" +#include "execution_environment/execution_environment.h" +#include "unit_tests/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_multi_device_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp index 9dcdc93376..75301a1e95 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_multi_device_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_constants.h" -#include "core/os_interface/os_context.h" -#include "core/os_interface/os_interface.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_constants.h" +#include "os_interface/os_context.h" +#include "os_interface/os_interface.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/mem_obj/mem_obj_helper.h" #include "opencl/source/platform/platform.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 5006a22ea0..5314dd1ae9 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -5,18 +5,18 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/gmm_helper/page_table_mngr.h" -#include "core/helpers/cache_policy.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_constants.h" -#include "core/memory_manager/residency.h" -#include "core/os_interface/os_context.h" -#include "core/os_interface/os_interface.h" -#include "core/program/program_initialization.h" -#include "core/unit_tests/compiler_interface/linker_mock.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/preemption.h" +#include "gmm_helper/page_table_mngr.h" +#include "helpers/cache_policy.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_constants.h" +#include "memory_manager/residency.h" +#include "os_interface/os_context.h" +#include "os_interface/os_interface.h" +#include "program/program_initialization.h" +#include "unit_tests/compiler_interface/linker_mock.h" +#include "unit_tests/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/memory_pool_tests.cpp b/opencl/test/unit_test/memory_manager/memory_pool_tests.cpp index 72ece4f80c..fcf3b92e3e 100644 --- a/opencl/test/unit_test/memory_manager/memory_pool_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_pool_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/memory_pool.h" +#include "memory_manager/memory_pool.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/memory_manager/page_table_tests.cpp b/opencl/test/unit_test/memory_manager/page_table_tests.cpp index 231cbb9468..39aea5d178 100644 --- a/opencl/test/unit_test/memory_manager/page_table_tests.cpp +++ b/opencl/test/unit_test/memory_manager/page_table_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/ptr_math.h" +#include "helpers/ptr_math.h" #include "opencl/source/aub_mem_dump/page_table_entry_bits.h" #include "opencl/source/memory_manager/memory_banks.h" #include "opencl/source/memory_manager/page_table.h" diff --git a/opencl/test/unit_test/memory_manager/surface_tests.cpp b/opencl/test/unit_test/memory_manager/surface_tests.cpp index 171a341973..fc18e78733 100644 --- a/opencl/test/unit_test/memory_manager/surface_tests.cpp +++ b/opencl/test/unit_test/memory_manager/surface_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/graphics_allocation.h" +#include "command_stream/preemption.h" +#include "helpers/hw_helper.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/memory_manager/mem_obj_surface.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/mocks/mock_buffer.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 ce6f672e94..bbc45f1c7e 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 @@ -5,10 +5,10 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/memory_manager/allocations_list.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" +#include "command_stream/command_stream_receiver.h" +#include "memory_manager/allocations_list.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/memory_manager/unified_memory_token_tests.cpp b/opencl/test/unit_test/memory_manager/unified_memory_token_tests.cpp index ddaf51104b..72ac5fcf2c 100644 --- a/opencl/test/unit_test/memory_manager/unified_memory_token_tests.cpp +++ b/opencl/test/unit_test/memory_manager/unified_memory_token_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/unified_memory/unified_memory.h" -#include "core/unified_memory/usm_memory_support.h" +#include "unified_memory/unified_memory.h" +#include "unified_memory/usm_memory_support.h" #include "opencl/source/extensions/public/cl_ext_private.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/mock_gdi/mock_gdi.cpp b/opencl/test/unit_test/mock_gdi/mock_gdi.cpp index 672898169b..971c001cbe 100644 --- a/opencl/test/unit_test/mock_gdi/mock_gdi.cpp +++ b/opencl/test/unit_test/mock_gdi/mock_gdi.cpp @@ -7,7 +7,7 @@ #include "mock_gdi.h" -#include "core/memory_manager/memory_constants.h" +#include "memory_manager/memory_constants.h" ADAPTER_INFO gAdapterInfo = {0}; D3DDDI_MAPGPUVIRTUALADDRESS gLastCallMapGpuVaArg = {0}; diff --git a/opencl/test/unit_test/mock_gdi/mock_gdi.h b/opencl/test/unit_test/mock_gdi/mock_gdi.h index eb1a1f823a..ddbe5bfc89 100644 --- a/opencl/test/unit_test/mock_gdi/mock_gdi.h +++ b/opencl/test/unit_test/mock_gdi/mock_gdi.h @@ -7,8 +7,8 @@ #pragma once -#include "core/gmm_helper/gmm_lib.h" -#include "core/os_interface/windows/os_time_win.h" +#include "gmm_helper/gmm_lib.h" +#include "os_interface/windows/os_time_win.h" #include #include diff --git a/opencl/test/unit_test/mock_gdi/mock_gdi_gfx_partition.cpp b/opencl/test/unit_test/mock_gdi/mock_gdi_gfx_partition.cpp index e319b127cd..ab25cdcdef 100644 --- a/opencl/test/unit_test/mock_gdi/mock_gdi_gfx_partition.cpp +++ b/opencl/test/unit_test/mock_gdi/mock_gdi_gfx_partition.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/memory_constants.h" +#include "memory_manager/memory_constants.h" #include "mock_gdi.h" diff --git a/opencl/test/unit_test/mock_gmm/mock_gmm.cpp b/opencl/test/unit_test/mock_gmm/mock_gmm.cpp index 55fc175a39..78baa8d73c 100644 --- a/opencl/test/unit_test/mock_gmm/mock_gmm.cpp +++ b/opencl/test/unit_test/mock_gmm/mock_gmm.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gmm_helper/gmm_interface.h" +#include "gmm_helper/gmm_interface.h" namespace NEO { GMM_INIT_IN_ARGS passedInputArgs = {}; diff --git a/opencl/test/unit_test/mocks/linux/mock_drm_allocation.h b/opencl/test/unit_test/mocks/linux/mock_drm_allocation.h index 709002dfac..cfeda0fe7c 100644 --- a/opencl/test/unit_test/mocks/linux/mock_drm_allocation.h +++ b/opencl/test/unit_test/mocks/linux/mock_drm_allocation.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/os_interface/linux/drm_allocation.h" -#include "core/os_interface/linux/drm_buffer_object.h" +#include "os_interface/linux/drm_allocation.h" +#include "os_interface/linux/drm_buffer_object.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.cpp b/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.cpp index 186b3dd6a3..1419613a59 100644 --- a/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.cpp +++ b/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.cpp @@ -7,8 +7,8 @@ #include "opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h" -#include "core/os_interface/linux/allocator_helper.h" -#include "core/os_interface/linux/drm_memory_manager.h" +#include "os_interface/linux/allocator_helper.h" +#include "os_interface/linux/drm_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" #include "opencl/test/unit_test/mocks/mock_host_ptr_manager.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" diff --git a/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h b/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h index 80cbd5b758..8e78980688 100644 --- a/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h +++ b/opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/linux/drm_memory_manager.h" +#include "os_interface/linux/drm_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include diff --git a/opencl/test/unit_test/mocks/mock_allocation_properties.h b/opencl/test/unit_test/mocks/mock_allocation_properties.h index 4588cb810e..4cce8f5049 100644 --- a/opencl/test/unit_test/mocks/mock_allocation_properties.h +++ b/opencl/test/unit_test/mocks/mock_allocation_properties.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/memory_manager.h" +#include "memory_manager/memory_manager.h" namespace NEO { struct MockAllocationProperties : public AllocationProperties { diff --git a/opencl/test/unit_test/mocks/mock_aub_csr.h b/opencl/test/unit_test/mocks/mock_aub_csr.h index 49d31709ac..8b26f8e029 100644 --- a/opencl/test/unit_test/mocks/mock_aub_csr.h +++ b/opencl/test/unit_test/mocks/mock_aub_csr.h @@ -7,11 +7,11 @@ #pragma once -#include "core/command_stream/preemption.h" -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/hw_info.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "command_stream/preemption.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/hw_info.h" +#include "unit_tests/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_buffer.h b/opencl/test/unit_test/mocks/mock_buffer.h index 53ca7cd134..1153ac0e53 100644 --- a/opencl/test/unit_test/mocks/mock_buffer.h +++ b/opencl/test/unit_test/mocks/mock_buffer.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/test/unit_test/mocks/mock_context.h" diff --git a/opencl/test/unit_test/mocks/mock_command_queue.h b/opencl/test/unit_test/mocks/mock_command_queue.h index 68d4a98665..80a6274ac5 100644 --- a/opencl/test/unit_test/mocks/mock_command_queue.h +++ b/opencl/test/unit_test/mocks/mock_command_queue.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/graphics_allocation.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" diff --git a/opencl/test/unit_test/mocks/mock_compilers.cpp b/opencl/test/unit_test/mocks/mock_compilers.cpp index 4026f1fd3e..c50c6bbcfd 100644 --- a/opencl/test/unit_test/mocks/mock_compilers.cpp +++ b/opencl/test/unit_test/mocks/mock_compilers.cpp @@ -7,8 +7,8 @@ #include "mock_compilers.h" -#include "core/helpers/file_io.h" -#include "core/helpers/hw_info.h" +#include "helpers/file_io.h" +#include "helpers/hw_info.h" #include "opencl/source/os_interface/os_inc_base.h" #include "opencl/test/unit_test/helpers/test_files.h" #include "opencl/test/unit_test/mocks/mock_compilers.h" diff --git a/opencl/test/unit_test/mocks/mock_compilers.h b/opencl/test/unit_test/mocks/mock_compilers.h index b7529700ee..2b5dc81f4d 100644 --- a/opencl/test/unit_test/mocks/mock_compilers.h +++ b/opencl/test/unit_test/mocks/mock_compilers.h @@ -7,7 +7,7 @@ #pragma once -#include "core/compiler_interface/compiler_interface.h" +#include "compiler_interface/compiler_interface.h" #include "opencl/test/unit_test/mocks/mock_cif.h" #include "ocl_igc_interface/fcl_ocl_device_ctx.h" diff --git a/opencl/test/unit_test/mocks/mock_context.cpp b/opencl/test/unit_test/mocks/mock_context.cpp index 70ffdbd4be..a4546bf603 100644 --- a/opencl/test/unit_test/mocks/mock_context.cpp +++ b/opencl/test/unit_test/mocks/mock_context.cpp @@ -7,9 +7,9 @@ #include "opencl/test/unit_test/mocks/mock_context.h" -#include "core/compiler_interface/compiler_interface.h" -#include "core/memory_manager/deferred_deleter.h" -#include "core/memory_manager/unified_memory_manager.h" +#include "compiler_interface/compiler_interface.h" +#include "memory_manager/deferred_deleter.h" +#include "memory_manager/unified_memory_manager.h" #include "opencl/source/built_ins/built_ins.h" #include "opencl/source/command_queue/command_queue.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" diff --git a/opencl/test/unit_test/mocks/mock_csr.h b/opencl/test/unit_test/mocks/mock_csr.h index 26d701d32c..66a5e30be4 100644 --- a/opencl/test/unit_test/mocks/mock_csr.h +++ b/opencl/test/unit_test/mocks/mock_csr.h @@ -6,15 +6,15 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/flat_batch_buffer_helper_hw.h" -#include "core/helpers/flush_stamp.h" -#include "core/helpers/hw_info.h" -#include "core/helpers/string.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/os_interface/os_context.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "execution_environment/execution_environment.h" +#include "helpers/flat_batch_buffer_helper_hw.h" +#include "helpers/flush_stamp.h" +#include "helpers/hw_info.h" +#include "helpers/string.h" +#include "memory_manager/graphics_allocation.h" +#include "os_interface/os_context.h" #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/mocks/mock_deferrable_deletion.h b/opencl/test/unit_test/mocks/mock_deferrable_deletion.h index c7aa634282..77a5440ce7 100644 --- a/opencl/test/unit_test/mocks/mock_deferrable_deletion.h +++ b/opencl/test/unit_test/mocks/mock_deferrable_deletion.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/deferrable_deletion.h" +#include "memory_manager/deferrable_deletion.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/mocks/mock_deferred_deleter.cpp b/opencl/test/unit_test/mocks/mock_deferred_deleter.cpp index c403f9226a..c585d2ff3a 100644 --- a/opencl/test/unit_test/mocks/mock_deferred_deleter.cpp +++ b/opencl/test/unit_test/mocks/mock_deferred_deleter.cpp @@ -7,8 +7,8 @@ #include "opencl/test/unit_test/mocks/mock_deferred_deleter.h" -#include "core/memory_manager/deferrable_deletion.h" -#include "core/os_interface/os_thread.h" +#include "memory_manager/deferrable_deletion.h" +#include "os_interface/os_thread.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/mocks/mock_deferred_deleter.h b/opencl/test/unit_test/mocks/mock_deferred_deleter.h index cfd3722d85..906d956287 100644 --- a/opencl/test/unit_test/mocks/mock_deferred_deleter.h +++ b/opencl/test/unit_test/mocks/mock_deferred_deleter.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/deferred_deleter.h" +#include "memory_manager/deferred_deleter.h" namespace NEO { class MockDeferredDeleter : public DeferredDeleter { diff --git a/opencl/test/unit_test/mocks/mock_device.cpp b/opencl/test/unit_test/mocks/mock_device.cpp index b23a3ad7ac..ce98c137fc 100644 --- a/opencl/test/unit_test/mocks/mock_device.cpp +++ b/opencl/test/unit_test/mocks/mock_device.cpp @@ -7,8 +7,8 @@ #include "opencl/test/unit_test/mocks/mock_device.h" -#include "core/command_stream/preemption.h" -#include "core/os_interface/os_context.h" +#include "command_stream/preemption.h" +#include "os_interface/os_context.h" #include "opencl/source/device/driver_info.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" diff --git a/opencl/test/unit_test/mocks/mock_device.h b/opencl/test/unit_test/mocks/mock_device.h index 8ada2569d3..9a62833d96 100644 --- a/opencl/test/unit_test/mocks/mock_device.h +++ b/opencl/test/unit_test/mocks/mock_device.h @@ -6,10 +6,10 @@ */ #pragma once -#include "core/device/root_device.h" -#include "core/device/sub_device.h" -#include "core/helpers/hw_helper.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "device/root_device.h" +#include "device/sub_device.h" +#include "helpers/hw_helper.h" +#include "unit_tests/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_execution_environment.h b/opencl/test/unit_test/mocks/mock_execution_environment.h index 1413fc60e7..8db28a77a5 100644 --- a/opencl/test/unit_test/mocks/mock_execution_environment.h +++ b/opencl/test/unit_test/mocks/mock_execution_environment.h @@ -7,8 +7,8 @@ #pragma once -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/hw_helper.h" +#include "execution_environment/execution_environment.h" +#include "helpers/hw_helper.h" #include "opencl/test/unit_test/fixtures/mock_aub_center_fixture.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_experimental_command_buffer.h b/opencl/test/unit_test/mocks/mock_experimental_command_buffer.h index 88dc166b81..f0d6df7e51 100644 --- a/opencl/test/unit_test/mocks/mock_experimental_command_buffer.h +++ b/opencl/test/unit_test/mocks/mock_experimental_command_buffer.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/command_stream/experimental_command_buffer.h" +#include "command_stream/experimental_command_buffer.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_gfx_partition.h b/opencl/test/unit_test/mocks/mock_gfx_partition.h index 82575d7544..0e3f09c306 100644 --- a/opencl/test/unit_test/mocks/mock_gfx_partition.h +++ b/opencl/test/unit_test/mocks/mock_gfx_partition.h @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/gfx_partition.h" +#include "memory_manager/gfx_partition.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/mocks/mock_gmm.h b/opencl/test/unit_test/mocks/mock_gmm.h index 87df882e54..6b2179dd11 100644 --- a/opencl/test/unit_test/mocks/mock_gmm.h +++ b/opencl/test/unit_test/mocks/mock_gmm.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gmm_helper/gmm.h" +#include "gmm_helper/gmm.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/source/mem_obj/image.h" #include "opencl/test/unit_test/mocks/mock_device.h" diff --git a/opencl/test/unit_test/mocks/mock_gmm_memory_base.h b/opencl/test/unit_test/mocks/mock_gmm_memory_base.h index f5e4eb8f92..8daf5ae108 100644 --- a/opencl/test/unit_test/mocks/mock_gmm_memory_base.h +++ b/opencl/test/unit_test/mocks/mock_gmm_memory_base.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/windows/windows_defs.h" +#include "os_interface/windows/windows_defs.h" #include "gmm_memory.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h b/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h index 8f7dfcba7d..9f19e56579 100644 --- a/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h +++ b/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.h @@ -7,7 +7,7 @@ #pragma once -#include "core/gmm_helper/page_table_mngr.h" +#include "gmm_helper/page_table_mngr.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp b/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp index c68a1aac81..da9c8a0240 100644 --- a/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp +++ b/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/mocks/mock_gmm_resource_info.h" -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include "opencl/source/helpers/surface_formats.h" using namespace ::testing; diff --git a/opencl/test/unit_test/mocks/mock_gmm_resource_info.h b/opencl/test/unit_test/mocks/mock_gmm_resource_info.h index ba85a53cb5..530717d223 100644 --- a/opencl/test/unit_test/mocks/mock_gmm_resource_info.h +++ b/opencl/test/unit_test/mocks/mock_gmm_resource_info.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/gmm_helper/resource_info.h" +#include "gmm_helper/resource_info.h" #include "opencl/source/helpers/surface_formats.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/mocks/mock_graphics_allocation.h b/opencl/test/unit_test/mocks/mock_graphics_allocation.h index 1d40c3648a..a7f4baddec 100644 --- a/opencl/test/unit_test/mocks/mock_graphics_allocation.h +++ b/opencl/test/unit_test/mocks/mock_graphics_allocation.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/graphics_allocation.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_host_ptr_manager.h b/opencl/test/unit_test/mocks/mock_host_ptr_manager.h index f46235e345..282230b250 100644 --- a/opencl/test/unit_test/mocks/mock_host_ptr_manager.h +++ b/opencl/test/unit_test/mocks/mock_host_ptr_manager.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/host_ptr_manager.h" +#include "memory_manager/host_ptr_manager.h" namespace NEO { class MockHostPtrManager : public HostPtrManager { diff --git a/opencl/test/unit_test/mocks/mock_hw_helper.h b/opencl/test/unit_test/mocks/mock_hw_helper.h index 0a26155915..fdaaed5e6b 100644 --- a/opencl/test/unit_test/mocks/mock_hw_helper.h +++ b/opencl/test/unit_test/mocks/mock_hw_helper.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/helpers/hw_helper.h" -#include "core/helpers/hw_info.h" +#include "helpers/hw_helper.h" +#include "helpers/hw_info.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_internal_allocation_storage.h b/opencl/test/unit_test/mocks/mock_internal_allocation_storage.h index b2763d4b32..3900a4653a 100644 --- a/opencl/test/unit_test/mocks/mock_internal_allocation_storage.h +++ b/opencl/test/unit_test/mocks/mock_internal_allocation_storage.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/command_stream/command_stream_receiver.h" -#include "core/memory_manager/internal_allocation_storage.h" +#include "command_stream/command_stream_receiver.h" +#include "memory_manager/internal_allocation_storage.h" namespace NEO { class MockInternalAllocationStorage : public InternalAllocationStorage { diff --git a/opencl/test/unit_test/mocks/mock_kernel.h b/opencl/test/unit_test/mocks/mock_kernel.h index 94827a80e5..41381a0490 100644 --- a/opencl/test/unit_test/mocks/mock_kernel.h +++ b/opencl/test/unit_test/mocks/mock_kernel.h @@ -7,9 +7,9 @@ #pragma once -#include "core/device/device.h" -#include "core/helpers/string.h" -#include "core/kernel/grf_config.h" +#include "device/device.h" +#include "helpers/string.h" +#include "kernel/grf_config.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/test/unit_test/mocks/mock_memory_manager.cpp b/opencl/test/unit_test/mocks/mock_memory_manager.cpp index c01e569c81..a4558408b8 100644 --- a/opencl/test/unit_test/mocks/mock_memory_manager.cpp +++ b/opencl/test/unit_test/mocks/mock_memory_manager.cpp @@ -7,9 +7,9 @@ #include "opencl/test/unit_test/mocks/mock_memory_manager.h" -#include "core/command_stream/command_stream_receiver.h" -#include "core/gmm_helper/gmm.h" -#include "core/memory_manager/deferred_deleter.h" +#include "command_stream/command_stream_receiver.h" +#include "gmm_helper/gmm.h" +#include "memory_manager/deferred_deleter.h" #include "opencl/source/helpers/surface_formats.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" diff --git a/opencl/test/unit_test/mocks/mock_memory_manager.h b/opencl/test/unit_test/mocks/mock_memory_manager.h index 615c005f3e..ea0769a1db 100644 --- a/opencl/test/unit_test/mocks/mock_memory_manager.h +++ b/opencl/test/unit_test/mocks/mock_memory_manager.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/execution_environment/execution_environment.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "execution_environment/execution_environment.h" +#include "unit_tests/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_memory_operations_handler.h b/opencl/test/unit_test/mocks/mock_memory_operations_handler.h index be334f1d1d..9011cb864a 100644 --- a/opencl/test/unit_test/mocks/mock_memory_operations_handler.h +++ b/opencl/test/unit_test/mocks/mock_memory_operations_handler.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/memory_operations_handler.h" +#include "memory_manager/memory_operations_handler.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_os_context.h b/opencl/test/unit_test/mocks/mock_os_context.h index 776c53b385..eb7fb614a5 100644 --- a/opencl/test/unit_test/mocks/mock_os_context.h +++ b/opencl/test/unit_test/mocks/mock_os_context.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/os_context.h" +#include "os_interface/os_context.h" namespace NEO { class MockOsContext : public OsContext { diff --git a/opencl/test/unit_test/mocks/mock_ostime.h b/opencl/test/unit_test/mocks/mock_ostime.h index 42166dcf83..dff54c5437 100644 --- a/opencl/test/unit_test/mocks/mock_ostime.h +++ b/opencl/test/unit_test/mocks/mock_ostime.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/os_time.h" +#include "os_interface/os_time.h" namespace NEO { class MockOSTime : public OSTime { diff --git a/opencl/test/unit_test/mocks/mock_ostime_win.h b/opencl/test/unit_test/mocks/mock_ostime_win.h index 4e1b594560..f59de50194 100644 --- a/opencl/test/unit_test/mocks/mock_ostime_win.h +++ b/opencl/test/unit_test/mocks/mock_ostime_win.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/windows/os_time_win.h" +#include "os_interface/windows/os_time_win.h" namespace NEO { class MockOSTimeWin : public OSTimeWin { diff --git a/opencl/test/unit_test/mocks/mock_pipe.h b/opencl/test/unit_test/mocks/mock_pipe.h index 68e288c1bf..806fca9327 100644 --- a/opencl/test/unit_test/mocks/mock_pipe.h +++ b/opencl/test/unit_test/mocks/mock_pipe.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include "opencl/source/mem_obj/pipe.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" diff --git a/opencl/test/unit_test/mocks/mock_platform.cpp b/opencl/test/unit_test/mocks/mock_platform.cpp index 8c2b8c1496..1a18aabd29 100644 --- a/opencl/test/unit_test/mocks/mock_platform.cpp +++ b/opencl/test/unit_test/mocks/mock_platform.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/mocks/mock_platform.h" -#include "core/device/device.h" +#include "device/device.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_platform.h b/opencl/test/unit_test/mocks/mock_platform.h index 247684af66..4d5598efda 100644 --- a/opencl/test/unit_test/mocks/mock_platform.h +++ b/opencl/test/unit_test/mocks/mock_platform.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/execution_environment/execution_environment.h" +#include "execution_environment/execution_environment.h" #include "opencl/source/platform/platform.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_program.cpp b/opencl/test/unit_test/mocks/mock_program.cpp index 8df0732f87..476636f4f1 100644 --- a/opencl/test/unit_test/mocks/mock_program.cpp +++ b/opencl/test/unit_test/mocks/mock_program.cpp @@ -7,11 +7,11 @@ #include "opencl/test/unit_test/mocks/mock_program.h" -#include "core/compiler_interface/compiler_cache.h" -#include "core/device_binary_format/patchtokens_decoder.h" -#include "core/helpers/hash.h" -#include "core/program/program_info_from_patchtokens.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "compiler_interface/compiler_cache.h" +#include "device_binary_format/patchtokens_decoder.h" +#include "helpers/hash.h" +#include "program/program_info_from_patchtokens.h" +#include "unit_tests/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/mocks/mock_program.h b/opencl/test/unit_test/mocks/mock_program.h index e580cea6cc..17d53811d6 100644 --- a/opencl/test/unit_test/mocks/mock_program.h +++ b/opencl/test/unit_test/mocks/mock_program.h @@ -6,9 +6,9 @@ */ #pragma once -#include "core/device/device.h" -#include "core/helpers/hash.h" -#include "core/helpers/string.h" +#include "device/device.h" +#include "helpers/hash.h" +#include "helpers/string.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/program/kernel_info.h" #include "opencl/source/program/program.h" diff --git a/opencl/test/unit_test/mocks/mock_sip.cpp b/opencl/test/unit_test/mocks/mock_sip.cpp index 9a8855dc09..0a4a801183 100644 --- a/opencl/test/unit_test/mocks/mock_sip.cpp +++ b/opencl/test/unit_test/mocks/mock_sip.cpp @@ -7,8 +7,8 @@ #include "opencl/test/unit_test/mocks/mock_sip.h" -#include "core/helpers/file_io.h" -#include "core/helpers/hw_info.h" +#include "helpers/file_io.h" +#include "helpers/hw_info.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/os_interface/os_inc_base.h" #include "opencl/test/unit_test/helpers/test_files.h" diff --git a/opencl/test/unit_test/mocks/mock_submissions_aggregator.h b/opencl/test/unit_test/mocks/mock_submissions_aggregator.h index 7acd8dea91..3d04d73ea4 100644 --- a/opencl/test/unit_test/mocks/mock_submissions_aggregator.h +++ b/opencl/test/unit_test/mocks/mock_submissions_aggregator.h @@ -7,7 +7,7 @@ #pragma once -#include "core/command_stream/submissions_aggregator.h" +#include "command_stream/submissions_aggregator.h" namespace NEO { struct mockSubmissionsAggregator : public SubmissionAggregator { diff --git a/opencl/test/unit_test/mocks/mock_svm_manager.h b/opencl/test/unit_test/mocks/mock_svm_manager.h index e32b82a8db..690aaf2e1d 100644 --- a/opencl/test/unit_test/mocks/mock_svm_manager.h +++ b/opencl/test/unit_test/mocks/mock_svm_manager.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/memory_manager/unified_memory_manager.h" +#include "memory_manager/unified_memory_manager.h" namespace NEO { struct MockSVMAllocsManager : SVMAllocsManager { diff --git a/opencl/test/unit_test/mocks/mock_tbx_csr.h b/opencl/test/unit_test/mocks/mock_tbx_csr.h index 36ea03887e..b49c3613d2 100644 --- a/opencl/test/unit_test/mocks/mock_tbx_csr.h +++ b/opencl/test/unit_test/mocks/mock_tbx_csr.h @@ -7,9 +7,9 @@ #pragma once -#include "core/command_stream/preemption.h" -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/hw_info.h" +#include "command_stream/preemption.h" +#include "execution_environment/execution_environment.h" +#include "helpers/hw_info.h" #include "opencl/source/aub/aub_center.h" #include "opencl/source/command_stream/tbx_command_stream_receiver_hw.h" diff --git a/opencl/test/unit_test/mocks/mock_timestamp_container.h b/opencl/test/unit_test/mocks/mock_timestamp_container.h index 5a561ab0d8..62d30a70bb 100644 --- a/opencl/test/unit_test/mocks/mock_timestamp_container.h +++ b/opencl/test/unit_test/mocks/mock_timestamp_container.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/timestamp_packet.h" +#include "helpers/timestamp_packet.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/mock_wddm.cpp b/opencl/test/unit_test/mocks/mock_wddm.cpp index 5e2d763674..05c692f759 100644 --- a/opencl/test/unit_test/mocks/mock_wddm.cpp +++ b/opencl/test/unit_test/mocks/mock_wddm.cpp @@ -7,10 +7,10 @@ #include "opencl/test/unit_test/mocks/mock_wddm.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/aligned_memory.h" -#include "core/os_interface/windows/gdi_interface.h" -#include "core/os_interface/windows/wddm_allocation.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/aligned_memory.h" +#include "os_interface/windows/gdi_interface.h" +#include "os_interface/windows/wddm_allocation.h" #include "opencl/test/unit_test/mock_gdi/mock_gdi.h" #include "opencl/test/unit_test/mocks/mock_wddm_residency_allocations_container.h" diff --git a/opencl/test/unit_test/mocks/mock_wddm.h b/opencl/test/unit_test/mocks/mock_wddm.h index a0f8918da5..516d0bd98c 100644 --- a/opencl/test/unit_test/mocks/mock_wddm.h +++ b/opencl/test/unit_test/mocks/mock_wddm.h @@ -7,11 +7,11 @@ #pragma once -#include "core/memory_manager/host_ptr_defines.h" -#include "core/memory_manager/memory_constants.h" -#include "core/os_interface/windows/wddm/wddm.h" -#include "core/os_interface/windows/wddm_residency_allocations_container.h" -#include "core/os_interface/windows/windows_defs.h" +#include "memory_manager/host_ptr_defines.h" +#include "memory_manager/memory_constants.h" +#include "os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/wddm_residency_allocations_container.h" +#include "os_interface/windows/windows_defs.h" #include "opencl/test/unit_test/mocks/wddm_mock_helpers.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/mocks/mock_wddm_interface20.h b/opencl/test/unit_test/mocks/mock_wddm_interface20.h index 9b0cb8afb9..c828bb821b 100644 --- a/opencl/test/unit_test/mocks/mock_wddm_interface20.h +++ b/opencl/test/unit_test/mocks/mock_wddm_interface20.h @@ -7,7 +7,7 @@ #pragma once -#include "core/os_interface/windows/wddm/wddm_interface.h" +#include "os_interface/windows/wddm/wddm_interface.h" namespace NEO { class WddmMockInterface20 : public WddmInterface20 { diff --git a/opencl/test/unit_test/mocks/mock_wddm_interface23.h b/opencl/test/unit_test/mocks/mock_wddm_interface23.h index 43224b4a90..75c5891bae 100644 --- a/opencl/test/unit_test/mocks/mock_wddm_interface23.h +++ b/opencl/test/unit_test/mocks/mock_wddm_interface23.h @@ -7,7 +7,7 @@ #pragma once -#include "core/os_interface/windows/wddm/wddm_interface.h" +#include "os_interface/windows/wddm/wddm_interface.h" namespace NEO { class WddmMockInterface23 : public WddmInterface23 { diff --git a/opencl/test/unit_test/mocks/mock_wddm_residency_allocations_container.h b/opencl/test/unit_test/mocks/mock_wddm_residency_allocations_container.h index d8d617aa49..e263e0da42 100644 --- a/opencl/test/unit_test/mocks/mock_wddm_residency_allocations_container.h +++ b/opencl/test/unit_test/mocks/mock_wddm_residency_allocations_container.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/memory_manager/memory_operations_status.h" -#include "core/os_interface/windows/wddm_residency_allocations_container.h" +#include "memory_manager/memory_operations_status.h" +#include "os_interface/windows/wddm_residency_allocations_container.h" #include "opencl/test/unit_test/mocks/wddm_mock_helpers.h" namespace NEO { diff --git a/opencl/test/unit_test/mocks/wddm_mock_helpers.h b/opencl/test/unit_test/mocks/wddm_mock_helpers.h index 83b9111a05..3de2524cbf 100644 --- a/opencl/test/unit_test/mocks/wddm_mock_helpers.h +++ b/opencl/test/unit_test/mocks/wddm_mock_helpers.h @@ -7,9 +7,9 @@ #pragma once -#include "core/memory_manager/eviction_status.h" -#include "core/os_interface/windows/wddm/wddm_defs.h" -#include "core/os_interface/windows/windows_defs.h" +#include "memory_manager/eviction_status.h" +#include "os_interface/windows/wddm/wddm_defs.h" +#include "os_interface/windows/windows_defs.h" #include diff --git a/opencl/test/unit_test/mt_tests/helpers/interlocked_max_mt_tests.cpp b/opencl/test/unit_test/mt_tests/helpers/interlocked_max_mt_tests.cpp index 257d208b34..297cb9b5fd 100644 --- a/opencl/test/unit_test/mt_tests/helpers/interlocked_max_mt_tests.cpp +++ b/opencl/test/unit_test/mt_tests/helpers/interlocked_max_mt_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/interlocked_max.h" +#include "helpers/interlocked_max.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp b/opencl/test/unit_test/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp index ba175c38fb..55a3aa5dc9 100644 --- a/opencl/test/unit_test/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp +++ b/opencl/test/unit_test/mt_tests/os_interface/linux/drm_memory_manager_mt_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/os_interface/linux/drm_memory_manager.h" -#include "core/os_interface/linux/os_interface.h" +#include "execution_environment/execution_environment.h" +#include "os_interface/linux/drm_memory_manager.h" +#include "os_interface/linux/os_interface.h" #include "opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" diff --git a/opencl/test/unit_test/mt_tests/utilities/reference_tracked_object_tests_mt.cpp b/opencl/test/unit_test/mt_tests/utilities/reference_tracked_object_tests_mt.cpp index d8332acf25..c4e898472d 100644 --- a/opencl/test/unit_test/mt_tests/utilities/reference_tracked_object_tests_mt.cpp +++ b/opencl/test/unit_test/mt_tests/utilities/reference_tracked_object_tests_mt.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/reference_tracked_object.h" +#include "utilities/reference_tracked_object.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/offline_compiler/decoder/decoder_tests.cpp b/opencl/test/unit_test/offline_compiler/decoder/decoder_tests.cpp index a327000d4b..77935e755c 100644 --- a/opencl/test/unit_test/offline_compiler/decoder/decoder_tests.cpp +++ b/opencl/test/unit_test/offline_compiler/decoder/decoder_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/array_count.h" +#include "helpers/array_count.h" #include "opencl/test/unit_test/test_files/patch_list.h" #include "gmock/gmock.h" diff --git a/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp b/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp index 89dca13bd0..62a3fefe7d 100644 --- a/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp +++ b/opencl/test/unit_test/offline_compiler/decoder/encoder_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/array_count.h" +#include "helpers/array_count.h" #include "offline_compiler/decoder/binary_decoder.h" #include "opencl/test/unit_test/helpers/test_files.h" diff --git a/opencl/test/unit_test/offline_compiler/decoder/mock/mock_encoder.h b/opencl/test/unit_test/offline_compiler/decoder/mock/mock_encoder.h index cf96826cd4..9cb3077ca3 100644 --- a/opencl/test/unit_test/offline_compiler/decoder/mock/mock_encoder.h +++ b/opencl/test/unit_test/offline_compiler/decoder/mock/mock_encoder.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/hash.h" +#include "helpers/hash.h" #include "offline_compiler/decoder/binary_encoder.h" #include "mock_iga_wrapper.h" diff --git a/opencl/test/unit_test/offline_compiler/main.cpp b/opencl/test/unit_test/offline_compiler/main.cpp index a58465466a..8013e9df39 100644 --- a/opencl/test/unit_test/offline_compiler/main.cpp +++ b/opencl/test/unit_test/offline_compiler/main.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "opencl/test/unit_test/custom_event_listener.h" #include "opencl/test/unit_test/helpers/test_files.h" diff --git a/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp b/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp index 875448311d..843d855be3 100644 --- a/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp +++ b/opencl/test/unit_test/offline_compiler/ocloc_fatbinary_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" #include "offline_compiler/ocloc_fatbinary.h" #include "gtest/gtest.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 2c95adc51e..95f56a1026 100644 --- a/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp +++ b/opencl/test/unit_test/offline_compiler/offline_compiler_tests.cpp @@ -7,11 +7,11 @@ #include "offline_compiler_tests.h" -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/file_io.h" -#include "core/helpers/hw_cmds.h" -#include "core/helpers/hw_info.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/file_io.h" +#include "helpers/hw_cmds.h" +#include "helpers/hw_info.h" +#include "unit_tests/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 79ce219783..8568a755e5 100644 --- a/opencl/test/unit_test/os_interface/device_factory_tests.cpp +++ b/opencl/test/unit_test/os_interface/device_factory_tests.cpp @@ -5,13 +5,13 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/hw_info.h" -#include "core/memory_manager/memory_constants.h" -#include "core/os_interface/device_factory.h" -#include "core/os_interface/os_interface.h" -#include "core/os_interface/os_library.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "execution_environment/execution_environment.h" +#include "helpers/hw_info.h" +#include "memory_manager/memory_constants.h" +#include "os_interface/device_factory.h" +#include "os_interface/os_interface.h" +#include "os_interface/os_library.h" +#include "unit_tests/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/hw_info_config_tests.cpp b/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp index 41da366692..51f1cd61ff 100644 --- a/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp +++ b/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/os_interface/hw_info_config_tests.h" -#include "core/helpers/hw_helper.h" +#include "helpers/hw_helper.h" using namespace NEO; using namespace std; diff --git a/opencl/test/unit_test/os_interface/hw_info_config_tests.h b/opencl/test/unit_test/os_interface/hw_info_config_tests.h index a93539e580..4fd1d23571 100644 --- a/opencl/test/unit_test/os_interface/hw_info_config_tests.h +++ b/opencl/test/unit_test/os_interface/hw_info_config_tests.h @@ -7,7 +7,7 @@ #pragma once -#include "core/device/device.h" +#include "device/device.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/os_interface/linux/allocator_helper.cpp b/opencl/test/unit_test/os_interface/linux/allocator_helper.cpp index ab671c3b8d..99750af4d9 100644 --- a/opencl/test/unit_test/os_interface/linux/allocator_helper.cpp +++ b/opencl/test/unit_test/os_interface/linux/allocator_helper.cpp @@ -5,9 +5,9 @@ * */ -#include "core/os_interface/linux/allocator_helper.h" +#include "os_interface/linux/allocator_helper.h" -#include "core/helpers/basic_math.h" +#include "helpers/basic_math.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/linux/allocator_helper_tests.cpp b/opencl/test/unit_test/os_interface/linux/allocator_helper_tests.cpp index 9f00caaffb..1a82640e27 100644 --- a/opencl/test/unit_test/os_interface/linux/allocator_helper_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/allocator_helper_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/basic_math.h" -#include "core/os_interface/linux/allocator_helper.h" +#include "helpers/basic_math.h" +#include "os_interface/linux/allocator_helper.h" #include "gtest/gtest.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 d1ff4c5e84..f04fbb910f 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 @@ -5,11 +5,11 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/os_interface/linux/drm_memory_manager.h" -#include "core/os_interface/linux/os_interface.h" -#include "core/os_interface/os_interface.h" -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "execution_environment/execution_environment.h" +#include "os_interface/linux/drm_memory_manager.h" +#include "os_interface/linux/os_interface.h" +#include "os_interface/os_interface.h" +#include "unit_tests/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/debug_env_reader.cpp b/opencl/test/unit_test/os_interface/linux/debug_env_reader.cpp index 426f710e99..34b6131deb 100644 --- a/opencl/test/unit_test/os_interface/linux/debug_env_reader.cpp +++ b/opencl/test/unit_test/os_interface/linux/debug_env_reader.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/debug_env_reader.h" +#include "os_interface/linux/debug_env_reader.h" #include "test.h" 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 dbe908bea6..6f8ff6edcf 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 @@ -6,11 +6,11 @@ */ #pragma once -#include "core/helpers/aligned_memory.h" -#include "core/helpers/hw_helper.h" -#include "core/os_interface/linux/drm_memory_manager.h" -#include "core/os_interface/linux/drm_neo.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "helpers/aligned_memory.h" +#include "helpers/hw_helper.h" +#include "os_interface/linux/drm_memory_manager.h" +#include "os_interface/linux/drm_neo.h" +#include "unit_tests/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_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp index 1f6b787ffc..a7f37e27aa 100644 --- a/opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/device_command_stream_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/linear_stream.h" -#include "core/os_interface/linux/os_interface.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/linear_stream.h" +#include "os_interface/linux/os_interface.h" #include "opencl/source/command_stream/aub_command_stream_receiver.h" #include "opencl/source/command_stream/device_command_stream.h" #include "opencl/source/os_interface/linux/device_command_stream.inl" 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 4f58954f66..00a117f010 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 @@ -7,10 +7,10 @@ #include "opencl/test/unit_test/os_interface/linux/device_factory_tests.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/os_interface/linux/os_interface.h" -#include "core/os_interface/os_interface.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "execution_environment/root_device_environment.h" +#include "os_interface/linux/os_interface.h" +#include "os_interface/os_interface.h" +#include "unit_tests/helpers/default_hw_info.h" TEST_F(DeviceFactoryLinuxTest, GetDevicesCheckEUCntSSCnt) { const HardwareInfo *refHwinfo = *platformDevices; diff --git a/opencl/test/unit_test/os_interface/linux/device_factory_tests.h b/opencl/test/unit_test/os_interface/linux/device_factory_tests.h index 19079e1def..1d6df88947 100644 --- a/opencl/test/unit_test/os_interface/linux/device_factory_tests.h +++ b/opencl/test/unit_test/os_interface/linux/device_factory_tests.h @@ -7,9 +7,9 @@ #pragma once -#include "core/device/device.h" -#include "core/execution_environment/execution_environment.h" -#include "core/os_interface/device_factory.h" +#include "device/device.h" +#include "execution_environment/execution_environment.h" +#include "os_interface/device_factory.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/os_interface/linux/drm_mock.h" diff --git a/opencl/test/unit_test/os_interface/linux/device_os_tests.cpp b/opencl/test/unit_test/os_interface/linux/device_os_tests.cpp index 75ca37194a..4fb42d90d4 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 @@ -5,9 +5,9 @@ * */ -#include "core/device/device.h" -#include "core/helpers/get_info.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "device/device.h" +#include "helpers/get_info.h" +#include "unit_tests/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_buffer_object_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp index 3842e5bfdb..8006639e29 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_buffer_object_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_buffer_object.h" +#include "os_interface/linux/drm_buffer_object.h" #include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" #include "test.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 59b4298946..079131d5be 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 @@ -6,10 +6,10 @@ */ #pragma once -#include "core/command_stream/preemption.h" -#include "core/os_interface/linux/os_context_linux.h" -#include "core/os_interface/linux/os_interface.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/preemption.h" +#include "os_interface/linux/os_context_linux.h" +#include "os_interface/linux/os_interface.h" +#include "unit_tests/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 fd8427690f..16970b20fa 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 @@ -5,11 +5,11 @@ * */ -#include "core/execution_environment/root_device_environment.h" -#include "core/os_interface/linux/drm_memory_manager.h" -#include "core/os_interface/linux/drm_memory_operations_handler.h" -#include "core/os_interface/linux/os_interface.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "execution_environment/root_device_environment.h" +#include "os_interface/linux/drm_memory_manager.h" +#include "os_interface/linux/drm_memory_operations_handler.h" +#include "os_interface/linux/os_interface.h" +#include "unit_tests/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 33cb30538c..11b3f8b0f7 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 @@ -5,19 +5,19 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/gmm_helper/page_table_mngr.h" -#include "core/gmm_helper/resource_info.h" -#include "core/helpers/flush_stamp.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/residency.h" -#include "core/os_interface/linux/drm_buffer_object.h" -#include "core/os_interface/linux/os_context_linux.h" -#include "core/os_interface/linux/os_interface.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/preemption.h" +#include "gmm_helper/gmm_helper.h" +#include "gmm_helper/page_table_mngr.h" +#include "gmm_helper/resource_info.h" +#include "helpers/flush_stamp.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/residency.h" +#include "os_interface/linux/drm_buffer_object.h" +#include "os_interface/linux/os_context_linux.h" +#include "os_interface/linux/os_interface.h" +#include "os_interface/os_context.h" +#include "unit_tests/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_gem_close_worker_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp index a1c75dbadd..b1ac932e19 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_gem_close_worker_tests.cpp @@ -5,13 +5,13 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/aligned_memory.h" -#include "core/os_interface/linux/drm_buffer_object.h" -#include "core/os_interface/linux/drm_gem_close_worker.h" -#include "core/os_interface/linux/drm_memory_manager.h" -#include "core/os_interface/linux/drm_memory_operations_handler.h" -#include "core/os_interface/linux/os_interface.h" +#include "execution_environment/execution_environment.h" +#include "helpers/aligned_memory.h" +#include "os_interface/linux/drm_buffer_object.h" +#include "os_interface/linux/drm_gem_close_worker.h" +#include "os_interface/linux/drm_memory_manager.h" +#include "os_interface/linux/drm_memory_operations_handler.h" +#include "os_interface/linux/os_interface.h" #include "opencl/source/command_stream/device_command_stream.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_mapper_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_mapper_tests.cpp index 11355522e4..2e099a3861 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_mapper_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_mapper_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_engine_mapper.h" +#include "os_interface/linux/drm_engine_mapper.h" #include "test.h" #include "drm/i915_drm.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp index d8268e104d..2e3f45a685 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_info_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/memory_info.h" +#include "os_interface/linux/memory_info.h" #include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp index 4e0506a5fc..1c9e64754b 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_allocate_in_device_pool_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/os_interface/linux/drm_memory_manager.h" -#include "core/os_interface/linux/os_interface.h" +#include "execution_environment/execution_environment.h" +#include "os_interface/linux/drm_memory_manager.h" +#include "os_interface/linux/os_interface.h" #include "opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.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 7820acbe6e..3e83fbf7e5 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 @@ -7,24 +7,24 @@ #include "drm_memory_manager_tests.h" -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/preemption.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/timestamp_packet.h" -#include "core/memory_manager/host_ptr_manager.h" -#include "core/memory_manager/memory_constants.h" -#include "core/memory_manager/residency.h" -#include "core/os_interface/linux/allocator_helper.h" -#include "core/os_interface/linux/drm_allocation.h" -#include "core/os_interface/linux/drm_buffer_object.h" -#include "core/os_interface/linux/drm_memory_manager.h" -#include "core/os_interface/linux/os_context_linux.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/ult_hw_config.h" -#include "core/utilities/tag_allocator.h" +#include "command_stream/linear_stream.h" +#include "command_stream/preemption.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/aligned_memory.h" +#include "helpers/ptr_math.h" +#include "helpers/timestamp_packet.h" +#include "memory_manager/host_ptr_manager.h" +#include "memory_manager/memory_constants.h" +#include "memory_manager/residency.h" +#include "os_interface/linux/allocator_helper.h" +#include "os_interface/linux/drm_allocation.h" +#include "os_interface/linux/drm_buffer_object.h" +#include "os_interface/linux/drm_memory_manager.h" +#include "os_interface/linux/os_context_linux.h" +#include "os_interface/os_context.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/helpers/ult_hw_config.h" +#include "utilities/tag_allocator.h" #include "opencl/source/command_stream/device_command_stream.h" #include "opencl/source/event/event.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h index 34902d5216..8721d2ff14 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h +++ b/opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/os_interface/linux/drm_memory_operations_handler.h" -#include "core/os_interface/linux/os_interface.h" +#include "os_interface/linux/drm_memory_operations_handler.h" +#include "os_interface/linux/os_interface.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "opencl/test/unit_test/mocks/linux/mock_drm_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_device.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_mock.h b/opencl/test/unit_test/os_interface/linux/drm_mock.h index ecd953c4e1..44156c6fe9 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_mock.h +++ b/opencl/test/unit_test/os_interface/linux/drm_mock.h @@ -7,9 +7,9 @@ #pragma once -#include "core/execution_environment/execution_environment.h" -#include "core/memory_manager/memory_constants.h" -#include "core/os_interface/linux/drm_neo.h" +#include "execution_environment/execution_environment.h" +#include "memory_manager/memory_constants.h" +#include "os_interface/linux/drm_neo.h" #include "opencl/source/platform/platform.h" #include "drm/i915_drm.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_os_memory_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_os_memory_tests.cpp index 960e278cf7..7b86f9b193 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_os_memory_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_os_memory_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/os_memory_linux.h" +#include "os_interface/linux/os_memory_linux.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp index c5ed15d98b..f9e5475780 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_residency_handler_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/drm_memory_operations_handler.h" +#include "os_interface/linux/drm_memory_operations_handler.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "test.h" diff --git a/opencl/test/unit_test/os_interface/linux/drm_tests.cpp b/opencl/test/unit_test/os_interface/linux/drm_tests.cpp index 2143334831..8c6e4a3e93 100644 --- a/opencl/test/unit_test/os_interface/linux/drm_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/drm_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/helpers/file_io.h" -#include "core/os_interface/device_factory.h" -#include "core/os_interface/linux/os_context_linux.h" -#include "core/os_interface/linux/os_interface.h" +#include "helpers/file_io.h" +#include "os_interface/device_factory.h" +#include "os_interface/linux/os_context_linux.h" +#include "os_interface/linux/os_interface.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "opencl/test/unit_test/os_interface/linux/drm_mock.h" diff --git a/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp index cdaa256768..92d32e5690 100644 --- a/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/file_logger_linux_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" +#include "debug_settings/debug_settings_manager.h" #include "opencl/test/unit_test/mocks/linux/mock_drm_allocation.h" #include "opencl/test/unit_test/utilities/file_logger_tests.h" #include "test.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 ec3f058183..26f57df783 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 @@ -7,10 +7,10 @@ #include "opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" -#include "core/helpers/hw_helper.h" -#include "core/os_interface/linux/os_interface.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "helpers/hw_helper.h" +#include "os_interface/linux/os_interface.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/helpers/default_hw_info.h" #include diff --git a/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h index 280197c9c2..a2c4ec8571 100644 --- a/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h +++ b/opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h @@ -7,9 +7,9 @@ #pragma once -#include "core/os_interface/hw_info_config.h" -#include "core/os_interface/os_interface.h" -#include "core/utilities/cpu_info.h" +#include "os_interface/hw_info_config.h" +#include "os_interface/os_interface.h" +#include "utilities/cpu_info.h" #include "opencl/test/unit_test/os_interface/hw_info_config_tests.h" #include "opencl/test/unit_test/os_interface/linux/drm_mock.h" diff --git a/opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp b/opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp index 6be3d8b011..57a29c1ab8 100644 --- a/opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/linux_create_command_queue_with_properties_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/os_interface.h" +#include "os_interface/linux/os_interface.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_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/mock_os_time_linux.h b/opencl/test/unit_test/os_interface/linux/mock_os_time_linux.h index 839127adf1..c30a2659ee 100644 --- a/opencl/test/unit_test/os_interface/linux/mock_os_time_linux.h +++ b/opencl/test/unit_test/os_interface/linux/mock_os_time_linux.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/os_interface/linux/os_interface.h" -#include "core/os_interface/linux/os_time_linux.h" +#include "os_interface/linux/os_interface.h" +#include "os_interface/linux/os_time_linux.h" namespace NEO { class MockOSTimeLinux : public OSTimeLinux { diff --git a/opencl/test/unit_test/os_interface/linux/options.cpp b/opencl/test/unit_test/os_interface/linux/options.cpp index c5ce5a53a4..e80e2aa122 100644 --- a/opencl/test/unit_test/os_interface/linux/options.cpp +++ b/opencl/test/unit_test/os_interface/linux/options.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "common/gtsysinfo.h" #include "igfxfmid.h" diff --git a/opencl/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp b/opencl/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp index baa9f69306..ad8dde2e5f 100644 --- a/opencl/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp +++ b/opencl/test/unit_test/os_interface/linux/os_interface_linux_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/helpers/hw_helper.h" -#include "core/os_interface/linux/os_context_linux.h" -#include "core/os_interface/linux/os_interface.h" +#include "command_stream/preemption.h" +#include "helpers/hw_helper.h" +#include "os_interface/linux/os_context_linux.h" +#include "os_interface/linux/os_interface.h" #include "opencl/test/unit_test/os_interface/linux/drm_mock.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/os_interface/linux/os_time_test.cpp b/opencl/test/unit_test/os_interface/linux/os_time_test.cpp index e15655b036..bc6c1e26a0 100644 --- a/opencl/test/unit_test/os_interface/linux/os_time_test.cpp +++ b/opencl/test/unit_test/os_interface/linux/os_time_test.cpp @@ -5,9 +5,9 @@ * */ -#include "core/os_interface/linux/drm_neo.h" -#include "core/os_interface/linux/os_interface.h" -#include "core/os_interface/linux/os_time_linux.h" +#include "os_interface/linux/drm_neo.h" +#include "os_interface/linux/os_interface.h" +#include "os_interface/linux/os_time_linux.h" #include "opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h" #include "opencl/test/unit_test/os_interface/linux/mock_os_time_linux.h" #include "test.h" diff --git a/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp b/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp index 69629788e8..887bb1a686 100644 --- a/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp +++ b/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/linux/sys_calls.h" +#include "os_interface/linux/sys_calls.h" #include "drm/i915_drm.h" diff --git a/opencl/test/unit_test/os_interface/mock_performance_counters.cpp b/opencl/test/unit_test/os_interface/mock_performance_counters.cpp index 37f2355719..02660727da 100644 --- a/opencl/test/unit_test/os_interface/mock_performance_counters.cpp +++ b/opencl/test/unit_test/os_interface/mock_performance_counters.cpp @@ -7,8 +7,8 @@ #include "mock_performance_counters.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/os_interface/os_interface.h" +#include "execution_environment/root_device_environment.h" +#include "os_interface/os_interface.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" using namespace MetricsLibraryApi; diff --git a/opencl/test/unit_test/os_interface/mock_performance_counters.h b/opencl/test/unit_test/os_interface/mock_performance_counters.h index 0f18dc7432..8753df341b 100644 --- a/opencl/test/unit_test/os_interface/mock_performance_counters.h +++ b/opencl/test/unit_test/os_interface/mock_performance_counters.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.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/os_interface/os_context_tests.cpp b/opencl/test/unit_test/os_interface/os_context_tests.cpp index 50b71449ad..d9304170c6 100644 --- a/opencl/test/unit_test/os_interface/os_context_tests.cpp +++ b/opencl/test/unit_test/os_interface/os_context_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_context.h" +#include "os_interface/os_context.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/os_interface/os_interface_tests.cpp b/opencl/test/unit_test/os_interface/os_interface_tests.cpp index 154c6b8ae2..f6ec89809d 100644 --- a/opencl/test/unit_test/os_interface/os_interface_tests.cpp +++ b/opencl/test/unit_test/os_interface/os_interface_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_interface.h" +#include "os_interface/os_interface.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/os_interface/os_library_tests.cpp b/opencl/test/unit_test/os_interface/os_library_tests.cpp index a09d181d13..27a99725b6 100644 --- a/opencl/test/unit_test/os_interface/os_library_tests.cpp +++ b/opencl/test/unit_test/os_interface/os_library_tests.cpp @@ -6,11 +6,11 @@ */ #if defined(_WIN32) -#include "core/os_interface/windows/os_library_win.h" +#include "os_interface/windows/os_library_win.h" #elif defined(__linux__) -#include "core/os_interface/linux/os_library_linux.h" +#include "os_interface/linux/os_library_linux.h" #endif -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/os_interface/os_memory_tests.cpp b/opencl/test/unit_test/os_interface/os_memory_tests.cpp index 3148fc0c5e..18e338abe4 100644 --- a/opencl/test/unit_test/os_interface/os_memory_tests.cpp +++ b/opencl/test/unit_test/os_interface/os_memory_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_memory.h" +#include "os_interface/os_memory.h" #include "gtest/gtest.h" 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 61e0fecdd3..3e9b8184e0 100644 --- a/opencl/test/unit_test/os_interface/performance_counters_tests.cpp +++ b/opencl/test/unit_test/os_interface/performance_counters_tests.cpp @@ -5,11 +5,11 @@ * */ -#include "core/execution_environment/root_device_environment.h" -#include "core/os_interface/os_interface.h" -#include "core/os_interface/os_time.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/utilities/tag_allocator.h" +#include "execution_environment/root_device_environment.h" +#include "os_interface/os_interface.h" +#include "os_interface/os_time.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "utilities/tag_allocator.h" #include "opencl/test/unit_test/fixtures/device_instrumentation_fixture.h" #include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.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 911f4edb56..85d1d6e8e6 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 @@ -5,11 +5,11 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/os_interface/os_interface.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm_memory_manager.h" -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "execution_environment/execution_environment.h" +#include "os_interface/os_interface.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm_memory_manager.h" +#include "unit_tests/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/deferrable_deletion_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/deferrable_deletion_win_tests.cpp index 9bc6f20cb4..5391ee440b 100644 --- a/opencl/test/unit_test/os_interface/windows/deferrable_deletion_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/deferrable_deletion_win_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/execution_environment/root_device_environment.h" -#include "core/os_interface/windows/deferrable_deletion_win.h" +#include "execution_environment/root_device_environment.h" +#include "os_interface/windows/deferrable_deletion_win.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_wddm.h" diff --git a/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp b/opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp index e8966564c6..fadb3ba77f 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 @@ -5,21 +5,21 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/linear_stream.h" -#include "core/command_stream/preemption.h" -#include "core/helpers/flush_stamp.h" -#include "core/helpers/hw_cmds.h" -#include "core/helpers/windows/gmm_callbacks.h" -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/windows/os_context_win.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm_memory_manager.h" -#include "core/os_interface/windows/wddm_memory_operations_handler.h" -#include "core/os_interface/windows/wddm_residency_controller.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/linear_stream.h" +#include "command_stream/preemption.h" +#include "helpers/flush_stamp.h" +#include "helpers/hw_cmds.h" +#include "helpers/windows/gmm_callbacks.h" +#include "memory_manager/internal_allocation_storage.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/windows/os_context_win.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm_memory_manager.h" +#include "os_interface/windows/wddm_memory_operations_handler.h" +#include "os_interface/windows/wddm_residency_controller.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 6d969ee2c5..c4e0552941 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 @@ -5,9 +5,9 @@ * */ -#include "core/device/device.h" -#include "core/helpers/get_info.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "device/device.h" +#include "helpers/get_info.h" +#include "unit_tests/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 e4a24d810a..b28fee5c96 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 @@ -5,12 +5,12 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/os_interface/windows/debug_registry_reader.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "command_stream/preemption.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "os_interface/windows/debug_registry_reader.h" +#include "os_interface/windows/os_interface.h" +#include "unit_tests/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/file_logger_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp index fc834756bf..ffaf67ef5c 100644 --- a/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/file_logger_win_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/gmm_helper/gmm.h" +#include "debug_settings/debug_settings_manager.h" +#include "gmm_helper/gmm.h" #include "opencl/source/platform/platform.h" #include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h" #include "opencl/test/unit_test/utilities/file_logger_tests.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 33f4feeba7..c0326a47f7 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 @@ -6,9 +6,9 @@ */ #pragma once -#include "core/helpers/hw_info.h" -#include "core/os_interface/os_library.h" -#include "core/unit_tests/helpers/default_hw_info.h" +#include "helpers/hw_info.h" +#include "os_interface/os_library.h" +#include "unit_tests/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/gl/gl_dll_helper.h b/opencl/test/unit_test/os_interface/windows/gl/gl_dll_helper.h index 3ccc9d9d89..f2a0ba4d68 100644 --- a/opencl/test/unit_test/os_interface/windows/gl/gl_dll_helper.h +++ b/opencl/test/unit_test/os_interface/windows/gl/gl_dll_helper.h @@ -7,8 +7,8 @@ #pragma once -#include "core/helpers/debug_helpers.h" -#include "core/os_interface/os_library.h" +#include "helpers/debug_helpers.h" +#include "os_interface/os_library.h" #include "opencl/source/extensions/public/cl_gl_private_intel.h" #include "Gl/gl.h" diff --git a/opencl/test/unit_test/os_interface/windows/gl/gl_os_sharing_tests.cpp b/opencl/test/unit_test/os_interface/windows/gl/gl_os_sharing_tests.cpp index 956ac6da84..9191e2f432 100644 --- a/opencl/test/unit_test/os_interface/windows/gl/gl_os_sharing_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/gl/gl_os_sharing_tests.cpp @@ -5,13 +5,13 @@ * */ -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/timestamp_packet.h" -#include "core/os_interface/os_interface.h" -#include "core/os_interface/windows/os_context_win.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm/wddm.h" -#include "core/os_interface/windows/wddm_memory_operations_handler.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/timestamp_packet.h" +#include "os_interface/os_interface.h" +#include "os_interface/windows/os_context_win.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/wddm_memory_operations_handler.h" #include "opencl/source/extensions/public/cl_gl_private_intel.h" #include "opencl/source/sharings/gl/gl_arb_sync_event.h" #include "opencl/source/sharings/gl/windows/gl_sharing_windows.h" 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 f27559f9bf..763baded6b 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 @@ -7,11 +7,11 @@ #include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/hw_helper.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm/wddm.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/hw_helper.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm/wddm.h" +#include "unit_tests/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/hw_info_config_win_tests.h b/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h index b9ca484d6d..798efe2e11 100644 --- a/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h +++ b/opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h @@ -7,7 +7,7 @@ #pragma once -#include "core/os_interface/hw_info_config.h" +#include "os_interface/hw_info_config.h" #include "opencl/test/unit_test/os_interface/hw_info_config_tests.h" #include diff --git a/opencl/test/unit_test/os_interface/windows/mock_kmdaf_listener.h b/opencl/test/unit_test/os_interface/windows/mock_kmdaf_listener.h index af9691ee55..a1e56eb76b 100644 --- a/opencl/test/unit_test/os_interface/windows/mock_kmdaf_listener.h +++ b/opencl/test/unit_test/os_interface/windows/mock_kmdaf_listener.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/windows/kmdaf_listener.h" +#include "os_interface/windows/kmdaf_listener.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/windows/mock_os_time_win.h b/opencl/test/unit_test/os_interface/windows/mock_os_time_win.h index 0b43d3837a..983c582b2d 100644 --- a/opencl/test/unit_test/os_interface/windows/mock_os_time_win.h +++ b/opencl/test/unit_test/os_interface/windows/mock_os_time_win.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/windows/os_time_win.h" +#include "os_interface/windows/os_time_win.h" namespace NEO { class MockOSTimeWin : public OSTimeWin { diff --git a/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.cpp b/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.cpp index ce3f2009b0..2be8e776e6 100644 --- a/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.cpp +++ b/opencl/test/unit_test/os_interface/windows/mock_performance_counters_win.cpp @@ -7,9 +7,9 @@ #include "mock_performance_counters_win.h" -#include "core/os_interface/os_interface.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/windows_wrapper.h" +#include "os_interface/os_interface.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/windows_wrapper.h" #include "opencl/test/unit_test/mocks/mock_wddm.h" #include "opencl/test/unit_test/os_interface/windows/mock_os_time_win.h" diff --git a/opencl/test/unit_test/os_interface/windows/mock_registry_reader.cpp b/opencl/test/unit_test/os_interface/windows/mock_registry_reader.cpp index 469b83fd53..4c81b6c4f9 100644 --- a/opencl/test/unit_test/os_interface/windows/mock_registry_reader.cpp +++ b/opencl/test/unit_test/os_interface/windows/mock_registry_reader.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/windows_wrapper.h" +#include "os_interface/windows/windows_wrapper.h" LSTATUS APIENTRY RegOpenKeyExA( HKEY hKey, diff --git a/opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h b/opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h index 03e74585dd..df91fb7383 100644 --- a/opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h +++ b/opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/os_interface/windows/wddm_allocation.h" +#include "os_interface/windows/wddm_allocation.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h b/opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h index c2426e738b..706ecd9de5 100644 --- a/opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h +++ b/opencl/test/unit_test/os_interface/windows/mock_wddm_memory_manager.h @@ -6,8 +6,8 @@ */ #pragma once -#include "core/memory_manager/deferred_deleter.h" -#include "core/os_interface/windows/wddm_memory_manager.h" +#include "memory_manager/deferred_deleter.h" +#include "os_interface/windows/wddm_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_host_ptr_manager.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" diff --git a/opencl/test/unit_test/os_interface/windows/options.cpp b/opencl/test/unit_test/os_interface/windows/options.cpp index 571dffe23f..41e001ee59 100644 --- a/opencl/test/unit_test/os_interface/windows/options.cpp +++ b/opencl/test/unit_test/os_interface/windows/options.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/os_library.h" +#include "os_interface/os_library.h" #include "common/gtsysinfo.h" #include "igfxfmid.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 2e93253ece..999fb12589 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/os_interface_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/os_interface_win_tests.cpp index cc3de3d638..a4c02303af 100644 --- a/opencl/test/unit_test/os_interface/windows/os_interface_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/os_interface_win_tests.cpp @@ -7,8 +7,8 @@ #include "opencl/test/unit_test/os_interface/windows/os_interface_win_tests.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/os_interface/windows/os_context_win.h" +#include "execution_environment/root_device_environment.h" +#include "os_interface/windows/os_context_win.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" diff --git a/opencl/test/unit_test/os_interface/windows/os_interface_win_tests.h b/opencl/test/unit_test/os_interface/windows/os_interface_win_tests.h index 6e4e8a8885..a524c1c46c 100644 --- a/opencl/test/unit_test/os_interface/windows/os_interface_win_tests.h +++ b/opencl/test/unit_test/os_interface/windows/os_interface_win_tests.h @@ -7,10 +7,10 @@ #pragma once -#include "core/helpers/hw_info.h" -#include "core/os_interface/device_factory.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm/wddm.h" +#include "helpers/hw_info.h" +#include "os_interface/device_factory.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm/wddm.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/os_interface/windows/os_library_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/os_library_win_tests.cpp index 2a11420c5a..6a71f8af65 100644 --- a/opencl/test/unit_test/os_interface/windows/os_library_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/os_library_win_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/os_library_win.h" +#include "os_interface/windows/os_library_win.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "test.h" diff --git a/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp b/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp index 12e3a0a2ff..01844737df 100644 --- a/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/os_time_win_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/execution_environment/root_device_environment.h" -#include "core/os_interface/windows/os_interface.h" +#include "execution_environment/root_device_environment.h" +#include "os_interface/windows/os_interface.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/os_interface/windows/wddm_fixture.h" diff --git a/opencl/test/unit_test/os_interface/windows/registry_reader_tests.h b/opencl/test/unit_test/os_interface/windows/registry_reader_tests.h index 2812facd45..9d73e889ee 100644 --- a/opencl/test/unit_test/os_interface/windows/registry_reader_tests.h +++ b/opencl/test/unit_test/os_interface/windows/registry_reader_tests.h @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/debug_registry_reader.h" +#include "os_interface/windows/debug_registry_reader.h" #include "opencl/source/os_interface/ocl_reg_path.h" namespace NEO { diff --git a/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h b/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h index 51dea8584b..3138a7b191 100644 --- a/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h +++ b/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.h @@ -7,7 +7,7 @@ #pragma once -#include "core/memory_manager/memory_constants.h" +#include "memory_manager/memory_constants.h" #include #include 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 e9cb846be1..2ec3108831 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp @@ -5,20 +5,20 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/hw_info.h" -#include "core/os_interface/os_library.h" -#include "core/os_interface/os_time.h" -#include "core/os_interface/windows/os_context_win.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm/wddm_interface.h" -#include "core/os_interface/windows/wddm_allocation.h" -#include "core/os_interface/windows/wddm_engine_mapper.h" -#include "core/os_interface/windows/wddm_memory_manager.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/hw_info.h" +#include "os_interface/os_library.h" +#include "os_interface/os_time.h" +#include "os_interface/windows/os_context_win.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm/wddm_interface.h" +#include "os_interface/windows/wddm_allocation.h" +#include "os_interface/windows/wddm_engine_mapper.h" +#include "os_interface/windows/wddm_memory_manager.h" +#include "unit_tests/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 43a0169199..3d34d4df98 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp @@ -5,14 +5,14 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/memory_constants.h" -#include "core/os_interface/windows/gdi_interface.h" -#include "core/os_interface/windows/os_context_win.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/preemption.h" +#include "execution_environment/execution_environment.h" +#include "helpers/hw_helper.h" +#include "memory_manager/memory_constants.h" +#include "os_interface/windows/gdi_interface.h" +#include "os_interface/windows/os_context_win.h" +#include "os_interface/windows/os_interface.h" +#include "unit_tests/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_address_space_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp index 72ece161ac..4a61e653d8 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_address_space_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/execution_environment/root_device_environment.h" +#include "command_stream/preemption.h" +#include "execution_environment/root_device_environment.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "opencl/test/unit_test/mocks/mock_wddm.h" #include "test.h" diff --git a/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp b/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp index 39bd38ab18..441efd3cb3 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/host_ptr_defines.h" +#include "memory_manager/host_ptr_defines.h" #include "opencl/test/unit_test/mocks/mock_wddm.h" #include "opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.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 180763c262..cd0dede50b 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_fixture.h +++ b/opencl/test/unit_test/os_interface/windows/wddm_fixture.h @@ -7,16 +7,16 @@ #pragma once -#include "core/command_stream/preemption.h" -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/hw_helper.h" -#include "core/os_interface/windows/gdi_interface.h" -#include "core/os_interface/windows/os_context_win.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm_memory_operations_handler.h" -#include "core/unit_tests/helpers/default_hw_info.h" -#include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" +#include "command_stream/preemption.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/hw_helper.h" +#include "os_interface/windows/gdi_interface.h" +#include "os_interface/windows/os_context_win.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm_memory_operations_handler.h" +#include "unit_tests/helpers/default_hw_info.h" +#include "unit_tests/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 04a135e5cd..75d742c472 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 @@ -5,14 +5,14 @@ * */ -#include "core/command_stream/preemption.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/memory_manager/memory_manager.h" -#include "core/os_interface/windows/wddm/wddm.h" -#include "core/os_interface/windows/wddm_allocation.h" -#include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" +#include "command_stream/preemption.h" +#include "execution_environment/root_device_environment.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "memory_manager/memory_manager.h" +#include "os_interface/windows/wddm/wddm.h" +#include "os_interface/windows/wddm_allocation.h" +#include "unit_tests/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_mapper_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_mapper_tests.cpp index 2accab73c3..a34f99ab72 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_mapper_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_mapper_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/wddm_engine_mapper.h" +#include "os_interface/windows/wddm_engine_mapper.h" #include "test.h" using namespace NEO; diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl index 0149ebc635..f7f2952211 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl +++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.inl @@ -5,7 +5,7 @@ * */ -#include "core/os_interface/windows/wddm_memory_manager.h" +#include "os_interface/windows/wddm_memory_manager.h" #include "opencl/test/unit_test/mocks/mock_memory_manager.h" #include "opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h" diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp index 235fa19258..4452d2bc21 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 @@ -7,17 +7,17 @@ #include "opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h" -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/array_count.h" -#include "core/os_interface/os_library.h" -#include "core/os_interface/windows/os_context_win.h" -#include "core/os_interface/windows/wddm_residency_controller.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/ult_hw_config.h" -#include "core/unit_tests/utilities/base_object_utils.h" -#include "core/utilities/tag_allocator.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/aligned_memory.h" +#include "helpers/array_count.h" +#include "os_interface/os_library.h" +#include "os_interface/windows/os_context_win.h" +#include "os_interface/windows/wddm_residency_controller.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/helpers/ult_hw_config.h" +#include "unit_tests/utilities/base_object_utils.h" +#include "utilities/tag_allocator.h" #include "opencl/source/helpers/memory_properties_flags_helpers.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/mem_obj/image.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 3c42b77f04..1b5a3044f6 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 @@ -7,9 +7,9 @@ #pragma once -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm_memory_operations_handler.h" -#include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm_memory_operations_handler.h" +#include "unit_tests/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 e7fde930ab..0ce22803cb 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 @@ -5,20 +5,20 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/command_stream/preemption.h" -#include "core/execution_environment/execution_environment.h" -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/hw_helper.h" -#include "core/memory_manager/memory_operations_handler.h" -#include "core/os_interface/os_context.h" -#include "core/os_interface/os_interface.h" -#include "core/os_interface/windows/os_context_win.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/os_interface/windows/wddm/wddm_interface.h" -#include "core/os_interface/windows/wddm_memory_operations_handler.h" -#include "core/os_interface/windows/wddm_residency_controller.h" -#include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" +#include "command_stream/command_stream_receiver.h" +#include "command_stream/preemption.h" +#include "execution_environment/execution_environment.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/hw_helper.h" +#include "memory_manager/memory_operations_handler.h" +#include "os_interface/os_context.h" +#include "os_interface/os_interface.h" +#include "os_interface/windows/os_context_win.h" +#include "os_interface/windows/os_interface.h" +#include "os_interface/windows/wddm/wddm_interface.h" +#include "os_interface/windows/wddm_memory_operations_handler.h" +#include "os_interface/windows/wddm_residency_controller.h" +#include "unit_tests/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 c272c92747..474c831e15 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 @@ -5,10 +5,10 @@ * */ -#include "core/os_interface/windows/wddm_memory_operations_handler.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/ult_hw_config.h" -#include "core/utilities/stackvec.h" +#include "os_interface/windows/wddm_memory_operations_handler.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/helpers/ult_hw_config.h" +#include "utilities/stackvec.h" #include "opencl/source/device/cl_device.h" #include "opencl/test/unit_test/helpers/variable_backup.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h" diff --git a/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.cpp b/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.cpp index 293a14b0ec..422bb9bdd3 100644 --- a/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.cpp +++ b/opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/perf_tests/fixtures/command_queue_fixture.h" -#include "core/device/device.h" +#include "device/device.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/context/context.h" diff --git a/opencl/test/unit_test/perf_tests/fixtures/device_fixture.h b/opencl/test/unit_test/perf_tests/fixtures/device_fixture.h index 2aa8a9c37b..35f14dfb69 100644 --- a/opencl/test/unit_test/perf_tests/fixtures/device_fixture.h +++ b/opencl/test/unit_test/perf_tests/fixtures/device_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/device/device.h" +#include "device/device.h" #include diff --git a/opencl/test/unit_test/perf_tests/fixtures/platform_fixture.cpp b/opencl/test/unit_test/perf_tests/fixtures/platform_fixture.cpp index a22b0f54b9..876f529580 100644 --- a/opencl/test/unit_test/perf_tests/fixtures/platform_fixture.cpp +++ b/opencl/test/unit_test/perf_tests/fixtures/platform_fixture.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/fixtures/platform_fixture.h" -#include "core/device/device.h" +#include "device/device.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/perf_tests/options_perf_tests.cpp b/opencl/test/unit_test/perf_tests/options_perf_tests.cpp index 5365a3f4fa..a934bb6a3f 100644 --- a/opencl/test/unit_test/perf_tests/options_perf_tests.cpp +++ b/opencl/test/unit_test/perf_tests/options_perf_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/hw_cmds.h" +#include "helpers/hw_cmds.h" #include "opencl/source/helpers/array_count.h" namespace NEO { diff --git a/opencl/test/unit_test/perf_tests/perf_test_utils.cpp b/opencl/test/unit_test/perf_tests/perf_test_utils.cpp index f05d7312c0..d833c4aca4 100644 --- a/opencl/test/unit_test/perf_tests/perf_test_utils.cpp +++ b/opencl/test/unit_test/perf_tests/perf_test_utils.cpp @@ -7,7 +7,7 @@ #include "perf_test_utils.h" -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include "opencl/source/helpers/hash.h" #include diff --git a/opencl/test/unit_test/perf_tests/perf_test_utils.h b/opencl/test/unit_test/perf_tests/perf_test_utils.h index 756c5ee66d..a3d69c26e8 100644 --- a/opencl/test/unit_test/perf_tests/perf_test_utils.h +++ b/opencl/test/unit_test/perf_tests/perf_test_utils.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/utilities/timer_util.h" +#include "utilities/timer_util.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/platform/platform_icd_tests.cpp b/opencl/test/unit_test/platform/platform_icd_tests.cpp index 71c15b70f8..42e5c5bcc5 100644 --- a/opencl/test/unit_test/platform/platform_icd_tests.cpp +++ b/opencl/test/unit_test/platform/platform_icd_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/string.h" +#include "helpers/string.h" #include "opencl/source/api/dispatch.h" #include "opencl/source/sharings/sharing_factory.h" #include "opencl/test/unit_test/mocks/mock_platform.h" diff --git a/opencl/test/unit_test/platform/platform_tests.cpp b/opencl/test/unit_test/platform/platform_tests.cpp index 8a4433220d..323b443424 100644 --- a/opencl/test/unit_test/platform/platform_tests.cpp +++ b/opencl/test/unit_test/platform/platform_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/device/device.h" -#include "core/helpers/hw_info.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "device/device.h" +#include "helpers/hw_info.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 4cf5546039..e9611ac9a6 100644 --- a/opencl/test/unit_test/profiling/profiling_tests.cpp +++ b/opencl/test/unit_test/profiling/profiling_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/os_interface/os_interface.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/base_object_utils.h" -#include "core/utilities/tag_allocator.h" +#include "os_interface/os_interface.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/utilities/base_object_utils.h" +#include "utilities/tag_allocator.h" #include "opencl/source/command_queue/command_queue_hw.h" #include "opencl/source/command_queue/enqueue_common.h" #include "opencl/source/command_queue/enqueue_kernel.h" diff --git a/opencl/test/unit_test/program/block_kernel_manager_tests.cpp b/opencl/test/unit_test/program/block_kernel_manager_tests.cpp index 9b2687f492..514f82dd6f 100644 --- a/opencl/test/unit_test/program/block_kernel_manager_tests.cpp +++ b/opencl/test/unit_test/program/block_kernel_manager_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/memory_manager/graphics_allocation.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/program/kernel_info.h" #include "opencl/test/unit_test/mocks/mock_block_kernel_manager.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.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 b746501e33..c56b87cbe7 100644 --- a/opencl/test/unit_test/program/evaluate_unhandled_token_tests.cpp +++ b/opencl/test/unit_test/program/evaluate_unhandled_token_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/device_binary_format/patchtokens_decoder.h" -#include "core/execution_environment/execution_environment.h" -#include "core/unit_tests/device_binary_format/patchtokens_tests.h" +#include "device_binary_format/patchtokens_decoder.h" +#include "execution_environment/execution_environment.h" +#include "unit_tests/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_data.cpp b/opencl/test/unit_test/program/kernel_data.cpp index 6000ca5b38..e060357920 100644 --- a/opencl/test/unit_test/program/kernel_data.cpp +++ b/opencl/test/unit_test/program/kernel_data.cpp @@ -5,7 +5,7 @@ * */ -#include "core/helpers/string.h" +#include "helpers/string.h" #include "opencl/source/platform/platform.h" #include "opencl/source/program/program.h" #include "opencl/test/unit_test/fixtures/kernel_data_fixture.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 149d26a607..99c9c019b9 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 @@ -5,8 +5,8 @@ * */ -#include "core/device_binary_format/patchtokens_decoder.h" -#include "core/unit_tests/device_binary_format/patchtokens_tests.h" +#include "device_binary_format/patchtokens_decoder.h" +#include "unit_tests/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/kernel_info_tests.cpp b/opencl/test/unit_test/program/kernel_info_tests.cpp index 1df42a491b..f97e415aaf 100644 --- a/opencl/test/unit_test/program/kernel_info_tests.cpp +++ b/opencl/test/unit_test/program/kernel_info_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/execution_environment/execution_environment.h" +#include "execution_environment/execution_environment.h" #include "opencl/source/memory_manager/os_agnostic_memory_manager.h" #include "opencl/source/program/kernel_arg_info.h" #include "opencl/source/program/kernel_info.h" diff --git a/opencl/test/unit_test/program/printf_helper_tests.cpp b/opencl/test/unit_test/program/printf_helper_tests.cpp index 527c21bc76..889e829795 100644 --- a/opencl/test/unit_test/program/printf_helper_tests.cpp +++ b/opencl/test/unit_test/program/printf_helper_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/helpers/aligned_memory.h" -#include "core/helpers/string.h" -#include "core/program/print_formatter.h" +#include "helpers/aligned_memory.h" +#include "helpers/string.h" +#include "program/print_formatter.h" #include "opencl/test/unit_test/mocks/mock_device.h" #include "opencl/test/unit_test/mocks/mock_graphics_allocation.h" #include "opencl/test/unit_test/mocks/mock_kernel.h" 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 04b12f6645..44034494c8 100644 --- a/opencl/test/unit_test/program/process_elf_binary_tests.cpp +++ b/opencl/test/unit_test/program/process_elf_binary_tests.cpp @@ -5,13 +5,13 @@ * */ -#include "core/device/device.h" -#include "core/device_binary_format/elf/elf.h" -#include "core/device_binary_format/elf/elf_decoder.h" -#include "core/device_binary_format/elf/ocl_elf.h" -#include "core/helpers/file_io.h" -#include "core/helpers/string.h" -#include "core/unit_tests/device_binary_format/patchtokens_tests.h" +#include "device/device.h" +#include "device_binary_format/elf/elf.h" +#include "device_binary_format/elf/elf_decoder.h" +#include "device_binary_format/elf/ocl_elf.h" +#include "helpers/file_io.h" +#include "helpers/string.h" +#include "unit_tests/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/process_spir_binary_tests.cpp b/opencl/test/unit_test/program/process_spir_binary_tests.cpp index caa5791088..4a79d25bf7 100644 --- a/opencl/test/unit_test/program/process_spir_binary_tests.cpp +++ b/opencl/test/unit_test/program/process_spir_binary_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/device/device.h" -#include "core/helpers/string.h" +#include "device/device.h" +#include "helpers/string.h" #include "opencl/test/unit_test/mocks/mock_program.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/program/program_data_tests.cpp b/opencl/test/unit_test/program/program_data_tests.cpp index 19da724107..a28f8d4564 100644 --- a/opencl/test/unit_test/program/program_data_tests.cpp +++ b/opencl/test/unit_test/program/program_data_tests.cpp @@ -5,13 +5,13 @@ * */ -#include "core/helpers/string.h" -#include "core/memory_manager/allocations_list.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/unified_memory_manager.h" -#include "core/program/program_info_from_patchtokens.h" -#include "core/unit_tests/compiler_interface/linker_mock.h" -#include "core/unit_tests/device_binary_format/patchtokens_tests.h" +#include "helpers/string.h" +#include "memory_manager/allocations_list.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/unified_memory_manager.h" +#include "program/program_info_from_patchtokens.h" +#include "unit_tests/compiler_interface/linker_mock.h" +#include "unit_tests/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_nonuniform.cpp b/opencl/test/unit_test/program/program_nonuniform.cpp index 519bf7a0c5..3829abfebe 100644 --- a/opencl/test/unit_test/program/program_nonuniform.cpp +++ b/opencl/test/unit_test/program/program_nonuniform.cpp @@ -5,11 +5,11 @@ * */ -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/hash.h" -#include "core/helpers/ptr_math.h" -#include "core/memory_manager/graphics_allocation.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "helpers/aligned_memory.h" +#include "helpers/hash.h" +#include "helpers/ptr_math.h" +#include "memory_manager/graphics_allocation.h" #include "opencl/source/helpers/hardware_commands_helper.h" #include "opencl/source/kernel/kernel.h" #include "opencl/test/unit_test/fixtures/device_fixture.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 acfcf2846d..ee253d13f1 100644 --- a/opencl/test/unit_test/program/program_spec_constants_tests.cpp +++ b/opencl/test/unit_test/program/program_spec_constants_tests.cpp @@ -5,11 +5,11 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/compiler_interface/compiler_interface.inl" -#include "core/helpers/file_io.h" -#include "core/helpers/hw_info.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "compiler_interface/compiler_interface.h" +#include "compiler_interface/compiler_interface.inl" +#include "helpers/file_io.h" +#include "helpers/hw_info.h" +#include "unit_tests/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 5a5abff122..dd13b0b704 100644 --- a/opencl/test/unit_test/program/program_tests.cpp +++ b/opencl/test/unit_test/program/program_tests.cpp @@ -7,24 +7,24 @@ #include "opencl/test/unit_test/program/program_tests.h" -#include "core/command_stream/command_stream_receiver_hw.h" -#include "core/compiler_interface/intermediate_representations.h" -#include "core/device_binary_format/elf/elf_decoder.h" -#include "core/device_binary_format/elf/ocl_elf.h" -#include "core/device_binary_format/patchtokens_decoder.h" -#include "core/gmm_helper/gmm_helper.h" -#include "core/helpers/aligned_memory.h" -#include "core/helpers/hash.h" -#include "core/helpers/hw_helper.h" -#include "core/helpers/ptr_math.h" -#include "core/helpers/string.h" -#include "core/memory_manager/allocations_list.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/memory_manager/surface.h" -#include "core/os_interface/os_context.h" -#include "core/unit_tests/device_binary_format/patchtokens_tests.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "command_stream/command_stream_receiver_hw.h" +#include "compiler_interface/intermediate_representations.h" +#include "device_binary_format/elf/elf_decoder.h" +#include "device_binary_format/elf/ocl_elf.h" +#include "device_binary_format/patchtokens_decoder.h" +#include "gmm_helper/gmm_helper.h" +#include "helpers/aligned_memory.h" +#include "helpers/hash.h" +#include "helpers/hw_helper.h" +#include "helpers/ptr_math.h" +#include "helpers/string.h" +#include "memory_manager/allocations_list.h" +#include "memory_manager/graphics_allocation.h" +#include "memory_manager/surface.h" +#include "os_interface/os_context.h" +#include "unit_tests/device_binary_format/patchtokens_tests.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/program/program_with_block_kernels_tests.cpp b/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp index 7a9cf065ed..8ba8ab0af4 100644 --- a/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp +++ b/opencl/test/unit_test/program/program_with_block_kernels_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/compiler_interface/compiler_interface.h" -#include "core/device/device.h" +#include "compiler_interface/compiler_interface.h" +#include "device/device.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/program/block_kernel_manager.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" diff --git a/opencl/test/unit_test/program/program_with_source.h b/opencl/test/unit_test/program/program_with_source.h index dbe349550d..3c33072df7 100644 --- a/opencl/test/unit_test/program/program_with_source.h +++ b/opencl/test/unit_test/program/program_with_source.h @@ -7,7 +7,7 @@ #pragma once -#include "core/compiler_interface/compiler_interface.h" +#include "compiler_interface/compiler_interface.h" #include "opencl/test/unit_test/fixtures/context_fixture.h" #include "opencl/test/unit_test/fixtures/memory_management_fixture.h" #include "opencl/test/unit_test/fixtures/platform_fixture.h" diff --git a/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp b/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp index 33f8935f0d..7fd95a37af 100644 --- a/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp +++ b/opencl/test/unit_test/sampler/sampler_set_arg_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/ptr_math.h" -#include "core/utilities/numeric.h" +#include "helpers/ptr_math.h" +#include "utilities/numeric.h" #include "opencl/source/helpers/sampler_helpers.h" #include "opencl/source/kernel/kernel.h" #include "opencl/source/sampler/sampler.h" 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 5e33e4f4ed..c33d863752 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 "core/unit_tests/utilities/base_object_utils.h" +#include "unit_tests/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 a2e99c1ba8..029a896cb1 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 @@ -5,9 +5,9 @@ * */ -#include "core/memory_manager/internal_allocation_storage.h" -#include "core/os_interface/windows/os_interface.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "memory_manager/internal_allocation_storage.h" +#include "os_interface/windows/os_interface.h" +#include "unit_tests/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 5d98a079a5..278392d33b 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 "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/scheduler/scheduler_source_tests.cpp b/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp index a3df854527..1bee57c424 100644 --- a/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp +++ b/opencl/test/unit_test/scheduler/scheduler_source_tests.cpp @@ -7,7 +7,7 @@ #include "opencl/test/unit_test/scheduler/scheduler_source_tests.h" -#include "core/helpers/hw_cmds.h" +#include "helpers/hw_cmds.h" #include "opencl/source/device_queue/device_queue_hw.h" #include "opencl/test/unit_test/fixtures/device_host_queue_fixture.h" #include "opencl/test/unit_test/fixtures/execution_model_fixture.h" diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp index 154314a342..a62ed035b0 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_arb_sync_event_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/os_interface/os_interface.h" +#include "execution_environment/execution_environment.h" +#include "os_interface/os_interface.h" #include "opencl/source/context/context.h" #include "opencl/source/event/user_event.h" #include "opencl/source/platform/platform.h" diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp index 4b0595d312..48a0faff7b 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_create_from_texture_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gmm_helper/gmm_types_converter.h" -#include "core/helpers/get_info.h" +#include "gmm_helper/gmm_types_converter.h" +#include "helpers/get_info.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/sharings/gl/gl_texture.h" #include "opencl/test/unit_test/libult/ult_command_stream_receiver.h" diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp index 9e9c61546c..8f0b27cf9f 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_reused_buffers_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/gmm_helper/gmm.h" -#include "core/gmm_helper/resource_info.h" +#include "gmm_helper/gmm.h" +#include "gmm_helper/resource_info.h" #include "opencl/source/device/cl_device.h" #include "opencl/source/mem_obj/buffer.h" #include "opencl/source/sharings/gl/gl_buffer.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 85d0dacae6..842452ef59 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 @@ -5,11 +5,11 @@ * */ -#include "core/device/device.h" -#include "core/gmm_helper/gmm.h" -#include "core/helpers/array_count.h" -#include "core/os_interface/os_interface.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "device/device.h" +#include "gmm_helper/gmm.h" +#include "helpers/array_count.h" +#include "os_interface/os_interface.h" +#include "unit_tests/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/gl/windows/gl_texture_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp index 64db966be6..fbb876c98a 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gmm_helper/gmm_types_converter.h" +#include "gmm_helper/gmm_types_converter.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/platform/platform.h" #include "opencl/source/sharings/gl/gl_texture.h" diff --git a/opencl/test/unit_test/sharings/sharing_factory_tests.cpp b/opencl/test/unit_test/sharings/sharing_factory_tests.cpp index d1f432483c..6e64e48fb5 100644 --- a/opencl/test/unit_test/sharings/sharing_factory_tests.cpp +++ b/opencl/test/unit_test/sharings/sharing_factory_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/command_stream/command_stream_receiver.h" -#include "core/device/device.h" -#include "core/helpers/string.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "command_stream/command_stream_receiver.h" +#include "device/device.h" +#include "helpers/string.h" +#include "unit_tests/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/unified/unified_sharing_image_tests.cpp b/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp index 60b93c5028..ddafc265bc 100644 --- a/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp +++ b/opencl/test/unit_test/sharings/unified/unified_sharing_image_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/gmm_helper/gmm.h" +#include "gmm_helper/gmm.h" #include "opencl/source/mem_obj/image.h" #include "opencl/source/sharings/unified/unified_image.h" #include "opencl/test/unit_test/helpers/raii_hw_helper.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 8a53b81e86..f62d947fbf 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 6dca58b708..65f3ed8338 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/mock_va_sharing.h b/opencl/test/unit_test/sharings/va/mock_va_sharing.h index 8ed18faa34..0e08fc4d61 100644 --- a/opencl/test/unit_test/sharings/va/mock_va_sharing.h +++ b/opencl/test/unit_test/sharings/va/mock_va_sharing.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/aligned_memory.h" +#include "helpers/aligned_memory.h" #include "opencl/source/sharings/va/va_sharing.h" namespace NEO { 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 ea49ee7d86..60b7ebff7c 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 aeed8f377f..9f9740fe56 100644 --- a/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/va/va_sharing_tests.cpp @@ -5,10 +5,10 @@ * */ -#include "core/gmm_helper/gmm.h" -#include "core/helpers/array_count.h" -#include "core/memory_manager/graphics_allocation.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "gmm_helper/gmm.h" +#include "helpers/array_count.h" +#include "memory_manager/graphics_allocation.h" +#include "unit_tests/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/sku_info/sku_info_base_reference.h b/opencl/test/unit_test/sku_info/sku_info_base_reference.h index 9ce2c1a324..3db73ab6a2 100644 --- a/opencl/test/unit_test/sku_info/sku_info_base_reference.h +++ b/opencl/test/unit_test/sku_info/sku_info_base_reference.h @@ -7,7 +7,7 @@ #pragma once -#include "core/gmm_helper/gmm_lib.h" +#include "gmm_helper/gmm_lib.h" #include "sku_info.h" diff --git a/opencl/test/unit_test/sku_info/sku_info_receiver_tests.cpp b/opencl/test/unit_test/sku_info/sku_info_receiver_tests.cpp index 91c2cbcf9d..82715a12b1 100644 --- a/opencl/test/unit_test/sku_info/sku_info_receiver_tests.cpp +++ b/opencl/test/unit_test/sku_info/sku_info_receiver_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/sku_info/operations/windows/sku_info_receiver.h" +#include "sku_info/operations/windows/sku_info_receiver.h" #include "opencl/test/unit_test/sku_info/sku_info_base_reference.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/sku_info/sku_info_transfer_tests.cpp b/opencl/test/unit_test/sku_info/sku_info_transfer_tests.cpp index 6bdf47dffb..e586664625 100644 --- a/opencl/test/unit_test/sku_info/sku_info_transfer_tests.cpp +++ b/opencl/test/unit_test/sku_info/sku_info_transfer_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "core/sku_info/operations/sku_info_transfer.h" +#include "sku_info/operations/sku_info_transfer.h" #include "opencl/test/unit_test/sku_info/sku_info_base_reference.h" #include "gtest/gtest.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 b25f90cf95..a65d1af9a9 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 "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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 d3c107bffe..d3bb405497 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 @@ -5,9 +5,9 @@ * */ -#include "core/device/device.h" -#include "core/os_interface/os_interface.h" -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "device/device.h" +#include "os_interface/os_interface.h" +#include "unit_tests/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 73a879dba4..2cd2a62af3 100644 --- a/opencl/test/unit_test/ult_config_listener.cpp +++ b/opencl/test/unit_test/ult_config_listener.cpp @@ -7,10 +7,10 @@ #include "opencl/test/unit_test/ult_config_listener.h" -#include "core/execution_environment/execution_environment.h" -#include "core/memory_manager/memory_manager.h" -#include "core/unit_tests/helpers/default_hw_info.h" -#include "core/unit_tests/helpers/ult_hw_config.h" +#include "execution_environment/execution_environment.h" +#include "memory_manager/memory_manager.h" +#include "unit_tests/helpers/default_hw_info.h" +#include "unit_tests/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/ult_config_listener.h b/opencl/test/unit_test/ult_config_listener.h index fc6d9de965..00eb9a5e70 100644 --- a/opencl/test/unit_test/ult_config_listener.h +++ b/opencl/test/unit_test/ult_config_listener.h @@ -6,7 +6,7 @@ */ #pragma once -#include "core/helpers/hw_info.h" +#include "helpers/hw_info.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/utilities/debug_file_reader_tests.inl b/opencl/test/unit_test/utilities/debug_file_reader_tests.inl index 5a6dc392b1..ed5081748f 100644 --- a/opencl/test/unit_test/utilities/debug_file_reader_tests.inl +++ b/opencl/test/unit_test/utilities/debug_file_reader_tests.inl @@ -5,8 +5,8 @@ * */ -#include "core/helpers/file_io.h" -#include "core/utilities/debug_file_reader.h" +#include "helpers/file_io.h" +#include "utilities/debug_file_reader.h" #include "test.h" #include "gtest/gtest.h" diff --git a/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp b/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp index 7dc0d8c914..df589b5421 100644 --- a/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp +++ b/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp @@ -5,7 +5,7 @@ * */ -#include "core/utilities/debug_settings_reader_creator.h" +#include "utilities/debug_settings_reader_creator.h" namespace NEO { std::unique_ptr SettingsReaderCreator::create(const std::string ®Key) { diff --git a/opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp b/opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp index 70e6daa474..3612c2bf3b 100644 --- a/opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp +++ b/opencl/test/unit_test/utilities/debug_settings_reader_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/debug_settings/debug_settings_manager.h" -#include "core/helpers/file_io.h" -#include "core/utilities/debug_settings_reader.h" +#include "debug_settings/debug_settings_manager.h" +#include "helpers/file_io.h" +#include "utilities/debug_settings_reader.h" #include "opencl/source/os_interface/ocl_reg_path.h" #include "test.h" diff --git a/opencl/test/unit_test/utilities/file_logger_tests.cpp b/opencl/test/unit_test/utilities/file_logger_tests.cpp index 24d296a120..41ff83bb23 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 "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "core/unit_tests/utilities/base_object_utils.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" +#include "unit_tests/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/utilities/file_logger_tests.h b/opencl/test/unit_test/utilities/file_logger_tests.h index 0b3ee12bd9..e6aba1ea92 100644 --- a/opencl/test/unit_test/utilities/file_logger_tests.h +++ b/opencl/test/unit_test/utilities/file_logger_tests.h @@ -7,8 +7,8 @@ #pragma once -#include "core/helpers/file_io.h" -#include "core/utilities/directory.h" +#include "helpers/file_io.h" +#include "utilities/directory.h" #include "opencl/source/helpers/string_helpers.h" #include "opencl/source/utilities/logger.h" diff --git a/opencl/test/unit_test/utilities/tag_allocator_tests.cpp b/opencl/test/unit_test/utilities/tag_allocator_tests.cpp index 7db6ad79f5..a364a72b13 100644 --- a/opencl/test/unit_test/utilities/tag_allocator_tests.cpp +++ b/opencl/test/unit_test/utilities/tag_allocator_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/helpers/timestamp_packet.h" -#include "core/utilities/tag_allocator.h" +#include "helpers/timestamp_packet.h" +#include "utilities/tag_allocator.h" #include "opencl/test/unit_test/fixtures/memory_allocator_fixture.h" #include "test.h" diff --git a/opencl/test/unit_test/windows/get_devices_tests.cpp b/opencl/test/unit_test/windows/get_devices_tests.cpp index 66f1551e26..d4a306c3bb 100644 --- a/opencl/test/unit_test/windows/get_devices_tests.cpp +++ b/opencl/test/unit_test/windows/get_devices_tests.cpp @@ -5,9 +5,9 @@ * */ -#include "core/execution_environment/execution_environment.h" -#include "core/helpers/hw_info.h" -#include "core/os_interface/device_factory.h" +#include "execution_environment/execution_environment.h" +#include "helpers/hw_info.h" +#include "os_interface/device_factory.h" #include "opencl/source/platform/platform.h" #include "test.h" diff --git a/opencl/test/unit_test/windows/os_interface_tests.cpp b/opencl/test/unit_test/windows/os_interface_tests.cpp index b66f9331b9..7dd1b991fb 100644 --- a/opencl/test/unit_test/windows/os_interface_tests.cpp +++ b/opencl/test/unit_test/windows/os_interface_tests.cpp @@ -5,8 +5,8 @@ * */ -#include "core/memory_manager/memory_constants.h" -#include "core/os_interface/windows/os_interface.h" +#include "memory_manager/memory_constants.h" +#include "os_interface/windows/os_interface.h" #include "test.h" TEST(osInterfaceTests, osInterfaceLocalMemoryEnabledByDefault) { diff --git a/opencl/test/unit_test/windows/wddm_create_tests.cpp b/opencl/test/unit_test/windows/wddm_create_tests.cpp index 6d018b5c36..5617294747 100644 --- a/opencl/test/unit_test/windows/wddm_create_tests.cpp +++ b/opencl/test/unit_test/windows/wddm_create_tests.cpp @@ -5,11 +5,11 @@ * */ -#include "core/execution_environment/root_device_environment.h" -#include "core/helpers/hw_info.h" -#include "core/os_interface/os_interface.h" -#include "core/os_interface/windows/wddm/wddm.h" -#include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "execution_environment/root_device_environment.h" +#include "helpers/hw_info.h" +#include "os_interface/os_interface.h" +#include "os_interface/windows/wddm/wddm.h" +#include "unit_tests/helpers/debug_manager_state_restore.h" #include "opencl/test/unit_test/mocks/mock_execution_environment.h" #include "test.h"