Move runtime/helpers/aligned_memory.h to core/helpers

Signed-off-by: Jim Snow <jim.m.snow@intel.com>
Change-Id: I15de094c51d4eb18bfff4d17fd34e817b5525fda

core/helpers/CMakeLists.txt

@@ -6,6 +6,7 @@
 
 set(NEO_CORE_HELPERS
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/aligned_memory.h
   ${CMAKE_CURRENT_SOURCE_DIR}/basic_math.h
   ${CMAKE_CURRENT_SOURCE_DIR}/interlocked_max.h
   ${CMAKE_CURRENT_SOURCE_DIR}/non_copyable_or_moveable.h

core/unit_tests/helpers/aligned_memory_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 
 #include "gtest/gtest.h"
 

offline_compiler/decoder/binary_encoder.cpp

@@ -7,9 +7,9 @@
 
 #include "binary_encoder.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "elf/writer.h"
 #include "offline_compiler/offline_compiler.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/file_io.h"
 #include "runtime/helpers/hash.h"
 

runtime/api/api.cpp

@@ -7,6 +7,7 @@
 
 #include "api.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "runtime/accelerators/intel_motion_estimation.h"
 #include "runtime/api/additional_extensions.h"
 #include "runtime/aub/aub_center.h"
@@ -19,7 +20,6 @@
 #include "runtime/device_queue/device_queue.h"
 #include "runtime/event/user_event.h"
 #include "runtime/gtpin/gtpin_notify.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/get_info.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/mem_properties_parser_helper.h"

runtime/command_queue/command_queue.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/command_queue/command_queue.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
@@ -17,7 +18,6 @@
 #include "runtime/event/event_builder.h"
 #include "runtime/event/user_event.h"
 #include "runtime/gtpin/gtpin_notify.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/array_count.h"
 #include "runtime/helpers/convert_color.h"
 #include "runtime/helpers/get_info.h"

runtime/command_queue/gpgpu_walker_base.inl

@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include "core/helpers/aligned_memory.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_queue/local_id_gen.h"
@@ -13,7 +14,6 @@
 #include "runtime/device/device_info.h"
 #include "runtime/event/perf_counter.h"
 #include "runtime/event/user_event.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/hw_helper.h"

runtime/command_queue/local_id_gen.cpp

@@ -7,8 +7,8 @@
 
 #include "runtime/command_queue/local_id_gen.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "core/utilities/cpu_info.h"
-#include "runtime/helpers/aligned_memory.h"
 
 #include <array>
 

runtime/command_stream/aub_command_stream_receiver_hw_base.inl

@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
 #include "runtime/aub/aub_helper.h"
@@ -15,7 +16,6 @@
 #include "runtime/command_stream/aub_subcapture.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/hardware_context_controller.h"
 #include "runtime/helpers/hash.h"

runtime/command_stream/command_stream_receiver.h

@@ -6,13 +6,13 @@
  */
 
 #pragma once
+#include "core/helpers/aligned_memory.h"
 #include "runtime/command_stream/aub_subcapture.h"
 #include "runtime/command_stream/csr_definitions.h"
 #include "runtime/command_stream/linear_stream.h"
 #include "runtime/command_stream/submissions_aggregator.h"
 #include "runtime/command_stream/thread_arbitration_policy.h"
 #include "runtime/helpers/address_patch.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/blit_commands_helper.h"
 #include "runtime/helpers/completion_stamp.h"
 #include "runtime/helpers/flat_batch_buffer_helper.h"

runtime/command_stream/scratch_space_controller_base.cpp

@@ -7,8 +7,8 @@
 
 #include "runtime/command_stream/scratch_space_controller_base.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/preamble.h"
 #include "runtime/memory_manager/graphics_allocation.h"

runtime/command_stream/tbx_command_stream_receiver_hw.inl

@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/aub/aub_center.h"
 #include "runtime/aub/aub_helper.h"
@@ -12,7 +13,6 @@
 #include "runtime/command_stream/aub_command_stream_receiver.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/hardware_context_controller.h"
 #include "runtime/helpers/hw_helper.h"

runtime/compiler_interface/binary_cache.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include <core/helpers/aligned_memory.h>
 #include <runtime/compiler_interface/binary_cache.h>
-#include <runtime/helpers/aligned_memory.h>
 #include <runtime/helpers/file_io.h>
 #include <runtime/helpers/hash.h>
 #include <runtime/helpers/hw_info.h>

runtime/dll/linux/allocator_helper.cpp

@@ -7,8 +7,8 @@
 
 #include "runtime/os_interface/linux/allocator_helper.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
-#include "runtime/helpers/aligned_memory.h"
 
 namespace NEO {
 

runtime/event/event.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/event/event.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "public/cl_ext_private.h"
 #include "runtime/api/cl_types.h"
 #include "runtime/command_queue/command_queue.h"
@@ -15,7 +16,6 @@
 #include "runtime/device/device.h"
 #include "runtime/event/async_events_handler.h"
 #include "runtime/event/event_tracker.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/get_info.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/timestamp_packet.h"

runtime/gmm_helper/gmm.cpp

@@ -7,10 +7,10 @@
 
 #include "runtime/gmm_helper/gmm.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/hw_info.h"

runtime/gmm_helper/gmm_helper.cpp

@@ -7,10 +7,10 @@
 
 #include "runtime/gmm_helper/gmm_helper.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/resource_info.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/get_info.h"
 #include "runtime/helpers/hw_info.h"

runtime/helpers/CMakeLists.txt

@@ -8,7 +8,6 @@ set(RUNTIME_SRCS_HELPERS_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/abort.h
   ${CMAKE_CURRENT_SOURCE_DIR}/address_patch.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/aligned_memory.h
   ${CMAKE_CURRENT_SOURCE_DIR}/array_count.h
   ${CMAKE_CURRENT_SOURCE_DIR}/base_object.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/base_object.h

runtime/helpers/cache_policy.cpp

@@ -7,7 +7,7 @@
 
 #include "runtime/helpers/cache_policy.h"
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 
 namespace NEO {

runtime/helpers/hardware_commands_helper.inl

@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
@@ -12,7 +13,6 @@
 #include "runtime/command_stream/csr_definitions.h"
 #include "runtime/command_stream/preemption.h"
 #include "runtime/helpers/address_patch.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/kernel/kernel.h"

runtime/helpers/hash.h

@@ -7,7 +7,7 @@
 
 #pragma once
 #include "common/compiler_support.h"
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 
 #include <cstdint>
 

runtime/helpers/hw_helper_base.inl

@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/hw_info.h"

runtime/helpers/preamble_base.inl

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "runtime/command_stream/linear_stream.h"
 #include "runtime/command_stream/preemption.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/preamble.h"
 #include "runtime/kernel/kernel.h"
 

runtime/helpers/task_information.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/helpers/task_information.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/string.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/command_queue/command_queue.h"
@@ -16,7 +17,6 @@
 #include "runtime/device/device.h"
 #include "runtime/device_queue/device_queue.h"
 #include "runtime/gtpin/gtpin_notify.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/csr_deps.h"
 #include "runtime/helpers/task_information.inl"
 #include "runtime/mem_obj/mem_obj.h"

runtime/helpers/uint16_avx2.h

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

runtime/helpers/uint16_sse4.h

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

runtime/indirect_heap/indirect_heap.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/linear_stream.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/memory_manager/memory_constants.h"
 

runtime/kernel/kernel.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/kernel/kernel.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/accelerators/intel_accelerator.h"
@@ -20,7 +21,6 @@
 #include "runtime/execution_model/device_enqueue.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gtpin/gtpin_notify.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/get_info.h"
 #include "runtime/helpers/hw_helper.h"

runtime/mem_obj/buffer.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/mem_obj/buffer.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
 #include "runtime/command_queue/command_queue.h"
@@ -15,7 +16,6 @@
 #include "runtime/device/device.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/timestamp_packet.h"

runtime/mem_obj/buffer_base.inl

@@ -6,11 +6,11 @@
  */
 
 #include "common/helpers/bit_helpers.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/buffer.h"
 

runtime/mem_obj/image.cpp

@@ -8,6 +8,7 @@
 #include "runtime/mem_obj/image.h"
 
 #include "common/compiler_support.h"
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
@@ -17,7 +18,6 @@
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/get_info.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/hw_info.h"

runtime/mem_obj/image.inl

@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/image.h"
 

runtime/mem_obj/mem_obj.cpp

@@ -8,12 +8,12 @@
 #include "runtime/mem_obj/mem_obj.h"
 
 #include "common/helpers/bit_helpers.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
 #include "runtime/gmm_helper/gmm.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/get_info.h"
 #include "runtime/memory_manager/deferred_deleter.h"
 #include "runtime/memory_manager/internal_allocation_storage.h"

runtime/memory_manager/address_mapper.cpp

@@ -7,7 +7,7 @@
 
 #include "runtime/memory_manager/address_mapper.h"
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 
 #include <inttypes.h>
 #include <iostream>

runtime/memory_manager/gfx_partition.cpp

@@ -7,7 +7,7 @@
 
 #include "runtime/memory_manager/gfx_partition.h"
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 
 namespace NEO {
 

runtime/memory_manager/graphics_allocation.cpp

@@ -7,7 +7,7 @@
 
 #include "runtime/memory_manager/graphics_allocation.h"
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 
 namespace NEO {

runtime/memory_manager/memory_manager.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/memory_manager/memory_manager.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/event/event.h"
@@ -15,7 +16,6 @@
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/hw_info.h"

runtime/memory_manager/memory_manager.h

@@ -8,8 +8,8 @@
 #pragma once
 #include "common/helpers/bit_helpers.h"
 #include "core/command_stream/preemption_mode.h"
+#include "core/helpers/aligned_memory.h"
 #include "public/cl_ext_private.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/engine_control.h"
 #include "runtime/memory_manager/allocation_properties.h"
 #include "runtime/memory_manager/gfx_partition.h"

runtime/memory_manager/os_agnostic_memory_manager.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/aub/aub_center.h"
@@ -14,7 +15,6 @@
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/options.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/memory_manager/host_ptr_manager.h"

runtime/memory_manager/physical_address_allocator.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/memory_manager/memory_banks.h"
 #include "runtime/memory_manager/memory_constants.h"

runtime/memory_manager/unified_memory_manager.cpp

@@ -7,8 +7,8 @@
 
 #include "runtime/memory_manager/unified_memory_manager.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/mem_obj/mem_obj_helper.h"
 #include "runtime/memory_manager/memory_manager.h"
 

runtime/os_interface/linux/drm_buffer_object.cpp

@@ -7,7 +7,7 @@
 
 #include "runtime/os_interface/linux/drm_buffer_object.h"
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/os_interface/linux/drm_memory_manager.h"
 #include "runtime/os_interface/linux/drm_neo.h"

runtime/os_interface/linux/drm_command_stream.inl

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "runtime/command_stream/linear_stream.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/gmm_helper/gmm_helper.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/preamble.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/os_interface/linux/drm_buffer_object.h"

runtime/os_interface/linux/drm_gem_close_worker.cpp

@@ -7,7 +7,7 @@
 
 #include "runtime/os_interface/linux/drm_gem_close_worker.h"
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/os_interface/linux/drm_buffer_object.h"
 #include "runtime/os_interface/linux/drm_command_stream.h"
 #include "runtime/os_interface/linux/drm_memory_manager.h"

runtime/os_interface/windows/wddm_allocation.h

@@ -7,7 +7,7 @@
 
 #pragma once
 #define UMDF_USING_NTSTATUS
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/os_interface/windows/windows_wrapper.h"
 

runtime/os_interface/windows/wddm_memory_manager.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/os_interface/windows/wddm_memory_manager.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "core/memory_manager/residency_handler.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
@@ -15,7 +16,6 @@
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/memory_manager/deferrable_deletion.h"
 #include "runtime/memory_manager/deferred_deleter.h"

runtime/os_interface/windows/wddm_memory_manager.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/os_interface/os_context.h"
 #include "runtime/os_interface/windows/wddm_allocation.h"

runtime/program/kernel_info.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/buffer.h"

runtime/program/print_formatter.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/os_interface/print.h"
 

runtime/program/printf_handler.cpp

@@ -7,8 +7,8 @@
 
 #include "printf_handler.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/buffer.h"

runtime/program/process_gen_binary.cpp

@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
 #include "runtime/context/context.h"
 #include "runtime/gtpin/gtpin_notify.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/hash.h"
 #include "runtime/memory_manager/memory_manager.h"

runtime/utilities/heap_allocator.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/helpers/debug_helpers.h"
 
 #include <algorithm>

runtime/utilities/tag_allocator.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/utilities/idlist.h"

scripts/tests/copyright/in/file2.cpp

@@ -1,4 +1,3 @@
 /*
  * Copyright (C) 2017 XYZ
  */
-

unit_tests/accelerators/media_image_arg_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/image.h"

unit_tests/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "test.h"

unit_tests/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "test.h"

unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/options.h"
 #include "runtime/mem_obj/buffer.h"
 #include "test.h"

unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "test.h"

unit_tests/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 "runtime/helpers/aligned_memory.h"
 #include "runtime/mem_obj/image.h"
 #include "test.h"
 #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"

unit_tests/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/api/api.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "test.h"

unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/options.h"
 #include "runtime/mem_obj/buffer.h"
 #include "test.h"

unit_tests/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "test.h"

unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h

@@ -6,11 +6,11 @@
  */
 
 #pragma once
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/options.h"
 #include "test.h"
 

unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/platform/platform.h"

unit_tests/command_queue/dispatch_walker_tests.cpp

@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/built_ins/aux_translation_builtin.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_queue/hardware_interface.h"
 #include "runtime/event/perf_counter.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/task_information.h"
 #include "runtime/memory_manager/internal_allocation_storage.h"

unit_tests/command_queue/enqueue_api_tests_mt_with_asyncGPU.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/os_interface/os_context.h"
 #include "test.h"

unit_tests/command_queue/enqueue_fill_buffer_tests.cpp

@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/memory_manager/allocations_list.h"
 #include "runtime/memory_manager/memory_manager.h"

unit_tests/command_queue/enqueue_map_buffer_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "test.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"
 #include "unit_tests/command_queue/enqueue_map_buffer_fixture.h"

unit_tests/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 "runtime/helpers/aligned_memory.h"
 #include "unit_tests/command_queue/command_enqueue_fixture.h"
 #include "unit_tests/fixtures/buffer_fixture.h"
 #include "unit_tests/gen_common/gen_cmd_parse.h"

unit_tests/command_queue/enqueue_svm_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/event/user_event.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/memory_manager/allocations_list.h"
 #include "runtime/memory_manager/surface.h"
 #include "runtime/memory_manager/unified_memory_manager.h"

unit_tests/command_queue/enqueue_thread_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"

unit_tests/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 "runtime/helpers/aligned_memory.h"
 #include "runtime/mem_obj/buffer.h"
 #include "unit_tests/command_queue/command_enqueue_fixture.h"
 #include "unit_tests/fixtures/buffer_fixture.h"

unit_tests/command_queue/local_id_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/local_id_gen.h"
-#include "runtime/helpers/aligned_memory.h"
 
 #include "gtest/gtest.h"
 

unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/built_ins/built_ins.h"
@@ -14,7 +15,6 @@
 #include "runtime/command_stream/linear_stream.h"
 #include "runtime/command_stream/preemption.h"
 #include "runtime/event/user_event.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/cache_policy.h"
 #include "runtime/helpers/preamble.h"
 #include "runtime/mem_obj/buffer.h"

unit_tests/command_stream/command_stream_receiver_hw_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/built_ins/built_ins.h"
@@ -16,7 +17,6 @@
 #include "runtime/command_stream/scratch_space_controller.h"
 #include "runtime/command_stream/scratch_space_controller_base.h"
 #include "runtime/event/user_event.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/blit_commands_helper.h"
 #include "runtime/helpers/cache_policy.h"
 #include "runtime/helpers/preamble.h"

unit_tests/compiler_interface/binary_cache_tests.cpp

@@ -7,9 +7,9 @@
 
 #include "runtime/compiler_interface/compiler_interface.h"
 #include "test.h"
+#include <core/helpers/aligned_memory.h>
 #include <core/helpers/string.h>
 #include <runtime/compiler_interface/binary_cache.h>
-#include <runtime/helpers/aligned_memory.h>
 #include <runtime/helpers/hash.h>
 #include <runtime/helpers/hw_info.h>
 #include <unit_tests/fixtures/device_fixture.h>

unit_tests/context/driver_diagnostics_tests.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
+#include "core/helpers/aligned_memory.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/context/context.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/options.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/buffer.h"

unit_tests/event/event_fixture.h

@@ -7,10 +7,10 @@
 
 #pragma once
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/event/user_event.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"
 #include "unit_tests/command_stream/command_stream_fixture.h"
 #include "unit_tests/fixtures/device_fixture.h"

unit_tests/fixtures/hello_world_fixture.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/helpers/aligned_memory.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "test.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"

unit_tests/fixtures/kernel_data_fixture.cpp

@@ -7,8 +7,8 @@
 
 #include "unit_tests/fixtures/kernel_data_fixture.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/string.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 
 void KernelDataTest::buildAndDecode() {

unit_tests/helpers/CMakeLists.txt

@@ -7,7 +7,6 @@
 set(IGDRCL_SRCS_tests_helpers
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/array_count_tests.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/aligned_memory_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/base_object_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/base_object_tests_mt.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/basic_math_tests.cpp
@@ -54,6 +53,7 @@ set(IGDRCL_SRCS_tests_helpers
   ${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/validator_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/variable_backup.h
+  ${NEO_CORE_DIRECTORY}/unit_tests/helpers/aligned_memory_tests.cpp
   ${NEO_CORE_DIRECTORY}/unit_tests/helpers/debug_manager_state_restore.h
 )
 

unit_tests/helpers/hw_helper_tests.cpp

@@ -7,12 +7,12 @@
 
 #include "unit_tests/helpers/hw_helper_tests.h"
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/string.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/options.h"
 #include "runtime/memory_manager/graphics_allocation.h"

unit_tests/helpers/per_thread_data_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "runtime/command_queue/local_id_gen.h"
 #include "runtime/command_stream/linear_stream.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/per_thread_data.h"
 #include "runtime/program/kernel_info.h"
 #include "test.h"

unit_tests/helpers/uint16_sse4_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/helpers/uint16_sse4.h"
 
 #include "gtest/gtest.h"

unit_tests/linux/main_linux_dll.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/os_interface/linux/allocator_helper.h"
 #include "runtime/os_interface/linux/os_interface.h"

unit_tests/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 "runtime/helpers/aligned_memory.h"
 #include "runtime/mem_obj/buffer.h"
 #include "unit_tests/mocks/mock_context.h"
 

unit_tests/mem_obj/get_mem_object_info_tests.cpp

@@ -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 "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/options.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "unit_tests/fixtures/buffer_fixture.h"

unit_tests/mem_obj/image2d_from_buffer_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"

unit_tests/mem_obj/image3d_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/mem_obj/image.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"

unit_tests/mem_obj/image_array_size_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/mem_obj/image.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"

unit_tests/mem_obj/image_from_subbuffer_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"
 #include "test.h"

unit_tests/mem_obj/image_redescribe_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"

unit_tests/mem_obj/image_set_arg_tests.cpp

@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/ptr_math.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/image.h"

unit_tests/mem_obj/image_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/compiler_interface/compiler_interface.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/mipmap.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/mem_obj/mem_obj_helper.h"

unit_tests/mem_obj/image_validate_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/helpers/convert_color.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/image.h"

unit_tests/mem_obj/nv12_image_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/aligned_memory.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/gmm_helper/gmm.h"
-#include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/image.h"
 #include "test.h"

unit_tests/mem_obj/packed_yuv_image_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/mem_obj/image.h"

unit_tests/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 "runtime/helpers/aligned_memory.h"
 #include "runtime/mem_obj/buffer.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/fixtures/memory_management_fixture.h"

unit_tests/memory_manager/address_mapper_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/aligned_memory.h"
+#include "core/helpers/aligned_memory.h"
 #include "runtime/memory_manager/address_mapper.h"
 #include "test.h"