feature: add new definitions for support of AOT configs

Related-To: NEO-11466 Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
2025-12-19 16:24:18 +08:00 · 2024-05-21 14:09:32 +00:00
parent 77beaac80c
commit a787686ac5
4 changed files with 43 additions and 1 deletions
--- a/cmake/setup_platform_flags.cmake
+++ b/cmake/setup_platform_flags.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2023 Intel Corporation
+# Copyright (C) 2020-2024 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -69,10 +69,12 @@ endif()

 # Add supported and tested platforms
 if(SUPPORT_GEN8)
+  ADD_AOT_DEFINITION(GEN8)
  if(TESTS_GEN8)
    ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN8" "Gen8Family")
  endif()
  if(SUPPORT_BDW)
+    ADD_AOT_DEFINITION(BDW)
    set(BDW_GEN8_REVISIONS 0)
    set(BDW_GEN8_RELEASES "8.0.0")
    ADD_PRODUCT("SUPPORTED" "BDW" "IGFX_BROADWELL")
@@ -87,10 +89,12 @@ if(SUPPORT_GEN8)
 endif()

 if(SUPPORT_GEN9)
+  ADD_AOT_DEFINITION(GEN9)
  if(TESTS_GEN9)
    ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN9" "Gen9Family")
  endif()
  if(SUPPORT_SKL)
+    ADD_AOT_DEFINITION(SKL)
    set(SKL_GEN9_REVISIONS 9)
    set(SKL_GEN9_RELEASES "9.0.9")
    ADD_PRODUCT("SUPPORTED" "SKL" "IGFX_SKYLAKE")
@@ -105,6 +109,8 @@ if(SUPPORT_GEN9)
  endif()

  if(SUPPORT_KBL)
+    ADD_AOT_DEFINITION(KBL)
+    ADD_AOT_DEFINITION(AML)
    set(KBL_GEN9_REVISIONS 9)
    set(KBL_GEN9_RELEASES "9.1.9")
    ADD_PRODUCT("SUPPORTED" "KBL" "IGFX_KABYLAKE")
@@ -119,6 +125,7 @@ if(SUPPORT_GEN9)
  endif()

  if(SUPPORT_GLK)
+    ADD_AOT_DEFINITION(GLK)
    set(GLK_GEN9_REVISIONS 0)
    set(GLK_GEN9_RELEASES "9.4.0")
    ADD_PRODUCT("SUPPORTED" "GLK" "IGFX_GEMINILAKE")
@@ -132,6 +139,9 @@ if(SUPPORT_GEN9)
  endif()

  if(SUPPORT_CFL)
+    ADD_AOT_DEFINITION(CFL)
+    ADD_AOT_DEFINITION(WHL)
+    ADD_AOT_DEFINITION(CML)
    set(CFL_GEN9_REVISIONS 9)
    set(CFL_GEN9_RELEASES "9.2.9")
    ADD_PRODUCT("SUPPORTED" "CFL" "IGFX_COFFEELAKE")
@@ -146,6 +156,7 @@ if(SUPPORT_GEN9)
  endif()

  if(SUPPORT_BXT)
+    ADD_AOT_DEFINITION(BXT)
    set(BXT_GEN9_REVISIONS 0)
    set(BXT_GEN9_RELEASES "9.3.0")
    ADD_PRODUCT("SUPPORTED" "BXT" "IGFX_BROXTON")
@@ -160,11 +171,13 @@ if(SUPPORT_GEN9)
 endif()

 if(SUPPORT_GEN11)
+  ADD_AOT_DEFINITION(GEN11)
  if(TESTS_GEN11)
    ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN11" "Gen11Family")
  endif()

  if(SUPPORT_ICLLP)
+    ADD_AOT_DEFINITION(ICLLP)
    set(ICLLP_GEN11_REVISIONS 0)
    set(ICLLP_GEN11_RELEASES "11.0.0")
    ADD_PRODUCT("SUPPORTED" "ICLLP" "IGFX_ICELAKE_LP")
@@ -179,6 +192,7 @@ if(SUPPORT_GEN11)
  endif()

  if(SUPPORT_LKF)
+    ADD_AOT_DEFINITION(LKF1)
    set(LKF_GEN11_REVISIONS 0)
    set(LKF_GEN11_RELEASES "11.1.0")
    ADD_PRODUCT("SUPPORTED" "LKF" "IGFX_LAKEFIELD")
