Cmake format script

Related-To: NEO-1157

Change-Id: Ie1b907e838cfb9ad0d75cc8971d415f7c77103c9
Signed-off-by: Pawel Cieslak <pawel.cieslak@intel.com>
This commit is contained in:
Pawel Cieslak
2020-08-19 12:18:18 +02:00
committed by sys_ocldev
parent 2f4b132722
commit fb821f21f5
423 changed files with 5242 additions and 5079 deletions

View File

@@ -5,9 +5,9 @@
# #
if(WIN32) if(WIN32)
cmake_minimum_required(VERSION 3.13.0 FATAL_ERROR) cmake_minimum_required(VERSION 3.13.0 FATAL_ERROR)
else() else()
cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR) cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR)
endif() endif()
include(ExternalProject) include(ExternalProject)
@@ -15,30 +15,29 @@ include(ExternalProject)
# Include custom configs # Include custom configs
file(GLOB custom_configs *custom_config.cmake) file(GLOB custom_configs *custom_config.cmake)
foreach(config ${custom_configs}) foreach(config ${custom_configs})
include(${config}) include(${config})
endforeach() endforeach()
# Include needed macros # Include needed macros
include(common_macros.cmake) include(common_macros.cmake)
if(MSVC) if(MSVC)
set(CMAKE_GENERATOR_TOOLSET "host=x64") set(CMAKE_GENERATOR_TOOLSET "host=x64")
endif() endif()
if(NOT PROJECT_NAME) if(NOT PROJECT_NAME)
set(PROJECT_NAME igdrcl) set(PROJECT_NAME igdrcl)
endif() endif()
project(${PROJECT_NAME}) project(${PROJECT_NAME})
if(CMAKE_CONFIGURATION_TYPES) if(CMAKE_CONFIGURATION_TYPES)
# Set custom build types for multi-configuration generators # Set custom build types for multi-configuration generators
set(CMAKE_CONFIGURATION_TYPES "Release;ReleaseInternal;Debug") set(CMAKE_CONFIGURATION_TYPES "Release;ReleaseInternal;Debug")
if(DEFINED CMAKE_BUILD_TYPE) if(DEFINED CMAKE_BUILD_TYPE)
list(APPEND CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE}) list(APPEND CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE})
endif() endif()
list(REMOVE_DUPLICATES CMAKE_CONFIGURATION_TYPES) list(REMOVE_DUPLICATES CMAKE_CONFIGURATION_TYPES)
endif() endif()
include(GNUInstallDirs) include(GNUInstallDirs)
@@ -54,27 +53,27 @@ string(STRIP "${BRANCH_TYPE}" BRANCH_TYPE)
set(BRANCH_DIR_SUFFIX "/${BRANCH_TYPE}") set(BRANCH_DIR_SUFFIX "/${BRANCH_TYPE}")
list(APPEND BRANCH_DIR_LIST "/") list(APPEND BRANCH_DIR_LIST "/")
if(NOT "${BRANCH_TYPE}" STREQUAL "") if(NOT "${BRANCH_TYPE}" STREQUAL "")
list(APPEND BRANCH_DIR_LIST "/${BRANCH_TYPE}/") list(APPEND BRANCH_DIR_LIST "/${BRANCH_TYPE}/")
endif() endif()
message(STATUS "branch dir list: ${BRANCH_DIR_LIST}") message(STATUS "branch dir list: ${BRANCH_DIR_LIST}")
if(TR_DEPRECATED) if(TR_DEPRECATED)
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING=1) add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING=1)
endif(TR_DEPRECATED) endif()
add_definitions(-DIGC_CLEANUP) add_definitions(-DIGC_CLEANUP)
if(RELEASE_WITH_REGKEYS) if(RELEASE_WITH_REGKEYS)
message(STATUS "Enabling RegKey reading in release build") message(STATUS "Enabling RegKey reading in release build")
add_definitions(-D_RELEASE_BUILD_WITH_REGKEYS) add_definitions(-D_RELEASE_BUILD_WITH_REGKEYS)
endif(RELEASE_WITH_REGKEYS) endif()
if(DEFINED NEO_EXTRA_DEFINES) if(DEFINED NEO_EXTRA_DEFINES)
string(REPLACE "," ";" NEO_EXTRA_DEFINES "${NEO_EXTRA_DEFINES}") string(REPLACE "," ";" NEO_EXTRA_DEFINES "${NEO_EXTRA_DEFINES}")
foreach(_tmp ${NEO_EXTRA_DEFINES}) foreach(_tmp ${NEO_EXTRA_DEFINES})
message(STATUS "adding extra define: ${_tmp}") message(STATUS "adding extra define: ${_tmp}")
add_definitions(-D${_tmp}) add_definitions(-D${_tmp})
endforeach() endforeach()
endif() endif()
include("${BRANCH_TYPE}.cmake" OPTIONAL) include("${BRANCH_TYPE}.cmake" OPTIONAL)
@@ -93,25 +92,25 @@ else()
endif() endif()
if(NOT DEFINED BUILD_WITH_L0) if(NOT DEFINED BUILD_WITH_L0)
if("${NEO_BITS}" STREQUAL "64") if("${NEO_BITS}" STREQUAL "64")
set(BUILD_WITH_L0 TRUE) set(BUILD_WITH_L0 TRUE)
endif() endif()
endif() endif()
if(NOT "${NEO_BITS}" STREQUAL "64") if(NOT "${NEO_BITS}" STREQUAL "64")
set(BUILD_WITH_L0 FALSE) set(BUILD_WITH_L0 FALSE)
endif() endif()
add_definitions( add_definitions(
-DCL_USE_DEPRECATED_OPENCL_1_1_APIS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS
-DCL_USE_DEPRECATED_OPENCL_1_2_APIS -DCL_USE_DEPRECATED_OPENCL_1_2_APIS
-DCL_USE_DEPRECATED_OPENCL_2_0_APIS -DCL_USE_DEPRECATED_OPENCL_2_0_APIS
-DCL_USE_DEPRECATED_OPENCL_2_1_APIS -DCL_USE_DEPRECATED_OPENCL_2_1_APIS
-DCL_USE_DEPRECATED_OPENCL_2_2_APIS -DCL_USE_DEPRECATED_OPENCL_2_2_APIS
) )
if(WIN32) if(WIN32)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -DWDDM_VERSION_NUMBER=23 -DNOMINMAX) add_definitions(-D_CRT_SECURE_NO_WARNINGS -DWDDM_VERSION_NUMBER=23 -DNOMINMAX)
endif() endif()
set(CMAKE_C_FLAGS_RELEASEINTERNAL "${CMAKE_C_FLAGS_RELEASE}") set(CMAKE_C_FLAGS_RELEASEINTERNAL "${CMAKE_C_FLAGS_RELEASE}")
@@ -119,10 +118,10 @@ set(CMAKE_CXX_FLAGS_RELEASEINTERNAL "${CMAKE_CXX_FLAGS_RELEASE}")
set(CMAKE_SHARED_LINKER_FLAGS_RELEASEINTERNAL "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") set(CMAKE_SHARED_LINKER_FLAGS_RELEASEINTERNAL "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
set(CMAKE_EXE_LINKER_FLAGS_RELEASEINTERNAL "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") set(CMAKE_EXE_LINKER_FLAGS_RELEASEINTERNAL "${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
if(MSVC AND ENABLE_VS_FASTLINK) if(MSVC AND ENABLE_VS_FASTLINK)
string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " /debug:FASTLINK") string(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG " /debug:FASTLINK")
string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG " /debug:FASTLINK") string(APPEND CMAKE_SHARED_LINKER_FLAGS_DEBUG " /debug:FASTLINK")
string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG " /debug:FASTLINK") string(APPEND CMAKE_STATIC_LINKER_FLAGS_DEBUG " /debug:FASTLINK")
string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG " /debug:FASTLINK") string(APPEND CMAKE_MODULE_LINKER_FLAGS_DEBUG " /debug:FASTLINK")
endif() endif()
string(TOLOWER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_lower) string(TOLOWER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_lower)
@@ -194,7 +193,7 @@ if(MSVC)
string(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") string(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASEINTERNAL "${CMAKE_CXX_FLAGS_RELEASEINTERNAL}") string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASEINTERNAL "${CMAKE_CXX_FLAGS_RELEASEINTERNAL}")
endif(MSVC) endif()
if(NOT SKIP_UNIT_TESTS) if(NOT SKIP_UNIT_TESTS)
if(NOT DEFINED GTEST_REPEAT) if(NOT DEFINED GTEST_REPEAT)
@@ -209,62 +208,62 @@ if(NOT SKIP_UNIT_TESTS)
endif() endif()
if(NOT KMDAF_HEADERS_DIR) if(NOT KMDAF_HEADERS_DIR)
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../kmdaf/inc/common/kmDaf.h") if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../kmdaf/inc/common/kmDaf.h")
get_filename_component(KMDAF_HEADERS_DIR "../kmdaf/inc/common/" ABSOLUTE) get_filename_component(KMDAF_HEADERS_DIR "../kmdaf/inc/common/" ABSOLUTE)
message(STATUS "KM-DAF headers dir: ${KMDAF_HEADERS_DIR}") message(STATUS "KM-DAF headers dir: ${KMDAF_HEADERS_DIR}")
endif() endif()
endif(NOT KMDAF_HEADERS_DIR) endif()
if(NOT DEFINED SOURCE_LEVEL_DEBUGGER_HEADERS_DIR) if(NOT DEFINED SOURCE_LEVEL_DEBUGGER_HEADERS_DIR)
get_filename_component(SOURCE_LEVEL_DEBUGGER_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/source_level_debugger/" ABSOLUTE) get_filename_component(SOURCE_LEVEL_DEBUGGER_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party/source_level_debugger/" ABSOLUTE)
message(STATUS "Source Level Debugger headers dir: ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR}") message(STATUS "Source Level Debugger headers dir: ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR}")
endif() endif()
get_filename_component(AUB_STREAM_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/aub_stream/headers" ABSOLUTE) get_filename_component(AUB_STREAM_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/aub_stream/headers" ABSOLUTE)
if(IS_DIRECTORY ${AUB_STREAM_HEADERS_DIR}) if(IS_DIRECTORY ${AUB_STREAM_HEADERS_DIR})
message(STATUS "Aub Stream Headers dir: ${AUB_STREAM_HEADERS_DIR}") message(STATUS "Aub Stream Headers dir: ${AUB_STREAM_HEADERS_DIR}")
else() else()
message(FATAL_ERROR "Aub Stream headers not available!") message(FATAL_ERROR "Aub Stream headers not available!")
endif() endif()
if(TARGET aub_stream) if(TARGET aub_stream)
set(AUB_STREAM_PROJECT_NAME "aub_stream") set(AUB_STREAM_PROJECT_NAME "aub_stream")
else() else()
if(NOT DEFINED AUB_STREAM_DIR) if(NOT DEFINED AUB_STREAM_DIR)
get_filename_component(TEMP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../aub_stream/aub_mem_dump" ABSOLUTE) get_filename_component(TEMP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../aub_stream/aub_mem_dump" ABSOLUTE)
if(IS_DIRECTORY ${TEMP_DIR}) if(IS_DIRECTORY ${TEMP_DIR})
set(AUB_STREAM_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../aub_stream") set(AUB_STREAM_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../aub_stream")
message(STATUS "Aub Stream dir: ${AUB_STREAM_DIR}") message(STATUS "Aub Stream dir: ${AUB_STREAM_DIR}")
endif()
endif() endif()
endif()
if(DISABLE_AUB_STREAM) if(DISABLE_AUB_STREAM)
unset(AUB_STREAM_DIR) unset(AUB_STREAM_DIR)
endif() endif()
endif() endif()
# Metrics Library # Metrics Library
get_filename_component(METRICS_LIBRARY_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/metrics_library" ABSOLUTE) get_filename_component(METRICS_LIBRARY_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/metrics_library" ABSOLUTE)
if(IS_DIRECTORY ${METRICS_LIBRARY_HEADERS_DIR}) if(IS_DIRECTORY ${METRICS_LIBRARY_HEADERS_DIR})
message(STATUS "Metrics Library dir: ${METRICS_LIBRARY_HEADERS_DIR}") message(STATUS "Metrics Library dir: ${METRICS_LIBRARY_HEADERS_DIR}")
include_directories(${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/metrics_library) include_directories(${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/metrics_library)
else() else()
message(FATAL_ERROR "Metrics Library headers not available!") message(FATAL_ERROR "Metrics Library headers not available!")
endif() endif()
# Metrics Discovery # Metrics Discovery
get_filename_component(METRICS_DISCOVERY_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/metrics_discovery" ABSOLUTE) get_filename_component(METRICS_DISCOVERY_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/metrics_discovery" ABSOLUTE)
if(IS_DIRECTORY ${METRICS_DISCOVERY_HEADERS_DIR}) if(IS_DIRECTORY ${METRICS_DISCOVERY_HEADERS_DIR})
message(STATUS "Metrics Discovery dir: ${METRICS_DISCOVERY_HEADERS_DIR}") message(STATUS "Metrics Discovery dir: ${METRICS_DISCOVERY_HEADERS_DIR}")
include_directories(${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/metrics_discovery) include_directories(${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/metrics_discovery)
else() else()
message(FATAL_ERROR "Metrics Discovery headers not available!") message(FATAL_ERROR "Metrics Discovery headers not available!")
endif() endif()
if(SUPPORT_DG1 AND "${BRANCH_TYPE}" STREQUAL "") if(SUPPORT_DG1 AND "${BRANCH_TYPE}" STREQUAL "")
get_filename_component(I915_INCLUDES_DIR "${NEO_SOURCE_DIR}/third_party/uapi/dg1" ABSOLUTE) get_filename_component(I915_INCLUDES_DIR "${NEO_SOURCE_DIR}/third_party/uapi/dg1" ABSOLUTE)
else() else()
get_filename_component(I915_INCLUDES_DIR "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/uapi" ABSOLUTE) get_filename_component(I915_INCLUDES_DIR "${NEO_SOURCE_DIR}/third_party${BRANCH_DIR_SUFFIX}/uapi" ABSOLUTE)
endif() endif()
message(STATUS "i915 includes dir: ${I915_INCLUDES_DIR}") message(STATUS "i915 includes dir: ${I915_INCLUDES_DIR}")
@@ -291,16 +290,16 @@ message(STATUS "Khronos OpenGL headers dir: ${KHRONOS_GL_HEADERS_DIR}")
if(NOT THIRD_PARTY_DIR) if(NOT THIRD_PARTY_DIR)
get_filename_component(THIRD_PARTY_DIR "../third_party/" ABSOLUTE) get_filename_component(THIRD_PARTY_DIR "../third_party/" ABSOLUTE)
endif(NOT THIRD_PARTY_DIR) endif()
message(STATUS "Third party dir: ${THIRD_PARTY_DIR}") message(STATUS "Third party dir: ${THIRD_PARTY_DIR}")
if(WIN32) if(WIN32)
# get WDK location and version to use # get WDK location and version to use
if(NOT WDK_DIR) if(NOT WDK_DIR)
if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../wdk") if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../wdk")
get_filename_component(WDK_DIR "../wdk" ABSOLUTE) get_filename_component(WDK_DIR "../wdk" ABSOLUTE)
endif() endif()
endif(NOT WDK_DIR) endif()
if(WDK_DIR) if(WDK_DIR)
if(IS_DIRECTORY "${WDK_DIR}/Win15") if(IS_DIRECTORY "${WDK_DIR}/Win15")
get_filename_component(WDK_DIR "${WDK_DIR}/Win15" ABSOLUTE) get_filename_component(WDK_DIR "${WDK_DIR}/Win15" ABSOLUTE)
@@ -315,7 +314,7 @@ if(WIN32)
list(LENGTH WindowsTargetPlatformVersion versionListLength) list(LENGTH WindowsTargetPlatformVersion versionListLength)
if(NOT versionListLength EQUAL 3) if(NOT versionListLength EQUAL 3)
message(ERROR "Error reading content of WDKVersion.txt file") message(ERROR "Error reading content of WDKVersion.txt file")
endif(NOT versionListLength EQUAL 3) endif()
list(GET WindowsTargetPlatformVersion 2 WindowsTargetPlatformVersion) list(GET WindowsTargetPlatformVersion 2 WindowsTargetPlatformVersion)
else() else()
set(WindowsTargetPlatformVersion ${WDK_VERSION}) set(WindowsTargetPlatformVersion ${WDK_VERSION})
@@ -330,131 +329,131 @@ if(WIN32)
add_compile_options(-DCONST_FROM_WDK_10_0_18328_0=${CONST_FROM_WDK_10_0_18328_0}) add_compile_options(-DCONST_FROM_WDK_10_0_18328_0=${CONST_FROM_WDK_10_0_18328_0})
set(WDK_INCLUDE_PATHS set(WDK_INCLUDE_PATHS
"${WDK_DIR}/Include/${WindowsTargetPlatformVersion}/um" "${WDK_DIR}/Include/${WindowsTargetPlatformVersion}/um"
"${WDK_DIR}/Include/${WindowsTargetPlatformVersion}/shared" "${WDK_DIR}/Include/${WindowsTargetPlatformVersion}/shared"
"${WDK_DIR}/Include/${WindowsTargetPlatformVersion}/km" "${WDK_DIR}/Include/${WindowsTargetPlatformVersion}/km"
) )
message(STATUS "WDK include paths: ${WDK_INCLUDE_PATHS}") message(STATUS "WDK include paths: ${WDK_INCLUDE_PATHS}")
endif() endif()
# Intel Graphics Compiler detection # Intel Graphics Compiler detection
if(NOT IGC__IGC_TARGETS) if(NOT IGC__IGC_TARGETS)
# check whether igc is part of workspace # check whether igc is part of workspace
if(DEFINED IGC_DIR) if(DEFINED IGC_DIR)
get_filename_component(IGC_DIR "${IGC_DIR}" ABSOLUTE) get_filename_component(IGC_DIR "${IGC_DIR}" ABSOLUTE)
else() else()
get_filename_component(IGC_DIR_tmp "${NEO_SOURCE_DIR}/../igc" ABSOLUTE) get_filename_component(IGC_DIR_tmp "${NEO_SOURCE_DIR}/../igc" ABSOLUTE)
if(IS_DIRECTORY "${IGC_DIR_tmp}") if(IS_DIRECTORY "${IGC_DIR_tmp}")
set(IGC_DIR "${IGC_DIR_tmp}") set(IGC_DIR "${IGC_DIR_tmp}")
endif()
endif() endif()
endif()
if(UNIX) if(UNIX)
# on Unix-like use pkg-config # on Unix-like use pkg-config
find_package(PkgConfig) find_package(PkgConfig)
if(DEFINED IGC_DIR) if(DEFINED IGC_DIR)
if(IS_DIRECTORY "${IGC_DIR}/lib/pkgconfig/") if(IS_DIRECTORY "${IGC_DIR}/lib/pkgconfig/")
set(__tmp_LIBDIR "lib") set(__tmp_LIBDIR "lib")
elseif(IS_DIRECTORY "${IGC_DIR}/${CMAKE_INSTALL_LIBDIR}/pkgconfig/") elseif(IS_DIRECTORY "${IGC_DIR}/${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
set(__tmp_LIBDIR ${CMAKE_INSTALL_LIBDIR}) set(__tmp_LIBDIR ${CMAKE_INSTALL_LIBDIR})
endif() endif()
endif() endif()
if(DEFINED __tmp_LIBDIR) if(DEFINED __tmp_LIBDIR)
set(OLD_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH}) set(OLD_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
set(ENV{PKG_CONFIG_PATH} "${IGC_DIR}/${__tmp_LIBDIR}/pkgconfig") set(ENV{PKG_CONFIG_PATH} "${IGC_DIR}/${__tmp_LIBDIR}/pkgconfig")
endif() endif()
pkg_check_modules(NEO__IGC igc-opencl) pkg_check_modules(NEO__IGC igc-opencl)
if(DEFINED __tmp_LIBDIR) if(DEFINED __tmp_LIBDIR)
set(ENV{PKG_CONFIG_PATH} ${OLD_PKG_CONFIG_PATH}) set(ENV{PKG_CONFIG_PATH} ${OLD_PKG_CONFIG_PATH})
set(NEO__IGC_LIBRARY_PATH "${IGC_DIR}/${__tmp_LIBDIR}/") set(NEO__IGC_LIBRARY_PATH "${IGC_DIR}/${__tmp_LIBDIR}/")
endif()
if(NEO__IGC_FOUND)
if(DEFINED IGC_DIR AND IS_DIRECTORY "${IGC_DIR}/${__tmp_LIBDIR}/pkgconfig/")
string(REPLACE "${NEO__IGC_INCLUDEDIR}" "${IGC_DIR}/include/igc" NEO__IGC_INCLUDE_DIRS "${NEO__IGC_INCLUDE_DIRS}")
endif()
set(NEO__IGC_INCLUDE_DIR ${NEO__IGC_INCLUDE_DIRS})
message(STATUS "IGC include dirs: ${NEO__IGC_INCLUDE_DIR}")
endif()
if(DEFINED __tmp_LIBDIR)
unset(__tmp_LIBDIR)
endif()
endif() endif()
if(NEO__IGC_FOUND) if(NEO__IGC_FOUND)
# do nothing if(DEFINED IGC_DIR AND IS_DIRECTORY "${IGC_DIR}/${__tmp_LIBDIR}/pkgconfig/")
elseif(EXISTS "${IGC_DIR}/CMakeLists.txt") string(REPLACE "${NEO__IGC_INCLUDEDIR}" "${IGC_DIR}/include/igc" NEO__IGC_INCLUDE_DIRS "${NEO__IGC_INCLUDE_DIRS}")
message(STATUS "IGC source dir is: ${IGC_DIR}") endif()
set(IGC_OPTION__OUTPUT_DIR "${NEO_BUILD_DIR}/igc") set(NEO__IGC_INCLUDE_DIR ${NEO__IGC_INCLUDE_DIRS})
set(IGC_OPTION__INCLUDE_IGC_COMPILER_TOOLS OFF) message(STATUS "IGC include dirs: ${NEO__IGC_INCLUDE_DIR}")
add_subdirectory_unique("${IGC_DIR}" "${NEO_BUILD_DIR}/igc" EXCLUDE_FROM_ALL)
set(NEO__IGC_TARGETS "${IGC__IGC_TARGETS}")
foreach(TARGET_tmp ${NEO__IGC_TARGETS})
list(APPEND NEO__IGC_INCLUDE_DIR $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_INCLUDE_DIRECTORIES>)
list(APPEND NEO__IGC_COMPILE_DEFINITIONS $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_COMPILE_DEFINITIONS>)
endforeach(TARGET_tmp)
message(STATUS "IGC targets: ${NEO__IGC_TARGETS}")
else()
message(FATAL_ERROR "Intel Graphics Compiler not found!")
endif() endif()
else() if(DEFINED __tmp_LIBDIR)
unset(__tmp_LIBDIR)
endif()
endif()
if(NEO__IGC_FOUND)
# do nothing
elseif(EXISTS "${IGC_DIR}/CMakeLists.txt")
message(STATUS "IGC source dir is: ${IGC_DIR}")
set(IGC_OPTION__OUTPUT_DIR "${NEO_BUILD_DIR}/igc")
set(IGC_OPTION__INCLUDE_IGC_COMPILER_TOOLS OFF)
add_subdirectory_unique("${IGC_DIR}" "${NEO_BUILD_DIR}/igc" EXCLUDE_FROM_ALL)
set(NEO__IGC_TARGETS "${IGC__IGC_TARGETS}") set(NEO__IGC_TARGETS "${IGC__IGC_TARGETS}")
foreach(TARGET_tmp ${NEO__IGC_TARGETS}) foreach(TARGET_tmp ${NEO__IGC_TARGETS})
list(APPEND NEO__IGC_INCLUDE_DIR $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_INCLUDE_DIRECTORIES>) list(APPEND NEO__IGC_INCLUDE_DIR $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_INCLUDE_DIRECTORIES>)
list(APPEND NEO__IGC_LIBRARY_PATH $<TARGET_FILE_DIR:${TARGET_tmp}>) list(APPEND NEO__IGC_COMPILE_DEFINITIONS $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_COMPILE_DEFINITIONS>)
endforeach(TARGET_tmp) endforeach()
string(REPLACE ";" ":" NEO__IGC_LIBRARY_PATH "${NEO__IGC_LIBRARY_PATH}")
message(STATUS "IGC targets: ${NEO__IGC_TARGETS}") message(STATUS "IGC targets: ${NEO__IGC_TARGETS}")
else()
message(FATAL_ERROR "Intel Graphics Compiler not found!")
endif()
else()
set(NEO__IGC_TARGETS "${IGC__IGC_TARGETS}")
foreach(TARGET_tmp ${NEO__IGC_TARGETS})
list(APPEND NEO__IGC_INCLUDE_DIR $<TARGET_PROPERTY:${TARGET_tmp},INTERFACE_INCLUDE_DIRECTORIES>)
list(APPEND NEO__IGC_LIBRARY_PATH $<TARGET_FILE_DIR:${TARGET_tmp}>)
endforeach()
string(REPLACE ";" ":" NEO__IGC_LIBRARY_PATH "${NEO__IGC_LIBRARY_PATH}")
message(STATUS "IGC targets: ${NEO__IGC_TARGETS}")
endif() endif()
# VISA headers - always relative to IGC # VISA headers - always relative to IGC
if(IS_DIRECTORY "${IGC_DIR}/../visa") if(IS_DIRECTORY "${IGC_DIR}/../visa")
get_filename_component(VISA_DIR "${IGC_DIR}/../visa" ABSOLUTE) get_filename_component(VISA_DIR "${IGC_DIR}/../visa" ABSOLUTE)
elseif(IS_DIRECTORY "${IGC_DIR}/visa") elseif(IS_DIRECTORY "${IGC_DIR}/visa")
set(VISA_DIR "${IGC_DIR}/visa") set(VISA_DIR "${IGC_DIR}/visa")
elseif(IS_DIRECTORY "${IGC_DIR}/include/visa") elseif(IS_DIRECTORY "${IGC_DIR}/include/visa")
set(VISA_DIR "${IGC_DIR}/include/visa") set(VISA_DIR "${IGC_DIR}/include/visa")
elseif(IS_DIRECTORY "${NEO__IGC_INCLUDEDIR}/../visa") elseif(IS_DIRECTORY "${NEO__IGC_INCLUDEDIR}/../visa")
get_filename_component(VISA_DIR "${NEO__IGC_INCLUDEDIR}/../visa" ABSOLUTE) get_filename_component(VISA_DIR "${NEO__IGC_INCLUDEDIR}/../visa" ABSOLUTE)
elseif(IS_DIRECTORY "${IGC_OCL_ADAPTOR_DIR}/../../visa") elseif(IS_DIRECTORY "${IGC_OCL_ADAPTOR_DIR}/../../visa")
get_filename_component(VISA_DIR "${IGC_OCL_ADAPTOR_DIR}/../../visa" ABSOLUTE) get_filename_component(VISA_DIR "${IGC_OCL_ADAPTOR_DIR}/../../visa" ABSOLUTE)
endif() endif()
message(STATUS "VISA Dir: ${VISA_DIR}") message(STATUS "VISA Dir: ${VISA_DIR}")
if(IS_DIRECTORY "${VISA_DIR}/include") if(IS_DIRECTORY "${VISA_DIR}/include")
set(VISA_INCLUDE_DIR "${VISA_DIR}/include") set(VISA_INCLUDE_DIR "${VISA_DIR}/include")
else() else()
set(VISA_INCLUDE_DIR "${VISA_DIR}") set(VISA_INCLUDE_DIR "${VISA_DIR}")
endif() endif()
# IGA headers - always relative to VISA # IGA headers - always relative to VISA
if(IS_DIRECTORY "${VISA_DIR}/../iga") if(IS_DIRECTORY "${VISA_DIR}/../iga")
get_filename_component(IGA_DIR "${VISA_DIR}/../iga" ABSOLUTE) get_filename_component(IGA_DIR "${VISA_DIR}/../iga" ABSOLUTE)
elseif(IS_DIRECTORY "${VISA_DIR}/iga") elseif(IS_DIRECTORY "${VISA_DIR}/iga")
set(IGA_DIR "${VISA_DIR}/iga") set(IGA_DIR "${VISA_DIR}/iga")
endif() endif()
if(IS_DIRECTORY "${IGA_DIR}/IGALibrary/api") if(IS_DIRECTORY "${IGA_DIR}/IGALibrary/api")
set(IGA_INCLUDE_DIR "${IGA_DIR}/IGALibrary/api") set(IGA_INCLUDE_DIR "${IGA_DIR}/IGALibrary/api")
else() else()
set(IGA_INCLUDE_DIR "${IGA_DIR}") set(IGA_INCLUDE_DIR "${IGA_DIR}")
endif() endif()
if(IS_DIRECTORY ${IGA_INCLUDE_DIR}) if(IS_DIRECTORY ${IGA_INCLUDE_DIR})
set(IGA_HEADERS_AVAILABLE TRUE) set(IGA_HEADERS_AVAILABLE TRUE)
set(IGA_LIBRARY_NAME "iga${NEO_BITS}") set(IGA_LIBRARY_NAME "iga${NEO_BITS}")
else() else()
set(IGA_HEADERS_AVAILABLE FALSE) set(IGA_HEADERS_AVAILABLE FALSE)
endif() endif()
message(STATUS "IGA Includes dir: ${IGA_INCLUDE_DIR}") message(STATUS "IGA Includes dir: ${IGA_INCLUDE_DIR}")
if(WIN32) if(WIN32)
set(IGC_LIBRARY_NAME "igc${NEO_BITS}") set(IGC_LIBRARY_NAME "igc${NEO_BITS}")
set(FCL_LIBRARY_NAME "igdfcl${NEO_BITS}") set(FCL_LIBRARY_NAME "igdfcl${NEO_BITS}")
endif() endif()
# GmmLib detection # GmmLib detection
@@ -508,7 +507,7 @@ else()
message(FATAL_ERROR "GmmLib not found!") message(FATAL_ERROR "GmmLib not found!")
endif() endif()
if(DEFINED __tmp_LIBDIR) if(DEFINED __tmp_LIBDIR)
unset(__tmp_LIBDIR) unset(__tmp_LIBDIR)
endif() endif()
else() else()
if(EXISTS "${GMM_DIR}/CMakeLists.txt") if(EXISTS "${GMM_DIR}/CMakeLists.txt")
@@ -531,64 +530,63 @@ endif()
macro(copy_gmm_dll_for target) macro(copy_gmm_dll_for target)
if(NOT UNIX) if(NOT UNIX)
add_custom_command( add_custom_command(
TARGET ${target} TARGET ${target}
POST_BUILD POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${GMM_TARGET_NAME}> $<TARGET_FILE_DIR:${target}> COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${GMM_TARGET_NAME}> $<TARGET_FILE_DIR:${target}>
) )
endif() endif()
endmacro() endmacro()
link_directories(${NEO__GMM_LIBRARY_PATH}) link_directories(${NEO__GMM_LIBRARY_PATH})
if(NOT DISABLE_LIBVA) if(NOT DISABLE_LIBVA)
# LibVA detection # LibVA detection
if(UNIX) if(UNIX)
set(NEO__LIBVA_IS_REQUIRED "") set(NEO__LIBVA_IS_REQUIRED "")
if(IGDRCL_FORCE_USE_LIBVA) if(IGDRCL_FORCE_USE_LIBVA)
set(NEO__LIBVA_IS_REQUIRED "REQUIRED") set(NEO__LIBVA_IS_REQUIRED "REQUIRED")
endif() endif()
if(DEFINED LIBVA_SOURCE_DIR) if(DEFINED LIBVA_SOURCE_DIR)
get_filename_component(LIBVA_SOURCE_DIR "${LIBVA_SOURCE_DIR}" ABSOLUTE) get_filename_component(LIBVA_SOURCE_DIR "${LIBVA_SOURCE_DIR}" ABSOLUTE)
else() else()
get_filename_component(LIBVA_SOURCE_DIR_tmp "${NEO_SOURCE_DIR}/../libva" ABSOLUTE) get_filename_component(LIBVA_SOURCE_DIR_tmp "${NEO_SOURCE_DIR}/../libva" ABSOLUTE)
if(IS_DIRECTORY "${LIBVA_SOURCE_DIR_tmp}") if(IS_DIRECTORY "${LIBVA_SOURCE_DIR_tmp}")
set(LIBVA_SOURCE_DIR "${LIBVA_SOURCE_DIR_tmp}") set(LIBVA_SOURCE_DIR "${LIBVA_SOURCE_DIR_tmp}")
endif()
endif()
find_package(PkgConfig)
if(DEFINED LIBVA_SOURCE_DIR AND IS_DIRECTORY "${LIBVA_SOURCE_DIR}/lib/pkgconfig/")
set(OLD_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
set(ENV{PKG_CONFIG_PATH} "${LIBVA_SOURCE_DIR}/lib/pkgconfig/")
endif()
pkg_check_modules(NEO__LIBVA ${NEO__LIBVA_IS_REQUIRED} libva>=1.0.0)
include(CheckLibraryExists)
if(DEFINED LIBVA_SOURCE_DIR AND IS_DIRECTORY "${LIBVA_SOURCE_DIR}/lib/pkgconfig/")
set(ENV{PKG_CONFIG_PATH} ${OLD_PKG_CONFIG_PATH})
endif()
if(NEO__LIBVA_FOUND)
CHECK_LIBRARY_EXISTS(va vaGetLibFunc ${NEO__LIBVA_LIBDIR} HAVE_VAGETLIBFUNC)
add_definitions(-DLIBVA)
message(STATUS "Using libva ")
if(DEFINED LIBVA_SOURCE_DIR AND IS_DIRECTORY "${LIBVA_SOURCE_DIR}/lib/pkgconfig/")
string(REPLACE "${NEO__LIBVA_INCLUDEDIR}" "${LIBVA_SOURCE_DIR}/include" NEO__LIBVA_INCLUDE_DIRS "${NEO__LIBVA_INCLUDE_DIRS}")
string(REPLACE "${NEO__LIBVA_LIBDIR}" "${LIBVA_SOURCE_DIR}/lib" NEO__LIBVA_LIBDIR "${NEO__LIBVA_LIBDIR}")
set(NEO__LIBVA_LIBRARY_PATH "${NEO__LIBVA_LIBDIR}")
endif()
list(LENGTH NEO__LIBVA_INCLUDE_DIRS __len)
if(__len GREATER 0)
set(NEO__LIBVA_INCLUDE_DIR ${NEO__LIBVA_INCLUDE_DIRS})
include_directories("${NEO__LIBVA_INCLUDE_DIR}")
message(STATUS "LibVA include dirs: ${NEO__LIBVA_INCLUDE_DIR}")
endif()
endif() endif()
endif() endif()
find_package(PkgConfig)
if(DEFINED LIBVA_SOURCE_DIR AND IS_DIRECTORY "${LIBVA_SOURCE_DIR}/lib/pkgconfig/")
set(OLD_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
set(ENV{PKG_CONFIG_PATH} "${LIBVA_SOURCE_DIR}/lib/pkgconfig/")
endif()
pkg_check_modules(NEO__LIBVA ${NEO__LIBVA_IS_REQUIRED} libva>=1.0.0)
include(CheckLibraryExists)
if(DEFINED LIBVA_SOURCE_DIR AND IS_DIRECTORY "${LIBVA_SOURCE_DIR}/lib/pkgconfig/")
set(ENV{PKG_CONFIG_PATH} ${OLD_PKG_CONFIG_PATH})
endif()
if(NEO__LIBVA_FOUND)
CHECK_LIBRARY_EXISTS(va vaGetLibFunc ${NEO__LIBVA_LIBDIR} HAVE_VAGETLIBFUNC)
add_definitions(-DLIBVA)
message(STATUS "Using libva ")
if(DEFINED LIBVA_SOURCE_DIR AND IS_DIRECTORY "${LIBVA_SOURCE_DIR}/lib/pkgconfig/")
string(REPLACE "${NEO__LIBVA_INCLUDEDIR}" "${LIBVA_SOURCE_DIR}/include" NEO__LIBVA_INCLUDE_DIRS "${NEO__LIBVA_INCLUDE_DIRS}")
string(REPLACE "${NEO__LIBVA_LIBDIR}" "${LIBVA_SOURCE_DIR}/lib" NEO__LIBVA_LIBDIR "${NEO__LIBVA_LIBDIR}")
set(NEO__LIBVA_LIBRARY_PATH "${NEO__LIBVA_LIBDIR}")
endif()
list(LENGTH NEO__LIBVA_INCLUDE_DIRS __len)
if(__len GREATER 0)
set(NEO__LIBVA_INCLUDE_DIR ${NEO__LIBVA_INCLUDE_DIRS})
include_directories("${NEO__LIBVA_INCLUDE_DIR}")
message(STATUS "LibVA include dirs: ${NEO__LIBVA_INCLUDE_DIR}")
endif()
endif()
endif()
endif() endif()
set(SLD_LIBRARY_NAME "igfxdbgxchg") set(SLD_LIBRARY_NAME "igfxdbgxchg")
@@ -596,16 +594,15 @@ if(NEO_BITS STREQUAL "64")
set(SLD_LIBRARY_NAME "${SLD_LIBRARY_NAME}${NEO_BITS}") set(SLD_LIBRARY_NAME "${SLD_LIBRARY_NAME}${NEO_BITS}")
endif() endif()
add_subdirectory_unique(third_party/gtest) add_subdirectory_unique(third_party/gtest)
message(STATUS "AUB_STREAM_DIR = ${AUB_STREAM_DIR}" ) message(STATUS "AUB_STREAM_DIR = ${AUB_STREAM_DIR}")
if(DEFINED AUB_STREAM_DIR) if(DEFINED AUB_STREAM_DIR)
set(AUB_STREAM_PROJECT_NAME "aub_stream") set(AUB_STREAM_PROJECT_NAME "aub_stream")
add_subdirectory_unique(${AUB_STREAM_DIR} ${CMAKE_BINARY_DIR}/aub_stream EXCLUDE_FROM_ALL) add_subdirectory_unique(${AUB_STREAM_DIR} ${CMAKE_BINARY_DIR}/aub_stream EXCLUDE_FROM_ALL)
set(ENGINE_NODE_DIR ${AUB_STREAM_DIR}${BRANCH_DIR_SUFFIX}/headers) set(ENGINE_NODE_DIR ${AUB_STREAM_DIR}${BRANCH_DIR_SUFFIX}/headers)
else() else()
set(ENGINE_NODE_DIR ${AUB_STREAM_HEADERS_DIR}) set(ENGINE_NODE_DIR ${AUB_STREAM_HEADERS_DIR})
endif() endif()
message(STATUS "Engine node dir: ${ENGINE_NODE_DIR}") message(STATUS "Engine node dir: ${ENGINE_NODE_DIR}")
@@ -624,7 +621,7 @@ set(COMPILE_BUILT_INS TRUE CACHE BOOL "Enable built-in kernels compilation")
set(IGDRCL_OUTPUT_DIR "${IGDRCL_OPTION__OUTPUT_DIR}") set(IGDRCL_OUTPUT_DIR "${IGDRCL_OPTION__OUTPUT_DIR}")
# do not add rpath # do not add rpath
set(CMAKE_SKIP_RPATH YES CACHE BOOL "" FORCE ) set(CMAKE_SKIP_RPATH YES CACHE BOOL "" FORCE)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
@@ -652,18 +649,18 @@ if(MSVC)
# Force to treat warnings as errors # Force to treat warnings as errors
if(NOT CMAKE_CXX_FLAGS MATCHES "/WX") if(NOT CMAKE_CXX_FLAGS MATCHES "/WX")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /we4189") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /we4189")
endif() endif()
endif() endif()
# Disable generating manifest # Disable generating manifest
set(LINKER_FLAGS "/MANIFEST:NO") set(LINKER_FLAGS "/MANIFEST:NO")
# Use legacy float rounding # Use legacy float rounding
set(LINKER_FLAGS "${LINKER_FLAGS} legacy_stdio_float_rounding.obj") set(LINKER_FLAGS "${LINKER_FLAGS} legacy_stdio_float_rounding.obj")
# Support for WUD # Support for WUD
set(CMAKE_CXX_STANDARD_LIBRARIES "onecore.lib") set(CMAKE_CXX_STANDARD_LIBRARIES "onecore.lib")
foreach(IT kernel32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;) foreach(IT kernel32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;)
set(LINKER_FLAGS "${LINKER_FLAGS} /NODEFAULTLIB:${IT}") set(LINKER_FLAGS "${LINKER_FLAGS} /NODEFAULTLIB:${IT}")
@@ -759,11 +756,11 @@ else()
else() else()
message(WARNING "Spectre mitigation DISABLED") message(WARNING "Spectre mitigation DISABLED")
endif() endif()
endif(MSVC) endif()
if(NOT MSVC) if(NOT MSVC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
endif(NOT MSVC) endif()
# Compiler warning flags # Compiler warning flags
if(NOT MSVC) if(NOT MSVC)
@@ -775,7 +772,7 @@ if(NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wno-unused-parameter -Wno-missing-field-initializers") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wno-unused-parameter -Wno-missing-field-initializers")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Winvalid-pch") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Winvalid-pch")
if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" ) if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
# clang only # clang only
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshorten-64-to-32") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshorten-64-to-32")
if(USE_SANITIZE_UB) if(USE_SANITIZE_UB)
@@ -784,24 +781,24 @@ if(NOT MSVC)
if(NOT SANITIZE_UB_ALLOW_CONTINUE) if(NOT SANITIZE_UB_ALLOW_CONTINUE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-sanitize-recover=undefined") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-sanitize-recover=undefined")
endif() endif()
endif(USE_SANITIZE_UB) endif()
if (NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS 3.6)) if(NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS 3.6))
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs -DSANITIZER_BUILD") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs -DSANITIZER_BUILD")
endif() endif()
if (NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0)) if(NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.0))
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register") # Added for htons() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-register") # Added for htons()
endif() endif()
if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0) if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-copy") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-copy")
endif() endif()
else() else()
# gcc only # gcc only
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs -Wno-unused-but-set-variable") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs -Wno-unused-but-set-variable")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wclobbered") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wclobbered")
if (CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0) if(CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0)
else() else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wimplicit-fallthrough=4") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wimplicit-fallthrough=4")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") # Added for gtest set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") # Added for gtest
endif() endif()
endif() endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
@@ -824,7 +821,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")
else() else()
# gcc, g++ only # gcc, g++ only
if (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9) if(CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector")
else() else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
@@ -857,29 +854,29 @@ include_directories(${NEO_SOURCE_DIR}/opencl/source/command_queue/definitions${B
include_directories(${NEO_SOURCE_DIR}/opencl/source/command_stream/definitions${BRANCH_DIR_SUFFIX}) include_directories(${NEO_SOURCE_DIR}/opencl/source/command_stream/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/opencl/source/mem_obj/definitions${BRANCH_DIR_SUFFIX}) include_directories(${NEO_SOURCE_DIR}/opencl/source/mem_obj/definitions${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/opencl/source/memory_manager/definitions${BRANCH_DIR_SUFFIX}) include_directories(${NEO_SOURCE_DIR}/opencl/source/memory_manager/definitions${BRANCH_DIR_SUFFIX})
if (MSVC) if(MSVC)
include_directories(${NEO_SOURCE_DIR}/opencl/source/sharings/gl/windows/include) include_directories(${NEO_SOURCE_DIR}/opencl/source/sharings/gl/windows/include)
endif() endif()
# Define where to put binaries # Define where to put binaries
set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
if(MSVC) if(MSVC)
if (NOT "${CMAKE_GENERATOR}" STREQUAL "Ninja") if(NOT "${CMAKE_GENERATOR}" STREQUAL "Ninja")
set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}) set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE})
endif() endif()
endif() endif()
add_subdirectory_unique(${OCLOC_DIRECTORY} ${NEO_BUILD_DIR}/offline_compiler) add_subdirectory_unique(${OCLOC_DIRECTORY} ${NEO_BUILD_DIR}/offline_compiler)
target_compile_definitions(ocloc_lib PRIVATE MOCKABLE_VIRTUAL=) target_compile_definitions(ocloc_lib PRIVATE MOCKABLE_VIRTUAL=)
if(DONT_CARE_OF_VIRTUALS) if(DONT_CARE_OF_VIRTUALS)
set(NEO_SHARED_RELEASE_LIB_NAME "neo_shared") set(NEO_SHARED_RELEASE_LIB_NAME "neo_shared")
set(NEO_SHARED_MOCKABLE_LIB_NAME ${NEO_SHARED_RELEASE_LIB_NAME}) set(NEO_SHARED_MOCKABLE_LIB_NAME ${NEO_SHARED_RELEASE_LIB_NAME})
else() else()
set(NEO_SHARED_RELEASE_LIB_NAME "neo_shared") set(NEO_SHARED_RELEASE_LIB_NAME "neo_shared")
if(NOT SKIP_UNIT_TESTS) if(NOT SKIP_UNIT_TESTS)
set(NEO_SHARED_MOCKABLE_LIB_NAME "neo_shared_mockable") set(NEO_SHARED_MOCKABLE_LIB_NAME "neo_shared_mockable")
endif() endif()
endif() endif()
set(BIKSIM_LIB_NAME "biksim") set(BIKSIM_LIB_NAME "biksim")
@@ -892,59 +889,58 @@ add_subdirectory_unique(shared/source)
add_subdirectory_unique(shared/generate_cpp_array) add_subdirectory_unique(shared/generate_cpp_array)
macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC) macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC)
set(NEO_STATIC_LIB_NAME ${LIB_NAME}) set(NEO_STATIC_LIB_NAME ${LIB_NAME})
set(SHARINGS_ENABLE_LIB_NAME "${LIB_NAME}_sharings_enable") set(SHARINGS_ENABLE_LIB_NAME "${LIB_NAME}_sharings_enable")
set(GENERATE_EXECUTABLE ${GENERATE_EXEC}) set(GENERATE_EXECUTABLE ${GENERATE_EXEC})
if(${MOCKABLE}) if(${MOCKABLE})
set(NEO_SHARED_LIB ${NEO_SHARED_MOCKABLE_LIB_NAME}) set(NEO_SHARED_LIB ${NEO_SHARED_MOCKABLE_LIB_NAME})
else() else()
set(NEO_SHARED_LIB ${NEO_SHARED_RELEASE_LIB_NAME}) set(NEO_SHARED_LIB ${NEO_SHARED_RELEASE_LIB_NAME})
endif() endif()
if(NOT BUILD_WITHOUT_RUNTIME) if(NOT BUILD_WITHOUT_RUNTIME)
add_subdirectory(${NEO_RUNTIME_SUB_DIR} "${NEO_BUILD_DIR}/${LIB_NAME}") add_subdirectory(${NEO_RUNTIME_SUB_DIR} "${NEO_BUILD_DIR}/${LIB_NAME}")
else() else()
add_subdirectory(${NEO_RUNTIME_SUB_DIR} "${NEO_BUILD_DIR}/${LIB_NAME}" EXCLUDE_FROM_ALL) add_subdirectory(${NEO_RUNTIME_SUB_DIR} "${NEO_BUILD_DIR}/${LIB_NAME}" EXCLUDE_FROM_ALL)
endif() endif()
target_compile_definitions(${BUILTINS_SOURCES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) target_compile_definitions(${BUILTINS_SOURCES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
target_compile_definitions(${BUILTINS_VME_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) target_compile_definitions(${BUILTINS_VME_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
target_compile_definitions(${BUILTINS_BINARIES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) target_compile_definitions(${BUILTINS_BINARIES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
target_compile_definitions(${SCHEDULER_BINARY_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) target_compile_definitions(${SCHEDULER_BINARY_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
if(${MOCKABLE})
if(${MOCKABLE}) target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual)
target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual) target_compile_definitions(${SHARINGS_ENABLE_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual)
target_compile_definitions(${SHARINGS_ENABLE_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual) target_compile_definitions(${LIB_NAME} PUBLIC DEFAULT_TEST_PLATFORM=${DEFAULT_TESTED_PLATFORM} DEFAULT_TEST_FAMILY_NAME=${DEFAULT_TESTED_FAMILY_NAME} ${TESTED_GEN_FLAGS_DEFINITONS})
target_compile_definitions(${LIB_NAME} PUBLIC DEFAULT_TEST_PLATFORM=${DEFAULT_TESTED_PLATFORM} DEFAULT_TEST_FAMILY_NAME=${DEFAULT_TESTED_FAMILY_NAME} ${TESTED_GEN_FLAGS_DEFINITONS}) else()
else() target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) target_compile_definitions(${SHARINGS_ENABLE_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
target_compile_definitions(${SHARINGS_ENABLE_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=) endif()
endif() endmacro()
endmacro(generate_runtime_lib)
set(NEO_DYNAMIC_LIB_NAME "igdrcl_dll") # single NEO dll set(NEO_DYNAMIC_LIB_NAME "igdrcl_dll") # single NEO dll
set(NEO_DLL_NAME_BASE "igdrcl") set(NEO_DLL_NAME_BASE "igdrcl")
if(DONT_CARE_OF_VIRTUALS) if(DONT_CARE_OF_VIRTUALS)
message(STATUS "All targets will use virtuals") message(STATUS "All targets will use virtuals")
set(NEO_RELEASE_LIB_NAME "igdrcl_lib") set(NEO_RELEASE_LIB_NAME "igdrcl_lib")
set(NEO_MOCKABLE_LIB_NAME ${NEO_RELEASE_LIB_NAME}) set(NEO_MOCKABLE_LIB_NAME ${NEO_RELEASE_LIB_NAME})
generate_runtime_lib(${NEO_RELEASE_LIB_NAME} TRUE TRUE) generate_runtime_lib(${NEO_RELEASE_LIB_NAME} TRUE TRUE)
else() else()
set(NEO_RELEASE_LIB_NAME "igdrcl_lib_release") # Used by dll/so set(NEO_RELEASE_LIB_NAME "igdrcl_lib_release") # Used by dll/so
generate_runtime_lib(${NEO_RELEASE_LIB_NAME} FALSE TRUE) generate_runtime_lib(${NEO_RELEASE_LIB_NAME} FALSE TRUE)
if(NOT SKIP_UNIT_TESTS) if(NOT SKIP_UNIT_TESTS)
set(NEO_MOCKABLE_LIB_NAME "igdrcl_lib_mockable") # Used by ULTS set(NEO_MOCKABLE_LIB_NAME "igdrcl_lib_mockable") # Used by ULTS
generate_runtime_lib(${NEO_MOCKABLE_LIB_NAME} TRUE FALSE) generate_runtime_lib(${NEO_MOCKABLE_LIB_NAME} TRUE FALSE)
endif() endif()
endif() endif()
set(NEO_STATICALLY_LINKED_LIBRARIES ${NEO_RELEASE_LIB_NAME} ${NEO_SHARED_RELEASE_LIB_NAME} ${NEO_RELEASE_LIB_NAME} ${NEO_SHARED_RELEASE_LIB_NAME}) set(NEO_STATICALLY_LINKED_LIBRARIES ${NEO_RELEASE_LIB_NAME} ${NEO_SHARED_RELEASE_LIB_NAME} ${NEO_RELEASE_LIB_NAME} ${NEO_SHARED_RELEASE_LIB_NAME})
set(NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME}) set(NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME})
if(NOT SKIP_UNIT_TESTS) if(NOT SKIP_UNIT_TESTS)
include(${CMAKE_CURRENT_SOURCE_DIR}/level_zero/cmake/${BRANCH_TYPE}/l0_tests.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/level_zero/cmake/${BRANCH_TYPE}/l0_tests.cmake)
endif() endif()
add_subdirectory_unique(shared/test/unit_test) add_subdirectory_unique(shared/test/unit_test)
@@ -956,15 +952,15 @@ else()
endif() endif()
if(NOT BUILD_WITHOUT_RUNTIME) if(NOT BUILD_WITHOUT_RUNTIME)
add_subdirectory_unique(${NEO_OPENCL_BLACK_BOX_TESTS_SUB_DIR}) add_subdirectory_unique(${NEO_OPENCL_BLACK_BOX_TESTS_SUB_DIR})
else() else()
hide_subdir(${NEO_OPENCL_BLACK_BOX_TESTS_SUB_DIR}) hide_subdir(${NEO_OPENCL_BLACK_BOX_TESTS_SUB_DIR})
endif() endif()
set(DONT_LINK_ELF_STATICALLY TRUE) set(DONT_LINK_ELF_STATICALLY TRUE)
if(EXISTS ${NEO_SOURCE_DIR}/../internal) if(EXISTS ${NEO_SOURCE_DIR}/../internal)
add_subdirectory_unique(${NEO_SOURCE_DIR}/../internal ${NEO_BUILD_DIR}/internal) add_subdirectory_unique(${NEO_SOURCE_DIR}/../internal ${NEO_BUILD_DIR}/internal)
endif(EXISTS ${NEO_SOURCE_DIR}/../internal) endif()
add_subdirectory_unique(scripts/lint) add_subdirectory_unique(scripts/lint)
if(EXISTS ${NEO_SOURCE_DIR}/scripts/format) if(EXISTS ${NEO_SOURCE_DIR}/scripts/format)
@@ -973,7 +969,7 @@ endif()
configure_file(config.h.in ${NEO_BUILD_DIR}/config.h) configure_file(config.h.in ${NEO_BUILD_DIR}/config.h)
if(WIN32 AND NOT NEO__IGC_FOUND) if(WIN32 AND NOT NEO__IGC_FOUND)
configure_file(igc.opencl.h.in ${NEO_BUILD_DIR}/igc.opencl.h) configure_file(igc.opencl.h.in ${NEO_BUILD_DIR}/igc.opencl.h)
endif() endif()
configure_file(driver_version.h.in ${NEO_BUILD_DIR}/driver_version.h) # Put Driver version into define configure_file(driver_version.h.in ${NEO_BUILD_DIR}/driver_version.h) # Put Driver version into define
configure_file(lib_names.h.in ${NEO_BUILD_DIR}/lib_names.h) configure_file(lib_names.h.in ${NEO_BUILD_DIR}/lib_names.h)
@@ -981,7 +977,7 @@ configure_file(lib_names.h.in ${NEO_BUILD_DIR}/lib_names.h)
hide_subdir(${NEO_RUNTIME_SUB_DIR}) hide_subdir(${NEO_RUNTIME_SUB_DIR})
if(BUILD_WITH_L0) if(BUILD_WITH_L0)
add_subdirectory_unique(level_zero) add_subdirectory_unique(level_zero)
endif() endif()
add_subdirectory_unique(target_unit_tests) add_subdirectory_unique(target_unit_tests)

View File

@@ -12,44 +12,44 @@ list(GET unit_test_config 3 eu_per_ss)
add_custom_target(run_${product}_unit_tests ALL DEPENDS unit_tests) add_custom_target(run_${product}_unit_tests ALL DEPENDS unit_tests)
set_target_properties(run_${product}_unit_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}") set_target_properties(run_${product}_unit_tests PROPERTIES FOLDER "${PLATFORM_SPECIFIC_TEST_TARGETS_FOLDER}/${product}")
if(NOT SKIP_NEO_UNIT_TESTS) if(NOT SKIP_NEO_UNIT_TESTS)
add_custom_command( add_custom_command(
TARGET run_${product}_unit_tests TARGET run_${product}_unit_tests
POST_BUILD POST_BUILD
COMMAND WORKING_DIRECTORY ${TargetDir} COMMAND WORKING_DIRECTORY ${TargetDir}
COMMAND echo Running neo_shared_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product} COMMAND echo Running neo_shared_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product}
COMMAND $<TARGET_FILE:neo_shared_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} COMMAND $<TARGET_FILE:neo_shared_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION}
) )
add_custom_command( add_custom_command(
TARGET run_${product}_unit_tests TARGET run_${product}_unit_tests
POST_BUILD POST_BUILD
COMMAND WORKING_DIRECTORY ${TargetDir} COMMAND WORKING_DIRECTORY ${TargetDir}
COMMAND echo Running igdrcl_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product} COMMAND echo Running igdrcl_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product}
COMMAND ${GTEST_ENV} $<TARGET_FILE:igdrcl_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} COMMAND ${GTEST_ENV} $<TARGET_FILE:igdrcl_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION}
) )
if(WIN32 AND ${CMAKE_BUILD_TYPE} STREQUAL "Debug" AND "${IGDRCL_OPTION__BITS}" STREQUAL "64" AND APPVERIFIER_ALLOWED) if(WIN32 AND ${CMAKE_BUILD_TYPE} STREQUAL "Debug" AND "${IGDRCL_OPTION__BITS}" STREQUAL "64" AND APPVERIFIER_ALLOWED)
add_custom_command( add_custom_command(
TARGET run_${product}_unit_tests TARGET run_${product}_unit_tests
POST_BUILD POST_BUILD
COMMAND WORKING_DIRECTORY ${TargetDir} COMMAND WORKING_DIRECTORY ${TargetDir}
COMMAND echo Running igdrcl_tests with App Verifier COMMAND echo Running igdrcl_tests with App Verifier
COMMAND ${NEO_SOURCE_DIR}/scripts/verify.bat $<TARGET_FILE:igdrcl_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} COMMAND ${NEO_SOURCE_DIR}/scripts/verify.bat $<TARGET_FILE:igdrcl_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION}
COMMAND echo App Verifier returned: %errorLevel% COMMAND echo App Verifier returned: %errorLevel%
) )
endif() endif()
endif() endif()
if(NOT SKIP_L0_UNIT_TESTS AND BUILD_WITH_L0) if(NOT SKIP_L0_UNIT_TESTS AND BUILD_WITH_L0)
add_custom_command( add_custom_command(
TARGET run_${product}_unit_tests TARGET run_${product}_unit_tests
POST_BUILD POST_BUILD
COMMAND WORKING_DIRECTORY ${TargetDir} COMMAND WORKING_DIRECTORY ${TargetDir}
COMMAND echo Running ze_intel_gpu_core_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product} COMMAND echo Running ze_intel_gpu_core_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product}
COMMAND $<TARGET_FILE:ze_intel_gpu_core_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} COMMAND $<TARGET_FILE:ze_intel_gpu_core_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION}
COMMAND echo Running ze_intel_gpu_tools_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product} COMMAND echo Running ze_intel_gpu_tools_tests ${target} ${slices}x${subslices}x${eu_per_ss} in ${TargetDir}/${product}
COMMAND $<TARGET_FILE:ze_intel_gpu_tools_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION} COMMAND $<TARGET_FILE:ze_intel_gpu_tools_tests> --product ${product} --slices ${slices} --subslices ${subslices} --eu_per_ss ${eu_per_ss} ${GTEST_EXCEPTION_OPTIONS} --gtest_repeat=${GTEST_REPEAT} ${GTEST_SHUFFLE} ${IGDRCL_TESTS_LISTENER_OPTION} ${GTEST_FILTER_OPTION}
) )
endif() endif()
add_dependencies(run_unit_tests run_${product}_unit_tests) add_dependencies(run_unit_tests run_${product}_unit_tests)

