hw_cmds.h usage refactor

create header with include for DEFAULT_PLATFORM what can be used in some
places

Signed-off-by: Artur Harasimiuk <[email protected]>

Author: ArturHarasimiuk

CMakeLists.txt

@@ -840,6 +840,7 @@ configure_file(config.h.in ${NEO_BUILD_DIR}/config.h)
 configure_file(driver_version.h.in ${NEO_BUILD_DIR}/driver_version.h) # Put Driver version into define
 configure_file(lib_names.h.in ${NEO_BUILD_DIR}/lib_names.h)
 configure_file(test_files_setup.h.in ${NEO_BUILD_DIR}/test_files_setup.h)
+configure_file(hw_cmds_default.h.in ${NEO_BUILD_DIR}/hw_cmds_default.h)
 
 if(BUILD_WITH_L0)
   add_subdirectory_unique(level_zero)

cmake/setup_platform_flags.cmake

@@ -237,7 +237,6 @@ if(SUPPORT_GEN12LP)
 endif()
 
 if(SUPPORT_XE_HP_CORE)
-  SET_FLAGS_FOR("XE_HP_CORE")
   set(CORE_XE_HP_CORE_REVISIONS 4)
   if(TESTS_XE_HP_CORE)
     if(TESTS_XE_HP_SDV)

hw_cmds_default.h.in

@@ -0,0 +1,10 @@
+/*
+ * Copyright (C) 2018-2022 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+
+#include "shared/source/${MAP_${DEFAULT_SUPPORTED_PLATFORM}_CORE_lower}/hw_cmds_${MAP_${DEFAULT_SUPPORTED_PLATFORM}_lower}.h"

level_zero/core/test/unit_tests/main.cpp

@@ -28,7 +28,7 @@
 #include "level_zero/core/source/compiler_interface/l0_reg_path.h"
 
 #include "gmock/gmock.h"
-#include "hw_cmds.h"
+#include "hw_cmds_default.h"
 #include "igfxfmid.h"
 
 #include <fstream>

opencl/test/unit_test/main.cpp

@@ -32,7 +32,7 @@
 #include "opencl/test/unit_test/ult_config_listener.h"
 
 #include "gmock/gmock.h"
-#include "hw_cmds.h"
+#include "hw_cmds_default.h"
 #include "test_files_setup.h"
 
 #include <algorithm>

opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp

@@ -20,7 +20,7 @@
 
 #include "environment.h"
 #include "gtest/gtest.h"
-#include "hw_cmds.h"
+#include "hw_cmds_default.h"
 
 #include <algorithm>
 #include <array>

platforms.cmake

@@ -154,6 +154,10 @@ macro(SET_FLAGS_FOR CORE_TYPE)
         set(TESTS_${CORE_TYPE} TRUE CACHE BOOL "Build ULTs for ${CORE_TYPE} devices" FORCE)
       endif()
     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}_lower ${MAP_${SKU_NAME}_lower} CACHE STRING "SKU in lower case" FORCE)
   endforeach()
 
   set(SUPPORT_${CORE_TYPE} ${SUPPORT_GEN_DEFAULT} CACHE BOOL "Support ${CORE_TYPE} devices")

shared/source/dll/get_devices.cpp

@@ -9,7 +9,7 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 
-#include "hw_cmds.h"
+#include "hw_cmds_default.h"
 
 namespace NEO {
 

shared/source/xe_hp_core/hw_cmds.h

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
 #ifdef SUPPORT_XE_HP_SDV
-#include "hw_cmds_xehp.h"
+#include "hw_cmds_xe_hp_sdv.h"
 #endif