Rename cmake GEN variables

Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
This commit is contained in:
Bartosz Dunajski
2021-11-24 09:38:00 +00:00
committed by Compute-Runtime-Automation
parent ca256a3f54
commit 29f74a1a98
28 changed files with 627 additions and 626 deletions

View File

@@ -719,14 +719,14 @@ else()
include_directories(${NEO_SHARED_DIRECTORY}/os_interface/linux/flags${BRANCH_DIR_SUFFIX}) include_directories(${NEO_SHARED_DIRECTORY}/os_interface/linux/flags${BRANCH_DIR_SUFFIX})
endif() endif()
macro(macro_for_each_gen) macro(macro_for_each_core_type)
foreach(PLATFORM_DIRECTORY ${NEO_SHARED_DIRECTORY}/${GEN_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX} ${NEO_SOURCE_DIR}/opencl/source/${GEN_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX}) foreach(PLATFORM_DIRECTORY ${NEO_SHARED_DIRECTORY}/${CORE_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX} ${NEO_SOURCE_DIR}/opencl/source/${CORE_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX})
if(EXISTS ${PLATFORM_DIRECTORY}) if(EXISTS ${PLATFORM_DIRECTORY})
include_directories(${PLATFORM_DIRECTORY}) include_directories(${PLATFORM_DIRECTORY})
endif() endif()
endforeach() endforeach()
endmacro() endmacro()
apply_macro_for_each_gen("SUPPORTED") apply_macro_for_each_core_type("SUPPORTED")
# Define where to put binaries # Define where to put binaries
set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})

View File

@@ -59,29 +59,29 @@ macro(create_project_source_tree_with_exports target exports_filename)
endif() endif()
endmacro() endmacro()
macro(apply_macro_for_each_gen type) macro(apply_macro_for_each_core_type type)
set(given_type ${type}) set(given_type ${type})
foreach(GEN_TYPE ${ALL_GEN_TYPES}) foreach(CORE_TYPE ${ALL_CORE_TYPES})
string(TOLOWER ${GEN_TYPE} GEN_TYPE_LOWER) string(TOLOWER ${CORE_TYPE} CORE_TYPE_LOWER)
GEN_CONTAINS_PLATFORMS(${given_type} ${GEN_TYPE} GENX_HAS_PLATFORMS) CORE_CONTAINS_PLATFORMS(${given_type} ${CORE_TYPE} COREX_HAS_PLATFORMS)
if(${GENX_HAS_PLATFORMS}) if(${COREX_HAS_PLATFORMS})
macro_for_each_gen() macro_for_each_core_type()
endif() endif()
endforeach() endforeach()
endmacro() endmacro()
macro(apply_macro_for_each_platform) macro(apply_macro_for_each_platform)
GET_PLATFORMS_FOR_GEN(${given_type} ${GEN_TYPE} TESTED_GENX_PLATFORMS) GET_PLATFORMS_FOR_CORE_TYPE(${given_type} ${CORE_TYPE} TESTED_COREX_PLATFORMS)
foreach(PLATFORM_IT ${TESTED_GENX_PLATFORMS}) foreach(PLATFORM_IT ${TESTED_COREX_PLATFORMS})
string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER) string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER)
macro_for_each_platform() macro_for_each_platform()
endforeach() endforeach()
endmacro() endmacro()
macro(get_family_name_with_type gen_type platform_type) macro(get_family_name_with_type core_type platform_type)
string(REPLACE "GEN" "Gen" gen_type_capitalized ${gen_type}) string(REPLACE "GEN" "Gen" core_type_capitalized ${core_type})
string(TOLOWER ${platform_type} platform_type_lower) string(TOLOWER ${platform_type} platform_type_lower)
set(family_name_with_type ${gen_type_capitalized}${platform_type_lower}) set(family_name_with_type ${core_type_capitalized}${platform_type_lower})
endmacro() endmacro()
macro(append_sources_from_properties list_name) macro(append_sources_from_properties list_name)

View File

@@ -0,0 +1,14 @@
#
# Copyright (C) 2020-2021 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
list(APPEND ALL_CORE_TYPES "GEN8")
list(APPEND ALL_CORE_TYPES "GEN9")
list(APPEND ALL_CORE_TYPES "GEN11")
list(APPEND ALL_CORE_TYPES "GEN12LP")
list(APPEND ALL_CORE_TYPES "XE_HP_CORE")
list(APPEND ALL_CORE_TYPES "XE_HPG_CORE")
list(APPEND XEHP_AND_LATER_CORE_TYPES "XE_HP_CORE" "XE_HPG_CORE")
list(APPEND DG2_AND_LATER_CORE_TYPES "XE_HPG_CORE")

View File

@@ -1,14 +0,0 @@
#
# Copyright (C) 2020-2021 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
list(APPEND ALL_GEN_TYPES "GEN8")
list(APPEND ALL_GEN_TYPES "GEN9")
list(APPEND ALL_GEN_TYPES "GEN11")
list(APPEND ALL_GEN_TYPES "GEN12LP")
list(APPEND ALL_GEN_TYPES "XE_HP_CORE")
list(APPEND ALL_GEN_TYPES "XE_HPG_CORE")
list(APPEND XEHP_AND_LATER_GENS "XE_HP_CORE" "XE_HPG_CORE")
list(APPEND DG2_AND_LATER_GENS "XE_HPG_CORE")

View File

@@ -10,26 +10,26 @@ SET_FLAGS_FOR("GEN11" "ICLLP" "LKF" "EHL")
SET_FLAGS_FOR("GEN12LP" "TGLLP" "RKL" "ADLS" "ADLP" "DG1") SET_FLAGS_FOR("GEN12LP" "TGLLP" "RKL" "ADLS" "ADLP" "DG1")
SET_FLAGS_FOR("XE_HP_CORE" "XE_HP_SDV") SET_FLAGS_FOR("XE_HP_CORE" "XE_HP_SDV")
set(DEVICE_ENQUEUE_DISABLED_GENS "GEN8" "GEN12LP" ${XEHP_AND_LATER_GENS}) set(DEVICE_ENQUEUE_DISABLED_CORE_TYPES "GEN8" "GEN12LP" ${XEHP_AND_LATER_CORE_TYPES})
foreach(GEN_TYPE ${XEHP_AND_LATER_GENS}) foreach(CORE_TYPE ${XEHP_AND_LATER_CORE_TYPES})
if(TESTS_${GEN_TYPE}) if(TESTS_${CORE_TYPE})
set(TESTS_XEHP_AND_LATER 1) set(TESTS_XEHP_AND_LATER 1)
endif() endif()
if(SUPPORT_${GEN_TYPE}) if(SUPPORT_${CORE_TYPE})
set(SUPPORT_XEHP_AND_LATER 1) set(SUPPORT_XEHP_AND_LATER 1)
endif() endif()
endforeach() endforeach()
foreach(GEN_TYPE ${DEVICE_ENQUEUE_DISABLED_GENS}) foreach(CORE_TYPE ${DEVICE_ENQUEUE_DISABLED_CORE_TYPES})
set(SUPPORT_DEVICE_ENQUEUE_${GEN_TYPE} FALSE CACHE BOOL "Disabled support ${GEN_TYPE} for device side enqueue" FORCE) set(SUPPORT_DEVICE_ENQUEUE_${CORE_TYPE} FALSE CACHE BOOL "Disabled support ${CORE_TYPE} for device side enqueue" FORCE)
endforeach() endforeach()
foreach(GEN_TYPE ${DG2_AND_LATER_GENS}) foreach(CORE_TYPE ${DG2_AND_LATER_CORE_TYPES})
if(TESTS_${GEN_TYPE}) if(TESTS_${CORE_TYPE})
set(TESTS_DG2_AND_LATER 1) set(TESTS_DG2_AND_LATER 1)
endif() endif()
if(SUPPORT_${GEN_TYPE}) if(SUPPORT_${CORE_TYPE})
set(SUPPORT_DG2_AND_LATER 1) set(SUPPORT_DG2_AND_LATER 1)
endif() endif()
endforeach() endforeach()
@@ -38,15 +38,15 @@ endforeach()
if(SUPPORT_GEN8) if(SUPPORT_GEN8)
set(CORE_GEN8_REVISIONS 0) set(CORE_GEN8_REVISIONS 0)
if(TESTS_GEN8) if(TESTS_GEN8)
ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN8" "BDWFamily") ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN8" "BDWFamily")
endif() endif()
if(SUPPORT_BDW) if(SUPPORT_BDW)
ADD_PRODUCT("SUPPORTED" "BDW" "IGFX_BROADWELL") ADD_PRODUCT("SUPPORTED" "BDW" "IGFX_BROADWELL")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN8" "BDW" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN8" "BDW" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_2_0" "GEN8" "BDW" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_2_0" "GEN8" "BDW" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN8" "BDW" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN8" "BDW" "CORE")
if(TESTS_BDW) if(TESTS_BDW)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN8" "BDW") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN8" "BDW")
ADD_PRODUCT("TESTED" "BDW" "IGFX_BROADWELL") ADD_PRODUCT("TESTED" "BDW" "IGFX_BROADWELL")
endif() endif()
endif() endif()
@@ -56,64 +56,64 @@ if(SUPPORT_GEN9)
set(CORE_GEN9_REVISIONS 9) set(CORE_GEN9_REVISIONS 9)
set(LP_GEN9_REVISIONS 0) set(LP_GEN9_REVISIONS 0)
if(TESTS_GEN9) if(TESTS_GEN9)
ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN9" "SKLFamily") ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN9" "SKLFamily")
endif() endif()
if(SUPPORT_SKL) if(SUPPORT_SKL)
ADD_PRODUCT("SUPPORTED" "SKL" "IGFX_SKYLAKE") ADD_PRODUCT("SUPPORTED" "SKL" "IGFX_SKYLAKE")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN9" "SKL" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN9" "SKL" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_2_0" "GEN9" "SKL" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_2_0" "GEN9" "SKL" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_VME" "GEN9" "SKL" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN9" "SKL" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN9" "SKL" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "SKL" "CORE")
set(PREFERRED_PLATFORM "SKL") set(PREFERRED_PLATFORM "SKL")
if(TESTS_SKL) if(TESTS_SKL)
set(PREFERRED_FAMILY_NAME "SKLFamily") set(PREFERRED_FAMILY_NAME "SKLFamily")
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "SKL") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN9" "SKL")
ADD_PRODUCT("TESTED" "SKL" "IGFX_SKYLAKE") ADD_PRODUCT("TESTED" "SKL" "IGFX_SKYLAKE")
endif() endif()
endif() endif()
if(SUPPORT_KBL) if(SUPPORT_KBL)
ADD_PRODUCT("SUPPORTED" "KBL" "IGFX_KABYLAKE") ADD_PRODUCT("SUPPORTED" "KBL" "IGFX_KABYLAKE")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN9" "KBL" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN9" "KBL" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_2_0" "GEN9" "KBL" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_2_0" "GEN9" "KBL" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_VME" "GEN9" "KBL" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN9" "KBL" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN9" "KBL" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "KBL" "CORE")
if(TESTS_KBL) if(TESTS_KBL)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "KBL") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN9" "KBL")
ADD_PRODUCT("TESTED" "KBL" "IGFX_KABYLAKE") ADD_PRODUCT("TESTED" "KBL" "IGFX_KABYLAKE")
endif() endif()
endif() endif()
if(SUPPORT_GLK) if(SUPPORT_GLK)
ADD_PRODUCT("SUPPORTED" "GLK" "IGFX_GEMINILAKE") ADD_PRODUCT("SUPPORTED" "GLK" "IGFX_GEMINILAKE")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN9" "GLK" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN9" "GLK" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_VME" "GEN9" "GLK" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN9" "GLK" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN9" "GLK" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "GLK" "LP")
if(TESTS_GLK) if(TESTS_GLK)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "GLK") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN9" "GLK")
ADD_PRODUCT("TESTED" "GLK" "IGFX_GEMINILAKE") ADD_PRODUCT("TESTED" "GLK" "IGFX_GEMINILAKE")
endif() endif()
endif() endif()
if(SUPPORT_CFL) if(SUPPORT_CFL)
ADD_PRODUCT("SUPPORTED" "CFL" "IGFX_COFFEELAKE") ADD_PRODUCT("SUPPORTED" "CFL" "IGFX_COFFEELAKE")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN9" "CFL" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN9" "CFL" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_2_0" "GEN9" "CFL" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_2_0" "GEN9" "CFL" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_VME" "GEN9" "CFL" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN9" "CFL" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN9" "CFL" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "CFL" "CORE")
if(TESTS_CFL) if(TESTS_CFL)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "CFL") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN9" "CFL")
ADD_PRODUCT("TESTED" "CFL" "IGFX_COFFEELAKE") ADD_PRODUCT("TESTED" "CFL" "IGFX_COFFEELAKE")
endif() endif()
endif() endif()
if(SUPPORT_BXT) if(SUPPORT_BXT)
ADD_PRODUCT("SUPPORTED" "BXT" "IGFX_BROXTON") ADD_PRODUCT("SUPPORTED" "BXT" "IGFX_BROXTON")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN9" "BXT" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN9" "BXT" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_VME" "GEN9" "BXT" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN9" "BXT" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN9" "BXT" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN9" "BXT" "LP")
if(TESTS_BXT) if(TESTS_BXT)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN9" "BXT") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN9" "BXT")
ADD_PRODUCT("TESTED" "BXT" "IGFX_BROXTON") ADD_PRODUCT("TESTED" "BXT" "IGFX_BROXTON")
endif() endif()
endif() endif()
@@ -123,37 +123,37 @@ if(SUPPORT_GEN11)
set(CORE_GEN11_REVISIONS 0) set(CORE_GEN11_REVISIONS 0)
set(LP_GEN11_REVISIONS 0) set(LP_GEN11_REVISIONS 0)
if(TESTS_GEN11) if(TESTS_GEN11)
ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN11" "ICLFamily") ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN11" "ICLFamily")
endif() endif()
if(SUPPORT_ICLLP) if(SUPPORT_ICLLP)
ADD_PRODUCT("SUPPORTED" "ICLLP" "IGFX_ICELAKE_LP") ADD_PRODUCT("SUPPORTED" "ICLLP" "IGFX_ICELAKE_LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN11" "ICLLP" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN11" "ICLLP" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_2_0" "GEN11" "ICLLP" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_2_0" "GEN11" "ICLLP" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_VME" "GEN11" "ICLLP" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_VME" "GEN11" "ICLLP" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN11" "ICLLP" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN11" "ICLLP" "LP")
if(TESTS_ICLLP) if(TESTS_ICLLP)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN11" "ICLLP") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN11" "ICLLP")
ADD_PRODUCT("TESTED" "ICLLP" "IGFX_ICELAKE_LP") ADD_PRODUCT("TESTED" "ICLLP" "IGFX_ICELAKE_LP")
endif() endif()
endif() endif()
if(SUPPORT_LKF) if(SUPPORT_LKF)
ADD_PRODUCT("SUPPORTED" "LKF" "IGFX_LAKEFIELD") ADD_PRODUCT("SUPPORTED" "LKF" "IGFX_LAKEFIELD")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN11" "LKF" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN11" "LKF" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN11" "LKF" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN11" "LKF" "LP")
if(TESTS_LKF) if(TESTS_LKF)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN11" "LKF") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN11" "LKF")
ADD_PRODUCT("TESTED" "LKF" "IGFX_LAKEFIELD") ADD_PRODUCT("TESTED" "LKF" "IGFX_LAKEFIELD")
endif() endif()
endif() endif()
if(SUPPORT_EHL) if(SUPPORT_EHL)
ADD_PRODUCT("SUPPORTED" "EHL" "IGFX_ELKHARTLAKE") ADD_PRODUCT("SUPPORTED" "EHL" "IGFX_ELKHARTLAKE")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN11" "EHL" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN11" "EHL" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN11" "EHL" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN11" "EHL" "LP")
if(TESTS_EHL) if(TESTS_EHL)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN11" "EHL") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN11" "EHL")
ADD_PRODUCT("TESTED" "EHL" "IGFX_ELKHARTLAKE") ADD_PRODUCT("TESTED" "EHL" "IGFX_ELKHARTLAKE")
endif() endif()
endif() endif()
@@ -162,59 +162,59 @@ endif()
if(SUPPORT_GEN12LP) if(SUPPORT_GEN12LP)
set(LP_GEN12LP_REVISIONS 0) set(LP_GEN12LP_REVISIONS 0)
if(TESTS_GEN12LP) if(TESTS_GEN12LP)
ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "GEN12LP" "TGLLPFamily") ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "GEN12LP" "TGLLPFamily")
endif() endif()
if(SUPPORT_TGLLP) if(SUPPORT_TGLLP)
ADD_PRODUCT("SUPPORTED" "TGLLP" "IGFX_TIGERLAKE_LP") ADD_PRODUCT("SUPPORTED" "TGLLP" "IGFX_TIGERLAKE_LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN12LP" "TGLLP" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "TGLLP" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN12LP" "TGLLP" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "TGLLP" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "TGLLP" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "TGLLP" "LP")
if(TESTS_TGLLP) if(TESTS_TGLLP)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN12LP" "TGLLP") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN12LP" "TGLLP")
ADD_PRODUCT("TESTED" "TGLLP" "IGFX_TIGERLAKE_LP") ADD_PRODUCT("TESTED" "TGLLP" "IGFX_TIGERLAKE_LP")
endif() endif()
endif() endif()
if(SUPPORT_DG1) if(SUPPORT_DG1)
ADD_PRODUCT("SUPPORTED" "DG1" "IGFX_DG1") ADD_PRODUCT("SUPPORTED" "DG1" "IGFX_DG1")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN12LP" "DG1" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "DG1" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN12LP" "DG1" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "DG1" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "DG1" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "DG1" "LP")
if(TESTS_DG1) if(TESTS_DG1)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN12LP" "DG1") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN12LP" "DG1")
ADD_PRODUCT("TESTED" "DG1" "IGFX_DG1") ADD_PRODUCT("TESTED" "DG1" "IGFX_DG1")
endif() endif()
endif() endif()
if(SUPPORT_RKL) if(SUPPORT_RKL)
ADD_PRODUCT("SUPPORTED" "RKL" "IGFX_ROCKETLAKE") ADD_PRODUCT("SUPPORTED" "RKL" "IGFX_ROCKETLAKE")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN12LP" "RKL" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "RKL" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN12LP" "RKL" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "RKL" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "RKL" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "RKL" "LP")
if(TESTS_RKL) if(TESTS_RKL)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN12LP" "RKL") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN12LP" "RKL")
ADD_PRODUCT("TESTED" "RKL" "IGFX_ROCKETLAKE") ADD_PRODUCT("TESTED" "RKL" "IGFX_ROCKETLAKE")
endif() endif()
endif() endif()
if(SUPPORT_ADLS) if(SUPPORT_ADLS)
ADD_PRODUCT("SUPPORTED" "ADLS" "IGFX_ALDERLAKE_S") ADD_PRODUCT("SUPPORTED" "ADLS" "IGFX_ALDERLAKE_S")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN12LP" "ADLS" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "ADLS" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN12LP" "ADLS" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "ADLS" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "ADLS" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "ADLS" "LP")
if(TESTS_ADLS) if(TESTS_ADLS)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN12LP" "ADLS") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN12LP" "ADLS")
ADD_PRODUCT("TESTED" "ADLS" "IGFX_ALDERLAKE_S") ADD_PRODUCT("TESTED" "ADLS" "IGFX_ALDERLAKE_S")
endif() endif()
endif() endif()
if(SUPPORT_ADLP) if(SUPPORT_ADLP)
ADD_PRODUCT("SUPPORTED" "ADLP" "IGFX_ALDERLAKE_P") ADD_PRODUCT("SUPPORTED" "ADLP" "IGFX_ALDERLAKE_P")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "GEN12LP" "ADLP" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "GEN12LP" "ADLP" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "GEN12LP" "ADLP" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "GEN12LP" "ADLP" "LP")
ADD_PLATFORM_FOR_GEN("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "ADLP" "LP") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "GEN12LP" "ADLP" "LP")
if(TESTS_ADLP) if(TESTS_ADLP)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "GEN12LP" "ADLP") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "GEN12LP" "ADLP")
ADD_PRODUCT("TESTED" "ADLP" "IGFX_ALDERLAKE_P") ADD_PRODUCT("TESTED" "ADLP" "IGFX_ALDERLAKE_P")
endif() endif()
endif() endif()
@@ -225,20 +225,20 @@ if(SUPPORT_XE_HP_CORE)
set(CORE_XE_HP_CORE_REVISIONS 4) set(CORE_XE_HP_CORE_REVISIONS 4)
if(TESTS_XE_HP_CORE) if(TESTS_XE_HP_CORE)
if(TESTS_XE_HP_SDV) if(TESTS_XE_HP_SDV)
ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "XE_HP_CORE" "XeHpFamily") ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "XE_HP_CORE" "XeHpFamily")
else() else()
set(TESTS_XE_HP_CORE FALSE) set(TESTS_XE_HP_CORE FALSE)
endif() endif()
endif() endif()
if(SUPPORT_XE_HP_SDV) if(SUPPORT_XE_HP_SDV)
ADD_PRODUCT("SUPPORTED" "XE_HP_SDV" "IGFX_XE_HP_SDV") ADD_PRODUCT("SUPPORTED" "XE_HP_SDV" "IGFX_XE_HP_SDV")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "XE_HP_CORE" "XE_HP_SDV" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "XE_HP_CORE" "XE_HP_SDV" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "XE_HP_CORE" "XE_HP_SDV" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "XE_HP_CORE" "XE_HP_SDV" "CORE")
ADD_PLATFORM_FOR_GEN("SUPPORTED_AUX_TRANSLATION" "XE_HP_CORE" "XE_HP_SDV" "CORE") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "XE_HP_CORE" "XE_HP_SDV" "CORE")
set(PREFERRED_PLATFORM "XE_HP_SDV") set(PREFERRED_PLATFORM "XE_HP_SDV")
if(TESTS_XE_HP_SDV) if(TESTS_XE_HP_SDV)
set(PREFERRED_FAMILY_NAME "XeHpFamily") set(PREFERRED_FAMILY_NAME "XeHpFamily")
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "XE_HP_CORE" "XE_HP_SDV") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "XE_HP_CORE" "XE_HP_SDV")
ADD_PRODUCT("TESTED" "XE_HP_SDV" "IGFX_XE_HP_SDV") ADD_PRODUCT("TESTED" "XE_HP_SDV" "IGFX_XE_HP_SDV")
endif() endif()
endif() endif()
@@ -247,16 +247,16 @@ endif()
if(SUPPORT_XE_HPG_CORE) if(SUPPORT_XE_HPG_CORE)
set(CORE_XE_HPG_CORE_REVISIONS 0) set(CORE_XE_HPG_CORE_REVISIONS 0)
if(TESTS_XE_HPG_CORE) if(TESTS_XE_HPG_CORE)
ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "XE_HPG_CORE" "XE_HPG_COREFamily") ADD_ITEM_FOR_CORE_TYPE("FAMILY_NAME" "TESTED" "XE_HPG_CORE" "XE_HPG_COREFamily")
endif() endif()
if(SUPPORT_DG2) if(SUPPORT_DG2)
set(DG2_XE_HPG_CORE_REVISIONS 0) set(DG2_XE_HPG_CORE_REVISIONS 0)
ADD_PRODUCT("SUPPORTED" "DG2" "IGFX_DG2") ADD_PRODUCT("SUPPORTED" "DG2" "IGFX_DG2")
ADD_PLATFORM_FOR_GEN("SUPPORTED" "XE_HPG_CORE" "DG2" "DG2") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "XE_HPG_CORE" "DG2" "DG2")
ADD_PLATFORM_FOR_GEN("SUPPORTED_AUX_TRANSLATION" "XE_HPG_CORE" "DG2" "DG2") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "XE_HPG_CORE" "DG2" "DG2")
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "XE_HPG_CORE" "DG2" "DG2") ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_IMAGES" "XE_HPG_CORE" "DG2" "DG2")
if(TESTS_DG2) if(TESTS_DG2)
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "XE_HPG_CORE" "DG2") ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" "TESTED" "XE_HPG_CORE" "DG2")
ADD_PRODUCT("TESTED" "DG2" "IGFX_DG2") ADD_PRODUCT("TESTED" "DG2" "IGFX_DG2")
endif() endif()
endif() endif()