@@ -191,6 +205,7 @@ if(SUPPORT_GEN11)
  endif()

  if(SUPPORT_EHL)
+    ADD_AOT_DEFINITION(JSL)
    set(EHL_GEN11_REVISIONS 0)
    set(EHL_GEN11_RELEASES "11.2.0")
    ADD_PRODUCT("SUPPORTED" "EHL" "IGFX_ELKHARTLAKE")
@@ -204,10 +219,13 @@ if(SUPPORT_GEN11)
 endif()

 if(SUPPORT_GEN12LP)
+  ADD_AOT_DEFINITION(XE_LP)
+  ADD_AOT_DEFINITION(XE)
  if(TESTS_GEN12LP)
    ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN12LP" "Gen12LpFamily")
  endif()
  if(SUPPORT_TGLLP)
+    ADD_AOT_DEFINITION(TGLLP)
    set(TGLLP_GEN12LP_REVISIONS 0)
    set(TGLLP_GEN12LP_RELEASES "12.0.0")
    ADD_PRODUCT("SUPPORTED" "TGLLP" "IGFX_TIGERLAKE_LP")
@@ -221,6 +239,7 @@ if(SUPPORT_GEN12LP)
  endif()

  if(SUPPORT_DG1)
+    ADD_AOT_DEFINITION(DG1)
    set(DG1_GEN12LP_REVISIONS 0)
    set(DG1_GEN12LP_RELEASES "12.10.0")
    ADD_PRODUCT("SUPPORTED" "DG1" "IGFX_DG1")
@@ -234,6 +253,7 @@ if(SUPPORT_GEN12LP)
  endif()

  if(SUPPORT_RKL)
+    ADD_AOT_DEFINITION(RKLC)
    set(RKL_GEN12LP_REVISIONS 0)
    set(RKL_GEN12LP_RELEASES "12.1.0")
    ADD_PRODUCT("SUPPORTED" "RKL" "IGFX_ROCKETLAKE")
@@ -247,6 +267,7 @@ if(SUPPORT_GEN12LP)
  endif()

  if(SUPPORT_ADLS)
+    ADD_AOT_DEFINITION(ADLS)
    set(ADLS_GEN12LP_REVISIONS 0)
    set(ADLS_GEN12LP_RELEASES "12.2.0")
    ADD_PRODUCT("SUPPORTED" "ADLS" "IGFX_ALDERLAKE_S")
@@ -260,6 +281,7 @@ if(SUPPORT_GEN12LP)
  endif()

  if(SUPPORT_ADLP)
+    ADD_AOT_DEFINITION(ADL)
    set(ADLP_GEN12LP_REVISIONS 0)
    set(ADLP_GEN12LP_RELEASES "12.3.0")
    ADD_PRODUCT("SUPPORTED" "ADLP" "IGFX_ALDERLAKE_P")
@@ -273,6 +295,7 @@ if(SUPPORT_GEN12LP)
  endif()

  if(SUPPORT_ADLN)
+    ADD_AOT_DEFINITION(ADL)
    set(ADLN_GEN12LP_REVISIONS 0)
    set(ADLN_GEN12LP_RELEASES "12.4.0")
    ADD_PRODUCT("SUPPORTED" "ADLN" "IGFX_ALDERLAKE_N")
@@ -287,10 +310,13 @@ if(SUPPORT_GEN12LP)
 endif()

 if(SUPPORT_XE_HPG_CORE)
+  ADD_AOT_DEFINITION(XE)
  if(TESTS_XE_HPG_CORE)
    ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "XE_HPG_CORE" "XeHpgCoreFamily")
  endif()
  if(SUPPORT_MTL)
+    ADD_AOT_DEFINITION(XE_LPG)
+    ADD_AOT_DEFINITION(MTL)
    set(MTL_XE_HPG_CORE_REVISIONS 0)
    set(MTL_XE_HPG_CORE_RELEASES "12.70.0" "12.70.4" "12.71.0" "12.71.4")
    ADD_PRODUCT("SUPPORTED" "MTL" "IGFX_METEORLAKE")
@@ -303,6 +329,8 @@ if(SUPPORT_XE_HPG_CORE)
    endif()
  endif()
  if(SUPPORT_DG2)
