Move files to core

JablonskiMateusz · Compute-Runtime-Automation · commit c7755c2c485d · 2019-12-11T17:39:14.000+01:00
engine_node_helper
kmdaf_listener
wddm_engine_mapper
windows_defs

Related-To: NEO-3982
Change-Id: Ia39342059bdeafa97d17f286c167138e5c40553c
Signed-off-by: Mateusz Jablonski &lt;mateusz.jablonski@intel.com&gt;
diff --git a/core/helpers/CMakeLists.txt b/core/helpers/CMakeLists.txt
@@ -16,6 +16,8 @@ set(NEO_CORE_HELPERS
   ${CMAKE_CURRENT_SOURCE_DIR}/completion_stamp.h
   ${CMAKE_CURRENT_SOURCE_DIR}/debug_helpers.h
   ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_helper.h
+  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/engine_node_helper.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/engine_node_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/extendable_enum.h
   ${CMAKE_CURRENT_SOURCE_DIR}/file_io.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/file_io.h
diff --git a/core/helpers/engine_node_helper.cpp b/core/helpers/engine_node_helper.cpp
diff --git a/core/helpers/engine_node_helper.h b/core/helpers/engine_node_helper.h
diff --git a/core/os_interface/windows/CMakeLists.txt b/core/os_interface/windows/CMakeLists.txt
@@ -4,15 +4,26 @@
 # SPDX-License-Identifier: MIT
 #
 
+if(KMDAF_HEADERS_DIR)
+  set(KMDAF_FILE_SUFFIX "")
+else()
+  set(KMDAF_FILE_SUFFIX "_stub")
+endif()
+
 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}/kmdaf_listener${KMDAF_FILE_SUFFIX}.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/kmdaf_listener.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
   ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_win.h
   ${CMAKE_CURRENT_SOURCE_DIR}/print.cpp
+  ${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
   ${CMAKE_CURRENT_SOURCE_DIR}/windows_wrapper.h
 )
 
diff --git a/core/os_interface/windows/kmdaf_listener.cpp b/core/os_interface/windows/kmdaf_listener.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/windows/kmdaf_listener.h"
+#include "core/os_interface/windows/kmdaf_listener.h"
 #pragma warning(push)           // save the current state
 #pragma warning(disable : 4189) // disable warning 4189 (unused local variable)
 #include "kmdaf.h"
