diff --git a/core/gen11/enable_gen11.cpp b/core/gen11/enable_gen11.cpp index 3ab0e061e2..77d0365dbc 100644 --- a/core/gen11/enable_gen11.cpp +++ b/core/gen11/enable_gen11.cpp @@ -6,8 +6,8 @@ */ #include "core/gen11/hw_cmds.h" +#include "core/os_interface/hw_info_config.h" #include "runtime/helpers/enable_product.inl" -#include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/core/gen11/enable_hw_info_config_gen11.cpp b/core/gen11/enable_hw_info_config_gen11.cpp index a835dd7a87..74b039c4ec 100644 --- a/core/gen11/enable_hw_info_config_gen11.cpp +++ b/core/gen11/enable_hw_info_config_gen11.cpp @@ -6,7 +6,7 @@ */ #include "core/gen11/hw_cmds.h" -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" namespace NEO { diff --git a/core/gen12lp/enable_gen12lp.cpp b/core/gen12lp/enable_gen12lp.cpp index a847d7d321..17e7e31521 100644 --- a/core/gen12lp/enable_gen12lp.cpp +++ b/core/gen12lp/enable_gen12lp.cpp @@ -6,8 +6,8 @@ */ #include "core/gen12lp/hw_cmds.h" +#include "core/os_interface/hw_info_config.h" #include "runtime/helpers/enable_product.inl" -#include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/core/gen12lp/enable_hw_info_config_gen12lp.cpp b/core/gen12lp/enable_hw_info_config_gen12lp.cpp index 5b74bf79fe..6a581bbaf0 100644 --- a/core/gen12lp/enable_hw_info_config_gen12lp.cpp +++ b/core/gen12lp/enable_hw_info_config_gen12lp.cpp @@ -6,7 +6,7 @@ */ #include "core/gen12lp/hw_cmds.h" -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" namespace NEO { diff --git a/core/gen8/enable_gen8.cpp b/core/gen8/enable_gen8.cpp index 9e0757fd4e..8758599803 100644 --- a/core/gen8/enable_gen8.cpp +++ b/core/gen8/enable_gen8.cpp @@ -6,8 +6,8 @@ */ #include "core/gen8/hw_cmds.h" +#include "core/os_interface/hw_info_config.h" #include "runtime/helpers/enable_product.inl" -#include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/core/gen8/enable_hw_info_config_gen8.cpp b/core/gen8/enable_hw_info_config_gen8.cpp index f0e97b9e25..28450991f3 100644 --- a/core/gen8/enable_hw_info_config_gen8.cpp +++ b/core/gen8/enable_hw_info_config_gen8.cpp @@ -6,7 +6,7 @@ */ #include "core/gen8/hw_cmds.h" -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" namespace NEO { diff --git a/core/gen9/enable_gen9.cpp b/core/gen9/enable_gen9.cpp index 18150983eb..20c3159452 100644 --- a/core/gen9/enable_gen9.cpp +++ b/core/gen9/enable_gen9.cpp @@ -6,8 +6,8 @@ */ #include "core/gen9/hw_cmds.h" +#include "core/os_interface/hw_info_config.h" #include "runtime/helpers/enable_product.inl" -#include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/core/gen9/enable_hw_info_config_gen9.cpp b/core/gen9/enable_hw_info_config_gen9.cpp index fa8c121934..4f621426a8 100644 --- a/core/gen9/enable_hw_info_config_gen9.cpp +++ b/core/gen9/enable_hw_info_config_gen9.cpp @@ -6,7 +6,7 @@ */ #include "core/gen9/hw_cmds.h" -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" namespace NEO { diff --git a/core/os_interface/CMakeLists.txt b/core/os_interface/CMakeLists.txt index 643f1b8ab7..1fa1a1e816 100644 --- a/core/os_interface/CMakeLists.txt +++ b/core/os_interface/CMakeLists.txt @@ -8,6 +8,9 @@ set(NEO_CORE_OS_INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler.cpp ${CMAKE_CURRENT_SOURCE_DIR}/aub_memory_operations_handler.h + ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.h + ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.inl + ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_bdw_plus.inl ${CMAKE_CURRENT_SOURCE_DIR}/os_context.h ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/os_library.h diff --git a/runtime/os_interface/hw_info_config.h b/core/os_interface/hw_info_config.h similarity index 100% rename from runtime/os_interface/hw_info_config.h rename to core/os_interface/hw_info_config.h diff --git a/runtime/os_interface/hw_info_config.inl b/core/os_interface/hw_info_config.inl similarity index 69% rename from runtime/os_interface/hw_info_config.inl rename to core/os_interface/hw_info_config.inl index c70f1a7fbd..aeaa7b07c6 100644 --- a/runtime/os_interface/hw_info_config.inl +++ b/core/os_interface/hw_info_config.inl @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/os_interface/hw_info_config_bdw_plus.inl b/core/os_interface/hw_info_config_bdw_plus.inl similarity index 95% rename from runtime/os_interface/hw_info_config_bdw_plus.inl rename to core/os_interface/hw_info_config_bdw_plus.inl index f9b17e449f..dfee59561e 100644 --- a/runtime/os_interface/hw_info_config_bdw_plus.inl +++ b/core/os_interface/hw_info_config_bdw_plus.inl @@ -5,7 +5,7 @@ * */ -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" namespace NEO { template diff --git a/core/os_interface/windows/CMakeLists.txt b/core/os_interface/windows/CMakeLists.txt index a93fed47a4..f26f5fd2c5 100644 --- a/core/os_interface/windows/CMakeLists.txt +++ b/core/os_interface/windows/CMakeLists.txt @@ -14,6 +14,8 @@ 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}/deferrable_deletion_win.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion_win.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 @@ -25,6 +27,13 @@ set(NEO_CORE_OS_INTERFACE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_win.h ${CMAKE_CURRENT_SOURCE_DIR}/os_thread_win.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_thread_win.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_time_win.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_time_win.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_context_win.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_context_win.h + ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.h + ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_additional_context_flags.cpp ${CMAKE_CURRENT_SOURCE_DIR}/page_table_manager_functions.cpp ${CMAKE_CURRENT_SOURCE_DIR}/print.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sys_calls.h @@ -35,6 +44,18 @@ set(NEO_CORE_OS_INTERFACE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/wddm_engine_mapper.h ${CMAKE_CURRENT_SOURCE_DIR}/windows_defs.h ${CMAKE_CURRENT_SOURCE_DIR}/windows_wrapper.h + ${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_allocations_container.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_allocations_container.h + ${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_controller.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_controller.h + ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_operations_handler.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_operations_handler.h + ${CMAKE_CURRENT_SOURCE_DIR}/windows_inc.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.h + ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm_interface.h + ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm_interface.cpp ) if(WIN32) diff --git a/runtime/os_interface/windows/deferrable_deletion_win.cpp b/core/os_interface/windows/deferrable_deletion_win.cpp similarity index 87% rename from runtime/os_interface/windows/deferrable_deletion_win.cpp rename to core/os_interface/windows/deferrable_deletion_win.cpp index 9e5a31b826..a3ddcbfee1 100644 --- a/runtime/os_interface/windows/deferrable_deletion_win.cpp +++ b/core/os_interface/windows/deferrable_deletion_win.cpp @@ -1,13 +1,13 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/deferrable_deletion_win.h" +#include "core/os_interface/windows/deferrable_deletion_win.h" -#include "runtime/os_interface/windows/wddm/wddm.h" +#include "core/os_interface/windows/wddm/wddm.h" namespace NEO { diff --git a/runtime/os_interface/windows/deferrable_deletion_win.h b/core/os_interface/windows/deferrable_deletion_win.h similarity index 100% rename from runtime/os_interface/windows/deferrable_deletion_win.h rename to core/os_interface/windows/deferrable_deletion_win.h diff --git a/runtime/os_interface/windows/hw_info_config.cpp b/core/os_interface/windows/hw_info_config.cpp similarity index 96% rename from runtime/os_interface/windows/hw_info_config.cpp rename to core/os_interface/windows/hw_info_config.cpp index 6994baec35..ccc38e12ed 100644 --- a/runtime/os_interface/windows/hw_info_config.cpp +++ b/core/os_interface/windows/hw_info_config.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" #include "core/command_stream/preemption.h" #include "core/debug_settings/debug_settings_manager.h" diff --git a/runtime/os_interface/windows/os_context_win.cpp b/core/os_interface/windows/os_context_win.cpp similarity index 85% rename from runtime/os_interface/windows/os_context_win.cpp rename to core/os_interface/windows/os_context_win.cpp index 6540057858..0f88b4e678 100644 --- a/runtime/os_interface/windows/os_context_win.cpp +++ b/core/os_interface/windows/os_context_win.cpp @@ -1,15 +1,15 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/os_context_win.h" +#include "core/os_interface/windows/os_context_win.h" -#include "runtime/os_interface/windows/os_interface.h" -#include "runtime/os_interface/windows/wddm/wddm.h" -#include "runtime/os_interface/windows/wddm/wddm_interface.h" +#include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm/wddm.h" +#include "core/os_interface/windows/wddm/wddm_interface.h" namespace NEO { diff --git a/runtime/os_interface/windows/os_context_win.h b/core/os_interface/windows/os_context_win.h similarity index 95% rename from runtime/os_interface/windows/os_context_win.h rename to core/os_interface/windows/os_context_win.h index 06a861f247..b0a8b53bda 100644 --- a/runtime/os_interface/windows/os_context_win.h +++ b/core/os_interface/windows/os_context_win.h @@ -7,7 +7,7 @@ #pragma once #include "core/os_interface/os_context.h" -#include "runtime/os_interface/windows/wddm_residency_controller.h" +#include "core/os_interface/windows/wddm_residency_controller.h" namespace NEO { diff --git a/runtime/os_interface/windows/os_interface.cpp b/core/os_interface/windows/os_interface.cpp similarity index 94% rename from runtime/os_interface/windows/os_interface.cpp rename to core/os_interface/windows/os_interface.cpp index e28efa9e1e..4a311e79f1 100644 --- a/runtime/os_interface/windows/os_interface.cpp +++ b/core/os_interface/windows/os_interface.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "os_interface.h" #include "core/os_interface/windows/sys_calls.h" -#include "runtime/os_interface/windows/wddm/wddm.h" +#include "core/os_interface/windows/wddm/wddm.h" namespace NEO { diff --git a/runtime/os_interface/windows/os_interface.h b/core/os_interface/windows/os_interface.h similarity index 95% rename from runtime/os_interface/windows/os_interface.h rename to core/os_interface/windows/os_interface.h index d31ef3ebac..fb2a67894f 100644 --- a/runtime/os_interface/windows/os_interface.h +++ b/core/os_interface/windows/os_interface.h @@ -8,8 +8,8 @@ #pragma once #include "core/os_interface/os_interface.h" +#include "core/os_interface/windows/wddm/wddm.h" #include "core/os_interface/windows/windows_wrapper.h" -#include "runtime/os_interface/windows/wddm/wddm.h" #include "profileapi.h" #include "umKmInc/sharedata.h" diff --git a/runtime/os_interface/windows/os_time_win.cpp b/core/os_interface/windows/os_time_win.cpp similarity index 93% rename from runtime/os_interface/windows/os_time_win.cpp rename to core/os_interface/windows/os_time_win.cpp index b446881210..3125ac9afa 100644 --- a/runtime/os_interface/windows/os_time_win.cpp +++ b/core/os_interface/windows/os_time_win.cpp @@ -1,14 +1,14 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/os_time_win.h" +#include "core/os_interface/windows/os_time_win.h" -#include "runtime/os_interface/windows/os_interface.h" -#include "runtime/os_interface/windows/wddm/wddm.h" +#include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm/wddm.h" #include diff --git a/runtime/os_interface/windows/os_time_win.h b/core/os_interface/windows/os_time_win.h similarity index 100% rename from runtime/os_interface/windows/os_time_win.h rename to core/os_interface/windows/os_time_win.h diff --git a/runtime/os_interface/windows/wddm/wddm.cpp b/core/os_interface/windows/wddm/wddm.cpp similarity index 99% rename from runtime/os_interface/windows/wddm/wddm.cpp rename to core/os_interface/windows/wddm/wddm.cpp index da2b1a41b9..534b89a9b6 100644 --- a/runtime/os_interface/windows/wddm/wddm.cpp +++ b/core/os_interface/windows/wddm/wddm.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/os_interface/windows/wddm/wddm.h" +#include "core/os_interface/windows/wddm/wddm.h" #include "core/command_stream/preemption.h" #include "core/execution_environment/root_device_environment.h" @@ -15,18 +15,18 @@ #include "core/gmm_helper/resource_info.h" #include "core/helpers/interlocked_max.h" #include "core/helpers/windows/gmm_callbacks.h" +#include "core/os_interface/hw_info_config.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/os_context_win.h" #include "core/os_interface/windows/sys_calls.h" +#include "core/os_interface/windows/wddm/wddm_interface.h" #include "core/os_interface/windows/wddm_allocation.h" #include "core/os_interface/windows/wddm_engine_mapper.h" +#include "core/os_interface/windows/wddm_residency_allocations_container.h" #include "core/sku_info/operations/windows/sku_info_receiver.h" #include "core/utilities/stackvec.h" -#include "runtime/os_interface/hw_info_config.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_residency_allocations_container.h" #include "gmm_memory.h" diff --git a/runtime/os_interface/windows/wddm/wddm.h b/core/os_interface/windows/wddm/wddm.h similarity index 100% rename from runtime/os_interface/windows/wddm/wddm.h rename to core/os_interface/windows/wddm/wddm.h diff --git a/runtime/os_interface/windows/wddm/wddm_calls.cpp b/core/os_interface/windows/wddm/wddm_calls.cpp similarity index 80% rename from runtime/os_interface/windows/wddm/wddm_calls.cpp rename to core/os_interface/windows/wddm/wddm_calls.cpp index e0c8b5b0fc..24d6ce797c 100644 --- a/runtime/os_interface/windows/wddm/wddm_calls.cpp +++ b/core/os_interface/windows/wddm/wddm_calls.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/wddm/wddm.h" +#include "core/os_interface/windows/wddm/wddm.h" #include diff --git a/runtime/os_interface/windows/wddm/wddm_create.cpp b/core/os_interface/windows/wddm/wddm_create.cpp similarity index 67% rename from runtime/os_interface/windows/wddm/wddm_create.cpp rename to core/os_interface/windows/wddm/wddm_create.cpp index 05011090fe..0973c4f2f1 100644 --- a/runtime/os_interface/windows/wddm/wddm_create.cpp +++ b/core/os_interface/windows/wddm/wddm_create.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/wddm/wddm.h" +#include "core/os_interface/windows/wddm/wddm.h" namespace NEO { Wddm *Wddm::createWddm(RootDeviceEnvironment &rootDeviceEnvironment) { diff --git a/runtime/os_interface/windows/wddm/wddm_interface.cpp b/core/os_interface/windows/wddm/wddm_interface.cpp similarity index 97% rename from runtime/os_interface/windows/wddm/wddm_interface.cpp rename to core/os_interface/windows/wddm/wddm_interface.cpp index 649b07b83e..f37c21382b 100644 --- a/runtime/os_interface/windows/wddm/wddm_interface.cpp +++ b/core/os_interface/windows/wddm/wddm_interface.cpp @@ -5,12 +5,12 @@ * */ -#include "runtime/os_interface/windows/wddm/wddm_interface.h" +#include "core/os_interface/windows/wddm/wddm_interface.h" #include "core/memory_manager/memory_constants.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" +#include "core/os_interface/windows/os_context_win.h" +#include "core/os_interface/windows/wddm/wddm.h" using namespace NEO; diff --git a/runtime/os_interface/windows/wddm/wddm_interface.h b/core/os_interface/windows/wddm/wddm_interface.h similarity index 100% rename from runtime/os_interface/windows/wddm/wddm_interface.h rename to core/os_interface/windows/wddm/wddm_interface.h diff --git a/runtime/os_interface/windows/wddm_additional_context_flags.cpp b/core/os_interface/windows/wddm_additional_context_flags.cpp similarity index 65% rename from runtime/os_interface/windows/wddm_additional_context_flags.cpp rename to core/os_interface/windows/wddm_additional_context_flags.cpp index 5ca78588dc..7bf88fce2a 100644 --- a/runtime/os_interface/windows/wddm_additional_context_flags.cpp +++ b/core/os_interface/windows/wddm_additional_context_flags.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/wddm/wddm.h" +#include "core/os_interface/windows/wddm/wddm.h" namespace NEO { void Wddm::applyAdditionalContextFlags(CREATECONTEXT_PVTDATA &privateData, OsContextWin &osContext) { diff --git a/runtime/os_interface/windows/wddm_memory_operations_handler.cpp b/core/os_interface/windows/wddm_memory_operations_handler.cpp similarity index 95% rename from runtime/os_interface/windows/wddm_memory_operations_handler.cpp rename to core/os_interface/windows/wddm_memory_operations_handler.cpp index 07f05d90b1..b280ff7510 100644 --- a/runtime/os_interface/windows/wddm_memory_operations_handler.cpp +++ b/core/os_interface/windows/wddm_memory_operations_handler.cpp @@ -5,12 +5,12 @@ * */ -#include "runtime/os_interface/windows/wddm_memory_operations_handler.h" +#include "core/os_interface/windows/wddm_memory_operations_handler.h" #include "core/memory_manager/host_ptr_defines.h" #include "core/os_interface/windows/wddm_allocation.h" +#include "core/os_interface/windows/wddm_residency_allocations_container.h" #include "core/utilities/stackvec.h" -#include "runtime/os_interface/windows/wddm_residency_allocations_container.h" namespace NEO { diff --git a/runtime/os_interface/windows/wddm_memory_operations_handler.h b/core/os_interface/windows/wddm_memory_operations_handler.h similarity index 100% rename from runtime/os_interface/windows/wddm_memory_operations_handler.h rename to core/os_interface/windows/wddm_memory_operations_handler.h diff --git a/runtime/os_interface/windows/wddm_residency_allocations_container.cpp b/core/os_interface/windows/wddm_residency_allocations_container.cpp similarity index 96% rename from runtime/os_interface/windows/wddm_residency_allocations_container.cpp rename to core/os_interface/windows/wddm_residency_allocations_container.cpp index a531cca6f6..6993798dfb 100644 --- a/runtime/os_interface/windows/wddm_residency_allocations_container.cpp +++ b/core/os_interface/windows/wddm_residency_allocations_container.cpp @@ -5,10 +5,10 @@ * */ -#include "runtime/os_interface/windows/wddm_residency_allocations_container.h" +#include "core/os_interface/windows/wddm_residency_allocations_container.h" +#include "core/os_interface/windows/wddm/wddm.h" #include "core/os_interface/windows/wddm_allocation.h" -#include "runtime/os_interface/windows/wddm/wddm.h" #include diff --git a/runtime/os_interface/windows/wddm_residency_allocations_container.h b/core/os_interface/windows/wddm_residency_allocations_container.h similarity index 96% rename from runtime/os_interface/windows/wddm_residency_allocations_container.h rename to core/os_interface/windows/wddm_residency_allocations_container.h index b0b505f9cd..7278f1e847 100644 --- a/runtime/os_interface/windows/wddm_residency_allocations_container.h +++ b/core/os_interface/windows/wddm_residency_allocations_container.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/runtime/os_interface/windows/wddm_residency_controller.cpp b/core/os_interface/windows/wddm_residency_controller.cpp similarity index 98% rename from runtime/os_interface/windows/wddm_residency_controller.cpp rename to core/os_interface/windows/wddm_residency_controller.cpp index 3e09b1fd39..c2a98c3dab 100644 --- a/runtime/os_interface/windows/wddm_residency_controller.cpp +++ b/core/os_interface/windows/wddm_residency_controller.cpp @@ -5,13 +5,13 @@ * */ -#include "runtime/os_interface/windows/wddm_residency_controller.h" +#include "core/os_interface/windows/wddm_residency_controller.h" #include "core/debug_settings/debug_settings_manager.h" +#include "core/os_interface/windows/wddm/wddm.h" #include "core/os_interface/windows/wddm_allocation.h" +#include "core/os_interface/windows/wddm_residency_allocations_container.h" #include "core/utilities/spinlock.h" -#include "runtime/os_interface/windows/wddm/wddm.h" -#include "runtime/os_interface/windows/wddm_residency_allocations_container.h" namespace NEO { diff --git a/runtime/os_interface/windows/wddm_residency_controller.h b/core/os_interface/windows/wddm_residency_controller.h similarity index 100% rename from runtime/os_interface/windows/wddm_residency_controller.h rename to core/os_interface/windows/wddm_residency_controller.h diff --git a/runtime/os_interface/windows/windows_inc.cpp b/core/os_interface/windows/windows_inc.cpp similarity index 68% rename from runtime/os_interface/windows/windows_inc.cpp rename to core/os_interface/windows/windows_inc.cpp index ce73537687..c662a314bc 100644 --- a/runtime/os_interface/windows/windows_inc.cpp +++ b/core/os_interface/windows/windows_inc.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * diff --git a/runtime/device/device_caps.cpp b/runtime/device/device_caps.cpp index e4ff8b6429..319df41813 100644 --- a/runtime/device/device_caps.cpp +++ b/runtime/device/device_caps.cpp @@ -8,12 +8,12 @@ #include "core/helpers/basic_math.h" #include "core/helpers/hw_helper.h" #include "core/helpers/options.h" +#include "core/os_interface/hw_info_config.h" #include "core/os_interface/os_interface.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/device/device.h" #include "runtime/device/driver_info.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/os_interface/hw_info_config.h" #include "runtime/platform/extensions.h" #include "runtime/sharings/sharing_factory.h" #include "runtime/source_level_debugger/source_level_debugger.h" diff --git a/runtime/dll/CMakeLists.txt b/runtime/dll/CMakeLists.txt index 0c3a73eae3..15fb3d8480 100644 --- a/runtime/dll/CMakeLists.txt +++ b/runtime/dll/CMakeLists.txt @@ -55,8 +55,8 @@ set(RUNTIME_SRCS_DLL_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/windows/os_interface.cpp ${NEO_SOURCE_DIR}/core/os_interface/windows/sys_calls.cpp ${NEO_SOURCE_DIR}/runtime/gmm_helper/gmm_memory.cpp - ${NEO_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_calls.cpp - ${NEO_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_create.cpp + ${NEO_SOURCE_DIR}/core/os_interface/windows/wddm/wddm_calls.cpp + ${NEO_SOURCE_DIR}/core/os_interface/windows/wddm/wddm_create.cpp ) target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_DLL_BASE}) diff --git a/runtime/dll/windows/create_wddm_memory_manager.cpp b/runtime/dll/windows/create_wddm_memory_manager.cpp index 629e3274d7..854453dd82 100644 --- a/runtime/dll/windows/create_wddm_memory_manager.cpp +++ b/runtime/dll/windows/create_wddm_memory_manager.cpp @@ -7,9 +7,9 @@ #include "core/debug_settings/debug_settings_manager.h" #include "core/os_interface/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/os_interface/windows/os_interface.h" #include "runtime/os_interface/windows/wddm_memory_manager.h" namespace NEO { diff --git a/runtime/dll/windows/os_interface.cpp b/runtime/dll/windows/os_interface.cpp index ab0ec30bda..91e845e73b 100644 --- a/runtime/dll/windows/os_interface.cpp +++ b/runtime/dll/windows/os_interface.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "core/memory_manager/memory_constants.h" namespace NEO { diff --git a/runtime/gen11/linux/hw_info_config_ehl.inl b/runtime/gen11/linux/hw_info_config_ehl.inl index 770bc16350..fa7ad0f4c9 100644 --- a/runtime/gen11/linux/hw_info_config_ehl.inl +++ b/runtime/gen11/linux/hw_info_config_ehl.inl @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen11/linux/hw_info_config_gen11.cpp b/runtime/gen11/linux/hw_info_config_gen11.cpp index 650909f619..942fed9eb9 100644 --- a/runtime/gen11/linux/hw_info_config_gen11.cpp +++ b/runtime/gen11/linux/hw_info_config_gen11.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/hw_info_config.inl" -#include "runtime/os_interface/hw_info_config_bdw_plus.inl" +#include "core/os_interface/hw_info_config.inl" +#include "core/os_interface/hw_info_config_bdw_plus.inl" #ifdef SUPPORT_ICLLP #include "hw_info_config_icllp.inl" diff --git a/runtime/gen11/linux/hw_info_config_icllp.inl b/runtime/gen11/linux/hw_info_config_icllp.inl index c1e6486746..2bd5caed1a 100644 --- a/runtime/gen11/linux/hw_info_config_icllp.inl +++ b/runtime/gen11/linux/hw_info_config_icllp.inl @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen11/linux/hw_info_config_lkf.inl b/runtime/gen11/linux/hw_info_config_lkf.inl index 5aa0431578..2ff9be4a09 100644 --- a/runtime/gen11/linux/hw_info_config_lkf.inl +++ b/runtime/gen11/linux/hw_info_config_lkf.inl @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen11/windows/hw_info_config_gen11.cpp b/runtime/gen11/windows/hw_info_config_gen11.cpp index a18966d72a..f88be48d7a 100644 --- a/runtime/gen11/windows/hw_info_config_gen11.cpp +++ b/runtime/gen11/windows/hw_info_config_gen11.cpp @@ -1,14 +1,14 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" -#include "runtime/os_interface/hw_info_config.inl" -#include "runtime/os_interface/hw_info_config_bdw_plus.inl" +#include "core/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.inl" +#include "core/os_interface/hw_info_config_bdw_plus.inl" namespace NEO { diff --git a/runtime/gen12lp/linux/hw_info_config_gen12lp.cpp b/runtime/gen12lp/linux/hw_info_config_gen12lp.cpp index c4258f497f..da87e88d85 100644 --- a/runtime/gen12lp/linux/hw_info_config_gen12lp.cpp +++ b/runtime/gen12lp/linux/hw_info_config_gen12lp.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/hw_info_config.inl" -#include "runtime/os_interface/hw_info_config_bdw_plus.inl" +#include "core/os_interface/hw_info_config.inl" +#include "core/os_interface/hw_info_config_bdw_plus.inl" #ifdef SUPPORT_TGLLP #include "hw_info_config_tgllp.inl" diff --git a/runtime/gen12lp/linux/hw_info_config_tgllp.inl b/runtime/gen12lp/linux/hw_info_config_tgllp.inl index 4637cd5162..5e4a40e034 100644 --- a/runtime/gen12lp/linux/hw_info_config_tgllp.inl +++ b/runtime/gen12lp/linux/hw_info_config_tgllp.inl @@ -1,12 +1,12 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen12lp/windows/hw_info_config_gen12lp.cpp b/runtime/gen12lp/windows/hw_info_config_gen12lp.cpp index 4e3e58b4c0..fe18e1f6ae 100644 --- a/runtime/gen12lp/windows/hw_info_config_gen12lp.cpp +++ b/runtime/gen12lp/windows/hw_info_config_gen12lp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,9 +7,9 @@ #include "core/debug_settings/debug_settings_manager.h" #include "core/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" -#include "runtime/os_interface/hw_info_config.inl" -#include "runtime/os_interface/hw_info_config_bdw_plus.inl" +#include "core/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.inl" +#include "core/os_interface/hw_info_config_bdw_plus.inl" namespace NEO { diff --git a/runtime/gen8/linux/hw_info_config_bdw.inl b/runtime/gen8/linux/hw_info_config_bdw.inl index a7dda4399e..8abe2aa339 100644 --- a/runtime/gen8/linux/hw_info_config_bdw.inl +++ b/runtime/gen8/linux/hw_info_config_bdw.inl @@ -1,12 +1,12 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen8/linux/hw_info_config_gen8.cpp b/runtime/gen8/linux/hw_info_config_gen8.cpp index 6f4a22e1b1..9f7f037a3d 100644 --- a/runtime/gen8/linux/hw_info_config_gen8.cpp +++ b/runtime/gen8/linux/hw_info_config_gen8.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/hw_info_config.inl" -#include "runtime/os_interface/hw_info_config_bdw_plus.inl" +#include "core/os_interface/hw_info_config.inl" +#include "core/os_interface/hw_info_config_bdw_plus.inl" #ifdef SUPPORT_BDW #include "hw_info_config_bdw.inl" diff --git a/runtime/gen8/windows/hw_info_config_gen8.cpp b/runtime/gen8/windows/hw_info_config_gen8.cpp index d379fbc7c4..b1a20bad45 100644 --- a/runtime/gen8/windows/hw_info_config_gen8.cpp +++ b/runtime/gen8/windows/hw_info_config_gen8.cpp @@ -1,14 +1,14 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" -#include "runtime/os_interface/hw_info_config.inl" -#include "runtime/os_interface/hw_info_config_bdw_plus.inl" +#include "core/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.inl" +#include "core/os_interface/hw_info_config_bdw_plus.inl" namespace NEO { diff --git a/runtime/gen9/linux/hw_info_config_bxt.inl b/runtime/gen9/linux/hw_info_config_bxt.inl index 23a57905c2..11c0a0f997 100644 --- a/runtime/gen9/linux/hw_info_config_bxt.inl +++ b/runtime/gen9/linux/hw_info_config_bxt.inl @@ -6,9 +6,9 @@ */ #include "core/helpers/hw_info.h" +#include "core/os_interface/hw_info_config.h" #include "core/os_interface/linux/drm_neo.h" #include "core/os_interface/linux/os_interface.h" -#include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen9/linux/hw_info_config_cfl.inl b/runtime/gen9/linux/hw_info_config_cfl.inl index 2b0d87fe60..9d1e542807 100644 --- a/runtime/gen9/linux/hw_info_config_cfl.inl +++ b/runtime/gen9/linux/hw_info_config_cfl.inl @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen9/linux/hw_info_config_gen9.cpp b/runtime/gen9/linux/hw_info_config_gen9.cpp index b098986eb4..06152ce190 100644 --- a/runtime/gen9/linux/hw_info_config_gen9.cpp +++ b/runtime/gen9/linux/hw_info_config_gen9.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/hw_info_config.inl" -#include "runtime/os_interface/hw_info_config_bdw_plus.inl" +#include "core/os_interface/hw_info_config.inl" +#include "core/os_interface/hw_info_config_bdw_plus.inl" #ifdef SUPPORT_BXT #include "hw_info_config_bxt.inl" diff --git a/runtime/gen9/linux/hw_info_config_glk.inl b/runtime/gen9/linux/hw_info_config_glk.inl index c2a875d256..9b31959876 100644 --- a/runtime/gen9/linux/hw_info_config_glk.inl +++ b/runtime/gen9/linux/hw_info_config_glk.inl @@ -6,9 +6,9 @@ */ #include "core/helpers/hw_info.h" +#include "core/os_interface/hw_info_config.h" #include "core/os_interface/linux/drm_neo.h" #include "core/os_interface/linux/os_interface.h" -#include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen9/linux/hw_info_config_kbl.inl b/runtime/gen9/linux/hw_info_config_kbl.inl index 2b87dfcf63..afedb8946f 100644 --- a/runtime/gen9/linux/hw_info_config_kbl.inl +++ b/runtime/gen9/linux/hw_info_config_kbl.inl @@ -1,12 +1,12 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen9/linux/hw_info_config_skl.inl b/runtime/gen9/linux/hw_info_config_skl.inl index 64f5f46c36..ff037ed92f 100644 --- a/runtime/gen9/linux/hw_info_config_skl.inl +++ b/runtime/gen9/linux/hw_info_config_skl.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #include "core/helpers/hw_cmds.h" #include "core/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/gen9/windows/hw_info_config_gen9.cpp b/runtime/gen9/windows/hw_info_config_gen9.cpp index 65c6550791..0374cd28c5 100644 --- a/runtime/gen9/windows/hw_info_config_gen9.cpp +++ b/runtime/gen9/windows/hw_info_config_gen9.cpp @@ -1,14 +1,14 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/helpers/hw_info.h" -#include "runtime/os_interface/hw_info_config.h" -#include "runtime/os_interface/hw_info_config.inl" -#include "runtime/os_interface/hw_info_config_bdw_plus.inl" +#include "core/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.inl" +#include "core/os_interface/hw_info_config_bdw_plus.inl" namespace NEO { diff --git a/runtime/os_interface/CMakeLists.txt b/runtime/os_interface/CMakeLists.txt index 5d3fc874d3..371ada0e28 100644 --- a/runtime/os_interface/CMakeLists.txt +++ b/runtime/os_interface/CMakeLists.txt @@ -8,9 +8,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_BASE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/device_factory.cpp ${CMAKE_CURRENT_SOURCE_DIR}/device_factory.h - ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.h - ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.inl - ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_bdw_plus.inl ${CMAKE_CURRENT_SOURCE_DIR}/metrics_library.cpp ${CMAKE_CURRENT_SOURCE_DIR}/metrics_library.h ${CMAKE_CURRENT_SOURCE_DIR}/ocl_reg_path.h diff --git a/runtime/os_interface/device_factory.cpp b/runtime/os_interface/device_factory.cpp index 77bcc161ed..ec4150c490 100644 --- a/runtime/os_interface/device_factory.cpp +++ b/runtime/os_interface/device_factory.cpp @@ -10,9 +10,9 @@ #include "core/helpers/hw_helper.h" #include "core/helpers/options.h" #include "core/os_interface/aub_memory_operations_handler.h" +#include "core/os_interface/hw_info_config.h" #include "runtime/aub/aub_center.h" #include "runtime/device/device.h" -#include "runtime/os_interface/hw_info_config.h" namespace NEO { diff --git a/runtime/os_interface/linux/device_factory_linux.cpp b/runtime/os_interface/linux/device_factory_linux.cpp index b7eff48808..f376463c3e 100644 --- a/runtime/os_interface/linux/device_factory_linux.cpp +++ b/runtime/os_interface/linux/device_factory_linux.cpp @@ -8,12 +8,12 @@ #include "core/debug_settings/debug_settings_manager.h" #include "core/execution_environment/root_device_environment.h" #include "core/helpers/hw_info.h" +#include "core/os_interface/hw_info_config.h" #include "core/os_interface/linux/drm_neo.h" #include "core/os_interface/linux/os_interface.h" #include "runtime/device/cl_device.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/os_interface/device_factory.h" -#include "runtime/os_interface/hw_info_config.h" #include "runtime/os_interface/linux/drm_memory_operations_handler.h" #include "drm/i915_drm.h" diff --git a/runtime/os_interface/linux/hw_info_config.cpp b/runtime/os_interface/linux/hw_info_config.cpp index bb8b93156e..8740790d60 100644 --- a/runtime/os_interface/linux/hw_info_config.cpp +++ b/runtime/os_interface/linux/hw_info_config.cpp @@ -5,7 +5,7 @@ * */ -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" #include "core/command_stream/preemption.h" #include "core/debug_settings/debug_settings_manager.h" diff --git a/runtime/os_interface/windows/CMakeLists.txt b/runtime/os_interface/windows/CMakeLists.txt index f32ab49224..8439af8e62 100644 --- a/runtime/os_interface/windows/CMakeLists.txt +++ b/runtime/os_interface/windows/CMakeLists.txt @@ -10,42 +10,21 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS ${CMAKE_CURRENT_SOURCE_DIR}/d3d10_11_sharing_functions.cpp ${CMAKE_CURRENT_SOURCE_DIR}/d3d9_sharing_functions.cpp ${CMAKE_CURRENT_SOURCE_DIR}/d3d_sharing_functions.h - ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion_win.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/deferrable_deletion_win.h ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.inl ${CMAKE_CURRENT_SOURCE_DIR}/device_factory_win.cpp ${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}/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_interface.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/os_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/os_metrics_library.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_socket.h - ${CMAKE_CURRENT_SOURCE_DIR}/os_time_win.cpp - ${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}${BRANCH_DIR_SUFFIX}/wddm_additional_context_flags.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_device_command_stream.h ${CMAKE_CURRENT_SOURCE_DIR}/wddm_device_command_stream.inl ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager.cpp ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager.h ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/wddm_memory_manager_allocate_in_device_pool.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_allocations_container.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_allocations_container.h - ${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_controller.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/wddm_residency_controller.h - ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_operations_handler.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_operations_handler.h - ${CMAKE_CURRENT_SOURCE_DIR}/windows_inc.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.h - ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm_interface.h - ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm_interface.cpp ) if(WIN32) diff --git a/runtime/os_interface/windows/device_factory_win.cpp b/runtime/os_interface/windows/device_factory_win.cpp index 98c77230d6..ac023ab152 100644 --- a/runtime/os_interface/windows/device_factory_win.cpp +++ b/runtime/os_interface/windows/device_factory_win.cpp @@ -9,12 +9,12 @@ #include "core/debug_settings/debug_settings_manager.h" #include "core/execution_environment/root_device_environment.h" +#include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm/wddm.h" +#include "core/os_interface/windows/wddm_memory_operations_handler.h" #include "runtime/device/cl_device.h" #include "runtime/device/device.h" #include "runtime/os_interface/device_factory.h" -#include "runtime/os_interface/windows/os_interface.h" -#include "runtime/os_interface/windows/wddm/wddm.h" -#include "runtime/os_interface/windows/wddm_memory_operations_handler.h" namespace NEO { diff --git a/runtime/os_interface/windows/driver_info.cpp b/runtime/os_interface/windows/driver_info.cpp index a267b13a55..05db0c8074 100644 --- a/runtime/os_interface/windows/driver_info.cpp +++ b/runtime/os_interface/windows/driver_info.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,9 +8,9 @@ #include "runtime/device/driver_info.h" #include "core/os_interface/windows/debug_registry_reader.h" +#include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm/wddm.h" #include "runtime/os_interface/windows/driver_info.h" -#include "runtime/os_interface/windows/os_interface.h" -#include "runtime/os_interface/windows/wddm/wddm.h" 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 3512e426c3..4ea04d9724 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 @@ -8,12 +8,12 @@ #include "core/helpers/timestamp_packet.h" #include "core/os_interface/os_interface.h" #include "core/os_interface/windows/gdi_interface.h" +#include "core/os_interface/windows/os_context_win.h" +#include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm/wddm.h" #include "public/cl_gl_private_intel.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/context/context.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" #include "runtime/sharings/gl/gl_arb_sync_event.h" #include "runtime/sharings/gl/windows/gl_sharing_windows.h" diff --git a/runtime/os_interface/windows/performance_counters_win.cpp b/runtime/os_interface/windows/performance_counters_win.cpp index 95f1c7358d..eca44de4e2 100644 --- a/runtime/os_interface/windows/performance_counters_win.cpp +++ b/runtime/os_interface/windows/performance_counters_win.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,9 +8,9 @@ #include "performance_counters_win.h" #include "core/helpers/hw_helper.h" +#include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/os_time_win.h" #include "runtime/device/device.h" -#include "runtime/os_interface/windows/os_interface.h" -#include "runtime/os_interface/windows/os_time_win.h" namespace NEO { ///////////////////////////////////////////////////// diff --git a/runtime/os_interface/windows/performance_counters_win.h b/runtime/os_interface/windows/performance_counters_win.h index 5ef12ccbda..320bb66212 100644 --- a/runtime/os_interface/windows/performance_counters_win.h +++ b/runtime/os_interface/windows/performance_counters_win.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/wddm_device_command_stream.inl b/runtime/os_interface/windows/wddm_device_command_stream.inl index 1a7e1cbe14..56a3c6f82c 100644 --- a/runtime/os_interface/windows/wddm_device_command_stream.inl +++ b/runtime/os_interface/windows/wddm_device_command_stream.inl @@ -16,15 +16,15 @@ #include "core/helpers/hw_cmds.h" #include "core/helpers/ptr_math.h" #include "core/helpers/windows/gmm_callbacks.h" +#include "core/os_interface/windows/wddm/wddm.h" #include "runtime/device/device.h" #include "runtime/mem_obj/mem_obj.h" -#include "runtime/os_interface/windows/wddm/wddm.h" #include "runtime/os_interface/windows/wddm_device_command_stream.h" #pragma warning(pop) #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 "core/os_interface/windows/os_context_win.h" +#include "core/os_interface/windows/os_interface.h" #include "runtime/os_interface/windows/wddm_memory_manager.h" namespace NEO { diff --git a/runtime/os_interface/windows/wddm_memory_manager.cpp b/runtime/os_interface/windows/wddm_memory_manager.cpp index 8bcfc889f7..cd9318fa28 100644 --- a/runtime/os_interface/windows/wddm_memory_manager.cpp +++ b/runtime/os_interface/windows/wddm_memory_manager.cpp @@ -20,15 +20,15 @@ #include "core/memory_manager/host_ptr_manager.h" #include "core/memory_manager/memory_operations_handler.h" #include "core/os_interface/os_interface.h" +#include "core/os_interface/windows/os_context_win.h" +#include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm/wddm.h" #include "core/os_interface/windows/wddm_allocation.h" +#include "core/os_interface/windows/wddm_residency_allocations_container.h" +#include "core/os_interface/windows/wddm_residency_controller.h" #include "runtime/command_stream/command_stream_receiver_hw.h" #include "runtime/device/device.h" #include "runtime/helpers/surface_formats.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" -#include "runtime/os_interface/windows/wddm_residency_allocations_container.h" -#include "runtime/os_interface/windows/wddm_residency_controller.h" #include "runtime/platform/platform.h" #include diff --git a/unit_tests/command_stream/get_devices_tests.cpp b/unit_tests/command_stream/get_devices_tests.cpp index b65e4ad2f0..98ba1eeb5c 100644 --- a/unit_tests/command_stream/get_devices_tests.cpp +++ b/unit_tests/command_stream/get_devices_tests.cpp @@ -6,12 +6,12 @@ */ #include "core/helpers/options.h" +#include "core/os_interface/hw_info_config.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/command_stream/command_stream_receiver.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "runtime/os_interface/device_factory.h" -#include "runtime/os_interface/hw_info_config.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/libult/create_command_stream.h" diff --git a/unit_tests/gen11/ehl/windows/hw_info_config_tests_ehl.cpp b/unit_tests/gen11/ehl/windows/hw_info_config_tests_ehl.cpp index 3788dad41e..416d2cc808 100644 --- a/unit_tests/gen11/ehl/windows/hw_info_config_tests_ehl.cpp +++ b/unit_tests/gen11/ehl/windows/hw_info_config_tests_ehl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/unit_tests/gen11/icllp/windows/hw_info_config_tests_icllp.cpp b/unit_tests/gen11/icllp/windows/hw_info_config_tests_icllp.cpp index f4eacb5e27..55feedbbb6 100644 --- a/unit_tests/gen11/icllp/windows/hw_info_config_tests_icllp.cpp +++ b/unit_tests/gen11/icllp/windows/hw_info_config_tests_icllp.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/unit_tests/gen11/lkf/windows/hw_info_config_tests_lkf.cpp b/unit_tests/gen11/lkf/windows/hw_info_config_tests_lkf.cpp index 0ae1dde704..5aa6d600bc 100644 --- a/unit_tests/gen11/lkf/windows/hw_info_config_tests_lkf.cpp +++ b/unit_tests/gen11/lkf/windows/hw_info_config_tests_lkf.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/unit_tests/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp b/unit_tests/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp index c56079ef7e..f315a92837 100644 --- a/unit_tests/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp +++ b/unit_tests/gen12lp/tgllp/windows/hw_info_config_tests_tgllp.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/unit_tests/gen12lp/windows/hw_info_config_tests_gen12lp.cpp b/unit_tests/gen12lp/windows/hw_info_config_tests_gen12lp.cpp index 22986494b3..994db5b648 100644 --- a/unit_tests/gen12lp/windows/hw_info_config_tests_gen12lp.cpp +++ b/unit_tests/gen12lp/windows/hw_info_config_tests_gen12lp.cpp @@ -5,8 +5,8 @@ * */ +#include "core/os_interface/windows/os_interface.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/os_interface/windows/os_interface.h" #include "unit_tests/gen12lp/special_ult_helper_gen12lp.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" diff --git a/unit_tests/gen8/bdw/windows/hw_info_config_tests_bdw.cpp b/unit_tests/gen8/bdw/windows/hw_info_config_tests_bdw.cpp index 017c208541..cae208346f 100644 --- a/unit_tests/gen8/bdw/windows/hw_info_config_tests_bdw.cpp +++ b/unit_tests/gen8/bdw/windows/hw_info_config_tests_bdw.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/unit_tests/gen9/bxt/windows/hw_info_config_tests_bxt.cpp b/unit_tests/gen9/bxt/windows/hw_info_config_tests_bxt.cpp index 8a6576cbff..b698108e00 100644 --- a/unit_tests/gen9/bxt/windows/hw_info_config_tests_bxt.cpp +++ b/unit_tests/gen9/bxt/windows/hw_info_config_tests_bxt.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/unit_tests/gen9/cfl/windows/hw_info_config_tests_cfl.cpp b/unit_tests/gen9/cfl/windows/hw_info_config_tests_cfl.cpp index 0fda724dbc..555ae57bfb 100644 --- a/unit_tests/gen9/cfl/windows/hw_info_config_tests_cfl.cpp +++ b/unit_tests/gen9/cfl/windows/hw_info_config_tests_cfl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/unit_tests/gen9/glk/windows/hw_info_config_tests_glk.cpp b/unit_tests/gen9/glk/windows/hw_info_config_tests_glk.cpp index 7cba2edd60..f5b32fa3bc 100644 --- a/unit_tests/gen9/glk/windows/hw_info_config_tests_glk.cpp +++ b/unit_tests/gen9/glk/windows/hw_info_config_tests_glk.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/unit_tests/gen9/kbl/windows/hw_info_config_tests_kbl.cpp b/unit_tests/gen9/kbl/windows/hw_info_config_tests_kbl.cpp index 8dbe6c2972..683d2afbd7 100644 --- a/unit_tests/gen9/kbl/windows/hw_info_config_tests_kbl.cpp +++ b/unit_tests/gen9/kbl/windows/hw_info_config_tests_kbl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/unit_tests/gen9/skl/windows/hw_info_config_tests_skl.cpp b/unit_tests/gen9/skl/windows/hw_info_config_tests_skl.cpp index b643380491..1288c75b5e 100644 --- a/unit_tests/gen9/skl/windows/hw_info_config_tests_skl.cpp +++ b/unit_tests/gen9/skl/windows/hw_info_config_tests_skl.cpp @@ -1,11 +1,11 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ -#include "runtime/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "unit_tests/os_interface/windows/hw_info_config_win_tests.h" using namespace NEO; diff --git a/unit_tests/helpers/hw_helper_tests.cpp b/unit_tests/helpers/hw_helper_tests.cpp index b03cf5661c..30f3a94597 100644 --- a/unit_tests/helpers/hw_helper_tests.cpp +++ b/unit_tests/helpers/hw_helper_tests.cpp @@ -14,12 +14,12 @@ #include "core/helpers/options.h" #include "core/helpers/string.h" #include "core/memory_manager/graphics_allocation.h" +#include "core/os_interface/hw_info_config.h" #include "core/os_interface/os_interface.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/helpers/dispatch_info.h" #include "runtime/helpers/hardware_commands_helper.h" #include "runtime/mem_obj/image.h" -#include "runtime/os_interface/hw_info_config.h" #include "unit_tests/helpers/unit_test_helper.h" #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/mocks/mock_buffer.h" diff --git a/unit_tests/main.cpp b/unit_tests/main.cpp index 838c4b1a1b..17e1ff75b3 100644 --- a/unit_tests/main.cpp +++ b/unit_tests/main.cpp @@ -10,9 +10,9 @@ #include "core/gmm_helper/gmm_interface.h" #include "core/gmm_helper/resource_info.h" #include "core/helpers/options.h" +#include "core/os_interface/hw_info_config.h" #include "core/unit_tests/helpers/memory_leak_listener.h" #include "core/utilities/debug_settings_reader.h" -#include "runtime/os_interface/hw_info_config.h" #include "runtime/os_interface/ocl_reg_path.h" #include "unit_tests/custom_event_listener.h" #include "unit_tests/helpers/kernel_binary_helper.h" diff --git a/unit_tests/mock_gdi/mock_gdi.h b/unit_tests/mock_gdi/mock_gdi.h index b26fac64bf..eb1a1f823a 100644 --- a/unit_tests/mock_gdi/mock_gdi.h +++ b/unit_tests/mock_gdi/mock_gdi.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #pragma once #include "core/gmm_helper/gmm_lib.h" -#include "runtime/os_interface/windows/os_time_win.h" +#include "core/os_interface/windows/os_time_win.h" #include #include diff --git a/unit_tests/mocks/mock_ostime_win.h b/unit_tests/mocks/mock_ostime_win.h index d8fece31f2..4e1b594560 100644 --- a/unit_tests/mocks/mock_ostime_win.h +++ b/unit_tests/mocks/mock_ostime_win.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/os_time_win.h" +#include "core/os_interface/windows/os_time_win.h" namespace NEO { class MockOSTimeWin : public OSTimeWin { diff --git a/unit_tests/mocks/mock_wddm.h b/unit_tests/mocks/mock_wddm.h index cdd0a38804..6e74eaeed0 100644 --- a/unit_tests/mocks/mock_wddm.h +++ b/unit_tests/mocks/mock_wddm.h @@ -9,9 +9,9 @@ #include "core/memory_manager/host_ptr_defines.h" #include "core/memory_manager/memory_constants.h" +#include "core/os_interface/windows/wddm/wddm.h" +#include "core/os_interface/windows/wddm_residency_allocations_container.h" #include "core/os_interface/windows/windows_defs.h" -#include "runtime/os_interface/windows/wddm/wddm.h" -#include "runtime/os_interface/windows/wddm_residency_allocations_container.h" #include "unit_tests/mocks/wddm_mock_helpers.h" #include "gmock/gmock.h" diff --git a/unit_tests/mocks/mock_wddm_interface20.h b/unit_tests/mocks/mock_wddm_interface20.h index c5b264ce0d..44f0af1f86 100644 --- a/unit_tests/mocks/mock_wddm_interface20.h +++ b/unit_tests/mocks/mock_wddm_interface20.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #pragma once -#include "runtime/os_interface/windows/wddm/wddm_interface.h" +#include "core/os_interface/windows/wddm/wddm_interface.h" namespace NEO { class WddmMockInterface20 : public WddmInterface20 { diff --git a/unit_tests/mocks/mock_wddm_interface23.h b/unit_tests/mocks/mock_wddm_interface23.h index c7daf5ef71..43224b4a90 100644 --- a/unit_tests/mocks/mock_wddm_interface23.h +++ b/unit_tests/mocks/mock_wddm_interface23.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #pragma once -#include "runtime/os_interface/windows/wddm/wddm_interface.h" +#include "core/os_interface/windows/wddm/wddm_interface.h" namespace NEO { class WddmMockInterface23 : public WddmInterface23 { diff --git a/unit_tests/mocks/mock_wddm_residency_allocations_container.h b/unit_tests/mocks/mock_wddm_residency_allocations_container.h index c8350a3b7b..463b986991 100644 --- a/unit_tests/mocks/mock_wddm_residency_allocations_container.h +++ b/unit_tests/mocks/mock_wddm_residency_allocations_container.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #pragma once #include "core/memory_manager/memory_operations_status.h" -#include "runtime/os_interface/windows/wddm_residency_allocations_container.h" +#include "core/os_interface/windows/wddm_residency_allocations_container.h" #include "unit_tests/mocks/wddm_mock_helpers.h" namespace NEO { diff --git a/unit_tests/os_interface/linux/hw_info_config_linux_tests.h b/unit_tests/os_interface/linux/hw_info_config_linux_tests.h index b054fd777a..9752381319 100644 --- a/unit_tests/os_interface/linux/hw_info_config_linux_tests.h +++ b/unit_tests/os_interface/linux/hw_info_config_linux_tests.h @@ -7,9 +7,9 @@ #pragma once +#include "core/os_interface/hw_info_config.h" #include "core/os_interface/os_interface.h" #include "core/utilities/cpu_info.h" -#include "runtime/os_interface/hw_info_config.h" #include "unit_tests/os_interface/hw_info_config_tests.h" #include "unit_tests/os_interface/linux/drm_mock.h" diff --git a/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp b/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp index 57150504a3..f7ddabd695 100644 --- a/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp +++ b/unit_tests/os_interface/windows/create_wddm_memory_manager.cpp @@ -6,9 +6,9 @@ */ #include "core/os_interface/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" -#include "runtime/os_interface/windows/os_interface.h" #include "runtime/os_interface/windows/wddm_memory_manager.h" #include "unit_tests/libult/create_command_stream.h" diff --git a/unit_tests/os_interface/windows/deferrable_deletion_win_tests.cpp b/unit_tests/os_interface/windows/deferrable_deletion_win_tests.cpp index 21db2a66fd..c458bce281 100644 --- a/unit_tests/os_interface/windows/deferrable_deletion_win_tests.cpp +++ b/unit_tests/os_interface/windows/deferrable_deletion_win_tests.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/execution_environment/root_device_environment.h" -#include "runtime/os_interface/windows/deferrable_deletion_win.h" +#include "core/os_interface/windows/deferrable_deletion_win.h" #include "unit_tests/mocks/mock_execution_environment.h" #include "unit_tests/mocks/mock_wddm.h" 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 dc36255b2d..e61afa2437 100644 --- a/unit_tests/os_interface/windows/device_command_stream_tests.cpp +++ b/unit_tests/os_interface/windows/device_command_stream_tests.cpp @@ -12,6 +12,10 @@ #include "core/helpers/options.h" #include "core/helpers/windows/gmm_callbacks.h" #include "core/memory_manager/internal_allocation_storage.h" +#include "core/os_interface/windows/os_context_win.h" +#include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm_memory_operations_handler.h" +#include "core/os_interface/windows/wddm_residency_controller.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" @@ -21,12 +25,8 @@ #include "runtime/helpers/built_ins_helper.h" #include "runtime/mem_obj/buffer.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/os_interface/windows/os_context_win.h" -#include "runtime/os_interface/windows/os_interface.h" #include "runtime/os_interface/windows/wddm_device_command_stream.h" #include "runtime/os_interface/windows/wddm_memory_manager.h" -#include "runtime/os_interface/windows/wddm_memory_operations_handler.h" -#include "runtime/os_interface/windows/wddm_residency_controller.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/fixtures/device_fixture.h" diff --git a/unit_tests/os_interface/windows/driver_info_tests.cpp b/unit_tests/os_interface/windows/driver_info_tests.cpp index 1e82819bd4..456e6f1771 100644 --- a/unit_tests/os_interface/windows/driver_info_tests.cpp +++ b/unit_tests/os_interface/windows/driver_info_tests.cpp @@ -9,10 +9,10 @@ #include "core/execution_environment/root_device_environment.h" #include "core/helpers/options.h" #include "core/os_interface/windows/debug_registry_reader.h" +#include "core/os_interface/windows/os_interface.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/memory_manager/os_agnostic_memory_manager.h" #include "runtime/os_interface/windows/driver_info.h" -#include "runtime/os_interface/windows/os_interface.h" #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/libult/create_command_stream.h" #include "unit_tests/mocks/mock_csr.h" diff --git a/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp b/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp index 97079b6054..2fa1dec269 100644 --- a/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp +++ b/unit_tests/os_interface/windows/gl/gl_os_sharing_tests.cpp @@ -8,11 +8,11 @@ #include "core/execution_environment/root_device_environment.h" #include "core/helpers/timestamp_packet.h" #include "core/os_interface/os_interface.h" +#include "core/os_interface/windows/os_context_win.h" +#include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm/wddm.h" +#include "core/os_interface/windows/wddm_memory_operations_handler.h" #include "public/cl_gl_private_intel.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" -#include "runtime/os_interface/windows/wddm_memory_operations_handler.h" #include "runtime/sharings/gl/gl_arb_sync_event.h" #include "runtime/sharings/gl/windows/gl_sharing_windows.h" #include "unit_tests/mocks/gl/windows/mock_gl_sharing_windows.h" diff --git a/unit_tests/os_interface/windows/hw_info_config_win_tests.cpp b/unit_tests/os_interface/windows/hw_info_config_win_tests.cpp index e938a06610..9cc9f9d05a 100644 --- a/unit_tests/os_interface/windows/hw_info_config_win_tests.cpp +++ b/unit_tests/os_interface/windows/hw_info_config_win_tests.cpp @@ -10,9 +10,9 @@ #include "core/execution_environment/root_device_environment.h" #include "core/helpers/hw_helper.h" #include "core/helpers/options.h" +#include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm/wddm.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/os_interface/windows/os_interface.h" -#include "runtime/os_interface/windows/wddm/wddm.h" #include "test.h" #include "unit_tests/mocks/mock_execution_environment.h" diff --git a/unit_tests/os_interface/windows/hw_info_config_win_tests.h b/unit_tests/os_interface/windows/hw_info_config_win_tests.h index 6f701acea2..b0f51f4e17 100644 --- a/unit_tests/os_interface/windows/hw_info_config_win_tests.h +++ b/unit_tests/os_interface/windows/hw_info_config_win_tests.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,7 +7,7 @@ #pragma once -#include "runtime/os_interface/hw_info_config.h" +#include "core/os_interface/hw_info_config.h" #include "unit_tests/os_interface/hw_info_config_tests.h" #include diff --git a/unit_tests/os_interface/windows/mock_os_time_win.h b/unit_tests/os_interface/windows/mock_os_time_win.h index 5762c7da55..0b43d3837a 100644 --- a/unit_tests/os_interface/windows/mock_os_time_win.h +++ b/unit_tests/os_interface/windows/mock_os_time_win.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/os_time_win.h" +#include "core/os_interface/windows/os_time_win.h" namespace NEO { class MockOSTimeWin : public OSTimeWin { diff --git a/unit_tests/os_interface/windows/mock_performance_counters_win.cpp b/unit_tests/os_interface/windows/mock_performance_counters_win.cpp index d661ecf0a3..26213b78f2 100644 --- a/unit_tests/os_interface/windows/mock_performance_counters_win.cpp +++ b/unit_tests/os_interface/windows/mock_performance_counters_win.cpp @@ -8,8 +8,8 @@ #include "mock_performance_counters_win.h" #include "core/os_interface/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "core/os_interface/windows/windows_wrapper.h" -#include "runtime/os_interface/windows/os_interface.h" #include "unit_tests/mocks/mock_wddm.h" #include "unit_tests/os_interface/windows/mock_os_time_win.h" diff --git a/unit_tests/os_interface/windows/os_interface_win_tests.cpp b/unit_tests/os_interface/windows/os_interface_win_tests.cpp index 18886e4833..bbddc2ccad 100644 --- a/unit_tests/os_interface/windows/os_interface_win_tests.cpp +++ b/unit_tests/os_interface/windows/os_interface_win_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -8,7 +8,7 @@ #include "unit_tests/os_interface/windows/os_interface_win_tests.h" #include "core/execution_environment/root_device_environment.h" -#include "runtime/os_interface/windows/os_context_win.h" +#include "core/os_interface/windows/os_context_win.h" #include "unit_tests/mocks/mock_execution_environment.h" #include "unit_tests/os_interface/windows/wddm_fixture.h" diff --git a/unit_tests/os_interface/windows/os_interface_win_tests.h b/unit_tests/os_interface/windows/os_interface_win_tests.h index 2a7eb4d413..9da7b35d91 100644 --- a/unit_tests/os_interface/windows/os_interface_win_tests.h +++ b/unit_tests/os_interface/windows/os_interface_win_tests.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -9,9 +9,9 @@ #include "core/helpers/hw_info.h" #include "core/helpers/options.h" +#include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm/wddm.h" #include "runtime/os_interface/device_factory.h" -#include "runtime/os_interface/windows/os_interface.h" -#include "runtime/os_interface/windows/wddm/wddm.h" #include "gtest/gtest.h" diff --git a/unit_tests/os_interface/windows/os_time_win_tests.cpp b/unit_tests/os_interface/windows/os_time_win_tests.cpp index 3be48312c8..7e513e7dfa 100644 --- a/unit_tests/os_interface/windows/os_time_win_tests.cpp +++ b/unit_tests/os_interface/windows/os_time_win_tests.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2017-2019 Intel Corporation + * Copyright (C) 2017-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/execution_environment/root_device_environment.h" -#include "runtime/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "unit_tests/mocks/mock_execution_environment.h" #include "unit_tests/os_interface/windows/wddm_fixture.h" diff --git a/unit_tests/os_interface/windows/wddm20_tests.cpp b/unit_tests/os_interface/windows/wddm20_tests.cpp index 742dfd8d8c..9a987cb75c 100644 --- a/unit_tests/os_interface/windows/wddm20_tests.cpp +++ b/unit_tests/os_interface/windows/wddm20_tests.cpp @@ -12,14 +12,14 @@ #include "core/helpers/options.h" #include "core/os_interface/os_library.h" #include "core/os_interface/os_time.h" +#include "core/os_interface/windows/os_context_win.h" +#include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm/wddm_interface.h" #include "core/os_interface/windows/wddm_allocation.h" #include "core/os_interface/windows/wddm_engine_mapper.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/memory_manager/os_agnostic_memory_manager.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_interface.h" #include "runtime/os_interface/windows/wddm_memory_manager.h" #include "unit_tests/helpers/variable_backup.h" #include "unit_tests/mocks/mock_execution_environment.h" diff --git a/unit_tests/os_interface/windows/wddm23_tests.cpp b/unit_tests/os_interface/windows/wddm23_tests.cpp index b9d1a5c386..66856fa83e 100644 --- a/unit_tests/os_interface/windows/wddm23_tests.cpp +++ b/unit_tests/os_interface/windows/wddm23_tests.cpp @@ -9,10 +9,10 @@ #include "core/helpers/hw_helper.h" #include "core/memory_manager/memory_constants.h" #include "core/os_interface/windows/gdi_interface.h" +#include "core/os_interface/windows/os_context_win.h" +#include "core/os_interface/windows/os_interface.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "runtime/execution_environment/execution_environment.h" -#include "runtime/os_interface/windows/os_context_win.h" -#include "runtime/os_interface/windows/os_interface.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/mocks/mock_wddm.h" diff --git a/unit_tests/os_interface/windows/wddm_fixture.h b/unit_tests/os_interface/windows/wddm_fixture.h index 51787b20c7..543414ee01 100644 --- a/unit_tests/os_interface/windows/wddm_fixture.h +++ b/unit_tests/os_interface/windows/wddm_fixture.h @@ -11,11 +11,11 @@ #include "core/execution_environment/root_device_environment.h" #include "core/helpers/hw_helper.h" #include "core/os_interface/windows/gdi_interface.h" +#include "core/os_interface/windows/os_context_win.h" +#include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm_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/windows/os_context_win.h" -#include "runtime/os_interface/windows/os_interface.h" -#include "runtime/os_interface/windows/wddm_memory_operations_handler.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/mocks/mock_wddm.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 2fd6bb7841..95e0bc8dc7 100644 --- a/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_kmdaf_listener_tests.cpp @@ -9,10 +9,10 @@ #include "core/execution_environment/root_device_environment.h" #include "core/gmm_helper/gmm.h" #include "core/gmm_helper/gmm_helper.h" +#include "core/os_interface/windows/wddm/wddm.h" #include "core/os_interface/windows/wddm_allocation.h" #include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" #include "runtime/memory_manager/memory_manager.h" -#include "runtime/os_interface/windows/wddm/wddm.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/mock_gdi/mock_gdi.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 4cece1a84d..9871a43e52 100644 --- a/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_memory_manager_tests.cpp @@ -12,6 +12,8 @@ #include "core/helpers/aligned_memory.h" #include "core/helpers/array_count.h" #include "core/os_interface/os_library.h" +#include "core/os_interface/windows/os_context_win.h" +#include "core/os_interface/windows/wddm_residency_controller.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" #include "core/unit_tests/utilities/base_object_utils.h" #include "core/utilities/tag_allocator.h" @@ -19,8 +21,6 @@ #include "runtime/mem_obj/buffer.h" #include "runtime/mem_obj/image.h" #include "runtime/mem_obj/mem_obj_helper.h" -#include "runtime/os_interface/windows/os_context_win.h" -#include "runtime/os_interface/windows/wddm_residency_controller.h" #include "runtime/platform/platform.h" #include "unit_tests/helpers/execution_environment_helper.h" #include "unit_tests/helpers/unit_test_helper.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 3273713bc5..f2cf2225dd 100644 --- a/unit_tests/os_interface/windows/wddm_memory_manager_tests.h +++ b/unit_tests/os_interface/windows/wddm_memory_manager_tests.h @@ -7,9 +7,9 @@ #pragma once +#include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm_memory_operations_handler.h" #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" #include "unit_tests/helpers/execution_environment_helper.h" #include "unit_tests/mocks/mock_context.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 b3bb7c1daf..f276b821b2 100644 --- a/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_residency_controller_tests.cpp @@ -11,13 +11,13 @@ #include "core/memory_manager/memory_operations_handler.h" #include "core/os_interface/os_context.h" #include "core/os_interface/os_interface.h" +#include "core/os_interface/windows/os_context_win.h" +#include "core/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/wddm/wddm_interface.h" +#include "core/os_interface/windows/wddm_memory_operations_handler.h" +#include "core/os_interface/windows/wddm_residency_controller.h" #include "core/unit_tests/os_interface/windows/mock_gdi_interface.h" #include "runtime/execution_environment/execution_environment.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_interface.h" -#include "runtime/os_interface/windows/wddm_memory_operations_handler.h" -#include "runtime/os_interface/windows/wddm_residency_controller.h" #include "runtime/platform/platform.h" #include "test.h" #include "unit_tests/mocks/mock_allocation_properties.h" diff --git a/unit_tests/os_interface/windows/wddm_residency_handler_tests.cpp b/unit_tests/os_interface/windows/wddm_residency_handler_tests.cpp index 12d46c5da2..f07baa460f 100644 --- a/unit_tests/os_interface/windows/wddm_residency_handler_tests.cpp +++ b/unit_tests/os_interface/windows/wddm_residency_handler_tests.cpp @@ -5,8 +5,8 @@ * */ +#include "core/os_interface/windows/wddm_memory_operations_handler.h" #include "core/utilities/stackvec.h" -#include "runtime/os_interface/windows/wddm_memory_operations_handler.h" #include "test.h" #include "unit_tests/mocks/mock_allocation_properties.h" #include "unit_tests/mocks/mock_wddm.h" diff --git a/unit_tests/page_fault_manager_tests/CMakeLists.txt b/unit_tests/page_fault_manager_tests/CMakeLists.txt index 5104e48496..94876c3bc8 100644 --- a/unit_tests/page_fault_manager_tests/CMakeLists.txt +++ b/unit_tests/page_fault_manager_tests/CMakeLists.txt @@ -25,7 +25,7 @@ target_sources(neo_page_fault_manager_tests PRIVATE ${CPU_PAGE_FAULT_MANAGER_TES if(WIN32) target_sources(neo_page_fault_manager_tests PRIVATE ${CPU_PAGE_FAULT_MANAGER_WINDOWS_TESTS} - ${NEO_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_create.cpp + ${NEO_SOURCE_DIR}/core/os_interface/windows/wddm/wddm_create.cpp ) endif() diff --git a/unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp b/unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp index 74deaac44c..6d604ae60b 100644 --- a/unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp +++ b/unit_tests/scenarios/windows/enqueue_read_write_buffer_scenarios_windows_tests.cpp @@ -6,8 +6,8 @@ */ #include "core/memory_manager/internal_allocation_storage.h" +#include "core/os_interface/windows/os_interface.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/os_interface/windows/os_interface.h" #include "runtime/os_interface/windows/wddm_device_command_stream.h" #include "test.h" #include "unit_tests/fixtures/buffer_fixture.h" diff --git a/unit_tests/windows/CMakeLists.txt b/unit_tests/windows/CMakeLists.txt index 615357e7e4..325162b9fe 100644 --- a/unit_tests/windows/CMakeLists.txt +++ b/unit_tests/windows/CMakeLists.txt @@ -19,7 +19,7 @@ add_executable(igdrcl_windows_dll_tests ${NEO_SOURCE_DIR}/runtime/dll/create_command_stream.cpp ${NEO_SOURCE_DIR}/runtime/dll${BRANCH_DIR_SUFFIX}/get_devices.cpp ${NEO_SOURCE_DIR}/runtime/dll/windows/os_interface.cpp - ${NEO_SOURCE_DIR}/runtime/os_interface/windows/wddm/wddm_create.cpp + ${NEO_SOURCE_DIR}/core/os_interface/windows/wddm/wddm_create.cpp ${NEO_SOURCE_DIR}/unit_tests/ult_configuration.cpp ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/get_devices_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp diff --git a/unit_tests/windows/os_interface_tests.cpp b/unit_tests/windows/os_interface_tests.cpp index 7795dce668..b66f9331b9 100644 --- a/unit_tests/windows/os_interface_tests.cpp +++ b/unit_tests/windows/os_interface_tests.cpp @@ -1,12 +1,12 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * */ #include "core/memory_manager/memory_constants.h" -#include "runtime/os_interface/windows/os_interface.h" +#include "core/os_interface/windows/os_interface.h" #include "test.h" TEST(osInterfaceTests, osInterfaceLocalMemoryEnabledByDefault) { diff --git a/unit_tests/windows/wddm_create_tests.cpp b/unit_tests/windows/wddm_create_tests.cpp index fdb0a7ae19..2cbbe20bad 100644 --- a/unit_tests/windows/wddm_create_tests.cpp +++ b/unit_tests/windows/wddm_create_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2019 Intel Corporation + * Copyright (C) 2018-2020 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -7,8 +7,8 @@ #include "core/execution_environment/root_device_environment.h" #include "core/helpers/hw_info.h" +#include "core/os_interface/windows/wddm/wddm.h" #include "core/unit_tests/helpers/debug_manager_state_restore.h" -#include "runtime/os_interface/windows/wddm/wddm.h" #include "test.h" #include "unit_tests/mocks/mock_execution_environment.h"