diff --git a/core/os_interface/windows/CMakeLists.txt b/core/os_interface/windows/CMakeLists.txt index 6dd914559b..ad9fcb9eb0 100644 --- a/core/os_interface/windows/CMakeLists.txt +++ b/core/os_interface/windows/CMakeLists.txt @@ -14,8 +14,11 @@ set(NEO_CORE_OS_INTERFACE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/debug_registry_reader.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debug_registry_reader.h + ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/kmdaf_listener${KMDAF_FILE_SUFFIX}.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kmdaf_listener.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_inc.h ${CMAKE_CURRENT_SOURCE_DIR}/os_library_win.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_library_win.h ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_win.cpp @@ -25,6 +28,7 @@ set(NEO_CORE_OS_INTERFACE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/page_table_manager_functions.cpp ${CMAKE_CURRENT_SOURCE_DIR}/print.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sys_calls.h + ${CMAKE_CURRENT_SOURCE_DIR}/thk_wrapper.h ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_engine_mapper.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_engine_mapper.h ${CMAKE_CURRENT_SOURCE_DIR}/windows_defs.h diff --git a/runtime/os_interface/windows/gdi_interface.cpp b/core/os_interface/windows/gdi_interface.cpp similarity index 99% rename from runtime/os_interface/windows/gdi_interface.cpp rename to core/os_interface/windows/gdi_interface.cpp index b223f87531..2bd3ac62da 100644 --- a/runtime/os_interface/windows/gdi_interface.cpp +++ b/core/os_interface/windows/gdi_interface.cpp @@ -5,7 +5,7 @@ * */ -#include "gdi_interface.h" +#include "core/os_interface/windows/gdi_interface.h" #include "core/debug_settings/debug_settings_manager.h" diff --git a/runtime/os_interface/windows/gdi_interface.h b/core/os_interface/windows/gdi_interface.h similarity index 96% rename from runtime/os_interface/windows/gdi_interface.h rename to core/os_interface/windows/gdi_interface.h index 8047124815..9e2e7fb99c 100644 --- a/runtime/os_interface/windows/gdi_interface.h +++ b/core/os_interface/windows/gdi_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,9 +7,9 @@ #pragma once #include "core/helpers/options.h" +#include "core/os_interface/windows/os_inc.h" #include "core/os_interface/windows/os_library_win.h" -#include "runtime/os_interface/windows/os_inc.h" -#include "runtime/os_interface/windows/thk_wrapper.h" +#include "core/os_interface/windows/thk_wrapper.h" #include diff --git a/runtime/os_interface/windows/os_inc.h b/core/os_interface/windows/os_inc.h similarity index 86% rename from runtime/os_interface/windows/os_inc.h rename to core/os_interface/windows/os_inc.h index b401aae615..030e7eaa71 100644 --- a/runtime/os_interface/windows/os_inc.h +++ b/core/os_interface/windows/os_inc.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/runtime/os_interface/windows/thk_wrapper.h b/core/os_interface/windows/thk_wrapper.h similarity index 99% rename from runtime/os_interface/windows/thk_wrapper.h rename to core/os_interface/windows/thk_wrapper.h index de6e09eae3..d0595950b5 100644 --- a/runtime/os_interface/windows/thk_wrapper.h +++ b/core/os_interface/windows/thk_wrapper.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/utilities/api_intercept.h" +#include "core/utilities/api_intercept.h" #include diff --git a/core/unit_tests/os_interface/windows/CMakeLists.txt b/core/unit_tests/os_interface/windows/CMakeLists.txt index 32fc8081c9..612df00862 100644 --- a/core/unit_tests/os_interface/windows/CMakeLists.txt +++ b/core/unit_tests/os_interface/windows/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2019 Intel Corporation +# Copyright (C) 2019-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -7,6 +7,8 @@ if(WIN32) set(NEO_CORE_tests_os_interface_windows ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/mock_gdi_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/wddm_preemption_tests.cpp ) set_property(GLOBAL PROPERTY NEO_CORE_tests_os_interface_windows ${NEO_CORE_tests_os_interface_windows}) diff --git a/unit_tests/os_interface/windows/gdi_interface_tests.cpp b/core/unit_tests/os_interface/windows/gdi_interface_tests.cpp similarity index 91% rename from unit_tests/os_interface/windows/gdi_interface_tests.cpp rename to core/unit_tests/os_interface/windows/gdi_interface_tests.cpp index 3fb7697f01..7d0a971635 100644 --- a/unit_tests/os_interface/windows/gdi_interface_tests.cpp +++ b/core/unit_tests/os_interface/windows/gdi_interface_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #if defined(_WIN32) #include "core/os_interface/os_library.h" +#include "core/os_interface/windows/gdi_interface.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/os_interface/windows/gdi_interface.h" #include "test.h" #include "gtest/gtest.h" diff --git a/unit_tests/os_interface/windows/mock_gdi_interface.h b/core/unit_tests/os_interface/windows/mock_gdi_interface.h similarity index 98% rename from unit_tests/os_interface/windows/mock_gdi_interface.h rename to core/unit_tests/os_interface/windows/mock_gdi_interface.h index 7b3532542c..da34a93a40 100644 --- a/unit_tests/os_interface/windows/mock_gdi_interface.h +++ b/core/unit_tests/os_interface/windows/mock_gdi_interface.h @@ -1,12 +1,12 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once -#include "runtime/os_interface/windows/gdi_interface.h" +#include "core/os_interface/windows/gdi_interface.h" namespace NEO { diff --git a/core/unit_tests/utilities/CMakeLists.txt b/core/unit_tests/utilities/CMakeLists.txt index 2abdaf9928..34548c6ced 100644 --- a/core/unit_tests/utilities/CMakeLists.txt +++ b/core/unit_tests/utilities/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2019 Intel Corporation +# Copyright (C) 2019-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -16,6 +16,7 @@ set(NEO_CORE_UTILITIES_TESTS ${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}/spinlock_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/timer_util_tests.cpp diff --git a/unit_tests/utilities/perf_profiler.cpp b/core/unit_tests/utilities/perf_profiler.cpp similarity index 99% rename from unit_tests/utilities/perf_profiler.cpp rename to core/unit_tests/utilities/perf_profiler.cpp index 229eca0fd8..879706f7b0 100644 --- a/unit_tests/utilities/perf_profiler.cpp +++ b/core/unit_tests/utilities/perf_profiler.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/utilities/perf_profiler.h" +#include "core/utilities/perf_profiler.h" #include "test.h" diff --git a/core/utilities/CMakeLists.txt b/core/utilities/CMakeLists.txt index f368804d6d..98ad014b08 100644 --- a/core/utilities/CMakeLists.txt +++ b/core/utilities/CMakeLists.txt @@ -1,11 +1,12 @@ # -# Copyright (C) 2019 Intel Corporation +# Copyright (C) 2019-2020 Intel Corporation # # SPDX-License-Identifier: MIT # set(NEO_CORE_UTILITIES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/api_intercept.h ${CMAKE_CURRENT_SOURCE_DIR}/arrayref.h ${CMAKE_CURRENT_SOURCE_DIR}/clflush.h ${CMAKE_CURRENT_SOURCE_DIR}/const_stringref.h @@ -21,6 +22,8 @@ set(NEO_CORE_UTILITIES ${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}/spinlock.h diff --git a/runtime/utilities/api_intercept.h b/core/utilities/api_intercept.h similarity index 100% rename from runtime/utilities/api_intercept.h rename to core/utilities/api_intercept.h diff --git a/runtime/utilities/perf_profiler.cpp b/core/utilities/perf_profiler.cpp similarity index 98% rename from runtime/utilities/perf_profiler.cpp rename to core/utilities/perf_profiler.cpp index d73e699400..113e9dcb9c 100644 --- a/runtime/utilities/perf_profiler.cpp +++ b/core/utilities/perf_profiler.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/utilities/perf_profiler.h" +#include "core/utilities/perf_profiler.h" #include "core/utilities/stackvec.h" diff --git a/runtime/utilities/perf_profiler.h b/core/utilities/perf_profiler.h similarity index 98% rename from runtime/utilities/perf_profiler.h rename to core/utilities/perf_profiler.h index fae1a35779..cfc97d108b 100644 --- a/runtime/utilities/perf_profiler.h +++ b/core/utilities/perf_profiler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/runtime/api/api.cpp b/runtime/api/api.cpp index 30690d42a6..9430611521 100644 --- a/runtime/api/api.cpp +++ b/runtime/api/api.cpp @@ -14,6 +14,7 @@ #include "core/helpers/kernel_helpers.h" #include "core/helpers/options.h" #include "core/memory_manager/unified_memory_manager.h" +#include "core/utilities/api_intercept.h" #include "core/utilities/stackvec.h" #include "runtime/accelerators/intel_motion_estimation.h" #include "runtime/api/additional_extensions.h" @@ -44,7 +45,6 @@ #include "runtime/sharings/sharing_factory.h" #include "runtime/tracing/tracing_api.h" #include "runtime/tracing/tracing_notify.h" -#include "runtime/utilities/api_intercept.h" #include "CL/cl.h" #include "config.h" diff --git a/runtime/api/api_enter.h b/runtime/api/api_enter.h index 08a80f9416..a54b6fcea5 100644 --- a/runtime/api/api_enter.h +++ b/runtime/api/api_enter.h @@ -5,8 +5,8 @@ * */ +#include "core/utilities/perf_profiler.h" #include "runtime/utilities/logger.h" -#include "runtime/utilities/perf_profiler.h" #define API_ENTER(retValPointer) \ LoggerApiEnterWrapper::enabled()> ApiWrapperForSingleCall(__FUNCTION__, retValPointer) diff --git a/runtime/command_queue/command_queue.cpp b/runtime/command_queue/command_queue.cpp index 12c7ec8673..a4c9098316 100644 --- a/runtime/command_queue/command_queue.cpp +++ b/runtime/command_queue/command_queue.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -12,6 +12,7 @@ #include "core/helpers/options.h" #include "core/helpers/ptr_math.h" #include "core/helpers/string.h" +#include "core/utilities/api_intercept.h" #include "runtime/built_ins/builtins_dispatch_builder.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/context/context.h" @@ -32,7 +33,6 @@ #include "runtime/mem_obj/image.h" #include "runtime/memory_manager/internal_allocation_storage.h" #include "runtime/os_interface/os_context.h" -#include "runtime/utilities/api_intercept.h" #include "runtime/utilities/tag_allocator.h" #include "CL/cl_ext.h" diff --git a/runtime/os_interface/linux/drm_neo.h b/runtime/os_interface/linux/drm_neo.h index 2cc3904e77..3e5234525d 100644 --- a/runtime/os_interface/linux/drm_neo.h +++ b/runtime/os_interface/linux/drm_neo.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "core/helpers/basic_math.h" #include "core/os_interface/linux/engine_info.h" #include "core/os_interface/linux/memory_info.h" -#include "runtime/utilities/api_intercept.h" +#include "core/utilities/api_intercept.h" #include "drm/i915_drm.h" #include "engine_node.h" diff --git a/runtime/os_interface/windows/CMakeLists.txt b/runtime/os_interface/windows/CMakeLists.txt index 38e04e0eca..43263c957b 100644 --- a/runtime/os_interface/windows/CMakeLists.txt +++ b/runtime/os_interface/windows/CMakeLists.txt @@ -17,12 +17,9 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.cpp ${CMAKE_CURRENT_SOURCE_DIR}/driver_info.h ${CMAKE_CURRENT_SOURCE_DIR}/environment_variables.h - ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/ocl_reg_path.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_context_win.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_context_win.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_inc.h ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/os_metrics_library.cpp @@ -31,7 +28,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/os_time_win.h ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.cpp ${CMAKE_CURRENT_SOURCE_DIR}/performance_counters_win.h - ${CMAKE_CURRENT_SOURCE_DIR}/thk_wrapper.h ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_allocation.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_allocation.h ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_additional_context_flags.cpp diff --git a/runtime/os_interface/windows/api_win.cpp b/runtime/os_interface/windows/api_win.cpp index 4757d8ec17..3ee0bfe3c3 100644 --- a/runtime/os_interface/windows/api_win.cpp +++ b/runtime/os_interface/windows/api_win.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "core/utilities/api_intercept.h" #include "runtime/api/api.h" #include "runtime/api/dispatch.h" #include "runtime/command_queue/command_queue.h" @@ -16,7 +17,6 @@ #include "runtime/sharings/d3d/d3d_buffer.h" #include "runtime/sharings/d3d/d3d_surface.h" #include "runtime/sharings/d3d/d3d_texture.h" -#include "runtime/utilities/api_intercept.h" using namespace NEO; diff --git a/runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp b/runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp index dee47e3452..e1b81fa974 100644 --- a/runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp +++ b/runtime/os_interface/windows/gl/gl_arb_sync_event_os.cpp @@ -1,16 +1,16 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "core/os_interface/windows/gdi_interface.h" #include "public/cl_gl_private_intel.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/context/context.h" #include "runtime/helpers/timestamp_packet.h" #include "runtime/os_interface/os_interface.h" -#include "runtime/os_interface/windows/gdi_interface.h" #include "runtime/os_interface/windows/os_context_win.h" #include "runtime/os_interface/windows/os_interface.h" #include "runtime/os_interface/windows/wddm/wddm.h" diff --git a/runtime/os_interface/windows/wddm/wddm.cpp b/runtime/os_interface/windows/wddm/wddm.cpp index 3f81680fd8..6ab184e201 100644 --- a/runtime/os_interface/windows/wddm/wddm.cpp +++ b/runtime/os_interface/windows/wddm/wddm.cpp @@ -14,6 +14,7 @@ #include "core/gmm_helper/resource_info.h" #include "core/helpers/interlocked_max.h" #include "core/os_interface/windows/debug_registry_reader.h" +#include "core/os_interface/windows/gdi_interface.h" #include "core/os_interface/windows/kmdaf_listener.h" #include "core/os_interface/windows/sys_calls.h" #include "core/os_interface/windows/wddm_engine_mapper.h" @@ -24,7 +25,6 @@ #include "runtime/helpers/windows/gmm_callbacks.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/os_interface/hw_info_config.h" -#include "runtime/os_interface/windows/gdi_interface.h" #include "runtime/os_interface/windows/os_context_win.h" #include "runtime/os_interface/windows/wddm/wddm_interface.h" #include "runtime/os_interface/windows/wddm_allocation.h" diff --git a/runtime/os_interface/windows/wddm/wddm_interface.cpp b/runtime/os_interface/windows/wddm/wddm_interface.cpp index 4f125556fa..649b07b83e 100644 --- a/runtime/os_interface/windows/wddm/wddm_interface.cpp +++ b/runtime/os_interface/windows/wddm/wddm_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "runtime/os_interface/windows/wddm/wddm_interface.h" #include "core/memory_manager/memory_constants.h" -#include "runtime/os_interface/windows/gdi_interface.h" +#include "core/os_interface/windows/gdi_interface.h" #include "runtime/os_interface/windows/os_context_win.h" #include "runtime/os_interface/windows/wddm/wddm.h" diff --git a/runtime/os_interface/windows/wddm_device_command_stream.inl b/runtime/os_interface/windows/wddm_device_command_stream.inl index c84af9e995..e6f241a375 100644 --- a/runtime/os_interface/windows/wddm_device_command_stream.inl +++ b/runtime/os_interface/windows/wddm_device_command_stream.inl @@ -22,7 +22,7 @@ #include "runtime/os_interface/windows/wddm_device_command_stream.h" #pragma warning(pop) -#include "runtime/os_interface/windows/gdi_interface.h" +#include "core/os_interface/windows/gdi_interface.h" #include "runtime/os_interface/windows/os_context_win.h" #include "runtime/os_interface/windows/os_interface.h" #include "runtime/os_interface/windows/wddm_memory_manager.h" diff --git a/runtime/sharings/gl/cl_gl_api.cpp b/runtime/sharings/gl/cl_gl_api.cpp index 5b2540dc56..ab03e021f2 100644 --- a/runtime/sharings/gl/cl_gl_api.cpp +++ b/runtime/sharings/gl/cl_gl_api.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "core/utilities/api_intercept.h" #include "runtime/api/api.h" #include "runtime/command_queue/command_queue.h" #include "runtime/context/context.h" @@ -22,7 +23,6 @@ #include "runtime/sharings/gl/gl_sync_event.h" #include "runtime/sharings/gl/gl_texture.h" #include "runtime/tracing/tracing_notify.h" -#include "runtime/utilities/api_intercept.h" #include "CL/cl.h" #include "CL/cl_gl.h" diff --git a/runtime/sharings/va/cl_va_api.cpp b/runtime/sharings/va/cl_va_api.cpp index e5ce7391b0..a706464687 100644 --- a/runtime/sharings/va/cl_va_api.cpp +++ b/runtime/sharings/va/cl_va_api.cpp @@ -1,10 +1,11 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ +#include "core/utilities/api_intercept.h" #include "runtime/api/api.h" #include "runtime/command_queue/command_queue.h" #include "runtime/context/context.h" @@ -13,7 +14,6 @@ #include "runtime/platform/platform.h" #include "runtime/sharings/va/va_sharing.h" #include "runtime/sharings/va/va_surface.h" -#include "runtime/utilities/api_intercept.h" #include "CL/cl.h" diff --git a/runtime/utilities/CMakeLists.txt b/runtime/utilities/CMakeLists.txt index a10de85fe8..5a00b965f1 100644 --- a/runtime/utilities/CMakeLists.txt +++ b/runtime/utilities/CMakeLists.txt @@ -1,16 +1,13 @@ # -# Copyright (C) 2018-2019 Intel Corporation +# Copyright (C) 2018-2020 Intel Corporation # # SPDX-License-Identifier: MIT # set(RUNTIME_SRCS_UTILITIES_BASE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/api_intercept.h ${CMAKE_CURRENT_SOURCE_DIR}/logger.cpp ${CMAKE_CURRENT_SOURCE_DIR}/logger.h - ${CMAKE_CURRENT_SOURCE_DIR}/perf_profiler.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/perf_profiler.h ${CMAKE_CURRENT_SOURCE_DIR}/tag_allocator.h ) diff --git a/unit_tests/gen12lp/windows/wddm_tests_gen12lp.cpp b/unit_tests/gen12lp/windows/wddm_tests_gen12lp.cpp index 9b9be58a7a..d224b84706 100644 --- a/unit_tests/gen12lp/windows/wddm_tests_gen12lp.cpp +++ b/unit_tests/gen12lp/windows/wddm_tests_gen12lp.cpp @@ -7,7 +7,7 @@ #include "core/command_stream/preemption.h" #include "core/execution_environment/root_device_environment.h" -#include "runtime/os_interface/windows/gdi_interface.h" +#include "core/os_interface/windows/gdi_interface.h" #include "test.h" #include "unit_tests/mocks/mock_execution_environment.h" #include "unit_tests/mocks/mock_wddm.h" diff --git a/unit_tests/mocks/mock_wddm.cpp b/unit_tests/mocks/mock_wddm.cpp index bc79e151a3..2fd407d34f 100644 --- a/unit_tests/mocks/mock_wddm.cpp +++ b/unit_tests/mocks/mock_wddm.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,7 +9,7 @@ #include "core/execution_environment/root_device_environment.h" #include "core/helpers/aligned_memory.h" -#include "runtime/os_interface/windows/gdi_interface.h" +#include "core/os_interface/windows/gdi_interface.h" #include "runtime/os_interface/windows/wddm_allocation.h" #include "unit_tests/mock_gdi/mock_gdi.h" #include "unit_tests/mocks/mock_wddm_residency_allocations_container.h" diff --git a/unit_tests/os_interface/windows/CMakeLists.txt b/unit_tests/os_interface/windows/CMakeLists.txt index cc4bd55ae1..5d02d97aca 100644 --- a/unit_tests/os_interface/windows/CMakeLists.txt +++ b/unit_tests/os_interface/windows/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2019 Intel Corporation +# Copyright (C) 2018-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -12,12 +12,10 @@ set(IGDRCL_SRCS_tests_os_interface_windows ${CMAKE_CURRENT_SOURCE_DIR}/driver_info_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/file_logger_win_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gdi_dll_fixture.h - ${CMAKE_CURRENT_SOURCE_DIR}/gdi_interface_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gmm_memory_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_win_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_win_tests.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_environment_variables.h - ${CMAKE_CURRENT_SOURCE_DIR}/mock_gdi_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_kmdaf_listener.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_os_time_win.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters_win.cpp diff --git a/unit_tests/os_interface/windows/device_command_stream_tests.cpp b/unit_tests/os_interface/windows/device_command_stream_tests.cpp index a7d5a08f79..38b2e7c96b 100644 --- a/unit_tests/os_interface/windows/device_command_stream_tests.cpp +++ b/unit_tests/os_interface/windows/device_command_stream_tests.cpp @@ -10,6 +10,7 @@ #include "core/helpers/hw_cmds.h" #include "core/helpers/options.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" +#include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" #include "runtime/command_stream/aub_command_stream_receiver.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/command_stream/command_stream_receiver_with_aub_dump.h" @@ -41,7 +42,6 @@ #include "unit_tests/mocks/mock_program.h" #include "unit_tests/mocks/mock_submissions_aggregator.h" #include "unit_tests/mocks/mock_wddm_interface23.h" -#include "unit_tests/os_interface/windows/mock_gdi_interface.h" #include "unit_tests/os_interface/windows/mock_wddm_memory_manager.h" #include "unit_tests/os_interface/windows/wddm_fixture.h" diff --git a/unit_tests/os_interface/windows/wddm23_tests.cpp b/unit_tests/os_interface/windows/wddm23_tests.cpp index a3615d553c..b9d1a5c386 100644 --- a/unit_tests/os_interface/windows/wddm23_tests.cpp +++ b/unit_tests/os_interface/windows/wddm23_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,9 +8,9 @@ #include "core/command_stream/preemption.h" #include "core/helpers/hw_helper.h" #include "core/memory_manager/memory_constants.h" +#include "core/os_interface/windows/gdi_interface.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/os_interface/windows/gdi_interface.h" #include "runtime/os_interface/windows/os_context_win.h" #include "runtime/os_interface/windows/os_interface.h" #include "runtime/platform/platform.h" diff --git a/unit_tests/os_interface/windows/wddm_fixture.h b/unit_tests/os_interface/windows/wddm_fixture.h index b412fc4b38..f241102911 100644 --- a/unit_tests/os_interface/windows/wddm_fixture.h +++ b/unit_tests/os_interface/windows/wddm_fixture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -10,8 +10,9 @@ #include "core/command_stream/preemption.h" #include "core/execution_environment/root_device_environment.h" #include "core/helpers/hw_helper.h" +#include "core/os_interface/windows/gdi_interface.h" +#include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/os_interface/windows/gdi_interface.h" #include "runtime/os_interface/windows/os_context_win.h" #include "runtime/os_interface/windows/os_interface.h" #include "runtime/os_interface/windows/wddm_memory_operations_handler.h" @@ -21,7 +22,6 @@ #include "unit_tests/mocks/mock_wddm_interface20.h" #include "unit_tests/mocks/mock_wddm_residency_allocations_container.h" #include "unit_tests/os_interface/windows/gdi_dll_fixture.h" -#include "unit_tests/os_interface/windows/mock_gdi_interface.h" #include "mock_gmm_memory.h" diff --git a/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp b/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp index 2d141d6262..3ee620c54e 100644 --- a/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,6 +8,7 @@ #include "core/command_stream/preemption.h" #include "core/execution_environment/root_device_environment.h" #include "core/gmm_helper/gmm_helper.h" +#include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" #include "runtime/gmm_helper/gmm.h" #include "runtime/memory_manager/memory_manager.h" #include "runtime/os_interface/windows/wddm/wddm.h" @@ -15,7 +16,6 @@ #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/mock_gdi/mock_gdi.h" -#include "unit_tests/os_interface/windows/mock_gdi_interface.h" #include "unit_tests/os_interface/windows/mock_kmdaf_listener.h" #include "unit_tests/os_interface/windows/mock_wddm_allocation.h" diff --git a/unit_tests/os_interface/windows/wddm_memory_manager_tests.h b/unit_tests/os_interface/windows/wddm_memory_manager_tests.h index d155f7aea9..7524ad66c4 100644 --- a/unit_tests/os_interface/windows/wddm_memory_manager_tests.h +++ b/unit_tests/os_interface/windows/wddm_memory_manager_tests.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,6 +7,7 @@ #pragma once +#include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" #include "runtime/os_interface/windows/os_interface.h" #include "runtime/os_interface/windows/wddm_memory_operations_handler.h" #include "test.h" @@ -15,7 +16,6 @@ #include "unit_tests/mocks/mock_gmm.h" #include "unit_tests/mocks/mock_gmm_page_table_mngr.h" #include "unit_tests/mocks/mock_wddm_residency_allocations_container.h" -#include "unit_tests/os_interface/windows/mock_gdi_interface.h" #include "unit_tests/os_interface/windows/mock_wddm_memory_manager.h" #include "unit_tests/os_interface/windows/wddm_fixture.h" diff --git a/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp b/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp index 38f38abb8c..2c94860ddb 100644 --- a/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,6 +9,7 @@ #include "core/execution_environment/root_device_environment.h" #include "core/helpers/hw_helper.h" #include "core/memory_manager/memory_operations_handler.h" +#include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/os_interface/os_context.h" #include "runtime/os_interface/os_interface.h" @@ -22,7 +23,6 @@ #include "unit_tests/mocks/mock_allocation_properties.h" #include "unit_tests/mocks/mock_execution_environment.h" #include "unit_tests/mocks/mock_wddm.h" -#include "unit_tests/os_interface/windows/mock_gdi_interface.h" #include "unit_tests/os_interface/windows/mock_wddm_allocation.h" #include "unit_tests/os_interface/windows/mock_wddm_memory_manager.h" diff --git a/unit_tests/utilities/CMakeLists.txt b/unit_tests/utilities/CMakeLists.txt index bee8fbe5bf..8a2c9166b4 100644 --- a/unit_tests/utilities/CMakeLists.txt +++ b/unit_tests/utilities/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2017-2019 Intel Corporation +# Copyright (C) 2017-2020 Intel Corporation # # SPDX-License-Identifier: MIT # @@ -11,7 +11,6 @@ set(IGDRCL_SRCS_tests_utilities ${CMAKE_CURRENT_SOURCE_DIR}/debug_settings_reader_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/file_logger_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/file_logger_tests.h - ${CMAKE_CURRENT_SOURCE_DIR}/perf_profiler.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tag_allocator_tests.cpp )