View File

@@ -14,17 +14,17 @@ set(TEST_MODULES
) )
set(l0_test_kernels_outputs) set(l0_test_kernels_outputs)
macro(macro_for_each_gen) macro(macro_for_each_core_type)
foreach(PLATFORM_TYPE ${PLATFORM_TYPES}) foreach(PLATFORM_TYPE ${PLATFORM_TYPES})
if(${GEN_TYPE}_HAS_${PLATFORM_TYPE}) if(${CORE_TYPE}_HAS_${PLATFORM_TYPE})
get_family_name_with_type(${GEN_TYPE} ${PLATFORM_TYPE}) get_family_name_with_type(${CORE_TYPE} ${PLATFORM_TYPE})
string(TOLOWER ${PLATFORM_TYPE} PLATFORM_TYPE_LOWER) string(TOLOWER ${PLATFORM_TYPE} PLATFORM_TYPE_LOWER)
set(PLATFORM_LOWER ${DEFAULT_SUPPORTED_${GEN_TYPE}_${PLATFORM_TYPE}_PLATFORM}) set(PLATFORM_LOWER ${DEFAULT_SUPPORTED_${CORE_TYPE}_${PLATFORM_TYPE}_PLATFORM})
level_zero_gen_kernels(l0_test_kernel_outputs ${PLATFORM_LOWER} ${family_name_with_type} "-g" ${TEST_MODULES}) level_zero_generate_kernels(l0_test_kernel_outputs ${PLATFORM_LOWER} ${family_name_with_type} "-g" ${TEST_MODULES})
endif() endif()
endforeach() endforeach()
endmacro() endmacro()
apply_macro_for_each_gen("TESTED") apply_macro_for_each_core_type("TESTED")
add_custom_target(l0_common_test_kernels DEPENDS ${l0_test_kernel_outputs} copy_compiler_files) add_custom_target(l0_common_test_kernels DEPENDS ${l0_test_kernel_outputs} copy_compiler_files)
set_target_properties(l0_common_test_kernels PROPERTIES FOLDER ${TARGET_NAME_L0}) set_target_properties(l0_common_test_kernels PROPERTIES FOLDER ${TARGET_NAME_L0})
add_dependencies(prepare_test_kernels_for_l0 l0_common_test_kernels) add_dependencies(prepare_test_kernels_for_l0 l0_common_test_kernels)

View File

@@ -4,7 +4,7 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
function(level_zero_gen_kernels target_list platform_name suffix options) function(level_zero_generate_kernels target_list platform_name suffix options)
list(APPEND results copy_compiler_files) list(APPEND results copy_compiler_files)

View File

@@ -26,12 +26,12 @@ hide_subdir(dll)
add_library(${NEO_STATIC_LIB_NAME} STATIC EXCLUDE_FROM_ALL add_library(${NEO_STATIC_LIB_NAME} STATIC EXCLUDE_FROM_ALL
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/enable_gens.cmake ${CMAKE_CURRENT_SOURCE_DIR}/enable_cores.cmake
$<TARGET_OBJECTS:${BIKSIM_LIB_NAME}> $<TARGET_OBJECTS:${BIKSIM_LIB_NAME}>
) )
add_subdirectories() add_subdirectories()
include(enable_gens.cmake) include(enable_cores.cmake)
if(WIN32) if(WIN32)
if("${IGDRCL_OPTION__BITS}" STREQUAL "32") if("${IGDRCL_OPTION__BITS}" STREQUAL "32")
@@ -81,7 +81,7 @@ endif()
target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC GMM_LIB_DLL DEFAULT_PLATFORM=${DEFAULT_SUPPORTED_PLATFORM}) target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC GMM_LIB_DLL DEFAULT_PLATFORM=${DEFAULT_SUPPORTED_PLATFORM})
list(APPEND LIB_FLAGS_DEFINITIONS -DCIF_HEADERS_ONLY_BUILD ${SUPPORTED_GEN_FLAGS_DEFINITONS}) list(APPEND LIB_FLAGS_DEFINITIONS -DCIF_HEADERS_ONLY_BUILD ${SUPPORTED_CORE_FLAGS_DEFINITONS})
target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC ${LIB_FLAGS_DEFINITIONS}) target_compile_definitions(${NEO_STATIC_LIB_NAME} PUBLIC ${LIB_FLAGS_DEFINITIONS})
@@ -157,14 +157,14 @@ if(${GENERATE_EXECUTABLE})
endif() endif()
if(NOT DISABLED_GTPIN_SUPPORT) if(NOT DISABLED_GTPIN_SUPPORT)
macro(macro_for_each_gen) macro(macro_for_each_core_type)
foreach(BRANCH_DIR ${BRANCH_DIR_LIST}) foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/gtpin_setup_${GEN_TYPE_LOWER}.cpp) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}/gtpin_setup_${CORE_TYPE_LOWER}.cpp)
target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/gtpin_setup_${GEN_TYPE_LOWER}.cpp) target_sources(${NEO_DYNAMIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}/gtpin_setup_${CORE_TYPE_LOWER}.cpp)
endif() endif()
endforeach() endforeach()
endmacro() endmacro()
apply_macro_for_each_gen("SUPPORTED") apply_macro_for_each_core_type("SUPPORTED")
endif() endif()
add_subdirectory(dll) add_subdirectory(dll)

View File

@@ -29,9 +29,9 @@ endif()
set(BUILTINS_INCLUDE_DIR ${TargetDir} PARENT_SCOPE) set(BUILTINS_INCLUDE_DIR ${TargetDir} PARENT_SCOPE)
set(BUILTIN_CPP "") set(BUILTIN_CPP "")
function(get_bits_for_stateless gen_type platform_type) function(get_bits_for_stateless core_type platform_type)
# Force 32bits compiling on gen9lp for stateless builtins # Force 32bits compiling on gen9lp for stateless builtins
if((${GEN_TYPE} STREQUAL "GEN9") AND (${PLATFORM_TYPE} STREQUAL "LP")) if((${CORE_TYPE} STREQUAL "GEN9") AND (${PLATFORM_TYPE} STREQUAL "LP"))
set(BITS "32" PARENT_SCOPE) set(BITS "32" PARENT_SCOPE)
else() else()
set(BITS ${NEO_BITS} PARENT_SCOPE) set(BITS ${NEO_BITS} PARENT_SCOPE)
@@ -39,10 +39,10 @@ function(get_bits_for_stateless gen_type platform_type)
endfunction() endfunction()
# Define function for compiling built-ins (with ocloc) # Define function for compiling built-ins (with ocloc)
function(compile_builtin gen_type platform_type builtin bits builtin_options) function(compile_builtin core_type platform_type builtin bits builtin_options)
string(TOLOWER ${gen_type} gen_type_lower) string(TOLOWER ${core_type} core_type_lower)
get_family_name_with_type(${gen_type} ${platform_type}) get_family_name_with_type(${core_type} ${platform_type})
set(OUTPUTDIR "${BUILTINS_OUTDIR_WITH_ARCH}/${gen_type_lower}") set(OUTPUTDIR "${BUILTINS_OUTDIR_WITH_ARCH}/${core_type_lower}")
# get filename # get filename
set(FILENAME ${builtin}) set(FILENAME ${builtin})
# get name of the file w/o extension # get name of the file w/o extension
@@ -63,15 +63,15 @@ function(compile_builtin gen_type platform_type builtin bits builtin_options)
add_custom_command( add_custom_command(
OUTPUT ${OUTPUT_FILES} OUTPUT ${OUTPUT_FILES}
COMMAND ${ocloc_cmd_prefix} -q -file ${FILENAME} -device ${DEFAULT_SUPPORTED_${gen_type}_${platform_type}_PLATFORM} ${builtin_options} -${bits} -out_dir ${OUTPUTDIR} -options "$<JOIN:${__ocloc__options__}, >" COMMAND ${ocloc_cmd_prefix} -q -file ${FILENAME} -device ${DEFAULT_SUPPORTED_${core_type}_${platform_type}_PLATFORM} ${builtin_options} -${bits} -out_dir ${OUTPUTDIR} -options "$<JOIN:${__ocloc__options__}, >"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${builtin} ocloc copy_compiler_files DEPENDS ${builtin} ocloc copy_compiler_files
) )
# set variable outside function # set variable outside function
set(BUILTIN_CPP built_ins/${NEO_ARCH}/${gen_type_lower}/${BASENAME}_${family_name_with_type}.cpp PARENT_SCOPE) set(BUILTIN_CPP built_ins/${NEO_ARCH}/${core_type_lower}/${BASENAME}_${family_name_with_type}.cpp PARENT_SCOPE)
else() else()
foreach(_file_name "spv" "bin" "gen") foreach(_file_name "spv" "bin" "gen")
set(_file_prebuilt "${NEO_SOURCE_DIR}/../neo_test_kernels/built_ins/${NEO_ARCH}/${gen_type_lower}/${BASENAME}_${family_name_with_type}.${_file_name}") set(_file_prebuilt "${NEO_SOURCE_DIR}/../neo_test_kernels/built_ins/${NEO_ARCH}/${core_type_lower}/${BASENAME}_${family_name_with_type}.${_file_name}")
if(EXISTS ${_file_prebuilt}) if(EXISTS ${_file_prebuilt})
add_custom_command( add_custom_command(
OUTPUT ${OUTPUTPATH_BASE}.${_file_name} OUTPUT ${OUTPUTPATH_BASE}.${_file_name}
@@ -80,7 +80,7 @@ function(compile_builtin gen_type platform_type builtin bits builtin_options)
) )
endif() endif()
endforeach() endforeach()
set(_file_prebuilt "${NEO_SOURCE_DIR}/../neo_test_kernels/built_ins/${NEO_ARCH}/${gen_type_lower}/${BASENAME}_${family_name_with_type}.cpp") set(_file_prebuilt "${NEO_SOURCE_DIR}/../neo_test_kernels/built_ins/${NEO_ARCH}/${core_type_lower}/${BASENAME}_${family_name_with_type}.cpp")
if(EXISTS ${_file_prebuilt}) if(EXISTS ${_file_prebuilt})
add_custom_command( add_custom_command(
OUTPUT ${OUTPUTPATH_BASE}.cpp OUTPUT ${OUTPUTPATH_BASE}.cpp
@@ -88,26 +88,26 @@ function(compile_builtin gen_type platform_type builtin bits builtin_options)
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${_file_prebuilt} ${OUTPUTDIR} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${_file_prebuilt} ${OUTPUTDIR}
) )
# set variable outside function # set variable outside function
set(BUILTIN_CPP built_ins/${NEO_ARCH}/${gen_type_lower}/${BASENAME}_${family_name_with_type}.cpp PARENT_SCOPE) set(BUILTIN_CPP built_ins/${NEO_ARCH}/${core_type_lower}/${BASENAME}_${family_name_with_type}.cpp PARENT_SCOPE)
endif() endif()
endif() endif()
endfunction() endfunction()
macro(macro_for_each_gen) macro(macro_for_each_core_type)
foreach(PLATFORM_TYPE ${PLATFORM_TYPES}) foreach(PLATFORM_TYPE ${PLATFORM_TYPES})
if(${GEN_TYPE}_HAS_${PLATFORM_TYPE}) if(${CORE_TYPE}_HAS_${PLATFORM_TYPE})
get_family_name_with_type(${GEN_TYPE} ${PLATFORM_TYPE}) get_family_name_with_type(${CORE_TYPE} ${PLATFORM_TYPE})
string(TOLOWER ${PLATFORM_TYPE} PLATFORM_TYPE_LOWER) string(TOLOWER ${PLATFORM_TYPE} PLATFORM_TYPE_LOWER)
unset(BUILTINS_COMMANDS) unset(BUILTINS_COMMANDS)
foreach(GENERATED_BUILTIN ${GENERATED_BUILTINS}) foreach(GENERATED_BUILTIN ${GENERATED_BUILTINS})
compile_builtin(${GEN_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN}.builtin_kernel ${NEO_BITS} "${BUILTIN_OPTIONS}") compile_builtin(${CORE_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN}.builtin_kernel ${NEO_BITS} "${BUILTIN_OPTIONS}")
if(NOT ${BUILTIN_CPP} STREQUAL "") if(NOT ${BUILTIN_CPP} STREQUAL "")
list(APPEND BUILTINS_COMMANDS ${TargetDir}/${BUILTIN_CPP}) list(APPEND BUILTINS_COMMANDS ${TargetDir}/${BUILTIN_CPP})
endif() endif()
endforeach() endforeach()
get_bits_for_stateless(${GEN_TYPE} ${PLATFORM_TYPE}) get_bits_for_stateless(${CORE_TYPE} ${PLATFORM_TYPE})
foreach(GENERATED_BUILTIN_STATELESS ${GENERATED_BUILTINS_STATELESS}) foreach(GENERATED_BUILTIN_STATELESS ${GENERATED_BUILTINS_STATELESS})
compile_builtin(${GEN_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN_STATELESS}.builtin_kernel ${BITS} "${BUILTIN_OPTIONS_STATELESS}") compile_builtin(${CORE_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN_STATELESS}.builtin_kernel ${BITS} "${BUILTIN_OPTIONS_STATELESS}")
if(NOT ${BUILTIN_CPP} STREQUAL "") if(NOT ${BUILTIN_CPP} STREQUAL "")
list(APPEND BUILTINS_COMMANDS ${TargetDir}/${BUILTIN_CPP}) list(APPEND BUILTINS_COMMANDS ${TargetDir}/${BUILTIN_CPP})
endif() endif()
@@ -122,4 +122,4 @@ macro(macro_for_each_gen)
endforeach() endforeach()
endmacro() endmacro()
apply_macro_for_each_gen("SUPPORTED") apply_macro_for_each_core_type("SUPPORTED")

