Move ptr.h to core folder

Change-Id: Icf0db7c767b2b1ea44fccc02b135f0f6c1f78c8f
Signed-off-by: Jaime Arteaga <jaime.a.arteaga.molina@intel.com>

core/helpers/CMakeLists.txt

@@ -8,6 +8,7 @@ set(NEO_CORE_HELPERS
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/basic_math.h
   ${CMAKE_CURRENT_SOURCE_DIR}/interlocked_max.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/ptr_math.h
   ${CMAKE_CURRENT_SOURCE_DIR}/vec.h
 )
 

offline_compiler/decoder/binary_decoder.cpp

@@ -7,9 +7,9 @@
 
 #include "binary_decoder.h"
 
+#include "core/helpers/ptr_math.h"
 #include "elf/reader.h"
 #include "runtime/helpers/file_io.h"
-#include "runtime/helpers/ptr_math.h"
 
 #include "helper.h"
 

runtime/aub_mem_dump/aub_mem_dump.cpp

@@ -7,9 +7,9 @@
 
 #include "aub_mem_dump.h"
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/helpers/debug_helpers.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 
 namespace AubMemDump {

runtime/aub_mem_dump/aub_mem_dump.inl

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/helpers/debug_helpers.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/memory_manager/memory_constants.h"
 
 #include "aub_mem_dump.h"

runtime/built_ins/sip.cpp

@@ -7,10 +7,10 @@
 
 #include "runtime/built_ins/sip.h"
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/device/device.h"
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/hw_helper.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/string.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/program/program.h"

runtime/command_queue/command_queue.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/command_queue/command_queue.h"
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
@@ -22,7 +23,6 @@
 #include "runtime/helpers/kernel_commands.h"
 #include "runtime/helpers/mipmap.h"
 #include "runtime/helpers/options.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/queue_helpers.h"
 #include "runtime/helpers/string.h"
 #include "runtime/helpers/surface_formats.h"

runtime/command_queue/local_id_gen.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.h"
 
 #include <algorithm>
 #include <array>

runtime/command_stream/aub_command_stream_receiver_hw_base.inl

@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/aub_mem_dump/aub_alloc_dump.h"
 #include "runtime/aub_mem_dump/aub_alloc_dump.inl"
@@ -17,7 +18,6 @@
 #include "runtime/helpers/hardware_context_controller.h"
 #include "runtime/helpers/hash.h"
 #include "runtime/helpers/neo_driver_version.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/string.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/memory_manager/memory_banks.h"

runtime/command_stream/command_stream_receiver_hw_base.inl

@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
 #include "runtime/command_stream/experimental_command_buffer.h"
@@ -21,7 +22,6 @@
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/options.h"
 #include "runtime/helpers/preamble.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/state_base_address.h"
 #include "runtime/helpers/timestamp_packet.h"
 #include "runtime/indirect_heap/indirect_heap.h"

runtime/command_stream/linear_stream.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/helpers/ptr_math.h"
 #include "runtime/helpers/debug_helpers.h"
-#include "runtime/helpers/ptr_math.h"
 
 #include <atomic>
 #include <cstddef>

runtime/command_stream/tbx_command_stream_receiver_hw.inl

@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/aub/aub_center.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/aub_mem_dump/page_table_entry_bits.h"
@@ -15,7 +16,6 @@
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/hardware_context_controller.h"
 #include "runtime/helpers/hw_helper.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/memory_manager/memory_banks.h"
 #include "runtime/memory_manager/memory_constants.h"

runtime/context/context.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/context/context.h"
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_stream/command_stream_receiver.h"
@@ -15,7 +16,6 @@
 #include "runtime/device_queue/device_queue.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/get_info.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/string.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/image.h"

runtime/device_queue/device_queue_hw.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/linear_stream.h"
 #include "runtime/device_queue/device_queue.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/program/program.h"

runtime/gmm_helper/gmm.cpp

@@ -7,13 +7,13 @@
 
 #include "runtime/gmm_helper/gmm.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"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/surface_formats.h"
 
 namespace NEO {

runtime/helpers/CMakeLists.txt

@@ -71,7 +71,6 @@ set(RUNTIME_SRCS_HELPERS_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/preamble_bdw_plus.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/properties_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/properties_helper.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/ptr_math.h
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/queue_helpers.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/queue_helpers.h
   ${CMAKE_CURRENT_SOURCE_DIR}/sampler_helpers.h

runtime/helpers/kernel_commands.inl

@@ -6,13 +6,13 @@
  */
 
 #include "core/helpers/basic_math.h"
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/local_id_gen.h"
 #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/helpers/ptr_math.h"
 #include "runtime/helpers/string.h"
 #include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/kernel/kernel.h"

runtime/indirect_heap/indirect_heap.h

@@ -7,9 +7,9 @@
 
 #pragma once
 #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/helpers/ptr_math.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/memory_manager/memory_constants.h"
 

runtime/kernel/image_transformer.cpp

@@ -7,7 +7,7 @@
 
 #include "runtime/kernel/image_transformer.h"
 
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/program/kernel_info.h"
 

runtime/kernel/kernel.cpp

@@ -8,6 +8,7 @@
 #include "runtime/kernel/kernel.h"
 
 #include "core/helpers/basic_math.h"
+#include "core/helpers/ptr_math.h"
 #include "runtime/accelerators/intel_accelerator.h"
 #include "runtime/accelerators/intel_motion_estimation.h"
 #include "runtime/built_ins/built_ins.h"
@@ -24,7 +25,6 @@
 #include "runtime/helpers/get_info.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/per_thread_data.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/sampler_helpers.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/kernel/image_transformer.h"

runtime/mem_obj/buffer.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/mem_obj/buffer.h"
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
@@ -16,7 +17,6 @@
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/hw_info.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/string.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/mem_obj/mem_obj_helper.h"

runtime/mem_obj/image.cpp

@@ -9,6 +9,7 @@
 
 #include "common/compiler_support.h"
 #include "core/helpers/basic_math.h"
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
@@ -20,7 +21,6 @@
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/mipmap.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/string.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/mem_obj/buffer.h"

runtime/mem_obj/map_operations_handler.cpp

@@ -7,7 +7,7 @@
 
 #include "runtime/mem_obj/map_operations_handler.h"
 
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.h"
 
 using namespace NEO;
 

runtime/memory_manager/graphics_allocation.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/helpers/debug_helpers.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/memory_manager/host_ptr_defines.h"
 #include "runtime/memory_manager/memory_banks.h"
 #include "runtime/memory_manager/memory_constants.h"

runtime/memory_manager/os_agnostic_memory_manager.cpp

@@ -8,13 +8,13 @@
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 
 #include "core/helpers/basic_math.h"
+#include "core/helpers/ptr_math.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/options.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/memory_manager/host_ptr_manager.h"
 

runtime/os_interface/debug_settings_manager.cpp

@@ -7,9 +7,9 @@
 
 #include "debug_settings_manager.h"
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/event/event.h"
 #include "runtime/helpers/dispatch_info.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/string.h"
 #include "runtime/helpers/timestamp_packet.h"
 #include "runtime/kernel/kernel.h"

runtime/os_interface/linux/drm_32bit_memory.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "core/helpers/basic_math.h"
+#include "core/helpers/ptr_math.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/os_interface/32bit_memory.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/os_interface/linux/allocator_helper.h"

runtime/os_interface/linux/drm_limited_range.h

@@ -7,8 +7,8 @@
 
 #pragma once
 #include "core/helpers/basic_math.h"
+#include "core/helpers/ptr_math.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/utilities/heap_allocator.h"
 
 #include <memory>

runtime/os_interface/linux/drm_memory_manager.cpp

@@ -7,6 +7,7 @@
 
 #include "runtime/os_interface/linux/drm_memory_manager.h"
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/device/device.h"
 #include "runtime/execution_environment/execution_environment.h"
@@ -15,7 +16,6 @@
 #include "runtime/gmm_helper/resource_info.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/memory_manager/host_ptr_manager.h"
 #include "runtime/os_interface/32bit_memory.h"

runtime/os_interface/windows/wddm_device_command_stream.inl

@@ -9,12 +9,12 @@
 // Current order must be preserved due to two versions of igfxfmid.h
 #pragma warning(push)
 #pragma warning(disable : 4005)
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/linear_stream.h"
 #include "runtime/command_stream/preemption.h"
 #include "runtime/device/device.h"
 #include "runtime/gmm_helper/page_table_mngr.h"
 #include "runtime/helpers/gmm_callbacks.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/mem_obj/mem_obj.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/wddm_device_command_stream.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/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
 #include "runtime/device/device.h"
 #include "runtime/execution_environment/execution_environment.h"
@@ -14,7 +15,6 @@
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gmm_helper/resource_info.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/memory_manager/deferrable_deletion.h"
 #include "runtime/memory_manager/deferred_deleter.h"

runtime/program/kernel_info.cpp

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

runtime/program/printf_handler.cpp

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

runtime/program/process_gen_binary.cpp

@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/helpers/ptr_math.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/helpers/ptr_math.h"
 #include "runtime/helpers/string.h"
 #include "runtime/memory_manager/memory_manager.h"
 

unit_tests/accelerators/media_image_arg_tests.cpp

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

unit_tests/api/cl_create_context_tests.inl

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

unit_tests/api/cl_enqueue_copy_buffer_rect_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/command_queue.h"
-#include "runtime/helpers/ptr_math.h"
 #include "unit_tests/mocks/mock_buffer.h"
 
 #include "cl_api_tests.h"

unit_tests/api/cl_enqueue_copy_image_tests.inl

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/surface_formats.h"
 
 #include "cl_api_tests.h"

unit_tests/api/cl_enqueue_fill_buffer_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/command_queue.h"
-#include "runtime/helpers/ptr_math.h"
 
 #include "cl_api_tests.h"
 

unit_tests/api/cl_enqueue_fill_image_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/command_queue.h"
-#include "runtime/helpers/ptr_math.h"
 #include "unit_tests/fixtures/image_fixture.h"
 
 #include "cl_api_tests.h"

unit_tests/api/cl_enqueue_read_buffer_rect_tests.inl

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
-#include "runtime/helpers/ptr_math.h"
 
 #include "cl_api_tests.h"
 

unit_tests/api/cl_enqueue_write_buffer_rect_tests.inl

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
-#include "runtime/helpers/ptr_math.h"
 
 #include "cl_api_tests.h"
 

unit_tests/api/cl_enqueue_write_buffer_tests.inl

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/command_queue.h"
-#include "runtime/helpers/ptr_math.h"
 
 #include "cl_api_tests.h"
 

unit_tests/aub_tests/command_queue/enqueue_copy_buffer_aub_tests.cpp

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

unit_tests/aub_tests/command_queue/enqueue_copy_buffer_rect_aub_tests.cpp

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

unit_tests/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/ptr_math.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_fill_buffer_aub_tests.cpp

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

unit_tests/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/ptr_math.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_kernel_aub_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/event/event.h"
 #include "runtime/helpers/kernel_commands.h"
-#include "runtime/helpers/ptr_math.h"
 #include "test.h"
 #include "unit_tests/aub_tests/fixtures/aub_fixture.h"
 #include "unit_tests/aub_tests/fixtures/hello_world_fixture.h"

unit_tests/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/ptr_math.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_aub_tests.cpp

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

unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#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/helpers/ptr_math.h"
 #include "runtime/mem_obj/buffer.h"
 #include "test.h"
 #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"

unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#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/ptr_math.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,8 +5,8 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/ptr_math.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/ptr_math.h"
 #include "runtime/api/api.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/ptr_math.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_aub_tests.cpp

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

unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp

@@ -5,11 +5,11 @@
  *
  */
 
+#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/helpers/ptr_math.h"
 #include "runtime/mem_obj/buffer.h"
 #include "test.h"
 #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"

unit_tests/aub_tests/command_queue/enqueue_write_copy_read_buffer_aub_tests.h

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/helpers/options.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/mem_obj/buffer.h"
 #include "unit_tests/aub_tests/fixtures/aub_fixture.h"
 

unit_tests/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/ptr_math.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_command_stream_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/os_interface/os_context.h"
 #include "test.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"

unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h

@@ -6,12 +6,12 @@
  */
 
 #pragma once
+#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 "runtime/helpers/ptr_math.h"
 #include "test.h"
 
 #include "aub_mapper.h"

unit_tests/aub_tests/fixtures/fixture_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/mem_obj/image.h"
 #include "unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h"
 #include "unit_tests/command_queue/command_enqueue_fixture.h"

unit_tests/command_queue/buffer_operations_fixture.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.h"
 #include "unit_tests/command_queue/command_enqueue_fixture.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
 #include "unit_tests/fixtures/buffer_fixture.h"

unit_tests/command_queue/enqueue_copy_buffer_fixture.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.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_copy_buffer_rect_fixture.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.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_copy_buffer_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/helpers/dispatch_info.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/kernel/kernel.h"
 #include "test.h"
 #include "unit_tests/command_queue/enqueue_copy_buffer_fixture.h"

unit_tests/command_queue/enqueue_copy_buffer_to_image_fixture.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.h"
 #include "unit_tests/command_queue/command_enqueue_fixture.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
 #include "unit_tests/fixtures/buffer_fixture.h"

unit_tests/command_queue/enqueue_copy_image_fixture.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.h"
 #include "unit_tests/command_queue/command_enqueue_fixture.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
 #include "unit_tests/fixtures/built_in_fixture.h"

unit_tests/command_queue/enqueue_copy_image_to_buffer_fixture.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.h"
 #include "unit_tests/command_queue/command_enqueue_fixture.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
 #include "unit_tests/fixtures/buffer_fixture.h"

unit_tests/command_queue/enqueue_fill_buffer_negative_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/command_queue.h"
-#include "runtime/helpers/ptr_math.h"
 #include "unit_tests/command_queue/enqueue_fill_buffer_fixture.h"
 
 #include "gtest/gtest.h"

unit_tests/command_queue/enqueue_fill_buffer_tests.cpp

@@ -5,13 +5,13 @@
  *
  */
 
+#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/helpers/ptr_math.h"
 #include "runtime/memory_manager/allocations_list.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/os_interface/os_context.h"

unit_tests/command_queue/enqueue_fixture.cpp

@@ -7,7 +7,7 @@
 
 #include "unit_tests/command_queue/enqueue_fixture.h"
 
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.h"
 
 // clang-format off
 // EnqueueTraits

unit_tests/command_queue/enqueue_read_buffer_rect_fixture.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/helpers/ptr_math.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/ptr_math.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_read_image_fixture.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.h"
 #include "unit_tests/command_queue/command_enqueue_fixture.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
 #include "unit_tests/fixtures/image_fixture.h"

unit_tests/command_queue/enqueue_write_buffer_rect_fixture.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/helpers/ptr_math.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/ptr_math.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/enqueue_write_image_fixture.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.h"
 #include "unit_tests/command_queue/command_enqueue_fixture.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
 #include "unit_tests/fixtures/image_fixture.h"

unit_tests/command_queue/local_id_tests.cpp

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

unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_queue/gpgpu_walker.h"
@@ -15,7 +16,6 @@
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/cache_policy.h"
 #include "runtime/helpers/preamble.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/memory_manager/memory_manager.h"

unit_tests/command_stream/command_stream_receiver_hw_tests.cpp

@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_queue/gpgpu_walker.h"
@@ -17,7 +18,6 @@
 #include "runtime/helpers/blit_commands_helper.h"
 #include "runtime/helpers/cache_policy.h"
 #include "runtime/helpers/preamble.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "runtime/memory_manager/memory_manager.h"

unit_tests/command_stream/tbx_command_stream_tests.cpp

@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/aub_command_stream_receiver.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
 #include "runtime/command_stream/tbx_command_stream_receiver_hw.h"
 #include "runtime/helpers/hardware_context_controller.h"
 #include "runtime/helpers/hw_helper.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/mem_obj/mem_obj.h"
 #include "runtime/memory_manager/memory_banks.h"
 #include "runtime/os_interface/debug_settings_manager.h"

unit_tests/event/event_fixture.h

@@ -7,10 +7,10 @@
 
 #pragma once
 
+#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 "runtime/helpers/ptr_math.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/gmm_helper/gmm_helper_tests.cpp

@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/gmm_helper/gmm.h"
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/platform/platform.h"
 #include "unit_tests/helpers/debug_manager_state_restore.h"

unit_tests/helpers/dirty_state_helpers_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/helpers/dirty_state_helpers.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/memory_manager/graphics_allocation.h"
 #include "unit_tests/mocks/mock_graphics_allocation.h"

unit_tests/helpers/hw_parse.h

@@ -6,11 +6,11 @@
  */
 
 #pragma once
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/command_stream/linear_stream.h"
 #include "runtime/helpers/pipeline_select_helper.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/kernel/kernel.h"
 #include "unit_tests/gen_common/gen_cmd_parse.h"
 

unit_tests/helpers/ptr_math_tests.cpp

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

unit_tests/helpers/validator_tests.cpp

@@ -5,10 +5,10 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/api/cl_types.h"
 #include "runtime/helpers/base_object.h"
 #include "runtime/helpers/error_mappers.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/platform/platform.h"
 #include "unit_tests/mocks/mock_buffer.h"

unit_tests/igdrcl_tests_pch.h

@@ -5,6 +5,7 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/gen_common/hw_cmds.h"
 #include "runtime/gmm_helper/gmm_lib.h"
 #include "runtime/helpers/abort.h"
@@ -12,7 +13,6 @@
 #include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/kmd_notify_properties.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/memory_manager/memory_constants.h"
 #include "runtime/sku_info/sku_info_base.h"
 #include "test.h"

unit_tests/kernel/kernel_image_arg_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.h"
 #include "runtime/kernel/kernel.h"
 #include "test.h"
 #include "unit_tests/fixtures/kernel_arg_fixture.h"

unit_tests/kernel/kernel_slm_arg_tests.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "core/helpers/basic_math.h"
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.h"
 #include "runtime/kernel/kernel.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"

unit_tests/mem_obj/buffer_set_arg_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/gmm_helper/gmm.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/memory_manager/surface.h"
 #include "runtime/memory_manager/svm_memory_manager.h"

unit_tests/mem_obj/get_mem_object_info_subbuffer_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/ptr_math.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/ptr_math.h"
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/options.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "unit_tests/fixtures/buffer_fixture.h"
 #include "unit_tests/fixtures/device_fixture.h"

unit_tests/mem_obj/image_set_arg_tests.cpp

@@ -6,10 +6,10 @@
  */
 
 #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/ptr_math.h"
 #include "runtime/helpers/surface_formats.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/image.h"

unit_tests/mem_obj/map_operations_handler_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.h"
 #include "runtime/mem_obj/map_operations_handler.h"
 #include "test.h"
 

unit_tests/mem_obj/sub_buffer_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/ptr_math.h"
+#include "core/helpers/ptr_math.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/memory_constants.h"
 #include "unit_tests/fixtures/device_fixture.h"

unit_tests/memory_manager/gfx_partition_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/ptr_math.h"
 #include "unit_tests/mocks/mock_gfx_partition.h"
 
 #include "gtest/gtest.h"

unit_tests/memory_manager/host_ptr_manager_tests.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/aligned_memory.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/memory_manager/memory_constants.h"
 #include "test.h"
 #include "unit_tests/fixtures/memory_manager_fixture.h"

unit_tests/memory_manager/page_table_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/aub_mem_dump/page_table_entry_bits.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/memory_manager/memory_banks.h"
 #include "runtime/memory_manager/page_table.h"
 #include "runtime/memory_manager/page_table.inl"

unit_tests/os_interface/linux/drm_memory_manager_tests.cpp

@@ -7,13 +7,13 @@
 
 #include "drm_memory_manager_tests.h"
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/device_command_stream.h"
 #include "runtime/command_stream/linear_stream.h"
 #include "runtime/command_stream/preemption.h"
 #include "runtime/event/event.h"
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/array_count.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/helpers/timestamp_packet.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"

unit_tests/program/program_nonuniform.cpp

@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/helpers/ptr_math.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
 #include "runtime/helpers/aligned_memory.h"
 #include "runtime/helpers/hash.h"
 #include "runtime/helpers/kernel_commands.h"
-#include "runtime/helpers/ptr_math.h"
 #include "runtime/indirect_heap/indirect_heap.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/memory_manager/graphics_allocation.h"