diff --git a/core/helpers/CMakeLists.txt b/core/helpers/CMakeLists.txt index ac39ae10f9..0846b0361d 100644 --- a/core/helpers/CMakeLists.txt +++ b/core/helpers/CMakeLists.txt @@ -9,6 +9,7 @@ set(NEO_CORE_HELPERS ${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}/string.h ${CMAKE_CURRENT_SOURCE_DIR}/vec.h ) diff --git a/runtime/helpers/string.h b/core/helpers/string.h similarity index 100% rename from runtime/helpers/string.h rename to core/helpers/string.h diff --git a/elf/writer.cpp b/elf/writer.cpp index 246d70c717..8b667cd202 100644 --- a/elf/writer.cpp +++ b/elf/writer.cpp @@ -10,7 +10,7 @@ #include // Need for linux compatibility with memcpy_s -#include "runtime/helpers/string.h" +#include "core/helpers/string.h" namespace CLElfLib { void CElfWriter::resolveBinary(ElfBinaryStorage &binary) { diff --git a/offline_compiler/offline_compiler.cpp b/offline_compiler/offline_compiler.cpp index 08d5c2ec84..10436a1658 100644 --- a/offline_compiler/offline_compiler.cpp +++ b/offline_compiler/offline_compiler.cpp @@ -7,11 +7,11 @@ #include "offline_compiler.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/string.h" #include "runtime/helpers/validators.h" #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/os_interface/os_inc_base.h" diff --git a/runtime/accelerators/intel_accelerator.cpp b/runtime/accelerators/intel_accelerator.cpp index 695eb88094..c0f0690a2e 100644 --- a/runtime/accelerators/intel_accelerator.cpp +++ b/runtime/accelerators/intel_accelerator.cpp @@ -7,9 +7,9 @@ #include "runtime/accelerators/intel_accelerator.h" +#include "core/helpers/string.h" #include "runtime/context/context.h" #include "runtime/helpers/get_info.h" -#include "runtime/helpers/string.h" namespace NEO { diff --git a/runtime/built_ins/sip.cpp b/runtime/built_ins/sip.cpp index 052f47a02d..e2e0b5ba13 100644 --- a/runtime/built_ins/sip.cpp +++ b/runtime/built_ins/sip.cpp @@ -8,10 +8,10 @@ #include "runtime/built_ins/sip.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/helpers/string.h" #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/program/program.h" diff --git a/runtime/builtin_kernels_simulation/opencl_c.cpp b/runtime/builtin_kernels_simulation/opencl_c.cpp index 02347f131c..a6409c3030 100644 --- a/runtime/builtin_kernels_simulation/opencl_c.cpp +++ b/runtime/builtin_kernels_simulation/opencl_c.cpp @@ -7,7 +7,7 @@ #include "opencl_c.h" -#include "runtime/helpers/string.h" +#include "core/helpers/string.h" namespace BuiltinKernelsSimulation { diff --git a/runtime/command_queue/command_queue.cpp b/runtime/command_queue/command_queue.cpp index 5ef97986c4..d0a166f73d 100644 --- a/runtime/command_queue/command_queue.cpp +++ b/runtime/command_queue/command_queue.cpp @@ -8,6 +8,7 @@ #include "runtime/command_queue/command_queue.h" #include "core/helpers/ptr_math.h" +#include "core/helpers/string.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/context/context.h" @@ -24,7 +25,6 @@ #include "runtime/helpers/mipmap.h" #include "runtime/helpers/options.h" #include "runtime/helpers/queue_helpers.h" -#include "runtime/helpers/string.h" #include "runtime/helpers/surface_formats.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/mem_obj/buffer.h" diff --git a/runtime/command_queue/enqueue_write_buffer.h b/runtime/command_queue/enqueue_write_buffer.h index 7cf57d6ba3..7ec33c570d 100644 --- a/runtime/command_queue/enqueue_write_buffer.h +++ b/runtime/command_queue/enqueue_write_buffer.h @@ -6,11 +6,11 @@ */ #pragma once +#include "core/helpers/string.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/helpers/hardware_commands_helper.h" -#include "runtime/helpers/string.h" #include "runtime/mem_obj/buffer.h" #include "runtime/memory_manager/surface.h" diff --git a/runtime/command_stream/aub_command_stream_receiver_hw_base.inl b/runtime/command_stream/aub_command_stream_receiver_hw_base.inl index 86180e2ec3..fd912760c9 100644 --- a/runtime/command_stream/aub_command_stream_receiver_hw_base.inl +++ b/runtime/command_stream/aub_command_stream_receiver_hw_base.inl @@ -6,6 +6,7 @@ */ #include "core/helpers/ptr_math.h" +#include "core/helpers/string.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" @@ -19,7 +20,6 @@ #include "runtime/helpers/hardware_context_controller.h" #include "runtime/helpers/hash.h" #include "runtime/helpers/neo_driver_version.h" -#include "runtime/helpers/string.h" #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/memory_manager/memory_banks.h" #include "runtime/memory_manager/memory_constants.h" diff --git a/runtime/command_stream/command_stream_receiver.cpp b/runtime/command_stream/command_stream_receiver.cpp index 311e28f316..646b6e8353 100644 --- a/runtime/command_stream/command_stream_receiver.cpp +++ b/runtime/command_stream/command_stream_receiver.cpp @@ -7,6 +7,7 @@ #include "runtime/command_stream/command_stream_receiver.h" +#include "core/helpers/string.h" #include "runtime/aub_mem_dump/aub_services.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_stream/experimental_command_buffer.h" @@ -19,7 +20,6 @@ #include "runtime/helpers/array_count.h" #include "runtime/helpers/cache_policy.h" #include "runtime/helpers/flush_stamp.h" -#include "runtime/helpers/string.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/mem_obj/buffer.h" #include "runtime/memory_manager/internal_allocation_storage.h" diff --git a/runtime/command_stream/preemption.cpp b/runtime/command_stream/preemption.cpp index 9a476e5bca..67abcff69d 100644 --- a/runtime/command_stream/preemption.cpp +++ b/runtime/command_stream/preemption.cpp @@ -7,10 +7,10 @@ #include "runtime/command_stream/preemption.h" +#include "core/helpers/string.h" #include "runtime/built_ins/built_ins.h" #include "runtime/device/device.h" #include "runtime/helpers/dispatch_info.h" -#include "runtime/helpers/string.h" #include "runtime/kernel/kernel.h" namespace NEO { diff --git a/runtime/context/context.cpp b/runtime/context/context.cpp index c715b457f1..68c885754b 100644 --- a/runtime/context/context.cpp +++ b/runtime/context/context.cpp @@ -8,6 +8,7 @@ #include "runtime/context/context.h" #include "core/helpers/ptr_math.h" +#include "core/helpers/string.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_stream/command_stream_receiver.h" @@ -16,7 +17,6 @@ #include "runtime/device_queue/device_queue.h" #include "runtime/gtpin/gtpin_notify.h" #include "runtime/helpers/get_info.h" -#include "runtime/helpers/string.h" #include "runtime/helpers/surface_formats.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/deferred_deleter.h" diff --git a/runtime/device_queue/device_queue_hw_base.inl b/runtime/device_queue/device_queue_hw_base.inl index 966674e9ef..7536e1b503 100644 --- a/runtime/device_queue/device_queue_hw_base.inl +++ b/runtime/device_queue/device_queue_hw_base.inl @@ -6,12 +6,12 @@ */ #pragma once +#include "core/helpers/string.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/helpers/hw_helper.h" #include "runtime/helpers/preamble.h" -#include "runtime/helpers/string.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/utilities/tag_allocator.h" diff --git a/runtime/gtpin/gtpin_hw_helper.inl b/runtime/gtpin/gtpin_hw_helper.inl index c9ad8b4605..956f0509ef 100644 --- a/runtime/gtpin/gtpin_hw_helper.inl +++ b/runtime/gtpin/gtpin_hw_helper.inl @@ -5,8 +5,8 @@ * */ +#include "core/helpers/string.h" #include "runtime/gtpin/gtpin_hw_helper.h" -#include "runtime/helpers/string.h" #include "runtime/kernel/kernel.h" #include "hw_cmds.h" diff --git a/runtime/helpers/CMakeLists.txt b/runtime/helpers/CMakeLists.txt index def5281d29..b4bf4509cf 100644 --- a/runtime/helpers/CMakeLists.txt +++ b/runtime/helpers/CMakeLists.txt @@ -79,7 +79,6 @@ set(RUNTIME_SRCS_HELPERS_BASE ${CMAKE_CURRENT_SOURCE_DIR}/state_base_address_base.inl ${CMAKE_CURRENT_SOURCE_DIR}/state_base_address_bdw_plus.inl ${CMAKE_CURRENT_SOURCE_DIR}/stdio.h - ${CMAKE_CURRENT_SOURCE_DIR}/string.h ${CMAKE_CURRENT_SOURCE_DIR}/string_helpers.h ${CMAKE_CURRENT_SOURCE_DIR}/surface_formats.cpp ${CMAKE_CURRENT_SOURCE_DIR}/surface_formats.h diff --git a/runtime/helpers/flat_batch_buffer_helper_hw.inl b/runtime/helpers/flat_batch_buffer_helper_hw.inl index db6f86859a..864382527a 100644 --- a/runtime/helpers/flat_batch_buffer_helper_hw.inl +++ b/runtime/helpers/flat_batch_buffer_helper_hw.inl @@ -5,9 +5,9 @@ * */ +#include "core/helpers/string.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/helpers/flat_batch_buffer_helper_hw.h" -#include "runtime/helpers/string.h" #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/memory_manager/memory_manager.h" diff --git a/runtime/helpers/get_info.h b/runtime/helpers/get_info.h index a6028b63fd..dd461205e8 100644 --- a/runtime/helpers/get_info.h +++ b/runtime/helpers/get_info.h @@ -11,7 +11,7 @@ #include // Need for linux compatibility with memcpy_s -#include "runtime/helpers/string.h" +#include "core/helpers/string.h" inline cl_int getInfo(void *destParamValue, size_t destParamValueSize, const void *srcParamValue, size_t srcParamValueSize) { diff --git a/runtime/helpers/hardware_commands_helper.inl b/runtime/helpers/hardware_commands_helper.inl index 5504b9214c..a6e7d3e9e7 100644 --- a/runtime/helpers/hardware_commands_helper.inl +++ b/runtime/helpers/hardware_commands_helper.inl @@ -7,13 +7,13 @@ #include "core/helpers/basic_math.h" #include "core/helpers/ptr_math.h" +#include "core/helpers/string.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/string.h" #include "runtime/indirect_heap/indirect_heap.h" #include "runtime/kernel/kernel.h" #include "runtime/os_interface/debug_settings_manager.h" diff --git a/runtime/helpers/task_information.cpp b/runtime/helpers/task_information.cpp index d65c123eef..ee581c127d 100644 --- a/runtime/helpers/task_information.cpp +++ b/runtime/helpers/task_information.cpp @@ -7,6 +7,7 @@ #include "runtime/helpers/task_information.h" +#include "core/helpers/string.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_queue/enqueue_common.h" @@ -17,7 +18,6 @@ #include "runtime/gtpin/gtpin_notify.h" #include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/csr_deps.h" -#include "runtime/helpers/string.h" #include "runtime/mem_obj/mem_obj.h" #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/memory_manager/surface.h" diff --git a/runtime/mem_obj/buffer.cpp b/runtime/mem_obj/buffer.cpp index d63e5ed420..e09533013c 100644 --- a/runtime/mem_obj/buffer.cpp +++ b/runtime/mem_obj/buffer.cpp @@ -8,6 +8,7 @@ #include "runtime/mem_obj/buffer.h" #include "core/helpers/ptr_math.h" +#include "core/helpers/string.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/context/context.h" @@ -17,7 +18,6 @@ #include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/hw_helper.h" #include "runtime/helpers/hw_info.h" -#include "runtime/helpers/string.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/helpers/validators.h" #include "runtime/mem_obj/mem_obj_helper.h" diff --git a/runtime/mem_obj/image.cpp b/runtime/mem_obj/image.cpp index 242a68ef3d..00f456d18f 100644 --- a/runtime/mem_obj/image.cpp +++ b/runtime/mem_obj/image.cpp @@ -10,6 +10,7 @@ #include "common/compiler_support.h" #include "core/helpers/basic_math.h" #include "core/helpers/ptr_math.h" +#include "core/helpers/string.h" #include "runtime/command_queue/command_queue.h" #include "runtime/context/context.h" #include "runtime/device/device.h" @@ -21,7 +22,6 @@ #include "runtime/helpers/hw_helper.h" #include "runtime/helpers/hw_info.h" #include "runtime/helpers/mipmap.h" -#include "runtime/helpers/string.h" #include "runtime/helpers/surface_formats.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/mem_obj_helper.h" diff --git a/runtime/mem_obj/image.h b/runtime/mem_obj/image.h index 8e0394b17a..d70ffc944b 100644 --- a/runtime/mem_obj/image.h +++ b/runtime/mem_obj/image.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/string.h" +#include "core/helpers/string.h" #include "runtime/helpers/surface_formats.h" #include "runtime/helpers/validators.h" #include "runtime/mem_obj/buffer.h" diff --git a/runtime/os_interface/debug_settings_manager.cpp b/runtime/os_interface/debug_settings_manager.cpp index 59eeaf7b9e..6c074fba78 100644 --- a/runtime/os_interface/debug_settings_manager.cpp +++ b/runtime/os_interface/debug_settings_manager.cpp @@ -8,9 +8,9 @@ #include "debug_settings_manager.h" #include "core/helpers/ptr_math.h" +#include "core/helpers/string.h" #include "runtime/event/event.h" #include "runtime/helpers/dispatch_info.h" -#include "runtime/helpers/string.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/mem_obj.h" diff --git a/runtime/platform/platform.cpp b/runtime/platform/platform.cpp index 24d1e246ca..ba6aa8e8d5 100644 --- a/runtime/platform/platform.cpp +++ b/runtime/platform/platform.cpp @@ -7,6 +7,7 @@ #include "platform.h" +#include "core/helpers/string.h" #include "runtime/api/api.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/compiler_interface/compiler_interface.h" @@ -20,7 +21,6 @@ #include "runtime/helpers/get_info.h" #include "runtime/helpers/hw_helper.h" #include "runtime/helpers/options.h" -#include "runtime/helpers/string.h" #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/os_interface/device_factory.h" #include "runtime/os_interface/os_interface.h" diff --git a/runtime/program/kernel_info.cpp b/runtime/program/kernel_info.cpp index eb87166385..c9b84de29a 100644 --- a/runtime/program/kernel_info.cpp +++ b/runtime/program/kernel_info.cpp @@ -6,10 +6,10 @@ */ #include "core/helpers/ptr_math.h" +#include "core/helpers/string.h" #include "runtime/device/device.h" #include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/dispatch_info.h" -#include "runtime/helpers/string.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" diff --git a/runtime/program/print_formatter.cpp b/runtime/program/print_formatter.cpp index 88d6d371dc..57e10c1b66 100644 --- a/runtime/program/print_formatter.cpp +++ b/runtime/program/print_formatter.cpp @@ -7,7 +7,7 @@ #include "print_formatter.h" -#include "runtime/helpers/string.h" +#include "core/helpers/string.h" #include "runtime/memory_manager/graphics_allocation.h" #include diff --git a/runtime/program/process_elf_binary.cpp b/runtime/program/process_elf_binary.cpp index 94e7506a35..4377596328 100644 --- a/runtime/program/process_elf_binary.cpp +++ b/runtime/program/process_elf_binary.cpp @@ -6,9 +6,9 @@ */ #include "common/compiler_support.h" +#include "core/helpers/string.h" #include "elf/reader.h" #include "elf/writer.h" -#include "runtime/helpers/string.h" #include "program.h" diff --git a/runtime/program/process_gen_binary.cpp b/runtime/program/process_gen_binary.cpp index acbf7e20b0..f809835aff 100644 --- a/runtime/program/process_gen_binary.cpp +++ b/runtime/program/process_gen_binary.cpp @@ -6,12 +6,12 @@ */ #include "core/helpers/ptr_math.h" +#include "core/helpers/string.h" #include "runtime/context/context.h" #include "runtime/gtpin/gtpin_notify.h" #include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/debug_helpers.h" #include "runtime/helpers/hash.h" -#include "runtime/helpers/string.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/memory_manager/unified_memory_manager.h" diff --git a/runtime/program/program.cpp b/runtime/program/program.cpp index faa2a953da..dddff8a6fe 100644 --- a/runtime/program/program.cpp +++ b/runtime/program/program.cpp @@ -7,12 +7,12 @@ #include "program.h" +#include "core/helpers/string.h" #include "elf/writer.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/helpers/string.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/memory_manager/unified_memory_manager.h" diff --git a/runtime/sharings/gl/gl_sharing.cpp b/runtime/sharings/gl/gl_sharing.cpp index cf2be4a5c6..2caacc4a02 100644 --- a/runtime/sharings/gl/gl_sharing.cpp +++ b/runtime/sharings/gl/gl_sharing.cpp @@ -7,8 +7,8 @@ #include "runtime/sharings/gl/gl_sharing.h" +#include "core/helpers/string.h" #include "runtime/context/context.h" -#include "runtime/helpers/string.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/sharings/gl/gl_arb_sync_event.h" #include "runtime/sharings/sharing_factory.h" diff --git a/runtime/tbx/tbx_sockets_imp.cpp b/runtime/tbx/tbx_sockets_imp.cpp index 0170959071..c39b910d6c 100644 --- a/runtime/tbx/tbx_sockets_imp.cpp +++ b/runtime/tbx/tbx_sockets_imp.cpp @@ -7,8 +7,8 @@ #include "runtime/tbx/tbx_sockets_imp.h" +#include "core/helpers/string.h" #include "runtime/helpers/debug_helpers.h" -#include "runtime/helpers/string.h" #ifdef WIN32 #ifndef WIN32_LEAN_AND_MEAN diff --git a/unit_tests/built_ins/built_in_tests.cpp b/unit_tests/built_ins/built_in_tests.cpp index 9d19c0fe7a..e912c06863 100644 --- a/unit_tests/built_ins/built_in_tests.cpp +++ b/unit_tests/built_ins/built_in_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/helpers/string.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/aux_translation_builtin.h" #include "runtime/built_ins/built_ins.h" @@ -13,7 +14,6 @@ #include "runtime/helpers/dispatch_info_builder.h" #include "runtime/helpers/file_io.h" #include "runtime/helpers/hash.h" -#include "runtime/helpers/string.h" #include "runtime/kernel/kernel.h" #include "runtime/os_interface/debug_settings_manager.h" #include "test.h" diff --git a/unit_tests/command_queue/flattened_id_tests.cpp b/unit_tests/command_queue/flattened_id_tests.cpp index db78655250..89ff4c6224 100644 --- a/unit_tests/command_queue/flattened_id_tests.cpp +++ b/unit_tests/command_queue/flattened_id_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/string.h" +#include "core/helpers/string.h" #include "gtest/gtest.h" diff --git a/unit_tests/compiler_interface/binary_cache_tests.cpp b/unit_tests/compiler_interface/binary_cache_tests.cpp index c139fde467..ab28613b9b 100644 --- a/unit_tests/compiler_interface/binary_cache_tests.cpp +++ b/unit_tests/compiler_interface/binary_cache_tests.cpp @@ -7,11 +7,11 @@ #include "runtime/compiler_interface/compiler_interface.h" #include "test.h" +#include #include #include #include #include -#include #include #include #include diff --git a/unit_tests/fixtures/kernel_data_fixture.cpp b/unit_tests/fixtures/kernel_data_fixture.cpp index 4bd69b274e..ae1853582e 100644 --- a/unit_tests/fixtures/kernel_data_fixture.cpp +++ b/unit_tests/fixtures/kernel_data_fixture.cpp @@ -7,8 +7,8 @@ #include "unit_tests/fixtures/kernel_data_fixture.h" +#include "core/helpers/string.h" #include "runtime/helpers/aligned_memory.h" -#include "runtime/helpers/string.h" #include "runtime/memory_manager/graphics_allocation.h" void KernelDataTest::buildAndDecode() { diff --git a/unit_tests/helpers/hw_helper_tests.cpp b/unit_tests/helpers/hw_helper_tests.cpp index 1681dcef1d..a373ab4d67 100644 --- a/unit_tests/helpers/hw_helper_tests.cpp +++ b/unit_tests/helpers/hw_helper_tests.cpp @@ -7,6 +7,7 @@ #include "unit_tests/helpers/hw_helper_tests.h" +#include "core/helpers/string.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" @@ -14,7 +15,6 @@ #include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/options.h" -#include "runtime/helpers/string.h" #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/os_interface/os_interface.h" #include "unit_tests/helpers/unit_test_helper.h" diff --git a/unit_tests/helpers/string_tests.cpp b/unit_tests/helpers/string_tests.cpp index bb356ddf00..e54284a5eb 100644 --- a/unit_tests/helpers/string_tests.cpp +++ b/unit_tests/helpers/string_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/string.h" #include "runtime/helpers/hash.h" -#include "runtime/helpers/string.h" #include "gtest/gtest.h" diff --git a/unit_tests/libult/source_level_debugger_library.cpp b/unit_tests/libult/source_level_debugger_library.cpp index d5a85f9806..242423bd11 100644 --- a/unit_tests/libult/source_level_debugger_library.cpp +++ b/unit_tests/libult/source_level_debugger_library.cpp @@ -7,7 +7,7 @@ #include "source_level_debugger_library.h" -#include "runtime/helpers/string.h" +#include "core/helpers/string.h" using namespace NEO; diff --git a/unit_tests/mocks/mock_csr.h b/unit_tests/mocks/mock_csr.h index ec7f848e72..adbac88fa9 100644 --- a/unit_tests/mocks/mock_csr.h +++ b/unit_tests/mocks/mock_csr.h @@ -6,6 +6,7 @@ */ #pragma once +#include "core/helpers/string.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/execution_environment/execution_environment.h" @@ -13,7 +14,6 @@ #include "runtime/helpers/flush_stamp.h" #include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" -#include "runtime/helpers/string.h" #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/os_interface/os_context.h" #include "unit_tests/libult/ult_command_stream_receiver.h" diff --git a/unit_tests/mocks/mock_kernel.h b/unit_tests/mocks/mock_kernel.h index 607b1bd229..37ceb4fa4e 100644 --- a/unit_tests/mocks/mock_kernel.h +++ b/unit_tests/mocks/mock_kernel.h @@ -7,8 +7,8 @@ #pragma once +#include "core/helpers/string.h" #include "runtime/device/device.h" -#include "runtime/helpers/string.h" #include "runtime/kernel/grf_config.h" #include "runtime/kernel/kernel.h" #include "runtime/scheduler/scheduler_kernel.h" diff --git a/unit_tests/mocks/mock_program.h b/unit_tests/mocks/mock_program.h index df7525711f..10f7b5fb4d 100644 --- a/unit_tests/mocks/mock_program.h +++ b/unit_tests/mocks/mock_program.h @@ -6,9 +6,9 @@ */ #pragma once +#include "core/helpers/string.h" #include "runtime/helpers/hash.h" #include "runtime/helpers/options.h" -#include "runtime/helpers/string.h" #include "runtime/program/program.h" #include "gmock/gmock.h" diff --git a/unit_tests/platform/platform_icd_tests.cpp b/unit_tests/platform/platform_icd_tests.cpp index 800d0e82c9..598bad54fa 100644 --- a/unit_tests/platform/platform_icd_tests.cpp +++ b/unit_tests/platform/platform_icd_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/string.h" #include "runtime/api/dispatch.h" -#include "runtime/helpers/string.h" #include "runtime/platform/platform.h" #include "runtime/sharings/sharing_factory.h" diff --git a/unit_tests/program/kernel_data.cpp b/unit_tests/program/kernel_data.cpp index 8edb7c4063..816681e9a9 100644 --- a/unit_tests/program/kernel_data.cpp +++ b/unit_tests/program/kernel_data.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/string.h" +#include "core/helpers/string.h" #include "runtime/platform/platform.h" #include "runtime/program/program.h" #include "unit_tests/fixtures/kernel_data_fixture.h" diff --git a/unit_tests/program/printf_helper_tests.cpp b/unit_tests/program/printf_helper_tests.cpp index 238e12558e..be593f5052 100644 --- a/unit_tests/program/printf_helper_tests.cpp +++ b/unit_tests/program/printf_helper_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/string.h" #include "runtime/helpers/aligned_memory.h" -#include "runtime/helpers/string.h" #include "runtime/program/print_formatter.h" #include "unit_tests/mocks/mock_device.h" #include "unit_tests/mocks/mock_graphics_allocation.h" diff --git a/unit_tests/program/process_elf_binary_tests.cpp b/unit_tests/program/process_elf_binary_tests.cpp index 050700dbbf..3e3f74cd38 100644 --- a/unit_tests/program/process_elf_binary_tests.cpp +++ b/unit_tests/program/process_elf_binary_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/string.h" #include "runtime/helpers/file_io.h" -#include "runtime/helpers/string.h" #include "runtime/program/program.h" #include "unit_tests/helpers/test_files.h" #include "unit_tests/mocks/mock_program.h" diff --git a/unit_tests/program/process_spir_binary_tests.cpp b/unit_tests/program/process_spir_binary_tests.cpp index 40943b6f1f..11f59c5a93 100644 --- a/unit_tests/program/process_spir_binary_tests.cpp +++ b/unit_tests/program/process_spir_binary_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/string.h" +#include "core/helpers/string.h" #include "runtime/program/program.h" #include "unit_tests/mocks/mock_program.h" diff --git a/unit_tests/program/program_data_tests.cpp b/unit_tests/program/program_data_tests.cpp index ecfc00144b..925477ab86 100644 --- a/unit_tests/program/program_data_tests.cpp +++ b/unit_tests/program/program_data_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/string.h" #include "core/unit_tests/compiler_interface/linker_mock.h" -#include "runtime/helpers/string.h" #include "runtime/memory_manager/allocations_list.h" #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/memory_manager/unified_memory_manager.h" diff --git a/unit_tests/program/program_tests.cpp b/unit_tests/program/program_tests.cpp index 7a16dee9b5..8518b43272 100644 --- a/unit_tests/program/program_tests.cpp +++ b/unit_tests/program/program_tests.cpp @@ -8,6 +8,7 @@ #include "unit_tests/program/program_tests.h" #include "core/helpers/ptr_math.h" +#include "core/helpers/string.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "elf/reader.h" #include "runtime/command_stream/command_stream_receiver_hw.h" @@ -17,7 +18,6 @@ #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/hash.h" #include "runtime/helpers/hw_helper.h" -#include "runtime/helpers/string.h" #include "runtime/indirect_heap/indirect_heap.h" #include "runtime/kernel/kernel.h" #include "runtime/memory_manager/allocations_list.h" diff --git a/unit_tests/sharings/sharing_factory_tests.cpp b/unit_tests/sharings/sharing_factory_tests.cpp index bb777c749d..5ae725179a 100644 --- a/unit_tests/sharings/sharing_factory_tests.cpp +++ b/unit_tests/sharings/sharing_factory_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/helpers/string.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/context/context.h" #include "runtime/device/device.h" -#include "runtime/helpers/string.h" #include "runtime/platform/extensions.h" #include "runtime/platform/platform.h" #include "runtime/sharings/sharing.h"