View File

@@ -35,18 +35,18 @@ if(NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -fPIC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -fPIC")
endif() endif()
macro(macro_for_each_gen) macro(macro_for_each_core_type)
foreach(BRANCH_DIR ${BRANCH_DIR_LIST}) foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
list(APPEND DEFAULT_GEN_PLATFORMS_DEFITIONS DEFAULT_${GEN_TYPE}_PLATFORM=${DEFAULT_SUPPORTED_${GEN_TYPE}_PLATFORM}) list(APPEND DEFAULT_CORE_PLATFORMS_DEFITIONS DEFAULT_${CORE_TYPE}_PLATFORM=${DEFAULT_SUPPORTED_${CORE_TYPE}_PLATFORM})
if(${SUPPORT_DEVICE_ENQUEUE_${GEN_TYPE}}) if(${SUPPORT_DEVICE_ENQUEUE_${CORE_TYPE}})
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/scheduler_simulation_${GEN_TYPE_LOWER}.cpp) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}/scheduler_simulation_${CORE_TYPE_LOWER}.cpp)
list(APPEND BUILTIN_KERNELS_SIMULATION_SRCS ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/scheduler_simulation_${GEN_TYPE_LOWER}.cpp) list(APPEND BUILTIN_KERNELS_SIMULATION_SRCS ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}/scheduler_simulation_${CORE_TYPE_LOWER}.cpp)
endif() endif()
endif() endif()
endforeach() endforeach()
endmacro() endmacro()
apply_macro_for_each_gen("SUPPORTED") apply_macro_for_each_core_type("SUPPORTED")
add_library(${BIKSIM_LIB_NAME} OBJECT EXCLUDE_FROM_ALL ${BUILTIN_KERNELS_SIMULATION_SRCS}) add_library(${BIKSIM_LIB_NAME} OBJECT EXCLUDE_FROM_ALL ${BUILTIN_KERNELS_SIMULATION_SRCS})
target_include_directories(${BIKSIM_LIB_NAME} BEFORE PRIVATE target_include_directories(${BIKSIM_LIB_NAME} BEFORE PRIVATE
@@ -58,4 +58,4 @@ target_include_directories(${BIKSIM_LIB_NAME} BEFORE PRIVATE
${THIRD_PARTY_DIR} ${THIRD_PARTY_DIR}
) )
set_target_properties(${BIKSIM_LIB_NAME} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUILTINS_PROJECTS_FOLDER}") set_target_properties(${BIKSIM_LIB_NAME} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUILTINS_PROJECTS_FOLDER}")
target_compile_definitions(${BIKSIM_LIB_NAME} PUBLIC ${SUPPORTED_GEN_FLAGS_DEFINITONS} ${DEFAULT_GEN_PLATFORMS_DEFITIONS} MOCKABLE_VIRTUAL=) target_compile_definitions(${BIKSIM_LIB_NAME} PUBLIC ${SUPPORTED_CORE_FLAGS_DEFINITONS} ${DEFAULT_CORE_PLATFORMS_DEFITIONS} MOCKABLE_VIRTUAL=)

View File

@@ -0,0 +1,82 @@
#
# Copyright (C) 2018-2021 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(RUNTIME_SRCS_COREX_CPP_BASE
buffer
cl_hw_helper
command_queue
gpgpu_walker
hardware_commands_helper
image
sampler
)
macro(macro_for_each_core_type)
foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
set(COREX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER})
# Add default CORE files
if(EXISTS "${COREX_PREFIX}/additional_files_${CORE_TYPE_LOWER}.cmake")
include("${COREX_PREFIX}/additional_files_${CORE_TYPE_LOWER}.cmake")
endif()
if(${SUPPORT_DEVICE_ENQUEUE_${CORE_TYPE}})
if(EXISTS ${COREX_PREFIX}/device_enqueue.h)
list(APPEND RUNTIME_SRCS_${CORE_TYPE}_H_BASE ${COREX_PREFIX}/device_enqueue.h)
endif()
if(EXISTS ${COREX_PREFIX}/scheduler_definitions.h)
list(APPEND RUNTIME_SRCS_${CORE_TYPE}_H_BASE ${COREX_PREFIX}/scheduler_definitions.h)
endif()
if(EXISTS ${COREX_PREFIX}/scheduler_builtin_kernel.inl)
list(APPEND RUNTIME_SRCS_${CORE_TYPE}_H_BASE ${COREX_PREFIX}/scheduler_builtin_kernel.inl)
endif()
if(EXISTS ${COREX_PREFIX}/device_queue_${CORE_TYPE_LOWER}.cpp)
list(APPEND RUNTIME_SRCS_${CORE_TYPE}_CPP_BASE ${COREX_PREFIX}/device_queue_${CORE_TYPE_LOWER}.cpp)
endif()
endif()
foreach(SRC_IT ${RUNTIME_SRCS_COREX_CPP_BASE})
if(EXISTS ${COREX_PREFIX}/${SRC_IT}_${CORE_TYPE_LOWER}.cpp)
list(APPEND RUNTIME_SRCS_${CORE_TYPE}_CPP_BASE ${COREX_PREFIX}/${SRC_IT}_${CORE_TYPE_LOWER}.cpp)
endif()
endforeach()
if(EXISTS ${COREX_PREFIX}/enable_family_full_ocl_${CORE_TYPE_LOWER}.cpp)
list(APPEND ${CORE_TYPE}_SRC_LINK_BASE ${COREX_PREFIX}/enable_family_full_ocl_${CORE_TYPE_LOWER}.cpp)
endif()
if(NOT DISABLED_GTPIN_SUPPORT)
if(EXISTS ${COREX_PREFIX}/gtpin_setup_${CORE_TYPE_LOWER}.cpp)
list(APPEND ${CORE_TYPE}_SRC_LINK_BASE ${COREX_PREFIX}/gtpin_setup_${CORE_TYPE_LOWER}.cpp)
endif()
endif()
list(APPEND RUNTIME_SRCS_COREX_ALL_BASE ${RUNTIME_SRCS_${CORE_TYPE}_H_BASE})
list(APPEND RUNTIME_SRCS_COREX_ALL_BASE ${RUNTIME_SRCS_${CORE_TYPE}_CPP_BASE})
list(APPEND HW_SRC_LINK ${${CORE_TYPE}_SRC_LINK_BASE})
list(APPEND RUNTIME_SRCS_COREX_ALL_WINDOWS ${RUNTIME_SRCS_${CORE_TYPE}_CPP_WINDOWS})
list(APPEND RUNTIME_SRCS_COREX_ALL_LINUX ${RUNTIME_SRCS_${CORE_TYPE}_CPP_LINUX})
if(UNIX)
list(APPEND HW_SRC_LINK ${${CORE_TYPE}_SRC_LINK_LINUX})
endif()
endforeach()
endmacro()
get_property(RUNTIME_SRCS_COREX_ALL_BASE GLOBAL PROPERTY RUNTIME_SRCS_COREX_ALL_BASE)
get_property(RUNTIME_SRCS_COREX_ALL_LINUX GLOBAL PROPERTY RUNTIME_SRCS_COREX_ALL_LINUX)
get_property(RUNTIME_SRCS_COREX_ALL_WINDOWS GLOBAL PROPERTY RUNTIME_SRCS_COREX_ALL_WINDOWS)
apply_macro_for_each_core_type("SUPPORTED")
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COREX_ALL_BASE})
if(WIN32)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COREX_ALL_WINDOWS})
else()
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_COREX_ALL_LINUX})
endif()
set_property(GLOBAL PROPERTY RUNTIME_SRCS_COREX_ALL_BASE ${RUNTIME_SRCS_COREX_ALL_BASE})
set_property(GLOBAL PROPERTY RUNTIME_SRCS_COREX_ALL_LINUX ${RUNTIME_SRCS_COREX_ALL_LINUX})
set_property(GLOBAL PROPERTY RUNTIME_SRCS_COREX_ALL_WINDOWS ${RUNTIME_SRCS_COREX_ALL_WINDOWS})

View File

@@ -1,82 +0,0 @@
#
# Copyright (C) 2018-2021 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(RUNTIME_SRCS_GENX_CPP_BASE
buffer
cl_hw_helper
command_queue
gpgpu_walker
hardware_commands_helper
image
sampler
)
macro(macro_for_each_gen)
foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
set(GENX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER})
# Add default GEN files
if(EXISTS "${GENX_PREFIX}/additional_files_${GEN_TYPE_LOWER}.cmake")
include("${GENX_PREFIX}/additional_files_${GEN_TYPE_LOWER}.cmake")
endif()
if(${SUPPORT_DEVICE_ENQUEUE_${GEN_TYPE}})
if(EXISTS ${GENX_PREFIX}/device_enqueue.h)
list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/device_enqueue.h)
endif()
if(EXISTS ${GENX_PREFIX}/scheduler_definitions.h)
list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/scheduler_definitions.h)
endif()
if(EXISTS ${GENX_PREFIX}/scheduler_builtin_kernel.inl)
list(APPEND RUNTIME_SRCS_${GEN_TYPE}_H_BASE ${GENX_PREFIX}/scheduler_builtin_kernel.inl)
endif()
if(EXISTS ${GENX_PREFIX}/device_queue_${GEN_TYPE_LOWER}.cpp)
list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${GENX_PREFIX}/device_queue_${GEN_TYPE_LOWER}.cpp)
endif()
endif()
foreach(SRC_IT ${RUNTIME_SRCS_GENX_CPP_BASE})
if(EXISTS ${GENX_PREFIX}/${SRC_IT}_${GEN_TYPE_LOWER}.cpp)
list(APPEND RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE ${GENX_PREFIX}/${SRC_IT}_${GEN_TYPE_LOWER}.cpp)
endif()
endforeach()
if(EXISTS ${GENX_PREFIX}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp)
list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp)
endif()
if(NOT DISABLED_GTPIN_SUPPORT)
if(EXISTS ${GENX_PREFIX}/gtpin_setup_${GEN_TYPE_LOWER}.cpp)
list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${GENX_PREFIX}/gtpin_setup_${GEN_TYPE_LOWER}.cpp)
endif()
endif()
list(APPEND RUNTIME_SRCS_GENX_ALL_BASE ${RUNTIME_SRCS_${GEN_TYPE}_H_BASE})
list(APPEND RUNTIME_SRCS_GENX_ALL_BASE ${RUNTIME_SRCS_${GEN_TYPE}_CPP_BASE})
list(APPEND HW_SRC_LINK ${${GEN_TYPE}_SRC_LINK_BASE})
list(APPEND RUNTIME_SRCS_GENX_ALL_WINDOWS ${RUNTIME_SRCS_${GEN_TYPE}_CPP_WINDOWS})
list(APPEND RUNTIME_SRCS_GENX_ALL_LINUX ${RUNTIME_SRCS_${GEN_TYPE}_CPP_LINUX})
if(UNIX)
list(APPEND HW_SRC_LINK ${${GEN_TYPE}_SRC_LINK_LINUX})
endif()
endforeach()
endmacro()
get_property(RUNTIME_SRCS_GENX_ALL_BASE GLOBAL PROPERTY RUNTIME_SRCS_GENX_ALL_BASE)
get_property(RUNTIME_SRCS_GENX_ALL_LINUX GLOBAL PROPERTY RUNTIME_SRCS_GENX_ALL_LINUX)
get_property(RUNTIME_SRCS_GENX_ALL_WINDOWS GLOBAL PROPERTY RUNTIME_SRCS_GENX_ALL_WINDOWS)
apply_macro_for_each_gen("SUPPORTED")
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GENX_ALL_BASE})
if(WIN32)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GENX_ALL_WINDOWS})
else()
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_GENX_ALL_LINUX})
endif()
set_property(GLOBAL PROPERTY RUNTIME_SRCS_GENX_ALL_BASE ${RUNTIME_SRCS_GENX_ALL_BASE})
set_property(GLOBAL PROPERTY RUNTIME_SRCS_GENX_ALL_LINUX ${RUNTIME_SRCS_GENX_ALL_LINUX})
set_property(GLOBAL PROPERTY RUNTIME_SRCS_GENX_ALL_WINDOWS ${RUNTIME_SRCS_GENX_ALL_WINDOWS})

View File

