diff --git a/core/unit_tests/utilities/CMakeLists.txt b/core/unit_tests/utilities/CMakeLists.txt index 4c7036d077..e754f68ab2 100644 --- a/core/unit_tests/utilities/CMakeLists.txt +++ b/core/unit_tests/utilities/CMakeLists.txt @@ -5,10 +5,20 @@ # set(NEO_CORE_UTILITIES_TESTS + ${CMAKE_CURRENT_SOURCE_DIR}/base_object_utils.h ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/clflush_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/containers_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/containers_tests_helpers.h ${CMAKE_CURRENT_SOURCE_DIR}/cpuinfo_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/destructor_counted.h + ${CMAKE_CURRENT_SOURCE_DIR}/directory_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/numeric_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/reference_tracked_object_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/spinlock_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/timer_util_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/vec_tests.cpp ) set_property(GLOBAL PROPERTY NEO_CORE_UTILITIES_TESTS ${NEO_CORE_UTILITIES_TESTS}) \ No newline at end of file diff --git a/unit_tests/utilities/base_object_utils.h b/core/unit_tests/utilities/base_object_utils.h similarity index 100% rename from unit_tests/utilities/base_object_utils.h rename to core/unit_tests/utilities/base_object_utils.h diff --git a/unit_tests/utilities/containers_tests.cpp b/core/unit_tests/utilities/containers_tests.cpp similarity index 99% rename from unit_tests/utilities/containers_tests.cpp rename to core/unit_tests/utilities/containers_tests.cpp index bb2ffbf0c7..d7787d3ee7 100644 --- a/unit_tests/utilities/containers_tests.cpp +++ b/core/unit_tests/utilities/containers_tests.cpp @@ -5,12 +5,12 @@ * */ -#include "runtime/utilities/arrayref.h" -#include "runtime/utilities/idlist.h" -#include "runtime/utilities/iflist.h" -#include "runtime/utilities/range.h" -#include "runtime/utilities/stackvec.h" -#include "unit_tests/utilities/containers_tests_helpers.h" +#include "core/unit_tests/utilities/containers_tests_helpers.h" +#include "core/utilities/arrayref.h" +#include "core/utilities/idlist.h" +#include "core/utilities/iflist.h" +#include "core/utilities/range.h" +#include "core/utilities/stackvec.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/unit_tests/utilities/containers_tests_helpers.h b/core/unit_tests/utilities/containers_tests_helpers.h similarity index 70% rename from unit_tests/utilities/containers_tests_helpers.h rename to core/unit_tests/utilities/containers_tests_helpers.h index 6fc176afc8..6b58f0b9cd 100644 --- a/unit_tests/utilities/containers_tests_helpers.h +++ b/core/unit_tests/utilities/containers_tests_helpers.h @@ -1,27 +1,14 @@ /* - * Copyright (c) 2017, Intel Corporation + * Copyright (C) 2017-2019 Intel Corporation * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: + * SPDX-License-Identifier: MIT * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. */ #pragma once +#include + template size_t countArgs(const Arg1 &arg1) { return 1; diff --git a/unit_tests/utilities/destructor_counted.h b/core/unit_tests/utilities/destructor_counted.h similarity index 100% rename from unit_tests/utilities/destructor_counted.h rename to core/unit_tests/utilities/destructor_counted.h diff --git a/unit_tests/utilities/directory_tests.cpp b/core/unit_tests/utilities/directory_tests.cpp similarity index 92% rename from unit_tests/utilities/directory_tests.cpp rename to core/unit_tests/utilities/directory_tests.cpp index e99900c300..98959c1c9f 100644 --- a/unit_tests/utilities/directory_tests.cpp +++ b/core/unit_tests/utilities/directory_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/utilities/directory.h" +#include "core/utilities/directory.h" #include "test.h" #include "gtest/gtest.h" diff --git a/unit_tests/utilities/heap_allocator_tests.cpp b/core/unit_tests/utilities/heap_allocator_tests.cpp similarity index 100% rename from unit_tests/utilities/heap_allocator_tests.cpp rename to core/unit_tests/utilities/heap_allocator_tests.cpp diff --git a/unit_tests/utilities/numeric_tests.cpp b/core/unit_tests/utilities/numeric_tests.cpp similarity index 98% rename from unit_tests/utilities/numeric_tests.cpp rename to core/unit_tests/utilities/numeric_tests.cpp index e949f46de8..bfdc3b4767 100644 --- a/unit_tests/utilities/numeric_tests.cpp +++ b/core/unit_tests/utilities/numeric_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/utilities/numeric.h" +#include "core/utilities/numeric.h" #include "test.h" #include diff --git a/unit_tests/utilities/reference_tracked_object_tests.cpp b/core/unit_tests/utilities/reference_tracked_object_tests.cpp similarity index 99% rename from unit_tests/utilities/reference_tracked_object_tests.cpp rename to core/unit_tests/utilities/reference_tracked_object_tests.cpp index 06a04c5cb1..d60c52b216 100644 --- a/unit_tests/utilities/reference_tracked_object_tests.cpp +++ b/core/unit_tests/utilities/reference_tracked_object_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/utilities/reference_tracked_object.h" +#include "core/utilities/reference_tracked_object.h" #include "gtest/gtest.h" diff --git a/unit_tests/utilities/timer_util_tests.cpp b/core/unit_tests/utilities/timer_util_tests.cpp similarity index 96% rename from unit_tests/utilities/timer_util_tests.cpp rename to core/unit_tests/utilities/timer_util_tests.cpp index 50077f7651..cbf555bf7c 100644 --- a/unit_tests/utilities/timer_util_tests.cpp +++ b/core/unit_tests/utilities/timer_util_tests.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/utilities/timer_util.h" +#include "core/utilities/timer_util.h" #include "test.h" #include "gtest/gtest.h" diff --git a/unit_tests/utilities/vec_tests.cpp b/core/unit_tests/utilities/vec_tests.cpp similarity index 100% rename from unit_tests/utilities/vec_tests.cpp rename to core/unit_tests/utilities/vec_tests.cpp diff --git a/core/utilities/CMakeLists.txt b/core/utilities/CMakeLists.txt index becb3b4d30..6c1d1856bf 100644 --- a/core/utilities/CMakeLists.txt +++ b/core/utilities/CMakeLists.txt @@ -6,6 +6,7 @@ set(NEO_CORE_UTILITIES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/arrayref.h ${CMAKE_CURRENT_SOURCE_DIR}/clflush.h ${CMAKE_CURRENT_SOURCE_DIR}/cpu_info.h ${CMAKE_CURRENT_SOURCE_DIR}/debug_file_reader.cpp @@ -13,17 +14,29 @@ set(NEO_CORE_UTILITIES ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader_creator.h ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader.h + ${CMAKE_CURRENT_SOURCE_DIR}/directory.h ${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator.cpp ${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator.h + ${CMAKE_CURRENT_SOURCE_DIR}/iflist.h + ${CMAKE_CURRENT_SOURCE_DIR}/idlist.h + ${CMAKE_CURRENT_SOURCE_DIR}/numeric.h + ${CMAKE_CURRENT_SOURCE_DIR}/range.h + ${CMAKE_CURRENT_SOURCE_DIR}/reference_tracked_object.h ${CMAKE_CURRENT_SOURCE_DIR}/spinlock.h + ${CMAKE_CURRENT_SOURCE_DIR}/stackvec.h + ${CMAKE_CURRENT_SOURCE_DIR}/timer_util.h ) set(NEO_CORE_UTILITIES_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/windows/cpu_info.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/windows/directory.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/windows/timer_util.cpp ) set(NEO_CORE_UTILITIES_LINUX ${CMAKE_CURRENT_SOURCE_DIR}/linux/cpu_info.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/linux/directory.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/linux/timer_util.cpp ) set_property(GLOBAL PROPERTY NEO_CORE_UTILITIES ${NEO_CORE_UTILITIES}) diff --git a/runtime/utilities/arrayref.h b/core/utilities/arrayref.h similarity index 97% rename from runtime/utilities/arrayref.h rename to core/utilities/arrayref.h index bc66aa948f..9d55d614c1 100644 --- a/runtime/utilities/arrayref.h +++ b/core/utilities/arrayref.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Intel Corporation + * Copyright (C) 2018-2019 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/runtime/utilities/directory.h b/core/utilities/directory.h similarity index 100% rename from runtime/utilities/directory.h rename to core/utilities/directory.h diff --git a/runtime/utilities/idlist.h b/core/utilities/idlist.h similarity index 100% rename from runtime/utilities/idlist.h rename to core/utilities/idlist.h diff --git a/runtime/utilities/iflist.h b/core/utilities/iflist.h similarity index 100% rename from runtime/utilities/iflist.h rename to core/utilities/iflist.h diff --git a/runtime/utilities/linux/directory.cpp b/core/utilities/linux/directory.cpp similarity index 94% rename from runtime/utilities/linux/directory.cpp rename to core/utilities/linux/directory.cpp index b6774019cd..508bfd5feb 100644 --- a/runtime/utilities/linux/directory.cpp +++ b/core/utilities/linux/directory.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/utilities/directory.h" +#include "core/utilities/directory.h" #include #include diff --git a/runtime/utilities/linux/timer_util.cpp b/core/utilities/linux/timer_util.cpp similarity index 98% rename from runtime/utilities/linux/timer_util.cpp rename to core/utilities/linux/timer_util.cpp index d104a17f36..586c765c9a 100644 --- a/runtime/utilities/linux/timer_util.cpp +++ b/core/utilities/linux/timer_util.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/utilities/timer_util.h" +#include "core/utilities/timer_util.h" #include diff --git a/runtime/utilities/numeric.h b/core/utilities/numeric.h similarity index 100% rename from runtime/utilities/numeric.h rename to core/utilities/numeric.h diff --git a/runtime/utilities/range.h b/core/utilities/range.h similarity index 100% rename from runtime/utilities/range.h rename to core/utilities/range.h diff --git a/runtime/utilities/reference_tracked_object.h b/core/utilities/reference_tracked_object.h similarity index 100% rename from runtime/utilities/reference_tracked_object.h rename to core/utilities/reference_tracked_object.h diff --git a/runtime/utilities/stackvec.h b/core/utilities/stackvec.h similarity index 100% rename from runtime/utilities/stackvec.h rename to core/utilities/stackvec.h diff --git a/runtime/utilities/timer_util.h b/core/utilities/timer_util.h similarity index 100% rename from runtime/utilities/timer_util.h rename to core/utilities/timer_util.h diff --git a/runtime/utilities/windows/directory.cpp b/core/utilities/windows/directory.cpp similarity index 95% rename from runtime/utilities/windows/directory.cpp rename to core/utilities/windows/directory.cpp index 67eb91231c..9c899d155e 100644 --- a/runtime/utilities/windows/directory.cpp +++ b/core/utilities/windows/directory.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/utilities/directory.h" +#include "core/utilities/directory.h" #include "core/os_interface/windows/windows_wrapper.h" diff --git a/runtime/utilities/windows/timer_util.cpp b/core/utilities/windows/timer_util.cpp similarity index 98% rename from runtime/utilities/windows/timer_util.cpp rename to core/utilities/windows/timer_util.cpp index 34eba62ef3..5f50a7a32a 100644 --- a/runtime/utilities/windows/timer_util.cpp +++ b/core/utilities/windows/timer_util.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/utilities/timer_util.h" +#include "core/utilities/timer_util.h" #include "core/helpers/debug_helpers.h" #include "core/os_interface/windows/windows_wrapper.h" diff --git a/runtime/api/api.cpp b/runtime/api/api.cpp index de21eda17c..6901acbabe 100644 --- a/runtime/api/api.cpp +++ b/runtime/api/api.cpp @@ -8,6 +8,7 @@ #include "api.h" #include "core/helpers/aligned_memory.h" +#include "core/utilities/stackvec.h" #include "runtime/accelerators/intel_motion_estimation.h" #include "runtime/api/additional_extensions.h" #include "runtime/aub/aub_center.h" @@ -41,7 +42,6 @@ #include "runtime/tracing/tracing_api.h" #include "runtime/tracing/tracing_notify.h" #include "runtime/utilities/api_intercept.h" -#include "runtime/utilities/stackvec.h" #include "CL/cl.h" #include "config.h" diff --git a/runtime/command_queue/enqueue_common.h b/runtime/command_queue/enqueue_common.h index ac80945646..628e0f2c4c 100644 --- a/runtime/command_queue/enqueue_common.h +++ b/runtime/command_queue/enqueue_common.h @@ -6,6 +6,7 @@ */ #pragma once +#include "core/utilities/range.h" #include "runtime/built_ins/built_ins.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/builtin_kernels_simulation/scheduler_simulation.h" @@ -29,7 +30,6 @@ #include "runtime/os_interface/os_context.h" #include "runtime/program/block_kernel_manager.h" #include "runtime/program/printf_handler.h" -#include "runtime/utilities/range.h" #include "runtime/utilities/tag_allocator.h" #include "hw_cmds.h" diff --git a/runtime/command_stream/submissions_aggregator.h b/runtime/command_stream/submissions_aggregator.h index 6b82322185..f84503ff44 100644 --- a/runtime/command_stream/submissions_aggregator.h +++ b/runtime/command_stream/submissions_aggregator.h @@ -7,10 +7,10 @@ #pragma once #include "core/command_stream/linear_stream.h" +#include "core/utilities/idlist.h" +#include "core/utilities/stackvec.h" #include "runtime/helpers/properties_helper.h" #include "runtime/memory_manager/residency_container.h" -#include "runtime/utilities/idlist.h" -#include "runtime/utilities/stackvec.h" #include namespace NEO { diff --git a/runtime/compiler_interface/binary_cache.h b/runtime/compiler_interface/binary_cache.h index 1d2a091609..5ecc851ebb 100644 --- a/runtime/compiler_interface/binary_cache.h +++ b/runtime/compiler_interface/binary_cache.h @@ -7,7 +7,7 @@ #pragma once -#include "runtime/utilities/arrayref.h" +#include "core/utilities/arrayref.h" #include #include diff --git a/runtime/event/event.cpp b/runtime/event/event.cpp index 97317dec0a..dd57912123 100644 --- a/runtime/event/event.cpp +++ b/runtime/event/event.cpp @@ -8,6 +8,8 @@ #include "runtime/event/event.h" #include "core/helpers/aligned_memory.h" +#include "core/utilities/range.h" +#include "core/utilities/stackvec.h" #include "public/cl_ext_private.h" #include "runtime/api/cl_types.h" #include "runtime/command_queue/command_queue.h" @@ -22,8 +24,6 @@ #include "runtime/mem_obj/mem_obj.h" #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/platform/platform.h" -#include "runtime/utilities/range.h" -#include "runtime/utilities/stackvec.h" #include "runtime/utilities/tag_allocator.h" #define OCLRT_NUM_TIMESTAMP_BITS (32) diff --git a/runtime/event/event.h b/runtime/event/event.h index d2123d928f..737c2a9d4c 100644 --- a/runtime/event/event.h +++ b/runtime/event/event.h @@ -6,6 +6,9 @@ */ #pragma once +#include "core/utilities/arrayref.h" +#include "core/utilities/idlist.h" +#include "core/utilities/iflist.h" #include "runtime/api/cl_types.h" #include "runtime/event/hw_timestamps.h" #include "runtime/helpers/base_object.h" @@ -13,9 +16,6 @@ #include "runtime/helpers/task_information.h" #include "runtime/os_interface/os_time.h" #include "runtime/os_interface/performance_counters.h" -#include "runtime/utilities/arrayref.h" -#include "runtime/utilities/idlist.h" -#include "runtime/utilities/iflist.h" #include #include diff --git a/runtime/event/event_builder.h b/runtime/event/event_builder.h index 1187a26661..429239c661 100644 --- a/runtime/event/event_builder.h +++ b/runtime/event/event_builder.h @@ -6,8 +6,8 @@ */ #pragma once -#include "runtime/utilities/arrayref.h" -#include "runtime/utilities/stackvec.h" +#include "core/utilities/arrayref.h" +#include "core/utilities/stackvec.h" #include "CL/cl.h" diff --git a/runtime/event/event_tracker.h b/runtime/event/event_tracker.h index 4d0cd9909f..ccd7f699f5 100644 --- a/runtime/event/event_tracker.h +++ b/runtime/event/event_tracker.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/utilities/iflist.h" #include "runtime/event/event.h" -#include "runtime/utilities/iflist.h" #include #include diff --git a/runtime/execution_environment/execution_environment.h b/runtime/execution_environment/execution_environment.h index cc2382eb1f..0b84ecd125 100644 --- a/runtime/execution_environment/execution_environment.h +++ b/runtime/execution_environment/execution_environment.h @@ -7,9 +7,9 @@ #pragma once #include "core/memory_manager/memory_constants.h" +#include "core/utilities/reference_tracked_object.h" #include "runtime/helpers/options.h" #include "runtime/os_interface/device_factory.h" -#include "runtime/utilities/reference_tracked_object.h" #include #include diff --git a/runtime/helpers/base_object.h b/runtime/helpers/base_object.h index 1272d037b9..1406b29596 100644 --- a/runtime/helpers/base_object.h +++ b/runtime/helpers/base_object.h @@ -8,8 +8,8 @@ #pragma once #include "core/helpers/abort.h" #include "core/helpers/debug_helpers.h" +#include "core/utilities/reference_tracked_object.h" #include "runtime/api/dispatch.h" -#include "runtime/utilities/reference_tracked_object.h" #include "CL/cl.h" diff --git a/runtime/helpers/csr_deps.h b/runtime/helpers/csr_deps.h index 1371d82a5f..4cc8e6e696 100644 --- a/runtime/helpers/csr_deps.h +++ b/runtime/helpers/csr_deps.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/utilities/stackvec.h" +#include "core/utilities/stackvec.h" namespace NEO { diff --git a/runtime/helpers/dispatch_info.h b/runtime/helpers/dispatch_info.h index c7971f5c43..38bce952b0 100644 --- a/runtime/helpers/dispatch_info.h +++ b/runtime/helpers/dispatch_info.h @@ -8,11 +8,11 @@ #pragma once #include "core/helpers/vec.h" +#include "core/utilities/stackvec.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/helpers/registered_method_dispatcher.h" #include "runtime/mem_obj/mem_obj.h" #include "runtime/memory_manager/surface.h" -#include "runtime/utilities/stackvec.h" #include #include diff --git a/runtime/helpers/flush_stamp.h b/runtime/helpers/flush_stamp.h index de810748d7..43ce3ce7e8 100644 --- a/runtime/helpers/flush_stamp.h +++ b/runtime/helpers/flush_stamp.h @@ -7,9 +7,9 @@ #pragma once +#include "core/utilities/reference_tracked_object.h" +#include "core/utilities/stackvec.h" #include "runtime/helpers/completion_stamp.h" -#include "runtime/utilities/reference_tracked_object.h" -#include "runtime/utilities/stackvec.h" namespace NEO { struct FlushStampTrackingObj : public ReferenceTrackedObject { diff --git a/runtime/helpers/string_helpers.h b/runtime/helpers/string_helpers.h index 28aeb9b47c..1c1b3121ee 100644 --- a/runtime/helpers/string_helpers.h +++ b/runtime/helpers/string_helpers.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/utilities/stackvec.h" +#include "core/utilities/stackvec.h" #include "CL/cl.h" diff --git a/runtime/helpers/surface_formats.h b/runtime/helpers/surface_formats.h index 4357782028..eeb342de91 100644 --- a/runtime/helpers/surface_formats.h +++ b/runtime/helpers/surface_formats.h @@ -13,8 +13,8 @@ #include "CL/cl_ext.h" #endif +#include "core/utilities/arrayref.h" #include "runtime/gmm_helper/gmm_lib.h" -#include "runtime/utilities/arrayref.h" namespace NEO { enum GFX3DSTATE_SURFACEFORMAT : unsigned short { diff --git a/runtime/helpers/task_information.h b/runtime/helpers/task_information.h index 17d1377441..7400249706 100644 --- a/runtime/helpers/task_information.h +++ b/runtime/helpers/task_information.h @@ -7,13 +7,13 @@ #pragma once #include "core/command_stream/linear_stream.h" +#include "core/utilities/iflist.h" #include "runtime/helpers/blit_commands_helper.h" #include "runtime/helpers/completion_stamp.h" #include "runtime/helpers/hw_info.h" #include "runtime/helpers/properties_helper.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/indirect_heap/indirect_heap.h" -#include "runtime/utilities/iflist.h" #include #include diff --git a/runtime/memory_manager/deferrable_deletion.h b/runtime/memory_manager/deferrable_deletion.h index b10d078012..b9ebceafbd 100644 --- a/runtime/memory_manager/deferrable_deletion.h +++ b/runtime/memory_manager/deferrable_deletion.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/utilities/idlist.h" +#include "core/utilities/idlist.h" namespace NEO { class DeferrableDeletion : public IDNode { diff --git a/runtime/memory_manager/deferred_deleter.h b/runtime/memory_manager/deferred_deleter.h index 44d3c4e1d9..a2ddcfcc3e 100644 --- a/runtime/memory_manager/deferred_deleter.h +++ b/runtime/memory_manager/deferred_deleter.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/utilities/idlist.h" +#include "core/utilities/idlist.h" #include #include diff --git a/runtime/memory_manager/graphics_allocation.h b/runtime/memory_manager/graphics_allocation.h index eee6e9419c..63bac57569 100644 --- a/runtime/memory_manager/graphics_allocation.h +++ b/runtime/memory_manager/graphics_allocation.h @@ -11,8 +11,8 @@ #include "core/helpers/ptr_math.h" #include "core/memory_manager/host_ptr_defines.h" #include "core/memory_manager/memory_constants.h" +#include "core/utilities/idlist.h" #include "runtime/memory_manager/memory_pool.h" -#include "runtime/utilities/idlist.h" #include "engine_limits.h" #include "storage_info.h" diff --git a/runtime/memory_manager/memory_manager.cpp b/runtime/memory_manager/memory_manager.cpp index 6a105a0f63..c65c7b9e7e 100644 --- a/runtime/memory_manager/memory_manager.cpp +++ b/runtime/memory_manager/memory_manager.cpp @@ -9,6 +9,7 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/basic_math.h" +#include "core/utilities/stackvec.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/event/event.h" #include "runtime/event/hw_timestamps.h" @@ -27,7 +28,6 @@ #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/os_interface/os_context.h" #include "runtime/os_interface/os_interface.h" -#include "runtime/utilities/stackvec.h" #include diff --git a/runtime/os_interface/linux/drm_buffer_object.cpp b/runtime/os_interface/linux/drm_buffer_object.cpp index a593095b0e..0cf2938843 100644 --- a/runtime/os_interface/linux/drm_buffer_object.cpp +++ b/runtime/os_interface/linux/drm_buffer_object.cpp @@ -9,10 +9,10 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/debug_helpers.h" +#include "core/utilities/stackvec.h" #include "runtime/os_interface/linux/drm_memory_manager.h" #include "runtime/os_interface/linux/drm_neo.h" #include "runtime/os_interface/linux/os_time_linux.h" -#include "runtime/utilities/stackvec.h" #include "drm/i915_drm.h" diff --git a/runtime/os_interface/linux/drm_neo.cpp b/runtime/os_interface/linux/drm_neo.cpp index dd1366ee24..063339c1e1 100644 --- a/runtime/os_interface/linux/drm_neo.cpp +++ b/runtime/os_interface/linux/drm_neo.cpp @@ -8,8 +8,8 @@ #include "drm_neo.h" #include "core/memory_manager/memory_constants.h" +#include "core/utilities/directory.h" #include "runtime/os_interface/os_inc_base.h" -#include "runtime/utilities/directory.h" #include "drm/i915_drm.h" diff --git a/runtime/os_interface/os_context.h b/runtime/os_interface/os_context.h index 4332f73875..d21e241c79 100644 --- a/runtime/os_interface/os_context.h +++ b/runtime/os_interface/os_context.h @@ -7,8 +7,8 @@ #pragma once #include "core/command_stream/preemption_mode.h" +#include "core/utilities/reference_tracked_object.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/utilities/reference_tracked_object.h" #include "engine_node.h" diff --git a/runtime/os_interface/windows/wddm/wddm.cpp b/runtime/os_interface/windows/wddm/wddm.cpp index 833523e06b..170a11efbf 100644 --- a/runtime/os_interface/windows/wddm/wddm.cpp +++ b/runtime/os_interface/windows/wddm/wddm.cpp @@ -9,6 +9,7 @@ #include "core/helpers/interlocked_max.h" #include "core/os_interface/windows/debug_registry_reader.h" +#include "core/utilities/stackvec.h" #include "runtime/command_stream/preemption.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/gmm_helper/gmm.h" @@ -26,7 +27,6 @@ #include "runtime/os_interface/windows/wddm_residency_allocations_container.h" #include "runtime/platform/platform.h" #include "runtime/sku_info/operations/sku_info_receiver.h" -#include "runtime/utilities/stackvec.h" #include "gmm_memory.h" diff --git a/runtime/sampler/sampler.inl b/runtime/sampler/sampler.inl index 801d36d48e..ccc306e2db 100644 --- a/runtime/sampler/sampler.inl +++ b/runtime/sampler/sampler.inl @@ -5,7 +5,7 @@ * */ -#include "runtime/utilities/numeric.h" +#include "core/utilities/numeric.h" #include diff --git a/runtime/utilities/CMakeLists.txt b/runtime/utilities/CMakeLists.txt index 2d4c0b8452..0360f83638 100644 --- a/runtime/utilities/CMakeLists.txt +++ b/runtime/utilities/CMakeLists.txt @@ -7,44 +7,22 @@ set(RUNTIME_SRCS_UTILITIES_BASE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/api_intercept.h - ${CMAKE_CURRENT_SOURCE_DIR}/arrayref.h - ${CMAKE_CURRENT_SOURCE_DIR}/directory.h - ${CMAKE_CURRENT_SOURCE_DIR}/iflist.h - ${CMAKE_CURRENT_SOURCE_DIR}/idlist.h - ${CMAKE_CURRENT_SOURCE_DIR}/numeric.h ${CMAKE_CURRENT_SOURCE_DIR}/perf_profiler.cpp ${CMAKE_CURRENT_SOURCE_DIR}/perf_profiler.h - ${CMAKE_CURRENT_SOURCE_DIR}/range.h - ${CMAKE_CURRENT_SOURCE_DIR}/reference_tracked_object.h - ${CMAKE_CURRENT_SOURCE_DIR}/stackvec.h ${CMAKE_CURRENT_SOURCE_DIR}/tag_allocator.h - ${CMAKE_CURRENT_SOURCE_DIR}/timer_util.h ) get_property(NEO_CORE_UTILITIES GLOBAL PROPERTY NEO_CORE_UTILITIES) list(APPEND RUNTIME_SRCS_UTILITIES_BASE ${NEO_CORE_UTILITIES}) -set(RUNTIME_SRCS_UTILITIES_WINDOWS - ${CMAKE_CURRENT_SOURCE_DIR}/windows/directory.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/windows/timer_util.cpp -) - get_property(NEO_CORE_UTILITIES_WINDOWS GLOBAL PROPERTY NEO_CORE_UTILITIES_WINDOWS) -list(APPEND RUNTIME_SRCS_UTILITIES_WINDOWS ${NEO_CORE_UTILITIES_WINDOWS}) - -set(RUNTIME_SRCS_UTILITIES_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/linux/directory.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/linux/timer_util.cpp -) - get_property(NEO_CORE_UTILITIES_LINUX GLOBAL PROPERTY NEO_CORE_UTILITIES_LINUX) -list(APPEND RUNTIME_SRCS_UTILITIES_LINUX ${NEO_CORE_UTILITIES_LINUX}) + +set_property(GLOBAL PROPERTY RUNTIME_SRCS_UTILITIES_BASE ${RUNTIME_SRCS_UTILITIES_BASE}) target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_UTILITIES_BASE}) -set_property(GLOBAL PROPERTY RUNTIME_SRCS_UTILITIES_BASE ${RUNTIME_SRCS_UTILITIES_BASE}) -set_property(GLOBAL PROPERTY RUNTIME_SRCS_UTILITIES_LINUX ${RUNTIME_SRCS_UTILITIES_LINUX}) if(WIN32) - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_UTILITIES_WINDOWS}) + target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_CORE_UTILITIES_WINDOWS}) else() - target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_UTILITIES_LINUX}) + target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${NEO_CORE_UTILITIES_LINUX}) endif() diff --git a/runtime/utilities/perf_profiler.cpp b/runtime/utilities/perf_profiler.cpp index f732140218..d73e699400 100644 --- a/runtime/utilities/perf_profiler.cpp +++ b/runtime/utilities/perf_profiler.cpp @@ -7,7 +7,7 @@ #include "runtime/utilities/perf_profiler.h" -#include "runtime/utilities/stackvec.h" +#include "core/utilities/stackvec.h" #include "os_inc.h" diff --git a/runtime/utilities/perf_profiler.h b/runtime/utilities/perf_profiler.h index cc13fac9be..733f855806 100644 --- a/runtime/utilities/perf_profiler.h +++ b/runtime/utilities/perf_profiler.h @@ -6,8 +6,8 @@ */ #pragma once +#include "core/utilities/timer_util.h" #include "runtime/helpers/options.h" -#include "runtime/utilities/timer_util.h" #include #include diff --git a/runtime/utilities/tag_allocator.h b/runtime/utilities/tag_allocator.h index 27dd5767bb..52e7f1315e 100644 --- a/runtime/utilities/tag_allocator.h +++ b/runtime/utilities/tag_allocator.h @@ -8,8 +8,8 @@ #pragma once #include "core/helpers/aligned_memory.h" #include "core/helpers/debug_helpers.h" +#include "core/utilities/idlist.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/utilities/idlist.h" #include #include diff --git a/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp b/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp index 4a764a2454..e66608bf7d 100644 --- a/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp +++ b/unit_tests/api/cl_mem_locally_uncached_resource_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/unit_tests/utilities/base_object_utils.h" #include "public/cl_ext_private.h" #include "runtime/api/api.h" #include "runtime/command_queue/command_queue_hw.h" @@ -17,7 +18,6 @@ #include "test.h" #include "unit_tests/fixtures/hello_world_fixture.h" #include "unit_tests/helpers/hw_parse.h" -#include "unit_tests/utilities/base_object_utils.h" using namespace NEO; diff --git a/unit_tests/built_ins/built_in_tests.cpp b/unit_tests/built_ins/built_in_tests.cpp index f1afbc62f8..e374ccaaa4 100644 --- a/unit_tests/built_ins/built_in_tests.cpp +++ b/unit_tests/built_ins/built_in_tests.cpp @@ -7,6 +7,7 @@ #include "core/helpers/string.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/built_ins/aux_translation_builtin.h" #include "runtime/built_ins/built_ins.h" #include "runtime/built_ins/builtins_dispatch_builder.h" @@ -29,7 +30,6 @@ #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_compilers.h" #include "unit_tests/mocks/mock_kernel.h" -#include "unit_tests/utilities/base_object_utils.h" #include "gtest/gtest.h" #include "os_inc.h" diff --git a/unit_tests/command_queue/command_queue_hw_tests.cpp b/unit_tests/command_queue/command_queue_hw_tests.cpp index 9ccf8c0011..7ed1be2169 100644 --- a/unit_tests/command_queue/command_queue_hw_tests.cpp +++ b/unit_tests/command_queue/command_queue_hw_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/helpers/dispatch_info_builder.h" #include "test.h" @@ -21,7 +22,6 @@ #include "unit_tests/mocks/mock_csr.h" #include "unit_tests/mocks/mock_event.h" #include "unit_tests/mocks/mock_kernel.h" -#include "unit_tests/utilities/base_object_utils.h" using namespace NEO; diff --git a/unit_tests/command_queue/enqueue_kernel_2_tests.cpp b/unit_tests/command_queue/enqueue_kernel_2_tests.cpp index 4afdeb988b..e6bf72141e 100644 --- a/unit_tests/command_queue/enqueue_kernel_2_tests.cpp +++ b/unit_tests/command_queue/enqueue_kernel_2_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/command_stream/scratch_space_controller.h" #include "runtime/helpers/hw_helper.h" #include "runtime/memory_manager/allocations_list.h" @@ -18,7 +19,6 @@ #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_csr.h" #include "unit_tests/mocks/mock_device_queue.h" -#include "unit_tests/utilities/base_object_utils.h" #include "reg_configs_common.h" diff --git a/unit_tests/command_queue/enqueue_svm_tests.cpp b/unit_tests/command_queue/enqueue_svm_tests.cpp index c424030eb7..23e85ce118 100644 --- a/unit_tests/command_queue/enqueue_svm_tests.cpp +++ b/unit_tests/command_queue/enqueue_svm_tests.cpp @@ -8,6 +8,7 @@ #include "core/helpers/aligned_memory.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/event/user_event.h" #include "runtime/memory_manager/allocations_list.h" @@ -25,7 +26,6 @@ #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_kernel.h" #include "unit_tests/mocks/mock_svm_manager.h" -#include "unit_tests/utilities/base_object_utils.h" using namespace NEO; 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 8ac2619d7a..a5d8fd7105 100644 --- a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp +++ b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp @@ -10,6 +10,7 @@ #include "core/helpers/ptr_math.h" #include "core/os_interface/linux/debug_env_reader.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_queue/gpgpu_walker.h" @@ -43,7 +44,6 @@ #include "unit_tests/mocks/mock_kernel.h" #include "unit_tests/mocks/mock_submissions_aggregator.h" #include "unit_tests/mocks/mock_timestamp_container.h" -#include "unit_tests/utilities/base_object_utils.h" #include "reg_configs_common.h" diff --git a/unit_tests/d3d_sharing/cl_dx_sharing_tests.cpp b/unit_tests/d3d_sharing/cl_dx_sharing_tests.cpp index 4387ea0629..5ab47c5ec2 100644 --- a/unit_tests/d3d_sharing/cl_dx_sharing_tests.cpp +++ b/unit_tests/d3d_sharing/cl_dx_sharing_tests.cpp @@ -5,12 +5,12 @@ * */ +#include "core/utilities/arrayref.h" #include "runtime/sharings/d3d/cl_d3d_api.h" #include "runtime/sharings/d3d/d3d_buffer.h" #include "runtime/sharings/d3d/d3d_sharing.h" #include "runtime/sharings/d3d/d3d_surface.h" #include "runtime/sharings/d3d/d3d_texture.h" -#include "runtime/utilities/arrayref.h" #include "test.h" #include "unit_tests/fixtures/platform_fixture.h" #include "unit_tests/mocks/mock_buffer.h" diff --git a/unit_tests/d3d_sharing/d3d_aux_tests.cpp b/unit_tests/d3d_sharing/d3d_aux_tests.cpp index 40bf4fcdd7..14e6b89d6e 100644 --- a/unit_tests/d3d_sharing/d3d_aux_tests.cpp +++ b/unit_tests/d3d_sharing/d3d_aux_tests.cpp @@ -5,6 +5,7 @@ * */ +#include "core/utilities/arrayref.h" #include "runtime/api/api.h" #include "runtime/helpers/options.h" #include "runtime/mem_obj/image.h" @@ -15,7 +16,6 @@ #include "runtime/sharings/d3d/d3d_sharing.h" #include "runtime/sharings/d3d/d3d_surface.h" #include "runtime/sharings/d3d/d3d_texture.h" -#include "runtime/utilities/arrayref.h" #include "unit_tests/fixtures/d3d_test_fixture.h" #include "gmock/gmock.h" diff --git a/unit_tests/d3d_sharing/d3d_tests_part1.cpp b/unit_tests/d3d_sharing/d3d_tests_part1.cpp index 72981e111b..d91b9ee28f 100644 --- a/unit_tests/d3d_sharing/d3d_tests_part1.cpp +++ b/unit_tests/d3d_sharing/d3d_tests_part1.cpp @@ -6,6 +6,7 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/utilities/arrayref.h" #include "runtime/api/api.h" #include "runtime/helpers/options.h" #include "runtime/mem_obj/image.h" @@ -17,7 +18,6 @@ #include "runtime/sharings/d3d/d3d_surface.h" #include "runtime/sharings/d3d/d3d_texture.h" #include "runtime/sharings/d3d/enable_d3d.h" -#include "runtime/utilities/arrayref.h" #include "unit_tests/fixtures/d3d_test_fixture.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_sharing_factory.h" diff --git a/unit_tests/d3d_sharing/d3d_tests_part2.cpp b/unit_tests/d3d_sharing/d3d_tests_part2.cpp index ed5b907ae1..61d290784b 100644 --- a/unit_tests/d3d_sharing/d3d_tests_part2.cpp +++ b/unit_tests/d3d_sharing/d3d_tests_part2.cpp @@ -6,6 +6,7 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/utilities/arrayref.h" #include "runtime/api/api.h" #include "runtime/helpers/options.h" #include "runtime/mem_obj/image.h" @@ -16,7 +17,6 @@ #include "runtime/sharings/d3d/d3d_sharing.h" #include "runtime/sharings/d3d/d3d_surface.h" #include "runtime/sharings/d3d/d3d_texture.h" -#include "runtime/utilities/arrayref.h" #include "unit_tests/fixtures/d3d_test_fixture.h" #include "gmock/gmock.h" diff --git a/unit_tests/event/event_builder_tests.cpp b/unit_tests/event/event_builder_tests.cpp index 52d014b766..309a22509d 100644 --- a/unit_tests/event/event_builder_tests.cpp +++ b/unit_tests/event/event_builder_tests.cpp @@ -5,11 +5,11 @@ * */ +#include "core/utilities/arrayref.h" #include "runtime/event/event_builder.h" #include "runtime/event/user_event.h" #include "runtime/helpers/task_information.h" #include "runtime/memory_manager/internal_allocation_storage.h" -#include "runtime/utilities/arrayref.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_csr.h" diff --git a/unit_tests/event/event_fixture.h b/unit_tests/event/event_fixture.h index 3c841b9ef1..bcd2998963 100644 --- a/unit_tests/event/event_fixture.h +++ b/unit_tests/event/event_fixture.h @@ -9,6 +9,7 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/ptr_math.h" +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/command_queue/command_queue.h" #include "runtime/event/user_event.h" #include "unit_tests/command_queue/command_queue_fixture.h" @@ -18,7 +19,6 @@ #include "unit_tests/indirect_heap/indirect_heap_fixture.h" #include "unit_tests/mocks/mock_buffer.h" #include "unit_tests/mocks/mock_context.h" -#include "unit_tests/utilities/base_object_utils.h" #include "gtest/gtest.h" diff --git a/unit_tests/execution_environment/execution_environment_tests.cpp b/unit_tests/execution_environment/execution_environment_tests.cpp index 5920a4a15a..91dd346b72 100644 --- a/unit_tests/execution_environment/execution_environment_tests.cpp +++ b/unit_tests/execution_environment/execution_environment_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/utilities/destructor_counted.h" #include "runtime/aub/aub_center.h" #include "runtime/built_ins/built_ins.h" #include "runtime/command_stream/preemption.h" @@ -26,7 +27,6 @@ #include "unit_tests/mocks/mock_execution_environment.h" #include "unit_tests/mocks/mock_memory_manager.h" #include "unit_tests/mocks/mock_memory_operations_handler.h" -#include "unit_tests/utilities/destructor_counted.h" using namespace NEO; diff --git a/unit_tests/execution_model/enqueue_execution_model_kernel_tests.cpp b/unit_tests/execution_model/enqueue_execution_model_kernel_tests.cpp index 30cb2abdfb..8ea3bde533 100644 --- a/unit_tests/execution_model/enqueue_execution_model_kernel_tests.cpp +++ b/unit_tests/execution_model/enqueue_execution_model_kernel_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/builtin_kernels_simulation/scheduler_simulation.h" #include "runtime/command_queue/gpgpu_walker.h" @@ -23,7 +24,6 @@ #include "unit_tests/mocks/mock_event.h" #include "unit_tests/mocks/mock_mdi.h" #include "unit_tests/mocks/mock_submissions_aggregator.h" -#include "unit_tests/utilities/base_object_utils.h" using namespace NEO; diff --git a/unit_tests/helpers/cmd_buffer_validator.h b/unit_tests/helpers/cmd_buffer_validator.h index b30745d421..a31ab28b7c 100644 --- a/unit_tests/helpers/cmd_buffer_validator.h +++ b/unit_tests/helpers/cmd_buffer_validator.h @@ -7,7 +7,7 @@ #pragma once -#include "runtime/utilities/stackvec.h" +#include "core/utilities/stackvec.h" #include "unit_tests/helpers/hw_parse.h" #include diff --git a/unit_tests/helpers/hardware_commands_helper_tests.cpp b/unit_tests/helpers/hardware_commands_helper_tests.cpp index e098f20474..8ef194448d 100644 --- a/unit_tests/helpers/hardware_commands_helper_tests.cpp +++ b/unit_tests/helpers/hardware_commands_helper_tests.cpp @@ -9,6 +9,7 @@ #include "core/helpers/basic_math.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/api/api.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/command_queue/command_queue_hw.h" @@ -20,7 +21,6 @@ #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/indirect_heap/indirect_heap_fixture.h" #include "unit_tests/mocks/mock_graphics_allocation.h" -#include "unit_tests/utilities/base_object_utils.h" #include "hw_cmds.h" diff --git a/unit_tests/helpers/timestamp_packet_tests.cpp b/unit_tests/helpers/timestamp_packet_tests.cpp index 45bbca2143..c788e8dccb 100644 --- a/unit_tests/helpers/timestamp_packet_tests.cpp +++ b/unit_tests/helpers/timestamp_packet_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/command_queue/hardware_interface.h" #include "runtime/event/user_event.h" @@ -25,7 +26,6 @@ #include "unit_tests/mocks/mock_mdi.h" #include "unit_tests/mocks/mock_memory_manager.h" #include "unit_tests/mocks/mock_timestamp_container.h" -#include "unit_tests/utilities/base_object_utils.h" #include "gmock/gmock.h" diff --git a/unit_tests/kernel/kernel_tests.cpp b/unit_tests/kernel/kernel_tests.cpp index 05647db7e2..bf726874b6 100644 --- a/unit_tests/kernel/kernel_tests.cpp +++ b/unit_tests/kernel/kernel_tests.cpp @@ -7,6 +7,7 @@ #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/page_fault_manager/mock_cpu_page_fault_manager.h" +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/gmm_helper/gmm_helper.h" @@ -36,7 +37,6 @@ #include "unit_tests/mocks/mock_program.h" #include "unit_tests/program/program_from_binary.h" #include "unit_tests/program/program_tests.h" -#include "unit_tests/utilities/base_object_utils.h" #include diff --git a/unit_tests/mem_obj/buffer_tests.cpp b/unit_tests/mem_obj/buffer_tests.cpp index a60ea1f8bd..d9e02d6a50 100644 --- a/unit_tests/mem_obj/buffer_tests.cpp +++ b/unit_tests/mem_obj/buffer_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_queue/gpgpu_walker.h" #include "runtime/event/user_event.h" @@ -34,7 +35,6 @@ #include "unit_tests/mocks/mock_gmm_resource_info.h" #include "unit_tests/mocks/mock_memory_manager.h" #include "unit_tests/mocks/mock_timestamp_container.h" -#include "unit_tests/utilities/base_object_utils.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/unit_tests/mem_obj/image_compression_fixture.h b/unit_tests/mem_obj/image_compression_fixture.h index d36e462a44..8a9b67d801 100644 --- a/unit_tests/mem_obj/image_compression_fixture.h +++ b/unit_tests/mem_obj/image_compression_fixture.h @@ -5,12 +5,12 @@ * */ +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/helpers/surface_formats.h" #include "test.h" #include "unit_tests/mocks/mock_context.h" #include "unit_tests/mocks/mock_device.h" #include "unit_tests/mocks/mock_memory_manager.h" -#include "unit_tests/utilities/base_object_utils.h" using namespace NEO; diff --git a/unit_tests/mem_obj/mem_obj_helper_tests.cpp b/unit_tests/mem_obj/mem_obj_helper_tests.cpp index c560b27b1e..56af1b6715 100644 --- a/unit_tests/mem_obj/mem_obj_helper_tests.cpp +++ b/unit_tests/mem_obj/mem_obj_helper_tests.cpp @@ -5,10 +5,10 @@ * */ +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/helpers/memory_properties_flags_helpers.h" #include "runtime/mem_obj/mem_obj_helper.h" #include "unit_tests/fixtures/image_fixture.h" -#include "unit_tests/utilities/base_object_utils.h" #include "gtest/gtest.h" diff --git a/unit_tests/memory_manager/internal_allocation_storage_tests.cpp b/unit_tests/memory_manager/internal_allocation_storage_tests.cpp index a4eac60499..69ba2170b5 100644 --- a/unit_tests/memory_manager/internal_allocation_storage_tests.cpp +++ b/unit_tests/memory_manager/internal_allocation_storage_tests.cpp @@ -6,12 +6,12 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/utilities/containers_tests_helpers.h" #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/os_interface/os_context.h" #include "test.h" #include "unit_tests/fixtures/memory_allocator_fixture.h" #include "unit_tests/mocks/mock_allocation_properties.h" -#include "unit_tests/utilities/containers_tests_helpers.h" struct InternalAllocationStorageTest : public MemoryAllocatorFixture, public ::testing::Test { diff --git a/unit_tests/mt_tests/utilities/reference_tracked_object_tests_mt.cpp b/unit_tests/mt_tests/utilities/reference_tracked_object_tests_mt.cpp index c3bb33efe2..127b99b0ab 100644 --- a/unit_tests/mt_tests/utilities/reference_tracked_object_tests_mt.cpp +++ b/unit_tests/mt_tests/utilities/reference_tracked_object_tests_mt.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/utilities/reference_tracked_object.h" +#include "core/utilities/reference_tracked_object.h" #include "gtest/gtest.h" diff --git a/unit_tests/os_interface/debug_settings_manager_fixture.h b/unit_tests/os_interface/debug_settings_manager_fixture.h index 3080eddc13..787ecb3df1 100644 --- a/unit_tests/os_interface/debug_settings_manager_fixture.h +++ b/unit_tests/os_interface/debug_settings_manager_fixture.h @@ -7,10 +7,10 @@ #pragma once +#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" -#include "runtime/utilities/directory.h" #include diff --git a/unit_tests/os_interface/debug_settings_manager_tests.cpp b/unit_tests/os_interface/debug_settings_manager_tests.cpp index 3814a89933..75b0376dc2 100644 --- a/unit_tests/os_interface/debug_settings_manager_tests.cpp +++ b/unit_tests/os_interface/debug_settings_manager_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/utilities/base_object_utils.h" #include "core/utilities/debug_file_reader.h" #include "runtime/os_interface/ocl_reg_path.h" #include "unit_tests/fixtures/buffer_fixture.h" @@ -16,7 +17,6 @@ #include "unit_tests/mocks/mock_mdi.h" #include "unit_tests/mocks/mock_program.h" #include "unit_tests/os_interface/debug_settings_manager_fixture.h" -#include "unit_tests/utilities/base_object_utils.h" #include #include 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 309d067dd8..f8ea4be95d 100644 --- a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp @@ -9,6 +9,7 @@ #include "core/helpers/aligned_memory.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/gmm_helper/gmm_helper.h" #include "runtime/helpers/array_count.h" @@ -27,7 +28,6 @@ #include "unit_tests/mocks/mock_memory_manager.h" #include "unit_tests/mocks/mock_os_context.h" #include "unit_tests/os_interface/windows/mock_wddm_allocation.h" -#include "unit_tests/utilities/base_object_utils.h" using namespace NEO; using namespace ::testing; diff --git a/unit_tests/perf_tests/perf_test_utils.h b/unit_tests/perf_tests/perf_test_utils.h index e75cacac4f..6a01424ab9 100644 --- a/unit_tests/perf_tests/perf_test_utils.h +++ b/unit_tests/perf_tests/perf_test_utils.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/utilities/timer_util.h" +#include "core/utilities/timer_util.h" #include "gtest/gtest.h" diff --git a/unit_tests/preamble/preamble_tests.cpp b/unit_tests/preamble/preamble_tests.cpp index fbf5011b53..27927f3be2 100644 --- a/unit_tests/preamble/preamble_tests.cpp +++ b/unit_tests/preamble/preamble_tests.cpp @@ -6,10 +6,10 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/utilities/stackvec.h" #include "runtime/command_stream/preemption.h" #include "runtime/helpers/flat_batch_buffer_helper_hw.h" #include "runtime/helpers/preamble.h" -#include "runtime/utilities/stackvec.h" #include "test.h" #include "unit_tests/helpers/hw_parse.h" #include "unit_tests/mocks/mock_device.h" diff --git a/unit_tests/profiling/profiling_tests.cpp b/unit_tests/profiling/profiling_tests.cpp index 0af6aebff7..79adb7c1f2 100644 --- a/unit_tests/profiling/profiling_tests.cpp +++ b/unit_tests/profiling/profiling_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/command_queue/command_queue_hw.h" #include "runtime/command_queue/enqueue_common.h" #include "runtime/command_queue/enqueue_kernel.h" @@ -25,7 +26,6 @@ #include "unit_tests/mocks/mock_kernel.h" #include "unit_tests/mocks/mock_program.h" #include "unit_tests/os_interface/mock_performance_counters.h" -#include "unit_tests/utilities/base_object_utils.h" namespace NEO { diff --git a/unit_tests/program/program_tests.cpp b/unit_tests/program/program_tests.cpp index ebff6eaf96..8cdf60cdf4 100644 --- a/unit_tests/program/program_tests.cpp +++ b/unit_tests/program/program_tests.cpp @@ -11,6 +11,7 @@ #include "core/helpers/ptr_math.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" #include "elf/reader.h" #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/compiler_interface/compiler_options.h" @@ -35,7 +36,6 @@ #include "unit_tests/mocks/mock_program.h" #include "unit_tests/program/program_from_binary.h" #include "unit_tests/program/program_with_source.h" -#include "unit_tests/utilities/base_object_utils.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/unit_tests/sampler/sampler_set_arg_tests.cpp b/unit_tests/sampler/sampler_set_arg_tests.cpp index 02d56b0919..bddf31a87a 100644 --- a/unit_tests/sampler/sampler_set_arg_tests.cpp +++ b/unit_tests/sampler/sampler_set_arg_tests.cpp @@ -6,10 +6,10 @@ */ #include "core/helpers/ptr_math.h" +#include "core/utilities/numeric.h" #include "runtime/helpers/sampler_helpers.h" #include "runtime/kernel/kernel.h" #include "runtime/sampler/sampler.h" -#include "runtime/utilities/numeric.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" #include "unit_tests/fixtures/image_fixture.h" diff --git a/unit_tests/scenarios/blocked_enqueue_barrier_scenario_tests.cpp b/unit_tests/scenarios/blocked_enqueue_barrier_scenario_tests.cpp index 7d516b623e..823c3a0340 100644 --- a/unit_tests/scenarios/blocked_enqueue_barrier_scenario_tests.cpp +++ b/unit_tests/scenarios/blocked_enqueue_barrier_scenario_tests.cpp @@ -5,13 +5,13 @@ * */ +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/event/user_event.h" #include "runtime/helpers/options.h" #include "test.h" #include "unit_tests/fixtures/scenario_test_fixture.h" #include "unit_tests/mocks/mock_command_queue.h" #include "unit_tests/mocks/mock_kernel.h" -#include "unit_tests/utilities/base_object_utils.h" #include "gtest/gtest.h" diff --git a/unit_tests/scheduler/scheduler_kernel_tests.cpp b/unit_tests/scheduler/scheduler_kernel_tests.cpp index 37270cd374..c4e41c47ba 100644 --- a/unit_tests/scheduler/scheduler_kernel_tests.cpp +++ b/unit_tests/scheduler/scheduler_kernel_tests.cpp @@ -6,6 +6,7 @@ */ #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/utilities/base_object_utils.h" #include "runtime/helpers/options.h" #include "runtime/scheduler/scheduler_kernel.h" #include "test.h" @@ -15,7 +16,6 @@ #include "unit_tests/mocks/mock_graphics_allocation.h" #include "unit_tests/mocks/mock_ostime.h" #include "unit_tests/mocks/mock_program.h" -#include "unit_tests/utilities/base_object_utils.h" #include "gtest/gtest.h" diff --git a/unit_tests/utilities/CMakeLists.txt b/unit_tests/utilities/CMakeLists.txt index b697740a10..65b00c9049 100644 --- a/unit_tests/utilities/CMakeLists.txt +++ b/unit_tests/utilities/CMakeLists.txt @@ -5,22 +5,12 @@ # set(IGDRCL_SRCS_tests_utilities - ${CMAKE_CURRENT_SOURCE_DIR}/base_object_utils.h ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/containers_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/containers_tests_helpers ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/debug_file_reader_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debug_file_reader_tests.inl ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/destructor_counted.h - ${CMAKE_CURRENT_SOURCE_DIR}/directory_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/heap_allocator_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/numeric_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/perf_profiler.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/reference_tracked_object_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tag_allocator_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/timer_util_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/vec_tests.cpp ) get_property(NEO_CORE_UTILITIES_TESTS GLOBAL PROPERTY NEO_CORE_UTILITIES_TESTS)