Change core inlcudes

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

.clang-format

@@ -85,7 +85,7 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Right
 ReflowComments:  true
-SortIncludes:    true
+SortIncludes:    false
 SpaceAfterCStyleCast: false
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements

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

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 {
 

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 <cstdint>
 #include <limits>

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 <algorithm>
 

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 <algorithm>

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 <algorithm>

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 {

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 <cstddef>
 #include <cstdint>

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 <typename GfxFamily>

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"
 

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 {
 

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 <typename GfxFamily>

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 <limits>
 

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 {
 

core/command_stream/csr_deps.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "core/utilities/stackvec.h"
+#include "utilities/stackvec.h"
 
 namespace NEO {
 

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 {
 

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 <cstring>
 #include <type_traits>

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 {
 

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 {
 

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 <atomic>
 #include <cstddef>

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"

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"
 

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"
 

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)

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 <cstddef>
 #include <cstdint>

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)

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 {
 

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

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 <vector>
 namespace NEO {

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"

core/compiler_interface/compiler_cache.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "core/utilities/arrayref.h"
+#include "utilities/arrayref.h"
 
 #include <cstdint>
 #include <cstring>

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"

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"

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"

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"

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 {

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();

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 <algorithm>
 #include <cstdint>

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"
 

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 <cstdio>
 #include <sstream>

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"

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 {
 

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"
 

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"
 

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 {
 

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

core/device/root_device.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "core/device/device.h"
+#include "device/device.h"
 
 namespace NEO {
 

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 {
 

core/device/sub_device.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "core/device/device.h"
+#include "device/device.h"
 
 namespace NEO {
 class RootDevice;

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 {

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 <cstdint>
 

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 {

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 <vector>
 

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 <cstring>
 #include <vector>

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 {
 

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 <tuple>
 

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 {

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 {
 

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 <cstddef>
 #include <cstdint>

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 <inttypes.h>
 #include <stddef.h>

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 <string.h>
 

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 <cstdint>
 

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 <algorithm>
 

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 <queue>
 #include <string>

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 <inttypes.h>
 #include <stddef.h>

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 <algorithm>
 

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"

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"

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 <string>
 

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 <memory>
 

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 <cstring>
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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;
 

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 {
 

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"
 

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 <mutex>
 #include <vector>

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 {

core/execution_environment/root_device_environment.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "core/helpers/options.h"
+#include "helpers/options.h"
 
 #include <cstdint>
 #include <memory>

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 {
 

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 {
 

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 {

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 {
 

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<ICLFamily>;

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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

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<ICLFamily>;

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"
 

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 {
 

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<ICLFamily>;