@@ -20,12 +20,12 @@ endif()
set(SCHEDULER_INCLUDE_DIR ${TargetDir}) set(SCHEDULER_INCLUDE_DIR ${TargetDir})
function(compile_kernel target gen_type platform_type kernel) function(compile_kernel target core_type platform_type kernel)
get_family_name_with_type(${gen_type} ${platform_type}) get_family_name_with_type(${core_type} ${platform_type})
string(TOLOWER ${gen_type} gen_type_lower) string(TOLOWER ${core_type} core_type_lower)
# get filename # get filename
set(OUTPUTDIR "${SCHEDULER_OUTDIR_WITH_ARCH}/${gen_type_lower}") set(OUTPUTDIR "${SCHEDULER_OUTDIR_WITH_ARCH}/${core_type_lower}")
list(APPEND __ocloc__options__ "-I ../${gen_type_lower}") list(APPEND __ocloc__options__ "-I ../${core_type_lower}")
get_filename_component(BASENAME ${kernel} NAME_WE) get_filename_component(BASENAME ${kernel} NAME_WE)
@@ -39,15 +39,15 @@ function(compile_kernel target gen_type platform_type kernel)
if(NOT NEO_DISABLE_BUILTINS_COMPILATION) if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
add_custom_command( add_custom_command(
OUTPUT ${OUTPUTPATH} OUTPUT ${OUTPUTPATH}
COMMAND ${ocloc_cmd_prefix} -q -file ${kernel} -device ${DEFAULT_SUPPORTED_${gen_type}_${platform_type}_PLATFORM} -cl-intel-greater-than-4GB-buffer-required -${NEO_BITS} -out_dir ${OUTPUTDIR} -cpp_file -options "$<JOIN:${__ocloc__options__}, >" -internal_options "-cl-intel-no-spill" COMMAND ${ocloc_cmd_prefix} -q -file ${kernel} -device ${DEFAULT_SUPPORTED_${core_type}_${platform_type}_PLATFORM} -cl-intel-greater-than-4GB-buffer-required -${NEO_BITS} -out_dir ${OUTPUTDIR} -cpp_file -options "$<JOIN:${__ocloc__options__}, >" -internal_options "-cl-intel-no-spill"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${kernel} ocloc copy_compiler_files DEPENDS ${kernel} ocloc copy_compiler_files
) )
set(SCHEDULER_CPP ${SCHEDULER_CPP} PARENT_SCOPE) set(SCHEDULER_CPP ${SCHEDULER_CPP} PARENT_SCOPE)
add_custom_target(${target} DEPENDS ${OUTPUTPATH}) add_custom_target(${target} DEPENDS ${OUTPUTPATH})
set_target_properties(${target} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_SCHEDULER_PROJECTS_FOLDER}/${gen_type_lower}") set_target_properties(${target} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_SCHEDULER_PROJECTS_FOLDER}/${core_type_lower}")
else() else()
set(_file_prebuilt "${NEO_SOURCE_DIR}/../neo_test_kernels/scheduler/${NEO_ARCH}/${gen_type_lower}/${BASENAME}_${family_name_with_type}.bin") set(_file_prebuilt "${NEO_SOURCE_DIR}/../neo_test_kernels/scheduler/${NEO_ARCH}/${core_type_lower}/${BASENAME}_${family_name_with_type}.bin")
if(EXISTS ${_file_prebuilt}) if(EXISTS ${_file_prebuilt})
add_custom_command( add_custom_command(
OUTPUT ${OUTPUTPATH} OUTPUT ${OUTPUTPATH}
@@ -55,9 +55,9 @@ function(compile_kernel target gen_type platform_type kernel)
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${_file_prebuilt} ${OUTPUTDIR} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${_file_prebuilt} ${OUTPUTDIR}
) )
add_custom_target(${target} DEPENDS ${OUTPUTPATH}) add_custom_target(${target} DEPENDS ${OUTPUTPATH})
set_target_properties(${target} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_SCHEDULER_PROJECTS_FOLDER}/${gen_type_lower}") set_target_properties(${target} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_SCHEDULER_PROJECTS_FOLDER}/${core_type_lower}")
endif() endif()
set(_file_prebuilt "${NEO_SOURCE_DIR}/../neo_test_kernels/scheduler/${NEO_ARCH}/${gen_type_lower}/${BASENAME}_${family_name_with_type}.cpp") set(_file_prebuilt "${NEO_SOURCE_DIR}/../neo_test_kernels/scheduler/${NEO_ARCH}/${core_type_lower}/${BASENAME}_${family_name_with_type}.cpp")
if(EXISTS ${_file_prebuilt}) if(EXISTS ${_file_prebuilt})
add_custom_command( add_custom_command(
OUTPUT ${SCHEDULER_CPP} OUTPUT ${SCHEDULER_CPP}
@@ -69,13 +69,13 @@ function(compile_kernel target gen_type platform_type kernel)
endif() endif()
endfunction() endfunction()
macro(macro_for_each_gen) macro(macro_for_each_core_type)
foreach(PLATFORM_TYPE ${PLATFORM_TYPES}) foreach(PLATFORM_TYPE ${PLATFORM_TYPES})
if(${GEN_TYPE}_HAS_${PLATFORM_TYPE} AND SUPPORT_DEVICE_ENQUEUE_${GEN_TYPE}) if(${CORE_TYPE}_HAS_${PLATFORM_TYPE} AND SUPPORT_DEVICE_ENQUEUE_${CORE_TYPE})
get_family_name_with_type(${GEN_TYPE} ${PLATFORM_TYPE}) get_family_name_with_type(${CORE_TYPE} ${PLATFORM_TYPE})
set(PLATFORM_2_0_LOWER ${DEFAULT_SUPPORTED_2_0_${GEN_TYPE}_${PLATFORM_TYPE}_PLATFORM}) set(PLATFORM_2_0_LOWER ${DEFAULT_SUPPORTED_2_0_${CORE_TYPE}_${PLATFORM_TYPE}_PLATFORM})
if(COMPILE_BUILT_INS AND PLATFORM_2_0_LOWER) if(COMPILE_BUILT_INS AND PLATFORM_2_0_LOWER)
compile_kernel(scheduler_${family_name_with_type} ${GEN_TYPE} ${PLATFORM_TYPE} ${SCHEDULER_KERNEL}) compile_kernel(scheduler_${family_name_with_type} ${CORE_TYPE} ${PLATFORM_TYPE} ${SCHEDULER_KERNEL})
if(TARGET scheduler_${family_name_with_type}) if(TARGET scheduler_${family_name_with_type})
add_dependencies(scheduler scheduler_${family_name_with_type}) add_dependencies(scheduler scheduler_${family_name_with_type})
list(APPEND SCHEDULER_TARGETS scheduler_${family_name_with_type}) list(APPEND SCHEDULER_TARGETS scheduler_${family_name_with_type})
@@ -85,11 +85,11 @@ macro(macro_for_each_gen)
endif() endif()
endforeach() endforeach()
if(NOT "${GENERATED_SCHEDULER_CPPS}" STREQUAL "") if(NOT "${GENERATED_SCHEDULER_CPPS}" STREQUAL "")
source_group("generated files\\${GEN_TYPE_LOWER}" FILES ${GENERATED_SCHEDULER_CPPS}) source_group("generated files\\${CORE_TYPE_LOWER}" FILES ${GENERATED_SCHEDULER_CPPS})
endif() endif()
endmacro() endmacro()
apply_macro_for_each_gen("SUPPORTED") apply_macro_for_each_core_type("SUPPORTED")
add_library(${SCHEDULER_BINARY_LIB_NAME} OBJECT EXCLUDE_FROM_ALL CMakeLists.txt) add_library(${SCHEDULER_BINARY_LIB_NAME} OBJECT EXCLUDE_FROM_ALL CMakeLists.txt)

View File

@@ -459,29 +459,29 @@ list(REMOVE_ITEM TEST_KERNELS "${CMAKE_CURRENT_SOURCE_DIR}/test_files/stateless_
list(REMOVE_ITEM TEST_KERNELS ${TEST_KERNEL_VME}) list(REMOVE_ITEM TEST_KERNELS ${TEST_KERNEL_VME})
list(REMOVE_ITEM TEST_KERNELS "${CMAKE_CURRENT_SOURCE_DIR}/${TEST_KERNEL_PRINTF}") list(REMOVE_ITEM TEST_KERNELS "${CMAKE_CURRENT_SOURCE_DIR}/${TEST_KERNEL_PRINTF}")
macro(macro_for_each_gen) macro(macro_for_each_core_type)
foreach(PLATFORM_TYPE ${PLATFORM_TYPES}) foreach(PLATFORM_TYPE ${PLATFORM_TYPES})
if(${GEN_TYPE}_HAS_${PLATFORM_TYPE}) if(${CORE_TYPE}_HAS_${PLATFORM_TYPE})
get_family_name_with_type(${GEN_TYPE} ${PLATFORM_TYPE}) get_family_name_with_type(${CORE_TYPE} ${PLATFORM_TYPE})
string(TOLOWER ${PLATFORM_TYPE} PLATFORM_TYPE_LOWER) string(TOLOWER ${PLATFORM_TYPE} PLATFORM_TYPE_LOWER)
set(PLATFORM_LOWER ${DEFAULT_SUPPORTED_${GEN_TYPE}_${PLATFORM_TYPE}_PLATFORM}) set(PLATFORM_LOWER ${DEFAULT_SUPPORTED_${CORE_TYPE}_${PLATFORM_TYPE}_PLATFORM})
set(PLATFORM_2_0_LOWER ${DEFAULT_SUPPORTED_2_0_${GEN_TYPE}_${PLATFORM_TYPE}_PLATFORM}) set(PLATFORM_2_0_LOWER ${DEFAULT_SUPPORTED_2_0_${CORE_TYPE}_${PLATFORM_TYPE}_PLATFORM})
set(PLATFORM_VME_LOWER ${DEFAULT_SUPPORTED_VME_${GEN_TYPE}_${PLATFORM_TYPE}_PLATFORM}) set(PLATFORM_VME_LOWER ${DEFAULT_SUPPORTED_VME_${CORE_TYPE}_${PLATFORM_TYPE}_PLATFORM})
set(PLATFORM_TEST_KERNELS ${TEST_KERNELS}) set(PLATFORM_TEST_KERNELS ${TEST_KERNELS})
set(IMAGE_SUPPORT FALSE) set(IMAGE_SUPPORT FALSE)
GEN_CONTAINS_PLATFORMS("SUPPORTED_IMAGES" ${GEN_TYPE} IMAGE_SUPPORT) CORE_CONTAINS_PLATFORMS("SUPPORTED_IMAGES" ${CORE_TYPE} IMAGE_SUPPORT)
if(NOT IMAGE_SUPPORT) if(NOT IMAGE_SUPPORT)
list(REMOVE_ITEM PLATFORM_TEST_KERNELS "${CMAKE_CURRENT_SOURCE_DIR}/test_files/copy_buffer_to_image.cl") list(REMOVE_ITEM PLATFORM_TEST_KERNELS "${CMAKE_CURRENT_SOURCE_DIR}/test_files/copy_buffer_to_image.cl")
endif() endif()
foreach(KERNEL_TO_REMOVE ${${GEN_TYPE}_TEST_KERNELS_BLOCKLIST}) foreach(KERNEL_TO_REMOVE ${${CORE_TYPE}_TEST_KERNELS_BLOCKLIST})
set(KERNEL_TO_REMOVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/test_files/${KERNEL_TO_REMOVE}") set(KERNEL_TO_REMOVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/test_files/${KERNEL_TO_REMOVE}")
list(REMOVE_ITEM PLATFORM_TEST_KERNELS ${KERNEL_TO_REMOVE_PATH}) list(REMOVE_ITEM PLATFORM_TEST_KERNELS ${KERNEL_TO_REMOVE_PATH})
endforeach() endforeach()
if(MSVC OR CMAKE_SIZEOF_VOID_P EQUAL 8) if(MSVC OR CMAKE_SIZEOF_VOID_P EQUAL 8)
foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS}) foreach(REVISION_ID ${${PLATFORM_TYPE}_${CORE_TYPE}_REVISIONS})
neo_gen_kernels(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${PLATFORM_TEST_KERNELS}) neo_gen_kernels(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${PLATFORM_TEST_KERNELS})
neo_gen_kernels_with_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL} ${TEST_KERNEL_options}) neo_gen_kernels_with_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL} ${TEST_KERNEL_options})
endforeach() endforeach()
@@ -489,26 +489,26 @@ macro(macro_for_each_gen)
# Compile platform specific kernels if any were found # Compile platform specific kernels if any were found
file(GLOB_RECURSE ${PLATFORM_LOWER}_TEST_KERNELS test_files/*.${PLATFORM_LOWER}) file(GLOB_RECURSE ${PLATFORM_LOWER}_TEST_KERNELS test_files/*.${PLATFORM_LOWER})
if(NOT "${${PLATFORM_LOWER}_TEST_KERNELS}" STREQUAL "") if(NOT "${${PLATFORM_LOWER}_TEST_KERNELS}" STREQUAL "")
foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS}) foreach(REVISION_ID ${${PLATFORM_TYPE}_${CORE_TYPE}_REVISIONS})
neo_gen_kernels(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${${PLATFORM_LOWER}_TEST_KERNELS}) neo_gen_kernels(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${${PLATFORM_LOWER}_TEST_KERNELS})
endforeach() endforeach()
endif() endif()
# Disable debug kernel generation on gen8 - debugger not supported on gen8 # Disable debug kernel generation on gen8 - debugger not supported on gen8
if(NOT ("${GEN_TYPE_LOWER}" STREQUAL "gen8")) if(NOT ("${CORE_TYPE_LOWER}" STREQUAL "gen8"))
foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS}) foreach(REVISION_ID ${${PLATFORM_TYPE}_${CORE_TYPE}_REVISIONS})
neo_gen_kernel_with_kernel_debug_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL}) neo_gen_kernel_with_kernel_debug_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL})
endforeach() endforeach()
endif() endif()
# Gen9lp needs extra -m32 flag # Gen9lp needs extra -m32 flag
if(("${GEN_TYPE_LOWER}" STREQUAL "gen9") AND ("${PLATFORM_TYPE_LOWER}" STREQUAL "lp")) if(("${CORE_TYPE_LOWER}" STREQUAL "gen9") AND ("${PLATFORM_TYPE_LOWER}" STREQUAL "lp"))
foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS}) foreach(REVISION_ID ${${PLATFORM_TYPE}_${CORE_TYPE}_REVISIONS})
neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL_PRINTF} "" ${TEST_KERNEL_PRINTF_internal_options_gen9lp}) neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL_PRINTF} "" ${TEST_KERNEL_PRINTF_internal_options_gen9lp})
neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL_STATELESS} "" ${TEST_KERNEL_STATELESS_internal_options_gen9lp}) neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL_STATELESS} "" ${TEST_KERNEL_STATELESS_internal_options_gen9lp})
endforeach() endforeach()
else() else()
foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS}) foreach(REVISION_ID ${${PLATFORM_TYPE}_${CORE_TYPE}_REVISIONS})
neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL_PRINTF} "" " ") neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL_PRINTF} "" " ")
neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL_STATELESS} "" ${TEST_KERNEL_STATELESS_internal_options}) neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL_STATELESS} "" ${TEST_KERNEL_STATELESS_internal_options})
endforeach() endforeach()
@@ -520,24 +520,24 @@ macro(macro_for_each_gen)
endif() endif()
foreach(file ${TEST_KERNEL_BINDLESS} ${BINDLESS_KERNELS_IMAGES}) foreach(file ${TEST_KERNEL_BINDLESS} ${BINDLESS_KERNELS_IMAGES})
foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS}) foreach(REVISION_ID ${${PLATFORM_TYPE}_${CORE_TYPE}_REVISIONS})
neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${file} "bindless" ${TEST_KERNEL_BINDLESS_internal_options}) neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${REVISION_ID} ${family_name_with_type} ${file} "bindless" ${TEST_KERNEL_BINDLESS_internal_options})
endforeach() endforeach()
endforeach() endforeach()
if(PLATFORM_2_0_LOWER) if(PLATFORM_2_0_LOWER)
foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS}) foreach(REVISION_ID ${${PLATFORM_TYPE}_${CORE_TYPE}_REVISIONS})
neo_gen_kernels_with_options(${family_name_with_type} ${PLATFORM_2_0_LOWER} ${REVISION_ID} ${family_name_with_type} "${TEST_KERNEL_2_0}" ${TEST_KERNEL_2_0_options}) neo_gen_kernels_with_options(${family_name_with_type} ${PLATFORM_2_0_LOWER} ${REVISION_ID} ${family_name_with_type} "${TEST_KERNEL_2_0}" ${TEST_KERNEL_2_0_options})
endforeach() endforeach()
endif() endif()
if(PLATFORM_VME_LOWER) if(PLATFORM_VME_LOWER)
foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS}) foreach(REVISION_ID ${${PLATFORM_TYPE}_${CORE_TYPE}_REVISIONS})
neo_gen_kernels(${family_name_with_type} ${PLATFORM_VME_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL_VME}) neo_gen_kernels(${family_name_with_type} ${PLATFORM_VME_LOWER} ${REVISION_ID} ${family_name_with_type} ${TEST_KERNEL_VME})
endforeach() endforeach()
endif() endif()
endif() endif()
foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS}) foreach(REVISION_ID ${${PLATFORM_TYPE}_${CORE_TYPE}_REVISIONS})
add_custom_target(prepare_test_kernels_${family_name_with_type}_${REVISION_ID} DEPENDS ${kernels_to_compile_${family_name_with_type}_${REVISION_ID}} copy_compiler_files) add_custom_target(prepare_test_kernels_${family_name_with_type}_${REVISION_ID} DEPENDS ${kernels_to_compile_${family_name_with_type}_${REVISION_ID}} copy_compiler_files)
add_dependencies(prepare_test_kernels_for_ocl prepare_test_kernels_${family_name_with_type}_${REVISION_ID}) add_dependencies(prepare_test_kernels_for_ocl prepare_test_kernels_${family_name_with_type}_${REVISION_ID})
set_target_properties(prepare_test_kernels_${family_name_with_type}_${REVISION_ID} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${family_name_with_type}/${REVISION_ID}") set_target_properties(prepare_test_kernels_${family_name_with_type}_${REVISION_ID} PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${family_name_with_type}/${REVISION_ID}")
@@ -545,7 +545,7 @@ macro(macro_for_each_gen)
endif() endif()
endforeach() endforeach()
endmacro() endmacro()
apply_macro_for_each_gen("TESTED") apply_macro_for_each_core_type("TESTED")
add_subdirectories() add_subdirectories()
create_project_source_tree(igdrcl_tests) create_project_source_tree(igdrcl_tests)

View File

@@ -8,14 +8,14 @@ set(IGDRCL_SRCS_tests_gtpin
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/gtpin_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/gtpin_tests.cpp
) )
macro(macro_for_each_gen) macro(macro_for_each_core_type)
foreach(BRANCH_DIR ${BRANCH_DIR_LIST}) foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
if(EXISTS ${NEO_SOURCE_DIR}/opencl/source${BRANCH_DIR}${GEN_TYPE_LOWER}/gtpin_setup_${GEN_TYPE_LOWER}.cpp) if(EXISTS ${NEO_SOURCE_DIR}/opencl/source${BRANCH_DIR}${CORE_TYPE_LOWER}/gtpin_setup_${CORE_TYPE_LOWER}.cpp)
list(APPEND IGDRCL_SRCS_tests_gtpin ${NEO_SOURCE_DIR}/opencl/source${BRANCH_DIR}${GEN_TYPE_LOWER}/gtpin_setup_${GEN_TYPE_LOWER}.cpp) list(APPEND IGDRCL_SRCS_tests_gtpin ${NEO_SOURCE_DIR}/opencl/source${BRANCH_DIR}${CORE_TYPE_LOWER}/gtpin_setup_${CORE_TYPE_LOWER}.cpp)
endif() endif()
endforeach() endforeach()
endmacro() endmacro()
apply_macro_for_each_gen("TESTED") apply_macro_for_each_core_type("TESTED")
if(NOT DISABLED_GTPIN_SUPPORT) if(NOT DISABLED_GTPIN_SUPPORT)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gtpin}) target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_gtpin})
endif() endif()

View File

@@ -4,17 +4,17 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
macro(macro_for_each_gen) macro(macro_for_each_core_type)
foreach(BRANCH_DIR ${BRANCH_DIR_LIST}) foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
if(EXISTS ${NEO_SOURCE_DIR}/opencl/source${BRANCH_DIR}${GEN_TYPE_LOWER}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp) if(EXISTS ${NEO_SOURCE_DIR}/opencl/source${BRANCH_DIR}${CORE_TYPE_LOWER}/enable_family_full_ocl_${CORE_TYPE_LOWER}.cpp)
list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW list(APPEND IGDRCL_SRCS_ENABLE_TESTED_HW
${NEO_SOURCE_DIR}/opencl/source${BRANCH_DIR}${GEN_TYPE_LOWER}/enable_family_full_ocl_${GEN_TYPE_LOWER}.cpp ${NEO_SOURCE_DIR}/opencl/source${BRANCH_DIR}${CORE_TYPE_LOWER}/enable_family_full_ocl_${CORE_TYPE_LOWER}.cpp
) )
endif() endif()
endforeach() endforeach()
endmacro() endmacro()
apply_macro_for_each_gen("TESTED") apply_macro_for_each_core_type("TESTED")
set(IGDRCL_SRCS_LIB_ULT set(IGDRCL_SRCS_LIB_ULT
${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp ${NEO_SOURCE_DIR}/opencl/source/compiler_interface/default_cache_config.cpp

View File

@@ -95,7 +95,7 @@ target_include_directories(ocloc_tests PRIVATE
${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests ${NEO_SHARED_TEST_DIRECTORY}/common/test_configuration/unit_tests
$<TARGET_PROPERTY:ocloc_lib,INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:ocloc_lib,INCLUDE_DIRECTORIES>
) )
target_compile_definitions(ocloc_tests PUBLIC MOCKABLE_VIRTUAL=virtual $<TARGET_PROPERTY:ocloc_lib,INTERFACE_COMPILE_DEFINITIONS> ${TESTED_GEN_FLAGS_DEFINITONS}) target_compile_definitions(ocloc_tests PUBLIC MOCKABLE_VIRTUAL=virtual $<TARGET_PROPERTY:ocloc_lib,INTERFACE_COMPILE_DEFINITIONS> ${TESTED_CORE_FLAGS_DEFINITONS})
target_link_libraries(ocloc_tests gmock-gtest) target_link_libraries(ocloc_tests gmock-gtest)
@@ -126,8 +126,8 @@ macro(macro_for_each_platform)
if("${PLATFORM_IT_LOWER}" STREQUAL "${CLOC_LIB_DEFAULT_DEVICE}") if("${PLATFORM_IT_LOWER}" STREQUAL "${CLOC_LIB_DEFAULT_DEVICE}")
foreach(PLATFORM_TYPE ${PLATFORM_TYPES}) foreach(PLATFORM_TYPE ${PLATFORM_TYPES})
if(${PLATFORM_IT}_IS_${PLATFORM_TYPE}) if(${PLATFORM_IT}_IS_${PLATFORM_TYPE})
list(GET ${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS 0 REVISION_ID) list(GET ${PLATFORM_TYPE}_${CORE_TYPE}_REVISIONS 0 REVISION_ID)
get_family_name_with_type(${GEN_TYPE} ${PLATFORM_TYPE}) get_family_name_with_type(${CORE_TYPE} ${PLATFORM_TYPE})
add_dependencies(run_ocloc_tests prepare_test_kernels_${family_name_with_type}_${REVISION_ID}) add_dependencies(run_ocloc_tests prepare_test_kernels_${family_name_with_type}_${REVISION_ID})
add_dependencies(unit_tests prepare_test_kernels_${family_name_with_type}_${REVISION_ID}) add_dependencies(unit_tests prepare_test_kernels_${family_name_with_type}_${REVISION_ID})
neo_copy_test_files(copy_test_files_${family_name_with_type}_${REVISION_ID} ${family_name_with_type}) neo_copy_test_files(copy_test_files_${family_name_with_type}_${REVISION_ID} ${family_name_with_type})
@@ -138,10 +138,10 @@ macro(macro_for_each_platform)
endforeach() endforeach()
endif() endif()
endmacro() endmacro()
macro(macro_for_each_gen) macro(macro_for_each_core_type)
apply_macro_for_each_platform() apply_macro_for_each_platform()
endmacro() endmacro()
apply_macro_for_each_gen("TESTED") apply_macro_for_each_core_type("TESTED")
set_property(TARGET run_ocloc_tests PROPERTY FOLDER ${CLOC_LIB_FOLDER}) set_property(TARGET run_ocloc_tests PROPERTY FOLDER ${CLOC_LIB_FOLDER})

View File

@@ -4,50 +4,50 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
set(MAX_GEN 64) set(MAX_CORE 64)
set(ALL_GEN_TYPES "") set(ALL_CORE_TYPES "")
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake${BRANCH_DIR_SUFFIX}fill_gens.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake${BRANCH_DIR_SUFFIX}fill_core_types.cmake)
set(ALL_GEN_TYPES_REVERSED ${ALL_GEN_TYPES}) set(ALL_CORE_TYPES_REVERSED ${ALL_CORE_TYPES})
list(REVERSE ALL_GEN_TYPES_REVERSED) list(REVERSE ALL_CORE_TYPES_REVERSED)
macro(FIND_IDX_FOR_GEN_TYPE GEN_TYPE GEN_IDX) macro(FIND_IDX_FOR_CORE_TYPE CORE_TYPE CORE_IDX)
list(FIND ALL_GEN_TYPES "${GEN_TYPE}" GEN_IDX) list(FIND ALL_CORE_TYPES "${CORE_TYPE}" CORE_IDX)
if(${GEN_IDX} EQUAL -1) if(${CORE_IDX} EQUAL -1)
message(FATAL_ERROR "No ${GEN_TYPE} allowed, exiting") message(FATAL_ERROR "No ${CORE_TYPE} allowed, exiting")
endif() endif()
endmacro() endmacro()
macro(INIT_LIST LIST_TYPE ELEMENT_TYPE) macro(INIT_LIST LIST_TYPE ELEMENT_TYPE)
foreach(IT RANGE 0 ${MAX_GEN} 1) foreach(IT RANGE 0 ${MAX_CORE} 1)
list(APPEND ALL_${ELEMENT_TYPE}_${LIST_TYPE} " ") list(APPEND ALL_${ELEMENT_TYPE}_${LIST_TYPE} " ")
endforeach() endforeach()
endmacro() endmacro()
macro(GET_LIST_FOR_GEN LIST_TYPE ELEMENT_TYPE GEN_IDX OUT_LIST) macro(GET_LIST_FOR_CORE_TYPE LIST_TYPE ELEMENT_TYPE CORE_IDX OUT_LIST)
list(GET ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_IDX} GEN_X_${LIST_TYPE}) list(GET ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${CORE_IDX} CORE_X_${LIST_TYPE})
string(REPLACE "," ";" ${OUT_LIST} ${GEN_X_${LIST_TYPE}}) string(REPLACE "," ";" ${OUT_LIST} ${CORE_X_${LIST_TYPE}})
endmacro() endmacro()
macro(ADD_ITEM_FOR_GEN LIST_TYPE ELEMENT_TYPE GEN_TYPE ITEM) macro(ADD_ITEM_FOR_CORE_TYPE LIST_TYPE ELEMENT_TYPE CORE_TYPE ITEM)
FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX) FIND_IDX_FOR_CORE_TYPE(${CORE_TYPE} CORE_IDX)
list(GET ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_IDX} GEN_X_LIST) list(GET ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${CORE_IDX} CORE_X_LIST)
string(REPLACE " " "" GEN_X_LIST ${GEN_X_LIST}) string(REPLACE " " "" CORE_X_LIST ${CORE_X_LIST})
if("${GEN_X_LIST}" STREQUAL "") if("${CORE_X_LIST}" STREQUAL "")
set(GEN_X_LIST "${ITEM}") set(CORE_X_LIST "${ITEM}")
else() else()
set(GEN_X_LIST "${GEN_X_LIST},${ITEM}") set(CORE_X_LIST "${CORE_X_LIST},${ITEM}")
endif() endif()
list(REMOVE_AT ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_IDX}) list(REMOVE_AT ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${CORE_IDX})
list(INSERT ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${GEN_IDX} ${GEN_X_LIST}) list(INSERT ALL_${ELEMENT_TYPE}_${LIST_TYPE} ${CORE_IDX} ${CORE_X_LIST})
endmacro() endmacro()
macro(GEN_CONTAINS_PLATFORMS TYPE GEN_TYPE OUT_FLAG) macro(CORE_CONTAINS_PLATFORMS TYPE CORE_TYPE OUT_FLAG)
FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX) FIND_IDX_FOR_CORE_TYPE(${CORE_TYPE} CORE_IDX)
GET_LIST_FOR_GEN("PLATFORMS" ${TYPE} ${GEN_IDX} GEN_X_PLATFORMS) GET_LIST_FOR_CORE_TYPE("PLATFORMS" ${TYPE} ${CORE_IDX} CORE_X_PLATFORMS)
string(REPLACE " " "" GEN_X_PLATFORMS ${GEN_X_PLATFORMS}) string(REPLACE " " "" CORE_X_PLATFORMS ${CORE_X_PLATFORMS})
if("${GEN_X_PLATFORMS}" STREQUAL "") if("${CORE_X_PLATFORMS}" STREQUAL "")
set(${OUT_FLAG} FALSE) set(${OUT_FLAG} FALSE)
else() else()
set(${OUT_FLAG} TRUE) set(${OUT_FLAG} TRUE)
@@ -84,40 +84,40 @@ endmacro()
macro(GET_AVAILABLE_PLATFORMS TYPE FLAG_NAME OUT_STR) macro(GET_AVAILABLE_PLATFORMS TYPE FLAG_NAME OUT_STR)
set(${TYPE}_PLATFORM_LIST) set(${TYPE}_PLATFORM_LIST)
set(${TYPE}_GEN_FLAGS_DEFINITONS) set(${TYPE}_CORE_FLAGS_DEFINITONS)
if(NOT DEFAULT_${TYPE}_PLATFORM AND DEFINED PREFERRED_PLATFORM AND ${FLAG_NAME}_${PREFERRED_PLATFORM}) if(NOT DEFAULT_${TYPE}_PLATFORM AND DEFINED PREFERRED_PLATFORM AND ${FLAG_NAME}_${PREFERRED_PLATFORM})
set(DEFAULT_${TYPE}_PLATFORM ${PREFERRED_PLATFORM}) set(DEFAULT_${TYPE}_PLATFORM ${PREFERRED_PLATFORM})
endif() endif()
foreach(GEN_TYPE ${ALL_GEN_TYPES_REVERSED}) foreach(CORE_TYPE ${ALL_CORE_TYPES_REVERSED})
GEN_CONTAINS_PLATFORMS(${TYPE} ${GEN_TYPE} GENX_HAS_PLATFORMS) CORE_CONTAINS_PLATFORMS(${TYPE} ${CORE_TYPE} COREX_HAS_PLATFORMS)
if(${GENX_HAS_PLATFORMS}) if(${COREX_HAS_PLATFORMS})
FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX) FIND_IDX_FOR_CORE_TYPE(${CORE_TYPE} CORE_IDX)
list(APPEND ${TYPE}_GEN_FLAGS_DEFINITONS ${FLAG_NAME}_${GEN_TYPE}) list(APPEND ${TYPE}_CORE_FLAGS_DEFINITONS ${FLAG_NAME}_${CORE_TYPE})
GET_LIST_FOR_GEN("PLATFORMS" ${TYPE} ${GEN_IDX} ${TYPE}_GENX_PLATFORMS) GET_LIST_FOR_CORE_TYPE("PLATFORMS" ${TYPE} ${CORE_IDX} ${TYPE}_COREX_PLATFORMS)
list(APPEND ${TYPE}_PLATFORM_LIST ${${TYPE}_GENX_PLATFORMS}) list(APPEND ${TYPE}_PLATFORM_LIST ${${TYPE}_COREX_PLATFORMS})
if(NOT DEFAULT_${TYPE}_PLATFORM) if(NOT DEFAULT_${TYPE}_PLATFORM)
list(GET ${TYPE}_PLATFORM_LIST 0 DEFAULT_${TYPE}_PLATFORM ${PLATFORM_IT}) list(GET ${TYPE}_PLATFORM_LIST 0 DEFAULT_${TYPE}_PLATFORM ${PLATFORM_IT})
endif() endif()
if(NOT DEFAULT_${TYPE}_${GEN_TYPE}_PLATFORM) if(NOT DEFAULT_${TYPE}_${CORE_TYPE}_PLATFORM)
list(GET ${TYPE}_GENX_PLATFORMS 0 DEFAULT_${TYPE}_${GEN_TYPE}_PLATFORM) list(GET ${TYPE}_COREX_PLATFORMS 0 DEFAULT_${TYPE}_${CORE_TYPE}_PLATFORM)
endif() endif()
endif() endif()
endforeach() endforeach()
foreach(PLATFORM_IT ${${TYPE}_PLATFORM_LIST}) foreach(PLATFORM_IT ${${TYPE}_PLATFORM_LIST})
set(${OUT_STR} "${${OUT_STR}} ${PLATFORM_IT}") set(${OUT_STR} "${${OUT_STR}} ${PLATFORM_IT}")
list(APPEND ${TYPE}_GEN_FLAGS_DEFINITONS ${FLAG_NAME}_${PLATFORM_IT}) list(APPEND ${TYPE}_CORE_FLAGS_DEFINITONS ${FLAG_NAME}_${PLATFORM_IT})
endforeach() endforeach()
endmacro() endmacro()
macro(GET_PLATFORMS_FOR_GEN TYPE GEN_TYPE OUT_LIST) macro(GET_PLATFORMS_FOR_CORE_TYPE TYPE CORE_TYPE OUT_LIST)
FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX) FIND_IDX_FOR_CORE_TYPE(${CORE_TYPE} CORE_IDX)
GET_LIST_FOR_GEN("PLATFORMS" ${TYPE} ${GEN_IDX} ${OUT_LIST}) GET_LIST_FOR_CORE_TYPE("PLATFORMS" ${TYPE} ${CORE_IDX} ${OUT_LIST})
endmacro() endmacro()
macro(PLATFORM_HAS_2_0 GEN_TYPE PLATFORM_NAME OUT_FLAG) macro(PLATFORM_HAS_2_0 CORE_TYPE PLATFORM_NAME OUT_FLAG)
FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX) FIND_IDX_FOR_CORE_TYPE(${CORE_TYPE} CORE_IDX)
GET_LIST_FOR_GEN("PLATFORMS" "SUPPORTED_2_0" ${GEN_IDX} GEN_X_PLATFORMS) GET_LIST_FOR_CORE_TYPE("PLATFORMS" "SUPPORTED_2_0" ${CORE_IDX} CORE_X_PLATFORMS)
list(FIND GEN_X_PLATFORMS ${PLATFORM_NAME} PLATFORM_EXISTS) list(FIND CORE_X_PLATFORMS ${PLATFORM_NAME} PLATFORM_EXISTS)
if("${PLATFORM_EXISTS}" LESS 0) if("${PLATFORM_EXISTS}" LESS 0)
set(${OUT_FLAG} FALSE) set(${OUT_FLAG} FALSE)
else() else()
@@ -125,10 +125,10 @@ macro(PLATFORM_HAS_2_0 GEN_TYPE PLATFORM_NAME OUT_FLAG)
endif() endif()
endmacro() endmacro()
macro(PLATFORM_HAS_VME GEN_TYPE PLATFORM_NAME OUT_FLAG) macro(PLATFORM_HAS_VME CORE_TYPE PLATFORM_NAME OUT_FLAG)
FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX) FIND_IDX_FOR_CORE_TYPE(${CORE_TYPE} CORE_IDX)
GET_LIST_FOR_GEN("PLATFORMS" "SUPPORTED_VME" ${GEN_IDX} GEN_X_PLATFORMS) GET_LIST_FOR_CORE_TYPE("PLATFORMS" "SUPPORTED_VME" ${CORE_IDX} CORE_X_PLATFORMS)
list(FIND GEN_X_PLATFORMS ${PLATFORM_NAME} PLATFORM_EXISTS) list(FIND CORE_X_PLATFORMS ${PLATFORM_NAME} PLATFORM_EXISTS)
if("${PLATFORM_EXISTS}" LESS 0) if("${PLATFORM_EXISTS}" LESS 0)
set(${OUT_FLAG} FALSE) set(${OUT_FLAG} FALSE)
else() else()
@@ -136,62 +136,63 @@ macro(PLATFORM_HAS_VME GEN_TYPE PLATFORM_NAME OUT_FLAG)
endif() endif()
endmacro() endmacro()
# default flag for GenX devices support # default flag for CoreX devices support
set(SUPPORT_GEN_DEFAULT TRUE CACHE BOOL "default value for SUPPORT_GENx") set(SUPPORT_GEN_DEFAULT TRUE CACHE BOOL "default value for SUPPORT_COREx")
# default flag for platform support # default flag for platform support
set(SUPPORT_PLATFORM_DEFAULT TRUE CACHE BOOL "default value for support platform") set(SUPPORT_PLATFORM_DEFAULT TRUE CACHE BOOL "default value for support platform")
# Define the hardware configurations we support and test # Define the hardware configurations we support and test
macro(SET_FLAGS_FOR GEN_TYPE) macro(SET_FLAGS_FOR CORE_TYPE)
foreach(SKU_NAME ${ARGN}) foreach(SKU_NAME ${ARGN})
if(SUPPORT_${SKU_NAME}) if(SUPPORT_${SKU_NAME})
if(NOT SUPPORT_${GEN_TYPE}) if(NOT SUPPORT_${CORE_TYPE})
message(STATUS "Auto-Enabling ${GEN_TYPE} support for ${SKU_NAME}") message(STATUS "Auto-Enabling ${CORE_TYPE} support for ${SKU_NAME}")
set(SUPPORT_${GEN_TYPE} TRUE CACHE BOOL "Support ${GEN_TYPE} devices") set(SUPPORT_${CORE_TYPE} TRUE CACHE BOOL "Support ${CORE_TYPE} devices")
endif() endif()
if(NOT DEFINED TESTS_${GEN_TYPE}) if(NOT DEFINED TESTS_${CORE_TYPE})
message(STATUS "Auto-Enabling ${GEN_TYPE} tests for ${SKU_NAME}") message(STATUS "Auto-Enabling ${CORE_TYPE} tests for ${SKU_NAME}")
set(TESTS_${GEN_TYPE} TRUE CACHE BOOL "Build ULTs for ${GEN_TYPE} devices") set(TESTS_${CORE_TYPE} TRUE CACHE BOOL "Build ULTs for ${CORE_TYPE} devices")
endif() endif()
endif() endif()
endforeach() endforeach()
set(SUPPORT_${GEN_TYPE} ${SUPPORT_GEN_DEFAULT} CACHE BOOL "Support ${GEN_TYPE} devices") set(SUPPORT_${CORE_TYPE} ${SUPPORT_GEN_DEFAULT} CACHE BOOL "Support ${CORE_TYPE} devices")
set(TESTS_${GEN_TYPE} ${SUPPORT_${GEN_TYPE}} CACHE BOOL "Build ULTs for ${GEN_TYPE} devices") set(TESTS_${CORE_TYPE} ${SUPPORT_${CORE_TYPE}} CACHE BOOL "Build ULTs for ${CORE_TYPE} devices")
set(SUPPORT_DEVICE_ENQUEUE_${GEN_TYPE} TRUE CACHE BOOL "Support ${GEN_TYPE} for device side enqueue") set(SUPPORT_DEVICE_ENQUEUE_${CORE_TYPE} TRUE CACHE BOOL "Support ${CORE_TYPE} for device side enqueue")
if(NOT SUPPORT_${GEN_TYPE} OR NEO_SKIP_UNIT_TESTS) if(NOT SUPPORT_${CORE_TYPE} OR NEO_SKIP_UNIT_TESTS)
set(TESTS_${GEN_TYPE} FALSE) set(TESTS_${CORE_TYPE} FALSE)
endif() endif()
if(SUPPORT_${GEN_TYPE}) if(SUPPORT_${CORE_TYPE})
list(APPEND ALL_SUPPORTED_CORE_FAMILIES ${GEN_TYPE}) list(APPEND ALL_SUPPORTED_CORE_FAMILIES ${CORE_TYPE})
list(REMOVE_DUPLICATES ALL_SUPPORTED_CORE_FAMILIES) list(REMOVE_DUPLICATES ALL_SUPPORTED_CORE_FAMILIES)
foreach(${GEN_TYPE}_PLATFORM ${ARGN}) foreach(${CORE_TYPE}_PLATFORM ${ARGN})
set(SUPPORT_${${GEN_TYPE}_PLATFORM} ${SUPPORT_PLATFORM_DEFAULT} CACHE BOOL "Support ${${GEN_TYPE}_PLATFORM}") set(SUPPORT_${${CORE_TYPE}_PLATFORM} ${SUPPORT_PLATFORM_DEFAULT} CACHE BOOL "Support ${${CORE_TYPE}_PLATFORM}")
if(TESTS_${GEN_TYPE}) if(TESTS_${CORE_TYPE})
set(TESTS_${${GEN_TYPE}_PLATFORM} ${SUPPORT_${${GEN_TYPE}_PLATFORM}} CACHE BOOL "Build ULTs for ${${GEN_TYPE}_PLATFORM}") set(TESTS_${${CORE_TYPE}_PLATFORM} ${SUPPORT_${${CORE_TYPE}_PLATFORM}} CACHE BOOL "Build ULTs for ${${CORE_TYPE}_PLATFORM}")
endif() endif()
if(NOT SUPPORT_${${GEN_TYPE}_PLATFORM} OR NOT TESTS_${GEN_TYPE} OR NEO_SKIP_UNIT_TESTS) if(NOT SUPPORT_${${CORE_TYPE}_PLATFORM} OR NOT TESTS_${CORE_TYPE} OR NEO_SKIP_UNIT_TESTS)
set(TESTS_${${GEN_TYPE}_PLATFORM} FALSE) set(TESTS_${${CORE_TYPE}_PLATFORM} FALSE)
endif() endif()
endforeach() endforeach()
endif() endif()
if(TESTS_${GEN_TYPE}) if(TESTS_${CORE_TYPE})
list(APPEND ALL_TESTED_CORE_FAMILIES ${GEN_TYPE}) list(APPEND ALL_TESTED_CORE_FAMILIES ${CORE_TYPE})
list(REMOVE_DUPLICATES ALL_TESTED_CORE_FAMILIES) list(REMOVE_DUPLICATES ALL_TESTED_CORE_FAMILIES)
endif() endif()
endmacro() endmacro()
macro(ADD_PLATFORM_FOR_GEN LIST_TYPE GEN_TYPE PLATFORM_NAME PLATFORM_TYPE)
macro(ADD_PLATFORM_FOR_CORE_TYPE LIST_TYPE CORE_TYPE PLATFORM_NAME PLATFORM_TYPE)
list(APPEND PLATFORM_TYPES ${PLATFORM_TYPE}) list(APPEND PLATFORM_TYPES ${PLATFORM_TYPE})
list(REMOVE_DUPLICATES PLATFORM_TYPES) list(REMOVE_DUPLICATES PLATFORM_TYPES)
ADD_ITEM_FOR_GEN("PLATFORMS" ${LIST_TYPE} ${GEN_TYPE} ${PLATFORM_NAME}) ADD_ITEM_FOR_CORE_TYPE("PLATFORMS" ${LIST_TYPE} ${CORE_TYPE} ${PLATFORM_NAME})
set(${GEN_TYPE}_HAS_${PLATFORM_TYPE} TRUE) set(${CORE_TYPE}_HAS_${PLATFORM_TYPE} TRUE)
set(${PLATFORM_NAME}_IS_${PLATFORM_TYPE} TRUE) set(${PLATFORM_NAME}_IS_${PLATFORM_TYPE} TRUE)
if(NOT DEFAULT_${LIST_TYPE}_${GEN_TYPE}_${PLATFORM_TYPE}_PLATFORM) if(NOT DEFAULT_${LIST_TYPE}_${CORE_TYPE}_${PLATFORM_TYPE}_PLATFORM)
string(TOLOWER ${PLATFORM_NAME} DEFAULT_${LIST_TYPE}_${GEN_TYPE}_${PLATFORM_TYPE}_PLATFORM) string(TOLOWER ${PLATFORM_NAME} DEFAULT_${LIST_TYPE}_${CORE_TYPE}_${PLATFORM_TYPE}_PLATFORM)
endif() endif()
endmacro() endmacro()
@@ -240,17 +241,17 @@ endif()
if(NOT DEFAULT_TESTED_FAMILY_NAME) if(NOT DEFAULT_TESTED_FAMILY_NAME)
if(DEFINED PREFERRED_FAMILY_NAME) if(DEFINED PREFERRED_FAMILY_NAME)
list(FIND ALL_TESTED_FAMILY_NAME ${PREFERRED_FAMILY_NAME} GEN_IDX) list(FIND ALL_TESTED_FAMILY_NAME ${PREFERRED_FAMILY_NAME} CORE_IDX)
if(${GEN_IDX} GREATER -1) if(${CORE_IDX} GREATER -1)
set(DEFAULT_TESTED_FAMILY_NAME ${PREFERRED_FAMILY_NAME}) set(DEFAULT_TESTED_FAMILY_NAME ${PREFERRED_FAMILY_NAME})
endif() endif()
endif() endif()
if(NOT DEFINED DEFAULT_TESTED_FAMILY_NAME) if(NOT DEFINED DEFAULT_TESTED_FAMILY_NAME)
foreach(GEN_TYPE ${ALL_GEN_TYPES_REVERSED}) foreach(CORE_TYPE ${ALL_CORE_TYPES_REVERSED})
FIND_IDX_FOR_GEN_TYPE(${GEN_TYPE} GEN_IDX) FIND_IDX_FOR_CORE_TYPE(${CORE_TYPE} CORE_IDX)
list(GET ALL_TESTED_FAMILY_NAME ${GEN_IDX} GEN_FAMILY_NAME) list(GET ALL_TESTED_FAMILY_NAME ${CORE_IDX} CORE_FAMILY_NAME)
if(NOT GEN_FAMILY_NAME STREQUAL " ") if(NOT CORE_FAMILY_NAME STREQUAL " ")
set(DEFAULT_TESTED_FAMILY_NAME ${GEN_FAMILY_NAME}) set(DEFAULT_TESTED_FAMILY_NAME ${CORE_FAMILY_NAME})
break() break()
endif() endif()
endforeach() endforeach()

View File

@@ -107,16 +107,16 @@ set(CLOC_LIB_LIB_FLAGS_DEFINITIONS
-DALL_SUPPORTED_PRODUCT_FAMILIES=${ALL_SUPPORTED_PRODUCT_FAMILIES} -DALL_SUPPORTED_PRODUCT_FAMILIES=${ALL_SUPPORTED_PRODUCT_FAMILIES}
) )
set(NEO_SHARED_GENX_CPP_FILES set(NEO_SHARED_COREX_CPP_FILES
hw_info hw_info
) )
macro(macro_for_each_platform) macro(macro_for_each_platform)
foreach(BRANCH_DIR ${BRANCH_DIR_LIST}) foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
foreach(BRANCH ${BRANCH_DIR_LIST}) foreach(BRANCH ${BRANCH_DIR_LIST})
foreach(SRC_FILE ${NEO_SOURCE_DIR}/shared/source${BRANCH}${GEN_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX}hw_info_setup_${PLATFORM_IT_LOWER}.inl foreach(SRC_FILE ${NEO_SOURCE_DIR}/shared/source${BRANCH}${CORE_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX}hw_info_setup_${PLATFORM_IT_LOWER}.inl
${NEO_SOURCE_DIR}/shared/source${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}hw_info_${PLATFORM_IT_LOWER}.cpp ${NEO_SOURCE_DIR}/shared/source${BRANCH}${CORE_TYPE_LOWER}${BRANCH_DIR}hw_info_${PLATFORM_IT_LOWER}.cpp
${NEO_SOURCE_DIR}/shared/source${BRANCH}${GEN_TYPE_LOWER}/compiler_hw_info_config_${PLATFORM_IT_LOWER}.inl ${NEO_SOURCE_DIR}/shared/source${BRANCH}${CORE_TYPE_LOWER}/compiler_hw_info_config_${PLATFORM_IT_LOWER}.inl
) )
if(EXISTS ${SRC_FILE}) if(EXISTS ${SRC_FILE})
list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE}) list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE})
@@ -124,12 +124,12 @@ macro(macro_for_each_platform)
endforeach() endforeach()
if(WIN32) if(WIN32)
set(SRC_FILE ${NEO_SOURCE_DIR}/shared/source${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}windows/hw_info_extra_${PLATFORM_IT_LOWER}.cpp) set(SRC_FILE ${NEO_SOURCE_DIR}/shared/source${BRANCH}${CORE_TYPE_LOWER}${BRANCH_DIR}windows/hw_info_extra_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE}) if(EXISTS ${SRC_FILE})
list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE}) list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE})
endif() endif()
else() else()
set(SRC_FILE ${NEO_SOURCE_DIR}/shared/source${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}linux/hw_info_extra_${PLATFORM_IT_LOWER}.cpp) set(SRC_FILE ${NEO_SOURCE_DIR}/shared/source${BRANCH}${CORE_TYPE_LOWER}${BRANCH_DIR}linux/hw_info_extra_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE}) if(EXISTS ${SRC_FILE})
list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE}) list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE})
endif() endif()
@@ -139,15 +139,15 @@ macro(macro_for_each_platform)
endforeach() endforeach()
endmacro() endmacro()
macro(macro_for_each_gen) macro(macro_for_each_core_type)
foreach(SRC_IT ${NEO_SHARED_GENX_CPP_FILES}) foreach(SRC_IT ${NEO_SHARED_COREX_CPP_FILES})
foreach(BRANCH_DIR ${BRANCH_DIR_LIST}) foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
foreach(BRANCH ${BRANCH_DIR_LIST}) foreach(BRANCH ${BRANCH_DIR_LIST})
set(SRC_FILE ${NEO_SOURCE_DIR}/shared/source${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}${SRC_IT}) set(SRC_FILE ${NEO_SOURCE_DIR}/shared/source${BRANCH}${CORE_TYPE_LOWER}${BRANCH_DIR}${SRC_IT})
if(EXISTS ${SRC_FILE}_${GEN_TYPE_LOWER}.cpp) if(EXISTS ${SRC_FILE}_${CORE_TYPE_LOWER}.cpp)
list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE}_${GEN_TYPE_LOWER}.cpp) list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE}_${CORE_TYPE_LOWER}.cpp)
endif() endif()
set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}enable_${GEN_TYPE_LOWER}.cpp) set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH}${CORE_TYPE_LOWER}${BRANCH_DIR}enable_${CORE_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE}) if(EXISTS ${SRC_FILE})
list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE}) list(APPEND CLOC_LIB_SRCS_LIB ${SRC_FILE})
endif() endif()
@@ -157,7 +157,7 @@ macro(macro_for_each_gen)
apply_macro_for_each_platform() apply_macro_for_each_platform()
endmacro() endmacro()
apply_macro_for_each_gen("SUPPORTED") apply_macro_for_each_core_type("SUPPORTED")
set(CLOC_LIB_SRCS set(CLOC_LIB_SRCS
${CLOC_LIB_SRCS_LIB} ${CLOC_LIB_SRCS_LIB}
@@ -182,7 +182,7 @@ set(CLOC_LIB_INCLUDES
target_include_directories(${OCLOC_NAME}_lib BEFORE PRIVATE ${CLOC_LIB_INCLUDES}) target_include_directories(${OCLOC_NAME}_lib BEFORE PRIVATE ${CLOC_LIB_INCLUDES})
target_include_directories(${OCLOC_NAME}_lib BEFORE PRIVATE ${IGA_INCLUDE_DIR}) target_include_directories(${OCLOC_NAME}_lib BEFORE PRIVATE ${IGA_INCLUDE_DIR})
target_compile_definitions(${OCLOC_NAME}_lib PUBLIC ${CLOC_LIB_LIB_FLAGS_DEFINITIONS} ${SUPPORTED_GEN_FLAGS_DEFINITONS} DEFAULT_PLATFORM=${DEFAULT_SUPPORTED_PLATFORM} 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} IGA_LIBRARY_NAME=${CMAKE_SHARED_LIBRARY_PREFIX}${IGA_LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
) )
target_compile_definitions(${OCLOC_NAME}_lib PUBLIC ${NEO__IGC_COMPILE_DEFINITIONS}) target_compile_definitions(${OCLOC_NAME}_lib PUBLIC ${NEO__IGC_COMPILE_DEFINITIONS})

View File

@@ -9,21 +9,21 @@ if(NOT DEFINED NEO_SHARED_RELEASE_LIB_NAME)
MESSAGE(FATAL_ERROR "NEO Shared library name undefined!") MESSAGE(FATAL_ERROR "NEO Shared library name undefined!")
endif() endif()
include(enable_gens.cmake) include(enable_cores.cmake)
function(generate_shared_lib LIB_NAME MOCKABLE) function(generate_shared_lib LIB_NAME MOCKABLE)
add_library(${LIB_NAME} STATIC add_library(${LIB_NAME} STATIC
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/enable_gens.cmake ${CMAKE_CURRENT_SOURCE_DIR}/enable_cores.cmake
${CORE_SOURCES} ${CORE_SOURCES}
) )
if(${MOCKABLE}) if(${MOCKABLE})
target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual DEFAULT_TEST_PLATFORM=${DEFAULT_TESTED_PLATFORM} DEFAULT_TEST_FAMILY_NAME=${DEFAULT_TESTED_FAMILY_NAME} ${TESTED_GEN_FLAGS_DEFINITONS}) target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual DEFAULT_TEST_PLATFORM=${DEFAULT_TESTED_PLATFORM} DEFAULT_TEST_FAMILY_NAME=${DEFAULT_TESTED_FAMILY_NAME} ${TESTED_CORE_FLAGS_DEFINITONS})
else() else()
target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
endif() endif()
list(APPEND LIB_FLAGS_DEFINITIONS ${SUPPORTED_GEN_FLAGS_DEFINITONS}) list(APPEND LIB_FLAGS_DEFINITIONS ${SUPPORTED_CORE_FLAGS_DEFINITONS})
set_property(TARGET ${LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) 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}") set_target_properties(${LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}")
@@ -80,29 +80,29 @@ function(generate_shared_lib LIB_NAME MOCKABLE)
endfunction() endfunction()
set(NEO_CORE_COMPILE_DEFS "") set(NEO_CORE_COMPILE_DEFS "")
set(CORE_SOURCES ${CORE_SRCS_GENX_ALL_BASE}) set(CORE_SOURCES ${CORE_SRCS_COREX_ALL_BASE})
add_subdirectories() add_subdirectories()
if(WIN32) if(WIN32)
list(APPEND CORE_SOURCES ${CORE_SRCS_GENX_ALL_WINDOWS}) list(APPEND CORE_SOURCES ${CORE_SRCS_COREX_ALL_WINDOWS})
endif() endif()
if(WIN32 OR NOT DISABLE_WDDM_LINUX) if(WIN32 OR NOT DISABLE_WDDM_LINUX)
list(APPEND CORE_SOURCES ${CORE_SRCS_GENX_ALL_WDDM}) list(APPEND CORE_SOURCES ${CORE_SRCS_COREX_ALL_WDDM})
endif() endif()
if(NOT WIN32) if(NOT WIN32)
list(APPEND CORE_SOURCES ${CORE_SRCS_GENX_ALL_LINUX}) list(APPEND CORE_SOURCES ${CORE_SRCS_COREX_ALL_LINUX})
endif() endif()
macro(macro_for_each_gen) macro(macro_for_each_core_type)
append_sources_from_properties(CORE_SOURCES append_sources_from_properties(CORE_SOURCES
SHARED_SRCS_ADDITIONAL_FILES_${GEN_TYPE} SHARED_SRCS_ADDITIONAL_FILES_${CORE_TYPE}
) )
endmacro() endmacro()
apply_macro_for_each_gen("SUPPORTED") apply_macro_for_each_core_type("SUPPORTED")
append_sources_from_properties(CORE_SOURCES append_sources_from_properties(CORE_SOURCES
NEO_CORE_AIL NEO_CORE_AIL

View File

@@ -57,7 +57,7 @@ endif()
foreach(MODE ${BIND_MODES}) foreach(MODE ${BIND_MODES})
get_property(GENERATED_BUILTINS_CPPS_${MODE} GLOBAL PROPERTY GENERATED_BUILTINS_CPPS_${MODE}) get_property(GENERATED_BUILTINS_CPPS_${MODE} GLOBAL PROPERTY GENERATED_BUILTINS_CPPS_${MODE})
source_group("generated files\\${GEN_TYPE_LOWER}" FILES GENERATED_BUILTINS_CPPS_${MODE}) source_group("generated files\\${CORE_TYPE_LOWER}" FILES GENERATED_BUILTINS_CPPS_${MODE})
endforeach() endforeach()
if(COMPILE_BUILT_INS) if(COMPILE_BUILT_INS)

View File

@@ -40,9 +40,9 @@ endif()
set(BUILTINS_INCLUDE_DIR ${TargetDir} PARENT_SCOPE) set(BUILTINS_INCLUDE_DIR ${TargetDir} PARENT_SCOPE)
set(BUILTIN_CPP "") set(BUILTIN_CPP "")
function(get_bits_for_stateless gen_type platform_type) function(get_bits_for_stateless core_type platform_type)
# Force 32bits compiling on gen9lp for stateless builtins # Force 32bits compiling on gen9lp for stateless builtins
if((${gen_type} STREQUAL "GEN9") AND (${platform_type} STREQUAL "LP")) if((${core_type} STREQUAL "GEN9") AND (${platform_type} STREQUAL "LP"))
set(BITS "32" PARENT_SCOPE) set(BITS "32" PARENT_SCOPE)
else() else()
set(BITS ${NEO_BITS} PARENT_SCOPE) set(BITS ${NEO_BITS} PARENT_SCOPE)
@@ -50,10 +50,10 @@ function(get_bits_for_stateless gen_type platform_type)
endfunction() endfunction()
# Define function for compiling built-ins (with ocloc) # Define function for compiling built-ins (with ocloc)
function(compile_builtin gen_type platform_type builtin bits builtin_options mode) function(compile_builtin core_type platform_type builtin bits builtin_options mode)
string(TOLOWER ${gen_type} gen_type_lower) string(TOLOWER ${core_type} core_type_lower)
get_family_name_with_type(${gen_type} ${platform_type}) get_family_name_with_type(${core_type} ${platform_type})
set(OUTPUTDIR "${BUILTINS_OUTDIR_WITH_ARCH}/${gen_type_lower}") set(OUTPUTDIR "${BUILTINS_OUTDIR_WITH_ARCH}/${core_type_lower}")
# get filename # get filename
set(FILENAME ${builtin}) set(FILENAME ${builtin})
# get name of the file w/o extension # get name of the file w/o extension
@@ -67,11 +67,11 @@ function(compile_builtin gen_type platform_type builtin bits builtin_options mod
set(INTERNAL_OPTIONS "${${mode}_OPTIONS}") set(INTERNAL_OPTIONS "${${mode}_OPTIONS}")
add_custom_command( add_custom_command(
OUTPUT ${OUTPUT_FILE_SPV} OUTPUT ${OUTPUT_FILE_SPV}
COMMAND ${ocloc_cmd_prefix} -q -file ${FILENAME} -spv_only -device ${DEFAULT_SUPPORTED_${gen_type}_${platform_type}_PLATFORM} ${builtin_options} -${bits} -output ${mode}_${BASENAME} -out_dir ${OUTPUTDIR} ${INTERNAL_OPTIONS} -options "$<JOIN:${__ocloc__options__}, >" COMMAND ${ocloc_cmd_prefix} -q -file ${FILENAME} -spv_only -device ${DEFAULT_SUPPORTED_${core_type}_${platform_type}_PLATFORM} ${builtin_options} -${bits} -output ${mode}_${BASENAME} -out_dir ${OUTPUTDIR} ${INTERNAL_OPTIONS} -options "$<JOIN:${__ocloc__options__}, >"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${builtin} ocloc copy_compiler_files DEPENDS ${builtin} ocloc copy_compiler_files
) )
foreach(REVISION_ID ${${platform_type}_${gen_type}_REVISIONS}) foreach(REVISION_ID ${${platform_type}_${core_type}_REVISIONS})
set(OUTPUT_FILE_CPP set(OUTPUT_FILE_CPP
${OUTPUTDIR}/${mode}_${BASENAME}_${family_name_with_type}_${REVISION_ID}.cpp ${OUTPUTDIR}/${mode}_${BASENAME}_${family_name_with_type}_${REVISION_ID}.cpp
) )
@@ -83,7 +83,7 @@ function(compile_builtin gen_type platform_type builtin bits builtin_options mod
) )
add_custom_command( add_custom_command(
OUTPUT ${OUTPUT_FILES_BINARIES} OUTPUT ${OUTPUT_FILES_BINARIES}
COMMAND ${ocloc_cmd_prefix} -q -file ${OUTPUT_FILE_SPV} -spirv_input -device ${DEFAULT_SUPPORTED_${gen_type}_${platform_type}_PLATFORM} ${builtin_options} -${bits} -output ${mode}_${BASENAME}_${REVISION_ID} -out_dir ${OUTPUTDIR} -revision_id ${REVISION_ID} ${INTERNAL_OPTIONS} -options "$<JOIN:${__ocloc__options__}, >" COMMAND ${ocloc_cmd_prefix} -q -file ${OUTPUT_FILE_SPV} -spirv_input -device ${DEFAULT_SUPPORTED_${core_type}_${platform_type}_PLATFORM} ${builtin_options} -${bits} -output ${mode}_${BASENAME}_${REVISION_ID} -out_dir ${OUTPUTDIR} -revision_id ${REVISION_ID} ${INTERNAL_OPTIONS} -options "$<JOIN:${__ocloc__options__}, >"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${OUTPUT_FILE_SPV} ocloc copy_compiler_files DEPENDS ${OUTPUT_FILE_SPV} ocloc copy_compiler_files
) )
@@ -96,7 +96,7 @@ function(compile_builtin gen_type platform_type builtin bits builtin_options mod
list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}") list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}")
else() else()
foreach(_file_name "gen" "bin") foreach(_file_name "gen" "bin")
set(_file_prebuilt "${NEO_SOURCE_DIR}/../neo_test_kernels/built_ins/${NEO_ARCH}/${gen_type_lower}/${mode}_${BASENAME}_${REVISION_ID}_${family_name_with_type}.${_file_name}") set(_file_prebuilt "${NEO_SOURCE_DIR}/../neo_test_kernels/built_ins/${NEO_ARCH}/${core_type_lower}/${mode}_${BASENAME}_${REVISION_ID}_${family_name_with_type}.${_file_name}")
if(EXISTS ${_file_prebuilt}) if(EXISTS ${_file_prebuilt})
add_custom_command( add_custom_command(
OUTPUT ${BINARY_OUTPUT}.${_file_name} OUTPUT ${BINARY_OUTPUT}.${_file_name}
@@ -105,7 +105,7 @@ function(compile_builtin gen_type platform_type builtin bits builtin_options mod
) )
endif() endif()
endforeach() endforeach()
set(_file_prebuilt "${NEO_SOURCE_DIR}/../neo_test_kernels/built_ins/${NEO_ARCH}/${gen_type_lower}/${mode}_${BASENAME}_${family_name_with_type}_${REVISION_ID}.cpp") set(_file_prebuilt "${NEO_SOURCE_DIR}/../neo_test_kernels/built_ins/${NEO_ARCH}/${core_type_lower}/${mode}_${BASENAME}_${family_name_with_type}_${REVISION_ID}.cpp")
if(EXISTS ${_file_prebuilt}) if(EXISTS ${_file_prebuilt})
add_custom_command( add_custom_command(
OUTPUT ${OUTPUT_FILE_CPP} OUTPUT ${OUTPUT_FILE_CPP}
@@ -167,16 +167,16 @@ function(generate_cpp_spirv builtin)
endif() endif()
endfunction() endfunction()
macro(macro_for_each_gen) macro(macro_for_each_core_type)
foreach(PLATFORM_TYPE ${PLATFORM_TYPES}) foreach(PLATFORM_TYPE ${PLATFORM_TYPES})
if(${GEN_TYPE}_HAS_${PLATFORM_TYPE}) if(${CORE_TYPE}_HAS_${PLATFORM_TYPE})
unset(IMAGE_SUPPORT) unset(IMAGE_SUPPORT)
unset(AUX_TRANSLATION_SUPPORT) unset(AUX_TRANSLATION_SUPPORT)
GEN_CONTAINS_PLATFORMS("SUPPORTED_IMAGES" ${GEN_TYPE} IMAGE_SUPPORT) CORE_CONTAINS_PLATFORMS("SUPPORTED_IMAGES" ${CORE_TYPE} IMAGE_SUPPORT)
GEN_CONTAINS_PLATFORMS("SUPPORTED_AUX_TRANSLATION" ${GEN_TYPE} AUX_TRANSLATION_SUPPORT) CORE_CONTAINS_PLATFORMS("SUPPORTED_AUX_TRANSLATION" ${CORE_TYPE} AUX_TRANSLATION_SUPPORT)
get_family_name_with_type(${GEN_TYPE} ${PLATFORM_TYPE}) get_family_name_with_type(${CORE_TYPE} ${PLATFORM_TYPE})
string(TOLOWER ${PLATFORM_TYPE} PLATFORM_TYPE_LOWER) string(TOLOWER ${PLATFORM_TYPE} PLATFORM_TYPE_LOWER)
get_bits_for_stateless(${GEN_TYPE} ${PLATFORM_TYPE}) get_bits_for_stateless(${CORE_TYPE} ${PLATFORM_TYPE})
set(target_name builtins_${family_name_with_type}) set(target_name builtins_${family_name_with_type})
add_custom_target(${target_name}) add_custom_target(${target_name})
add_dependencies(builtins ${target_name}) add_dependencies(builtins ${target_name})
@@ -184,22 +184,22 @@ macro(macro_for_each_gen)
foreach(MODE ${BIND_MODES}) foreach(MODE ${BIND_MODES})
unset(BUILTINS_COMMANDS) unset(BUILTINS_COMMANDS)
foreach(GENERATED_BUILTIN ${GENERATED_BUILTINS}) foreach(GENERATED_BUILTIN ${GENERATED_BUILTINS})
compile_builtin(${GEN_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN}.builtin_kernel ${NEO_BITS} "${BUILTIN_OPTIONS}" ${MODE}) compile_builtin(${CORE_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN}.builtin_kernel ${NEO_BITS} "${BUILTIN_OPTIONS}" ${MODE})
endforeach() endforeach()
foreach(GENERATED_BUILTIN_STATELESS ${GENERATED_BUILTINS_STATELESS}) foreach(GENERATED_BUILTIN_STATELESS ${GENERATED_BUILTINS_STATELESS})
compile_builtin(${GEN_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN_STATELESS}.builtin_kernel ${BITS} "${BUILTIN_OPTIONS_STATELESS}" ${MODE}) compile_builtin(${CORE_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN_STATELESS}.builtin_kernel ${BITS} "${BUILTIN_OPTIONS_STATELESS}" ${MODE})
endforeach() endforeach()
if(${IMAGE_SUPPORT}) if(${IMAGE_SUPPORT})
foreach(GENERATED_BUILTINS_IMAGES ${GENERATED_BUILTINS_IMAGES}) foreach(GENERATED_BUILTINS_IMAGES ${GENERATED_BUILTINS_IMAGES})
compile_builtin(${GEN_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTINS_IMAGES}.builtin_kernel ${NEO_BITS} "${BUILTIN_OPTIONS}" ${MODE}) compile_builtin(${CORE_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTINS_IMAGES}.builtin_kernel ${NEO_BITS} "${BUILTIN_OPTIONS}" ${MODE})
endforeach() endforeach()
foreach(GENERATED_BUILTIN_IMAGES_STATELESS ${GENERATED_BUILTINS_IMAGES_STATELESS}) foreach(GENERATED_BUILTIN_IMAGES_STATELESS ${GENERATED_BUILTINS_IMAGES_STATELESS})
compile_builtin(${GEN_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN_IMAGES_STATELESS}.builtin_kernel ${BITS} "${BUILTIN_OPTIONS_STATELESS}" ${MODE}) compile_builtin(${CORE_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN_IMAGES_STATELESS}.builtin_kernel ${BITS} "${BUILTIN_OPTIONS_STATELESS}" ${MODE})
endforeach() endforeach()
endif() endif()
if(${AUX_TRANSLATION_SUPPORT}) if(${AUX_TRANSLATION_SUPPORT})
foreach(GENERATED_BUILTIN_AUX_TRANSLATION ${GENERATED_BUILTINS_AUX_TRANSLATION}) foreach(GENERATED_BUILTIN_AUX_TRANSLATION ${GENERATED_BUILTINS_AUX_TRANSLATION})
compile_builtin(${GEN_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN_AUX_TRANSLATION}.builtin_kernel ${NEO_BITS} "${BUILTIN_OPTIONS}" ${MODE}) compile_builtin(${CORE_TYPE} ${PLATFORM_TYPE} ${GENERATED_BUILTIN_AUX_TRANSLATION}.builtin_kernel ${NEO_BITS} "${BUILTIN_OPTIONS}" ${MODE})
endforeach() endforeach()
endif() endif()
get_property(GENERATED_BUILTINS_CPPS_${MODE} GLOBAL PROPERTY GENERATED_BUILTINS_CPPS_${MODE}) get_property(GENERATED_BUILTINS_CPPS_${MODE} GLOBAL PROPERTY GENERATED_BUILTINS_CPPS_${MODE})
@@ -241,4 +241,4 @@ if(NOT "${OUTPUT_LIST_CPP_FILES}" STREQUAL "")
) )
endif() endif()
apply_macro_for_each_gen("SUPPORTED") apply_macro_for_each_core_type("SUPPORTED")

View File

@@ -0,0 +1,193 @@
#
# Copyright (C) 2020-2021 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(CORE_SRCS_COREX_H_BASE
hw_cmds.h
hw_info.h
hw_cmds_base.h
aub_mapper.h
)
set(CORE_RUNTIME_SRCS_COREX_CPP_BASE
aub_command_stream_receiver
aub_mem_dump
command_encoder
command_stream_receiver_hw
command_stream_receiver_simulated_common_hw
create_device_command_stream_receiver
direct_submission
experimental_command_buffer
implicit_scaling
hw_helper
hw_info
preamble
preemption
state_base_address
tbx_command_stream_receiver
)
set(CORE_RUNTIME_SRCS_COREX_CPP_WDDM
windows/command_stream_receiver
windows/direct_submission
windows/gmm_callbacks
)
set(CORE_RUNTIME_SRCS_COREX_CPP_LINUX
linux/command_stream_receiver
linux/direct_submission
)
macro(macro_for_each_platform)
string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER)
foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
set(PLATFORM_FILE "hw_info_setup_${PLATFORM_IT_LOWER}.inl")
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX}${PLATFORM_FILE})
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${CORE_TYPE}_CPP_BASE ${SRC_FILE})
endif()
foreach(BRANCH ${BRANCH_DIR_LIST})
set(PLATFORM_FILE "hw_cmds_${PLATFORM_IT_LOWER}.h")
set(PATH_TO_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}${BRANCH}${PLATFORM_FILE})
if(EXISTS ${PATH_TO_FILE})
list(APPEND CORE_SRCS_${CORE_TYPE}_H_BASE ${PATH_TO_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}${BRANCH}linux/hw_info_extra_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${CORE_TYPE}_CPP_LINUX ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}${BRANCH}windows/hw_info_extra_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${CORE_TYPE}_CPP_WINDOWS ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}${BRANCH}linux/hw_info_config_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${CORE_TYPE}_CPP_LINUX ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}${BRANCH}windows/hw_info_config_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${CORE_TYPE}_CPP_WINDOWS ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}${BRANCH}enable_hw_info_config_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND ${CORE_TYPE}_SRC_LINK_BASE ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}/compiler_hw_info_config_${PLATFORM_IT_LOWER}.inl)
if(EXISTS ${SRC_FILE})
list(APPEND ${CORE_TYPE}_SRC_LINK_BASE ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/os_interface/linux/local${BRANCH_DIR_SUFFIX}${PLATFORM_IT_LOWER}/enable_local_memory_helper_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND ${CORE_TYPE}_SRC_LINK_LINUX ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/ail${BRANCH_DIR}${CORE_TYPE_LOWER}${BRANCH}${PLATFORM_IT_LOWER}/ail_configuration_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND ${CORE_TYPE}_SRC_LINK_BASE ${SRC_FILE})
endif()
set(SRC_FILE "${CORE_COREX_PREFIX}/os_agnostic_hw_info_config_${PLATFORM_IT_LOWER}.inl")
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${CORE_TYPE}_H_BASE ${SRC_FILE})
endif()
set(PLATFORM_FILE "hw_info_${PLATFORM_IT_LOWER}.cpp")
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}${BRANCH}${PLATFORM_FILE})
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${CORE_TYPE}_CPP_BASE ${SRC_FILE})
endif()
endforeach()
endforeach()
endmacro()
macro(macro_for_each_core_type)
foreach(BRANCH ${BRANCH_DIR_LIST})
set(CORE_COREX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH}${CORE_TYPE_LOWER})
set(GENERATED_COREX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/generated${BRANCH}${CORE_TYPE_LOWER})
foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
foreach(SRC_IT ${CORE_SRCS_COREX_H_BASE} "hw_info_${CORE_TYPE_LOWER}.h")
set(SRC_FILE ${CORE_COREX_PREFIX}${BRANCH_DIR}${SRC_IT})
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${CORE_TYPE}_H_BASE ${SRC_FILE})
endif()
endforeach()
foreach(OS_IT "BASE" "WDDM" "LINUX")
foreach(SRC_IT ${CORE_RUNTIME_SRCS_COREX_CPP_${OS_IT}})
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}/${SRC_IT}_${CORE_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${CORE_TYPE}_CPP_${OS_IT} ${SRC_FILE})
endif()
endforeach()
endforeach()
set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH}${CORE_TYPE_LOWER}/image_core_${CORE_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${CORE_TYPE}_CPP_BASE ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}/enable_family_full_core_${CORE_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND ${CORE_TYPE}_SRC_LINK_BASE ${SRC_FILE})
endif()
set(SRC_FILE ${CORE_COREX_PREFIX}${BRANCH_DIR}enable_${CORE_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND ${CORE_TYPE}_SRC_LINK_BASE ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${CORE_TYPE_LOWER}/enable_${CORE_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND ${CORE_TYPE}_SRC_LINK_BASE ${SRC_FILE})
endif()
set(SRC_FILE "${CORE_COREX_PREFIX}/os_agnostic_hw_info_config_${CORE_TYPE_LOWER}.inl")
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${CORE_TYPE}_H_BASE ${SRC_FILE})
endif()
set(SRC_FILE "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR}sip_kernels/${CORE_TYPE_LOWER}/sip_kernel_${CORE_TYPE_LOWER}.cpp")
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${CORE_TYPE}_CPP_BASE ${SRC_FILE})
endif()
set(SRC_FILE "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR}sip_kernels/${CORE_TYPE_LOWER}/sip_kernel_${CORE_TYPE_LOWER}.h")
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${CORE_TYPE}_H_BASE ${SRC_FILE})
endif()
endforeach()
set(SRC_FILE "${CORE_COREX_PREFIX}/state_compute_mode_helper_${CORE_TYPE_LOWER}.cpp")
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${CORE_TYPE}_CPP_BASE ${SRC_FILE})
endif()
if(EXISTS ${GENERATED_COREX_PREFIX}/hw_cmds_generated_${CORE_TYPE_LOWER}.inl)
list(APPEND CORE_SRCS_${CORE_TYPE}_H_BASE "${GENERATED_COREX_PREFIX}/hw_cmds_generated_${CORE_TYPE_LOWER}.inl")
endif()
endforeach()
apply_macro_for_each_platform()
list(APPEND CORE_SRCS_COREX_ALL_BASE ${CORE_SRCS_${CORE_TYPE}_H_BASE})
list(APPEND CORE_SRCS_COREX_ALL_BASE ${CORE_SRCS_${CORE_TYPE}_CPP_BASE})
list(APPEND CORE_SRCS_COREX_ALL_WINDOWS ${CORE_SRCS_${CORE_TYPE}_CPP_WINDOWS})
list(APPEND CORE_SRCS_COREX_ALL_WDDM ${CORE_SRCS_${CORE_TYPE}_CPP_WDDM})
list(APPEND CORE_SRCS_COREX_ALL_LINUX ${CORE_SRCS_${CORE_TYPE}_CPP_LINUX})
list(APPEND CORE_SRCS_LINK ${${CORE_TYPE}_SRC_LINK_BASE})
list(APPEND CORE_SRCS_LINK_LINUX ${${CORE_TYPE}_SRC_LINK_LINUX})
endmacro()
apply_macro_for_each_core_type("SUPPORTED")
set_property(GLOBAL PROPERTY CORE_SRCS_COREX_ALL_BASE ${CORE_SRCS_COREX_ALL_BASE})
set_property(GLOBAL PROPERTY CORE_SRCS_COREX_ALL_LINUX ${CORE_SRCS_COREX_ALL_LINUX})
set_property(GLOBAL PROPERTY CORE_SRCS_COREX_ALL_WDDM ${CORE_SRCS_COREX_ALL_WDDM})
set_property(GLOBAL PROPERTY CORE_SRCS_COREX_ALL_WINDOWS ${CORE_SRCS_COREX_ALL_WINDOWS})

View File

@@ -1,193 +0,0 @@
#
# Copyright (C) 2020-2021 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
set(CORE_SRCS_GENX_H_BASE
hw_cmds.h
hw_info.h
hw_cmds_base.h
aub_mapper.h
)
set(CORE_RUNTIME_SRCS_GENX_CPP_BASE
aub_command_stream_receiver
aub_mem_dump
command_encoder
command_stream_receiver_hw
command_stream_receiver_simulated_common_hw
create_device_command_stream_receiver
direct_submission
experimental_command_buffer
implicit_scaling
hw_helper
hw_info
preamble
preemption
state_base_address
tbx_command_stream_receiver
)
set(CORE_RUNTIME_SRCS_GENX_CPP_WDDM
windows/command_stream_receiver
windows/direct_submission
windows/gmm_callbacks
)
set(CORE_RUNTIME_SRCS_GENX_CPP_LINUX
linux/command_stream_receiver
linux/direct_submission
)
macro(macro_for_each_platform)
string(TOLOWER ${PLATFORM_IT} PLATFORM_IT_LOWER)
foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
set(PLATFORM_FILE "hw_info_setup_${PLATFORM_IT_LOWER}.inl")
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/definitions${BRANCH_DIR_SUFFIX}${PLATFORM_FILE})
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${GEN_TYPE}_CPP_BASE ${SRC_FILE})
endif()
foreach(BRANCH ${BRANCH_DIR_LIST})
set(PLATFORM_FILE "hw_cmds_${PLATFORM_IT_LOWER}.h")
set(PATH_TO_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}${PLATFORM_FILE})
if(EXISTS ${PATH_TO_FILE})
list(APPEND CORE_SRCS_${GEN_TYPE}_H_BASE ${PATH_TO_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}linux/hw_info_extra_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${GEN_TYPE}_CPP_LINUX ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}windows/hw_info_extra_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${GEN_TYPE}_CPP_WINDOWS ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}linux/hw_info_config_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${GEN_TYPE}_CPP_LINUX ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}windows/hw_info_config_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${GEN_TYPE}_CPP_WINDOWS ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}enable_hw_info_config_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/compiler_hw_info_config_${PLATFORM_IT_LOWER}.inl)
if(EXISTS ${SRC_FILE})
list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/os_interface/linux/local${BRANCH_DIR_SUFFIX}${PLATFORM_IT_LOWER}/enable_local_memory_helper_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND ${GEN_TYPE}_SRC_LINK_LINUX ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/ail${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}${PLATFORM_IT_LOWER}/ail_configuration_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${SRC_FILE})
endif()
set(SRC_FILE "${CORE_GENX_PREFIX}/os_agnostic_hw_info_config_${PLATFORM_IT_LOWER}.inl")
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${GEN_TYPE}_H_BASE ${SRC_FILE})
endif()
set(PLATFORM_FILE "hw_info_${PLATFORM_IT_LOWER}.cpp")
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}${PLATFORM_FILE})
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${GEN_TYPE}_CPP_BASE ${SRC_FILE})
endif()
endforeach()
endforeach()
endmacro()
macro(macro_for_each_gen)
foreach(BRANCH ${BRANCH_DIR_LIST})
set(CORE_GENX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH}${GEN_TYPE_LOWER})
set(GENERATED_GENX_PREFIX ${CMAKE_CURRENT_SOURCE_DIR}/generated${BRANCH}${GEN_TYPE_LOWER})
foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
foreach(SRC_IT ${CORE_SRCS_GENX_H_BASE} "hw_info_${GEN_TYPE_LOWER}.h")
set(SRC_FILE ${CORE_GENX_PREFIX}${BRANCH_DIR}${SRC_IT})
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${GEN_TYPE}_H_BASE ${SRC_FILE})
endif()
endforeach()
foreach(OS_IT "BASE" "WDDM" "LINUX")
foreach(SRC_IT ${CORE_RUNTIME_SRCS_GENX_CPP_${OS_IT}})
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/${SRC_IT}_${GEN_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${GEN_TYPE}_CPP_${OS_IT} ${SRC_FILE})
endif()
endforeach()
endforeach()
set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH}${GEN_TYPE_LOWER}/image_core_${GEN_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${GEN_TYPE}_CPP_BASE ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/enable_family_full_core_${GEN_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${SRC_FILE})
endif()
set(SRC_FILE ${CORE_GENX_PREFIX}${BRANCH_DIR}enable_${GEN_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${SRC_FILE})
endif()
set(SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR}${GEN_TYPE_LOWER}/enable_${GEN_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE})
list(APPEND ${GEN_TYPE}_SRC_LINK_BASE ${SRC_FILE})
endif()
set(SRC_FILE "${CORE_GENX_PREFIX}/os_agnostic_hw_info_config_${GEN_TYPE_LOWER}.inl")
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${GEN_TYPE}_H_BASE ${SRC_FILE})
endif()
set(SRC_FILE "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR}sip_kernels/${GEN_TYPE_LOWER}/sip_kernel_${GEN_TYPE_LOWER}.cpp")
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${GEN_TYPE}_CPP_BASE ${SRC_FILE})
endif()
set(SRC_FILE "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR}sip_kernels/${GEN_TYPE_LOWER}/sip_kernel_${GEN_TYPE_LOWER}.h")
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${GEN_TYPE}_H_BASE ${SRC_FILE})
endif()
endforeach()
set(SRC_FILE "${CORE_GENX_PREFIX}/state_compute_mode_helper_${GEN_TYPE_LOWER}.cpp")
if(EXISTS ${SRC_FILE})
list(APPEND CORE_SRCS_${GEN_TYPE}_CPP_BASE ${SRC_FILE})
endif()
if(EXISTS ${GENERATED_GENX_PREFIX}/hw_cmds_generated_${GEN_TYPE_LOWER}.inl)
list(APPEND CORE_SRCS_${GEN_TYPE}_H_BASE "${GENERATED_GENX_PREFIX}/hw_cmds_generated_${GEN_TYPE_LOWER}.inl")
endif()
endforeach()
apply_macro_for_each_platform()
list(APPEND CORE_SRCS_GENX_ALL_BASE ${CORE_SRCS_${GEN_TYPE}_H_BASE})
list(APPEND CORE_SRCS_GENX_ALL_BASE ${CORE_SRCS_${GEN_TYPE}_CPP_BASE})
list(APPEND CORE_SRCS_GENX_ALL_WINDOWS ${CORE_SRCS_${GEN_TYPE}_CPP_WINDOWS})
list(APPEND CORE_SRCS_GENX_ALL_WDDM ${CORE_SRCS_${GEN_TYPE}_CPP_WDDM})
list(APPEND CORE_SRCS_GENX_ALL_LINUX ${CORE_SRCS_${GEN_TYPE}_CPP_LINUX})
list(APPEND CORE_SRCS_LINK ${${GEN_TYPE}_SRC_LINK_BASE})
list(APPEND CORE_SRCS_LINK_LINUX ${${GEN_TYPE}_SRC_LINK_LINUX})
endmacro()
apply_macro_for_each_gen("SUPPORTED")
set_property(GLOBAL PROPERTY CORE_SRCS_GENX_ALL_BASE ${CORE_SRCS_GENX_ALL_BASE})
set_property(GLOBAL PROPERTY CORE_SRCS_GENX_ALL_LINUX ${CORE_SRCS_GENX_ALL_LINUX})
set_property(GLOBAL PROPERTY CORE_SRCS_GENX_ALL_WDDM ${CORE_SRCS_GENX_ALL_WDDM})
set_property(GLOBAL PROPERTY CORE_SRCS_GENX_ALL_WINDOWS ${CORE_SRCS_GENX_ALL_WINDOWS})

View File

@@ -11,7 +11,7 @@ if(SUPPORT_ADLP)
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}hw_cmds_adlp.inl ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}hw_cmds_adlp.inl
) )
set_property(GLOBAL APPEND PROPERTY CORE_SRCS_GENX_ALL_BASE ${HW_DEFINITIONS_ADLP}) set_property(GLOBAL APPEND PROPERTY CORE_SRCS_COREX_ALL_BASE ${HW_DEFINITIONS_ADLP})
endif() endif()
if(SUPPORT_GEN12LP) if(SUPPORT_GEN12LP)

View File

@@ -9,7 +9,7 @@ if(SUPPORT_XE_HP_CORE)
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}hw_cmds_xehp.inl ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}hw_cmds_xehp.inl
) )
set_property(GLOBAL APPEND PROPERTY CORE_SRCS_GENX_ALL_BASE ${HW_DEFINITIONS_XE_HP_CORE}) set_property(GLOBAL APPEND PROPERTY CORE_SRCS_COREX_ALL_BASE ${HW_DEFINITIONS_XE_HP_CORE})
add_subdirectories() add_subdirectories()
endif() endif()

View File

@@ -9,7 +9,7 @@ macro(macro_for_each_platform)
foreach(BRANCH_DIR ${BRANCH_DIR_LIST}) foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
foreach(BRANCH ${BRANCH_DIR_LIST}) foreach(BRANCH ${BRANCH_DIR_LIST})
set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}enable_hw_info_config_${PLATFORM_IT_LOWER}.cpp) set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH_DIR}${CORE_TYPE_LOWER}${BRANCH}enable_hw_info_config_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE}) if(EXISTS ${SRC_FILE})
list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
endif() endif()
@@ -17,7 +17,7 @@ macro(macro_for_each_platform)
if(EXISTS ${SRC_FILE}) if(EXISTS ${SRC_FILE})
list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW_LINUX ${SRC_FILE}) list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW_LINUX ${SRC_FILE})
endif() endif()
set(SRC_FILE ${NEO_SHARED_DIRECTORY}/ail${BRANCH_DIR}${GEN_TYPE_LOWER}${BRANCH}${PLATFORM_IT_LOWER}/ail_configuration_${PLATFORM_IT_LOWER}.cpp) set(SRC_FILE ${NEO_SHARED_DIRECTORY}/ail${BRANCH_DIR}${CORE_TYPE_LOWER}${BRANCH}${PLATFORM_IT_LOWER}/ail_configuration_${PLATFORM_IT_LOWER}.cpp)
if(EXISTS ${SRC_FILE}) if(EXISTS ${SRC_FILE})
list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
endif() endif()
@@ -25,27 +25,27 @@ macro(macro_for_each_platform)
endforeach() endforeach()
endmacro() endmacro()
macro(macro_for_each_gen) macro(macro_for_each_core_type)
foreach(BRANCH_DIR ${BRANCH_DIR_LIST}) foreach(BRANCH_DIR ${BRANCH_DIR_LIST})
foreach(BRANCH ${BRANCH_DIR_LIST}) foreach(BRANCH ${BRANCH_DIR_LIST})
set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/${BRANCH}${GEN_TYPE_LOWER}/cmd_parse_${GEN_TYPE_LOWER}.cpp) set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/${BRANCH}${CORE_TYPE_LOWER}/cmd_parse_${CORE_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE}) if(EXISTS ${SRC_FILE})
list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
endif() endif()
set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/libult/${BRANCH}${GEN_TYPE_LOWER}.cpp) set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/libult/${BRANCH}${CORE_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE}) if(EXISTS ${SRC_FILE})
list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
endif() endif()
set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/${BRANCH}${GEN_TYPE_LOWER}/unit_test_helper_${GEN_TYPE_LOWER}.cpp) set(SRC_FILE ${NEO_SHARED_TEST_DIRECTORY}/common/${BRANCH}${CORE_TYPE_LOWER}/unit_test_helper_${CORE_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE}) if(EXISTS ${SRC_FILE})
list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
endif() endif()
foreach(SRC_IT "enable_" "enable_family_full_core_" "implicit_scaling_") foreach(SRC_IT "enable_" "enable_family_full_core_" "implicit_scaling_")
set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH}${GEN_TYPE_LOWER}${BRANCH_DIR}${SRC_IT}${GEN_TYPE_LOWER}.cpp) set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH}${CORE_TYPE_LOWER}${BRANCH_DIR}${SRC_IT}${CORE_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE}) if(EXISTS ${SRC_FILE})
list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
endif() endif()
set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH_DIR}${GEN_TYPE_LOWER}/${SRC_IT}${GEN_TYPE_LOWER}.cpp) set(SRC_FILE ${NEO_SHARED_DIRECTORY}${BRANCH_DIR}${CORE_TYPE_LOWER}/${SRC_IT}${CORE_TYPE_LOWER}.cpp)
if(EXISTS ${SRC_FILE}) if(EXISTS ${SRC_FILE})
list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE}) list(APPEND neo_libult_common_SRCS_ENABLE_TESTED_HW ${SRC_FILE})
endif() endif()
@@ -56,7 +56,7 @@ macro(macro_for_each_gen)
apply_macro_for_each_platform("TESTED") apply_macro_for_each_platform("TESTED")
endmacro() endmacro()
apply_macro_for_each_gen("TESTED") apply_macro_for_each_core_type("TESTED")
set(neo_libult_common_SRCS_LIB_ULT set(neo_libult_common_SRCS_LIB_ULT
${NEO_SHARED_TEST_DIRECTORY}/common/fixtures/device_fixture.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/fixtures/device_fixture.cpp

View File

@@ -77,7 +77,7 @@ set_target_properties(prepare_test_kernels_for_shared PROPERTIES FOLDER "${SHARE
macro(macro_for_each_platform) macro(macro_for_each_platform)
foreach(PLATFORM_TYPE ${PLATFORM_TYPES}) foreach(PLATFORM_TYPE ${PLATFORM_TYPES})
foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS}) foreach(REVISION_ID ${${PLATFORM_TYPE}_${CORE_TYPE}_REVISIONS})
if(${PLATFORM_IT}_IS_${PLATFORM_TYPE}) if(${PLATFORM_IT}_IS_${PLATFORM_TYPE})
neo_shared_copy_test_files(copy_test_kernel_${PLATFORM_IT_LOWER}_${REVISION_ID} ${PLATFORM_IT} ${REVISION_ID}) neo_shared_copy_test_files(copy_test_kernel_${PLATFORM_IT_LOWER}_${REVISION_ID} ${PLATFORM_IT} ${REVISION_ID})
add_dependencies(prepare_test_kernels_for_shared copy_test_kernel_${PLATFORM_IT_LOWER}_${REVISION_ID}) add_dependencies(prepare_test_kernels_for_shared copy_test_kernel_${PLATFORM_IT_LOWER}_${REVISION_ID})
@@ -86,22 +86,22 @@ macro(macro_for_each_platform)
endforeach() endforeach()
endmacro() endmacro()
macro(macro_for_each_gen) macro(macro_for_each_core_type)
apply_macro_for_each_platform("TESTED") apply_macro_for_each_platform("TESTED")
foreach(PLATFORM_TYPE ${PLATFORM_TYPES}) foreach(PLATFORM_TYPE ${PLATFORM_TYPES})
if(${GEN_TYPE}_HAS_${PLATFORM_TYPE}) if(${CORE_TYPE}_HAS_${PLATFORM_TYPE})
set(KERNELS_TO_COMPILE ${TEST_KERNELS}) set(KERNELS_TO_COMPILE ${TEST_KERNELS})
set(IMAGE_SUPPORT FALSE) set(IMAGE_SUPPORT FALSE)
GEN_CONTAINS_PLATFORMS("SUPPORTED_IMAGES" ${GEN_TYPE} IMAGE_SUPPORT) CORE_CONTAINS_PLATFORMS("SUPPORTED_IMAGES" ${CORE_TYPE} IMAGE_SUPPORT)
if(NOT IMAGE_SUPPORT) if(NOT IMAGE_SUPPORT)
list(REMOVE_ITEM KERNELS_TO_COMPILE ${TEST_KERNELS_IMAGES}) list(REMOVE_ITEM KERNELS_TO_COMPILE ${TEST_KERNELS_IMAGES})
endif() endif()
get_family_name_with_type(${GEN_TYPE} ${PLATFORM_TYPE}) get_family_name_with_type(${CORE_TYPE} ${PLATFORM_TYPE})
set(PLATFORM_LOWER ${DEFAULT_SUPPORTED_${GEN_TYPE}_${PLATFORM_TYPE}_PLATFORM}) set(PLATFORM_LOWER ${DEFAULT_SUPPORTED_${CORE_TYPE}_${PLATFORM_TYPE}_PLATFORM})
foreach(REVISION_ID ${${PLATFORM_TYPE}_${GEN_TYPE}_REVISIONS}) foreach(REVISION_ID ${${PLATFORM_TYPE}_${CORE_TYPE}_REVISIONS})
compile_kernels_gen(${family_name_with_type} ${REVISION_ID} ${PLATFORM_LOWER} ${family_name_with_type} ${KERNELS_TO_COMPILE}) compile_kernels_gen(${family_name_with_type} ${REVISION_ID} ${PLATFORM_LOWER} ${family_name_with_type} ${KERNELS_TO_COMPILE})
add_custom_target(prepare_test_kernels_for_shared_${family_name_with_type}_${REVISION_ID} DEPENDS ${compiled_kernels_${family_name_with_type}_${REVISION_ID}}) add_custom_target(prepare_test_kernels_for_shared_${family_name_with_type}_${REVISION_ID} DEPENDS ${compiled_kernels_${family_name_with_type}_${REVISION_ID}})
@@ -112,4 +112,4 @@ macro(macro_for_each_gen)
endforeach() endforeach()
endmacro() endmacro()
apply_macro_for_each_gen("TESTED") apply_macro_for_each_core_type("TESTED")