From 7b1d19eaec7e3a8bf9bc0a581bcd6bb5d725aeb3 Mon Sep 17 00:00:00 2001 From: "Milczarek, Slawomir" Date: Sat, 27 Oct 2018 14:46:29 -0700 Subject: [PATCH] Moved header with engine node definitions Change-Id: Iaa78bb0584589e354b1bb469b729844121decb8f --- runtime/command_stream/CMakeLists.txt | 1 + runtime/{helpers => command_stream/definitions}/engine_node.h | 0 runtime/device/device.h | 2 +- runtime/gen10/hw_info_cnl.inl | 2 +- runtime/gen8/hw_info_bdw.inl | 2 +- runtime/gen9/hw_info_bxt.inl | 2 +- runtime/gen9/hw_info_cfl.inl | 2 +- runtime/gen9/hw_info_glk.inl | 2 +- runtime/gen9/hw_info_kbl.inl | 2 +- runtime/gen9/hw_info_skl.inl | 2 +- runtime/helpers/CMakeLists.txt | 1 - runtime/helpers/completion_stamp.h | 2 +- runtime/helpers/hw_info.h | 2 +- runtime/os_interface/linux/drm_engine_mapper.h | 2 +- runtime/os_interface/windows/wddm_engine_mapper.h | 2 +- 15 files changed, 13 insertions(+), 13 deletions(-) rename runtime/{helpers => command_stream/definitions}/engine_node.h (100%) diff --git a/runtime/command_stream/CMakeLists.txt b/runtime/command_stream/CMakeLists.txt index c7336e94d6..b2cb1c18df 100644 --- a/runtime/command_stream/CMakeLists.txt +++ b/runtime/command_stream/CMakeLists.txt @@ -24,6 +24,7 @@ set(RUNTIME_SRCS_COMMAND_STREAM ${CMAKE_CURRENT_SOURCE_DIR}/create_command_stream_impl.h ${CMAKE_CURRENT_SOURCE_DIR}/csr_definitions.h ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/command_stream_receiver_simulated_hw.h + ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/engine_node.h ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_simulated_common_hw.h ${CMAKE_CURRENT_SOURCE_DIR}/device_command_stream.h ${CMAKE_CURRENT_SOURCE_DIR}/experimental_command_buffer.cpp diff --git a/runtime/helpers/engine_node.h b/runtime/command_stream/definitions/engine_node.h similarity index 100% rename from runtime/helpers/engine_node.h rename to runtime/command_stream/definitions/engine_node.h diff --git a/runtime/device/device.h b/runtime/device/device.h index d9c1ae6b90..8672278941 100644 --- a/runtime/device/device.h +++ b/runtime/device/device.h @@ -6,12 +6,12 @@ */ #pragma once +#include "engine_node.h" #include "runtime/api/cl_types.h" #include "runtime/device/device_info_map.h" #include "runtime/execution_environment/execution_environment.h" #include "runtime/helpers/base_object.h" #include "runtime/helpers/hw_info.h" -#include "runtime/helpers/engine_node.h" #include "runtime/memory_manager/memory_constants.h" #include "runtime/os_interface/performance_counters.h" #include diff --git a/runtime/gen10/hw_info_cnl.inl b/runtime/gen10/hw_info_cnl.inl index 22b0dbda5d..9f15047ac9 100644 --- a/runtime/gen10/hw_info_cnl.inl +++ b/runtime/gen10/hw_info_cnl.inl @@ -5,10 +5,10 @@ * */ +#include "engine_node.h" #include "hw_cmds.h" #include "hw_info.h" #include "runtime/aub_mem_dump/aub_services.h" -#include "runtime/helpers/engine_node.h" #include "runtime/memory_manager/memory_constants.h" namespace OCLRT { diff --git a/runtime/gen8/hw_info_bdw.inl b/runtime/gen8/hw_info_bdw.inl index 819e33d597..818548f75c 100644 --- a/runtime/gen8/hw_info_bdw.inl +++ b/runtime/gen8/hw_info_bdw.inl @@ -5,10 +5,10 @@ * */ +#include "engine_node.h" #include "hw_cmds.h" #include "hw_info.h" #include "runtime/aub_mem_dump/aub_services.h" -#include "runtime/helpers/engine_node.h" #include "runtime/memory_manager/memory_constants.h" namespace OCLRT { diff --git a/runtime/gen9/hw_info_bxt.inl b/runtime/gen9/hw_info_bxt.inl index e4a3fcd2f8..2228d029bb 100644 --- a/runtime/gen9/hw_info_bxt.inl +++ b/runtime/gen9/hw_info_bxt.inl @@ -5,10 +5,10 @@ * */ +#include "engine_node.h" #include "hw_cmds.h" #include "hw_info_bxt.h" #include "runtime/aub_mem_dump/aub_services.h" -#include "runtime/helpers/engine_node.h" #include "runtime/memory_manager/memory_constants.h" namespace OCLRT { diff --git a/runtime/gen9/hw_info_cfl.inl b/runtime/gen9/hw_info_cfl.inl index 2c25e8c370..551648e7ef 100644 --- a/runtime/gen9/hw_info_cfl.inl +++ b/runtime/gen9/hw_info_cfl.inl @@ -5,10 +5,10 @@ * */ +#include "engine_node.h" #include "hw_cmds.h" #include "hw_info_cfl.h" #include "runtime/aub_mem_dump/aub_services.h" -#include "runtime/helpers/engine_node.h" #include "runtime/memory_manager/memory_constants.h" namespace OCLRT { diff --git a/runtime/gen9/hw_info_glk.inl b/runtime/gen9/hw_info_glk.inl index b072731b48..687c302513 100644 --- a/runtime/gen9/hw_info_glk.inl +++ b/runtime/gen9/hw_info_glk.inl @@ -5,10 +5,10 @@ * */ +#include "engine_node.h" #include "hw_cmds.h" #include "hw_info_glk.h" #include "runtime/aub_mem_dump/aub_services.h" -#include "runtime/helpers/engine_node.h" #include "runtime/memory_manager/memory_constants.h" namespace OCLRT { diff --git a/runtime/gen9/hw_info_kbl.inl b/runtime/gen9/hw_info_kbl.inl index 675b8cf320..0b2a68317f 100644 --- a/runtime/gen9/hw_info_kbl.inl +++ b/runtime/gen9/hw_info_kbl.inl @@ -5,10 +5,10 @@ * */ +#include "engine_node.h" #include "hw_cmds.h" #include "hw_info_kbl.h" #include "runtime/aub_mem_dump/aub_services.h" -#include "runtime/helpers/engine_node.h" #include "runtime/memory_manager/memory_constants.h" namespace OCLRT { diff --git a/runtime/gen9/hw_info_skl.inl b/runtime/gen9/hw_info_skl.inl index 3a63070fc2..964e475dca 100644 --- a/runtime/gen9/hw_info_skl.inl +++ b/runtime/gen9/hw_info_skl.inl @@ -5,10 +5,10 @@ * */ +#include "engine_node.h" #include "hw_cmds.h" #include "hw_info_skl.h" #include "runtime/aub_mem_dump/aub_services.h" -#include "runtime/helpers/engine_node.h" #include "runtime/memory_manager/memory_constants.h" namespace OCLRT { diff --git a/runtime/helpers/CMakeLists.txt b/runtime/helpers/CMakeLists.txt index 774c658c06..027f6a4d04 100644 --- a/runtime/helpers/CMakeLists.txt +++ b/runtime/helpers/CMakeLists.txt @@ -28,7 +28,6 @@ set(RUNTIME_SRCS_HELPERS_BASE ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info.h ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_info_builder.h ${CMAKE_CURRENT_SOURCE_DIR}/enable_product.inl - ${CMAKE_CURRENT_SOURCE_DIR}/engine_node.h ${CMAKE_CURRENT_SOURCE_DIR}/error_mappers.h ${CMAKE_CURRENT_SOURCE_DIR}/extendable_enum.h ${CMAKE_CURRENT_SOURCE_DIR}/file_io.cpp diff --git a/runtime/helpers/completion_stamp.h b/runtime/helpers/completion_stamp.h index 7ce7193e49..7e7c0913bc 100644 --- a/runtime/helpers/completion_stamp.h +++ b/runtime/helpers/completion_stamp.h @@ -6,7 +6,7 @@ */ #pragma once -#include "runtime/helpers/engine_node.h" +#include "engine_node.h" #include namespace OCLRT { diff --git a/runtime/helpers/hw_info.h b/runtime/helpers/hw_info.h index e5f7db27f6..1fafc10487 100644 --- a/runtime/helpers/hw_info.h +++ b/runtime/helpers/hw_info.h @@ -6,11 +6,11 @@ */ #pragma once +#include "engine_node.h" #include "gtsysinfo.h" #include "igfxfmid.h" #include "sku_info.h" -#include "runtime/helpers/engine_node.h" #include "runtime/helpers/kmd_notify_properties.h" #include #include diff --git a/runtime/os_interface/linux/drm_engine_mapper.h b/runtime/os_interface/linux/drm_engine_mapper.h index daf13a79d0..8a5a0d9a19 100644 --- a/runtime/os_interface/linux/drm_engine_mapper.h +++ b/runtime/os_interface/linux/drm_engine_mapper.h @@ -7,7 +7,7 @@ #pragma once -#include "runtime/helpers/engine_node.h" +#include "engine_node.h" #include diff --git a/runtime/os_interface/windows/wddm_engine_mapper.h b/runtime/os_interface/windows/wddm_engine_mapper.h index 2c23ac68f0..b7e807be81 100644 --- a/runtime/os_interface/windows/wddm_engine_mapper.h +++ b/runtime/os_interface/windows/wddm_engine_mapper.h @@ -7,7 +7,7 @@ #pragma once -#include "runtime/helpers/engine_node.h" +#include "engine_node.h" #include "runtime/helpers/hw_info.h" #include "runtime/os_interface/windows/wddm/wddm.h"