+    ADD_AOT_DEFINITION(XE_HPG)
+    ADD_AOT_DEFINITION(DG2)
    set(DG2_XE_HPG_CORE_REVISIONS 0)
    set(DG2_XE_HPG_CORE_RELEASES "12.55.0" "12.55.1" "12.55.4" "12.55.8" "12.56.0" "12.56.4" "12.56.5" "12.57.0")
    ADD_PRODUCT("SUPPORTED" "DG2" "IGFX_DG2")
@@ -315,6 +343,8 @@ if(SUPPORT_XE_HPG_CORE)
    endif()
  endif()
  if(SUPPORT_ARL)
+    ADD_AOT_DEFINITION(XE_LPGPLUS)
+    ADD_AOT_DEFINITION(ARL)
    set(ARL_XE_HPG_CORE_REVISIONS 0)
    set(ARL_XE_HPG_CORE_RELEASES "12.74.0" "12.74.4")
    ADD_PRODUCT("SUPPORTED" "ARL" "IGFX_ARROWLAKE")
@@ -329,12 +359,16 @@ if(SUPPORT_XE_HPG_CORE)
 endif()

 if(SUPPORT_XE_HPC_CORE)
+  ADD_AOT_DEFINITION(XE)
+  ADD_AOT_DEFINITION(XE_HPC)
+  ADD_AOT_DEFINITION(XE_HPC_VG)
  set(XE_HPC_CORE_TEST_KERNELS_BLOCKLIST "CopyBuffer_simd8.cl")
  if(TESTS_XE_HPC_CORE)
    ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "XE_HPC_CORE" "XeHpcCoreFamily")
  endif()

  if(SUPPORT_PVC)
+    ADD_AOT_DEFINITION(PVC)
    set(PVC_XE_HPC_CORE_REVISIONS 3 47)
    set(PVC_XE_HPC_CORE_RELEASES "12.60.0" "12.60.1" "12.60.3" "12.60.5" "12.60.6" "12.60.7" "12.61.7")
    ADD_PRODUCT("SUPPORTED" "PVC" "IGFX_PVC")
--- a/platforms.cmake
+++ b/platforms.cmake
@@ -230,6 +230,10 @@ macro(ADD_PLATFORM_FOR_CORE_TYPE LIST_TYPE CORE_TYPE PLATFORM_NAME)
  endif()
 endmacro()

+macro(ADD_AOT_DEFINITION CONFIG_NAME)
+  list(APPEND AOT_DEFINITIONS "SUPPORT_AOT_${CONFIG_NAME}")
+endmacro()
+
 # Init lists
 INIT_LIST("FAMILY_NAME" "TESTED")
 INIT_LIST("PLATFORMS" "SUPPORTED")
@@ -242,6 +246,8 @@ INIT_LIST("PLATFORMS" "SUPPORTED_HEAPLESS")
 INIT_PRODUCTS_LIST("TESTED")
 INIT_PRODUCTS_LIST("SUPPORTED")

+set(AOT_DEFINITIONS)
+
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake${BRANCH_DIR_SUFFIX}setup_platform_flags.cmake)

 # Get platform lists, flag definition and set default platforms
--- a/shared/offline_compiler/source/CMakeLists.txt
+++ b/shared/offline_compiler/source/CMakeLists.txt
@@ -268,6 +268,7 @@ target_include_directories(${OCLOC_NAME}_lib BEFORE PRIVATE ${IGA_INCLUDE_DIR})

 target_compile_definitions(${OCLOC_NAME}_lib PUBLIC ${CLOC_LIB_LIB_FLAGS_DEFINITIONS} ${SUPPORTED_CORE_FLAGS_DEFINITONS} DEFAULT_PLATFORM=${DEFAULT_SUPPORTED_PLATFORM}
                           IGA_LIBRARY_NAME="${CMAKE_SHARED_LIBRARY_PREFIX}${IGA_LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                           ${AOT_DEFINITIONS}
 )
 target_compile_definitions(${OCLOC_NAME}_lib PUBLIC ${NEO__IGC_COMPILE_DEFINITIONS})

--- a/shared/source/CMakeLists.txt
+++ b/shared/source/CMakeLists.txt
@@ -24,6 +24,7 @@ function(generate_shared_lib LIB_NAME MOCKABLE)
  endif()

  list(APPEND LIB_FLAGS_DEFINITIONS ${SUPPORTED_CORE_FLAGS_DEFINITONS})
+  list(APPEND LIB_FLAGS_DEFINITIONS ${AOT_DEFINITIONS})

  set_property(TARGET ${LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
  set_target_properties(${LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}")