View File

@@ -84,7 +84,6 @@ macro(get_family_name_with_type gen_type platform_type)
set(family_name_with_type ${gen_type_capitalized}${platform_type_lower}) set(family_name_with_type ${gen_type_capitalized}${platform_type_lower})
endmacro() endmacro()
macro(append_sources_from_properties list_name) macro(append_sources_from_properties list_name)
foreach(name ${ARGN}) foreach(name ${ARGN})
get_property(${name} GLOBAL PROPERTY ${name}) get_property(${name} GLOBAL PROPERTY ${name})

View File

@@ -8,322 +8,322 @@ include(cmake/verify_l0_support.cmake)
if(BUILD_WITH_L0) if(BUILD_WITH_L0)
set(TARGET_NAME_L0 ze_intel_gpu) set(TARGET_NAME_L0 ze_intel_gpu)
# Level Zero third party detection # Level Zero third party detection
if(DEFINED LEVEL_ZERO_ROOT) if(DEFINED LEVEL_ZERO_ROOT)
get_filename_component(LEVEL_ZERO_ROOT "${LEVEL_ZERO_ROOT}" ABSOLUTE) get_filename_component(LEVEL_ZERO_ROOT "${LEVEL_ZERO_ROOT}" ABSOLUTE)
else()
get_filename_component(LEVEL_ZERO_ROOT_tmp "${NEO_SOURCE_DIR}/../level_zero" ABSOLUTE)
# Level Zero Headers if read from the git repo are in include/core & include/tools.
# To support the installation path of level_zero headers which is include/level_zero/*
# the header files are combined into the path include/level_zero/* in the commands below.
if(IS_DIRECTORY "${LEVEL_ZERO_ROOT_tmp}")
set(CUSTOM_L0_INCLUDE_PATH "${LEVEL_ZERO_ROOT_tmp}/include/level_zero/")
file(GLOB LEVEL_ZERO_SOURCE_HEADERS
"${LEVEL_ZERO_ROOT_tmp}/include/*.h"
)
file(MAKE_DIRECTORY ${CUSTOM_L0_INCLUDE_PATH})
file(COPY ${LEVEL_ZERO_SOURCE_HEADERS} DESTINATION ${CUSTOM_L0_INCLUDE_PATH})
set(LEVEL_ZERO_ROOT "${LEVEL_ZERO_ROOT_tmp}")
endif()
endif()
project(level-zero-gpu VERSION ${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_VERSION_BUILD})
message(STATUS "Level Zero driver version: ${PROJECT_VERSION}")
include(cmake/source_tree.cmake)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
find_package(LevelZero)
if(NOT LevelZero_FOUND)
message(STATUS "Level zero headers not found")
message(STATUS "Skipping level zero")
set(BUILD_WITH_L0 FALSE PARENT_SCOPE)
return()
endif()
add_definitions(-DL0_PROJECT_VERSION_MAJOR="${PROJECT_VERSION_MAJOR}")
add_definitions(-DL0_PROJECT_VERSION_MINOR="${PROJECT_VERSION_MINOR}")
add_definitions(-DL0_PROJECT_VERSION_PATCH="${PROJECT_VERSION_PATCH}")
add_definitions(-DNEO_VERSION_BUILD="${NEO_VERSION_BUILD}")
add_definitions(-DZE_ENABLE_OCL_INTEROP=1)
file(WRITE "${CMAKE_BINARY_DIR}/VERSION" "${PROJECT_VERSION}")
#Define a path for custom commands to work around MSVC
set(CUSTOM_COMMAND_BINARY_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
if(MSVC)
#MSVC implicitly adds $<CONFIG> to the output path
if(NOT "${CMAKE_GENERATOR}" STREQUAL "Ninja")
set(CUSTOM_COMMAND_BINARY_DIR ${CUSTOM_COMMAND_BINARY_DIR}/$<CONFIG>)
endif()
endif()
if(UNIX)
# Xml Library
find_package(LibXml2)
if(PC_LIBXML_FOUND)
include_directories(SYSTEM ${LIBXML2_INCLUDE_DIR})
message(STATUS "LibXml2 Library headers directory: ${LIBXML2_INCLUDE_DIR}")
else() else()
get_filename_component(LEVEL_ZERO_ROOT_tmp "${NEO_SOURCE_DIR}/../level_zero" ABSOLUTE) message(STATUS "LibXml2 Library headers not available. Building without.")
# Level Zero Headers if read from the git repo are in include/core & include/tools.
# To support the installation path of level_zero headers which is include/level_zero/*
# the header files are combined into the path include/level_zero/* in the commands below.
if(IS_DIRECTORY "${LEVEL_ZERO_ROOT_tmp}")
set(CUSTOM_L0_INCLUDE_PATH "${LEVEL_ZERO_ROOT_tmp}/include/level_zero/")
file(GLOB LEVEL_ZERO_SOURCE_HEADERS
"${LEVEL_ZERO_ROOT_tmp}/include/*.h"
)
file(MAKE_DIRECTORY ${CUSTOM_L0_INCLUDE_PATH})
file(COPY ${LEVEL_ZERO_SOURCE_HEADERS} DESTINATION ${CUSTOM_L0_INCLUDE_PATH})
set(LEVEL_ZERO_ROOT "${LEVEL_ZERO_ROOT_tmp}")
endif()
endif() endif()
endif()
project(level-zero-gpu VERSION ${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_VERSION_BUILD}) if(UNIX)
message(STATUS "Level Zero driver version: ${PROJECT_VERSION}") # Load GNUInstallDirs to determine install targets for Linux packages
include(GNUInstallDirs)
endif()
include(cmake/source_tree.cmake) if(NOT MSVC)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -fPIC")
find_package(LevelZero) endif()
if(NOT LevelZero_FOUND)
message(STATUS "Level zero headers not found")
message(STATUS "Skipping level zero")
set(BUILD_WITH_L0 FALSE PARENT_SCOPE)
return()
endif()
add_definitions( -DL0_PROJECT_VERSION_MAJOR="${PROJECT_VERSION_MAJOR}" ) set(L0_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
add_definitions( -DL0_PROJECT_VERSION_MINOR="${PROJECT_VERSION_MINOR}" )
add_definitions( -DL0_PROJECT_VERSION_PATCH="${PROJECT_VERSION_PATCH}" )
add_definitions( -DNEO_VERSION_BUILD="${NEO_VERSION_BUILD}" )
add_definitions( -DZE_ENABLE_OCL_INTEROP=1) if(NOT DEFINED COMPUTE_RUNTIME_DIR)
get_filename_component(COMPUTE_RUNTIME_DIR ${CMAKE_CURRENT_SOURCE_DIR}/.. ABSOLUTE)
endif()
# Option to disable tests
option(${PROJECT_NAME}_BUILD_TESTS "Build unit tests." ON)
file(WRITE "${CMAKE_BINARY_DIR}/VERSION" "${PROJECT_VERSION}") if(SKIP_UNIT_TESTS)
set(SKIP_L0_UNIT_TESTS TRUE)
endif()
#Define a path for custom commands to work around MSVC # Copy third_party_binaries to output BIN folder
set(CUSTOM_COMMAND_BINARY_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) add_custom_target(copy_third_party_files)
if(MSVC) set_target_properties(copy_third_party_files PROPERTIES FOLDER ${TARGET_NAME_L0})
#MSVC implicitly adds $<CONFIG> to the output path
if(NOT "${CMAKE_GENERATOR}" STREQUAL "Ninja")
set(CUSTOM_COMMAND_BINARY_DIR ${CUSTOM_COMMAND_BINARY_DIR}/$<CONFIG>)
endif()
endif()
if(UNIX) if(DEFINED NEO__IGC_TARGETS)
# Xml Library if(WIN32)
find_package(LibXml2) add_dependencies(copy_third_party_files copy_compiler_files)
if(PC_LIBXML_FOUND)
include_directories(SYSTEM ${LIBXML2_INCLUDE_DIR})
message(STATUS "LibXml2 Library headers directory: ${LIBXML2_INCLUDE_DIR}")
else()
message(STATUS "LibXml2 Library headers not available. Building without.")
endif()
endif()
if(UNIX)
# Load GNUInstallDirs to determine install targets for Linux packages
include(GNUInstallDirs)
endif()
if(NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -fPIC")
endif()
set(L0_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
if(NOT DEFINED COMPUTE_RUNTIME_DIR)
get_filename_component(COMPUTE_RUNTIME_DIR ${CMAKE_CURRENT_SOURCE_DIR}/.. ABSOLUTE)
endif()
# Option to disable tests
option(${PROJECT_NAME}_BUILD_TESTS "Build unit tests." ON)
if(SKIP_UNIT_TESTS)
set(SKIP_L0_UNIT_TESTS TRUE)
endif()
# Copy third_party_binaries to output BIN folder
add_custom_target(copy_third_party_files)
set_target_properties(copy_third_party_files PROPERTIES FOLDER ${TARGET_NAME_L0})
if(DEFINED NEO__IGC_TARGETS)
if(WIN32)
add_dependencies(copy_third_party_files copy_compiler_files)
else()
add_dependencies(copy_third_party_files ${NEO__IGC_TARGETS})
foreach(TARGET_tmp ${NEO__IGC_TARGETS})
if(UNIX)
add_custom_command(
TARGET copy_third_party_files
PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory ${CUSTOM_COMMAND_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_SONAME_FILE:${TARGET_tmp}> "${CUSTOM_COMMAND_BINARY_DIR}/"
)
endif()
add_custom_command(
TARGET copy_third_party_files
PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory ${CUSTOM_COMMAND_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${TARGET_tmp}> "${CUSTOM_COMMAND_BINARY_DIR}/"
)
endforeach()
endif()
else() else()
if(DEFINED IGC_DIR) # Only copy igc libs if available add_dependencies(copy_third_party_files ${NEO__IGC_TARGETS})
message(STATUS "L0::Igc Dir: ${IGC_DIR}") foreach(TARGET_tmp ${NEO__IGC_TARGETS})
add_custom_command(
TARGET copy_third_party_files
PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory ${CUSTOM_COMMAND_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E copy_directory "${IGC_DIR}/lib" "${CUSTOM_COMMAND_BINARY_DIR}/"
DEPENDS "${IGC_DIR}/lib"
)
endif()
endif()
if(TARGET ${GMM_TARGET_NAME})
message(STATUS "L0::Gmm Target: ${GMM_TARGET_NAME}")
add_dependencies(copy_third_party_files ${GMM_TARGET_NAME})
if(UNIX) if(UNIX)
add_custom_command( add_custom_command(
TARGET copy_third_party_files TARGET copy_third_party_files
PRE_BUILD PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory ${CUSTOM_COMMAND_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E make_directory ${CUSTOM_COMMAND_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_SONAME_FILE:${GMM_TARGET_NAME}>" "${CUSTOM_COMMAND_BINARY_DIR}/" COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_SONAME_FILE:${TARGET_tmp}> "${CUSTOM_COMMAND_BINARY_DIR}/"
) )
endif() endif()
add_custom_command( add_custom_command(
TARGET copy_third_party_files TARGET copy_third_party_files
PRE_BUILD PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory ${CUSTOM_COMMAND_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E make_directory ${CUSTOM_COMMAND_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:${GMM_TARGET_NAME}>" "${CUSTOM_COMMAND_BINARY_DIR}/" COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${TARGET_tmp}> "${CUSTOM_COMMAND_BINARY_DIR}/"
) )
else() endforeach()
if(DEFINED GMM_DIR) # Only copy gmm libs if available
message(STATUS "L0::Gmm Dir: ${GMM_DIR}")
add_custom_command(
TARGET copy_third_party_files
PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory ${CUSTOM_COMMAND_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E copy_directory "${GMM_DIR}/lib" "${CUSTOM_COMMAND_BINARY_DIR}/"
DEPENDS "${GMM_DIR}/lib"
)
endif()
endif() endif()
else()
# Get build type if(DEFINED IGC_DIR) # Only copy igc libs if available
string(TOLOWER "${CMAKE_BUILD_TYPE}" BUILD_TYPE) message(STATUS "L0::Igc Dir: ${IGC_DIR}")
add_custom_command(
if("${BUILD_TYPE}" STREQUAL "debug") TARGET copy_third_party_files
add_definitions(-DZE_DEBUG) PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory ${CUSTOM_COMMAND_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E copy_directory "${IGC_DIR}/lib" "${CUSTOM_COMMAND_BINARY_DIR}/"
DEPENDS "${IGC_DIR}/lib"
)
endif() endif()
endif()
include_directories(${COMPUTE_RUNTIME_DIR}/third_party/opencl_headers) if(TARGET ${GMM_TARGET_NAME})
if (CUSTOM_L0_INCLUDE_PATH) message(STATUS "L0::Gmm Target: ${GMM_TARGET_NAME}")
include_directories(${CUSTOM_L0_INCLUDE_PATH}/../) add_dependencies(copy_third_party_files ${GMM_TARGET_NAME})
else() if(UNIX)
include_directories(${LevelZero_INCLUDE_DIRS}) add_custom_command(
TARGET copy_third_party_files
PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory ${CUSTOM_COMMAND_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_SONAME_FILE:${GMM_TARGET_NAME}>" "${CUSTOM_COMMAND_BINARY_DIR}/"
)
endif() endif()
include_directories(${NEO_SOURCE_DIR}/level_zero/api/experimental${BRANCH_DIR_SUFFIX}) add_custom_command(
include_directories(${NEO_SOURCE_DIR}/shared/source/compiler_interface/compiler_options${BRANCH_DIR_SUFFIX}) TARGET copy_third_party_files
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/hw_helpers${BRANCH_DIR_SUFFIX}) PRE_BUILD
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/cmdlist/cmdlist_extended${BRANCH_DIR_SUFFIX}) COMMAND ${CMAKE_COMMAND} -E make_directory ${CUSTOM_COMMAND_BINARY_DIR}
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/cmdqueue/cmdqueue_extended${BRANCH_DIR_SUFFIX}) COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:${GMM_TARGET_NAME}>" "${CUSTOM_COMMAND_BINARY_DIR}/"
include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
include_directories(ddi${BRANCH_DIR_SUFFIX})
include_directories(tools/source)
include_directories(experimental${BRANCH_DIR_SUFFIX}/source)
include_directories(experimental/source/tracing)
# Create our shared library/DLL
add_library(${TARGET_NAME_L0}
SHARED
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${NEO_SHARED_DIRECTORY}/dll/options_dll.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/page_table_mngr.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info.cpp
${NEO_SHARED_DIRECTORY}/helpers/abort.cpp
${NEO_SHARED_DIRECTORY}/helpers/debug_helpers.cpp
${NEO_SHARED_DIRECTORY}/utilities/cpuintrinsics.cpp
${NEO_SHARED_DIRECTORY}/utilities/debug_settings_reader_creator.cpp
${NEO_SHARED_DIRECTORY}/utilities/io_functions.cpp
) )
else()
target_sources(${TARGET_NAME_L0} if(DEFINED GMM_DIR) # Only copy gmm libs if available
PRIVATE message(STATUS "L0::Gmm Dir: ${GMM_DIR}")
${COMPUTE_RUNTIME_DIR}/opencl/source/aub/aub_stream_interface.cpp add_custom_command(
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_command_stream.cpp TARGET copy_third_party_files
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_deferred_deleter.cpp PRE_BUILD
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_tbx_sockets.cpp COMMAND ${CMAKE_COMMAND} -E make_directory ${CUSTOM_COMMAND_BINARY_DIR}
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/get_devices.cpp COMMAND ${CMAKE_COMMAND} -E copy_directory "${GMM_DIR}/lib" "${CUSTOM_COMMAND_BINARY_DIR}/"
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/source_level_debugger_dll.cpp DEPENDS "${GMM_DIR}/lib"
${COMPUTE_RUNTIME_DIR}/opencl/source/helpers/built_ins_helper.cpp )
)
if(WIN32)
target_sources(${TARGET_NAME_L0}
PRIVATE
${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory_base.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/sys_calls.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_interface.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_calls.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
${NEO_SHARED_DIRECTORY}/dll/windows/environment_variables.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/windows/options_windows.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/windows/os_interface.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/windows/create_wddm_memory_manager.cpp
)
target_link_libraries(${TARGET_NAME_L0}
dxgi
ws2_32
)
else()
target_sources(${TARGET_NAME_L0}
PRIVATE
${NEO_SHARED_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/allocator_helper.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/create_drm_memory_manager.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/devices${BRANCH_DIR_SUFFIX}/devices.inl
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/devices/devices_base.inl
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/options_linux.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/os_interface.cpp
)
endif() endif()
endif()
if(DEFINED AUB_STREAM_PROJECT_NAME) # Get build type
string(TOLOWER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)
if("${BUILD_TYPE}" STREQUAL "debug")
add_definitions(-DZE_DEBUG)
endif()
include_directories(${COMPUTE_RUNTIME_DIR}/third_party/opencl_headers)
if(CUSTOM_L0_INCLUDE_PATH)
include_directories(${CUSTOM_L0_INCLUDE_PATH}/../)
else()
include_directories(${LevelZero_INCLUDE_DIRS})
endif()
include_directories(${NEO_SOURCE_DIR}/level_zero/api/experimental${BRANCH_DIR_SUFFIX})
include_directories(${NEO_SOURCE_DIR}/shared/source/compiler_interface/compiler_options${BRANCH_DIR_SUFFIX})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/hw_helpers${BRANCH_DIR_SUFFIX})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/cmdlist/cmdlist_extended${BRANCH_DIR_SUFFIX})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/cmdqueue/cmdqueue_extended${BRANCH_DIR_SUFFIX})
include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
include_directories(ddi${BRANCH_DIR_SUFFIX})
include_directories(tools/source)
include_directories(experimental${BRANCH_DIR_SUFFIX}/source)
include_directories(experimental/source/tracing)
# Create our shared library/DLL
add_library(${TARGET_NAME_L0}
SHARED
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${NEO_SHARED_DIRECTORY}/dll/options_dll.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/page_table_mngr.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/resource_info.cpp
${NEO_SHARED_DIRECTORY}/helpers/abort.cpp
${NEO_SHARED_DIRECTORY}/helpers/debug_helpers.cpp
${NEO_SHARED_DIRECTORY}/utilities/cpuintrinsics.cpp
${NEO_SHARED_DIRECTORY}/utilities/debug_settings_reader_creator.cpp
${NEO_SHARED_DIRECTORY}/utilities/io_functions.cpp
)
target_sources(${TARGET_NAME_L0}
PRIVATE
${COMPUTE_RUNTIME_DIR}/opencl/source/aub/aub_stream_interface.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_command_stream.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_deferred_deleter.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/create_tbx_sockets.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/get_devices.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/source_level_debugger_dll.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/helpers/built_ins_helper.cpp
)
if(WIN32)
target_sources(${TARGET_NAME_L0} target_sources(${TARGET_NAME_L0}
PRIVATE PRIVATE
$<TARGET_OBJECTS:aub_stream_all_hw> ${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory_base.cpp
${NEO_SHARED_DIRECTORY}/gmm_helper/windows/gmm_memory.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/sys_calls.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/os_interface.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_calls.cpp
${NEO_SHARED_DIRECTORY}/os_interface/windows/wddm/wddm_create.cpp
${NEO_SHARED_DIRECTORY}/dll/windows/environment_variables.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/windows/options_windows.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/windows/os_interface.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/windows/create_wddm_memory_manager.cpp
) )
endif() target_link_libraries(${TARGET_NAME_L0}
target_sources(${TARGET_NAME_L0} dxgi
PRIVATE ws2_32
$<TARGET_OBJECTS:${BUILTINS_BINARIES_LIB_NAME}>
) )
else()
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/source/inc)
target_compile_definitions(${TARGET_NAME_L0}
PUBLIC
ZE_MAKEDLL
)
get_property(COMPUTE_RUNTIME_DEFINITIONS
TARGET ${NEO_RELEASE_LIB_NAME}
PROPERTY COMPILE_DEFINITIONS
)
target_compile_definitions(${TARGET_NAME_L0}
PRIVATE
${COMPUTE_RUNTIME_DEFINITIONS}
)
if(UNIX)
target_sources(${TARGET_NAME_L0} target_sources(${TARGET_NAME_L0}
PRIVATE PRIVATE
${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp ${NEO_SHARED_DIRECTORY}/os_interface/linux/sys_calls_linux.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/drm_neo_create.cpp ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/allocator_helper.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/create_drm_memory_manager.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/devices${BRANCH_DIR_SUFFIX}/devices.inl
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/devices/devices_base.inl
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/options_linux.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/os_interface.cpp
)
endif()
if(DEFINED AUB_STREAM_PROJECT_NAME)
target_sources(${TARGET_NAME_L0}
PRIVATE
$<TARGET_OBJECTS:aub_stream_all_hw>
)
endif()
target_sources(${TARGET_NAME_L0}
PRIVATE
$<TARGET_OBJECTS:${BUILTINS_BINARIES_LIB_NAME}>
)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/source/inc)
target_compile_definitions(${TARGET_NAME_L0}
PUBLIC
ZE_MAKEDLL
)
get_property(COMPUTE_RUNTIME_DEFINITIONS
TARGET ${NEO_RELEASE_LIB_NAME}
PROPERTY COMPILE_DEFINITIONS
)
target_compile_definitions(${TARGET_NAME_L0}
PRIVATE
${COMPUTE_RUNTIME_DEFINITIONS}
)
if(UNIX)
target_sources(${TARGET_NAME_L0}
PRIVATE
${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/drm_neo_create.cpp
) )
set(OS_SPECIFIC_LIBS dl pthread rt) set(OS_SPECIFIC_LIBS dl pthread rt)
target_include_directories(${TARGET_NAME_L0} PUBLIC target_include_directories(${TARGET_NAME_L0} PUBLIC
${L0_ROOT_DIR}/core/source/os_interface/linux ${L0_ROOT_DIR}/core/source/os_interface/linux
${I915_INCLUDES_DIR} ${I915_INCLUDES_DIR}
) )
target_include_directories(${TARGET_NAME_L0} PRIVATE target_include_directories(${TARGET_NAME_L0} PRIVATE
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/devices${BRANCH_DIR_SUFFIX} ${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/devices${BRANCH_DIR_SUFFIX}
) )
else() else()
set(OS_SPECIFIC_LIBS "") set(OS_SPECIFIC_LIBS "")
target_include_directories(${TARGET_NAME_L0} PUBLIC target_include_directories(${TARGET_NAME_L0} PUBLIC
${L0_ROOT_DIR}/core/source/os_interface/windows ${L0_ROOT_DIR}/core/source/os_interface/windows
) )
if(CMAKE_SIZEOF_VOID_P EQUAL 4) if(CMAKE_SIZEOF_VOID_P EQUAL 4)
set(L0_BITNESS_SUFIX 32) set(L0_BITNESS_SUFIX 32)
elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(L0_BITNESS_SUFIX 64) set(L0_BITNESS_SUFIX 64)
endif() endif()
set_target_properties(${TARGET_NAME_L0} PROPERTIES set_target_properties(${TARGET_NAME_L0} PROPERTIES
DEBUG_OUTPUT_NAME "${TARGET_NAME_L0}${L0_BITNESS_SUFIX}" DEBUG_OUTPUT_NAME "${TARGET_NAME_L0}${L0_BITNESS_SUFIX}"
RELEASE_OUTPUT_NAME "${TARGET_NAME_L0}${L0_BITNESS_SUFIX}" RELEASE_OUTPUT_NAME "${TARGET_NAME_L0}${L0_BITNESS_SUFIX}"
RELEASEINTERNAL_OUTPUT_NAME "${TARGET_NAME_L0}${L0_BITNESS_SUFIX}" RELEASEINTERNAL_OUTPUT_NAME "${TARGET_NAME_L0}${L0_BITNESS_SUFIX}"
OUTPUT_NAME "${TARGET_NAME_L0}${L0_BITNESS_SUFIX}" OUTPUT_NAME "${TARGET_NAME_L0}${L0_BITNESS_SUFIX}"
) )
add_dependencies(${TARGET_NAME_L0} ${GMM_TARGET_NAME}) add_dependencies(${TARGET_NAME_L0} ${GMM_TARGET_NAME})
target_sources(${TARGET_NAME_L0} PRIVATE target_sources(${TARGET_NAME_L0} PRIVATE
${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp ${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
) )
endif() endif()
add_subdirectory_unique(api) add_subdirectory_unique(api)
add_subdirectory_unique(source) add_subdirectory_unique(source)
if(DONT_CARE_OF_VIRTUALS) if(DONT_CARE_OF_VIRTUALS)
set(L0_RELEASE_LIB_NAME "${TARGET_NAME_L0}_lib") set(L0_RELEASE_LIB_NAME "${TARGET_NAME_L0}_lib")
set(L0_MOCKABLE_LIB_NAME "${TARGET_NAME_L0}_lib") set(L0_MOCKABLE_LIB_NAME "${TARGET_NAME_L0}_lib")
else() else()
set(L0_RELEASE_LIB_NAME "${TARGET_NAME_L0}_lib") set(L0_RELEASE_LIB_NAME "${TARGET_NAME_L0}_lib")
if(NOT SKIP_UNIT_TESTS) if(NOT SKIP_UNIT_TESTS)
set(L0_MOCKABLE_LIB_NAME "${TARGET_NAME_L0}_mockable") set(L0_MOCKABLE_LIB_NAME "${TARGET_NAME_L0}_mockable")
endif() endif()
endif() endif()
function(generate_l0_lib LIB_NAME MOCKABLE) function(generate_l0_lib LIB_NAME MOCKABLE)
set(L0_STATIC_LIB_NAME ${LIB_NAME}) set(L0_STATIC_LIB_NAME ${LIB_NAME})
add_library(${LIB_NAME} OBJECT add_library(${LIB_NAME} OBJECT
${L0_RUNTIME_SOURCES} ${L0_RUNTIME_SOURCES}
) )
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/core/source "${NEO_BUILD_DIR}/${LIB_NAME}/core/source") add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/core/source "${NEO_BUILD_DIR}/${LIB_NAME}/core/source")
@@ -332,168 +332,167 @@ function(generate_l0_lib LIB_NAME MOCKABLE)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools/source "${NEO_BUILD_DIR}/${LIB_NAME}tools/source") add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools/source "${NEO_BUILD_DIR}/${LIB_NAME}tools/source")
append_sources_from_properties(L0_RUNTIME_SOURCES append_sources_from_properties(L0_RUNTIME_SOURCES
L0_API L0_API
L0_SOURCES_LINUX L0_SOURCES_LINUX
L0_SOURCES_WINDOWS L0_SOURCES_WINDOWS
L0_SRCS_COMPILER_INTERFACE L0_SRCS_COMPILER_INTERFACE
L0_SRCS_DEBUGGER L0_SRCS_DEBUGGER
L0_SRCS_OCLOC_SHARED L0_SRCS_OCLOC_SHARED
) )
if(WIN32) if(WIN32)
append_sources_from_properties(L0_RUNTIME_SOURCES append_sources_from_properties(L0_RUNTIME_SOURCES
L0_SRCS_DEBUGGER_WINDOWS L0_SRCS_DEBUGGER_WINDOWS
) )
else() else()
append_sources_from_properties(L0_RUNTIME_SOURCES append_sources_from_properties(L0_RUNTIME_SOURCES
L0_SRCS_DEBUGGER_LINUX L0_SRCS_DEBUGGER_LINUX
) )
endif() endif()
target_sources(${LIB_NAME} PRIVATE ${L0_RUNTIME_SOURCES}) target_sources(${LIB_NAME} PRIVATE ${L0_RUNTIME_SOURCES})
if(${MOCKABLE}) if(${MOCKABLE})
get_property(COMPUTE_RUNTIME_DEFINITIONS get_property(COMPUTE_RUNTIME_DEFINITIONS
TARGET ${NEO_MOCKABLE_LIB_NAME} TARGET ${NEO_MOCKABLE_LIB_NAME}
PROPERTY COMPILE_DEFINITIONS PROPERTY COMPILE_DEFINITIONS
) )
target_compile_definitions(${LIB_NAME} target_compile_definitions(${LIB_NAME}
PUBLIC MOCKABLE_VIRTUAL=virtual PUBLIC MOCKABLE_VIRTUAL=virtual
PUBLIC PUBLIC
${COMPUTE_RUNTIME_DEFINITIONS} ${COMPUTE_RUNTIME_DEFINITIONS}
) )
else() else()
get_property(COMPUTE_RUNTIME_DEFINITIONS get_property(COMPUTE_RUNTIME_DEFINITIONS
TARGET ${NEO_RELEASE_LIB_NAME} TARGET ${NEO_RELEASE_LIB_NAME}
PROPERTY COMPILE_DEFINITIONS PROPERTY COMPILE_DEFINITIONS
) )
target_compile_definitions(${LIB_NAME} target_compile_definitions(${LIB_NAME}
PUBLIC MOCKABLE_VIRTUAL= PUBLIC MOCKABLE_VIRTUAL=
PUBLIC PUBLIC
${COMPUTE_RUNTIME_DEFINITIONS} ${COMPUTE_RUNTIME_DEFINITIONS}
) )
endif() endif()
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 ${TARGET_NAME_L0}) set_target_properties(${LIB_NAME} PROPERTIES FOLDER ${TARGET_NAME_L0})
target_include_directories(${LIB_NAME} PUBLIC target_include_directories(${LIB_NAME} PUBLIC
${ENGINE_NODE_DIR} ${ENGINE_NODE_DIR}
${NEO__GMM_INCLUDE_DIR} ${NEO__GMM_INCLUDE_DIR}
${CIF_BASE_DIR} ${CIF_BASE_DIR}
${IGC_OCL_ADAPTOR_DIR} ${IGC_OCL_ADAPTOR_DIR}
${NEO__IGC_INCLUDE_DIR} ${NEO__IGC_INCLUDE_DIR}
${KHRONOS_HEADERS_DIR} ${KHRONOS_HEADERS_DIR}
) )
if(WIN32) if(WIN32)
target_include_directories(${LIB_NAME} PUBLIC target_include_directories(${LIB_NAME} PUBLIC
${WDK_INCLUDE_PATHS} ${WDK_INCLUDE_PATHS}
${CMAKE_CURRENT_SOURCE_DIR}/os_interface/windows ${CMAKE_CURRENT_SOURCE_DIR}/os_interface/windows
) )
else() else()
target_include_directories(${LIB_NAME} PUBLIC target_include_directories(${LIB_NAME} PUBLIC
${I915_INCLUDES_DIR} ${I915_INCLUDES_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/os_interface/linux ${CMAKE_CURRENT_SOURCE_DIR}/os_interface/linux
) )
endif() endif()
create_project_source_tree(${LIB_NAME}) create_project_source_tree(${LIB_NAME})
endfunction() endfunction()
if(UNIX) if(UNIX)
option(L0_INSTALL_UDEV_RULES "Install udev rules. An attempt to automatically determine the proper location will be made if UDEV_RULES_DIR is not set." OFF) option(L0_INSTALL_UDEV_RULES "Install udev rules. An attempt to automatically determine the proper location will be made if UDEV_RULES_DIR is not set." OFF)
if(L0_INSTALL_UDEV_RULES) if(L0_INSTALL_UDEV_RULES)
if(DEFINED UDEV_RULES_DIR) if(DEFINED UDEV_RULES_DIR)
set(UDEV_RULES_DIR_FOUND TRUE) set(UDEV_RULES_DIR_FOUND TRUE)
else() else()
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/${BRANCH_TYPE}/UdevRulesDir.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/${BRANCH_TYPE}/UdevRulesDir.cmake)
endif() endif()
if(NOT UDEV_RULES_DIR_FOUND) if(NOT UDEV_RULES_DIR_FOUND)
message(SEND_ERROR "udev rule install requested but no rules directory found") message(SEND_ERROR "udev rule install requested but no rules directory found")
endif() endif()
endif() endif()
endif() endif()
if(DONT_CARE_OF_VIRTUALS)
if(DONT_CARE_OF_VIRTUALS)
generate_l0_lib(${L0_RELEASE_LIB_NAME} TRUE) generate_l0_lib(${L0_RELEASE_LIB_NAME} TRUE)
else() else()
generate_l0_lib(${L0_RELEASE_LIB_NAME} FALSE) generate_l0_lib(${L0_RELEASE_LIB_NAME} FALSE)
if(NOT SKIP_UNIT_TESTS) if(NOT SKIP_UNIT_TESTS)
generate_l0_lib(${L0_MOCKABLE_LIB_NAME} TRUE) generate_l0_lib(${L0_MOCKABLE_LIB_NAME} TRUE)
endif() endif()
endif() endif()
append_sources_from_properties(L0_SHARED_LIB_SRCS L0_SRCS_DLL NEO_CORE_SRCS_LINK) append_sources_from_properties(L0_SHARED_LIB_SRCS L0_SRCS_DLL NEO_CORE_SRCS_LINK)
target_sources(${TARGET_NAME_L0} PRIVATE $<TARGET_OBJECTS:${L0_RELEASE_LIB_NAME}> ${L0_SHARED_LIB_SRCS}) target_sources(${TARGET_NAME_L0} PRIVATE $<TARGET_OBJECTS:${L0_RELEASE_LIB_NAME}> ${L0_SHARED_LIB_SRCS})
target_link_libraries(${TARGET_NAME_L0} target_link_libraries(${TARGET_NAME_L0}
${NEO_STATICALLY_LINKED_LIBRARIES} ${NEO_STATICALLY_LINKED_LIBRARIES}
${OS_SPECIFIC_LIBS} ${ASAN_LIBS} ${TSAN_LIBS} ${OS_SPECIFIC_LIBS} ${ASAN_LIBS} ${TSAN_LIBS}
) )
if(UNIX) if(UNIX)
target_link_libraries(${TARGET_NAME_L0} ${GMM_LINK_NAME}) target_link_libraries(${TARGET_NAME_L0} ${GMM_LINK_NAME})
set_property(TARGET ${TARGET_NAME_L0} set_property(TARGET ${TARGET_NAME_L0}
APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/core/source/dll/linux/ze.exports" APPEND_STRING PROPERTY LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/core/source/dll/linux/ze.exports"
) )
endif() endif()
create_source_tree(${TARGET_NAME_L0} ${L0_ROOT_DIR}/..) create_source_tree(${TARGET_NAME_L0} ${L0_ROOT_DIR}/..)
set_property(TARGET ${TARGET_NAME_L0} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS}) set_property(TARGET ${TARGET_NAME_L0} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
set_target_properties(${TARGET_NAME_L0} PROPERTIES set_target_properties(${TARGET_NAME_L0} PROPERTIES
FOLDER ${TARGET_NAME_L0} FOLDER ${TARGET_NAME_L0}
VERSION "${PROJECT_VERSION}" VERSION "${PROJECT_VERSION}"
SOVERSION "${PROJECT_VERSION_MAJOR}" SOVERSION "${PROJECT_VERSION_MAJOR}"
) )
if(UNIX) if(UNIX)
install(TARGETS ${TARGET_NAME_L0} install(TARGETS ${TARGET_NAME_L0}
LIBRARY LIBRARY
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
DESTINATION ${CMAKE_INSTALL_LIBDIR} DESTINATION ${CMAKE_INSTALL_LIBDIR}
COMPONENT ${PROJECT_NAME} COMPONENT ${PROJECT_NAME}
NAMELINK_SKIP NAMELINK_SKIP
) )
else() else()
install(TARGETS ${TARGET_NAME_L0} RUNTIME install(TARGETS ${TARGET_NAME_L0} RUNTIME
DESTINATION Release/lh64 DESTINATION Release/lh64
CONFIGURATIONS Release CONFIGURATIONS Release
) )
install(TARGETS ${TARGET_NAME_L0} RUNTIME install(TARGETS ${TARGET_NAME_L0} RUNTIME
DESTINATION Release-Internal/lh64 DESTINATION Release-Internal/lh64
CONFIGURATIONS ReleaseInternal CONFIGURATIONS ReleaseInternal
) )
install(TARGETS ${TARGET_NAME_L0} RUNTIME install(TARGETS ${TARGET_NAME_L0} RUNTIME
DESTINATION Debug/lh64 DESTINATION Debug/lh64
CONFIGURATIONS Debug CONFIGURATIONS Debug
) )
endif() endif()
if(NOT SKIP_L0_UNIT_TESTS) if(NOT SKIP_L0_UNIT_TESTS)
add_subdirectory_unique(core/test) add_subdirectory_unique(core/test)
add_subdirectory_unique(tools/test) add_subdirectory_unique(tools/test)
else() else()
hide_subdir(core/test) hide_subdir(core/test)
hide_subdir(tools/test) hide_subdir(tools/test)
endif()
add_subdirectories()
if(UNIX AND NEO_BUILD_L0_PACKAGE)
message(STATUS "Building LevelZero package")
set_property(GLOBAL APPEND PROPERTY NEO_L0_COMPONENTS_LIST ${PROJECT_NAME})
set(L0_PACKAGE_VERSION_DEB "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
set(L0_PACKAGE_VERSION_RPM "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${BRANCH_TYPE}/cpack.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/${BRANCH_TYPE}/cpack.cmake)
endif() endif()
add_subdirectories()
if(UNIX AND NEO_BUILD_L0_PACKAGE) endif()
message(STATUS "Building LevelZero package")
set_property(GLOBAL APPEND PROPERTY NEO_L0_COMPONENTS_LIST ${PROJECT_NAME})
set(L0_PACKAGE_VERSION_DEB "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
set(L0_PACKAGE_VERSION_RPM "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${BRANCH_TYPE}/cpack.cmake)
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/${BRANCH_TYPE}/cpack.cmake)
endif()
endif()
else() else()
message(STATUS "Skipping level zero") message(STATUS "Skipping level zero")
set(BUILD_WITH_L0 FALSE PARENT_SCOPE) set(BUILD_WITH_L0 FALSE PARENT_SCOPE)

View File

@@ -12,9 +12,10 @@ add_subdirectory(sysman)
set(L0_API "") set(L0_API "")
append_sources_from_properties(L0_API append_sources_from_properties(L0_API
L0_SRCS_API L0_SRCS_API
L0_EXPERIMENTAL_API L0_EXPERIMENTAL_API
L0_EXPERIMENTAL_TRACING_API L0_EXPERIMENTAL_TRACING_API
L0_SYSMAN_API L0_SYSMAN_API
L0_TOOLS_API) L0_TOOLS_API
)
set_property(GLOBAL PROPERTY L0_API ${L0_API}) set_property(GLOBAL PROPERTY L0_API ${L0_API})

View File

@@ -5,20 +5,20 @@
# #
set(L0_SRCS_API set(L0_SRCS_API
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/ze_barrier.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ze_barrier.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdlist.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdlist.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdqueue.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ze_cmdqueue.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ze_context.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ze_context.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ze_copy.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ze_copy.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ze_core_loader.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ze_core_loader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ze_device.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ze_device.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ze_driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ze_driver.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ze_event.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ze_event.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ze_fence.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ze_fence.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ze_image.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ze_image.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ze_memory.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ze_memory.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ze_module.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ze_module.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ze_sampler.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ze_sampler.cpp
) )
set_property(GLOBAL PROPERTY L0_SRCS_API ${L0_SRCS_API}) set_property(GLOBAL PROPERTY L0_SRCS_API ${L0_SRCS_API})

View File

@@ -7,4 +7,4 @@
set(L0_EXPERIMENTAL_API set(L0_EXPERIMENTAL_API
) )
set_property(GLOBAL PROPERTY L0_EXPERIMENTAL_API ${L0_EXPERIMENTAL_API}) set_property(GLOBAL PROPERTY L0_EXPERIMENTAL_API ${L0_EXPERIMENTAL_API})

View File

@@ -5,7 +5,7 @@
# #
set(L0_EXPERIMENTAL_TRACING_API set(L0_EXPERIMENTAL_TRACING_API
${CMAKE_CURRENT_SOURCE_DIR}/zet_tracing.cpp ${CMAKE_CURRENT_SOURCE_DIR}/zet_tracing.cpp
) )
set_property(GLOBAL PROPERTY L0_EXPERIMENTAL_TRACING_API ${L0_EXPERIMENTAL_TRACING_API}) set_property(GLOBAL PROPERTY L0_EXPERIMENTAL_TRACING_API ${L0_EXPERIMENTAL_TRACING_API})

View File

@@ -7,26 +7,26 @@
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_path(LevelZero_INCLUDE_DIR find_path(LevelZero_INCLUDE_DIR
NAMES level_zero/ze_api.h NAMES level_zero/ze_api.h
PATHS PATHS
${LEVEL_ZERO_ROOT} ${LEVEL_ZERO_ROOT}
PATH_SUFFIXES "include" PATH_SUFFIXES "include"
) )
find_package_handle_standard_args(LevelZero find_package_handle_standard_args(LevelZero
REQUIRED_VARS REQUIRED_VARS
LevelZero_INCLUDE_DIR LevelZero_INCLUDE_DIR
) )
if(LevelZero_FOUND) if(LevelZero_FOUND)
list(APPEND LevelZero_INCLUDE_DIRS ${LevelZero_INCLUDE_DIR}) list(APPEND LevelZero_INCLUDE_DIRS ${LevelZero_INCLUDE_DIR})
endif() endif()
if(LevelZero_FOUND AND NOT TARGET LevelZero::LevelZero) if(LevelZero_FOUND AND NOT TARGET LevelZero::LevelZero)
add_library(LevelZero::LevelZero INTERFACE IMPORTED) add_library(LevelZero::LevelZero INTERFACE IMPORTED)
set_target_properties(LevelZero::LevelZero set_target_properties(LevelZero::LevelZero
PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${LevelZero_INCLUDE_DIRS}" PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${LevelZero_INCLUDE_DIRS}"
) )
endif() endif()
MESSAGE(STATUS "LevelZero_INCLUDE_DIRS: " ${LevelZero_INCLUDE_DIRS}) MESSAGE(STATUS "LevelZero_INCLUDE_DIRS: " ${LevelZero_INCLUDE_DIRS})

View File

@@ -7,9 +7,9 @@
set(UDEV_RULES_DIR_FOUND FALSE) set(UDEV_RULES_DIR_FOUND FALSE)
foreach(rules_dir IN ITEMS "/lib/udev/rules.d" "/usr/lib/udev/rules.d") foreach(rules_dir IN ITEMS "/lib/udev/rules.d" "/usr/lib/udev/rules.d")
if(IS_DIRECTORY ${rules_dir}) if(IS_DIRECTORY ${rules_dir})
set(UDEV_RULES_DIR ${rules_dir} CACHE PATH "Install path for udev rules") set(UDEV_RULES_DIR ${rules_dir} CACHE PATH "Install path for udev rules")
set(UDEV_RULES_DIR_FOUND TRUE) set(UDEV_RULES_DIR_FOUND TRUE)
break() break()
endif() endif()
endforeach() endforeach()

View File

@@ -10,87 +10,87 @@
# These need to be added to a project to enable platform support in ULTs # These need to be added to a project to enable platform support in ULTs
if(TESTS_GEN8) if(TESTS_GEN8)
set(COMPUTE_RUNTIME_ULT_GEN8 set(COMPUTE_RUNTIME_ULT_GEN8
${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen8.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen8.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/gen8/cmd_parse_gen8.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/gen8/cmd_parse_gen8.cpp
) )
endif() endif()
if(TESTS_GEN9) if(TESTS_GEN9)
set(COMPUTE_RUNTIME_ULT_GEN9 set(COMPUTE_RUNTIME_ULT_GEN9
${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen9.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen9.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/gen9/cmd_parse_gen9.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/gen9/cmd_parse_gen9.cpp
) )
endif() endif()
if(TESTS_GEN11) if(TESTS_GEN11)
set(COMPUTE_RUNTIME_ULT_GEN11 set(COMPUTE_RUNTIME_ULT_GEN11
${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen11.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen11.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/gen11/cmd_parse_gen11.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/gen11/cmd_parse_gen11.cpp
) )
endif() endif()
if(TESTS_GEN12LP) if(TESTS_GEN12LP)
set(COMPUTE_RUNTIME_ULT_GEN12LP set(COMPUTE_RUNTIME_ULT_GEN12LP
${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen12lp.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/libult/gen12lp.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/gen12lp/cmd_parse_gen12lp.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/gen12lp/cmd_parse_gen12lp.cpp
) )
include_directories(${NEO_SHARED_TEST_DIRECTORY}/unit_test/gen12lp/cmd_parse${BRANCH_DIR_SUFFIX}/) include_directories(${NEO_SHARED_TEST_DIRECTORY}/unit_test/gen12lp/cmd_parse${BRANCH_DIR_SUFFIX}/)
endif() endif()
## ULT related settings ## ULT related settings
#Extract compute runtime COMPILE_DEFINITIONS #Extract compute runtime COMPILE_DEFINITIONS
get_property(COMPUTE_RUNTIME_MOCKABLE_DEFINITIONS get_property(COMPUTE_RUNTIME_MOCKABLE_DEFINITIONS
TARGET ${NEO_MOCKABLE_LIB_NAME} TARGET ${NEO_MOCKABLE_LIB_NAME}
PROPERTY COMPILE_DEFINITIONS PROPERTY COMPILE_DEFINITIONS
) )
if(WIN32) if(WIN32)
set(COMPUTE_RUNTIME_MOCKABLE_DEFINITIONS set(COMPUTE_RUNTIME_MOCKABLE_DEFINITIONS
${COMPUTE_RUNTIME_MOCKABLE_DEFINITIONS} ${COMPUTE_RUNTIME_MOCKABLE_DEFINITIONS}
WDDM_VERSION_NUMBER=23 WDDM_VERSION_NUMBER=23
CONST_FROM_WDK_10_0_18328_0= CONST_FROM_WDK_10_0_18328_0=
) )
endif() endif()
#Extract compute runtime INCLUDE_DIRECTORIES #Extract compute runtime INCLUDE_DIRECTORIES
get_property(COMPUTE_RUNTIME_MOCKABLE_INCLUDES get_property(COMPUTE_RUNTIME_MOCKABLE_INCLUDES
TARGET ${NEO_MOCKABLE_LIB_NAME} TARGET ${NEO_MOCKABLE_LIB_NAME}
PROPERTY INCLUDE_DIRECTORIES PROPERTY INCLUDE_DIRECTORIES
) )
# Create a library that has the missing ingredients to link # Create a library that has the missing ingredients to link
add_library(compute_runtime_mockable_extra add_library(compute_runtime_mockable_extra
STATIC STATIC
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
${CMAKE_CURRENT_LIST_DIR}/l0_tests.cmake ${CMAKE_CURRENT_LIST_DIR}/l0_tests.cmake
${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/utilities/cpuintrinsics.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/test_files.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/helpers/test_files.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/mocks/mock_compiler_interface.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/mocks/mock_compiler_interface.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/mocks/mock_compiler_interface.h ${NEO_SHARED_TEST_DIRECTORY}/unit_test/mocks/mock_compiler_interface.h
${NEO_SHARED_TEST_DIRECTORY}/unit_test/mocks/mock_command_stream_receiver.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/mocks/mock_command_stream_receiver.cpp
${NEO_SHARED_TEST_DIRECTORY}/unit_test/mocks/mock_device.cpp ${NEO_SHARED_TEST_DIRECTORY}/unit_test/mocks/mock_device.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/abort.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/built_ins_helper.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/built_ins_helper.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/debug_helpers.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers/debug_helpers.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/os_interface.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/os_interface.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/source_level_debugger_ult.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/source_level_debugger_ult.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/source_level_debugger_library.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/source_level_debugger_library.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_cif.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_cif.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_compilers.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_compilers.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_page_table_mngr.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/create_tbx_sockets.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/create_tbx_sockets.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_deferred_deleter.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_deferred_deleter.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks${BRANCH_SUFIX_DIR}/mock_gmm_client_context.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks${BRANCH_SUFIX_DIR}/mock_gmm_client_context.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_client_context_base.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_client_context_base.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_resource_info.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_memory_manager.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_memory_manager.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_program.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_program.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_sip.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_sip.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/utilities/debug_settings_reader_creator.cpp
${NEO_SOURCE_DIR}/shared/source/debug_settings/debug_settings_manager.cpp ${NEO_SOURCE_DIR}/shared/source/debug_settings/debug_settings_manager.cpp
) )
set_property(TARGET compute_runtime_mockable_extra APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS}) set_property(TARGET compute_runtime_mockable_extra APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS} ${TSAN_FLAGS})
@@ -98,44 +98,44 @@ set_property(TARGET compute_runtime_mockable_extra APPEND_STRING PROPERTY COMPIL
# These need to be added to a project to enable platform support in ULTs # These need to be added to a project to enable platform support in ULTs
#Additional includes for ULT builds #Additional includes for ULT builds
target_include_directories(compute_runtime_mockable_extra target_include_directories(compute_runtime_mockable_extra
PUBLIC PUBLIC
${COMPUTE_RUNTIME_MOCKABLE_INCLUDES} ${COMPUTE_RUNTIME_MOCKABLE_INCLUDES}
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/gmm_memory ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/gmm_memory
${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR} ${SOURCE_LEVEL_DEBUGGER_HEADERS_DIR}
) )
#Additional compile definitions for ULT builds #Additional compile definitions for ULT builds
target_compile_definitions(compute_runtime_mockable_extra target_compile_definitions(compute_runtime_mockable_extra
PUBLIC PUBLIC
${COMPUTE_RUNTIME_MOCKABLE_DEFINITIONS} ${COMPUTE_RUNTIME_MOCKABLE_DEFINITIONS}
) )
target_link_libraries(compute_runtime_mockable_extra target_link_libraries(compute_runtime_mockable_extra
gmock-gtest gmock-gtest
) )
if(WIN32) if(WIN32)
target_sources(compute_runtime_mockable_extra target_sources(compute_runtime_mockable_extra
PRIVATE PRIVATE
${NEO_SOURCE_DIR}/shared/source/dll/windows/environment_variables.cpp ${NEO_SOURCE_DIR}/shared/source/dll/windows/environment_variables.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_memory_base.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_gmm_memory_base.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_wddm.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks/mock_wddm.cpp
) )
target_link_libraries(compute_runtime_mockable_extra target_link_libraries(compute_runtime_mockable_extra
ws2_32 ws2_32
) )
endif() endif()
if(UNIX) if(UNIX)
target_sources(compute_runtime_mockable_extra target_sources(compute_runtime_mockable_extra
PRIVATE PRIVATE
${NEO_SOURCE_DIR}/opencl/source/dll/linux/allocator_helper.cpp ${NEO_SOURCE_DIR}/opencl/source/dll/linux/allocator_helper.cpp
${NEO_SOURCE_DIR}/opencl/source/tbx/tbx_sockets_imp.cpp ${NEO_SOURCE_DIR}/opencl/source/tbx/tbx_sockets_imp.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_mock.cpp ${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_mock.cpp
) )
target_link_libraries(compute_runtime_mockable_extra target_link_libraries(compute_runtime_mockable_extra
dl dl
) )
endif() endif()
set_target_properties(compute_runtime_mockable_extra PROPERTIES POSITION_INDEPENDENT_CODE ON) set_target_properties(compute_runtime_mockable_extra PROPERTIES POSITION_INDEPENDENT_CODE ON)

View File

@@ -5,8 +5,8 @@
# #
set(L0_NOT_SUPPORTED_PRODUCT_FAMILIES set(L0_NOT_SUPPORTED_PRODUCT_FAMILIES
"IGFX_BROXTON" "IGFX_BROXTON"
"IGFX_LAKEFIELD" "IGFX_LAKEFIELD"
"IGFX_ELKHARTLAKE" "IGFX_ELKHARTLAKE"
"IGFX_BROADWELL" "IGFX_BROADWELL"
) )

View File

@@ -5,26 +5,26 @@
# #
function(create_source_tree target directory) function(create_source_tree target directory)
if(WIN32) if(WIN32)
get_filename_component(directory ${directory} ABSOLUTE) get_filename_component(directory ${directory} ABSOLUTE)
get_target_property(source_list ${target} SOURCES) get_target_property(source_list ${target} SOURCES)
source_group(TREE ${directory} FILES ${source_list}) source_group(TREE ${directory} FILES ${source_list})
endif() endif()
endfunction() endfunction()
macro(add_subdirectoriesL0 curdir dirmask) macro(add_subdirectoriesL0 curdir dirmask)
file(GLOB children RELATIVE ${curdir} ${curdir}/${dirmask}) file(GLOB children RELATIVE ${curdir} ${curdir}/${dirmask})
set(dirlist "") set(dirlist "")
foreach(child ${children}) foreach(child ${children})
if(IS_DIRECTORY ${curdir}/${child}) if(IS_DIRECTORY ${curdir}/${child})
list(APPEND dirlist ${child}) list(APPEND dirlist ${child})
endif() endif()
endforeach() endforeach()
foreach(subdir ${dirlist}) foreach(subdir ${dirlist})
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/CMakeLists.txt) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/CMakeLists.txt)
add_subdirectory(${subdir}) add_subdirectory(${subdir})
endif() endif()
endforeach() endforeach()
endmacro() endmacro()

View File

@@ -79,32 +79,32 @@ set(L0_RUNTIME_SOURCES
) )
target_include_directories(${L0_STATIC_LIB_NAME} target_include_directories(${L0_STATIC_LIB_NAME}
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/ ${CMAKE_CURRENT_SOURCE_DIR}/
) )
target_include_directories(${TARGET_NAME_L0} target_include_directories(${TARGET_NAME_L0}
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/ ${CMAKE_CURRENT_SOURCE_DIR}/
) )
add_subdirectories() add_subdirectories()
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_RUNTIME_SOURCES} ${L0_RUNTIME_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
target_sources(${TARGET_NAME_L0} target_sources(${TARGET_NAME_L0}
PRIVATE PRIVATE
${L0_SRCS_DLL} ${L0_SRCS_DLL}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
if(UNIX) if(UNIX)
set_source_files_properties(${L0_RUNTIME_SOURCES} PROPERTIES COMPILE_FLAGS -Wall) set_source_files_properties(${L0_RUNTIME_SOURCES} PROPERTIES COMPILE_FLAGS -Wall)
endif() endif()
if(NOT DEFINED L0_DRIVER_VERSION) if(NOT DEFINED L0_DRIVER_VERSION)

View File

@@ -5,11 +5,11 @@
# #
set(L0_SRCS_COMPILER_INTERFACE set(L0_SRCS_COMPILER_INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/default_cache_config.cpp ${CMAKE_CURRENT_SOURCE_DIR}/default_cache_config.cpp
${CMAKE_CURRENT_SOURCE_DIR}/default_l0_cache_config.cpp ${CMAKE_CURRENT_SOURCE_DIR}/default_l0_cache_config.cpp
${CMAKE_CURRENT_SOURCE_DIR}/default_l0_cache_config.h ${CMAKE_CURRENT_SOURCE_DIR}/default_l0_cache_config.h
${CMAKE_CURRENT_SOURCE_DIR}/l0_reg_path.h ${CMAKE_CURRENT_SOURCE_DIR}/l0_reg_path.h
) )
set_property(GLOBAL PROPERTY L0_SRCS_COMPILER_INTERFACE ${L0_SRCS_COMPILER_INTERFACE}) set_property(GLOBAL PROPERTY L0_SRCS_COMPILER_INTERFACE ${L0_SRCS_COMPILER_INTERFACE})

View File

@@ -5,11 +5,11 @@
# #
set(L0_SRCS_DEBUGGER set(L0_SRCS_DEBUGGER
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/debugger_l0.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debugger_l0.cpp
${CMAKE_CURRENT_SOURCE_DIR}/debugger_l0.h ${CMAKE_CURRENT_SOURCE_DIR}/debugger_l0.h
${CMAKE_CURRENT_SOURCE_DIR}/debugger_l0.inl ${CMAKE_CURRENT_SOURCE_DIR}/debugger_l0.inl
) )
add_subdirectories() add_subdirectories()
set_property(GLOBAL PROPERTY L0_SRCS_DEBUGGER ${L0_SRCS_DEBUGGER}) set_property(GLOBAL PROPERTY L0_SRCS_DEBUGGER ${L0_SRCS_DEBUGGER})

View File

@@ -14,4 +14,4 @@ if(WIN32)
else() else()
append_sources_from_properties(L0_SRCS_DLL L0_SRCS_DLL_LINUX) append_sources_from_properties(L0_SRCS_DLL L0_SRCS_DLL_LINUX)
endif() endif()
set_property(GLOBAL PROPERTY L0_SRCS_DLL ${L0_SRCS_DLL}) set_property(GLOBAL PROPERTY L0_SRCS_DLL ${L0_SRCS_DLL})

View File

@@ -5,8 +5,8 @@
# #
set(L0_SRCS_DLL_LINUX set(L0_SRCS_DLL_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/debugger_l0_linux.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debugger_l0_linux.cpp
) )
set_property(GLOBAL PROPERTY L0_SRCS_DLL_LINUX ${L0_SRCS_DLL_LINUX}) set_property(GLOBAL PROPERTY L0_SRCS_DLL_LINUX ${L0_SRCS_DLL_LINUX})

View File

@@ -5,8 +5,8 @@
# #
set(L0_SRCS_DLL_WINDOWS set(L0_SRCS_DLL_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/debugger_l0_windows.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debugger_l0_windows.cpp
) )
set_property(GLOBAL PROPERTY L0_SRCS_DLL_WINDOWS ${L0_SRCS_DLL_WINDOWS}) set_property(GLOBAL PROPERTY L0_SRCS_DLL_WINDOWS ${L0_SRCS_DLL_WINDOWS})

View File

@@ -5,14 +5,14 @@
# #
if(SUPPORT_GEN11) if(SUPPORT_GEN11)
set(HW_SOURCES_GEN11 set(HW_SOURCES_GEN11
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_gen11.inl ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_gen11.inl
${CMAKE_CURRENT_SOURCE_DIR}/debugger_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debugger_gen11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/enable_family_full_l0_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/enable_family_full_l0_gen11.cpp
) )
add_subdirectories() add_subdirectories()
target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${HW_SOURCES_GEN11}) target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${HW_SOURCES_GEN11})
set_property(GLOBAL PROPERTY L0_HW_SOURCES_GEN11 ${HW_SOURCES_GEN11}) set_property(GLOBAL PROPERTY L0_HW_SOURCES_GEN11 ${HW_SOURCES_GEN11})
endif() endif()

View File

@@ -5,14 +5,14 @@
# #
if(SUPPORT_ICLLP) if(SUPPORT_ICLLP)
set(HW_SOURCES_GEN11 set(HW_SOURCES_GEN11
${HW_SOURCES_GEN11} ${HW_SOURCES_GEN11}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_icllp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_icllp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_icllp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_icllp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel_icllp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kernel_icllp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/image_icllp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/image_icllp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/sampler_icllp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sampler_icllp.cpp
PARENT_SCOPE PARENT_SCOPE
) )
endif() endif()

View File

@@ -5,16 +5,16 @@
# #
if(SUPPORT_GEN12LP) if(SUPPORT_GEN12LP)
set(HW_SOURCES_GEN12LP set(HW_SOURCES_GEN12LP
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_gen12lp.h ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_gen12lp.h
${CMAKE_CURRENT_SOURCE_DIR}/debugger_gen12lp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debugger_gen12lp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/cache_flush_gen12lp.inl ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/cache_flush_gen12lp.inl
${CMAKE_CURRENT_SOURCE_DIR}/enable_family_full_l0_gen12lp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/enable_family_full_l0_gen12lp.cpp
) )
add_subdirectories() add_subdirectories()
target_include_directories(${L0_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/) target_include_directories(${L0_STATIC_LIB_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/definitions${BRANCH_DIR_SUFFIX}/)
target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${HW_SOURCES_GEN12LP}) target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${HW_SOURCES_GEN12LP})
set_property(GLOBAL APPEND PROPERTY L0_HW_SOURCES_GEN12LP ${HW_SOURCES_GEN12LP}) set_property(GLOBAL APPEND PROPERTY L0_HW_SOURCES_GEN12LP ${HW_SOURCES_GEN12LP})
endif() endif()

View File

@@ -5,14 +5,14 @@
# #
if(SUPPORT_DG1) if(SUPPORT_DG1)
set(HW_SOURCES_GEN12LP set(HW_SOURCES_GEN12LP
${HW_SOURCES_GEN12LP} ${HW_SOURCES_GEN12LP}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_dg1.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_dg1.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_dg1.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_dg1.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel_dg1.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kernel_dg1.cpp
${CMAKE_CURRENT_SOURCE_DIR}/image_dg1.cpp ${CMAKE_CURRENT_SOURCE_DIR}/image_dg1.cpp
${CMAKE_CURRENT_SOURCE_DIR}/sampler_dg1.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sampler_dg1.cpp
PARENT_SCOPE PARENT_SCOPE
) )
endif() endif()

View File

@@ -5,14 +5,14 @@
# #
if(SUPPORT_TGLLP) if(SUPPORT_TGLLP)
set(HW_SOURCES_GEN12LP set(HW_SOURCES_GEN12LP
${HW_SOURCES_GEN12LP} ${HW_SOURCES_GEN12LP}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_tgllp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_tgllp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_tgllp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_tgllp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel_tgllp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kernel_tgllp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/image_tgllp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/image_tgllp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/sampler_tgllp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tgllp.cpp
PARENT_SCOPE PARENT_SCOPE
) )
endif() endif()

View File

@@ -5,12 +5,12 @@
# #
if(SUPPORT_GEN8) if(SUPPORT_GEN8)
set(HW_SOURCES_GEN8 set(HW_SOURCES_GEN8
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/debugger_gen8.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debugger_gen8.cpp
${CMAKE_CURRENT_SOURCE_DIR}/enable_family_full_l0_gen8.cpp ${CMAKE_CURRENT_SOURCE_DIR}/enable_family_full_l0_gen8.cpp
) )
target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${HW_SOURCES_GEN8}) target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${HW_SOURCES_GEN8})
set_property(GLOBAL PROPERTY L0_HW_SOURCES_GEN8 ${HW_SOURCES_GEN8}) set_property(GLOBAL PROPERTY L0_HW_SOURCES_GEN8 ${HW_SOURCES_GEN8})
endif() endif()

View File

@@ -5,15 +5,15 @@
# #
if(SUPPORT_GEN9) if(SUPPORT_GEN9)
set(HW_SOURCES_GEN9 set(HW_SOURCES_GEN9
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_gen9.inl ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_gen9.inl
${CMAKE_CURRENT_SOURCE_DIR}/debugger_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/debugger_gen9.cpp
${CMAKE_CURRENT_SOURCE_DIR}/enable_family_full_l0_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/enable_family_full_l0_gen9.cpp
) )
add_subdirectories() add_subdirectories()
target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${HW_SOURCES_GEN9}) target_sources(${L0_STATIC_LIB_NAME} PRIVATE ${HW_SOURCES_GEN9})
set_property(GLOBAL PROPERTY L0_HW_SOURCES_GEN9 ${HW_SOURCES_GEN9}) set_property(GLOBAL PROPERTY L0_HW_SOURCES_GEN9 ${HW_SOURCES_GEN9})
endif() endif()

View File

@@ -5,14 +5,14 @@
# #
if(SUPPORT_CFL) if(SUPPORT_CFL)
set(HW_SOURCES_GEN9 set(HW_SOURCES_GEN9
${HW_SOURCES_GEN9} ${HW_SOURCES_GEN9}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_cfl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_cfl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_cfl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_cfl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel_cfl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kernel_cfl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/image_cfl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/image_cfl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/sampler_cfl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sampler_cfl.cpp
PARENT_SCOPE PARENT_SCOPE
) )
endif() endif()

View File

@@ -5,14 +5,14 @@
# #
if(SUPPORT_GLK) if(SUPPORT_GLK)
set(HW_SOURCES_GEN9 set(HW_SOURCES_GEN9
${HW_SOURCES_GEN9} ${HW_SOURCES_GEN9}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_glk.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_glk.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_glk.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_glk.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel_glk.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kernel_glk.cpp
${CMAKE_CURRENT_SOURCE_DIR}/image_glk.cpp ${CMAKE_CURRENT_SOURCE_DIR}/image_glk.cpp
${CMAKE_CURRENT_SOURCE_DIR}/sampler_glk.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sampler_glk.cpp
PARENT_SCOPE PARENT_SCOPE
) )
endif() endif()

View File

@@ -5,14 +5,14 @@
# #
if(SUPPORT_KBL) if(SUPPORT_KBL)
set(HW_SOURCES_GEN9 set(HW_SOURCES_GEN9
${HW_SOURCES_GEN9} ${HW_SOURCES_GEN9}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_kbl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_kbl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_kbl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_kbl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel_kbl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kernel_kbl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/image_kbl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/image_kbl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/sampler_kbl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sampler_kbl.cpp
PARENT_SCOPE PARENT_SCOPE
) )
endif() endif()

View File

@@ -5,14 +5,14 @@
# #
if(SUPPORT_SKL) if(SUPPORT_SKL)
set(HW_SOURCES_GEN9 set(HW_SOURCES_GEN9
${HW_SOURCES_GEN9} ${HW_SOURCES_GEN9}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_skl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cmdlist_skl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_skl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cmdqueue_skl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/kernel_skl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kernel_skl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/image_skl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/image_skl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/sampler_skl.cpp ${CMAKE_CURRENT_SOURCE_DIR}/sampler_skl.cpp
PARENT_SCOPE PARENT_SCOPE
) )
endif() endif()

View File

@@ -5,10 +5,10 @@
# #
if(UNIX) if(UNIX)
set(L0_SOURCES_LINUX set(L0_SOURCES_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/registry_path.cpp ${CMAKE_CURRENT_SOURCE_DIR}/registry_path.cpp
${CMAKE_CURRENT_SOURCE_DIR}/driver_teardown.cpp ${CMAKE_CURRENT_SOURCE_DIR}/driver_teardown.cpp
) )
set_property(GLOBAL PROPERTY L0_SOURCES_LINUX ${L0_SOURCES_LINUX}) set_property(GLOBAL PROPERTY L0_SOURCES_LINUX ${L0_SOURCES_LINUX})
endif() endif()

View File

@@ -5,10 +5,10 @@
# #
if(WIN32) if(WIN32)
set(L0_SOURCES_WINDOWS set(L0_SOURCES_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/registry_path.cpp ${CMAKE_CURRENT_SOURCE_DIR}/registry_path.cpp
${CMAKE_CURRENT_SOURCE_DIR}/driver_teardown.cpp ${CMAKE_CURRENT_SOURCE_DIR}/driver_teardown.cpp
) )
set_property(GLOBAL PROPERTY L0_SOURCES_WINDOWS ${L0_SOURCES_WINDOWS}) set_property(GLOBAL PROPERTY L0_SOURCES_WINDOWS ${L0_SOURCES_WINDOWS})
endif() endif()

View File

@@ -5,5 +5,5 @@
# #
if(NOT SKIP_L0_UNIT_TESTS) if(NOT SKIP_L0_UNIT_TESTS)
add_subdirectories() add_subdirectories()
endif() endif()

View File

@@ -5,32 +5,33 @@
# #
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set(L0_BLACK_BOX_TEST_PROJECT_FOLDER "ze_intel_gpu/black_box_tests") set(L0_BLACK_BOX_TEST_PROJECT_FOLDER "ze_intel_gpu/black_box_tests")
set(TEST_TARGETS set(TEST_TARGETS
zello_world zello_world
zello_timestamp) zello_timestamp
)
foreach (TEST_NAME ${TEST_TARGETS}) foreach(TEST_NAME ${TEST_TARGETS})
add_executable(${TEST_NAME} ${TEST_NAME}.cpp) add_executable(${TEST_NAME} ${TEST_NAME}.cpp)
set_target_properties(${TEST_NAME} set_target_properties(${TEST_NAME}
PROPERTIES PROPERTIES
VS_DEBUGGER_COMMAND "$(TargetPath)" VS_DEBUGGER_COMMAND "$(TargetPath)"
VS_DEBUGGER_COMMAND_ARGUMENTS "" VS_DEBUGGER_COMMAND_ARGUMENTS ""
VS_DEBUGGER_WORKING_DIRECTORY "$(OutputPath)" VS_DEBUGGER_WORKING_DIRECTORY "$(OutputPath)"
) )
if(MSVC) if(MSVC)
add_dependencies(${TEST_NAME} ${TARGET_NAME_L0}) add_dependencies(${TEST_NAME} ${TARGET_NAME_L0})
target_link_libraries(${TEST_NAME} PUBLIC ${TARGET_NAME_L0}) target_link_libraries(${TEST_NAME} PUBLIC ${TARGET_NAME_L0})
else() else()
if(BUILD_LEVEL_ZERO_LOADER) if(BUILD_LEVEL_ZERO_LOADER)
add_dependencies(${TEST_NAME} ze_loader) add_dependencies(${TEST_NAME} ze_loader)
target_link_libraries(${TEST_NAME} ${NEO_BINARY_DIR}/lib/libze_loader.so) target_link_libraries(${TEST_NAME} ${NEO_BINARY_DIR}/lib/libze_loader.so)
else() else()
set_target_properties(${TEST_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE) set_target_properties(${TEST_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE)
endif() endif()
endif() endif()
set_target_properties(${TEST_NAME} PROPERTIES FOLDER ${L0_BLACK_BOX_TEST_PROJECT_FOLDER}) set_target_properties(${TEST_NAME} PROPERTIES FOLDER ${L0_BLACK_BOX_TEST_PROJECT_FOLDER})
endforeach() endforeach()
endif() endif()

View File

@@ -13,55 +13,55 @@ include(gen_kernel.cmake)
append_sources_from_properties(L0_CORE_ENABLERS NEO_CORE_SRCS_LINK) append_sources_from_properties(L0_CORE_ENABLERS NEO_CORE_SRCS_LINK)
function(ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION) function(ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION)
set(L0_TESTED_PRODUCT_FAMILIES ${ALL_TESTED_PRODUCT_FAMILY}) set(L0_TESTED_PRODUCT_FAMILIES ${ALL_TESTED_PRODUCT_FAMILY})
string(REPLACE ";" "," L0_TESTED_PRODUCT_FAMILIES "${L0_TESTED_PRODUCT_FAMILIES}") string(REPLACE ";" "," L0_TESTED_PRODUCT_FAMILIES "${L0_TESTED_PRODUCT_FAMILIES}")
add_definitions(-DSUPPORTED_TEST_PRODUCT_FAMILIES=${L0_TESTED_PRODUCT_FAMILIES}) add_definitions(-DSUPPORTED_TEST_PRODUCT_FAMILIES=${L0_TESTED_PRODUCT_FAMILIES})
endfunction() endfunction()
ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION() ADD_SUPPORTED_TEST_PRODUCT_FAMILIES_DEFINITION()
add_executable(${TARGET_NAME} add_executable(${TARGET_NAME}
${NEO_SOURCE_DIR}/level_zero/core/source/dll/disallow_deferred_deleter.cpp ${NEO_SOURCE_DIR}/level_zero/core/source/dll/disallow_deferred_deleter.cpp
${NEO_SOURCE_DIR}/shared/test/unit_test/helpers/memory_management.h ${NEO_SOURCE_DIR}/shared/test/unit_test/helpers/memory_management.h
${NEO_SOURCE_DIR}/shared/test/unit_test/helpers/memory_management.cpp ${NEO_SOURCE_DIR}/shared/test/unit_test/helpers/memory_management.cpp
${NEO_SOURCE_DIR}/shared/test/unit_test/helpers/memory_leak_listener.h ${NEO_SOURCE_DIR}/shared/test/unit_test/helpers/memory_leak_listener.h
${NEO_SOURCE_DIR}/shared/test/unit_test/helpers/memory_leak_listener.cpp ${NEO_SOURCE_DIR}/shared/test/unit_test/helpers/memory_leak_listener.cpp
${L0_CORE_ENABLERS} ${L0_CORE_ENABLERS}
) )
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_LIST_DIR}/gen_kernel.cmake ${CMAKE_CURRENT_LIST_DIR}/gen_kernel.cmake
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mock.h ${CMAKE_CURRENT_SOURCE_DIR}/mock.h
${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h ${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
${CMAKE_CURRENT_SOURCE_DIR}/ult_configuration.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ult_configuration.cpp
${CMAKE_CURRENT_SOURCE_DIR}/white_box.h ${CMAKE_CURRENT_SOURCE_DIR}/white_box.h
${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h ${NEO_SHARED_TEST_DIRECTORY}/unit_test/tests_configuration.h
) )
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/create_command_stream.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/create_command_stream.cpp
${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/io_functions.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/libult/io_functions.cpp
$<TARGET_OBJECTS:${L0_MOCKABLE_LIB_NAME}> $<TARGET_OBJECTS:${L0_MOCKABLE_LIB_NAME}>
) )
if (UNIX) if(UNIX)
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp
${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/drm_neo_create.cpp
${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/options.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/options.cpp
${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/linux/sys_calls_linux_ult.cpp
) )
else() else()
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/create_wddm_memory_manager.cpp
${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/options.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/options.cpp
${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/sys_calls.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/sys_calls.cpp
${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/ult_dxgi_factory.cpp
${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_calls.cpp
${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/os_interface/windows/wddm_create.cpp
) )
endif() endif()
set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS}) set_property(TARGET ${TARGET_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS ${ASAN_FLAGS})
@@ -72,54 +72,54 @@ add_subdirectoriesL0(${CMAKE_CURRENT_SOURCE_DIR} "*")
target_compile_definitions(${TARGET_NAME} PRIVATE $<TARGET_PROPERTY:${L0_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>) target_compile_definitions(${TARGET_NAME} PRIVATE $<TARGET_PROPERTY:${L0_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
target_include_directories(${TARGET_NAME} target_include_directories(${TARGET_NAME}
BEFORE BEFORE
PRIVATE PRIVATE
$<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/core $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/core
$<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/tools $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/tools
$<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/../../../../instrumentation/inc/common/instrumentation/api/ $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/../../../../instrumentation/inc/common/instrumentation/api/
$<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/core/os_interface $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/core/os_interface
${NEO_SHARED_TEST_DIRECTORY}/unit_test/test_macros/header${BRANCH_DIR_SUFFIX} ${NEO_SHARED_TEST_DIRECTORY}/unit_test/test_macros/header${BRANCH_DIR_SUFFIX}
) )
if (UNIX) if(UNIX)
target_include_directories(${TARGET_NAME} target_include_directories(${TARGET_NAME}
BEFORE BEFORE
PRIVATE PRIVATE
$<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/core/os_interface/linux $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/core/os_interface/linux
$<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/tools/linux $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/tools/linux
${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/linux ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/linux
) )
else() else()
target_include_directories(${TARGET_NAME} target_include_directories(${TARGET_NAME}
BEFORE BEFORE
PRIVATE PRIVATE
$<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/core/os_interface/windows $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/core/os_interface/windows
$<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/tools/windows $<TARGET_PROPERTY:${TARGET_NAME_L0},SOURCE_DIR>/tools/windows
${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/windows ${COMPUTE_RUNTIME_DIR}/opencl/test/unit_test/windows
) )
endif() endif()
if (UNIX) if(UNIX)
target_link_libraries(${TARGET_NAME} pthread rt) target_link_libraries(${TARGET_NAME} pthread rt)
else() else()
target_link_libraries(${TARGET_NAME} dbghelp) target_link_libraries(${TARGET_NAME} dbghelp)
endif() endif()
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE} ${NEO_STATICALLY_LINKED_LIBRARIES_MOCKABLE}
compute_runtime_mockable_extra compute_runtime_mockable_extra
${HW_LIBS_ULT} ${HW_LIBS_ULT}
gmock-gtest gmock-gtest
) )
if(SKIP_NEO_UNIT_TESTS) if(SKIP_NEO_UNIT_TESTS)
add_subdirectory(${NEO_SOURCE_DIR}/opencl/test/unit_test/mock_gmm ${CMAKE_BINARY_DIR}/mock_gmm) add_subdirectory(${NEO_SOURCE_DIR}/opencl/test/unit_test/mock_gmm ${CMAKE_BINARY_DIR}/mock_gmm)
endif() endif()
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
$<TARGET_OBJECTS:mock_gmm> $<TARGET_OBJECTS:mock_gmm>
$<TARGET_OBJECTS:${TARGET_NAME_L0}_mocks> $<TARGET_OBJECTS:${TARGET_NAME_L0}_mocks>
$<TARGET_OBJECTS:${BUILTINS_BINARIES_LIB_NAME}> $<TARGET_OBJECTS:${BUILTINS_BINARIES_LIB_NAME}>
) )
set(TEST_MODULES set(TEST_MODULES
@@ -153,14 +153,14 @@ else()
endif() endif()
if(MSVC) if(MSVC)
set_target_properties(${TARGET_NAME} set_target_properties(${TARGET_NAME}
PROPERTIES PROPERTIES
VS_DEBUGGER_COMMAND_ARGUMENTS "${L0_TESTS_FILTER_OPTION} --gtest_catch_exceptions=0 ${L0_TESTS_LISTENER_OPTION}" VS_DEBUGGER_COMMAND_ARGUMENTS "${L0_TESTS_FILTER_OPTION} --gtest_catch_exceptions=0 ${L0_TESTS_LISTENER_OPTION}"
VS_DEBUGGER_WORKING_DIRECTORY "$(OutDir)" VS_DEBUGGER_WORKING_DIRECTORY "$(OutDir)"
) )
set(RUN_ULT_CMD $<TARGET_FILE:${TARGET_NAME}>) set(RUN_ULT_CMD $<TARGET_FILE:${TARGET_NAME}>)
else() else()
set(RUN_ULT_CMD LD_LIBRARY_PATH=$<TARGET_FILE_DIR:${TARGET_NAME}> $<TARGET_FILE:${TARGET_NAME}>) set(RUN_ULT_CMD LD_LIBRARY_PATH=$<TARGET_FILE_DIR:${TARGET_NAME}> $<TARGET_FILE:${TARGET_NAME}>)
endif() endif()
create_source_tree(${TARGET_NAME} ${L0_ROOT_DIR}/..) create_source_tree(${TARGET_NAME} ${L0_ROOT_DIR}/..)

View File

@@ -17,10 +17,10 @@ set(L0_FIXTURES_SOURCES
add_library(${TARGET_NAME} OBJECT ${L0_FIXTURES_SOURCES}) add_library(${TARGET_NAME} OBJECT ${L0_FIXTURES_SOURCES})
target_include_directories(${TARGET_NAME} PRIVATE target_include_directories(${TARGET_NAME} PRIVATE
$<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:${L0_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:${L0_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>
${NEO_SOURCE_DIR}/level_zero/core/test/unit_test ${NEO_SOURCE_DIR}/level_zero/core/test/unit_test
) )
target_compile_definitions(${TARGET_NAME} PRIVATE $<TARGET_PROPERTY:${L0_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>) target_compile_definitions(${TARGET_NAME} PRIVATE $<TARGET_PROPERTY:${L0_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)

View File

@@ -6,9 +6,9 @@
if(TESTS_GEN11) if(TESTS_GEN11)
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${COMPUTE_RUNTIME_ULT_GEN11} ${COMPUTE_RUNTIME_ULT_GEN11}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/enable_l0_mocks_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/enable_l0_mocks_gen11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_cmdqueue_thread_arbitration_policy_gen11.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdqueue_thread_arbitration_policy_gen11.cpp
) )
endif() endif()

View File

@@ -6,11 +6,11 @@
if(TESTS_GEN12LP) if(TESTS_GEN12LP)
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${COMPUTE_RUNTIME_ULT_GEN12LP} ${COMPUTE_RUNTIME_ULT_GEN12LP}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/enable_l0_mocks_gen12lp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/enable_l0_mocks_gen12lp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_device_gen12lp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_device_gen12lp.cpp
) )
target_include_directories(${TARGET_NAME} PRIVATE ${COMPUTE_RUNTIME_DIR}/level_zero/core/source/gen12lp/definitions${BRANCH_DIR_SUFFIX}/) target_include_directories(${TARGET_NAME} PRIVATE ${COMPUTE_RUNTIME_DIR}/level_zero/core/source/gen12lp/definitions${BRANCH_DIR_SUFFIX}/)
endif() endif()

View File

@@ -6,7 +6,7 @@
if(TESTS_GEN8) if(TESTS_GEN8)
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${COMPUTE_RUNTIME_ULT_GEN8} ${COMPUTE_RUNTIME_ULT_GEN8}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
endif() endif()

View File

@@ -6,11 +6,11 @@
if(TESTS_GEN9) if(TESTS_GEN9)
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${COMPUTE_RUNTIME_ULT_GEN9} ${COMPUTE_RUNTIME_ULT_GEN9}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/enable_l0_mocks_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/enable_l0_mocks_gen9.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_append_launch_kernel_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_append_launch_kernel_gen9.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_cmdqueue_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdqueue_gen9.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_device_gen9.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_device_gen9.cpp
) )
endif() endif()

View File

@@ -28,16 +28,16 @@ function(level_zero_gen_kernels target platform_name suffix options)
set(outputpath_base "${outputdir}${basename}_${suffix}") set(outputpath_base "${outputdir}${basename}_${suffix}")
set(output_files set(output_files
${outputpath_base}.bin ${outputpath_base}.bin
${outputpath_base}.gen ${outputpath_base}.gen
) )
add_custom_command( add_custom_command(
COMMAND echo generate ${cloc_cmd_prefix} -q -file ${filename} -device ${platform_name} -out_dir ${outputdir} -options "${options}" COMMAND echo generate ${cloc_cmd_prefix} -q -file ${filename} -device ${platform_name} -out_dir ${outputdir} -options "${options}"
OUTPUT ${output_files} OUTPUT ${output_files}
COMMAND ${cloc_cmd_prefix} -q -file ${filename} -device ${platform_name} -out_dir ${outputdir} -options "${options}" COMMAND ${cloc_cmd_prefix} -q -file ${filename} -device ${platform_name} -out_dir ${outputdir} -options "${options}"
WORKING_DIRECTORY ${workdir} WORKING_DIRECTORY ${workdir}
DEPENDS ${filepath} ocloc DEPENDS ${filepath} ocloc
) )
list(APPEND results ${output_files}) list(APPEND results ${output_files})

View File

@@ -36,10 +36,10 @@ set(L0_MOCKS_SOURCES
add_library(${TARGET_NAME} OBJECT ${L0_MOCKS_SOURCES}) add_library(${TARGET_NAME} OBJECT ${L0_MOCKS_SOURCES})
target_include_directories(${TARGET_NAME} PRIVATE target_include_directories(${TARGET_NAME} PRIVATE
$<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:${L0_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:${L0_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:${NEO_SHARED_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>
${NEO_SOURCE_DIR}/level_zero/core/test/unit_test ${NEO_SOURCE_DIR}/level_zero/core/test/unit_test
) )
target_compile_definitions(${TARGET_NAME} PUBLIC $<TARGET_PROPERTY:${L0_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>) target_compile_definitions(${TARGET_NAME} PUBLIC $<TARGET_PROPERTY:${L0_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)

View File

@@ -5,8 +5,8 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_test.cpp ${CMAKE_CURRENT_SOURCE_DIR}/deferred_deleter_test.cpp
) )
add_subdirectories() add_subdirectories()

View File

@@ -5,6 +5,6 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/builtin_functions_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/builtin_functions_tests.cpp
) )

View File

@@ -5,15 +5,15 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_1.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_1.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_2.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_2.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_api.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_api.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_append_barrier.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_append_barrier.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_append_event_reset.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_append_event_reset.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_append_launch_kernel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_append_launch_kernel.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_append_signal_event.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_append_signal_event.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_append_wait_on_events.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_append_wait_on_events.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_blit.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdlist_blit.cpp
) )
add_subdirectories() add_subdirectories()

View File

@@ -5,6 +5,6 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_cmdqueue.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_cmdqueue.cpp
) )

View File

@@ -5,6 +5,6 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_context.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_context.cpp
) )

View File

@@ -5,12 +5,12 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/active_debugger_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/active_debugger_fixture.h
${CMAKE_CURRENT_SOURCE_DIR}/l0_debugger_fixture.h ${CMAKE_CURRENT_SOURCE_DIR}/l0_debugger_fixture.h
${CMAKE_CURRENT_SOURCE_DIR}/test_source_level_debugger.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_source_level_debugger.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_l0_debugger.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_l0_debugger.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_module_with_debug.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_module_with_debug.cpp
) )
add_subdirectories() add_subdirectories()

View File

@@ -5,8 +5,8 @@
# #
if(UNIX) if(UNIX)
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_l0_debugger_linux.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_l0_debugger_linux.cpp
) )
endif() endif()

View File

@@ -5,6 +5,6 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_device.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_device.cpp
) )

View File

@@ -5,6 +5,6 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_driver.cpp
) )

View File

@@ -5,6 +5,6 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_event.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_event.cpp
) )

View File

@@ -5,6 +5,6 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_fence.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_fence.cpp
) )

