Move Debug helpers to the core dir

Related-To: NEO-3677

Change-Id: I2c98595190fadfa8ffd9e378e774c0d4485cbf9e
Signed-off-by: Jobczyk, Lukasz <lukasz.jobczyk@intel.com>

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 "runtime/helpers/debug_helpers.h"
 
 #include <atomic>
 #include <cstddef>

core/compiler_interface/linker.cpp

@@ -7,8 +7,8 @@
 
 #include "linker.h"
 
+#include "core/helpers/debug_helpers.h"
 #include "core/helpers/ptr_math.h"
-#include "runtime/helpers/debug_helpers.h"
 
 #if __has_include("RelocationInfo.h")
 #include "RelocationInfo.h"

core/helpers/CMakeLists.txt

@@ -6,8 +6,10 @@
 
 set(NEO_CORE_HELPERS
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/abort.h
   ${CMAKE_CURRENT_SOURCE_DIR}/aligned_memory.h
   ${CMAKE_CURRENT_SOURCE_DIR}/basic_math.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/debug_helpers.h
   ${CMAKE_CURRENT_SOURCE_DIR}/interlocked_max.h
   ${CMAKE_CURRENT_SOURCE_DIR}/non_copyable_or_moveable.h
   ${CMAKE_CURRENT_SOURCE_DIR}/ptr_math.h

core/helpers/abort.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/abort.h"
+#include "core/helpers/abort.h"
 
 #include <cstdlib>
 

core/helpers/aligned_memory.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/helpers/debug_helpers.h"
 #include "core/memory_manager/memory_constants.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 
 #include <algorithm>

core/helpers/debug_helpers.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/debug_helpers.h"
+#include "core/helpers/debug_helpers.h"
 
 #include "runtime/os_interface/debug_settings_manager.h"
 

core/helpers/debug_helpers.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/abort.h"
+#include "core/helpers/abort.h"
 
 #define UNRECOVERABLE_IF(expression)                 \
                                                      \

core/page_fault_manager/cpu_page_fault_manager.cpp

@@ -7,8 +7,8 @@
 
 #include "core/page_fault_manager/cpu_page_fault_manager.h"
 
+#include "core/helpers/debug_helpers.h"
 #include "core/helpers/ptr_math.h"
-#include "runtime/helpers/debug_helpers.h"
 
 #include <mutex>
 

core/page_fault_manager/linux/cpu_page_fault_manager_linux.cpp

@@ -7,7 +7,7 @@
 
 #include "core/page_fault_manager/linux/cpu_page_fault_manager_linux.h"
 
-#include "runtime/helpers/debug_helpers.h"
+#include "core/helpers/debug_helpers.h"
 
 #include <sys/mman.h>
 

core/page_fault_manager/windows/cpu_page_fault_manager_windows.cpp

@@ -7,7 +7,7 @@
 
 #include "core/page_fault_manager/windows/cpu_page_fault_manager_windows.h"
 
-#include "runtime/helpers/debug_helpers.h"
+#include "core/helpers/debug_helpers.h"
 
 namespace NEO {
 std::unique_ptr<PageFaultManager> PageFaultManager::create() {

core/utilities/heap_allocator.h

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

offline_compiler/CMakeLists.txt

@@ -7,6 +7,8 @@
 project(ocloc)
 
 set(CLOC_SRCS_LIB
+  ${IGDRCL_SOURCE_DIR}/core/helpers/abort.cpp
+  ${IGDRCL_SOURCE_DIR}/core/helpers/debug_helpers.cpp
   ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.cpp
   ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.h
   ${IGDRCL_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.cpp
@@ -22,8 +24,6 @@ set(CLOC_SRCS_LIB
   ${IGDRCL_SOURCE_DIR}/offline_compiler/multi_command.h
   ${IGDRCL_SOURCE_DIR}/offline_compiler/options.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/compiler_interface/create_main.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/helpers/abort.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/helpers/debug_helpers.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/helpers/file_io.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/helpers/hw_info.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/platform/extensions.cpp

offline_compiler/offline_compiler.cpp

@@ -7,9 +7,9 @@
 
 #include "offline_compiler.h"
 
+#include "core/helpers/debug_helpers.h"
 #include "core/helpers/string.h"
 #include "elf/writer.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/file_io.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/validators.h"

offline_compiler/utilities/linux/safety_guard_linux.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/helpers/abort.h"
+#include "core/helpers/abort.h"
 
 #include <cstdio>
 #include <cstdlib>

offline_compiler/utilities/windows/safety_guard_windows.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/helpers/abort.h"
 #include "offline_compiler/utilities/windows/seh_exception.h"
-#include "runtime/helpers/abort.h"
 
 #include <setjmp.h>
 

runtime/aub_mem_dump/aub_mem_dump.cpp

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

runtime/aub_mem_dump/aub_mem_dump.inl

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

runtime/built_ins/built_ins.cpp

@@ -8,6 +8,7 @@
 #include "runtime/built_ins/built_ins.h"
 
 #include "core/helpers/basic_math.h"
+#include "core/helpers/debug_helpers.h"
 #include "runtime/built_ins/aux_translation_builtin.h"
 #include "runtime/built_ins/built_ins.inl"
 #include "runtime/built_ins/sip.h"
@@ -15,7 +16,6 @@
 #include "runtime/compiler_interface/compiler_interface.h"
 #include "runtime/helpers/built_ins_helper.h"
 #include "runtime/helpers/convert_color.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/dispatch_info_builder.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/image.h"

runtime/built_ins/built_ins.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
+#include "core/helpers/debug_helpers.h"
 #include "core/helpers/non_copyable_or_moveable.h"
 #include "core/helpers/vec.h"
 #include "runtime/built_ins/sip.h"
-#include "runtime/helpers/debug_helpers.h"
 
 #include "CL/cl.h"
 #include "built_in_ops.h"

runtime/built_ins/sip.cpp

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

runtime/command_queue/gpgpu_walker_base.inl

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

runtime/command_queue/local_work_size.cpp

@@ -6,9 +6,9 @@
  */
 
 #include "core/helpers/basic_math.h"
+#include "core/helpers/debug_helpers.h"
 #include "runtime/context/context.h"
 #include "runtime/helpers/array_count.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/kernel/kernel.h"
 

runtime/command_stream/aub_command_stream_receiver.cpp

@@ -7,8 +7,8 @@
 
 #include "runtime/command_stream/aub_command_stream_receiver.h"
 
+#include "core/helpers/debug_helpers.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/hw_info.h"
 #include "runtime/helpers/options.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"

runtime/command_stream/aub_command_stream_receiver_hw_base.inl

@@ -6,6 +6,7 @@
  */
 
 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/debug_helpers.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
 #include "core/memory_manager/memory_constants.h"
@@ -17,7 +18,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/debug_helpers.h"
 #include "runtime/helpers/hardware_context_controller.h"
 #include "runtime/helpers/hash.h"
 #include "runtime/helpers/neo_driver_version.h"

runtime/command_stream/tbx_command_stream_receiver_hw.inl

@@ -6,6 +6,7 @@
  */
 
 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/debug_helpers.h"
 #include "core/helpers/ptr_math.h"
 #include "core/memory_manager/memory_constants.h"
 #include "runtime/aub/aub_center.h"
@@ -14,7 +15,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/debug_helpers.h"
 #include "runtime/helpers/hardware_context_controller.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/memory_manager/graphics_allocation.h"

runtime/command_stream/tbx_stream.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/debug_helpers.h"
 #include "runtime/aub/aub_helper.h"
 #include "runtime/command_stream/tbx_command_stream_receiver.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/os_interface/debug_settings_manager.h"
 #include "runtime/tbx/tbx_sockets.h"
 

runtime/context/driver_diagnostics.cpp

@@ -7,7 +7,7 @@
 
 #include "driver_diagnostics.h"
 
-#include "runtime/helpers/debug_helpers.h"
+#include "core/helpers/debug_helpers.h"
 
 namespace NEO {
 

runtime/dll/CMakeLists.txt

@@ -19,13 +19,13 @@ set(RUNTIME_SRCS_DLL_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/source_level_debugger.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices.cpp
 
+  ${IGDRCL_SOURCE_DIR}/core/helpers/abort.cpp
+  ${IGDRCL_SOURCE_DIR}/core/helpers/debug_helpers.cpp
   ${IGDRCL_SOURCE_DIR}/core/utilities/clflush.cpp
   ${IGDRCL_SOURCE_DIR}/core/utilities/debug_settings_reader_creator.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/api/api.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/gmm_helper/resource_info.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/helpers/abort.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/helpers/built_ins_helper.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/helpers/debug_helpers.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/program/evaluate_unhandled_token.cpp
 
   ${GTPIN_INIT_FILE}

runtime/event/event_builder.cpp

@@ -7,10 +7,10 @@
 
 #include "runtime/event/event_builder.h"
 
+#include "core/helpers/debug_helpers.h"
 #include "runtime/api/cl_types.h"
 #include "runtime/context/context.h"
 #include "runtime/event/user_event.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/timestamp_packet.h"
 
 namespace NEO {

runtime/gen11/hw_cmds_base.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/helpers/debug_helpers.h"
 #include "runtime/commands/bxml_generator_glue.h"
-#include "runtime/helpers/debug_helpers.h"
 
 #include "hw_info.h"
 #include "igfxfmid.h"

runtime/gen8/hw_cmds_base.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/helpers/debug_helpers.h"
 #include "runtime/commands/bxml_generator_glue.h"
-#include "runtime/helpers/debug_helpers.h"
 
 #include "hw_info.h"
 #include "igfxfmid.h"

runtime/gen9/hw_cmds_base.h

@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/helpers/debug_helpers.h"
 #include "runtime/commands/bxml_generator_glue.h"
-#include "runtime/helpers/debug_helpers.h"
 
 #include "hw_info.h"
 #include "igfxfmid.h"

runtime/gmm_helper/gmm.cpp

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

runtime/gmm_helper/gmm_helper.cpp

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

runtime/gmm_helper/gmm_interface.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/debug_helpers.h"
 #include "runtime/gmm_helper/gmm_helper.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/os_interface/os_library.h"
 
 namespace Os {

runtime/helpers/CMakeLists.txt

@@ -6,7 +6,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}/array_count.h
   ${CMAKE_CURRENT_SOURCE_DIR}/base_object.cpp
@@ -23,7 +22,6 @@ set(RUNTIME_SRCS_HELPERS_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/convert_color.h
   ${CMAKE_CURRENT_SOURCE_DIR}/csr_deps.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/csr_deps.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/debug_helpers.h
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/device_helpers.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/dirty_state_helpers.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/dirty_state_helpers.h

runtime/helpers/base_object.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
+#include "core/helpers/abort.h"
+#include "core/helpers/debug_helpers.h"
 #include "runtime/api/dispatch.h"
-#include "runtime/helpers/abort.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/utilities/reference_tracked_object.h"
 
 #include "CL/cl.h"

runtime/helpers/file_io.cpp

@@ -7,7 +7,7 @@
 
 #include "file_io.h"
 
-#include "runtime/helpers/debug_helpers.h"
+#include "core/helpers/debug_helpers.h"
 #include "runtime/helpers/stdio.h"
 
 #include <cstring>

runtime/helpers/options.h

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

runtime/helpers/per_thread_data.cpp

@@ -8,7 +8,7 @@
 #include "runtime/helpers/per_thread_data.h"
 
 #include "core/command_stream/linear_stream.h"
-#include "runtime/helpers/debug_helpers.h"
+#include "core/helpers/debug_helpers.h"
 
 #include <array>
 

runtime/helpers/uint16_avx2.h

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

runtime/helpers/uint16_sse4.h

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

runtime/kernel/kernel.cpp

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

runtime/memory_manager/cpu_page_fault_manager_memory_sync.cpp

@@ -5,9 +5,9 @@
  *
  */
 
+#include "core/helpers/debug_helpers.h"
 #include "core/page_fault_manager/cpu_page_fault_manager.h"
 #include "runtime/command_queue/command_queue.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/memory_manager/unified_memory_manager.h"
 
 namespace NEO {

runtime/memory_manager/graphics_allocation.h

@@ -7,9 +7,9 @@
 
 #pragma once
 
+#include "core/helpers/debug_helpers.h"
 #include "core/helpers/ptr_math.h"
 #include "core/memory_manager/memory_constants.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/memory_manager/host_ptr_defines.h"
 #include "runtime/memory_manager/memory_pool.h"
 #include "runtime/utilities/idlist.h"

runtime/memory_manager/local_memory_usage.h

@@ -7,8 +7,8 @@
 
 #pragma once
 
+#include "core/helpers/debug_helpers.h"
 #include "core/helpers/non_copyable_or_moveable.h"
-#include "runtime/helpers/debug_helpers.h"
 
 #include <atomic>
 #include <memory>

runtime/memory_manager/physical_address_allocator.h

@@ -7,8 +7,8 @@
 
 #pragma once
 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/debug_helpers.h"
 #include "core/memory_manager/memory_constants.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/memory_manager/memory_banks.h"
 
 #include <atomic>

runtime/os_interface/linux/drm_buffer_object.cpp

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

runtime/os_interface/linux/os_library.cpp

@@ -7,7 +7,7 @@
 
 #include "runtime/os_interface/os_library.h"
 
-#include "runtime/helpers/debug_helpers.h"
+#include "core/helpers/debug_helpers.h"
 
 #include "os_library.h"
 

runtime/os_interface/windows/d3d_sharing_functions.h

@@ -6,9 +6,9 @@
  */
 
 #pragma once
+#include "core/helpers/debug_helpers.h"
 #include "runtime/api/dispatch.h"
 #include "runtime/helpers/array_count.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/sharings/sharing.h"
 
 #include "DXGI1_2.h"

runtime/os_interface/windows/wddm/wddm.h

@@ -7,10 +7,10 @@
 
 #pragma once
 #include "core/command_stream/preemption_mode.h"
+#include "core/helpers/debug_helpers.h"
 #include "core/memory_manager/gfx_partition.h"
 #include "core/utilities/spinlock.h"
 #include "runtime/gmm_helper/gmm_lib.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/os_interface/os_context.h"
 
 #include "sku_info.h"

runtime/platform/platform.cpp

@@ -7,6 +7,7 @@
 
 #include "platform.h"
 
+#include "core/helpers/debug_helpers.h"
 #include "core/helpers/string.h"
 #include "runtime/api/api.h"
 #include "runtime/command_stream/command_stream_receiver.h"
@@ -17,7 +18,6 @@
 #include "runtime/gmm_helper/gmm_helper.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/built_ins_helper.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/get_info.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/helpers/options.h"

runtime/program/block_kernel_manager.cpp

@@ -7,8 +7,8 @@
 
 #include "runtime/program/block_kernel_manager.h"
 
+#include "core/helpers/debug_helpers.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/program/kernel_info.h"
 
 namespace NEO {

runtime/program/process_gen_binary.cpp

@@ -6,11 +6,11 @@
  */
 
 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/debug_helpers.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/debug_helpers.h"
 #include "runtime/helpers/hash.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/memory_manager/unified_memory_manager.h"

runtime/program/program.cpp

@@ -7,12 +7,12 @@
 
 #include "program.h"
 
+#include "core/helpers/debug_helpers.h"
 #include "core/helpers/string.h"
 #include "elf/writer.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/compiler_interface/compiler_interface.h"
 #include "runtime/context/context.h"
-#include "runtime/helpers/debug_helpers.h"
 #include "runtime/helpers/hw_helper.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/memory_manager/unified_memory_manager.h"

runtime/source_level_debugger/source_level_debugger.cpp

@@ -7,7 +7,7 @@
 
 #include "runtime/source_level_debugger/source_level_debugger.h"
 
-#include "runtime/helpers/debug_helpers.h"
+#include "core/helpers/debug_helpers.h"
 #include "runtime/os_interface/os_interface.h"
 #include "runtime/program/kernel_info.h"
 

runtime/tbx/tbx_sockets_imp.cpp

@@ -7,8 +7,8 @@
 
 #include "runtime/tbx/tbx_sockets_imp.h"
 
+#include "core/helpers/debug_helpers.h"
 #include "core/helpers/string.h"
-#include "runtime/helpers/debug_helpers.h"
 
 #ifdef WIN32
 #ifndef WIN32_LEAN_AND_MEAN

runtime/tracing/tracing_handle.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "runtime/helpers/debug_helpers.h"
+#include "core/helpers/debug_helpers.h"
 #include "runtime/tracing/tracing_types.h"
 
 #include <bitset>

runtime/utilities/idlist.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "runtime/helpers/debug_helpers.h"
+#include "core/helpers/debug_helpers.h"
 
 #include <atomic>
 #include <memory>

runtime/utilities/reference_tracked_object.h

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

runtime/utilities/stackvec.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "runtime/helpers/debug_helpers.h"
+#include "core/helpers/debug_helpers.h"
 
 #include <cinttypes>
 #include <cstddef>

runtime/utilities/tag_allocator.h

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

runtime/utilities/windows/timer_util.cpp

@@ -7,8 +7,8 @@
 
 #include "runtime/utilities/timer_util.h"
 
+#include "core/helpers/debug_helpers.h"
 #include "core/os_interface/windows/windows_wrapper.h"
-#include "runtime/helpers/debug_helpers.h"
 
 namespace NEO {
 

unit_tests/abort.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/abort.h"
+#include "core/helpers/abort.h"
 
 #include <exception>
 

unit_tests/helpers/debug_helpers.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/helpers/debug_helpers.h"
+#include "core/helpers/debug_helpers.h"
 
 #include <exception>
 

unit_tests/helpers/debug_helpers_tests.cpp

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

unit_tests/igdrcl_tests_pch.h

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

unit_tests/offline_compiler/CMakeLists.txt

@@ -48,7 +48,7 @@ set(IGDRCL_SRCS_offline_compiler_tests
   ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/offline_compiler_tests.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/offline_compiler_tests.h
-  ${IGDRCL_SOURCE_DIR}/runtime/helpers/abort.cpp
+  ${IGDRCL_SOURCE_DIR}/core/helpers/abort.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/helpers/file_io.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/memory_manager/deferred_deleter.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/memory_manager/deferred_deleter.h

unit_tests/offline_compiler/segfault_test/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 Intel Corporation
+# Copyright (C) 2018-2019 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -8,7 +8,7 @@ set(CLOC_SEGFAULT_TEST_SOURCES
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/segfault_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
-  ${IGDRCL_SOURCE_DIR}/runtime/helpers/abort.cpp
+  ${IGDRCL_SOURCE_DIR}/core/helpers/abort.cpp
   ${IGDRCL_SOURCE_DIR}/runtime/os_interface/os_library.h
   ${IGDRCL_SOURCE_DIR}/unit_tests/helpers/debug_helpers.cpp
 )