Move files to core

Change-Id: I78bf6a82df3399a2b79143333989bac81e7a392a
Signed-off-by: Mateusz Hoppe <mateusz.hoppe@intel.com>

core/command_stream/CMakeLists.txt

@@ -16,6 +16,10 @@ set(NEO_CORE_COMMAND_STREAM
   ${CMAKE_CURRENT_SOURCE_DIR}/preemption.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/preemption.h
   ${CMAKE_CURRENT_SOURCE_DIR}/preemption.inl
+  ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controller.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controller.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controller_base.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controller_base.h
   ${CMAKE_CURRENT_SOURCE_DIR}/submissions_aggregator.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/submissions_aggregator.h
   ${CMAKE_CURRENT_SOURCE_DIR}/thread_arbitration_policy.h

core/command_stream/csr_deps.cpp

@@ -7,7 +7,7 @@
 
 #include "core/command_stream/csr_deps.h"
 
-#include "runtime/helpers/timestamp_packet.h"
+#include "core/helpers/timestamp_packet.h"
 
 namespace NEO {
 

core/command_stream/scratch_space_controller.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/command_stream/scratch_space_controller.h"
+#include "core/command_stream/scratch_space_controller.h"
 
 #include "core/helpers/hw_helper.h"
 #include "core/memory_manager/graphics_allocation.h"

core/command_stream/scratch_space_controller.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

core/command_stream/scratch_space_controller_base.cpp

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

core/command_stream/scratch_space_controller_base.h

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "runtime/command_stream/scratch_space_controller.h"
+#include "core/command_stream/scratch_space_controller.h"
 
 namespace NEO {
 

core/helpers/CMakeLists.txt

@@ -9,6 +9,7 @@ set(NEO_CORE_HELPERS
   ${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}/aux_translation.h
   ${CMAKE_CURRENT_SOURCE_DIR}/basic_math.h
   ${CMAKE_CURRENT_SOURCE_DIR}/cache_policy.cpp
@@ -62,6 +63,8 @@ set(NEO_CORE_HELPERS
   ${CMAKE_CURRENT_SOURCE_DIR}/stdio.h
   ${CMAKE_CURRENT_SOURCE_DIR}/string.h
   ${CMAKE_CURRENT_SOURCE_DIR}/surface_format_info.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/timestamp_packet.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/timestamp_packet.h
   ${CMAKE_CURRENT_SOURCE_DIR}/vec.h
 )
 

core/helpers/array_count.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

core/helpers/timestamp_packet.cpp

@@ -5,11 +5,11 @@
  *
  */
 
-#include "runtime/helpers/timestamp_packet.h"
+#include "core/helpers/timestamp_packet.h"
 
 #include "core/command_stream/linear_stream.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/utilities/tag_allocator.h"
 
 using namespace NEO;
 

core/helpers/timestamp_packet.h

@@ -11,8 +11,8 @@
 #include "core/command_stream/csr_deps.h"
 #include "core/helpers/aux_translation.h"
 #include "core/helpers/non_copyable_or_moveable.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/helpers/properties_helper.h"
-#include "runtime/utilities/tag_allocator.h"
 
 #include <atomic>
 #include <cstdint>

core/utilities/CMakeLists.txt

@@ -28,6 +28,7 @@ set(NEO_CORE_UTILITIES
   ${CMAKE_CURRENT_SOURCE_DIR}/reference_tracked_object.h
   ${CMAKE_CURRENT_SOURCE_DIR}/spinlock.h
   ${CMAKE_CURRENT_SOURCE_DIR}/stackvec.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/tag_allocator.h
   ${CMAKE_CURRENT_SOURCE_DIR}/time_measure_wrapper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/timer_util.h
 )

core/utilities/tag_allocator.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *

offline_compiler/offline_compiler_options.cpp

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/helpers/array_count.h"
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/options.h"
-#include "runtime/helpers/array_count.h"
 
 #include <cstddef>
 

runtime/command_queue/command_queue.cpp

@@ -8,14 +8,17 @@
 #include "runtime/command_queue/command_queue.h"
 
 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/array_count.h"
 #include "core/helpers/engine_node_helper.h"
 #include "core/helpers/get_info.h"
 #include "core/helpers/options.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
+#include "core/helpers/timestamp_packet.h"
 #include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_context.h"
 #include "core/utilities/api_intercept.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
@@ -24,15 +27,12 @@
 #include "runtime/event/event_builder.h"
 #include "runtime/event/user_event.h"
 #include "runtime/gtpin/gtpin_notify.h"
-#include "runtime/helpers/array_count.h"
 #include "runtime/helpers/convert_color.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/mipmap.h"
 #include "runtime/helpers/queue_helpers.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"
-#include "runtime/utilities/tag_allocator.h"
 
 #include "CL/cl_ext.h"
 

runtime/command_queue/enqueue_common.h

@@ -6,12 +6,14 @@
  */
 
 #pragma once
+#include "core/helpers/array_count.h"
 #include "core/helpers/engine_node_helper.h"
 #include "core/helpers/options.h"
 #include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_context.h"
 #include "core/program/sync_buffer_handler.h"
 #include "core/utilities/range.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/builtin_kernels_simulation/scheduler_simulation.h"
@@ -22,7 +24,6 @@
 #include "runtime/event/event_builder.h"
 #include "runtime/event/user_event.h"
 #include "runtime/gtpin/gtpin_notify.h"
-#include "runtime/helpers/array_count.h"
 #include "runtime/helpers/dispatch_info_builder.h"
 #include "runtime/helpers/enqueue_properties.h"
 #include "runtime/helpers/hardware_commands_helper.h"
@@ -33,7 +34,6 @@
 #include "runtime/memory_manager/surface.h"
 #include "runtime/program/block_kernel_manager.h"
 #include "runtime/program/printf_handler.h"
-#include "runtime/utilities/tag_allocator.h"
 
 #include <algorithm>
 #include <new>

runtime/command_queue/gpgpu_walker.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -10,8 +10,10 @@
 #include "core/command_stream/linear_stream.h"
 #include "core/command_stream/preemption.h"
 #include "core/helpers/register_offsets.h"
+#include "core/helpers/timestamp_packet.h"
 #include "core/helpers/vec.h"
 #include "core/indirect_heap/indirect_heap.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/context/context.h"
@@ -21,10 +23,8 @@
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/task_information.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/program/kernel_info.h"
-#include "runtime/utilities/tag_allocator.h"
 
 namespace NEO {
 

runtime/command_queue/gpgpu_walker_base.inl

@@ -13,6 +13,7 @@
 #include "core/indirect_heap/indirect_heap.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/os_interface/os_context.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_queue/local_id_gen.h"
@@ -24,7 +25,6 @@
 #include "runtime/helpers/queue_helpers.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/mem_obj/mem_obj.h"
-#include "runtime/utilities/tag_allocator.h"
 
 #include <algorithm>
 #include <cmath>

runtime/command_queue/local_work_size.cpp

@@ -1,15 +1,15 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/helpers/array_count.h"
 #include "core/helpers/basic_math.h"
 #include "core/helpers/debug_helpers.h"
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/array_count.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/kernel/kernel.h"
 

runtime/command_stream/CMakeLists.txt

@@ -33,10 +33,6 @@ set(RUNTIME_SRCS_COMMAND_STREAM
   ${CMAKE_CURRENT_SOURCE_DIR}/experimental_command_buffer.h
   ${CMAKE_CURRENT_SOURCE_DIR}/experimental_command_buffer.inl
   ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/per_dss_backed_buffer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controller.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controller.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controller_base.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/scratch_space_controller_base.h
   ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver.h
   ${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver_hw.h

runtime/command_stream/aub_command_stream_receiver_hw.h

@@ -6,11 +6,11 @@
  */
 
 #pragma once
+#include "core/helpers/array_count.h"
 #include "core/utilities/spinlock.h"
 #include "runtime/aub/aub_center.h"
 #include "runtime/command_stream/aub_command_stream_receiver.h"
 #include "runtime/gen_common/aub_mapper.h"
-#include "runtime/helpers/array_count.h"
 #include "runtime/memory_manager/os_agnostic_memory_manager.h"
 #include "runtime/memory_manager/page_table.h"
 #include "runtime/memory_manager/physical_address_allocator.h"

runtime/command_stream/command_stream_receiver.cpp

@@ -8,26 +8,26 @@
 #include "runtime/command_stream/command_stream_receiver.h"
 
 #include "core/command_stream/preemption.h"
+#include "core/command_stream/scratch_space_controller.h"
 #include "core/execution_environment/root_device_environment.h"
+#include "core/helpers/array_count.h"
 #include "core/helpers/cache_policy.h"
 #include "core/helpers/flush_stamp.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/string.h"
+#include "core/helpers/timestamp_packet.h"
 #include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_context.h"
 #include "core/os_interface/os_interface.h"
 #include "core/utilities/cpuintrinsics.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/built_ins/built_ins.h"
 #include "runtime/command_stream/experimental_command_buffer.h"
-#include "runtime/command_stream/scratch_space_controller.h"
 #include "runtime/device/device.h"
 #include "runtime/gtpin/gtpin_notify.h"
-#include "runtime/helpers/array_count.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/memory_manager/surface.h"
 #include "runtime/platform/platform.h"
-#include "runtime/utilities/tag_allocator.h"
 
 namespace NEO {
 // Global table of CommandStreamReceiver factories for HW and tests

runtime/command_stream/command_stream_receiver_hw_base.inl

@@ -7,6 +7,7 @@
 
 #include "core/command_stream/linear_stream.h"
 #include "core/command_stream/preemption.h"
+#include "core/command_stream/scratch_space_controller_base.h"
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/execution_environment/root_device_environment.h"
 #include "core/gmm_helper/page_table_mngr.h"
@@ -17,20 +18,19 @@
 #include "core/helpers/preamble.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/state_base_address.h"
+#include "core/helpers/timestamp_packet.h"
 #include "core/indirect_heap/indirect_heap.h"
 #include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_context.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/command_stream/command_stream_receiver_hw.h"
 #include "runtime/command_stream/experimental_command_buffer.h"
-#include "runtime/command_stream/scratch_space_controller_base.h"
 #include "runtime/device/device.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/blit_commands_helper.h"
 #include "runtime/helpers/flat_batch_buffer_helper_hw.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/memory_manager/memory_manager.h"
-#include "runtime/utilities/tag_allocator.h"
 
 #include "command_stream_receiver_hw_ext.inl"
 

runtime/device_queue/device_queue_hw_base.inl

@@ -9,11 +9,11 @@
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/preamble.h"
 #include "core/helpers/string.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/device_queue/device_queue_hw.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/memory_manager/memory_manager.h"
-#include "runtime/utilities/tag_allocator.h"
 
 namespace NEO {
 template <typename GfxFamily>

runtime/dll/options_dll.cpp

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/helpers/array_count.h"
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/options.h"
-#include "runtime/helpers/array_count.h"
 
 namespace NEO {
 // AUB file folder location

runtime/event/async_events_handler.cpp

@@ -7,9 +7,9 @@
 
 #include "runtime/event/async_events_handler.h"
 
+#include "core/helpers/timestamp_packet.h"
 #include "core/os_interface/os_thread.h"
 #include "runtime/event/event.h"
-#include "runtime/helpers/timestamp_packet.h"
 
 #include <iterator>
 

runtime/event/event.cpp

@@ -9,9 +9,11 @@
 
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/get_info.h"
+#include "core/helpers/timestamp_packet.h"
 #include "core/memory_manager/internal_allocation_storage.h"
 #include "core/utilities/range.h"
 #include "core/utilities/stackvec.h"
+#include "core/utilities/tag_allocator.h"
 #include "public/cl_ext_private.h"
 #include "runtime/api/cl_types.h"
 #include "runtime/command_queue/command_queue.h"
@@ -21,10 +23,8 @@
 #include "runtime/event/async_events_handler.h"
 #include "runtime/event/event_tracker.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/mem_obj/mem_obj.h"
 #include "runtime/platform/platform.h"
-#include "runtime/utilities/tag_allocator.h"
 
 #define OCLRT_NUM_TIMESTAMP_BITS (32)
 

runtime/event/event_builder.cpp

@@ -8,10 +8,10 @@
 #include "runtime/event/event_builder.h"
 
 #include "core/helpers/debug_helpers.h"
+#include "core/helpers/timestamp_packet.h"
 #include "runtime/api/cl_types.h"
 #include "runtime/context/context.h"
 #include "runtime/event/user_event.h"
-#include "runtime/helpers/timestamp_packet.h"
 
 namespace NEO {
 EventBuilder::~EventBuilder() {

runtime/gen11/aub_command_stream_receiver_gen11.cpp

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/helpers/array_count.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw_bdw_plus.inl"
-#include "runtime/helpers/array_count.h"
 #include "runtime/helpers/base_object.h"
 
 namespace NEO {

runtime/gen11/tbx_command_stream_receiver_gen11.cpp

@@ -6,10 +6,10 @@
  */
 
 #include "core/gen11/hw_cmds.h"
+#include "core/helpers/array_count.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.inl"
 #include "runtime/command_stream/tbx_command_stream_receiver_hw.h"
 #include "runtime/command_stream/tbx_command_stream_receiver_hw.inl"
-#include "runtime/helpers/array_count.h"
 #include "runtime/helpers/base_object.h"
 
 namespace NEO {

runtime/gen12lp/aub_command_stream_receiver_gen12lp.cpp

@@ -1,15 +1,15 @@
 /*
- * Copyright (C) 2019 Intel Corporation
+ * Copyright (C) 2019-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/helpers/array_count.h"
 #include "core/memory_manager/memory_pool.h"
 #include "runtime/aub_mem_dump/aub_alloc_dump.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw_bdw_plus.inl"
-#include "runtime/helpers/array_count.h"
 #include "runtime/helpers/base_object.h"
 
 namespace NEO {

runtime/gen12lp/tbx_command_stream_receiver_gen12lp.cpp

@@ -1,17 +1,17 @@
 /*
- * Copyright (C) 2019 Intel Corporation
+ * Copyright (C) 2019-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "core/gen12lp/hw_cmds.h"
+#include "core/helpers/array_count.h"
 #include "core/memory_manager/memory_pool.h"
 #include "runtime/aub_mem_dump/aub_mem_dump.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.inl"
 #include "runtime/command_stream/tbx_command_stream_receiver_hw.h"
 #include "runtime/command_stream/tbx_command_stream_receiver_hw.inl"
-#include "runtime/helpers/array_count.h"
 #include "runtime/helpers/base_object.h"
 
 namespace NEO {

runtime/gen8/aub_command_stream_receiver_gen8.cpp

@@ -1,14 +1,13 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/helpers/array_count.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw_bdw_plus.inl"
-#include "runtime/helpers/array_count.h"
-#include "runtime/helpers/base_object.h"
 
 namespace NEO {
 

runtime/gen8/tbx_command_stream_receiver_gen8.cpp

@@ -1,16 +1,15 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "core/gen8/hw_cmds.h"
+#include "core/helpers/array_count.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.inl"
 #include "runtime/command_stream/tbx_command_stream_receiver_hw.h"
 #include "runtime/command_stream/tbx_command_stream_receiver_hw.inl"
-#include "runtime/helpers/array_count.h"
-#include "runtime/helpers/base_object.h"
 
 namespace NEO {
 

runtime/gen9/aub_command_stream_receiver_gen9.cpp

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/helpers/array_count.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw_bdw_plus.inl"
-#include "runtime/helpers/array_count.h"
 #include "runtime/helpers/base_object.h"
 
 namespace NEO {

runtime/gen9/tbx_command_stream_receiver_gen9.cpp

@@ -1,15 +1,15 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "core/gen9/hw_cmds.h"
+#include "core/helpers/array_count.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.inl"
 #include "runtime/command_stream/tbx_command_stream_receiver_hw.h"
 #include "runtime/command_stream/tbx_command_stream_receiver_hw.inl"
-#include "runtime/helpers/array_count.h"
 #include "runtime/helpers/base_object.h"
 
 namespace NEO {

runtime/helpers/CMakeLists.txt

@@ -6,7 +6,6 @@
 
 set(RUNTIME_SRCS_HELPERS_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/array_count.h
   ${CMAKE_CURRENT_SOURCE_DIR}/base_object.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/base_object.h
   ${CMAKE_CURRENT_SOURCE_DIR}/blit_commands_helper_base.inl
@@ -51,8 +50,6 @@ set(RUNTIME_SRCS_HELPERS_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/string_helpers.h
   ${CMAKE_CURRENT_SOURCE_DIR}/surface_formats.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/surface_formats.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/timestamp_packet.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/timestamp_packet.h
   ${CMAKE_CURRENT_SOURCE_DIR}/task_information.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/task_information.h
   ${CMAKE_CURRENT_SOURCE_DIR}/task_information.inl

runtime/helpers/blit_commands_helper.cpp

@@ -7,9 +7,9 @@
 
 #include "runtime/helpers/blit_commands_helper.h"
 
+#include "core/helpers/timestamp_packet.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/context/context.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/memory_manager/surface.h"
 
 #include "CL/cl.h"

runtime/helpers/helper_options.cpp

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/helpers/array_count.h"
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/options.h"
-#include "runtime/helpers/array_count.h"
 
 #include <cstddef>
 

runtime/helpers/properties_helper.cpp

@@ -7,9 +7,9 @@
 
 #include "runtime/helpers/properties_helper.h"
 
+#include "core/helpers/timestamp_packet.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/helpers/mipmap.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/mem_obj/mem_obj.h"
 #include "runtime/memory_manager/memory_manager.h"

runtime/helpers/surface_formats.cpp

@@ -8,8 +8,8 @@
 #include "surface_formats.h"
 
 #include "core/gmm_helper/gmm_lib.h"
+#include "core/helpers/array_count.h"
 #include "runtime/api/cl_types.h"
-#include "runtime/helpers/array_count.h"
 #include "runtime/mem_obj/image.h"
 
 #include "validators.h"

runtime/helpers/task_information.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,11 +9,11 @@
 #include "core/command_stream/linear_stream.h"
 #include "core/helpers/completion_stamp.h"
 #include "core/helpers/hw_info.h"
+#include "core/helpers/timestamp_packet.h"
 #include "core/indirect_heap/indirect_heap.h"
 #include "core/utilities/iflist.h"
 #include "runtime/helpers/blit_commands_helper.h"
 #include "runtime/helpers/properties_helper.h"
-#include "runtime/helpers/timestamp_packet.h"
 
 #include <memory>
 #include <vector>

runtime/mem_obj/buffer.cpp

@@ -15,6 +15,7 @@
 #include "core/helpers/hw_info.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
+#include "core/helpers/timestamp_packet.h"
 #include "core/memory_manager/host_ptr_manager.h"
 #include "core/memory_manager/unified_memory_manager.h"
 #include "runtime/command_queue/command_queue.h"
@@ -22,7 +23,6 @@
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/helpers/validators.h"
 #include "runtime/mem_obj/mem_obj_helper.h"
 #include "runtime/memory_manager/memory_manager.h"

runtime/os_interface/performance_counters.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #include "runtime/os_interface/performance_counters.h"
 
-#include "runtime/utilities/tag_allocator.h"
+#include "core/utilities/tag_allocator.h"
 
 using namespace MetricsLibraryApi;
 

runtime/os_interface/windows/d3d_sharing_functions.h

@@ -1,14 +1,14 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
+#include "core/helpers/array_count.h"
 #include "core/helpers/debug_helpers.h"
 #include "runtime/api/dispatch.h"
-#include "runtime/helpers/array_count.h"
 #include "runtime/sharings/sharing.h"
 
 #include "DXGI1_2.h"

runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp

@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/helpers/timestamp_packet.h"
 #include "core/os_interface/os_interface.h"
 #include "core/os_interface/windows/gdi_interface.h"
 #include "public/cl_gl_private_intel.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/os_interface/windows/os_context_win.h"
 #include "runtime/os_interface/windows/os_interface.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"

runtime/os_interface/windows/gl/gl_sharing_win.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/timestamp_packet.h"
 #include "core/os_interface/windows/windows_wrapper.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/helpers/windows/gl_helper.h"
 #include "runtime/sharings/gl/gl_arb_sync_event.h"
 #include "runtime/sharings/gl/windows/gl_sharing_windows.h"

runtime/sharings/gl/gl_sharing.cpp

@@ -8,8 +8,8 @@
 #include "runtime/sharings/gl/gl_sharing.h"
 
 #include "core/helpers/string.h"
+#include "core/helpers/timestamp_packet.h"
 #include "runtime/context/context.inl"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/sharings/gl/gl_context_guard.h"
 #include "runtime/sharings/sharing_factory.h"
 

runtime/sharings/gl/windows/gl_sync_event_windows.cpp

@@ -6,13 +6,13 @@
  */
 
 #include "core/helpers/get_info.h"
+#include "core/helpers/timestamp_packet.h"
 #include "public/cl_gl_private_intel.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/context/context.h"
 #include "runtime/device/device.h"
 #include "runtime/event/async_events_handler.h"
 #include "runtime/event/event_builder.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/platform/platform.h"
 #include "runtime/sharings/gl/gl_context_guard.h"
 #include "runtime/sharings/gl/gl_sync_event.h"

runtime/sharings/unified/unified_sharing.cpp

@@ -8,8 +8,8 @@
 #include "runtime/sharings/unified/unified_sharing.h"
 
 #include "core/helpers/string.h"
+#include "core/helpers/timestamp_packet.h"
 #include "runtime/context/context.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/sharings/sharing_factory.h"
 
 #include <unordered_map>

runtime/utilities/CMakeLists.txt

@@ -8,7 +8,6 @@ set(RUNTIME_SRCS_UTILITIES_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/logger.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/logger.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/tag_allocator.h
 )
 
 set_property(GLOBAL PROPERTY RUNTIME_SRCS_UTILITIES_BASE ${RUNTIME_SRCS_UTILITIES_BASE})

runtime/utilities/logger.cpp

@@ -8,9 +8,9 @@
 #include "runtime/utilities/logger.h"
 
 #include "core/debug_settings/debug_settings_manager.h"
+#include "core/helpers/timestamp_packet.h"
 #include "runtime/event/event.h"
 #include "runtime/helpers/dispatch_info.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/mem_obj/mem_obj.h"
 

unit_tests/aub_tests/command_queue/enqueue_with_timestamp_packet_aub_tests.cpp

@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/helpers/timestamp_packet.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/event/event.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/mem_obj/buffer.h"
-#include "runtime/utilities/tag_allocator.h"
 #include "test.h"
 #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h"
 

unit_tests/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.cpp

@@ -9,11 +9,11 @@
 
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/event/event.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/mem_obj/buffer.h"
-#include "runtime/utilities/tag_allocator.h"
 #include "test.h"
 #include "unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h"
 #include "unit_tests/aub_tests/fixtures/hello_world_fixture.h"

unit_tests/command_queue/command_queue_tests.cpp

@@ -7,13 +7,13 @@
 
 #include "core/helpers/basic_math.h"
 #include "core/helpers/options.h"
+#include "core/helpers/timestamp_packet.h"
 #include "core/memory_manager/internal_allocation_storage.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/event/event.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "test.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"

unit_tests/command_queue/dispatch_walker_tests.cpp

@@ -8,13 +8,13 @@
 #include "core/helpers/aligned_memory.h"
 #include "core/memory_manager/internal_allocation_storage.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
+#include "core/utilities/tag_allocator.h"
 #include "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/hardware_commands_helper.h"
 #include "runtime/helpers/task_information.h"
-#include "runtime/utilities/tag_allocator.h"
 #include "test.h"
 #include "unit_tests/command_queue/command_queue_fixture.h"
 #include "unit_tests/fixtures/device_fixture.h"

unit_tests/command_queue/enqueue_command_without_kernel_tests.cpp

@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/helpers/timestamp_packet.h"
 #include "core/os_interface/os_context.h"
 #include "runtime/event/event_builder.h"
 #include "runtime/event/user_event.h"
 #include "runtime/helpers/enqueue_properties.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/memory_manager/surface.h"
 #include "test.h"
 #include "unit_tests/fixtures/dispatch_flags_fixture.h"

unit_tests/command_queue/enqueue_kernel_2_tests.cpp

@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/command_stream/scratch_space_controller.h"
 #include "core/helpers/hw_helper.h"
 #include "core/memory_manager/allocations_list.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/utilities/base_object_utils.h"
-#include "runtime/command_stream/scratch_space_controller.h"
 #include "unit_tests/command_queue/enqueue_fixture.h"
 #include "unit_tests/fixtures/hello_world_fixture.h"
 #include "unit_tests/gen_common/gen_cmd_parse.h"

unit_tests/command_stream/command_stream_receiver_flush_task_2_tests.cpp

@@ -6,13 +6,13 @@
  */
 
 #include "core/command_stream/csr_definitions.h"
+#include "core/command_stream/scratch_space_controller.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/state_base_address.h"
 #include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_context.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/command_stream/scratch_space_controller.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "test.h"
 #include "unit_tests/fixtures/ult_command_stream_receiver_fixture.h"

unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp

@@ -7,6 +7,7 @@
 
 #include "core/command_stream/linear_stream.h"
 #include "core/command_stream/preemption.h"
+#include "core/command_stream/scratch_space_controller.h"
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/cache_policy.h"
@@ -19,7 +20,6 @@
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/command_stream/scratch_space_controller.h"
 #include "runtime/event/user_event.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/memory_manager.h"

unit_tests/command_stream/command_stream_receiver_hw_tests.cpp

@@ -7,6 +7,8 @@
 
 #include "core/command_stream/linear_stream.h"
 #include "core/command_stream/preemption.h"
+#include "core/command_stream/scratch_space_controller.h"
+#include "core/command_stream/scratch_space_controller_base.h"
 #include "core/debug_settings/debug_settings_manager.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/cache_policy.h"
@@ -22,8 +24,6 @@
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#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/blit_commands_helper.h"
 #include "runtime/mem_obj/buffer.h"

unit_tests/command_stream/command_stream_receiver_tests.cpp

@@ -7,20 +7,20 @@
 
 #include "core/command_stream/linear_stream.h"
 #include "core/command_stream/preemption.h"
+#include "core/command_stream/scratch_space_controller.h"
 #include "core/gmm_helper/page_table_mngr.h"
 #include "core/helpers/cache_policy.h"
 #include "core/helpers/hw_helper.h"
+#include "core/helpers/timestamp_packet.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/memory_manager/internal_allocation_storage.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/command_stream/command_stream_receiver.h"
-#include "runtime/command_stream/scratch_space_controller.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/memory_manager/memory_manager.h"
 #include "runtime/memory_manager/surface.h"
 #include "runtime/platform/platform.h"
-#include "runtime/utilities/tag_allocator.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"
 #include "unit_tests/fixtures/multi_root_device_fixture.h"

unit_tests/command_stream/command_stream_receiver_with_aub_dump_tests.cpp

@@ -8,16 +8,16 @@
 #include "core/command_stream/preemption.h"
 #include "core/helpers/flush_stamp.h"
 #include "core/helpers/hw_helper.h"
+#include "core/helpers/timestamp_packet.h"
 #include "core/os_interface/os_context.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/command_stream/aub_command_stream_receiver_hw.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h"
 #include "runtime/command_stream/command_stream_receiver_with_aub_dump.inl"
 #include "runtime/command_stream/tbx_command_stream_receiver_hw.h"
 #include "runtime/execution_environment/execution_environment.h"
 #include "runtime/helpers/dispatch_info.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/platform/platform.h"
-#include "runtime/utilities/tag_allocator.h"
 #include "test.h"
 #include "unit_tests/fixtures/mock_aub_center_fixture.h"
 #include "unit_tests/libult/ult_command_stream_receiver.h"

unit_tests/context/context_multi_device_tests.cpp

@@ -5,8 +5,8 @@
  *
  */
 
+#include "core/helpers/array_count.h"
 #include "runtime/context/context.h"
-#include "runtime/helpers/array_count.h"
 #include "test.h"
 #include "unit_tests/fixtures/device_fixture.h"
 

unit_tests/device_queue/device_queue_hw_tests.cpp

@@ -8,9 +8,9 @@
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/options.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/helpers/hardware_commands_helper.h"
-#include "runtime/utilities/tag_allocator.h"
 #include "unit_tests/fixtures/device_host_queue_fixture.h"
 #include "unit_tests/fixtures/execution_model_fixture.h"
 #include "unit_tests/helpers/hw_parse.h"

unit_tests/event/async_events_handler_tests.cpp

@@ -5,11 +5,11 @@
  *
  */
 
+#include "core/helpers/timestamp_packet.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/event/async_events_handler.h"
 #include "runtime/event/event.h"
 #include "runtime/event/user_event.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/platform/platform.h"
 #include "test.h"
 #include "unit_tests/mocks/mock_async_event_handler.h"

unit_tests/event/event_tests.cpp

@@ -9,12 +9,12 @@
 #include "core/memory_manager/internal_allocation_storage.h"
 #include "core/os_interface/os_interface.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/event/perf_counter.h"
 #include "runtime/helpers/task_information.h"
 #include "runtime/memory_manager/surface.h"
-#include "runtime/utilities/tag_allocator.h"
 #include "test.h"
 #include "unit_tests/fixtures/image_fixture.h"
 #include "unit_tests/mocks/mock_command_queue.h"

unit_tests/execution_model/submit_blocked_parent_kernel_tests.cpp

@@ -5,12 +5,12 @@
  *
  */
 
+#include "core/utilities/tag_allocator.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_queue/hardware_interface.h"
 #include "runtime/event/hw_timestamps.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/task_information.h"
-#include "runtime/utilities/tag_allocator.h"
 #include "unit_tests/fixtures/execution_model_fixture.h"
 #include "unit_tests/mocks/mock_command_queue.h"
 #include "unit_tests/mocks/mock_device_queue.h"

unit_tests/fixtures/simple_arg_kernel_fixture.h

@@ -6,10 +6,10 @@
  */
 
 #pragma once
+#include "core/helpers/array_count.h"
 #include "core/helpers/file_io.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/array_count.h"
 #include "runtime/kernel/kernel.h"
 #include "runtime/program/program.h"
 #include "unit_tests/fixtures/device_fixture.h"

unit_tests/gen12lp/test_device_queue_hw_gen12lp.inl

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2019 Intel Corporation
+ * Copyright (C) 2019-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/utilities/tag_allocator.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/context/context.h"
-#include "runtime/utilities/tag_allocator.h"
 #include "unit_tests/fixtures/device_host_queue_fixture.h"
 #include "unit_tests/helpers/hw_parse.h"
 #include "unit_tests/mocks/mock_device_queue.h"

unit_tests/helpers/array_count_tests.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "runtime/helpers/array_count.h"
+#include "core/helpers/array_count.h"
 
 #include "gtest/gtest.h"
 

unit_tests/helpers/timestamp_packet_tests.cpp

@@ -6,14 +6,14 @@
  */
 
 #include "core/helpers/options.h"
+#include "core/helpers/timestamp_packet.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/utilities/base_object_utils.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/command_queue/hardware_interface.h"
 #include "runtime/event/user_event.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/platform/platform.h"
-#include "runtime/utilities/tag_allocator.h"
 #include "test.h"
 #include "unit_tests/helpers/dispatch_flags_helper.h"
 #include "unit_tests/helpers/hw_parse.h"

unit_tests/mem_obj/buffer_tests.cpp

@@ -8,6 +8,7 @@
 #include "core/gmm_helper/gmm.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/gmm_helper/resource_info.h"
+#include "core/helpers/array_count.h"
 #include "core/helpers/hw_helper.h"
 #include "core/helpers/options.h"
 #include "core/memory_manager/allocations_list.h"
@@ -19,7 +20,6 @@
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_queue/gpgpu_walker.h"
 #include "runtime/event/user_event.h"
-#include "runtime/helpers/array_count.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/platform/platform.h"

unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp

@@ -7,7 +7,7 @@
 
 #include "unit_tests/memory_manager/memory_manager_allocate_in_device_pool_tests.inl"
 
-#include "runtime/helpers/array_count.h"
+#include "core/helpers/array_count.h"
 
 TEST(MemoryManagerTest, givenNotSetUseSystemMemoryWhenGraphicsAllocationInDevicePoolIsAllocatedThenAllocationIsReturned) {
     MockExecutionEnvironment executionEnvironment(*platformDevices);

unit_tests/mocks/mock_timestamp_container.h

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "runtime/helpers/timestamp_packet.h"
+#include "core/helpers/timestamp_packet.h"
 
 namespace NEO {
 

unit_tests/offline_compiler/decoder/decoder_tests.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "runtime/helpers/array_count.h"
+#include "core/helpers/array_count.h"
 #include "unit_tests/test_files/patch_list.h"
 
 #include "gmock/gmock.h"

unit_tests/offline_compiler/decoder/encoder_tests.cpp

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2018-2019 Intel Corporation
+ * Copyright (C) 2018-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/helpers/array_count.h"
 #include "offline_compiler/decoder/binary_decoder.h"
-#include "runtime/helpers/array_count.h"
 #include "unit_tests/helpers/test_files.h"
 
 #include "gmock/gmock.h"

unit_tests/options_unit_tests.cpp

@@ -1,14 +1,14 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
+#include "core/helpers/array_count.h"
 #include "core/helpers/hw_cmds.h"
 #include "core/helpers/hw_info.h"
 #include "core/helpers/options.h"
-#include "runtime/helpers/array_count.h"
 
 namespace NEO {
 const char *folderAUB = "aub_out";

unit_tests/os_interface/linux/drm_memory_manager_tests.cpp

@@ -12,15 +12,16 @@
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/ptr_math.h"
+#include "core/helpers/timestamp_packet.h"
 #include "core/memory_manager/host_ptr_manager.h"
 #include "core/memory_manager/memory_constants.h"
 #include "core/memory_manager/residency.h"
 #include "core/os_interface/os_context.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/command_stream/device_command_stream.h"
 #include "runtime/event/event.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/os_interface/linux/allocator_helper.h"
@@ -29,7 +30,6 @@
 #include "runtime/os_interface/linux/drm_command_stream.h"
 #include "runtime/os_interface/linux/drm_memory_manager.h"
 #include "runtime/os_interface/linux/os_context_linux.h"
-#include "runtime/utilities/tag_allocator.h"
 #include "test.h"
 #include "unit_tests/helpers/unit_test_helper.h"
 #include "unit_tests/mocks/linux/mock_drm_command_stream_receiver.h"

unit_tests/os_interface/performance_counters_tests.cpp

@@ -10,7 +10,7 @@
 #include "core/os_interface/os_interface.h"
 #include "core/os_interface/os_time.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
-#include "runtime/utilities/tag_allocator.h"
+#include "core/utilities/tag_allocator.h"
 #include "unit_tests/fixtures/device_instrumentation_fixture.h"
 #include "unit_tests/mocks/mock_device.h"
 #include "unit_tests/mocks/mock_execution_environment.h"

unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp

@@ -6,9 +6,9 @@
  */
 
 #include "core/execution_environment/root_device_environment.h"
+#include "core/helpers/timestamp_packet.h"
 #include "core/os_interface/os_interface.h"
 #include "public/cl_gl_private_intel.h"
-#include "runtime/helpers/timestamp_packet.h"
 #include "runtime/os_interface/windows/os_context_win.h"
 #include "runtime/os_interface/windows/os_interface.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"

unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp

@@ -10,10 +10,11 @@
 #include "core/gmm_helper/gmm.h"
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/array_count.h"
 #include "core/os_interface/os_library.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/utilities/base_object_utils.h"
-#include "runtime/helpers/array_count.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/helpers/memory_properties_flags_helpers.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"
@@ -21,7 +22,6 @@
 #include "runtime/os_interface/windows/os_context_win.h"
 #include "runtime/os_interface/windows/wddm_residency_controller.h"
 #include "runtime/platform/platform.h"
-#include "runtime/utilities/tag_allocator.h"
 #include "unit_tests/helpers/execution_environment_helper.h"
 #include "unit_tests/helpers/unit_test_helper.h"
 #include "unit_tests/mocks/mock_deferred_deleter.h"

unit_tests/profiling/profiling_tests.cpp

@@ -8,6 +8,7 @@
 #include "core/os_interface/os_interface.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/utilities/base_object_utils.h"
+#include "core/utilities/tag_allocator.h"
 #include "runtime/command_queue/command_queue_hw.h"
 #include "runtime/command_queue/enqueue_common.h"
 #include "runtime/command_queue/enqueue_kernel.h"
@@ -15,7 +16,6 @@
 #include "runtime/command_queue/enqueue_migrate_mem_objects.h"
 #include "runtime/helpers/dispatch_info.h"
 #include "runtime/memory_manager/surface.h"
-#include "runtime/utilities/tag_allocator.h"
 #include "test.h"
 #include "unit_tests/command_queue/command_enqueue_fixture.h"
 #include "unit_tests/event/event_fixture.h"

unit_tests/sharings/gl/windows/gl_sharing_tests.cpp

@@ -6,12 +6,12 @@
  */
 
 #include "core/gmm_helper/gmm.h"
+#include "core/helpers/array_count.h"
 #include "core/os_interface/os_interface.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/command_queue/command_queue.h"
 #include "runtime/device/device.h"
 #include "runtime/event/user_event.h"
-#include "runtime/helpers/array_count.h"
 #include "runtime/mem_obj/buffer.h"
 #include "runtime/mem_obj/image.h"
 #include "runtime/platform/platform.h"

unit_tests/sharings/va/va_sharing_tests.cpp

@@ -6,11 +6,11 @@
  */
 
 #include "core/gmm_helper/gmm.h"
+#include "core/helpers/array_count.h"
 #include "core/memory_manager/graphics_allocation.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "runtime/api/api.h"
 #include "runtime/device/device.h"
-#include "runtime/helpers/array_count.h"
 #include "runtime/platform/platform.h"
 #include "runtime/sharings/va/cl_va_api.h"
 #include "runtime/sharings/va/va_sharing.h"

unit_tests/utilities/tag_allocator_tests.cpp

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2017-2019 Intel Corporation
+ * Copyright (C) 2017-2020 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "runtime/helpers/timestamp_packet.h"
+#include "core/helpers/timestamp_packet.h"
-#include "runtime/utilities/tag_allocator.h"
+#include "core/utilities/tag_allocator.h"
 #include "test.h"
 #include "unit_tests/fixtures/memory_allocator_fixture.h"