View File

@@ -5,6 +5,6 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_image.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_image.cpp
) )

View File

@@ -5,6 +5,6 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_kernel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_kernel.cpp
) )

View File

@@ -5,6 +5,6 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_memory.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_memory.cpp
) )

View File

@@ -5,6 +5,6 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_module.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_module.cpp
) )

View File

@@ -5,6 +5,6 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_printf_handler.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_printf_handler.cpp
) )

View File

@@ -5,6 +5,6 @@
# #
target_sources(${TARGET_NAME} PRIVATE target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_sampler.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_sampler.cpp
) )

View File

@@ -7,17 +7,17 @@
add_subdirectory(tracing) add_subdirectory(tracing)
set(L0_EXPERIMENTAL_SOURCES set(L0_EXPERIMENTAL_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/experimental.cpp ${CMAKE_CURRENT_SOURCE_DIR}/experimental.cpp
) )
target_include_directories(${L0_STATIC_LIB_NAME} target_include_directories(${L0_STATIC_LIB_NAME}
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/ ${CMAKE_CURRENT_SOURCE_DIR}/
) )
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_EXPERIMENTAL_SOURCES} ${L0_EXPERIMENTAL_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -5,43 +5,43 @@
# #
set(L0_SRCS_EXPERIMENTAL_TRACING set(L0_SRCS_EXPERIMENTAL_TRACING
${CMAKE_CURRENT_SOURCE_DIR}/tracing.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing.h
${CMAKE_CURRENT_SOURCE_DIR}/tracing_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/tracing_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tracing_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tracing_barrier_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_barrier_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/tracing_barrier_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tracing_barrier_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tracing_cmdlist_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tracing_cmdlist_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tracing_cmdlist_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_cmdlist_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/tracing_cmdqueue_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tracing_cmdqueue_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tracing_cmdqueue_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_cmdqueue_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/tracing_copy_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tracing_copy_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tracing_copy_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_copy_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/tracing_device_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tracing_device_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tracing_device_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_device_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/tracing_driver_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tracing_driver_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tracing_driver_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_driver_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/tracing_event_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tracing_event_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tracing_event_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_event_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/tracing_fence_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tracing_fence_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tracing_fence_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_fence_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/tracing_global_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tracing_global_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tracing_global_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_global_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/tracing_sampler_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tracing_sampler_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tracing_sampler_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_sampler_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/tracing_residency_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tracing_residency_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tracing_residency_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_residency_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/tracing_image_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tracing_image_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tracing_image_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_image_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/tracing_memory_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tracing_memory_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tracing_memory_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_memory_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/tracing_module_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tracing_module_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tracing_module_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/tracing_module_imp.h
) )
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_EXPERIMENTAL_TRACING} ${L0_SRCS_EXPERIMENTAL_TRACING}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -5,135 +5,132 @@
# #
if(NOT DEFINED _os_release_info) if(NOT DEFINED _os_release_info)
set(_os_release_info TRUE) set(_os_release_info TRUE)
# os_release_info.cmake - Function to dump OS name and version
# os_release_info.cmake - Function to dump OS name and version # This file has no dependencies on other files (e.g., functions or definitions)
# of the local cmake environment.
# This file has no dependencies on other files (e.g., functions or definitions) # Set cmake policies for at least this level:
# of the local cmake environment. cmake_minimum_required(VERSION 3.2.0)
# Set cmake policies for at least this level: # Function get_os_release_info - Determine and return OS name and version
cmake_minimum_required(VERSION 3.2.0) #
# Args:
# 1. the name of a variable to receive os_name
# 2. the name of a variable to receive os_version
#
# Return values: (Quotation marks are always stripped).
# Upon failure, return values are null strings.
#
# Examples:
# os_name os_version
# -------------- -------
# clear-linux-os 21180 (Changes twice daily)
# ubuntu 12.04 16.04 17.10 18.04
# fedora 27
# centos 6.9 7.4.1708
#
# Potential sources are tried (in order of preference) until a
# suitable one is found.
# Implementation documentation:
#
# The potential sources, in order, are as follows.
# - /etc/centos-release
# Centos 7 also has /etc/os-release. File /etc/os-release is less
# precise about the Centos version (e.g., "7" instead of "7.4.1708").
# For that reason, this file is checked first.
# Examples:
# CentOS release 6.9 (Final)
# CentOS Linux release 7.4.1708 (Core)
# - /usr/lib/os-release
# Present for Clear Linux, modern Fedora, and Ubuntu since some time
# between 14.04 and 16.04. The ID and VERSION_ID values are used.
# Examples:
# ID=clear-linux-os VERSION_ID=21180
# ID=fedora VERSION_ID=27
# ID=ubuntu VERSION_ID="14.04"
# ID=ubuntu VERSION_ID="16.04"
# ID="ubuntu" VERSION_ID="17.10"
# - /etc/os-release - Same form as (sometimes a link to) /usr/lib/os-release
# ID="Ubuntu" VERSION_ID="12.04"
# ID="Ubuntu" VERSION_ID="14.04"
# with a symbolic link: /etc/os-release -> ../usr/lib/os-release
# ID="CentOS Linux" VERSION_ID="7" Also: ID_LIKE="rhel fedora"
# - /etc/lsb-release
# For Centos, not too meaningful.
# Other "OS"s are more reasonable:
# DISTRIB_ID=Ubuntu DISTRIB_RELEASE=12.04
# DISTRIB_ID=Ubuntu DISTRIB_RELEASE=14.04
# DISTRIB_ID=Ubuntu DISTRIB_RELEASE=17.10
# Function get_os_release_info - Determine and return OS name and version function(get_os_release_info _vn_id _vn_version_id _vn_codename)
#
# Args:
# 1. the name of a variable to receive os_name
# 2. the name of a variable to receive os_version
#
# Return values: (Quotation marks are always stripped).
# Upon failure, return values are null strings.
#
# Examples:
# os_name os_version
# -------------- -------
# clear-linux-os 21180 (Changes twice daily)
# ubuntu 12.04 16.04 17.10 18.04
# fedora 27
# centos 6.9 7.4.1708
#
# Potential sources are tried (in order of preference) until a
# suitable one is found.
# Implementation documentation:
#
# The potential sources, in order, are as follows.
# - /etc/centos-release
# Centos 7 also has /etc/os-release. File /etc/os-release is less
# precise about the Centos version (e.g., "7" instead of "7.4.1708").
# For that reason, this file is checked first.
# Examples:
# CentOS release 6.9 (Final)
# CentOS Linux release 7.4.1708 (Core)
# - /usr/lib/os-release
# Present for Clear Linux, modern Fedora, and Ubuntu since some time
# between 14.04 and 16.04. The ID and VERSION_ID values are used.
# Examples:
# ID=clear-linux-os VERSION_ID=21180
# ID=fedora VERSION_ID=27
# ID=ubuntu VERSION_ID="14.04"
# ID=ubuntu VERSION_ID="16.04"
# ID="ubuntu" VERSION_ID="17.10"
# - /etc/os-release - Same form as (sometimes a link to) /usr/lib/os-release
# ID="Ubuntu" VERSION_ID="12.04"
# ID="Ubuntu" VERSION_ID="14.04"
# with a symbolic link: /etc/os-release -> ../usr/lib/os-release
# ID="CentOS Linux" VERSION_ID="7" Also: ID_LIKE="rhel fedora"
# - /etc/lsb-release
# For Centos, not too meaningful.
# Other "OS"s are more reasonable:
# DISTRIB_ID=Ubuntu DISTRIB_RELEASE=12.04
# DISTRIB_ID=Ubuntu DISTRIB_RELEASE=14.04
# DISTRIB_ID=Ubuntu DISTRIB_RELEASE=17.10
function(get_os_release_info _vn_id _vn_version_id _vn_codename)
set(_var_id "") set(_var_id "")
set(_var_version_id "") set(_var_version_id "")
set(_var_codename "") set(_var_codename "")
if("${_var_id}" STREQUAL "") if("${_var_id}" STREQUAL "")
set(file_path "/etc/centos-release") set(file_path "/etc/centos-release")
if(EXISTS "${file_path}") if(EXISTS "${file_path}")
# Example: CentOS release 6.9 (Final) # Example: CentOS release 6.9 (Final)
file(STRINGS "${file_path}" file_list LIMIT_COUNT 1) file(STRINGS "${file_path}" file_list LIMIT_COUNT 1)
list(GET file_list 0 file_line) list(GET file_list 0 file_line)
# Remove all parenthesized items. # Remove all parenthesized items.
string(REGEX REPLACE "\\([^)]+\\)" "" file_line "${file_line}") string(REGEX REPLACE "\\([^)]+\\)" "" file_line "${file_line}")
# Extract start and end, discard optional "version" or "release" # Extract start and end, discard optional "version" or "release"
string(REGEX MATCH "^([A-Za-z0-9_]+)( +(version|release))? +(.*)$" _dummy "${file_line}") string(REGEX MATCH "^([A-Za-z0-9_]+)( +(version|release))? +(.*)$" _dummy "${file_line}")
# 1 2 3 4 # 1 2 3 4
set(_var_id "${CMAKE_MATCH_1}") set(_var_id "${CMAKE_MATCH_1}")
set(_var_version_id "${CMAKE_MATCH_4}") set(_var_version_id "${CMAKE_MATCH_4}")
endif() endif()
endif() endif()
if("${_var_id}" STREQUAL "") if("${_var_id}" STREQUAL "")
if(EXISTS "/usr/lib/os-release") if(EXISTS "/usr/lib/os-release")
set(file_path "/usr/lib/os-release") set(file_path "/usr/lib/os-release")
elseif(EXISTS "/etc/os-release") elseif(EXISTS "/etc/os-release")
set(file_path "/etc/os-release") set(file_path "/etc/os-release")
else() else()
set(file_path "") set(file_path "")
endif() endif()
if(NOT "${file_path}" STREQUAL "") if(NOT "${file_path}" STREQUAL "")
file(STRINGS "${file_path}" data_list REGEX "^(ID|VERSION_ID|VERSION_CODENAME)=") file(STRINGS "${file_path}" data_list REGEX "^(ID|VERSION_ID|VERSION_CODENAME)=")
# Look for lines like "ID="..." and VERSION_ID="..." # Look for lines like "ID="..." and VERSION_ID="..."
foreach(_var ${data_list}) foreach(_var ${data_list})
if("${_var}" MATCHES "^(ID)=(.*)$") if("${_var}" MATCHES "^(ID)=(.*)$")
set(_var_id "${CMAKE_MATCH_2}") set(_var_id "${CMAKE_MATCH_2}")
elseif("${_var}" MATCHES "^(VERSION_ID)=(.*)$") elseif("${_var}" MATCHES "^(VERSION_ID)=(.*)$")
set(_var_version_id "${CMAKE_MATCH_2}") set(_var_version_id "${CMAKE_MATCH_2}")
elseif("${_var}" MATCHES "^(VERSION_CODENAME)=(.*)$") elseif("${_var}" MATCHES "^(VERSION_CODENAME)=(.*)$")
set(_var_codename "${CMAKE_MATCH_2}") set(_var_codename "${CMAKE_MATCH_2}")
endif() endif()
endforeach() endforeach()
endif() endif()
endif() endif()
if("${_var_id}" STREQUAL "") if("${_var_id}" STREQUAL "")
set(file_path "/etc/lsb-release") set(file_path "/etc/lsb-release")
if(EXISTS "${file_path}") if(EXISTS "${file_path}")
file(STRINGS "${file_path}" data_list REGEX "^(DISTRIB_ID|DISTRIB_RELEASE|DISTRIB_CODENAME)=") file(STRINGS "${file_path}" data_list REGEX "^(DISTRIB_ID|DISTRIB_RELEASE|DISTRIB_CODENAME)=")
# Look for lines like "DISTRIB_ID="..." and DISTRIB_RELEASE="..." # Look for lines like "DISTRIB_ID="..." and DISTRIB_RELEASE="..."
foreach(_var ${data_list}) foreach(_var ${data_list})
if("${_var}" MATCHES "^(DISTRIB_ID)=(.*)$") if("${_var}" MATCHES "^(DISTRIB_ID)=(.*)$")
set(_var_id "${CMAKE_MATCH_2}") set(_var_id "${CMAKE_MATCH_2}")
elseif("${_var}" MATCHES "^(DISTRIB_RELEASE)=(.*)$") elseif("${_var}" MATCHES "^(DISTRIB_RELEASE)=(.*)$")
set(_var_version_id "${CMAKE_MATCH_2}") set(_var_version_id "${CMAKE_MATCH_2}")
elseif("${_var}" MATCHES "^(DISTRIB_CODENAME)=(.*)$") elseif("${_var}" MATCHES "^(DISTRIB_CODENAME)=(.*)$")
set(_var_codename "${CMAKE_MATCH_2}") set(_var_codename "${CMAKE_MATCH_2}")
endif() endif()
endforeach() endforeach()
endif() endif()
endif() endif()
string(TOLOWER "${_var_id}" "_var_id") string(TOLOWER "${_var_id}" "_var_id")
@@ -148,17 +145,16 @@ function(get_os_release_info _vn_id _vn_version_id _vn_codename)
string(REGEX REPLACE "^\"(.*)\"$" "\\1" _var_codename "${_var_codename}") string(REGEX REPLACE "^\"(.*)\"$" "\\1" _var_codename "${_var_codename}")
if(NOT "${_vn_id}" STREQUAL "") if(NOT "${_vn_id}" STREQUAL "")
set(${_vn_id} "${_var_id}" PARENT_SCOPE) set(${_vn_id} "${_var_id}" PARENT_SCOPE)
endif() endif()
if(NOT "${_vn_version_id}" STREQUAL "") if(NOT "${_vn_version_id}" STREQUAL "")
set(${_vn_version_id} "${_var_version_id}" PARENT_SCOPE) set(${_vn_version_id} "${_var_version_id}" PARENT_SCOPE)
endif() endif()
if(NOT "${_vn_codename}" STREQUAL "") if(NOT "${_vn_codename}" STREQUAL "")
set(${_vn_codename} "${_var_codename}" PARENT_SCOPE) set(${_vn_codename} "${_var_codename}" PARENT_SCOPE)
endif() endif()
endfunction() endfunction()
endif()
endif(NOT DEFINED _os_release_info)

