hw_cmds.h for XE refactor

Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>

CMakeLists.txt

@@ -293,6 +293,8 @@ else()
   add_definitions(-DPURGE_DEBUG_KEY_NAMES=0)
 endif()
 
+set_property(GLOBAL PROPERTY NEO_INCLUDE_DIRECTORIES "")
+
 if(NOT NEO_SKIP_UNIT_TESTS)
   if(NOT DEFINED GTEST_REPEAT)
     set(GTEST_REPEAT 1)
@@ -818,6 +820,9 @@ endif()
 
 add_subdirectory_unique(shared)
 
+get_property(NEO_INCLUDE_DIRECTORIES GLOBAL PROPERTY NEO_INCLUDE_DIRECTORIES)
+include_directories(${NEO_INCLUDE_DIRECTORIES})
+
 if(NEO_BUILD_WITH_OCL)
   add_subdirectory_unique(opencl)
 else()

level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.cpp

@@ -5,8 +5,6 @@
  *
  */
 
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
-
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw.inl"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
@@ -14,6 +12,7 @@
 #include "level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl"
 
 #include "cmdlist_extended.inl"
+#include "hw_cmds_xe_hpc_core_base.h"
 
 namespace L0 {
 template <>

level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.h

@@ -7,7 +7,7 @@
 
 #pragma once
 #include "shared/source/helpers/logical_state_helper.h"
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"

level_zero/core/source/xe_hpc_core/pvc/cmdlist_pvc.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 #include "level_zero/core/source/xe_hpc_core/cmdlist_xe_hpc_core.h"
 

level_zero/core/source/xe_hpc_core/pvc/kernel_pvc.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 #include "level_zero/core/source/kernel/kernel_hw.h"
 

level_zero/core/source/xe_hpg_core/cmdlist_xe_hpg_core.cpp

@@ -5,8 +5,6 @@
  *
  */
 
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
-
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw.inl"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"
@@ -14,6 +12,7 @@
 #include "level_zero/core/source/cmdlist/cmdlist_hw_xehp_and_later.inl"
 
 #include "cmdlist_extended.inl"
+#include "hw_cmds_xe_hpg_core_base.h"
 
 namespace L0 {
 

level_zero/core/source/xe_hpg_core/cmdlist_xe_hpg_core.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include "shared/source/helpers/logical_state_helper.h"
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 #include "level_zero/core/source/cmdlist/cmdlist_hw.h"
 #include "level_zero/core/source/cmdlist/cmdlist_hw_immediate.h"

level_zero/core/source/xe_hpg_core/dg2/kernel_dg2.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 #include "level_zero/core/source/kernel/kernel_hw.h"
 

opencl/source/xe_hpc_core/image_xe_hpc_core.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 #include "opencl/source/mem_obj/image.inl"
 

opencl/source/xe_hpc_core/sampler_xe_hpc_core.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 using Family = NEO::XE_HPC_COREFamily;
 constexpr static auto gfxCore = IGFX_XE_HPC_CORE;
 #include "opencl/source/sampler/sampler_tgllp_and_later.inl"

opencl/source/xe_hpg_core/image_xe_hpg_core.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 #include "opencl/source/mem_obj/image.inl"
 

opencl/source/xe_hpg_core/sampler_xe_hpg_core.cpp

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 using Family = NEO::XE_HPG_COREFamily;
 constexpr static auto gfxCore = IGFX_XE_HPG_CORE;
 

platforms.cmake

@@ -156,7 +156,7 @@ macro(SET_FLAGS_FOR CORE_TYPE)
     endif()
     string(TOLOWER ${CORE_TYPE} MAP_${SKU_NAME}_CORE_lower)
     string(TOLOWER ${SKU_NAME} MAP_${SKU_NAME}_lower)
-    set(MAP_${SKU_NAME}_CORE_lower "${CORE_PREFIX}${MAP_${SKU_NAME}_CORE_lower}" CACHE STRING "Core name for SKU" FORCE)
+    set(MAP_${SKU_NAME}_CORE_lower "${CORE_PREFIX}${MAP_${SKU_NAME}_CORE_lower}${CORE_SUFFIX}" CACHE STRING "Core name for SKU" FORCE)
     set(MAP_${SKU_NAME}_lower ${MAP_${SKU_NAME}_lower} CACHE STRING "SKU in lower case" FORCE)
   endforeach()
 

shared/source/xe_hpc_core/CMakeLists.txt

@@ -6,4 +6,6 @@
 
 if(SUPPORT_XE_HPC_CORE)
   add_subdirectories()
+
+  set_property(GLOBAL APPEND PROPERTY NEO_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}")
 endif()

shared/source/xe_hpc_core/aub_mem_dump_xe_hpc_core.cpp

@@ -7,7 +7,7 @@
 
 #include "shared/source/aub/aub_helper_xehp_and_later.inl"
 #include "shared/source/aub_mem_dump/aub_mem_dump.h"
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 namespace NEO {
 struct XE_HPC_COREFamily;

shared/source/xe_hpc_core/command_encoder_xe_hpc_core.cpp

@@ -13,7 +13,7 @@
 #include "shared/source/helpers/constants.h"
 #include "shared/source/kernel/grf_config.h"
 #include "shared/source/utilities/lookup_array.h"
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 using Family = NEO::XE_HPC_COREFamily;
 

shared/source/xe_hpc_core/hw_cmds.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 #ifdef SUPPORT_PVC
 #include "hw_cmds_pvc.h"

shared/source/xe_hpc_core/hw_cmds_pvc.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 #include "device_ids_configs_pvc.h"
 

shared/source/xe_hpc_core/image_core_xe_hpc_core.cpp

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #include "shared/source/image/image_surface_state.h"
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 namespace NEO {
 

shared/source/xe_hpc_core/implicit_scaling_xe_hpc_core.cpp

@@ -9,7 +9,7 @@
 #include "shared/source/command_container/implicit_scaling_xehp_and_later.inl"
 #include "shared/source/helpers/api_specific_config.h"
 #include "shared/source/os_interface/hw_info_config.h"
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 namespace NEO {
 

shared/source/xe_hpc_core/preemption_xe_hpc_core.cpp

@@ -7,7 +7,7 @@
 
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/command_stream/preemption.inl"
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 namespace NEO {
 

shared/source/xe_hpc_core/windows/command_stream_receiver_xe_hpc_core.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
 #include "shared/source/os_interface/windows/device_command_stream.inl"
 #include "shared/source/os_interface/windows/wddm_device_command_stream.inl"
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 namespace NEO {
 

shared/source/xe_hpc_core/windows/direct_submission_xe_hpc_core.cpp

@@ -13,7 +13,7 @@
 #include "shared/source/direct_submission/dispatchers/dispatcher.inl"
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl"
 #include "shared/source/direct_submission/windows/wddm_direct_submission.inl"
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 namespace NEO {
 using GfxFamily = XE_HPC_COREFamily;

shared/source/xe_hpc_core/windows/gmm_callbacks_xe_hpc_core.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl"
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 namespace NEO {
 

shared/source/xe_hpg_core/CMakeLists.txt

@@ -1,9 +1,11 @@
 #
-# Copyright (C) 2021 Intel Corporation
+# Copyright (C) 2021-2022 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(SUPPORT_XE_HPG_CORE)
   add_subdirectories()
+
+  set_property(GLOBAL APPEND PROPERTY NEO_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}")
 endif()

shared/source/xe_hpg_core/aub_mem_dump_xe_hpg_core.cpp

@@ -7,7 +7,7 @@
 
 #include "shared/source/aub/aub_helper_xehp_and_later.inl"
 #include "shared/source/aub_mem_dump/aub_mem_dump.h"
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 namespace NEO {
 struct XE_HPG_COREFamily;

shared/source/xe_hpg_core/command_encoder_xe_hpg_core.cpp

@@ -12,7 +12,7 @@
 #include "shared/source/command_stream/stream_properties.h"
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/utilities/lookup_array.h"
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 using Family = NEO::XE_HPG_COREFamily;
 

shared/source/xe_hpg_core/hw_cmds.h

@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 #ifdef SUPPORT_DG2
 #include "hw_cmds_dg2.h"

shared/source/xe_hpg_core/hw_cmds_dg2.h

@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 #include "device_ids_configs_dg2.h"
 

shared/source/xe_hpg_core/image_core_xe_hpg_core.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/image/image_surface_state.h"
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 namespace NEO {
 

shared/source/xe_hpg_core/implicit_scaling_xe_hpg_core.cpp

@@ -7,7 +7,7 @@
 
 #include "shared/source/command_container/implicit_scaling.h"
 #include "shared/source/command_container/implicit_scaling_xehp_and_later.inl"
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 namespace NEO {
 

shared/source/xe_hpg_core/preemption_xe_hpg_core.cpp

@@ -7,7 +7,7 @@
 
 #include "shared/source/command_stream/preemption.h"
 #include "shared/source/command_stream/preemption.inl"
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 namespace NEO {
 

shared/source/xe_hpg_core/windows/command_stream_receiver_xe_hpg_core.cpp

@@ -8,7 +8,7 @@
 #include "shared/source/command_stream/command_stream_receiver_with_aub_dump.inl"
 #include "shared/source/os_interface/windows/device_command_stream.inl"
 #include "shared/source/os_interface/windows/wddm_device_command_stream.inl"
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 namespace NEO {
 

shared/source/xe_hpg_core/windows/direct_submission_xe_hpg_core.cpp

@@ -13,7 +13,7 @@
 #include "shared/source/direct_submission/dispatchers/dispatcher.inl"
 #include "shared/source/direct_submission/dispatchers/render_dispatcher.inl"
 #include "shared/source/direct_submission/windows/wddm_direct_submission.inl"
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 namespace NEO {
 using GfxFamily = XE_HPG_COREFamily;

shared/source/xe_hpg_core/windows/gmm_callbacks_xe_hpg_core.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/helpers/windows/gmm_callbacks_tgllp_and_later.inl"
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 namespace NEO {
 

shared/test/unit_test/xe_hpc_core/hw_cmds_xe_hpc_core_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/test_macros/test.h"
 
 using namespace NEO;

shared/test/unit_test/xe_hpc_core/pvc/product_config_tests_pvc.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/os_interface/hw_info_config.h"
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/fixtures/product_config_fixture.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/test_macros/test.h"

shared/test/unit_test/xe_hpg_core/dg2/product_config_tests_dg2.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "shared/source/os_interface/hw_info_config.h"
-#include "shared/source/xe_hpc_core/hw_cmds_base.h"
+#include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 #include "shared/test/common/fixtures/product_config_fixture.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/test_macros/test.h"

shared/test/unit_test/xe_hpg_core/hw_cmds_xe_hpg_core_tests.cpp

@@ -5,7 +5,7 @@
  *
  */
 
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 #include "shared/test/common/test_macros/test.h"
 
 using namespace NEO;

shared/test/unit_test/xe_hpg_core/test_encode_dispatch_kernel_xe_hpg_core.cpp

@@ -7,7 +7,7 @@
 
 #include "shared/source/command_container/command_encoder.h"
 #include "shared/source/os_interface/hw_info_config.h"
-#include "shared/source/xe_hpg_core/hw_cmds_base.h"
+#include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/test_macros/test.h"