diff --git a/core/os_interface/windows/kmdaf_listener.h b/core/os_interface/windows/kmdaf_listener.h
diff --git a/core/os_interface/windows/kmdaf_listener_stub.cpp b/core/os_interface/windows/kmdaf_listener_stub.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/windows/kmdaf_listener.h"
+#include "core/os_interface/windows/kmdaf_listener.h"
 
 namespace NEO {
 
diff --git a/core/os_interface/windows/wddm_engine_mapper.cpp b/core/os_interface/windows/wddm_engine_mapper.cpp
@@ -5,9 +5,9 @@
  *
  */
 
-#include "runtime/os_interface/windows/wddm_engine_mapper.h"
+#include "core/os_interface/windows/wddm_engine_mapper.h"
 
-#include "core/helpers/hw_cmds.h"
+#include "core/helpers/debug_helpers.h"
 
 namespace NEO {
 
diff --git a/core/os_interface/windows/wddm_engine_mapper.h b/core/os_interface/windows/wddm_engine_mapper.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "runtime/os_interface/windows/wddm/wddm.h"
+#include "core/gmm_helper/gmm_lib.h"
 
 #include "engine_node.h"
 
diff --git a/core/os_interface/windows/windows_defs.h b/core/os_interface/windows/windows_defs.h
diff --git a/runtime/command_queue/enqueue_common.h b/runtime/command_queue/enqueue_common.h
@@ -6,6 +6,7 @@
  */
 
 #pragma once
+#include "core/helpers/engine_node_helper.h"
 #include "core/helpers/options.h"
 #include "core/program/sync_buffer_handler.h"
 #include "core/utilities/range.h"
@@ -21,7 +22,6 @@
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/array_count.h"
 #include "runtime/helpers/dispatch_info_builder.h"
-#include "runtime/helpers/engine_node_helper.h"
 #include "runtime/helpers/enqueue_properties.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/task_information.h"
diff --git a/runtime/command_queue/gpgpu_walker_base.inl b/runtime/command_queue/gpgpu_walker_base.inl
@@ -8,6 +8,7 @@
 #pragma once
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/debug_helpers.h"
+#include "core/helpers/engine_node_helper.h"
 #include "core/helpers/hw_helper.h"
 #include "core/indirect_heap/indirect_heap.h"
 #include "core/memory_manager/graphics_allocation.h"
@@ -18,7 +19,6 @@
 #include "runtime/device/device_info.h"
 #include "runtime/event/perf_counter.h"
 #include "runtime/event/user_event.h"
-#include "runtime/helpers/engine_node_helper.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "runtime/helpers/queue_helpers.h"
 #include "runtime/helpers/validators.h"
diff --git a/runtime/command_queue/hardware_interface_bdw_plus.inl b/runtime/command_queue/hardware_interface_bdw_plus.inl
@@ -6,8 +6,8 @@
  */
 
 #pragma once
+#include "core/helpers/engine_node_helper.h"
 #include "runtime/command_queue/hardware_interface_base.inl"
-#include "runtime/helpers/engine_node_helper.h"
 #include "runtime/os_interface/os_context.h"
 
 namespace NEO {
diff --git a/runtime/command_stream/aub_command_stream_receiver_hw_base.inl b/runtime/command_stream/aub_command_stream_receiver_hw_base.inl
@@ -8,6 +8,7 @@
 #include "core/execution_environment/root_device_environment.h"
 #include "core/helpers/aligned_memory.h"
 #include "core/helpers/debug_helpers.h"
+#include "core/helpers/engine_node_helper.h"
 #include "core/helpers/hash.h"
 #include "core/helpers/ptr_math.h"
 #include "core/helpers/string.h"
@@ -22,7 +23,6 @@
 #include "runtime/command_stream/aub_subcapture.h"
 #include "runtime/command_stream/command_stream_receiver.h"
 #include "runtime/execution_environment/execution_environment.h"
-#include "runtime/helpers/engine_node_helper.h"
 #include "runtime/helpers/hardware_context_controller.h"
 #include "runtime/helpers/neo_driver_version.h"
 #include "runtime/memory_manager/memory_banks.h"
diff --git a/runtime/gmm_helper/gmm_memory_base.cpp b/runtime/gmm_helper/gmm_memory_base.cpp
@@ -8,7 +8,7 @@
 #include "runtime/gmm_helper/gmm_memory_base.h"
 
 #include "core/gmm_helper/gmm_helper.h"
-#include "runtime/os_interface/windows/windows_defs.h"
+#include "core/os_interface/windows/windows_defs.h"
 #include "runtime/platform/platform.h"
 
 #include "gmm_client_context.h"
diff --git a/runtime/helpers/CMakeLists.txt b/runtime/helpers/CMakeLists.txt
@@ -26,8 +26,6 @@ set(RUNTIME_SRCS_HELPERS_BASE
   ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info_builder.h
   ${CMAKE_CURRENT_SOURCE_DIR}/enable_product.inl
   ${CMAKE_CURRENT_SOURCE_DIR}/engine_control.h
-  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/engine_node_helper.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/engine_node_helper.h
   ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_properties.h
   ${CMAKE_CURRENT_SOURCE_DIR}/error_mappers.h
   ${CMAKE_CURRENT_SOURCE_DIR}/flat_batch_buffer_helper.h
diff --git a/runtime/helpers/task_information.cpp b/runtime/helpers/task_information.cpp
@@ -10,6 +10,7 @@
 #include "core/command_stream/linear_stream.h"
 #include "core/command_stream/preemption.h"
 #include "core/helpers/aligned_memory.h"
+#include "core/helpers/engine_node_helper.h"
 #include "core/helpers/string.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/command_queue/command_queue.h"
@@ -19,7 +20,6 @@
 #include "runtime/device_queue/device_queue.h"
 #include "runtime/gtpin/gtpin_notify.h"
 #include "runtime/helpers/csr_deps.h"
-#include "runtime/helpers/engine_node_helper.h"
 #include "runtime/helpers/enqueue_properties.h"
 #include "runtime/helpers/task_information.inl"
 #include "runtime/mem_obj/mem_obj.h"
diff --git a/runtime/os_interface/windows/CMakeLists.txt b/runtime/os_interface/windows/CMakeLists.txt
@@ -4,12 +4,6 @@
 # SPDX-License-Identifier: MIT
 #
 
-if(KMDAF_HEADERS_DIR)
-  set(KMDAF_FILE_SUFFIX "")
-else()
-  set(KMDAF_FILE_SUFFIX "_stub")
-endif()
-
 set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/api_win.cpp
@@ -25,8 +19,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${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}/kmdaf_listener${KMDAF_FILE_SUFFIX}.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/kmdaf_listener.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
@@ -48,8 +40,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${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}${BRANCH_DIR_SUFFIX}/wddm_engine_mapper.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/wddm_engine_mapper.h
   ${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
@@ -59,7 +49,6 @@ set(RUNTIME_SRCS_OS_INTERFACE_WINDOWS
   ${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_defs.h
   ${CMAKE_CURRENT_SOURCE_DIR}/windows_inc.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/wddm/wddm.cpp
diff --git a/runtime/os_interface/windows/wddm/wddm.cpp b/runtime/os_interface/windows/wddm/wddm.cpp
@@ -11,6 +11,8 @@
 #include "core/gmm_helper/gmm_helper.h"
 #include "core/helpers/interlocked_max.h"
 #include "core/os_interface/windows/debug_registry_reader.h"
+#include "core/os_interface/windows/kmdaf_listener.h"
+#include "core/os_interface/windows/wddm_engine_mapper.h"
 #include "core/sku_info/operations/windows/sku_info_receiver.h"
 #include "core/utilities/stackvec.h"
 #include "runtime/execution_environment/execution_environment.h"
@@ -20,12 +22,10 @@
 #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/kmdaf_listener.h"
 #include "runtime/os_interface/windows/os_context_win.h"
 #include "runtime/os_interface/windows/sys_calls.h"
 #include "runtime/os_interface/windows/wddm/wddm_interface.h"
 #include "runtime/os_interface/windows/wddm_allocation.h"
-#include "runtime/os_interface/windows/wddm_engine_mapper.h"
 #include "runtime/os_interface/windows/wddm_residency_allocations_container.h"
 #include "runtime/platform/platform.h"
 
diff --git a/runtime/os_interface/windows/wddm_residency_allocations_container.h b/runtime/os_interface/windows/wddm_residency_allocations_container.h
@@ -7,8 +7,8 @@
 
 #pragma once
 #include "core/memory_manager/memory_operations_status.h"
+#include "core/os_interface/windows/windows_defs.h"
 #include "core/utilities/spinlock.h"
-#include "runtime/os_interface/windows/windows_defs.h"
 
 #include <mutex>
 #include <vector>
diff --git a/runtime/os_interface/windows/wddm_residency_controller.h b/runtime/os_interface/windows/wddm_residency_controller.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
+#include "core/os_interface/windows/windows_defs.h"
 #include "core/os_interface/windows/windows_wrapper.h"
 #include "core/utilities/spinlock.h"
 #include "runtime/memory_manager/residency_container.h"
-#include "runtime/os_interface/windows/windows_defs.h"
 
 #include <atomic>
 #include <mutex>
diff --git a/unit_tests/helpers/hardware_commands_helper_tests.cpp b/unit_tests/helpers/hardware_commands_helper_tests.cpp
@@ -8,13 +8,13 @@
 #include "unit_tests/helpers/hardware_commands_helper_tests.h"
 
 #include "core/helpers/basic_math.h"
+#include "core/helpers/engine_node_helper.h"
 #include "core/memory_manager/unified_memory_manager.h"
 #include "core/unit_tests/helpers/debug_manager_state_restore.h"
 #include "core/unit_tests/utilities/base_object_utils.h"
 #include "runtime/api/api.h"
 #include "runtime/built_ins/builtins_dispatch_builder.h"
 #include "runtime/command_queue/command_queue_hw.h"
-#include "runtime/helpers/engine_node_helper.h"
 #include "runtime/helpers/hardware_commands_helper.h"
 #include "unit_tests/fixtures/execution_model_kernel_fixture.h"
 #include "unit_tests/fixtures/hello_world_fixture.h"
diff --git a/unit_tests/mocks/mock_gmm_memory_base.h b/unit_tests/mocks/mock_gmm_memory_base.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/os_interface/windows/windows_defs.h"
+#include "core/os_interface/windows/windows_defs.h"
 
 #include "gmm_memory.h"
 #include "gmock/gmock.h"
diff --git 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/windows_defs.h"
 #include "runtime/os_interface/windows/wddm/wddm.h"
 #include "runtime/os_interface/windows/wddm_residency_allocations_container.h"
-#include "runtime/os_interface/windows/windows_defs.h"
 #include "unit_tests/mocks/wddm_mock_helpers.h"
 
 #include "gmock/gmock.h"
diff --git a/unit_tests/mocks/wddm_mock_helpers.h b/unit_tests/mocks/wddm_mock_helpers.h
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "core/memory_manager/eviction_status.h"
-#include "runtime/os_interface/windows/windows_defs.h"
+#include "core/os_interface/windows/windows_defs.h"
 
 #include <vector>
 
diff --git a/unit_tests/os_interface/windows/mock_kmdaf_listener.h b/unit_tests/os_interface/windows/mock_kmdaf_listener.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "runtime/os_interface/windows/kmdaf_listener.h"
+#include "core/os_interface/windows/kmdaf_listener.h"
 
 namespace NEO {
 
diff --git a/unit_tests/os_interface/windows/wddm20_tests.cpp b/unit_tests/os_interface/windows/wddm20_tests.cpp
@@ -9,6 +9,7 @@
 #include "core/helpers/hw_info.h"
 #include "core/helpers/options.h"
 #include "core/os_interface/os_library.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/gmm_helper/gmm.h"
@@ -18,7 +19,6 @@
 #include "runtime/os_interface/windows/os_interface.h"
 #include "runtime/os_interface/windows/wddm/wddm_interface.h"
 #include "runtime/os_interface/windows/wddm_allocation.h"
-#include "runtime/os_interface/windows/wddm_engine_mapper.h"
 #include "runtime/os_interface/windows/wddm_memory_manager.h"
 #include "unit_tests/helpers/variable_backup.h"
 #include "unit_tests/mocks/mock_gfx_partition.h"
diff --git a/unit_tests/os_interface/windows/wddm_mapper_tests.cpp b/unit_tests/os_interface/windows/wddm_mapper_tests.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "runtime/os_interface/windows/wddm_engine_mapper.h"
+#include "core/os_interface/windows/wddm_engine_mapper.h"
 #include "test.h"
 
 using namespace NEO;

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`*/`
`7`	`7`
`8`		`-#include "runtime/os_interface/windows/kmdaf_listener.h"`
	`8`	`+#include "core/os_interface/windows/kmdaf_listener.h"`
`9`	`9`	`#pragma warning(push) // save the current state`
`10`	`10`	`#pragma warning(disable : 4189) // disable warning 4189 (unused local variable)`
`11`	`11`	`#include "kmdaf.h"`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`	`*`
`6`	`6`	`*/`
`7`	`7`
`8`		`-#include "runtime/os_interface/windows/wddm_engine_mapper.h"`
	`8`	`+#include "core/os_interface/windows/wddm_engine_mapper.h"`
`9`	`9`
`10`		`-#include "core/helpers/hw_cmds.h"`
	`10`	`+#include "core/helpers/debug_helpers.h"`
`11`	`11`
`12`	`12`	`namespace NEO {`
`13`	`13`