View File

@@ -9,9 +9,9 @@ add_subdirectory(sysman)
add_subdirectory(pin) add_subdirectory(pin)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_TOOLS_SOURCES} ${L0_TOOLS_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -8,21 +8,22 @@ set(L0_SRCS_TOOLS_METRICS
) )
list(APPEND L0_SRCS_TOOLS_METRICS list(APPEND L0_SRCS_TOOLS_METRICS
${CMAKE_CURRENT_SOURCE_DIR}/metric.cpp ${CMAKE_CURRENT_SOURCE_DIR}/metric.cpp
${CMAKE_CURRENT_SOURCE_DIR}/metric_enumeration_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/metric_enumeration_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/metric_streamer_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/metric_streamer_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/metric_query_imp.cpp) ${CMAKE_CURRENT_SOURCE_DIR}/metric_query_imp.cpp
)
if(UNIX) if(UNIX)
add_subdirectory(linux) add_subdirectory(linux)
else() else()
add_subdirectory(windows) add_subdirectory(windows)
endif() endif()
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_METRICS} ${L0_SRCS_TOOLS_METRICS}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -7,14 +7,15 @@
set(L0_SRCS_TOOLS_LINUX set(L0_SRCS_TOOLS_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/os_metric_query_imp_linux.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_query_imp_linux.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_metric_enumeration_imp_linux.cpp) ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_enumeration_imp_linux.cpp
if(UNIX)
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${L0_SRCS_TOOLS_LINUX}
) )
# Make our source files visible to parent if(UNIX)
set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_LINUX ${L0_SRCS_TOOLS_LINUX}) target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${L0_SRCS_TOOLS_LINUX}
)
# Make our source files visible to parent
set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_LINUX ${L0_SRCS_TOOLS_LINUX})
endif() endif()

