From 4360aff03c292f9c0f88775e7c579419ae3ea465 Mon Sep 17 00:00:00 2001 From: Jim Snow Date: Fri, 2 Aug 2019 13:25:45 -0700 Subject: [PATCH] Move runtime/helpers/aligned_memory.h to core/helpers Signed-off-by: Jim Snow Change-Id: I15de094c51d4eb18bfff4d17fd34e817b5525fda --- core/helpers/CMakeLists.txt | 1 + {runtime => core}/helpers/aligned_memory.h | 0 .../unit_tests}/helpers/aligned_memory_tests.cpp | 2 +- offline_compiler/decoder/binary_encoder.cpp | 2 +- runtime/api/api.cpp | 2 +- runtime/command_queue/command_queue.cpp | 2 +- runtime/command_queue/gpgpu_walker_base.inl | 2 +- runtime/command_queue/local_id_gen.cpp | 2 +- runtime/command_stream/aub_command_stream_receiver_hw_base.inl | 2 +- runtime/command_stream/command_stream_receiver.h | 2 +- runtime/command_stream/scratch_space_controller_base.cpp | 2 +- runtime/command_stream/tbx_command_stream_receiver_hw.inl | 2 +- runtime/compiler_interface/binary_cache.cpp | 2 +- runtime/dll/linux/allocator_helper.cpp | 2 +- runtime/event/event.cpp | 2 +- runtime/gmm_helper/gmm.cpp | 2 +- runtime/gmm_helper/gmm_helper.cpp | 2 +- runtime/helpers/CMakeLists.txt | 1 - runtime/helpers/cache_policy.cpp | 2 +- runtime/helpers/hardware_commands_helper.inl | 2 +- runtime/helpers/hash.h | 2 +- runtime/helpers/hw_helper_base.inl | 2 +- runtime/helpers/preamble_base.inl | 2 +- runtime/helpers/task_information.cpp | 2 +- runtime/helpers/uint16_avx2.h | 2 +- runtime/helpers/uint16_sse4.h | 2 +- runtime/indirect_heap/indirect_heap.h | 2 +- runtime/kernel/kernel.cpp | 2 +- runtime/mem_obj/buffer.cpp | 2 +- runtime/mem_obj/buffer_base.inl | 2 +- runtime/mem_obj/image.cpp | 2 +- runtime/mem_obj/image.inl | 2 +- runtime/mem_obj/mem_obj.cpp | 2 +- runtime/memory_manager/address_mapper.cpp | 2 +- runtime/memory_manager/gfx_partition.cpp | 2 +- runtime/memory_manager/graphics_allocation.cpp | 2 +- runtime/memory_manager/memory_manager.cpp | 2 +- runtime/memory_manager/memory_manager.h | 2 +- runtime/memory_manager/os_agnostic_memory_manager.cpp | 2 +- runtime/memory_manager/physical_address_allocator.h | 2 +- runtime/memory_manager/unified_memory_manager.cpp | 2 +- runtime/os_interface/linux/drm_buffer_object.cpp | 2 +- runtime/os_interface/linux/drm_command_stream.inl | 2 +- runtime/os_interface/linux/drm_gem_close_worker.cpp | 2 +- runtime/os_interface/windows/wddm_allocation.h | 2 +- runtime/os_interface/windows/wddm_memory_manager.cpp | 2 +- runtime/os_interface/windows/wddm_memory_manager.h | 2 +- runtime/program/kernel_info.cpp | 2 +- runtime/program/print_formatter.h | 2 +- runtime/program/printf_handler.cpp | 2 +- runtime/program/process_gen_binary.cpp | 2 +- runtime/utilities/heap_allocator.h | 2 +- runtime/utilities/tag_allocator.h | 2 +- scripts/tests/copyright/in/file2.cpp | 1 - unit_tests/accelerators/media_image_arg_tests.cpp | 2 +- .../aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp | 2 +- .../aub_tests/command_queue/enqueue_map_image_aub_tests.cpp | 2 +- .../command_queue/enqueue_read_buffer_rect_aub_tests.cpp | 2 +- .../aub_tests/command_queue/enqueue_read_image_aub_tests.cpp | 2 +- .../command_queue/enqueue_read_write_image_aub_fixture.h | 2 +- .../command_queue/enqueue_verify_memory_image_aub_tests.cpp | 2 +- .../command_queue/enqueue_write_buffer_rect_aub_tests.cpp | 2 +- .../aub_tests/command_queue/enqueue_write_image_aub_tests.cpp | 2 +- unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h | 2 +- unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp | 2 +- unit_tests/command_queue/dispatch_walker_tests.cpp | 2 +- unit_tests/command_queue/enqueue_api_tests_mt_with_asyncGPU.cpp | 2 +- unit_tests/command_queue/enqueue_fill_buffer_tests.cpp | 2 +- unit_tests/command_queue/enqueue_map_buffer_tests.cpp | 2 +- unit_tests/command_queue/enqueue_read_buffer_rect_fixture.h | 2 +- unit_tests/command_queue/enqueue_svm_tests.cpp | 2 +- unit_tests/command_queue/enqueue_thread_tests.cpp | 2 +- unit_tests/command_queue/enqueue_write_buffer_rect_fixture.h | 2 +- unit_tests/command_queue/local_id_tests.cpp | 2 +- .../command_stream_receiver_flush_task_gmock_tests.cpp | 2 +- unit_tests/command_stream/command_stream_receiver_hw_tests.cpp | 2 +- unit_tests/compiler_interface/binary_cache_tests.cpp | 2 +- unit_tests/context/driver_diagnostics_tests.h | 2 +- unit_tests/event/event_fixture.h | 2 +- unit_tests/fixtures/hello_world_fixture.h | 2 +- unit_tests/fixtures/kernel_data_fixture.cpp | 2 +- unit_tests/helpers/CMakeLists.txt | 2 +- unit_tests/helpers/hw_helper_tests.cpp | 2 +- unit_tests/helpers/per_thread_data_tests.cpp | 2 +- unit_tests/helpers/uint16_sse4_tests.cpp | 2 +- unit_tests/linux/main_linux_dll.cpp | 2 +- unit_tests/mem_obj/get_mem_object_info_subbuffer_tests.cpp | 2 +- unit_tests/mem_obj/get_mem_object_info_tests.cpp | 2 +- unit_tests/mem_obj/image2d_from_buffer_tests.cpp | 2 +- unit_tests/mem_obj/image3d_tests.cpp | 2 +- unit_tests/mem_obj/image_array_size_tests.cpp | 2 +- unit_tests/mem_obj/image_from_subbuffer_tests.cpp | 2 +- unit_tests/mem_obj/image_redescribe_tests.cpp | 2 +- unit_tests/mem_obj/image_set_arg_tests.cpp | 2 +- unit_tests/mem_obj/image_tests.cpp | 2 +- unit_tests/mem_obj/image_validate_tests.cpp | 2 +- unit_tests/mem_obj/nv12_image_tests.cpp | 2 +- unit_tests/mem_obj/packed_yuv_image_tests.cpp | 2 +- unit_tests/mem_obj/zero_copy_tests.cpp | 2 +- unit_tests/memory_manager/address_mapper_tests.cpp | 2 +- unit_tests/memory_manager/gfx_partition_tests.cpp | 2 +- unit_tests/memory_manager/host_ptr_manager_tests.cpp | 2 +- unit_tests/mocks/mock_buffer.h | 2 +- unit_tests/mocks/mock_gmm_resource_info.cpp | 2 +- unit_tests/mocks/mock_pipe.h | 2 +- unit_tests/mocks/mock_wddm.cpp | 2 +- unit_tests/os_interface/linux/device_command_stream_fixture.h | 2 +- unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp | 2 +- unit_tests/os_interface/linux/drm_memory_manager_tests.cpp | 2 +- unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp | 2 +- unit_tests/perf_tests/perf_test_utils.cpp | 2 +- unit_tests/program/printf_helper_tests.cpp | 2 +- unit_tests/program/program_nonuniform.cpp | 2 +- unit_tests/program/program_tests.cpp | 2 +- unit_tests/sharings/va/mock_va_sharing.h | 2 +- 115 files changed, 112 insertions(+), 113 deletions(-) rename {runtime => core}/helpers/aligned_memory.h (100%) rename {unit_tests => core/unit_tests}/helpers/aligned_memory_tests.cpp (99%) diff --git a/core/helpers/CMakeLists.txt b/core/helpers/CMakeLists.txt index 52032eaaac..53cdaf7880 100644 --- a/core/helpers/CMakeLists.txt +++ b/core/helpers/CMakeLists.txt @@ -6,6 +6,7 @@ set(NEO_CORE_HELPERS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/aligned_memory.h ${CMAKE_CURRENT_SOURCE_DIR}/basic_math.h ${CMAKE_CURRENT_SOURCE_DIR}/interlocked_max.h ${CMAKE_CURRENT_SOURCE_DIR}/non_copyable_or_moveable.h diff --git a/runtime/helpers/aligned_memory.h b/core/helpers/aligned_memory.h similarity index 100% rename from runtime/helpers/aligned_memory.h rename to core/helpers/aligned_memory.h diff --git a/unit_tests/helpers/aligned_memory_tests.cpp b/core/unit_tests/helpers/aligned_memory_tests.cpp similarity index 99% rename from unit_tests/helpers/aligned_memory_tests.cpp rename to core/unit_tests/helpers/aligned_memory_tests.cpp index ea98cf72bd..9271e8bd36 100644 --- a/unit_tests/helpers/aligned_memory_tests.cpp +++ b/core/unit_tests/helpers/aligned_memory_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "gtest/gtest.h" diff --git a/offline_compiler/decoder/binary_encoder.cpp b/offline_compiler/decoder/binary_encoder.cpp index 41aea5059d..f67e30642b 100644 --- a/offline_compiler/decoder/binary_encoder.cpp +++ b/offline_compiler/decoder/binary_encoder.cpp @@ -7,9 +7,9 @@ #include "binary_encoder.h" +#include "core/helpers/aligned_memory.h" #include "elf/writer.h" #include "offline_compiler/offline_compiler.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/file_io.h" #include "runtime/helpers/hash.h" diff --git a/runtime/api/api.cpp b/runtime/api/api.cpp index 539cc5fdf6..a5c5d246a6 100644 --- a/runtime/api/api.cpp +++ b/runtime/api/api.cpp @@ -7,6 +7,7 @@ #include "api.h" +#include "core/helpers/aligned_memory.h" #include "runtime/accelerators/intel_motion_estimation.h" #include "runtime/api/additional_extensions.h" #include "runtime/aub/aub_center.h" @@ -19,7 +20,6 @@ #include "runtime/device_queue/device_queue.h" #include "runtime/event/user_event.h" #include "runtime/gtpin/gtpin_notify.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/get_info.h" #include "runtime/helpers/hw_info.h" #include "runtime/helpers/mem_properties_parser_helper.h" diff --git a/runtime/command_queue/command_queue.cpp b/runtime/command_queue/command_queue.cpp index dd36d37975..9fa77c3c2b 100644 --- a/runtime/command_queue/command_queue.cpp +++ b/runtime/command_queue/command_queue.cpp @@ -7,6 +7,7 @@ #include "runtime/command_queue/command_queue.h" +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" #include "runtime/built_ins/builtins_dispatch_builder.h" @@ -17,7 +18,6 @@ #include "runtime/event/event_builder.h" #include "runtime/event/user_event.h" #include "runtime/gtpin/gtpin_notify.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/array_count.h" #include "runtime/helpers/convert_color.h" #include "runtime/helpers/get_info.h" diff --git a/runtime/command_queue/gpgpu_walker_base.inl b/runtime/command_queue/gpgpu_walker_base.inl index 8885a0b0b9..86381a0fc3 100644 --- a/runtime/command_queue/gpgpu_walker_base.inl +++ b/runtime/command_queue/gpgpu_walker_base.inl @@ -6,6 +6,7 @@ */ #pragma once +#include "core/helpers/aligned_memory.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/command_queue/local_id_gen.h" @@ -13,7 +14,6 @@ #include "runtime/device/device_info.h" #include "runtime/event/perf_counter.h" #include "runtime/event/user_event.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/debug_helpers.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/hw_helper.h" diff --git a/runtime/command_queue/local_id_gen.cpp b/runtime/command_queue/local_id_gen.cpp index d2f00e5f35..0f6ec6b604 100644 --- a/runtime/command_queue/local_id_gen.cpp +++ b/runtime/command_queue/local_id_gen.cpp @@ -7,8 +7,8 @@ #include "runtime/command_queue/local_id_gen.h" +#include "core/helpers/aligned_memory.h" #include "core/utilities/cpu_info.h" -#include "runtime/helpers/aligned_memory.h" #include 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 fd912760c9..780f0f8df5 100644 --- a/runtime/command_stream/aub_command_stream_receiver_hw_base.inl +++ b/runtime/command_stream/aub_command_stream_receiver_hw_base.inl @@ -5,6 +5,7 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" #include "runtime/aub/aub_helper.h" @@ -15,7 +16,6 @@ #include "runtime/command_stream/aub_subcapture.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/debug_helpers.h" #include "runtime/helpers/hardware_context_controller.h" #include "runtime/helpers/hash.h" diff --git a/runtime/command_stream/command_stream_receiver.h b/runtime/command_stream/command_stream_receiver.h index c888da9340..c64ac4af67 100644 --- a/runtime/command_stream/command_stream_receiver.h +++ b/runtime/command_stream/command_stream_receiver.h @@ -6,13 +6,13 @@ */ #pragma once +#include "core/helpers/aligned_memory.h" #include "runtime/command_stream/aub_subcapture.h" #include "runtime/command_stream/csr_definitions.h" #include "runtime/command_stream/linear_stream.h" #include "runtime/command_stream/submissions_aggregator.h" #include "runtime/command_stream/thread_arbitration_policy.h" #include "runtime/helpers/address_patch.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/blit_commands_helper.h" #include "runtime/helpers/completion_stamp.h" #include "runtime/helpers/flat_batch_buffer_helper.h" diff --git a/runtime/command_stream/scratch_space_controller_base.cpp b/runtime/command_stream/scratch_space_controller_base.cpp index a6e1bee463..25af1bf948 100644 --- a/runtime/command_stream/scratch_space_controller_base.cpp +++ b/runtime/command_stream/scratch_space_controller_base.cpp @@ -7,8 +7,8 @@ #include "runtime/command_stream/scratch_space_controller_base.h" +#include "core/helpers/aligned_memory.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/hw_helper.h" #include "runtime/helpers/preamble.h" #include "runtime/memory_manager/graphics_allocation.h" diff --git a/runtime/command_stream/tbx_command_stream_receiver_hw.inl b/runtime/command_stream/tbx_command_stream_receiver_hw.inl index 14f7a352ef..7cc36e4d88 100644 --- a/runtime/command_stream/tbx_command_stream_receiver_hw.inl +++ b/runtime/command_stream/tbx_command_stream_receiver_hw.inl @@ -5,6 +5,7 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "runtime/aub/aub_center.h" #include "runtime/aub/aub_helper.h" @@ -12,7 +13,6 @@ #include "runtime/command_stream/aub_command_stream_receiver.h" #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/debug_helpers.h" #include "runtime/helpers/hardware_context_controller.h" #include "runtime/helpers/hw_helper.h" diff --git a/runtime/compiler_interface/binary_cache.cpp b/runtime/compiler_interface/binary_cache.cpp index 2db066a86c..34cbb2a269 100644 --- a/runtime/compiler_interface/binary_cache.cpp +++ b/runtime/compiler_interface/binary_cache.cpp @@ -5,8 +5,8 @@ * */ +#include #include -#include #include #include #include diff --git a/runtime/dll/linux/allocator_helper.cpp b/runtime/dll/linux/allocator_helper.cpp index 97abe8d78f..079c461e15 100644 --- a/runtime/dll/linux/allocator_helper.cpp +++ b/runtime/dll/linux/allocator_helper.cpp @@ -7,8 +7,8 @@ #include "runtime/os_interface/linux/allocator_helper.h" +#include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" -#include "runtime/helpers/aligned_memory.h" namespace NEO { diff --git a/runtime/event/event.cpp b/runtime/event/event.cpp index 734d3604d4..97317dec0a 100644 --- a/runtime/event/event.cpp +++ b/runtime/event/event.cpp @@ -7,6 +7,7 @@ #include "runtime/event/event.h" +#include "core/helpers/aligned_memory.h" #include "public/cl_ext_private.h" #include "runtime/api/cl_types.h" #include "runtime/command_queue/command_queue.h" @@ -15,7 +16,6 @@ #include "runtime/device/device.h" #include "runtime/event/async_events_handler.h" #include "runtime/event/event_tracker.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/get_info.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/timestamp_packet.h" diff --git a/runtime/gmm_helper/gmm.cpp b/runtime/gmm_helper/gmm.cpp index fcb8729ec6..5239d2b7eb 100644 --- a/runtime/gmm_helper/gmm.cpp +++ b/runtime/gmm_helper/gmm.cpp @@ -7,10 +7,10 @@ #include "runtime/gmm_helper/gmm.h" +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/debug_helpers.h" #include "runtime/helpers/hw_helper.h" #include "runtime/helpers/hw_info.h" diff --git a/runtime/gmm_helper/gmm_helper.cpp b/runtime/gmm_helper/gmm_helper.cpp index 63e1f63afc..615c14eca3 100644 --- a/runtime/gmm_helper/gmm_helper.cpp +++ b/runtime/gmm_helper/gmm_helper.cpp @@ -7,10 +7,10 @@ #include "runtime/gmm_helper/gmm_helper.h" +#include "core/helpers/aligned_memory.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/resource_info.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/debug_helpers.h" #include "runtime/helpers/get_info.h" #include "runtime/helpers/hw_info.h" diff --git a/runtime/helpers/CMakeLists.txt b/runtime/helpers/CMakeLists.txt index 3133966780..027bc91ea0 100644 --- a/runtime/helpers/CMakeLists.txt +++ b/runtime/helpers/CMakeLists.txt @@ -8,7 +8,6 @@ set(RUNTIME_SRCS_HELPERS_BASE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/abort.h ${CMAKE_CURRENT_SOURCE_DIR}/address_patch.h - ${CMAKE_CURRENT_SOURCE_DIR}/aligned_memory.h ${CMAKE_CURRENT_SOURCE_DIR}/array_count.h ${CMAKE_CURRENT_SOURCE_DIR}/base_object.cpp ${CMAKE_CURRENT_SOURCE_DIR}/base_object.h diff --git a/runtime/helpers/cache_policy.cpp b/runtime/helpers/cache_policy.cpp index f514aab030..98c87e96c0 100644 --- a/runtime/helpers/cache_policy.cpp +++ b/runtime/helpers/cache_policy.cpp @@ -7,7 +7,7 @@ #include "runtime/helpers/cache_policy.h" -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/memory_manager/graphics_allocation.h" namespace NEO { diff --git a/runtime/helpers/hardware_commands_helper.inl b/runtime/helpers/hardware_commands_helper.inl index a6e7d3e9e7..b43538f6c0 100644 --- a/runtime/helpers/hardware_commands_helper.inl +++ b/runtime/helpers/hardware_commands_helper.inl @@ -5,6 +5,7 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" @@ -12,7 +13,6 @@ #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/indirect_heap/indirect_heap.h" #include "runtime/kernel/kernel.h" diff --git a/runtime/helpers/hash.h b/runtime/helpers/hash.h index 6517acfb5e..29b0ca521b 100644 --- a/runtime/helpers/hash.h +++ b/runtime/helpers/hash.h @@ -7,7 +7,7 @@ #pragma once #include "common/compiler_support.h" -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include diff --git a/runtime/helpers/hw_helper_base.inl b/runtime/helpers/hw_helper_base.inl index 293392004d..695cacd43a 100644 --- a/runtime/helpers/hw_helper_base.inl +++ b/runtime/helpers/hw_helper_base.inl @@ -5,11 +5,11 @@ * */ +#include "core/helpers/aligned_memory.h" #include "runtime/aub_mem_dump/aub_mem_dump.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/hw_helper.h" #include "runtime/helpers/hw_info.h" diff --git a/runtime/helpers/preamble_base.inl b/runtime/helpers/preamble_base.inl index efb5a182b7..3d92f0add8 100644 --- a/runtime/helpers/preamble_base.inl +++ b/runtime/helpers/preamble_base.inl @@ -5,10 +5,10 @@ * */ +#include "core/helpers/aligned_memory.h" #include "runtime/command_stream/linear_stream.h" #include "runtime/command_stream/preemption.h" #include "runtime/device/device.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/preamble.h" #include "runtime/kernel/kernel.h" diff --git a/runtime/helpers/task_information.cpp b/runtime/helpers/task_information.cpp index f1221eab33..3ffc59a9b6 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/aligned_memory.h" #include "core/helpers/string.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/command_queue/command_queue.h" @@ -16,7 +17,6 @@ #include "runtime/device/device.h" #include "runtime/device_queue/device_queue.h" #include "runtime/gtpin/gtpin_notify.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/csr_deps.h" #include "runtime/helpers/task_information.inl" #include "runtime/mem_obj/mem_obj.h" diff --git a/runtime/helpers/uint16_avx2.h b/runtime/helpers/uint16_avx2.h index 8c91b94b58..5508904af1 100644 --- a/runtime/helpers/uint16_avx2.h +++ b/runtime/helpers/uint16_avx2.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/helpers/debug_helpers.h" #include diff --git a/runtime/helpers/uint16_sse4.h b/runtime/helpers/uint16_sse4.h index 8d7f020bfc..72fc9f3704 100644 --- a/runtime/helpers/uint16_sse4.h +++ b/runtime/helpers/uint16_sse4.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/helpers/debug_helpers.h" #include diff --git a/runtime/indirect_heap/indirect_heap.h b/runtime/indirect_heap/indirect_heap.h index f62e7afb1d..e948fed4e3 100644 --- a/runtime/indirect_heap/indirect_heap.h +++ b/runtime/indirect_heap/indirect_heap.h @@ -6,10 +6,10 @@ */ #pragma once +#include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "core/helpers/ptr_math.h" #include "runtime/command_stream/linear_stream.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/memory_manager/memory_constants.h" diff --git a/runtime/kernel/kernel.cpp b/runtime/kernel/kernel.cpp index 8a1ddab84b..5ee5a2995f 100644 --- a/runtime/kernel/kernel.cpp +++ b/runtime/kernel/kernel.cpp @@ -7,6 +7,7 @@ #include "runtime/kernel/kernel.h" +#include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "core/helpers/ptr_math.h" #include "runtime/accelerators/intel_accelerator.h" @@ -20,7 +21,6 @@ #include "runtime/execution_model/device_enqueue.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gtpin/gtpin_notify.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/debug_helpers.h" #include "runtime/helpers/get_info.h" #include "runtime/helpers/hw_helper.h" diff --git a/runtime/mem_obj/buffer.cpp b/runtime/mem_obj/buffer.cpp index 621bd39a8c..8e888a2951 100644 --- a/runtime/mem_obj/buffer.cpp +++ b/runtime/mem_obj/buffer.cpp @@ -7,6 +7,7 @@ #include "runtime/mem_obj/buffer.h" +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" #include "runtime/command_queue/command_queue.h" @@ -15,7 +16,6 @@ #include "runtime/device/device.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/hw_helper.h" #include "runtime/helpers/hw_info.h" #include "runtime/helpers/timestamp_packet.h" diff --git a/runtime/mem_obj/buffer_base.inl b/runtime/mem_obj/buffer_base.inl index 4c513d8282..e18c05a744 100644 --- a/runtime/mem_obj/buffer_base.inl +++ b/runtime/mem_obj/buffer_base.inl @@ -6,11 +6,11 @@ */ #include "common/helpers/bit_helpers.h" +#include "core/helpers/aligned_memory.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/surface_formats.h" #include "runtime/mem_obj/buffer.h" diff --git a/runtime/mem_obj/image.cpp b/runtime/mem_obj/image.cpp index 058f3090a0..0bdc61e1d4 100644 --- a/runtime/mem_obj/image.cpp +++ b/runtime/mem_obj/image.cpp @@ -8,6 +8,7 @@ #include "runtime/mem_obj/image.h" #include "common/compiler_support.h" +#include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" @@ -17,7 +18,6 @@ #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/get_info.h" #include "runtime/helpers/hw_helper.h" #include "runtime/helpers/hw_info.h" diff --git a/runtime/mem_obj/image.inl b/runtime/mem_obj/image.inl index 723a0a4b00..cc29de83f6 100644 --- a/runtime/mem_obj/image.inl +++ b/runtime/mem_obj/image.inl @@ -5,11 +5,11 @@ * */ +#include "core/helpers/aligned_memory.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/surface_formats.h" #include "runtime/mem_obj/image.h" diff --git a/runtime/mem_obj/mem_obj.cpp b/runtime/mem_obj/mem_obj.cpp index 27d934b1ca..1890a0beb8 100644 --- a/runtime/mem_obj/mem_obj.cpp +++ b/runtime/mem_obj/mem_obj.cpp @@ -8,12 +8,12 @@ #include "runtime/mem_obj/mem_obj.h" #include "common/helpers/bit_helpers.h" +#include "core/helpers/aligned_memory.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/context/context.h" #include "runtime/device/device.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/get_info.h" #include "runtime/memory_manager/deferred_deleter.h" #include "runtime/memory_manager/internal_allocation_storage.h" diff --git a/runtime/memory_manager/address_mapper.cpp b/runtime/memory_manager/address_mapper.cpp index d274f10eed..b62cda7087 100644 --- a/runtime/memory_manager/address_mapper.cpp +++ b/runtime/memory_manager/address_mapper.cpp @@ -7,7 +7,7 @@ #include "runtime/memory_manager/address_mapper.h" -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include #include diff --git a/runtime/memory_manager/gfx_partition.cpp b/runtime/memory_manager/gfx_partition.cpp index 884078b9a7..9d1f913ded 100644 --- a/runtime/memory_manager/gfx_partition.cpp +++ b/runtime/memory_manager/gfx_partition.cpp @@ -7,7 +7,7 @@ #include "runtime/memory_manager/gfx_partition.h" -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" namespace NEO { diff --git a/runtime/memory_manager/graphics_allocation.cpp b/runtime/memory_manager/graphics_allocation.cpp index a0e26d78bd..7a992dd2df 100644 --- a/runtime/memory_manager/graphics_allocation.cpp +++ b/runtime/memory_manager/graphics_allocation.cpp @@ -7,7 +7,7 @@ #include "runtime/memory_manager/graphics_allocation.h" -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/os_interface/debug_settings_manager.h" namespace NEO { diff --git a/runtime/memory_manager/memory_manager.cpp b/runtime/memory_manager/memory_manager.cpp index de77df01b7..1707230987 100644 --- a/runtime/memory_manager/memory_manager.cpp +++ b/runtime/memory_manager/memory_manager.cpp @@ -7,6 +7,7 @@ #include "runtime/memory_manager/memory_manager.h" +#include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/event/event.h" @@ -15,7 +16,6 @@ #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/hw_helper.h" #include "runtime/helpers/hw_info.h" diff --git a/runtime/memory_manager/memory_manager.h b/runtime/memory_manager/memory_manager.h index 99d4cb824e..90d8ae293b 100644 --- a/runtime/memory_manager/memory_manager.h +++ b/runtime/memory_manager/memory_manager.h @@ -8,8 +8,8 @@ #pragma once #include "common/helpers/bit_helpers.h" #include "core/command_stream/preemption_mode.h" +#include "core/helpers/aligned_memory.h" #include "public/cl_ext_private.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/engine_control.h" #include "runtime/memory_manager/allocation_properties.h" #include "runtime/memory_manager/gfx_partition.h" diff --git a/runtime/memory_manager/os_agnostic_memory_manager.cpp b/runtime/memory_manager/os_agnostic_memory_manager.cpp index 0eb81103eb..9faf6ac41e 100644 --- a/runtime/memory_manager/os_agnostic_memory_manager.cpp +++ b/runtime/memory_manager/os_agnostic_memory_manager.cpp @@ -7,6 +7,7 @@ #include "runtime/memory_manager/os_agnostic_memory_manager.h" +#include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "core/helpers/ptr_math.h" #include "runtime/aub/aub_center.h" @@ -14,7 +15,6 @@ #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/options.h" #include "runtime/helpers/surface_formats.h" #include "runtime/memory_manager/host_ptr_manager.h" diff --git a/runtime/memory_manager/physical_address_allocator.h b/runtime/memory_manager/physical_address_allocator.h index 00ff83b383..db10b75b28 100644 --- a/runtime/memory_manager/physical_address_allocator.h +++ b/runtime/memory_manager/physical_address_allocator.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/helpers/debug_helpers.h" #include "runtime/memory_manager/memory_banks.h" #include "runtime/memory_manager/memory_constants.h" diff --git a/runtime/memory_manager/unified_memory_manager.cpp b/runtime/memory_manager/unified_memory_manager.cpp index 998c54b521..f2f39fb054 100644 --- a/runtime/memory_manager/unified_memory_manager.cpp +++ b/runtime/memory_manager/unified_memory_manager.cpp @@ -7,8 +7,8 @@ #include "runtime/memory_manager/unified_memory_manager.h" +#include "core/helpers/aligned_memory.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/mem_obj/mem_obj_helper.h" #include "runtime/memory_manager/memory_manager.h" diff --git a/runtime/os_interface/linux/drm_buffer_object.cpp b/runtime/os_interface/linux/drm_buffer_object.cpp index c02c093be3..f3bb92ba0b 100644 --- a/runtime/os_interface/linux/drm_buffer_object.cpp +++ b/runtime/os_interface/linux/drm_buffer_object.cpp @@ -7,7 +7,7 @@ #include "runtime/os_interface/linux/drm_buffer_object.h" -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/helpers/debug_helpers.h" #include "runtime/os_interface/linux/drm_memory_manager.h" #include "runtime/os_interface/linux/drm_neo.h" diff --git a/runtime/os_interface/linux/drm_command_stream.inl b/runtime/os_interface/linux/drm_command_stream.inl index 90514de24a..976ca37982 100644 --- a/runtime/os_interface/linux/drm_command_stream.inl +++ b/runtime/os_interface/linux/drm_command_stream.inl @@ -5,10 +5,10 @@ * */ +#include "core/helpers/aligned_memory.h" #include "runtime/command_stream/linear_stream.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm_helper.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/preamble.h" #include "runtime/mem_obj/buffer.h" #include "runtime/os_interface/linux/drm_buffer_object.h" diff --git a/runtime/os_interface/linux/drm_gem_close_worker.cpp b/runtime/os_interface/linux/drm_gem_close_worker.cpp index bd5d12cb0e..69fc68a6dc 100644 --- a/runtime/os_interface/linux/drm_gem_close_worker.cpp +++ b/runtime/os_interface/linux/drm_gem_close_worker.cpp @@ -7,7 +7,7 @@ #include "runtime/os_interface/linux/drm_gem_close_worker.h" -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/os_interface/linux/drm_buffer_object.h" #include "runtime/os_interface/linux/drm_command_stream.h" #include "runtime/os_interface/linux/drm_memory_manager.h" diff --git a/runtime/os_interface/windows/wddm_allocation.h b/runtime/os_interface/windows/wddm_allocation.h index b08a7c39c0..f014d92ee0 100644 --- a/runtime/os_interface/windows/wddm_allocation.h +++ b/runtime/os_interface/windows/wddm_allocation.h @@ -7,7 +7,7 @@ #pragma once #define UMDF_USING_NTSTATUS -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/os_interface/windows/windows_wrapper.h" diff --git a/runtime/os_interface/windows/wddm_memory_manager.cpp b/runtime/os_interface/windows/wddm_memory_manager.cpp index c44b6bad4a..76bdfb236f 100644 --- a/runtime/os_interface/windows/wddm_memory_manager.cpp +++ b/runtime/os_interface/windows/wddm_memory_manager.cpp @@ -7,6 +7,7 @@ #include "runtime/os_interface/windows/wddm_memory_manager.h" +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/memory_manager/residency_handler.h" #include "runtime/command_stream/command_stream_receiver_hw.h" @@ -15,7 +16,6 @@ #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/gmm_helper/resource_info.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/surface_formats.h" #include "runtime/memory_manager/deferrable_deletion.h" #include "runtime/memory_manager/deferred_deleter.h" diff --git a/runtime/os_interface/windows/wddm_memory_manager.h b/runtime/os_interface/windows/wddm_memory_manager.h index 0d1c716b7e..4c35747abf 100644 --- a/runtime/os_interface/windows/wddm_memory_manager.h +++ b/runtime/os_interface/windows/wddm_memory_manager.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/os_interface/os_context.h" #include "runtime/os_interface/windows/wddm_allocation.h" diff --git a/runtime/program/kernel_info.cpp b/runtime/program/kernel_info.cpp index 1dec16c509..51e271ed98 100644 --- a/runtime/program/kernel_info.cpp +++ b/runtime/program/kernel_info.cpp @@ -5,10 +5,10 @@ * */ +#include "core/helpers/aligned_memory.h" #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/kernel/kernel.h" #include "runtime/mem_obj/buffer.h" diff --git a/runtime/program/print_formatter.h b/runtime/program/print_formatter.h index b3e00e9267..fa07c0b8d6 100644 --- a/runtime/program/print_formatter.h +++ b/runtime/program/print_formatter.h @@ -7,7 +7,7 @@ #pragma once -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/kernel/kernel.h" #include "runtime/os_interface/print.h" diff --git a/runtime/program/printf_handler.cpp b/runtime/program/printf_handler.cpp index 5b1b9705d3..176c62328f 100644 --- a/runtime/program/printf_handler.cpp +++ b/runtime/program/printf_handler.cpp @@ -7,8 +7,8 @@ #include "printf_handler.h" +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/buffer.h" diff --git a/runtime/program/process_gen_binary.cpp b/runtime/program/process_gen_binary.cpp index f940109224..2b9fbc7c92 100644 --- a/runtime/program/process_gen_binary.cpp +++ b/runtime/program/process_gen_binary.cpp @@ -5,11 +5,11 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" #include "runtime/context/context.h" #include "runtime/gtpin/gtpin_notify.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/debug_helpers.h" #include "runtime/helpers/hash.h" #include "runtime/memory_manager/memory_manager.h" diff --git a/runtime/utilities/heap_allocator.h b/runtime/utilities/heap_allocator.h index 9ebf8ef005..6afa9ac950 100644 --- a/runtime/utilities/heap_allocator.h +++ b/runtime/utilities/heap_allocator.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/helpers/debug_helpers.h" #include diff --git a/runtime/utilities/tag_allocator.h b/runtime/utilities/tag_allocator.h index 53f13cb92a..df60eedf4b 100644 --- a/runtime/utilities/tag_allocator.h +++ b/runtime/utilities/tag_allocator.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/helpers/debug_helpers.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/utilities/idlist.h" diff --git a/scripts/tests/copyright/in/file2.cpp b/scripts/tests/copyright/in/file2.cpp index 37ad944ec0..b8fc5e1005 100644 --- a/scripts/tests/copyright/in/file2.cpp +++ b/scripts/tests/copyright/in/file2.cpp @@ -1,4 +1,3 @@ /* * Copyright (C) 2017 XYZ */ - diff --git a/unit_tests/accelerators/media_image_arg_tests.cpp b/unit_tests/accelerators/media_image_arg_tests.cpp index 51589bfab9..a58d1af14c 100644 --- a/unit_tests/accelerators/media_image_arg_tests.cpp +++ b/unit_tests/accelerators/media_image_arg_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/surface_formats.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/image.h" diff --git a/unit_tests/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp index 904b2d7f63..3ca5fd0684 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "test.h" diff --git a/unit_tests/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp index 2a5a9e709c..9075260f60 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "test.h" diff --git a/unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp index e4f067a9a7..5388726858 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_read_buffer_rect_aub_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/options.h" #include "runtime/mem_obj/buffer.h" #include "test.h" diff --git a/unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp index 0086220918..ce2701e447 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/device/device.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "test.h" diff --git a/unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h b/unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h index e72b32d2b1..27c6adc918 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h +++ b/unit_tests/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h @@ -5,9 +5,9 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/mem_obj/image.h" #include "test.h" #include "unit_tests/aub_tests/command_queue/command_enqueue_fixture.h" diff --git a/unit_tests/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp index 3bfc41c346..f272b27ab5 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_verify_memory_image_aub_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "runtime/api/api.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "test.h" diff --git a/unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp index 00cdfd6494..32592fb527 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_write_buffer_rect_aub_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/device/device.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/options.h" #include "runtime/mem_obj/buffer.h" #include "test.h" diff --git a/unit_tests/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp b/unit_tests/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp index 86c552d35f..ffeb6f0e94 100644 --- a/unit_tests/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp +++ b/unit_tests/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "test.h" diff --git a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h b/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h index 91505ef252..b11a105f15 100644 --- a/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h +++ b/unit_tests/aub_tests/command_stream/aub_mem_dump_tests.h @@ -6,11 +6,11 @@ */ #pragma once +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "runtime/aub_mem_dump/aub_mem_dump.h" #include "runtime/command_stream/aub_command_stream_receiver_hw.h" #include "runtime/device/device.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/options.h" #include "test.h" diff --git a/unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp b/unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp index 465bc1071d..eaf10a0eca 100644 --- a/unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp +++ b/unit_tests/aub_tests/mem_obj/create_image_aub_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "runtime/platform/platform.h" diff --git a/unit_tests/command_queue/dispatch_walker_tests.cpp b/unit_tests/command_queue/dispatch_walker_tests.cpp index 7029d75958..205b46aa27 100644 --- a/unit_tests/command_queue/dispatch_walker_tests.cpp +++ b/unit_tests/command_queue/dispatch_walker_tests.cpp @@ -5,12 +5,12 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/unit_tests/helpers/debug_manager_state_restore.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/aligned_memory.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/task_information.h" #include "runtime/memory_manager/internal_allocation_storage.h" diff --git a/unit_tests/command_queue/enqueue_api_tests_mt_with_asyncGPU.cpp b/unit_tests/command_queue/enqueue_api_tests_mt_with_asyncGPU.cpp index 9f2a2eeba9..7ec1b41af7 100644 --- a/unit_tests/command_queue/enqueue_api_tests_mt_with_asyncGPU.cpp +++ b/unit_tests/command_queue/enqueue_api_tests_mt_with_asyncGPU.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/memory_manager/graphics_allocation.h" #include "runtime/os_interface/os_context.h" #include "test.h" diff --git a/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp b/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp index a563d0ea64..b3924f2e4c 100644 --- a/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_fill_buffer_tests.cpp @@ -5,12 +5,12 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "runtime/built_ins/built_ins.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/command_queue/command_queue.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/memory_manager/allocations_list.h" #include "runtime/memory_manager/memory_manager.h" diff --git a/unit_tests/command_queue/enqueue_map_buffer_tests.cpp b/unit_tests/command_queue/enqueue_map_buffer_tests.cpp index 0869cc83ad..67e0d8cc93 100644 --- a/unit_tests/command_queue/enqueue_map_buffer_tests.cpp +++ b/unit_tests/command_queue/enqueue_map_buffer_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/helpers/aligned_memory.h" #include "test.h" #include "unit_tests/command_queue/command_queue_fixture.h" #include "unit_tests/command_queue/enqueue_map_buffer_fixture.h" diff --git a/unit_tests/command_queue/enqueue_read_buffer_rect_fixture.h b/unit_tests/command_queue/enqueue_read_buffer_rect_fixture.h index 7c6431b7b1..78c83f32fe 100644 --- a/unit_tests/command_queue/enqueue_read_buffer_rect_fixture.h +++ b/unit_tests/command_queue/enqueue_read_buffer_rect_fixture.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" -#include "runtime/helpers/aligned_memory.h" #include "unit_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/fixtures/buffer_fixture.h" #include "unit_tests/gen_common/gen_cmd_parse.h" diff --git a/unit_tests/command_queue/enqueue_svm_tests.cpp b/unit_tests/command_queue/enqueue_svm_tests.cpp index 5b63125351..7e209faf37 100644 --- a/unit_tests/command_queue/enqueue_svm_tests.cpp +++ b/unit_tests/command_queue/enqueue_svm_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/event/user_event.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/memory_manager/allocations_list.h" #include "runtime/memory_manager/surface.h" #include "runtime/memory_manager/unified_memory_manager.h" diff --git a/unit_tests/command_queue/enqueue_thread_tests.cpp b/unit_tests/command_queue/enqueue_thread_tests.cpp index d5122db90f..2a5142e11e 100644 --- a/unit_tests/command_queue/enqueue_thread_tests.cpp +++ b/unit_tests/command_queue/enqueue_thread_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/aligned_memory.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_stream/command_stream_receiver_hw.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" diff --git a/unit_tests/command_queue/enqueue_write_buffer_rect_fixture.h b/unit_tests/command_queue/enqueue_write_buffer_rect_fixture.h index 4e8f8f9b59..8375d0c9c6 100644 --- a/unit_tests/command_queue/enqueue_write_buffer_rect_fixture.h +++ b/unit_tests/command_queue/enqueue_write_buffer_rect_fixture.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/mem_obj/buffer.h" #include "unit_tests/command_queue/command_enqueue_fixture.h" #include "unit_tests/fixtures/buffer_fixture.h" diff --git a/unit_tests/command_queue/local_id_tests.cpp b/unit_tests/command_queue/local_id_tests.cpp index 04afd518fd..c78342bd88 100644 --- a/unit_tests/command_queue/local_id_tests.cpp +++ b/unit_tests/command_queue/local_id_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "runtime/command_queue/local_id_gen.h" -#include "runtime/helpers/aligned_memory.h" #include "gtest/gtest.h" diff --git a/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp b/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp index 8e347c2894..e49bd37673 100644 --- a/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/built_ins.h" @@ -14,7 +15,6 @@ #include "runtime/command_stream/linear_stream.h" #include "runtime/command_stream/preemption.h" #include "runtime/event/user_event.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/cache_policy.h" #include "runtime/helpers/preamble.h" #include "runtime/mem_obj/buffer.h" diff --git a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp index 017c96cc87..8a1f78fe99 100644 --- a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/built_ins.h" @@ -16,7 +17,6 @@ #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/aligned_memory.h" #include "runtime/helpers/blit_commands_helper.h" #include "runtime/helpers/cache_policy.h" #include "runtime/helpers/preamble.h" diff --git a/unit_tests/compiler_interface/binary_cache_tests.cpp b/unit_tests/compiler_interface/binary_cache_tests.cpp index ab28613b9b..b8e5549eee 100644 --- a/unit_tests/compiler_interface/binary_cache_tests.cpp +++ b/unit_tests/compiler_interface/binary_cache_tests.cpp @@ -7,9 +7,9 @@ #include "runtime/compiler_interface/compiler_interface.h" #include "test.h" +#include #include #include -#include #include #include #include diff --git a/unit_tests/context/driver_diagnostics_tests.h b/unit_tests/context/driver_diagnostics_tests.h index 3cf1672f80..bebcbe286c 100644 --- a/unit_tests/context/driver_diagnostics_tests.h +++ b/unit_tests/context/driver_diagnostics_tests.h @@ -6,9 +6,9 @@ */ #pragma once +#include "core/helpers/aligned_memory.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/context/context.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/options.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/buffer.h" diff --git a/unit_tests/event/event_fixture.h b/unit_tests/event/event_fixture.h index 3e8f27bc20..3c841b9ef1 100644 --- a/unit_tests/event/event_fixture.h +++ b/unit_tests/event/event_fixture.h @@ -7,10 +7,10 @@ #pragma once +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "runtime/command_queue/command_queue.h" #include "runtime/event/user_event.h" -#include "runtime/helpers/aligned_memory.h" #include "unit_tests/command_queue/command_queue_fixture.h" #include "unit_tests/command_stream/command_stream_fixture.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/fixtures/hello_world_fixture.h b/unit_tests/fixtures/hello_world_fixture.h index 0c4f963a63..5ec19ccd0a 100644 --- a/unit_tests/fixtures/hello_world_fixture.h +++ b/unit_tests/fixtures/hello_world_fixture.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/helpers/aligned_memory.h" #include "runtime/command_stream/command_stream_receiver.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/memory_manager/memory_manager.h" #include "test.h" #include "unit_tests/command_queue/command_queue_fixture.h" diff --git a/unit_tests/fixtures/kernel_data_fixture.cpp b/unit_tests/fixtures/kernel_data_fixture.cpp index 9802d2c2f5..e40bf9f6c5 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/aligned_memory.h" #include "core/helpers/string.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/memory_manager/graphics_allocation.h" void KernelDataTest::buildAndDecode() { diff --git a/unit_tests/helpers/CMakeLists.txt b/unit_tests/helpers/CMakeLists.txt index 4aa4a99fc6..3de7cc5c83 100644 --- a/unit_tests/helpers/CMakeLists.txt +++ b/unit_tests/helpers/CMakeLists.txt @@ -7,7 +7,6 @@ set(IGDRCL_SRCS_tests_helpers ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/array_count_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/aligned_memory_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/base_object_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/base_object_tests_mt.cpp ${CMAKE_CURRENT_SOURCE_DIR}/basic_math_tests.cpp @@ -54,6 +53,7 @@ set(IGDRCL_SRCS_tests_helpers ${CMAKE_CURRENT_SOURCE_DIR}/unit_test_helper.inl ${CMAKE_CURRENT_SOURCE_DIR}/validator_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/variable_backup.h + ${NEO_CORE_DIRECTORY}/unit_tests/helpers/aligned_memory_tests.cpp ${NEO_CORE_DIRECTORY}/unit_tests/helpers/debug_manager_state_restore.h ) diff --git a/unit_tests/helpers/hw_helper_tests.cpp b/unit_tests/helpers/hw_helper_tests.cpp index 0410f41642..24ac464b43 100644 --- a/unit_tests/helpers/hw_helper_tests.cpp +++ b/unit_tests/helpers/hw_helper_tests.cpp @@ -7,12 +7,12 @@ #include "unit_tests/helpers/hw_helper_tests.h" +#include "core/helpers/aligned_memory.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" #include "runtime/gmm_helper/resource_info.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/options.h" #include "runtime/memory_manager/graphics_allocation.h" diff --git a/unit_tests/helpers/per_thread_data_tests.cpp b/unit_tests/helpers/per_thread_data_tests.cpp index e40a40c7e6..0851c82994 100644 --- a/unit_tests/helpers/per_thread_data_tests.cpp +++ b/unit_tests/helpers/per_thread_data_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/aligned_memory.h" #include "runtime/command_queue/local_id_gen.h" #include "runtime/command_stream/linear_stream.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/per_thread_data.h" #include "runtime/program/kernel_info.h" #include "test.h" diff --git a/unit_tests/helpers/uint16_sse4_tests.cpp b/unit_tests/helpers/uint16_sse4_tests.cpp index 1aedcd070f..f5dfa6787e 100644 --- a/unit_tests/helpers/uint16_sse4_tests.cpp +++ b/unit_tests/helpers/uint16_sse4_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/helpers/uint16_sse4.h" #include "gtest/gtest.h" diff --git a/unit_tests/linux/main_linux_dll.cpp b/unit_tests/linux/main_linux_dll.cpp index 7e8a223b9f..62365c169b 100644 --- a/unit_tests/linux/main_linux_dll.cpp +++ b/unit_tests/linux/main_linux_dll.cpp @@ -5,10 +5,10 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/os_interface/linux/allocator_helper.h" #include "runtime/os_interface/linux/os_interface.h" diff --git a/unit_tests/mem_obj/get_mem_object_info_subbuffer_tests.cpp b/unit_tests/mem_obj/get_mem_object_info_subbuffer_tests.cpp index d5fc051de9..5e47b53f98 100644 --- a/unit_tests/mem_obj/get_mem_object_info_subbuffer_tests.cpp +++ b/unit_tests/mem_obj/get_mem_object_info_subbuffer_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/mem_obj/buffer.h" #include "unit_tests/mocks/mock_context.h" diff --git a/unit_tests/mem_obj/get_mem_object_info_tests.cpp b/unit_tests/mem_obj/get_mem_object_info_tests.cpp index 652243c6e1..b7e94936ac 100644 --- a/unit_tests/mem_obj/get_mem_object_info_tests.cpp +++ b/unit_tests/mem_obj/get_mem_object_info_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/debug_settings_manager.h" #include "unit_tests/fixtures/buffer_fixture.h" diff --git a/unit_tests/mem_obj/image2d_from_buffer_tests.cpp b/unit_tests/mem_obj/image2d_from_buffer_tests.cpp index 0f78cc5095..c7e2964b18 100644 --- a/unit_tests/mem_obj/image2d_from_buffer_tests.cpp +++ b/unit_tests/mem_obj/image2d_from_buffer_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/helpers/hw_helper.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" diff --git a/unit_tests/mem_obj/image3d_tests.cpp b/unit_tests/mem_obj/image3d_tests.cpp index b8428e0e27..b3dc98ae8a 100644 --- a/unit_tests/mem_obj/image3d_tests.cpp +++ b/unit_tests/mem_obj/image3d_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/mem_obj/image.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/mem_obj/image_array_size_tests.cpp b/unit_tests/mem_obj/image_array_size_tests.cpp index 696fceaec6..bb5f03b64a 100644 --- a/unit_tests/mem_obj/image_array_size_tests.cpp +++ b/unit_tests/mem_obj/image_array_size_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/mem_obj/image.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/mem_obj/image_from_subbuffer_tests.cpp b/unit_tests/mem_obj/image_from_subbuffer_tests.cpp index c1ad75f94b..f2b91fb121 100644 --- a/unit_tests/mem_obj/image_from_subbuffer_tests.cpp +++ b/unit_tests/mem_obj/image_from_subbuffer_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" #include "test.h" diff --git a/unit_tests/mem_obj/image_redescribe_tests.cpp b/unit_tests/mem_obj/image_redescribe_tests.cpp index 59f628fdf4..2e57bca55e 100644 --- a/unit_tests/mem_obj/image_redescribe_tests.cpp +++ b/unit_tests/mem_obj/image_redescribe_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/helpers/surface_formats.h" #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" diff --git a/unit_tests/mem_obj/image_set_arg_tests.cpp b/unit_tests/mem_obj/image_set_arg_tests.cpp index e92884b8c4..8775eddbb3 100644 --- a/unit_tests/mem_obj/image_set_arg_tests.cpp +++ b/unit_tests/mem_obj/image_set_arg_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "core/helpers/ptr_math.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/surface_formats.h" #include "runtime/kernel/kernel.h" #include "runtime/mem_obj/image.h" diff --git a/unit_tests/mem_obj/image_tests.cpp b/unit_tests/mem_obj/image_tests.cpp index d1fded59e7..517d863186 100644 --- a/unit_tests/mem_obj/image_tests.cpp +++ b/unit_tests/mem_obj/image_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/built_ins/built_ins.h" #include "runtime/compiler_interface/compiler_interface.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/mipmap.h" #include "runtime/mem_obj/image.h" #include "runtime/mem_obj/mem_obj_helper.h" diff --git a/unit_tests/mem_obj/image_validate_tests.cpp b/unit_tests/mem_obj/image_validate_tests.cpp index 2c52a06042..fb0132a9e3 100644 --- a/unit_tests/mem_obj/image_validate_tests.cpp +++ b/unit_tests/mem_obj/image_validate_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/helpers/convert_color.h" #include "runtime/helpers/surface_formats.h" #include "runtime/mem_obj/image.h" diff --git a/unit_tests/mem_obj/nv12_image_tests.cpp b/unit_tests/mem_obj/nv12_image_tests.cpp index 40c360a944..547517cb8f 100644 --- a/unit_tests/mem_obj/nv12_image_tests.cpp +++ b/unit_tests/mem_obj/nv12_image_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/gmm_helper/gmm.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/surface_formats.h" #include "runtime/mem_obj/image.h" #include "test.h" diff --git a/unit_tests/mem_obj/packed_yuv_image_tests.cpp b/unit_tests/mem_obj/packed_yuv_image_tests.cpp index 524c262943..7127a34b54 100644 --- a/unit_tests/mem_obj/packed_yuv_image_tests.cpp +++ b/unit_tests/mem_obj/packed_yuv_image_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/helpers/surface_formats.h" #include "runtime/helpers/validators.h" #include "runtime/mem_obj/image.h" diff --git a/unit_tests/mem_obj/zero_copy_tests.cpp b/unit_tests/mem_obj/zero_copy_tests.cpp index 180ff90519..9bfe5e2ca5 100644 --- a/unit_tests/mem_obj/zero_copy_tests.cpp +++ b/unit_tests/mem_obj/zero_copy_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/mem_obj/buffer.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/memory_management_fixture.h" diff --git a/unit_tests/memory_manager/address_mapper_tests.cpp b/unit_tests/memory_manager/address_mapper_tests.cpp index 72b93e61c3..2d2d131388 100644 --- a/unit_tests/memory_manager/address_mapper_tests.cpp +++ b/unit_tests/memory_manager/address_mapper_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/memory_manager/address_mapper.h" #include "test.h" diff --git a/unit_tests/memory_manager/gfx_partition_tests.cpp b/unit_tests/memory_manager/gfx_partition_tests.cpp index 1af24073aa..6f8685a984 100644 --- a/unit_tests/memory_manager/gfx_partition_tests.cpp +++ b/unit_tests/memory_manager/gfx_partition_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" #include "core/helpers/ptr_math.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/os_interface/os_memory.h" #include "unit_tests/mocks/mock_gfx_partition.h" diff --git a/unit_tests/memory_manager/host_ptr_manager_tests.cpp b/unit_tests/memory_manager/host_ptr_manager_tests.cpp index d3612028a9..924a89a9c7 100644 --- a/unit_tests/memory_manager/host_ptr_manager_tests.cpp +++ b/unit_tests/memory_manager/host_ptr_manager_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/memory_manager/memory_constants.h" #include "test.h" #include "unit_tests/fixtures/memory_manager_fixture.h" diff --git a/unit_tests/mocks/mock_buffer.h b/unit_tests/mocks/mock_buffer.h index 7d19ca8e4f..b67d423827 100644 --- a/unit_tests/mocks/mock_buffer.h +++ b/unit_tests/mocks/mock_buffer.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/mem_obj/buffer.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_device.h" diff --git a/unit_tests/mocks/mock_gmm_resource_info.cpp b/unit_tests/mocks/mock_gmm_resource_info.cpp index 65153bfcdc..d090df414b 100644 --- a/unit_tests/mocks/mock_gmm_resource_info.cpp +++ b/unit_tests/mocks/mock_gmm_resource_info.cpp @@ -7,7 +7,7 @@ #include "unit_tests/mocks/mock_gmm_resource_info.h" -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/helpers/surface_formats.h" using namespace ::testing; diff --git a/unit_tests/mocks/mock_pipe.h b/unit_tests/mocks/mock_pipe.h index e7f15c6ce1..52b0249492 100644 --- a/unit_tests/mocks/mock_pipe.h +++ b/unit_tests/mocks/mock_pipe.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/mem_obj/pipe.h" #include "unit_tests/mocks/mock_graphics_allocation.h" diff --git a/unit_tests/mocks/mock_wddm.cpp b/unit_tests/mocks/mock_wddm.cpp index 092100926e..fe16307c05 100644 --- a/unit_tests/mocks/mock_wddm.cpp +++ b/unit_tests/mocks/mock_wddm.cpp @@ -7,7 +7,7 @@ #include "unit_tests/mocks/mock_wddm.h" -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/os_interface/windows/gdi_interface.h" #include "runtime/os_interface/windows/wddm_allocation.h" #include "unit_tests/mock_gdi/mock_gdi.h" diff --git a/unit_tests/os_interface/linux/device_command_stream_fixture.h b/unit_tests/os_interface/linux/device_command_stream_fixture.h index a2e66bdd89..0263eabfd2 100644 --- a/unit_tests/os_interface/linux/device_command_stream_fixture.h +++ b/unit_tests/os_interface/linux/device_command_stream_fixture.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/helpers/hw_helper.h" #include "runtime/os_interface/linux/drm_memory_manager.h" #include "runtime/os_interface/linux/drm_neo.h" diff --git a/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp b/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp index ba7303bdfb..5d3efadae2 100644 --- a/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp +++ b/unit_tests/os_interface/linux/drm_gem_close_worker_tests.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/aligned_memory.h" #include "runtime/command_stream/device_command_stream.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/mem_obj/buffer.h" #include "runtime/os_interface/linux/drm_buffer_object.h" #include "runtime/os_interface/linux/drm_command_stream.h" diff --git a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp index d2135d754e..69aab7840b 100644 --- a/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/linux/drm_memory_manager_tests.cpp @@ -7,13 +7,13 @@ #include "drm_memory_manager_tests.h" +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/device_command_stream.h" #include "runtime/command_stream/linear_stream.h" #include "runtime/command_stream/preemption.h" #include "runtime/event/event.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp index ad223d16d6..52fab0d688 100644 --- a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp @@ -7,10 +7,10 @@ #include "unit_tests/os_interface/windows/wddm_memory_manager_tests.h" +#include "core/helpers/aligned_memory.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/array_count.h" #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" diff --git a/unit_tests/perf_tests/perf_test_utils.cpp b/unit_tests/perf_tests/perf_test_utils.cpp index 602858877c..8686c47e3c 100644 --- a/unit_tests/perf_tests/perf_test_utils.cpp +++ b/unit_tests/perf_tests/perf_test_utils.cpp @@ -7,7 +7,7 @@ #include "perf_test_utils.h" -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/helpers/hash.h" #include diff --git a/unit_tests/program/printf_helper_tests.cpp b/unit_tests/program/printf_helper_tests.cpp index be593f5052..7314ca6e80 100644 --- a/unit_tests/program/printf_helper_tests.cpp +++ b/unit_tests/program/printf_helper_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/string.h" -#include "runtime/helpers/aligned_memory.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/program_nonuniform.cpp b/unit_tests/program/program_nonuniform.cpp index aa1e7c75ef..7cbca03cf1 100644 --- a/unit_tests/program/program_nonuniform.cpp +++ b/unit_tests/program/program_nonuniform.cpp @@ -5,9 +5,9 @@ * */ +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "runtime/command_stream/command_stream_receiver_hw.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/hash.h" #include "runtime/indirect_heap/indirect_heap.h" diff --git a/unit_tests/program/program_tests.cpp b/unit_tests/program/program_tests.cpp index 35a1e7f3ee..32eb3359b6 100644 --- a/unit_tests/program/program_tests.cpp +++ b/unit_tests/program/program_tests.cpp @@ -7,6 +7,7 @@ #include "unit_tests/program/program_tests.h" +#include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" @@ -14,7 +15,6 @@ #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/compiler_interface/compiler_options.h" #include "runtime/gmm_helper/gmm_helper.h" -#include "runtime/helpers/aligned_memory.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/helpers/hash.h" #include "runtime/helpers/hw_helper.h" diff --git a/unit_tests/sharings/va/mock_va_sharing.h b/unit_tests/sharings/va/mock_va_sharing.h index fe5ee1bb64..d86947298e 100644 --- a/unit_tests/sharings/va/mock_va_sharing.h +++ b/unit_tests/sharings/va/mock_va_sharing.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/aligned_memory.h" +#include "core/helpers/aligned_memory.h" #include "runtime/sharings/va/va_sharing.h" namespace NEO {