diff --git a/core/helpers/CMakeLists.txt b/core/helpers/CMakeLists.txt index 058f2ba449..3569b92302 100644 --- a/core/helpers/CMakeLists.txt +++ b/core/helpers/CMakeLists.txt @@ -12,6 +12,9 @@ set(NEO_CORE_HELPERS ${CMAKE_CURRENT_SOURCE_DIR}/debug_helpers.h ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/extendable_enum.h + ${CMAKE_CURRENT_SOURCE_DIR}/file_io.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/file_io.h + ${CMAKE_CURRENT_SOURCE_DIR}/hash.h ${CMAKE_CURRENT_SOURCE_DIR}/interlocked_max.h ${CMAKE_CURRENT_SOURCE_DIR}/non_copyable_or_moveable.h ${CMAKE_CURRENT_SOURCE_DIR}/pipeline_select_args.h @@ -20,6 +23,7 @@ set(NEO_CORE_HELPERS ${CMAKE_CURRENT_SOURCE_DIR}/preamble_base.inl ${CMAKE_CURRENT_SOURCE_DIR}/preamble_bdw_plus.inl ${CMAKE_CURRENT_SOURCE_DIR}/register_offsets.h + ${CMAKE_CURRENT_SOURCE_DIR}/stdio.h ${CMAKE_CURRENT_SOURCE_DIR}/string.h ${CMAKE_CURRENT_SOURCE_DIR}/vec.h ) diff --git a/runtime/helpers/file_io.cpp b/core/helpers/file_io.cpp similarity index 98% rename from runtime/helpers/file_io.cpp rename to core/helpers/file_io.cpp index e88c8778bf..628d03f78a 100644 --- a/runtime/helpers/file_io.cpp +++ b/core/helpers/file_io.cpp @@ -8,7 +8,7 @@ #include "file_io.h" #include "core/helpers/debug_helpers.h" -#include "runtime/helpers/stdio.h" +#include "core/helpers/stdio.h" #include #include diff --git a/runtime/helpers/file_io.h b/core/helpers/file_io.h similarity index 92% rename from runtime/helpers/file_io.h rename to core/helpers/file_io.h index 2d86ccc928..a45d65ae43 100644 --- a/runtime/helpers/file_io.h +++ b/core/helpers/file_io.h @@ -6,7 +6,6 @@ */ #pragma once -#include "runtime/helpers/stdio.h" #include #include diff --git a/runtime/helpers/hash.h b/core/helpers/hash.h similarity index 100% rename from runtime/helpers/hash.h rename to core/helpers/hash.h diff --git a/runtime/helpers/stdio.h b/core/helpers/stdio.h similarity index 100% rename from runtime/helpers/stdio.h rename to core/helpers/stdio.h diff --git a/core/unit_tests/helpers/CMakeLists.txt b/core/unit_tests/helpers/CMakeLists.txt index 98d15cf391..13722e6c56 100644 --- a/core/unit_tests/helpers/CMakeLists.txt +++ b/core/unit_tests/helpers/CMakeLists.txt @@ -7,8 +7,12 @@ set(NEO_CORE_HELPERS_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/debug_manager_state_restore.h + ${CMAKE_CURRENT_SOURCE_DIR}/file_io_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/hash_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/memory_leak_listener.h ${CMAKE_CURRENT_SOURCE_DIR}/memory_management.h + ${CMAKE_CURRENT_SOURCE_DIR}/string_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/string_to_hash_tests.cpp ) set_property(GLOBAL PROPERTY NEO_CORE_HELPERS_TESTS ${NEO_CORE_HELPERS_TESTS}) diff --git a/unit_tests/helpers/file_io_tests.cpp b/core/unit_tests/helpers/file_io_tests.cpp similarity index 93% rename from unit_tests/helpers/file_io_tests.cpp rename to core/unit_tests/helpers/file_io_tests.cpp index 258355787c..07937b0ae9 100644 --- a/unit_tests/helpers/file_io_tests.cpp +++ b/core/unit_tests/helpers/file_io_tests.cpp @@ -5,7 +5,8 @@ * */ -#include "runtime/helpers/file_io.h" +#include "core/helpers/file_io.h" +#include "core/helpers/stdio.h" #include "gtest/gtest.h" diff --git a/unit_tests/helpers/hash_tests.cpp b/core/unit_tests/helpers/hash_tests.cpp similarity index 96% rename from unit_tests/helpers/hash_tests.cpp rename to core/unit_tests/helpers/hash_tests.cpp index 173f7683db..1985a4488b 100644 --- a/unit_tests/helpers/hash_tests.cpp +++ b/core/unit_tests/helpers/hash_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hash.h" +#include "core/helpers/hash.h" #include "gtest/gtest.h" diff --git a/unit_tests/helpers/string_tests.cpp b/core/unit_tests/helpers/string_tests.cpp similarity index 99% rename from unit_tests/helpers/string_tests.cpp rename to core/unit_tests/helpers/string_tests.cpp index e54284a5eb..f963671098 100644 --- a/unit_tests/helpers/string_tests.cpp +++ b/core/unit_tests/helpers/string_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/hash.h" #include "core/helpers/string.h" -#include "runtime/helpers/hash.h" #include "gtest/gtest.h" diff --git a/unit_tests/helpers/string_to_hash_tests.cpp b/core/unit_tests/helpers/string_to_hash_tests.cpp similarity index 99% rename from unit_tests/helpers/string_to_hash_tests.cpp rename to core/unit_tests/helpers/string_to_hash_tests.cpp index 0bab0792df..0d7f91c2a7 100644 --- a/unit_tests/helpers/string_to_hash_tests.cpp +++ b/core/unit_tests/helpers/string_to_hash_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/hash.h" +#include "core/helpers/hash.h" #include "runtime/helpers/string_helpers.h" #include "gtest/gtest.h" diff --git a/offline_compiler/CMakeLists.txt b/offline_compiler/CMakeLists.txt index cd08566963..c548d7a6c8 100644 --- a/offline_compiler/CMakeLists.txt +++ b/offline_compiler/CMakeLists.txt @@ -9,6 +9,7 @@ project(ocloc) set(CLOC_SRCS_LIB ${NEO_SOURCE_DIR}/core/helpers/abort.cpp ${NEO_SOURCE_DIR}/core/helpers/debug_helpers.cpp + ${NEO_SOURCE_DIR}/core/helpers/file_io.cpp ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.cpp ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_decoder.h ${NEO_SOURCE_DIR}/offline_compiler/decoder/binary_encoder.cpp @@ -25,7 +26,6 @@ set(CLOC_SRCS_LIB ${NEO_SOURCE_DIR}/offline_compiler/options.cpp ${NEO_SOURCE_DIR}/offline_compiler/${BRANCH_DIR_SUFFIX}/extra_settings.cpp ${NEO_SOURCE_DIR}/runtime/compiler_interface/create_main.cpp - ${NEO_SOURCE_DIR}/runtime/helpers/file_io.cpp ${NEO_SOURCE_DIR}/runtime/helpers/hw_info.cpp ${NEO_SOURCE_DIR}/runtime/platform/extensions.cpp ${NEO_SOURCE_DIR}/runtime/platform/extensions.h diff --git a/offline_compiler/decoder/binary_decoder.cpp b/offline_compiler/decoder/binary_decoder.cpp index 2c801fcc43..d3ba078c81 100644 --- a/offline_compiler/decoder/binary_decoder.cpp +++ b/offline_compiler/decoder/binary_decoder.cpp @@ -7,10 +7,10 @@ #include "binary_decoder.h" +#include "core/helpers/file_io.h" #include "core/helpers/ptr_math.h" #include "elf/reader.h" #include "offline_compiler/offline_compiler.h" -#include "runtime/helpers/file_io.h" #include "helper.h" diff --git a/offline_compiler/decoder/binary_encoder.cpp b/offline_compiler/decoder/binary_encoder.cpp index f67e30642b..254d5d164e 100644 --- a/offline_compiler/decoder/binary_encoder.cpp +++ b/offline_compiler/decoder/binary_encoder.cpp @@ -8,10 +8,10 @@ #include "binary_encoder.h" #include "core/helpers/aligned_memory.h" +#include "core/helpers/file_io.h" +#include "core/helpers/hash.h" #include "elf/writer.h" #include "offline_compiler/offline_compiler.h" -#include "runtime/helpers/file_io.h" -#include "runtime/helpers/hash.h" #include "CL/cl.h" #include "helper.h" diff --git a/offline_compiler/offline_compiler.cpp b/offline_compiler/offline_compiler.cpp index 884fa4e6eb..2d8c71de71 100644 --- a/offline_compiler/offline_compiler.cpp +++ b/offline_compiler/offline_compiler.cpp @@ -8,9 +8,9 @@ #include "offline_compiler.h" #include "core/helpers/debug_helpers.h" +#include "core/helpers/file_io.h" #include "core/helpers/string.h" #include "elf/writer.h" -#include "runtime/helpers/file_io.h" #include "runtime/helpers/hw_info.h" #include "runtime/helpers/validators.h" #include "runtime/os_interface/debug_settings_manager.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 17c28740a7..c6619d3605 100644 --- a/runtime/command_stream/aub_command_stream_receiver_hw_base.inl +++ b/runtime/command_stream/aub_command_stream_receiver_hw_base.inl @@ -7,6 +7,7 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/debug_helpers.h" +#include "core/helpers/hash.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" #include "core/memory_manager/graphics_allocation.h" @@ -20,7 +21,6 @@ #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/hardware_context_controller.h" -#include "runtime/helpers/hash.h" #include "runtime/helpers/neo_driver_version.h" #include "runtime/memory_manager/memory_banks.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" diff --git a/runtime/compiler_interface/binary_cache.cpp b/runtime/compiler_interface/binary_cache.cpp index 5ccd5196d7..c1a8357411 100644 --- a/runtime/compiler_interface/binary_cache.cpp +++ b/runtime/compiler_interface/binary_cache.cpp @@ -5,14 +5,15 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "runtime/compiler_interface/binary_cache.h" + +#include "core/helpers/aligned_memory.h" +#include "core/helpers/file_io.h" +#include "core/helpers/hash.h" +#include "core/utilities/debug_settings_reader.h" +#include "runtime/helpers/hw_info.h" +#include "runtime/os_interface/ocl_reg_path.h" +#include "runtime/os_interface/os_inc_base.h" #include "config.h" #include "os_inc.h" diff --git a/runtime/compiler_interface/binary_cache.h b/runtime/compiler_interface/binary_cache.h index fdbfd722eb..610ec6365d 100644 --- a/runtime/compiler_interface/binary_cache.h +++ b/runtime/compiler_interface/binary_cache.h @@ -11,6 +11,7 @@ #include #include +#include #include #include diff --git a/runtime/helpers/CMakeLists.txt b/runtime/helpers/CMakeLists.txt index 97d848b5ad..bded5bc564 100644 --- a/runtime/helpers/CMakeLists.txt +++ b/runtime/helpers/CMakeLists.txt @@ -34,8 +34,6 @@ set(RUNTIME_SRCS_HELPERS_BASE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/engine_node_helper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/engine_node_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/error_mappers.h - ${CMAKE_CURRENT_SOURCE_DIR}/file_io.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/file_io.h ${CMAKE_CURRENT_SOURCE_DIR}/flat_batch_buffer_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/flat_batch_buffer_helper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/flat_batch_buffer_helper_hw.h @@ -43,7 +41,6 @@ set(RUNTIME_SRCS_HELPERS_BASE ${CMAKE_CURRENT_SOURCE_DIR}/flush_stamp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/flush_stamp.h ${CMAKE_CURRENT_SOURCE_DIR}/get_info.h - ${CMAKE_CURRENT_SOURCE_DIR}/hash.h ${CMAKE_CURRENT_SOURCE_DIR}/hardware_commands_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/hardware_commands_helper.inl ${CMAKE_CURRENT_SOURCE_DIR}/hardware_commands_helper_base.inl @@ -79,7 +76,6 @@ set(RUNTIME_SRCS_HELPERS_BASE ${CMAKE_CURRENT_SOURCE_DIR}/state_base_address.h ${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_helpers.h ${CMAKE_CURRENT_SOURCE_DIR}/surface_formats.cpp ${CMAKE_CURRENT_SOURCE_DIR}/surface_formats.h diff --git a/runtime/program/process_gen_binary.cpp b/runtime/program/process_gen_binary.cpp index 4f2f54dea3..6d36d49a31 100644 --- a/runtime/program/process_gen_binary.cpp +++ b/runtime/program/process_gen_binary.cpp @@ -7,13 +7,13 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/debug_helpers.h" +#include "core/helpers/hash.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" #include "core/memory_manager/unified_memory_manager.h" #include "runtime/context/context.h" #include "runtime/device/device.h" #include "runtime/gtpin/gtpin_notify.h" -#include "runtime/helpers/hash.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/program/program.h" diff --git a/runtime/program/program.h b/runtime/program/program.h index b0305f035b..ecac9be550 100644 --- a/runtime/program/program.h +++ b/runtime/program/program.h @@ -7,12 +7,12 @@ #pragma once #include "core/compiler_interface/linker.h" +#include "core/helpers/stdio.h" #include "elf/reader.h" #include "elf/writer.h" #include "runtime/api/cl_types.h" #include "runtime/compiler_interface/compiler_interface.h" #include "runtime/helpers/base_object.h" -#include "runtime/helpers/stdio.h" #include "runtime/helpers/string_helpers.h" #include "runtime/program/block_kernel_manager.h" #include "runtime/program/kernel_info.h" diff --git a/unit_tests/api/cl_build_program_tests.inl b/unit_tests/api/cl_build_program_tests.inl index feea42c8bc..b885b21a63 100644 --- a/unit_tests/api/cl_build_program_tests.inl +++ b/unit_tests/api/cl_build_program_tests.inl @@ -5,10 +5,10 @@ * */ +#include "core/helpers/file_io.h" #include "runtime/compiler_interface/compiler_interface.h" #include "runtime/context/context.h" #include "runtime/device/device.h" -#include "runtime/helpers/file_io.h" #include "runtime/program/program.h" #include "unit_tests/helpers/kernel_binary_helper.h" #include "unit_tests/helpers/test_files.h" diff --git a/unit_tests/api/cl_clone_kernel_tests.inl b/unit_tests/api/cl_clone_kernel_tests.inl index fcdda86190..9de78858ed 100644 --- a/unit_tests/api/cl_clone_kernel_tests.inl +++ b/unit_tests/api/cl_clone_kernel_tests.inl @@ -5,8 +5,8 @@ * */ +#include "core/helpers/file_io.h" #include "runtime/context/context.h" -#include "runtime/helpers/file_io.h" #include "unit_tests/helpers/test_files.h" #include "cl_api_tests.h" diff --git a/unit_tests/api/cl_compile_program_tests.inl b/unit_tests/api/cl_compile_program_tests.inl index 0abff99793..5c4219743a 100644 --- a/unit_tests/api/cl_compile_program_tests.inl +++ b/unit_tests/api/cl_compile_program_tests.inl @@ -5,9 +5,9 @@ * */ +#include "core/helpers/file_io.h" #include "runtime/compiler_interface/compiler_interface.h" #include "runtime/context/context.h" -#include "runtime/helpers/file_io.h" #include "runtime/helpers/options.h" #include "unit_tests/helpers/kernel_binary_helper.h" #include "unit_tests/helpers/test_files.h" diff --git a/unit_tests/api/cl_create_kernel_tests.inl b/unit_tests/api/cl_create_kernel_tests.inl index dea1115ba1..e5988ad567 100644 --- a/unit_tests/api/cl_create_kernel_tests.inl +++ b/unit_tests/api/cl_create_kernel_tests.inl @@ -5,8 +5,8 @@ * */ +#include "core/helpers/file_io.h" #include "runtime/context/context.h" -#include "runtime/helpers/file_io.h" #include "unit_tests/helpers/test_files.h" #include "unit_tests/mocks/mock_program.h" diff --git a/unit_tests/api/cl_create_kernels_in_program_tests.inl b/unit_tests/api/cl_create_kernels_in_program_tests.inl index 9a524a80e5..ca2ca02d7e 100644 --- a/unit_tests/api/cl_create_kernels_in_program_tests.inl +++ b/unit_tests/api/cl_create_kernels_in_program_tests.inl @@ -5,8 +5,8 @@ * */ +#include "core/helpers/file_io.h" #include "runtime/context/context.h" -#include "runtime/helpers/file_io.h" #include "unit_tests/helpers/test_files.h" #include "cl_api_tests.h" diff --git a/unit_tests/api/cl_create_program_with_binary_tests.inl b/unit_tests/api/cl_create_program_with_binary_tests.inl index 5c82f802c3..453d52e470 100644 --- a/unit_tests/api/cl_create_program_with_binary_tests.inl +++ b/unit_tests/api/cl_create_program_with_binary_tests.inl @@ -5,8 +5,8 @@ * */ +#include "core/helpers/file_io.h" #include "runtime/context/context.h" -#include "runtime/helpers/file_io.h" #include "unit_tests/helpers/test_files.h" #include "cl_api_tests.h" diff --git a/unit_tests/api/cl_get_kernel_arg_info_tests.inl b/unit_tests/api/cl_get_kernel_arg_info_tests.inl index 7e96db8b75..7fdd612819 100644 --- a/unit_tests/api/cl_get_kernel_arg_info_tests.inl +++ b/unit_tests/api/cl_get_kernel_arg_info_tests.inl @@ -5,10 +5,10 @@ * */ +#include "core/helpers/file_io.h" #include "runtime/compiler_interface/compiler_interface.h" #include "runtime/context/context.h" #include "runtime/device/device.h" -#include "runtime/helpers/file_io.h" #include "runtime/helpers/options.h" #include "unit_tests/helpers/kernel_binary_helper.h" #include "unit_tests/helpers/test_files.h" diff --git a/unit_tests/api/cl_get_kernel_info_tests.inl b/unit_tests/api/cl_get_kernel_info_tests.inl index 64705c9de9..fc2f00718d 100644 --- a/unit_tests/api/cl_get_kernel_info_tests.inl +++ b/unit_tests/api/cl_get_kernel_info_tests.inl @@ -5,10 +5,10 @@ * */ +#include "core/helpers/file_io.h" #include "runtime/compiler_interface/compiler_interface.h" #include "runtime/context/context.h" #include "runtime/device/device.h" -#include "runtime/helpers/file_io.h" #include "runtime/helpers/options.h" #include "unit_tests/helpers/kernel_binary_helper.h" #include "unit_tests/helpers/test_files.h" diff --git a/unit_tests/api/cl_get_kernel_work_group_info_tests.inl b/unit_tests/api/cl_get_kernel_work_group_info_tests.inl index e476a2988e..33eeeae2b5 100644 --- a/unit_tests/api/cl_get_kernel_work_group_info_tests.inl +++ b/unit_tests/api/cl_get_kernel_work_group_info_tests.inl @@ -5,9 +5,9 @@ * */ +#include "core/helpers/file_io.h" #include "runtime/compiler_interface/compiler_interface.h" #include "runtime/device/device.h" -#include "runtime/helpers/file_io.h" #include "runtime/helpers/options.h" #include "unit_tests/helpers/kernel_binary_helper.h" #include "unit_tests/helpers/test_files.h" diff --git a/unit_tests/api/cl_get_mem_object_info_tests.inl b/unit_tests/api/cl_get_mem_object_info_tests.inl index cec3964b9b..67110aafef 100644 --- a/unit_tests/api/cl_get_mem_object_info_tests.inl +++ b/unit_tests/api/cl_get_mem_object_info_tests.inl @@ -5,10 +5,10 @@ * */ +#include "core/helpers/file_io.h" #include "runtime/compiler_interface/compiler_interface.h" #include "runtime/context/context.h" #include "runtime/device/device.h" -#include "runtime/helpers/file_io.h" #include "runtime/helpers/options.h" #include "unit_tests/helpers/test_files.h" diff --git a/unit_tests/api/cl_get_program_build_info_tests.inl b/unit_tests/api/cl_get_program_build_info_tests.inl index 31b1d9039d..7877048d97 100644 --- a/unit_tests/api/cl_get_program_build_info_tests.inl +++ b/unit_tests/api/cl_get_program_build_info_tests.inl @@ -5,10 +5,10 @@ * */ +#include "core/helpers/file_io.h" #include "runtime/compiler_interface/compiler_interface.h" #include "runtime/context/context.h" #include "runtime/device/device.h" -#include "runtime/helpers/file_io.h" #include "runtime/helpers/options.h" #include "unit_tests/elflib/elf_binary_simulator.h" #include "unit_tests/helpers/kernel_binary_helper.h" diff --git a/unit_tests/api/cl_get_program_info_tests.inl b/unit_tests/api/cl_get_program_info_tests.inl index fa34b347af..312b0466e0 100644 --- a/unit_tests/api/cl_get_program_info_tests.inl +++ b/unit_tests/api/cl_get_program_info_tests.inl @@ -5,10 +5,10 @@ * */ +#include "core/helpers/file_io.h" #include "runtime/compiler_interface/compiler_interface.h" #include "runtime/context/context.h" #include "runtime/device/device.h" -#include "runtime/helpers/file_io.h" #include "runtime/helpers/options.h" #include "unit_tests/helpers/kernel_binary_helper.h" #include "unit_tests/helpers/test_files.h" diff --git a/unit_tests/api/cl_link_program_tests.inl b/unit_tests/api/cl_link_program_tests.inl index f73fb4195d..10ffbaa781 100644 --- a/unit_tests/api/cl_link_program_tests.inl +++ b/unit_tests/api/cl_link_program_tests.inl @@ -5,9 +5,9 @@ * */ +#include "core/helpers/file_io.h" #include "runtime/compiler_interface/compiler_interface.h" #include "runtime/context/context.h" -#include "runtime/helpers/file_io.h" #include "runtime/helpers/options.h" #include "unit_tests/helpers/test_files.h" diff --git a/unit_tests/api/cl_release_kernel_tests.inl b/unit_tests/api/cl_release_kernel_tests.inl index acb27828a7..091071fa8a 100644 --- a/unit_tests/api/cl_release_kernel_tests.inl +++ b/unit_tests/api/cl_release_kernel_tests.inl @@ -5,8 +5,8 @@ * */ +#include "core/helpers/file_io.h" #include "runtime/context/context.h" -#include "runtime/helpers/file_io.h" #include "unit_tests/helpers/test_files.h" #include "cl_api_tests.h" diff --git a/unit_tests/aub_tests/fixtures/run_kernel_fixture.h b/unit_tests/aub_tests/fixtures/run_kernel_fixture.h index e5e049af88..6939824cbb 100644 --- a/unit_tests/aub_tests/fixtures/run_kernel_fixture.h +++ b/unit_tests/aub_tests/fixtures/run_kernel_fixture.h @@ -7,8 +7,8 @@ #pragma once +#include "core/helpers/file_io.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/helpers/file_io.h" #include "runtime/program/program.h" #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/aub_tests/command_stream/aub_command_stream_fixture.h" diff --git a/unit_tests/built_ins/built_in_tests.cpp b/unit_tests/built_ins/built_in_tests.cpp index ea0bd14819..249fb3e5b1 100644 --- a/unit_tests/built_ins/built_in_tests.cpp +++ b/unit_tests/built_ins/built_in_tests.cpp @@ -5,6 +5,8 @@ * */ +#include "core/helpers/file_io.h" +#include "core/helpers/hash.h" #include "core/helpers/string.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/utilities/base_object_utils.h" @@ -14,8 +16,6 @@ #include "runtime/built_ins/vme_dispatch_builder.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/helpers/dispatch_info_builder.h" -#include "runtime/helpers/file_io.h" -#include "runtime/helpers/hash.h" #include "runtime/kernel/kernel.h" #include "runtime/os_interface/debug_settings_manager.h" #include "test.h" diff --git a/unit_tests/compiler_interface/binary_cache_tests.cpp b/unit_tests/compiler_interface/binary_cache_tests.cpp index 72b52c9afb..df1aa590ae 100644 --- a/unit_tests/compiler_interface/binary_cache_tests.cpp +++ b/unit_tests/compiler_interface/binary_cache_tests.cpp @@ -5,17 +5,17 @@ * */ +#include "core/helpers/aligned_memory.h" +#include "core/helpers/hash.h" +#include "core/helpers/string.h" +#include "runtime/compiler_interface/binary_cache.h" #include "runtime/compiler_interface/compiler_interface.h" +#include "runtime/helpers/hw_info.h" #include "test.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "unit_tests/fixtures/device_fixture.h" +#include "unit_tests/global_environment.h" +#include "unit_tests/mocks/mock_context.h" +#include "unit_tests/mocks/mock_program.h" #include #include diff --git a/unit_tests/compiler_interface/compiler_interface_tests.cpp b/unit_tests/compiler_interface/compiler_interface_tests.cpp index dbc57ed86a..e17003133d 100644 --- a/unit_tests/compiler_interface/compiler_interface_tests.cpp +++ b/unit_tests/compiler_interface/compiler_interface_tests.cpp @@ -5,12 +5,12 @@ * */ +#include "core/helpers/file_io.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/compiler_interface/compiler_interface.h" #include "runtime/compiler_interface/compiler_interface.inl" #include "runtime/context/context.h" #include "runtime/gen_common/hw_cmds.h" -#include "runtime/helpers/file_io.h" #include "runtime/helpers/hw_info.h" #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/platform/platform.h" diff --git a/unit_tests/event/event_tracker_tests.cpp b/unit_tests/event/event_tracker_tests.cpp index 0241d12656..592ff71390 100644 --- a/unit_tests/event/event_tracker_tests.cpp +++ b/unit_tests/event/event_tracker_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/helpers/file_io.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/event/event.h" #include "runtime/event/event_tracker.h" -#include "runtime/helpers/file_io.h" #include "event_fixture.h" diff --git a/unit_tests/fixtures/hello_world_kernel_fixture.h b/unit_tests/fixtures/hello_world_kernel_fixture.h index a13696d1b8..e5e5b059bd 100644 --- a/unit_tests/fixtures/hello_world_kernel_fixture.h +++ b/unit_tests/fixtures/hello_world_kernel_fixture.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/helpers/file_io.h" #include "runtime/device/device.h" -#include "runtime/helpers/file_io.h" #include "runtime/kernel/kernel.h" #include "runtime/platform/platform.h" #include "runtime/program/program.h" diff --git a/unit_tests/fixtures/program_fixture.h b/unit_tests/fixtures/program_fixture.h index 1210022787..510ef212bf 100644 --- a/unit_tests/fixtures/program_fixture.h +++ b/unit_tests/fixtures/program_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/file_io.h" +#include "core/helpers/file_io.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/fixtures/simple_arg_kernel_fixture.h b/unit_tests/fixtures/simple_arg_kernel_fixture.h index a005d5638f..c1a964cc0b 100644 --- a/unit_tests/fixtures/simple_arg_kernel_fixture.h +++ b/unit_tests/fixtures/simple_arg_kernel_fixture.h @@ -6,10 +6,10 @@ */ #pragma once +#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/helpers/file_io.h" #include "runtime/kernel/kernel.h" #include "runtime/program/program.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/gtpin/gtpin_tests.cpp b/unit_tests/gtpin/gtpin_tests.cpp index a42791af62..bf0e3b3279 100644 --- a/unit_tests/gtpin/gtpin_tests.cpp +++ b/unit_tests/gtpin/gtpin_tests.cpp @@ -6,6 +6,8 @@ */ #include "core/helpers/basic_math.h" +#include "core/helpers/file_io.h" +#include "core/helpers/hash.h" #include "runtime/context/context.h" #include "runtime/device/device.h" #include "runtime/gtpin/gtpin_defs.h" @@ -13,8 +15,6 @@ #include "runtime/gtpin/gtpin_hw_helper.h" #include "runtime/gtpin/gtpin_init.h" #include "runtime/gtpin/gtpin_notify.h" -#include "runtime/helpers/file_io.h" -#include "runtime/helpers/hash.h" #include "runtime/helpers/options.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/buffer.h" diff --git a/unit_tests/helpers/CMakeLists.txt b/unit_tests/helpers/CMakeLists.txt index 0144f8487d..5da39acec6 100644 --- a/unit_tests/helpers/CMakeLists.txt +++ b/unit_tests/helpers/CMakeLists.txt @@ -21,14 +21,12 @@ set(IGDRCL_SRCS_tests_helpers ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info_builder_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/extendable_enum_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/file_io_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/flush_stamp_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/get_gpgpu_engines_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/get_info_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gtest_helpers.h ${CMAKE_CURRENT_SOURCE_DIR}/hardware_commands_helper_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hardware_commands_helper_tests.h - ${CMAKE_CURRENT_SOURCE_DIR}/hash_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_default_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests.h @@ -45,8 +43,6 @@ set(IGDRCL_SRCS_tests_helpers ${CMAKE_CURRENT_SOURCE_DIR}/raii_hw_helper.h ${CMAKE_CURRENT_SOURCE_DIR}/queue_helpers_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sampler_helpers_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/string_to_hash_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/string_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/task_information_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_debug_variables.inl ${CMAKE_CURRENT_SOURCE_DIR}/timestamp_packet_tests.cpp diff --git a/unit_tests/helpers/test_files.cpp b/unit_tests/helpers/test_files.cpp index 78e5ae3858..64cdea23fa 100644 --- a/unit_tests/helpers/test_files.cpp +++ b/unit_tests/helpers/test_files.cpp @@ -7,7 +7,7 @@ #include "test_files.h" -#include "runtime/helpers/file_io.h" +#include "core/helpers/file_io.h" #include "config.h" diff --git a/unit_tests/mocks/mock_compilers.cpp b/unit_tests/mocks/mock_compilers.cpp index f2e2a39a7e..f2bea1c6d5 100644 --- a/unit_tests/mocks/mock_compilers.cpp +++ b/unit_tests/mocks/mock_compilers.cpp @@ -7,7 +7,7 @@ #include "mock_compilers.h" -#include "runtime/helpers/file_io.h" +#include "core/helpers/file_io.h" #include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/os_inc_base.h" diff --git a/unit_tests/mocks/mock_program.cpp b/unit_tests/mocks/mock_program.cpp index 06d7d4fd08..bd382139c6 100644 --- a/unit_tests/mocks/mock_program.cpp +++ b/unit_tests/mocks/mock_program.cpp @@ -7,9 +7,9 @@ #include "unit_tests/mocks/mock_program.h" +#include "core/helpers/hash.h" #include "runtime/compiler_interface/binary_cache.h" #include "runtime/context/context.h" -#include "runtime/helpers/hash.h" #include "runtime/program/create.inl" #include "unit_tests/mocks/mock_compilers.h" #include "unit_tests/mocks/mock_graphics_allocation.h" diff --git a/unit_tests/mocks/mock_program.h b/unit_tests/mocks/mock_program.h index 20799a6705..8e350b01a6 100644 --- a/unit_tests/mocks/mock_program.h +++ b/unit_tests/mocks/mock_program.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/helpers/hash.h" #include "core/helpers/string.h" -#include "runtime/helpers/hash.h" #include "runtime/helpers/options.h" #include "runtime/program/program.h" diff --git a/unit_tests/mocks/mock_sip.cpp b/unit_tests/mocks/mock_sip.cpp index 1eb748d55f..637ad21d1a 100644 --- a/unit_tests/mocks/mock_sip.cpp +++ b/unit_tests/mocks/mock_sip.cpp @@ -7,7 +7,7 @@ #include "unit_tests/mocks/mock_sip.h" -#include "runtime/helpers/file_io.h" +#include "core/helpers/file_io.h" #include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/os_inc_base.h" diff --git a/unit_tests/offline_compiler/CMakeLists.txt b/unit_tests/offline_compiler/CMakeLists.txt index 3ad4418486..a47a2a9cd6 100644 --- a/unit_tests/offline_compiler/CMakeLists.txt +++ b/unit_tests/offline_compiler/CMakeLists.txt @@ -49,7 +49,7 @@ set(IGDRCL_SRCS_offline_compiler_tests ${CMAKE_CURRENT_SOURCE_DIR}/offline_compiler_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/offline_compiler_tests.h ${NEO_SOURCE_DIR}/core/helpers/abort.cpp - ${NEO_SOURCE_DIR}/runtime/helpers/file_io.cpp + ${NEO_SOURCE_DIR}/core/helpers/file_io.cpp ${NEO_SOURCE_DIR}/runtime/memory_manager/deferred_deleter.cpp ${NEO_SOURCE_DIR}/runtime/memory_manager/deferred_deleter.h ${NEO_SOURCE_DIR}/unit_tests/helpers/test_files.cpp diff --git a/unit_tests/offline_compiler/decoder/mock/mock_encoder.h b/unit_tests/offline_compiler/decoder/mock/mock_encoder.h index 44119c6fa3..54e5612196 100644 --- a/unit_tests/offline_compiler/decoder/mock/mock_encoder.h +++ b/unit_tests/offline_compiler/decoder/mock/mock_encoder.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/helpers/hash.h" #include "offline_compiler/decoder/binary_encoder.h" -#include "runtime/helpers/hash.h" #include "mock_iga_wrapper.h" diff --git a/unit_tests/offline_compiler/offline_compiler_tests.cpp b/unit_tests/offline_compiler/offline_compiler_tests.cpp index fd54fdaaad..e68b5936e4 100644 --- a/unit_tests/offline_compiler/offline_compiler_tests.cpp +++ b/unit_tests/offline_compiler/offline_compiler_tests.cpp @@ -7,8 +7,8 @@ #include "offline_compiler_tests.h" +#include "core/helpers/file_io.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/helpers/file_io.h" #include "runtime/helpers/hw_info.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/debug_settings_manager.h" diff --git a/unit_tests/os_interface/debug_settings_manager_fixture.h b/unit_tests/os_interface/debug_settings_manager_fixture.h index 787ecb3df1..8c832acca4 100644 --- a/unit_tests/os_interface/debug_settings_manager_fixture.h +++ b/unit_tests/os_interface/debug_settings_manager_fixture.h @@ -7,8 +7,8 @@ #pragma once +#include "core/helpers/file_io.h" #include "core/utilities/directory.h" -#include "runtime/helpers/file_io.h" #include "runtime/helpers/string_helpers.h" #include "runtime/os_interface/debug_settings_manager.h" diff --git a/unit_tests/os_interface/linux/drm_tests.cpp b/unit_tests/os_interface/linux/drm_tests.cpp index bab090ff86..67afbf9252 100644 --- a/unit_tests/os_interface/linux/drm_tests.cpp +++ b/unit_tests/os_interface/linux/drm_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/file_io.h" +#include "core/helpers/file_io.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/device_factory.h" #include "runtime/os_interface/linux/os_context_linux.h" diff --git a/unit_tests/program/process_elf_binary_tests.cpp b/unit_tests/program/process_elf_binary_tests.cpp index 96c93a8607..a9747a1025 100644 --- a/unit_tests/program/process_elf_binary_tests.cpp +++ b/unit_tests/program/process_elf_binary_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/file_io.h" #include "core/helpers/string.h" #include "runtime/device/device.h" -#include "runtime/helpers/file_io.h" #include "unit_tests/helpers/test_files.h" #include "unit_tests/mocks/mock_program.h" diff --git a/unit_tests/program/program_nonuniform.cpp b/unit_tests/program/program_nonuniform.cpp index 51a19b930d..34dd30b2ec 100644 --- a/unit_tests/program/program_nonuniform.cpp +++ b/unit_tests/program/program_nonuniform.cpp @@ -6,11 +6,11 @@ */ #include "core/helpers/aligned_memory.h" +#include "core/helpers/hash.h" #include "core/helpers/ptr_math.h" #include "core/memory_manager/graphics_allocation.h" #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/helpers/hardware_commands_helper.h" -#include "runtime/helpers/hash.h" #include "runtime/indirect_heap/indirect_heap.h" #include "runtime/kernel/kernel.h" #include "runtime/memory_manager/surface.h" diff --git a/unit_tests/program/program_tests.cpp b/unit_tests/program/program_tests.cpp index 54c4a111c1..71dcb07b52 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/aligned_memory.h" +#include "core/helpers/hash.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" #include "core/memory_manager/graphics_allocation.h" @@ -18,7 +19,6 @@ #include "runtime/compiler_interface/compiler_options.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/helpers/hardware_commands_helper.h" -#include "runtime/helpers/hash.h" #include "runtime/helpers/hw_helper.h" #include "runtime/indirect_heap/indirect_heap.h" #include "runtime/kernel/kernel.h" diff --git a/unit_tests/utilities/debug_file_reader_tests.inl b/unit_tests/utilities/debug_file_reader_tests.inl index 6d5a9c8072..0059b19c0b 100644 --- a/unit_tests/utilities/debug_file_reader_tests.inl +++ b/unit_tests/utilities/debug_file_reader_tests.inl @@ -5,8 +5,8 @@ * */ +#include "core/helpers/file_io.h" #include "core/utilities/debug_file_reader.h" -#include "runtime/helpers/file_io.h" #include "test.h" #include "gtest/gtest.h" diff --git a/unit_tests/utilities/debug_settings_reader_tests.cpp b/unit_tests/utilities/debug_settings_reader_tests.cpp index 93062f999e..115b9bc7ab 100644 --- a/unit_tests/utilities/debug_settings_reader_tests.cpp +++ b/unit_tests/utilities/debug_settings_reader_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/file_io.h" #include "core/utilities/debug_settings_reader.h" -#include "runtime/helpers/file_io.h" #include "runtime/os_interface/debug_settings_manager.h" #include "runtime/os_interface/ocl_reg_path.h" #include "test.h"