View File

@@ -7,14 +7,15 @@
set(L0_SRCS_TOOLS_WINDOWS set(L0_SRCS_TOOLS_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/os_metric_query_imp_windows.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_query_imp_windows.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_metric_enumeration_imp_windows.cpp) ${CMAKE_CURRENT_SOURCE_DIR}/os_metric_enumeration_imp_windows.cpp
if(WIN32)
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${L0_SRCS_TOOLS_WINDOWS}
) )
# Make our source files visible to parent if(WIN32)
set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_WINDOWS ${L0_SRCS_TOOLS_WINDOWS}) target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${L0_SRCS_TOOLS_WINDOWS}
)
# Make our source files visible to parent
set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_WINDOWS ${L0_SRCS_TOOLS_WINDOWS})
endif() endif()

View File

@@ -10,9 +10,9 @@ set(L0_SRCS_TOOLS_PIN
) )
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_PIN} ${L0_SRCS_TOOLS_PIN}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
add_subdirectories() add_subdirectories()

View File

@@ -5,19 +5,19 @@
# #
set(L0_SRCS_TOOLS_LINUX set(L0_SRCS_TOOLS_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/os_pin.h ${CMAKE_CURRENT_SOURCE_DIR}/os_pin.h
) )
if(UNIX) if(UNIX)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_LINUX} ${L0_SRCS_TOOLS_LINUX}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
target_include_directories(${L0_STATIC_LIB_NAME} target_include_directories(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -9,18 +9,17 @@ set(L0_SRCS_TOOLS_WINDOWS
) )
if(WIN32) if(WIN32)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_WINDOWS} ${L0_SRCS_TOOLS_WINDOWS}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
target_include_directories(${L0_STATIC_LIB_NAME} target_include_directories(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent
set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_WINDOWS ${L0_SRCS_TOOLS_WINDOWS}) set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_WINDOWS ${L0_SRCS_TOOLS_WINDOWS})

View File

@@ -12,9 +12,9 @@ set(L0_SRCS_TOOLS_SYSMAN
) )
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN} ${L0_SRCS_TOOLS_SYSMAN}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
add_subdirectories() add_subdirectories()

View File

@@ -12,11 +12,10 @@ set(L0_SRCS_TOOLS_SYSMAN_ENGINE
${CMAKE_CURRENT_SOURCE_DIR}/os_engine.h ${CMAKE_CURRENT_SOURCE_DIR}/os_engine.h
) )
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_ENGINE} ${L0_SRCS_TOOLS_SYSMAN_ENGINE}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
add_subdirectories() add_subdirectories()

View File

@@ -10,9 +10,10 @@ set(L0_SRCS_TOOLS_SYSMAN_ENGINE_LINUX
) )
if(UNIX) if(UNIX)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_ENGINE_LINUX}) ${L0_SRCS_TOOLS_SYSMAN_ENGINE_LINUX}
)
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -9,9 +9,10 @@ set(L0_SRCS_TOOLS_SYSMAN_ENGINE_WINDOWS
) )
if(WIN32) if(WIN32)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_ENGINE_WINDOWS}) ${L0_SRCS_TOOLS_SYSMAN_ENGINE_WINDOWS}
)
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -13,9 +13,9 @@ set(L0_SRCS_TOOLS_SYSMAN_FABRICPORT
) )
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_FABRICPORT} ${L0_SRCS_TOOLS_SYSMAN_FABRICPORT}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
add_subdirectories() add_subdirectories()

View File

@@ -11,10 +11,10 @@ set(L0_SRCS_TOOLS_SYSMAN_FABRICPORT_LINUX
) )
if(UNIX) if(UNIX)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_FABRICPORT_LINUX} ${L0_SRCS_TOOLS_SYSMAN_FABRICPORT_LINUX}
) )
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -5,16 +5,16 @@
# #
set(L0_SRCS_TOOLS_SYSMAN_FABRICPORT_WINDOWS set(L0_SRCS_TOOLS_SYSMAN_FABRICPORT_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.h
) )
if(WIN32) if(WIN32)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_FABRICPORT_WINDOWS} ${L0_SRCS_TOOLS_SYSMAN_FABRICPORT_WINDOWS}
) )
endif() endif()
## Make our source files visible to parent ## Make our source files visible to parent

View File

@@ -13,16 +13,16 @@ set(L0_SRCS_TOOLS_SYSMAN_FREQUENCY
) )
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_FREQUENCY} ${L0_SRCS_TOOLS_SYSMAN_FREQUENCY}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
if(UNIX) if(UNIX)
add_subdirectory(linux) add_subdirectory(linux)
else() else()
add_subdirectory(windows) add_subdirectory(windows)
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent
set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FREQUENCY ${L0_SRCS_TOOLS_SYSMAN_FREQUENCY}) set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_FREQUENCY ${L0_SRCS_TOOLS_SYSMAN_FREQUENCY})

View File

@@ -11,10 +11,10 @@ set(L0_SRCS_TOOLS_SYSMAN_FREQUENCY_LINUX
) )
if(UNIX) if(UNIX)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_FREQUENCY_LINUX} ${L0_SRCS_TOOLS_SYSMAN_FREQUENCY_LINUX}
) )
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -10,10 +10,10 @@ set(L0_SRCS_TOOLS_SYSMAN_FREQUENCY_WINDOWS
) )
if(WIN32) if(WIN32)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_FREQUENCY_WINDOWS} ${L0_SRCS_TOOLS_SYSMAN_FREQUENCY_WINDOWS}
) )
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -12,20 +12,20 @@ set(L0_SRCS_TOOLS_GLOBAL_OPERATIONS
) )
target_include_directories(${L0_STATIC_LIB_NAME} target_include_directories(${L0_STATIC_LIB_NAME}
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/ ${CMAKE_CURRENT_SOURCE_DIR}/
) )
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_GLOBAL_OPERATIONS} ${L0_SRCS_TOOLS_GLOBAL_OPERATIONS}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
if(UNIX) if(UNIX)
add_subdirectory(linux) add_subdirectory(linux)
else() else()
add_subdirectory(windows) add_subdirectory(windows)
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -11,10 +11,10 @@ set(L0_SRCS_TOOLS_GLOBAL_OPERATIONS_LINUX
) )
if(UNIX) if(UNIX)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_GLOBAL_OPERATIONS_LINUX} ${L0_SRCS_TOOLS_GLOBAL_OPERATIONS_LINUX}
) )
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -10,10 +10,10 @@ set(L0_SRCS_TOOLS_GLOBAL_OPERATIONS_WINDOWS
) )
if(WIN32) if(WIN32)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_GLOBAL_OPERATIONS_WINDOWS} ${L0_SRCS_TOOLS_GLOBAL_OPERATIONS_WINDOWS}
) )
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -10,13 +10,14 @@ set(L0_SRCS_TOOLS_SYSMAN_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/fs_access.cpp ${CMAKE_CURRENT_SOURCE_DIR}/fs_access.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pmt.cpp ${CMAKE_CURRENT_SOURCE_DIR}/pmt.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pmt.h) ${CMAKE_CURRENT_SOURCE_DIR}/pmt.h
)
if(UNIX) if(UNIX)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_LINUX} ${L0_SRCS_TOOLS_SYSMAN_LINUX}
) )
endif() endif()
add_subdirectories() add_subdirectories()

View File

@@ -4,26 +4,27 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
if (PC_LIBXML_FOUND) if(PC_LIBXML_FOUND)
set(L0_SRCS_TOOLS_SYSMAN_LINUX_XML_PARSER set(L0_SRCS_TOOLS_SYSMAN_LINUX_XML_PARSER
${CMAKE_CURRENT_SOURCE_DIR}/xml_parser_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/xml_parser_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/xml_parser_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/xml_parser_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/xml2_api.h ${CMAKE_CURRENT_SOURCE_DIR}/xml2_api.h
${CMAKE_CURRENT_SOURCE_DIR}/xml2_api.cpp ${CMAKE_CURRENT_SOURCE_DIR}/xml2_api.cpp
${CMAKE_CURRENT_SOURCE_DIR}/xml_parser.h) ${CMAKE_CURRENT_SOURCE_DIR}/xml_parser.h
)
else() else()
set(L0_SRCS_TOOLS_SYSMAN_LINUX_XML_PARSER set(L0_SRCS_TOOLS_SYSMAN_LINUX_XML_PARSER
${CMAKE_CURRENT_SOURCE_DIR}/xml_parser_stub.cpp ${CMAKE_CURRENT_SOURCE_DIR}/xml_parser_stub.cpp
${CMAKE_CURRENT_SOURCE_DIR}/xml_parser.h) ${CMAKE_CURRENT_SOURCE_DIR}/xml_parser.h
)
endif() endif()
if(UNIX) if(UNIX)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_LINUX_XML_PARSER} ${L0_SRCS_TOOLS_SYSMAN_LINUX_XML_PARSER}
) )
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent
set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_XML_PARSER_LINUX ${L0_SRCS_TOOLS_SYSMAN_XML_PARSER_LINUX}) set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_XML_PARSER_LINUX ${L0_SRCS_TOOLS_SYSMAN_XML_PARSER_LINUX})

View File

@@ -12,11 +12,10 @@ set(L0_SRCS_TOOLS_SYSMAN_MEMORY
${CMAKE_CURRENT_SOURCE_DIR}/os_memory.h ${CMAKE_CURRENT_SOURCE_DIR}/os_memory.h
) )
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_MEMORY} ${L0_SRCS_TOOLS_SYSMAN_MEMORY}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
add_subdirectories() add_subdirectories()

View File

@@ -5,23 +5,24 @@
# #
if(SUPPORT_DG1) if(SUPPORT_DG1)
set(L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX set(L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/dg1/os_memory_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dg1/os_memory_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/dg1/os_memory_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/dg1/os_memory_imp.h
) )
else() else()
set(L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX set(L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.h ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.h
) )
endif() endif()
if(UNIX) if(UNIX)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX}) ${L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX}
)
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -10,9 +10,10 @@ set(L0_SRCS_TOOLS_SYSMAN_MEMORY_WINDOWS
) )
if(WIN32) if(WIN32)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_MEMORY_WINDOWS}) ${L0_SRCS_TOOLS_SYSMAN_MEMORY_WINDOWS}
)
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -12,15 +12,15 @@ set(L0_SRCS_TOOLS_SYSMAN_PCI
) )
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_PCI} ${L0_SRCS_TOOLS_SYSMAN_PCI}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
if(UNIX) if(UNIX)
add_subdirectory(linux) add_subdirectory(linux)
else() else()
add_subdirectory(windows) add_subdirectory(windows)
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -11,10 +11,10 @@ set(L0_SRCS_TOOLS_SYSMAN_PCI_LINUX
) )
if(UNIX) if(UNIX)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_PCI_LINUX} ${L0_SRCS_TOOLS_SYSMAN_PCI_LINUX}
) )
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -10,10 +10,10 @@ set(L0_SRCS_TOOLS_SYSMAN_PCI_WINDOWS
) )
if(WIN32) if(WIN32)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_PCI_WINDOWS} ${L0_SRCS_TOOLS_SYSMAN_PCI_WINDOWS}
) )
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -12,14 +12,13 @@ set(L0_SRCS_TOOLS_SYSMAN_POWER
${CMAKE_CURRENT_SOURCE_DIR}/os_power.h ${CMAKE_CURRENT_SOURCE_DIR}/os_power.h
) )
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_POWER} ${L0_SRCS_TOOLS_SYSMAN_POWER}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
add_subdirectories() add_subdirectories()
# Make our source files visible to parent # Make our source files visible to parent
set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_POWER ${L0_SRCS_TOOLS_SYSMAN_POWER}) set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_POWER ${L0_SRCS_TOOLS_SYSMAN_POWER})

View File

@@ -10,9 +10,10 @@ set(L0_SRCS_TOOLS_SYSMAN_POWER_LINUX
) )
if(UNIX) if(UNIX)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_POWER_LINUX}) ${L0_SRCS_TOOLS_SYSMAN_POWER_LINUX}
)
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -11,10 +11,11 @@ set(L0_SRCS_TOOLS_SYSMAN_POWER_WINDOWS
) )
if(WIN32) if(WIN32)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_POWER_WINDOWS}) ${L0_SRCS_TOOLS_SYSMAN_POWER_WINDOWS}
)
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent
set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_POWER_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_POWER_WINDOWS}) set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_POWER_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_POWER_WINDOWS})

View File

@@ -12,11 +12,10 @@ set(L0_SRCS_TOOLS_SYSMAN_RAS
${CMAKE_CURRENT_SOURCE_DIR}/os_ras.h ${CMAKE_CURRENT_SOURCE_DIR}/os_ras.h
) )
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_RAS} ${L0_SRCS_TOOLS_SYSMAN_RAS}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
add_subdirectories() add_subdirectories()

View File

@@ -10,33 +10,34 @@ set(L0_SRCS_TOOLS_SYSMAN_RAS_LINUX
) )
if(UNIX) if(UNIX)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_RAS_LINUX}) ${L0_SRCS_TOOLS_SYSMAN_RAS_LINUX}
)
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent
set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_RAS_LINUX ${L0_SRCS_TOOLS_SYSMAN_RAS_LINUX}) set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_RAS_LINUX ${L0_SRCS_TOOLS_SYSMAN_RAS_LINUX})
if(L0_INSTALL_UDEV_RULES) if(L0_INSTALL_UDEV_RULES)
install( install(
FILES "${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/udev/99-drm_ze_intel_gpu.rules" FILES "${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/udev/99-drm_ze_intel_gpu.rules"
DESTINATION ${UDEV_RULES_DIR} DESTINATION ${UDEV_RULES_DIR}
COMPONENT ${PROJECT_NAME} COMPONENT ${PROJECT_NAME}
) )
endif() endif()
if(L0_INSTALL_UDEV_RULES) if(L0_INSTALL_UDEV_RULES)
foreach(counter IN ITEMS foreach(counter IN ITEMS
ras_reset_count ras_reset_count
ras_cache_error_uncorrectable ras_cache_error_uncorrectable
ras_cache_error_correctable ras_cache_error_correctable
) )
install( install(
FILES "${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/udev/counter_init" FILES "${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/udev/counter_init"
DESTINATION "/var/lib/libze_intel_gpu/" DESTINATION "/var/lib/libze_intel_gpu/"
COMPONENT ${PROJECT_NAME} COMPONENT ${PROJECT_NAME}
RENAME ${counter} RENAME ${counter}
) )
endforeach() endforeach()
endif() endif()

View File

@@ -9,9 +9,10 @@ set(L0_SRCS_TOOLS_SYSMAN_RAS_WINDOWS
) )
if(WIN32) if(WIN32)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_RAS_WINDOWS}) ${L0_SRCS_TOOLS_SYSMAN_RAS_WINDOWS}
)
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -12,14 +12,13 @@ set(L0_SRCS_TOOLS_SYSMAN_SCHEDULER
${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler.h ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler.h
) )
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_SCHEDULER} ${L0_SRCS_TOOLS_SYSMAN_SCHEDULER}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
add_subdirectories() add_subdirectories()
# Make our source files visible to parent # Make our source files visible to parent
set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_SCHEDULER ${L0_SRCS_TOOLS_SYSMAN_SCHEDULER}) set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_SCHEDULER ${L0_SRCS_TOOLS_SYSMAN_SCHEDULER})

View File

@@ -11,10 +11,10 @@ set(L0_SRCS_TOOLS_SYSMAN_SCHEDULER_LINUX
) )
if(UNIX) if(UNIX)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_SCHEDULER_LINUX} ${L0_SRCS_TOOLS_SYSMAN_SCHEDULER_LINUX}
) )
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent

View File

@@ -10,11 +10,11 @@ set(L0_SRCS_TOOLS_SYSMAN_SCHEDULER_WINDOWS
) )
if(WIN32) if(WIN32)
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_SCHEDULER_WINDOWS} ${L0_SRCS_TOOLS_SYSMAN_SCHEDULER_WINDOWS}
) )
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent
set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_SCHEDULER_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_SCHEDULER_WINDOWS}) set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_SCHEDULER_WINDOWS ${L0_SRCS_TOOLS_SYSMAN_SCHEDULER_WINDOWS})

View File

@@ -13,16 +13,16 @@ set(L0_SRCS_TOOLS_SYSMAN_STANDBY
) )
target_sources(${L0_STATIC_LIB_NAME} target_sources(${L0_STATIC_LIB_NAME}
PRIVATE PRIVATE
${L0_SRCS_TOOLS_SYSMAN_STANDBY} ${L0_SRCS_TOOLS_SYSMAN_STANDBY}
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
) )
if(UNIX) if(UNIX)
add_subdirectory(linux) add_subdirectory(linux)
else() else()
add_subdirectory(windows) add_subdirectory(windows)
endif() endif()
# Make our source files visible to parent # Make our source files visible to parent
set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_STANDBY ${L0_SRCS_TOOLS_SYSMAN_STANDBY}) set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_SYSMAN_STANDBY ${L0_SRCS_TOOLS_SYSMAN_STANDBY})

Some files were not shown because too many files have changed in this diff Show More