intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-18 05:52:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cmake format script

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

64
CMakeLists.txt
View File

@@ -22,14 +22,13 @@ endforeach()
include(common_macros.cmake)
if(MSVC)
set(CMAKE_GENERATOR_TOOLSET "host=x64")
set(CMAKE_GENERATOR_TOOLSET "host=x64")
endif()
if(NOT PROJECT_NAME)
set(PROJECT_NAME igdrcl)
endif()
project(${PROJECT_NAME})
if(CMAKE_CONFIGURATION_TYPES)
@@ -60,14 +59,14 @@ message(STATUS "branch dir list: ${BRANCH_DIR_LIST}")
if(TR_DEPRECATED)
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING=1)
endif(TR_DEPRECATED)
endif()
add_definitions(-DIGC_CLEANUP)
if(RELEASE_WITH_REGKEYS)
message(STATUS "Enabling RegKey reading in release build")
add_definitions(-D_RELEASE_BUILD_WITH_REGKEYS)
endif(RELEASE_WITH_REGKEYS)
endif()
if(DEFINED NEO_EXTRA_DEFINES)
string(REPLACE "," ";" NEO_EXTRA_DEFINES "${NEO_EXTRA_DEFINES}")
@@ -194,7 +193,7 @@ if(MSVC)
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_RELEASEINTERNAL "${CMAKE_CXX_FLAGS_RELEASEINTERNAL}")
endif(MSVC)
endif()
if(NOT SKIP_UNIT_TESTS)
if(NOT DEFINED GTEST_REPEAT)
@@ -209,11 +208,11 @@ if(NOT SKIP_UNIT_TESTS)
endif()
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)
message(STATUS "KM-DAF headers dir: ${KMDAF_HEADERS_DIR}")
endif()
endif(NOT KMDAF_HEADERS_DIR)
endif()
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)
@@ -291,16 +290,16 @@ message(STATUS "Khronos OpenGL headers dir: ${KHRONOS_GL_HEADERS_DIR}")
if(NOT THIRD_PARTY_DIR)
get_filename_component(THIRD_PARTY_DIR "../third_party/" ABSOLUTE)
endif(NOT THIRD_PARTY_DIR)
endif()
message(STATUS "Third party dir: ${THIRD_PARTY_DIR}")
if(WIN32)
# get WDK location and version to use
# get WDK location and version to use
if(NOT WDK_DIR)
if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../wdk")
get_filename_component(WDK_DIR "../wdk" ABSOLUTE)
endif()
endif(NOT WDK_DIR)
endif()
if(WDK_DIR)
if(IS_DIRECTORY "${WDK_DIR}/Win15")
get_filename_component(WDK_DIR "${WDK_DIR}/Win15" ABSOLUTE)
@@ -315,7 +314,7 @@ if(WIN32)
list(LENGTH WindowsTargetPlatformVersion versionListLength)
if(NOT versionListLength EQUAL 3)
message(ERROR "Error reading content of WDKVersion.txt file")
endif(NOT versionListLength EQUAL 3)
endif()
list(GET WindowsTargetPlatformVersion 2 WindowsTargetPlatformVersion)
else()
set(WindowsTargetPlatformVersion ${WDK_VERSION})
@@ -395,7 +394,7 @@ if(NOT 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)
endforeach()
message(STATUS "IGC targets: ${NEO__IGC_TARGETS}")
else()
message(FATAL_ERROR "Intel Graphics Compiler not found!")
@@ -405,7 +404,7 @@ else()
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(TARGET_tmp)
endforeach()
string(REPLACE ";" ":" NEO__IGC_LIBRARY_PATH "${NEO__IGC_LIBRARY_PATH}")
message(STATUS "IGC targets: ${NEO__IGC_TARGETS}")
endif()
@@ -540,7 +539,6 @@ endmacro()
link_directories(${NEO__GMM_LIBRARY_PATH})
if(NOT DISABLE_LIBVA)
# LibVA detection
if(UNIX)
@@ -596,10 +594,9 @@ if(NEO_BITS STREQUAL "64")
set(SLD_LIBRARY_NAME "${SLD_LIBRARY_NAME}${NEO_BITS}")
endif()
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)
set(AUB_STREAM_PROJECT_NAME "aub_stream")
add_subdirectory_unique(${AUB_STREAM_DIR} ${CMAKE_BINARY_DIR}/aub_stream EXCLUDE_FROM_ALL)
@@ -624,7 +621,7 @@ set(COMPILE_BUILT_INS TRUE CACHE BOOL "Enable built-in kernels compilation")
set(IGDRCL_OUTPUT_DIR "${IGDRCL_OPTION__OUTPUT_DIR}")
# 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")
@@ -657,13 +654,13 @@ if(MSVC)
endif()
endif()
# Disable generating manifest
# Disable generating manifest
set(LINKER_FLAGS "/MANIFEST:NO")
# Use legacy float rounding
# Use legacy float rounding
set(LINKER_FLAGS "${LINKER_FLAGS} legacy_stdio_float_rounding.obj")
# Support for WUD
# Support for WUD
set(CMAKE_CXX_STANDARD_LIBRARIES "onecore.lib")
foreach(IT kernel32.lib;user32.lib;gdi32.lib;advapi32.lib;ole32.lib;)
set(LINKER_FLAGS "${LINKER_FLAGS} /NODEFAULTLIB:${IT}")
@@ -759,11 +756,11 @@ else()
else()
message(WARNING "Spectre mitigation DISABLED")
endif()
endif(MSVC)
endif()
if(NOT MSVC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
endif(NOT MSVC)
endif()
# Compiler warning flags
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} -Winvalid-pch")
if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" )
if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
# clang only
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wshorten-64-to-32")
if(USE_SANITIZE_UB)
@@ -784,21 +781,21 @@ if(NOT MSVC)
if(NOT SANITIZE_UB_ALLOW_CONTINUE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-sanitize-recover=undefined")
endif()
endif(USE_SANITIZE_UB)
if (NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS 3.6))
endif()
if(NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS 3.6))
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs -DSANITIZER_BUILD")
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()
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")
endif()
else()
# 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} -Wclobbered")
if (CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0)
if(CMAKE_C_COMPILER_VERSION VERSION_LESS 7.0)
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wimplicit-fallthrough=4")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-noexcept-type") # Added for gtest
@@ -824,7 +821,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")
else()
# 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")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
@@ -857,14 +854,14 @@ 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/mem_obj/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)
endif()
# Define where to put binaries
set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
if(MSVC)
if (NOT "${CMAKE_GENERATOR}" STREQUAL "Ninja")
if(NOT "${CMAKE_GENERATOR}" STREQUAL "Ninja")
set(TargetDir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE})
endif()
endif()
@@ -911,7 +908,6 @@ macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC)
target_compile_definitions(${BUILTINS_BINARIES_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
target_compile_definitions(${SCHEDULER_BINARY_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
if(${MOCKABLE})
target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual)
target_compile_definitions(${SHARINGS_ENABLE_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual)
@@ -920,7 +916,7 @@ macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC)
target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
target_compile_definitions(${SHARINGS_ENABLE_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
endif()
endmacro(generate_runtime_lib)
endmacro()
set(NEO_DYNAMIC_LIB_NAME "igdrcl_dll") # single NEO dll
set(NEO_DLL_NAME_BASE "igdrcl")
@@ -964,7 +960,7 @@ endif()
set(DONT_LINK_ELF_STATICALLY TRUE)
if(EXISTS ${NEO_SOURCE_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)
if(EXISTS ${NEO_SOURCE_DIR}/scripts/format)

1
common_macros.cmake
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})
endmacro()
macro(append_sources_from_properties list_name)
foreach(name ${ARGN})
get_property(${name} GLOBAL PROPERTY ${name})

87
level_zero/CMakeLists.txt
View File

@@ -42,12 +42,12 @@ if(BUILD_WITH_L0)
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(-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)
add_definitions(-DZE_ENABLE_OCL_INTEROP=1)
file(WRITE "${CMAKE_BINARY_DIR}/VERSION" "${PROJECT_VERSION}")
@@ -169,7 +169,7 @@ if(BUILD_WITH_L0)
endif()
include_directories(${COMPUTE_RUNTIME_DIR}/third_party/opencl_headers)
if (CUSTOM_L0_INCLUDE_PATH)
if(CUSTOM_L0_INCLUDE_PATH)
include_directories(${CUSTOM_L0_INCLUDE_PATH}/../)
else()
include_directories(${LevelZero_INCLUDE_DIRS})
@@ -241,35 +241,35 @@ if(BUILD_WITH_L0)
)
endif()
if(DEFINED AUB_STREAM_PROJECT_NAME)
if(DEFINED AUB_STREAM_PROJECT_NAME)
target_sources(${TARGET_NAME_L0}
PRIVATE
$<TARGET_OBJECTS:aub_stream_all_hw>
)
endif()
endif()
target_sources(${TARGET_NAME_L0}
PRIVATE
$<TARGET_OBJECTS:${BUILTINS_BINARIES_LIB_NAME}>
)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/source/inc)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/source/inc)
target_compile_definitions(${TARGET_NAME_L0}
target_compile_definitions(${TARGET_NAME_L0}
PUBLIC
ZE_MAKEDLL
)
)
get_property(COMPUTE_RUNTIME_DEFINITIONS
get_property(COMPUTE_RUNTIME_DEFINITIONS
TARGET ${NEO_RELEASE_LIB_NAME}
PROPERTY COMPILE_DEFINITIONS
)
)
target_compile_definitions(${TARGET_NAME_L0}
target_compile_definitions(${TARGET_NAME_L0}
PRIVATE
${COMPUTE_RUNTIME_DEFINITIONS}
)
)
if(UNIX)
if(UNIX)
target_sources(${TARGET_NAME_L0}
PRIVATE
${NEO_SHARED_DIRECTORY}/os_interface/linux/gmm_interface_linux.cpp
@@ -283,7 +283,7 @@ if(UNIX)
target_include_directories(${TARGET_NAME_L0} PRIVATE
${COMPUTE_RUNTIME_DIR}/opencl/source/dll/linux/devices${BRANCH_DIR_SUFFIX}
)
else()
else()
set(OS_SPECIFIC_LIBS "")
target_include_directories(${TARGET_NAME_L0} PUBLIC
${L0_ROOT_DIR}/core/source/os_interface/windows
@@ -305,22 +305,22 @@ else()
target_sources(${TARGET_NAME_L0} PRIVATE
${NEO_SHARED_DIRECTORY}/os_interface/windows/gmm_interface_win.cpp
)
endif()
endif()
add_subdirectory_unique(api)
add_subdirectory_unique(source)
add_subdirectory_unique(api)
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_MOCKABLE_LIB_NAME "${TARGET_NAME_L0}_lib")
else()
else()
set(L0_RELEASE_LIB_NAME "${TARGET_NAME_L0}_lib")
if(NOT SKIP_UNIT_TESTS)
set(L0_MOCKABLE_LIB_NAME "${TARGET_NAME_L0}_mockable")
endif()
endif()
endif()
function(generate_l0_lib LIB_NAME MOCKABLE)
function(generate_l0_lib LIB_NAME MOCKABLE)
set(L0_STATIC_LIB_NAME ${LIB_NAME})
add_library(${LIB_NAME} OBJECT
${L0_RUNTIME_SOURCES}
@@ -398,9 +398,9 @@ function(generate_l0_lib LIB_NAME MOCKABLE)
endif()
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)
if(L0_INSTALL_UDEV_RULES)
if(DEFINED UDEV_RULES_DIR)
@@ -412,45 +412,44 @@ if(UNIX)
message(SEND_ERROR "udev rule install requested but no rules directory found")
endif()
endif()
endif()
endif()
if(DONT_CARE_OF_VIRTUALS)
if(DONT_CARE_OF_VIRTUALS)
generate_l0_lib(${L0_RELEASE_LIB_NAME} TRUE)
else()
else()
generate_l0_lib(${L0_RELEASE_LIB_NAME} FALSE)
if(NOT SKIP_UNIT_TESTS)
generate_l0_lib(${L0_MOCKABLE_LIB_NAME} TRUE)
endif()
endif()
endif()
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})
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_link_libraries(${TARGET_NAME_L0}
target_link_libraries(${TARGET_NAME_L0}
${NEO_STATICALLY_LINKED_LIBRARIES}
${OS_SPECIFIC_LIBS} ${ASAN_LIBS} ${TSAN_LIBS}
)
)
if(UNIX)
if(UNIX)
target_link_libraries(${TARGET_NAME_L0} ${GMM_LINK_NAME})
set_property(TARGET ${TARGET_NAME_L0}
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}
VERSION "${PROJECT_VERSION}"
SOVERSION "${PROJECT_VERSION_MAJOR}"
)
)
if(UNIX)
if(UNIX)
install(TARGETS ${TARGET_NAME_L0}
LIBRARY
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
@@ -458,7 +457,7 @@ if(UNIX)
COMPONENT ${PROJECT_NAME}
NAMELINK_SKIP
)
else()
else()
install(TARGETS ${TARGET_NAME_L0} RUNTIME
DESTINATION Release/lh64
CONFIGURATIONS Release
@@ -471,7 +470,7 @@ else()
DESTINATION Debug/lh64
CONFIGURATIONS Debug
)
endif()
endif()
if(NOT SKIP_L0_UNIT_TESTS)
add_subdirectory_unique(core/test)
add_subdirectory_unique(tools/test)

3
level_zero/api/CMakeLists.txt
View File

@@ -16,5 +16,6 @@ append_sources_from_properties(L0_API
L0_EXPERIMENTAL_API
L0_EXPERIMENTAL_TRACING_API
L0_SYSMAN_API
L0_TOOLS_API)
L0_TOOLS_API
)
set_property(GLOBAL PROPERTY L0_API ${L0_API})

4
level_zero/cmake/l0_tests.cmake
View File

@@ -42,7 +42,7 @@ endif()
#Extract compute runtime COMPILE_DEFINITIONS
get_property(COMPUTE_RUNTIME_MOCKABLE_DEFINITIONS
TARGET ${NEO_MOCKABLE_LIB_NAME}
TARGET ${NEO_MOCKABLE_LIB_NAME}
PROPERTY COMPILE_DEFINITIONS
)
@@ -133,7 +133,7 @@ if(UNIX)
${NEO_SOURCE_DIR}/opencl/source/dll/linux/allocator_helper.cpp
${NEO_SOURCE_DIR}/opencl/source/tbx/tbx_sockets_imp.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/drm_mock.cpp
)
)
target_link_libraries(compute_runtime_mockable_extra
dl
)

5
level_zero/core/test/black_box_tests/CMakeLists.txt
View File

@@ -8,9 +8,10 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
set(L0_BLACK_BOX_TEST_PROJECT_FOLDER "ze_intel_gpu/black_box_tests")
set(TEST_TARGETS
zello_world
zello_timestamp)
zello_timestamp
)
foreach (TEST_NAME ${TEST_TARGETS})
foreach(TEST_NAME ${TEST_TARGETS})
add_executable(${TEST_NAME} ${TEST_NAME}.cpp)
set_target_properties(${TEST_NAME}

6
level_zero/core/test/unit_tests/CMakeLists.txt
View File

@@ -46,7 +46,7 @@ target_sources(${TARGET_NAME} PRIVATE
$<TARGET_OBJECTS:${L0_MOCKABLE_LIB_NAME}>
)
if (UNIX)
if(UNIX)
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/drm_neo_create.cpp
@@ -81,7 +81,7 @@ target_include_directories(${TARGET_NAME}
${NEO_SHARED_TEST_DIRECTORY}/unit_test/test_macros/header${BRANCH_DIR_SUFFIX}
)
if (UNIX)
if(UNIX)
target_include_directories(${TARGET_NAME}
BEFORE
PRIVATE
@@ -99,7 +99,7 @@ else()
)
endif()
if (UNIX)
if(UNIX)
target_link_libraries(${TARGET_NAME} pthread rt)
else()
target_link_libraries(${TARGET_NAME} dbghelp)

4
level_zero/core/test/unit_tests/sources/debugger/linux/CMakeLists.txt
View File

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

120
level_zero/os_release_info.cmake
View File

@@ -5,71 +5,68 @@
#
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)
# of the local cmake environment.
# Set cmake policies for at least this level:
cmake_minimum_required(VERSION 3.2.0)
# Set cmake policies for at least this level:
cmake_minimum_required(VERSION 3.2.0)
# Function get_os_release_info - Determine and return OS name and version
#
# 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
#
# 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)
function(get_os_release_info _vn_id _vn_version_id _vn_codename)
set(_var_id "")
set(_var_version_id "")
set(_var_codename "")
@@ -158,7 +155,6 @@ function(get_os_release_info _vn_id _vn_version_id _vn_codename)
if(NOT "${_vn_codename}" STREQUAL "")
set(${_vn_codename} "${_var_codename}" PARENT_SCOPE)
endif()
endfunction()
endfunction()
endif(NOT DEFINED _os_release_info)
endif()

3
level_zero/tools/source/metrics/CMakeLists.txt
View File

@@ -11,7 +11,8 @@ list(APPEND L0_SRCS_TOOLS_METRICS
${CMAKE_CURRENT_SOURCE_DIR}/metric.cpp
${CMAKE_CURRENT_SOURCE_DIR}/metric_enumeration_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)
add_subdirectory(linux)

17
level_zero/tools/source/metrics/linux/CMakeLists.txt
View File

@@ -7,14 +7,15 @@
set(L0_SRCS_TOOLS_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/os_metric_query_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}
${CMAKE_CURRENT_SOURCE_DIR}/os_metric_enumeration_imp_linux.cpp
)
# Make our source files visible to parent
set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_LINUX ${L0_SRCS_TOOLS_LINUX})
if(UNIX)
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()

17
level_zero/tools/source/metrics/windows/CMakeLists.txt
View File

@@ -7,14 +7,15 @@
set(L0_SRCS_TOOLS_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/os_metric_query_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}
${CMAKE_CURRENT_SOURCE_DIR}/os_metric_enumeration_imp_windows.cpp
)
# Make our source files visible to parent
set_property(GLOBAL PROPERTY L0_SRCS_TOOLS_WINDOWS ${L0_SRCS_TOOLS_WINDOWS})
if(WIN32)
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()

8
level_zero/tools/source/pin/linux/CMakeLists.txt
View File

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

9
level_zero/tools/source/pin/windows/CMakeLists.txt
View File

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

1
level_zero/tools/source/sysman/engine/CMakeLists.txt
View File

@@ -12,7 +12,6 @@ set(L0_SRCS_TOOLS_SYSMAN_ENGINE
${CMAKE_CURRENT_SOURCE_DIR}/os_engine.h
)
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${L0_SRCS_TOOLS_SYSMAN_ENGINE}

3
level_zero/tools/source/sysman/engine/linux/CMakeLists.txt
View File

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

3
level_zero/tools/source/sysman/engine/windows/CMakeLists.txt
View File

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

4
level_zero/tools/source/sysman/fabric_port/linux/CMakeLists.txt
View File

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

4
level_zero/tools/source/sysman/fabric_port/windows/CMakeLists.txt
View File

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

4
level_zero/tools/source/sysman/frequency/linux/CMakeLists.txt
View File

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

4
level_zero/tools/source/sysman/frequency/windows/CMakeLists.txt
View File

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

4
level_zero/tools/source/sysman/global_operations/linux/CMakeLists.txt
View File

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

4
level_zero/tools/source/sysman/global_operations/windows/CMakeLists.txt
View File

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

7
level_zero/tools/source/sysman/linux/CMakeLists.txt
View File

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

13
level_zero/tools/source/sysman/linux/xml_parser/CMakeLists.txt
View File

@@ -4,26 +4,27 @@
# SPDX-License-Identifier: MIT
#
if (PC_LIBXML_FOUND)
if(PC_LIBXML_FOUND)
set(L0_SRCS_TOOLS_SYSMAN_LINUX_XML_PARSER
${CMAKE_CURRENT_SOURCE_DIR}/xml_parser_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/xml_parser_imp.h
${CMAKE_CURRENT_SOURCE_DIR}/xml2_api.h
${CMAKE_CURRENT_SOURCE_DIR}/xml2_api.cpp
${CMAKE_CURRENT_SOURCE_DIR}/xml_parser.h)
${CMAKE_CURRENT_SOURCE_DIR}/xml_parser.h
)
else()
set(L0_SRCS_TOOLS_SYSMAN_LINUX_XML_PARSER
${CMAKE_CURRENT_SOURCE_DIR}/xml_parser_stub.cpp
${CMAKE_CURRENT_SOURCE_DIR}/xml_parser.h)
${CMAKE_CURRENT_SOURCE_DIR}/xml_parser.h
)
endif()
if(UNIX)
target_sources(${L0_STATIC_LIB_NAME}
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${L0_SRCS_TOOLS_SYSMAN_LINUX_XML_PARSER}
)
)
endif()
# 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})

1
level_zero/tools/source/sysman/memory/CMakeLists.txt
View File

@@ -12,7 +12,6 @@ set(L0_SRCS_TOOLS_SYSMAN_MEMORY
${CMAKE_CURRENT_SOURCE_DIR}/os_memory.h
)
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${L0_SRCS_TOOLS_SYSMAN_MEMORY}

11
level_zero/tools/source/sysman/memory/linux/CMakeLists.txt
View File

@@ -5,23 +5,24 @@
#
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}/dg1/os_memory_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/dg1/os_memory_imp.h
)
)
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}/os_memory_imp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.h
)
)
endif()
if(UNIX)
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX})
${L0_SRCS_TOOLS_SYSMAN_MEMORY_LINUX}
)
endif()
# Make our source files visible to parent

3
level_zero/tools/source/sysman/memory/windows/CMakeLists.txt
View File

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

4
level_zero/tools/source/sysman/pci/linux/CMakeLists.txt
View File

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

4
level_zero/tools/source/sysman/pci/windows/CMakeLists.txt
View File

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

1
level_zero/tools/source/sysman/power/CMakeLists.txt
View File

@@ -12,7 +12,6 @@ set(L0_SRCS_TOOLS_SYSMAN_POWER
${CMAKE_CURRENT_SOURCE_DIR}/os_power.h
)
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${L0_SRCS_TOOLS_SYSMAN_POWER}

3
level_zero/tools/source/sysman/power/linux/CMakeLists.txt
View File

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

3
level_zero/tools/source/sysman/power/windows/CMakeLists.txt
View File

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

1
level_zero/tools/source/sysman/ras/CMakeLists.txt
View File

@@ -12,7 +12,6 @@ set(L0_SRCS_TOOLS_SYSMAN_RAS
${CMAKE_CURRENT_SOURCE_DIR}/os_ras.h
)
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${L0_SRCS_TOOLS_SYSMAN_RAS}

3
level_zero/tools/source/sysman/ras/linux/CMakeLists.txt
View File

@@ -12,7 +12,8 @@ set(L0_SRCS_TOOLS_SYSMAN_RAS_LINUX
if(UNIX)
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${L0_SRCS_TOOLS_SYSMAN_RAS_LINUX})
${L0_SRCS_TOOLS_SYSMAN_RAS_LINUX}
)
endif()
# Make our source files visible to parent

3
level_zero/tools/source/sysman/ras/windows/CMakeLists.txt
View File

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

1
level_zero/tools/source/sysman/scheduler/CMakeLists.txt
View File

@@ -12,7 +12,6 @@ set(L0_SRCS_TOOLS_SYSMAN_SCHEDULER
${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler.h
)
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${L0_SRCS_TOOLS_SYSMAN_SCHEDULER}

4
level_zero/tools/source/sysman/scheduler/linux/CMakeLists.txt
View File

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

4
level_zero/tools/source/sysman/scheduler/windows/CMakeLists.txt
View File

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

4
level_zero/tools/source/sysman/standby/linux/CMakeLists.txt
View File

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

4
level_zero/tools/source/sysman/standby/windows/CMakeLists.txt
View File

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

1
level_zero/tools/source/sysman/temperature/CMakeLists.txt
View File

@@ -12,7 +12,6 @@ set(L0_SRCS_TOOLS_SYSMAN_TEMPERATURE
${CMAKE_CURRENT_SOURCE_DIR}/os_temperature.h
)
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${L0_SRCS_TOOLS_SYSMAN_TEMPERATURE}

3
level_zero/tools/source/sysman/temperature/linux/CMakeLists.txt
View File

@@ -12,7 +12,8 @@ set(L0_SRCS_TOOLS_SYSMAN_TEMPERATURE_LINUX
if(UNIX)
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${L0_SRCS_TOOLS_SYSMAN_TEMPERATURE_LINUX})
${L0_SRCS_TOOLS_SYSMAN_TEMPERATURE_LINUX}
)
endif()
# Make our source files visible to parent

3
level_zero/tools/source/sysman/temperature/windows/CMakeLists.txt
View File

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

7
level_zero/tools/source/sysman/windows/CMakeLists.txt
View File

@@ -10,13 +10,14 @@ set(L0_SRCS_TOOLS_SYSMAN_WINDOWS
${CMAKE_CURRENT_SOURCE_DIR}/kmd_sys.h
${CMAKE_CURRENT_SOURCE_DIR}/kmd_sys_manager.h
${CMAKE_CURRENT_SOURCE_DIR}/kmd_sys_manager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.cpp)
${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.cpp
)
if(WIN32)
target_sources(${L0_STATIC_LIB_NAME}
target_sources(${L0_STATIC_LIB_NAME}
PRIVATE
${L0_SRCS_TOOLS_SYSMAN_WINDOWS}
)
)
endif()
# Make our source files visible to parent

6
level_zero/tools/test/unit_tests/CMakeLists.txt
View File

@@ -43,7 +43,7 @@ target_sources(${TARGET_NAME} PRIVATE
$<TARGET_OBJECTS:${L0_MOCKABLE_LIB_NAME}>
)
if (UNIX)
if(UNIX)
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/drm_neo_create.cpp
@@ -74,7 +74,7 @@ target_include_directories(${TARGET_NAME}
${NEO_SHARED_TEST_DIRECTORY}/unit_test/test_macros/header${BRANCH_DIR_SUFFIX}
)
if (UNIX)
if(UNIX)
target_include_directories(${TARGET_NAME}
BEFORE
PRIVATE
@@ -88,7 +88,7 @@ else()
)
endif()
if (UNIX)
if(UNIX)
target_link_libraries(${TARGET_NAME} pthread rt)
else()
target_link_libraries(${TARGET_NAME} dbghelp)

11
level_zero/tools/test/unit_tests/sources/sysman/memory/linux/CMakeLists.txt
View File

@@ -5,20 +5,21 @@
#
if(SUPPORT_DG1)
set(L0_TESTS_TOOLS_SYSMAN_MEMORY_LINUX
set(L0_TESTS_TOOLS_SYSMAN_MEMORY_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/dg1/mock_memory.h
${CMAKE_CURRENT_SOURCE_DIR}/dg1/test_sysman_memory.cpp
)
)
else()
set(L0_TESTS_TOOLS_SYSMAN_MEMORY_LINUX
set(L0_TESTS_TOOLS_SYSMAN_MEMORY_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/test_sysman_memory.cpp
)
)
endif()
if(UNIX)
target_sources(${TARGET_NAME}
PRIVATE
${L0_TESTS_TOOLS_SYSMAN_MEMORY_LINUX})
${L0_TESTS_TOOLS_SYSMAN_MEMORY_LINUX}
)
endif()

2
manifests/manifest.yml
View File

@@ -14,7 +14,7 @@ components:
infra:
branch: infra
dest_dir: infra
revision: 898b6b6c7f04451e522b8daa4ce974c8e0416009
revision: ad149c937c3fa0906793a34b6712762185e36b4d
type: git
internal:
branch: master

4
opencl/source/CMakeLists.txt
View File

@@ -41,7 +41,7 @@ else()
endif()
if(WIN32)
if("${IGDRCL_OPTION__BITS}" STREQUAL "32" )
if("${IGDRCL_OPTION__BITS}" STREQUAL "32")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
endif()
endif()
@@ -194,7 +194,7 @@ if(${GENERATE_EXECUTABLE})
)
set_target_properties(${NEO_DYNAMIC_LIB_NAME} PROPERTIES FOLDER ${OPENCL_RUNTIME_PROJECTS_FOLDER})
create_project_source_tree_with_exports(${NEO_DYNAMIC_LIB_NAME} "${EXPORTS_FILENAME}")
endif(${GENERATE_EXECUTABLE})
endif()
create_project_source_tree(${NEO_STATIC_LIB_NAME})

4
opencl/source/built_ins/kernels/CMakeLists.txt
View File

@@ -22,7 +22,7 @@ set(BUILTIN_OPTIONS_STATELESS
"-cl-intel-greater-than-4GB-buffer-required"
)
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
list(APPEND __cloc__options__ "-D DEBUG")
endif()
@@ -31,7 +31,7 @@ set(BUILTIN_CPP "")
function(get_bits_for_stateless gen_type platform_type)
# Force 32bits compiling on gen9lp for stateless builtins
if( (${GEN_TYPE} STREQUAL "GEN9" ) AND ( ${PLATFORM_TYPE} STREQUAL "LP"))
if((${GEN_TYPE} STREQUAL "GEN9") AND (${PLATFORM_TYPE} STREQUAL "LP"))
set(BITS "32" PARENT_SCOPE)
else()
set(BITS ${NEO_BITS} PARENT_SCOPE)

4
opencl/source/scheduler/scheduler_binary.cmake
View File

@@ -8,7 +8,7 @@ add_custom_target(scheduler)
set(SCHEDULER_OUTDIR_WITH_ARCH "${TargetDir}/scheduler/${NEO_ARCH}")
set_target_properties(scheduler PROPERTIES FOLDER "scheduler")
set (SCHEDULER_KERNEL scheduler.cl)
set(SCHEDULER_KERNEL scheduler.cl)
if(DEFINED NEO__IGC_INCLUDE_DIR)
list(APPEND __cloc__options__ "-I$<JOIN:${NEO__IGC_INCLUDE_DIR}, -I>")
endif()
@@ -84,7 +84,7 @@ if(COMPILE_BUILT_INS)
foreach(SCHEDULER_TARGET ${SCHEDULER_TARGETS})
add_dependencies(${SCHEDULER_BINARY_LIB_NAME} ${SCHEDULER_TARGET})
endforeach()
endif(COMPILE_BUILT_INS)
endif()
set_target_properties(${SCHEDULER_BINARY_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX)
set_target_properties(${SCHEDULER_BINARY_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)

7
opencl/source/sharings/CMakeLists.txt
View File

@@ -5,9 +5,9 @@
#
file(GLOB_RECURSE SHARING_ENABLE_CPPS enable*.cpp)
add_library (${SHARINGS_ENABLE_LIB_NAME} OBJECT EXCLUDE_FROM_ALL ${SHARING_ENABLE_CPPS})
set_target_properties (${SHARINGS_ENABLE_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties (${SHARINGS_ENABLE_LIB_NAME} PROPERTIES FOLDER ${OPENCL_RUNTIME_PROJECTS_FOLDER})
add_library(${SHARINGS_ENABLE_LIB_NAME} OBJECT EXCLUDE_FROM_ALL ${SHARING_ENABLE_CPPS})
set_target_properties(${SHARINGS_ENABLE_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(${SHARINGS_ENABLE_LIB_NAME} PROPERTIES FOLDER ${OPENCL_RUNTIME_PROJECTS_FOLDER})
target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE
${KHRONOS_HEADERS_DIR}
@@ -27,7 +27,6 @@ set(RUNTIME_SRCS_SHARINGS
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SHARINGS})
set_property(GLOBAL PROPERTY RUNTIME_SRCS_SHARINGS ${RUNTIME_SRCS_SHARINGS})
if(WIN32)
target_include_directories(${SHARINGS_ENABLE_LIB_NAME} PRIVATE ${NEO_SOURCE_DIR}/opencl/source/os_interface/windows)
else()

8
opencl/source/sharings/gl/CMakeLists.txt
View File

@@ -21,13 +21,15 @@ if(WIN32)
add_subdirectories()
set(ADDITIONAL_EXPORTS "clEnqueueMarkerWithSyncObjectINTEL"
set(ADDITIONAL_EXPORTS
"clEnqueueMarkerWithSyncObjectINTEL"
"clGetCLObjectInfoINTEL"
"clGetCLEventInfoINTEL"
"clReleaseGlSharedEventINTEL")
"clReleaseGlSharedEventINTEL"
)
foreach(EXPORT_NAME ${ADDITIONAL_EXPORTS})
set(MSVC_DEF_ADDITIONAL_EXPORTS "${MSVC_DEF_ADDITIONAL_EXPORTS}\n${EXPORT_NAME}")
endforeach(EXPORT_NAME)
endforeach()
set(MSVC_DEF_ADDITIONAL_EXPORTS "${MSVC_DEF_ADDITIONAL_EXPORTS}" PARENT_SCOPE)
endif()
set_property(GLOBAL PROPERTY RUNTIME_SRCS_SHARINGS_GL ${RUNTIME_SRCS_SHARINGS_GL})

2
opencl/source/sharings/va/CMakeLists.txt
View File

@@ -21,6 +21,6 @@ set_property(GLOBAL PROPERTY RUNTIME_SRCS_SHARINGS_VA ${RUNTIME_SRCS_SHARINGS_VA
if(NEO__LIBVA_FOUND)
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SHARINGS_VA})
endif(NEO__LIBVA_FOUND)
endif()
add_subdirectories()

28
opencl/test/unit_test/CMakeLists.txt
View File

@@ -91,7 +91,7 @@ set(NEO_IGDRCL_TESTS__TARGET_OBJECTS
)
if(DEFINED AUB_STREAM_PROJECT_NAME)
add_library (aub_stream_mock_lib OBJECT EXCLUDE_FROM_ALL
add_library(aub_stream_mock_lib OBJECT EXCLUDE_FROM_ALL
${NEO_SOURCE_DIR}/opencl/test/unit_test/aub_stream_mocks/aub_stream_interface_mock.cpp
)
list(APPEND NEO_IGDRCL_TESTS__TARGET_OBJECTS
@@ -274,7 +274,7 @@ function(neo_gen_kernels_with_internal_options platform_name_with_type platform_
set(outputdir "${TargetDir}/${suffix}/test_files/${NEO_ARCH}/")
set(workdir "${CMAKE_CURRENT_SOURCE_DIR}/${base_workdir}/")
if (NOT "${output_name_prefix}" STREQUAL "")
if(NOT "${output_name_prefix}" STREQUAL "")
set(basename ${output_name_prefix}_${basename})
endif()
@@ -285,7 +285,7 @@ function(neo_gen_kernels_with_internal_options platform_name_with_type platform_
${outputpath_base}.gen
)
if (NOT "${output_name_prefix}" STREQUAL "")
if(NOT "${output_name_prefix}" STREQUAL "")
set(output_name -output ${basename})
endif()
@@ -448,7 +448,7 @@ macro(macro_for_each_gen)
neo_gen_kernels_with_options(${family_name_with_type} ${PLATFORM_LOWER} ${family_name_with_type} ${TEST_KERNEL} ${TEST_KERNEL_options})
# Compile platform specific kernels if any were found
file(GLOB_RECURSE ${PLATFORM_LOWER}_TEST_KERNELS test_files/*.${PLATFORM_LOWER})
if (NOT "${${PLATFORM_LOWER}_TEST_KERNELS}" STREQUAL "")
if(NOT "${${PLATFORM_LOWER}_TEST_KERNELS}" STREQUAL "")
neo_gen_kernels(${family_name_with_type} ${PLATFORM_LOWER} ${family_name_with_type} ${${PLATFORM_LOWER}_TEST_KERNELS})
endif()
# Temporarily disabled debug kernel generation on gen8
@@ -456,7 +456,7 @@ macro(macro_for_each_gen)
neo_gen_kernel_with_kernel_debug_options(${family_name_with_type} ${PLATFORM_LOWER} ${family_name_with_type} ${TEST_KERNEL})
endif()
# Gen9lp needs extra -m32 flag
if( ("${GEN_TYPE_LOWER}" STREQUAL "gen9") AND ("${PLATFORM_TYPE_LOWER}" STREQUAL "lp"))
if(("${GEN_TYPE_LOWER}" STREQUAL "gen9") AND ("${PLATFORM_TYPE_LOWER}" STREQUAL "lp"))
neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${family_name_with_type} ${TEST_KERNEL_PRINTF} "" ${TEST_KERNEL_PRINTF_internal_options_gen9lp})
neo_gen_kernels_with_internal_options(${family_name_with_type} ${PLATFORM_LOWER} ${family_name_with_type} ${TEST_KERNEL_STATELESS} "" ${TEST_KERNEL_STATELESS_internal_options_gen9lp})
else()
@@ -515,11 +515,13 @@ if(MSVC AND NOT DISABLE_ULT_PCH_WIN)
set_source_files_properties(${UltSources}
PROPERTIES COMPILE_FLAGS "/Yu${UltPchHeader} /FI${UltPchHeader} /Fp${UltPchBinary}"
OBJECT_DEPENDS "${UltPchBinary}")
OBJECT_DEPENDS "${UltPchBinary}"
)
set_source_files_properties(${UltPchSource}
PROPERTIES COMPILE_FLAGS "/Yc${UltPchHeader} /FI${UltPchHeader} /Fp${UltPchBinary}"
OBJECT_OUTPUTS "${UltPchBinary}")
OBJECT_OUTPUTS "${UltPchBinary}"
)
elseif(USE_ULT_PCH)
set(UltPchHeaderInBuildDir "${CMAKE_CURRENT_BINARY_DIR}/igdrcl_tests_pch.h")
set(UltPchBinaryGch "${UltPchHeaderInBuildDir}.gch")
@@ -530,7 +532,8 @@ elseif(USE_ULT_PCH)
target_include_directories(igdrcl_ult_pch PRIVATE
$<TARGET_PROPERTY:${NEO_MOCKABLE_LIB_NAME},INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:igdrcl_tests,INCLUDE_DIRECTORIES>)
$<TARGET_PROPERTY:igdrcl_tests,INCLUDE_DIRECTORIES>
)
target_compile_definitions(igdrcl_ult_pch PRIVATE $<TARGET_PROPERTY:${NEO_MOCKABLE_LIB_NAME},INTERFACE_COMPILE_DEFINITIONS>)
target_include_directories(igdrcl_tests PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
@@ -538,18 +541,21 @@ elseif(USE_ULT_PCH)
if(NOT USE_ASAN)
set_source_files_properties(${UltSources}
PROPERTIES COMPILE_FLAGS "-include ${UltPchHeaderInBuildDir} -msse4"
OBJECT_DEPENDS ${UltPchBinaryGch})
OBJECT_DEPENDS ${UltPchBinaryGch}
)
endif()
set_source_files_properties(${UltPchHeader}
PROPERTIES LANGUAGE "CXX"
COMPILE_FLAGS "-x c++-header -msse4 -gdwarf-2")
COMPILE_FLAGS "-x c++-header -msse4 -gdwarf-2"
)
add_custom_command(
OUTPUT ${UltPchBinaryGch}
COMMAND cp "${UltPchHeader}" "${UltPchHeaderInBuildDir}"
COMMAND cp "${UltPchBinary}" "${UltPchBinaryGch}"
DEPENDS ${UltPchBinary})
DEPENDS ${UltPchBinary}
)
endif()
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
# !! !!

4
opencl/test/unit_test/aub_tests/cmake/run_aub_test_target.cmake
View File

@@ -19,11 +19,11 @@ if(WIN32)
endif()
set(aub_tests_options "")
if (NOT ${AUB_DUMP_BUFFER_FORMAT} STREQUAL "")
if(NOT ${AUB_DUMP_BUFFER_FORMAT} STREQUAL "")
list(APPEND aub_tests_options --dump_buffer_format)
list(APPEND aub_tests_options ${AUB_DUMP_BUFFER_FORMAT})
endif()
if (NOT ${AUB_DUMP_IMAGE_FORMAT} STREQUAL "")
if(NOT ${AUB_DUMP_IMAGE_FORMAT} STREQUAL "")
list(APPEND aub_tests_options --dump_image_format)
list(APPEND aub_tests_options ${AUB_DUMP_IMAGE_FORMAT})
endif()

6
opencl/test/unit_test/libult/CMakeLists.txt
View File

@@ -74,7 +74,7 @@ set(IGDRCL_SRCS_LIB_ULT_WINDOWS
${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/windows/mock_environment_variables.cpp
)
add_library (igdrcl_libult OBJECT EXCLUDE_FROM_ALL
add_library(igdrcl_libult OBJECT EXCLUDE_FROM_ALL
${IGDRCL_SRCS_LIB_ULT}
${IGDRCL_SRCS_ENABLE_TESTED_HW}
)
@@ -86,7 +86,7 @@ set(IGDRCL_SRCS_LIB_ULT_CS
${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/create_command_stream.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/libult/create_command_stream.h
)
add_library (igdrcl_libult_cs OBJECT EXCLUDE_FROM_ALL
add_library(igdrcl_libult_cs OBJECT EXCLUDE_FROM_ALL
${IGDRCL_SRCS_LIB_ULT_CS}
)
target_include_directories(igdrcl_libult PRIVATE
@@ -120,7 +120,7 @@ set(IGDRCL_SRCS_LIB_ULT_ENV
${NEO_SOURCE_DIR}/opencl/test/unit_test/ult_config_listener.h
)
add_library (igdrcl_libult_env OBJECT EXCLUDE_FROM_ALL
add_library(igdrcl_libult_env OBJECT EXCLUDE_FROM_ALL
${IGDRCL_SRCS_LIB_ULT_ENV}
)

2
opencl/test/unit_test/mocks/gl/windows/CMakeLists.txt
View File

@@ -5,7 +5,7 @@
#
if(WIN32)
list (APPEND IGDRCL_SRCS_tests_mocks_windows
list(APPEND IGDRCL_SRCS_tests_mocks_windows
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/mock_gl_arb_sync_event_windows.h
${CMAKE_CURRENT_SOURCE_DIR}/mock_gl_sharing_windows.cpp

1
opencl/test/unit_test/mt_tests/CMakeLists.txt
View File

@@ -57,7 +57,6 @@ if(WIN32)
add_dependencies(igdrcl_mt_tests mock_gdi igdrcl_tests)
endif()
add_dependencies(igdrcl_mt_tests test_dynamic_lib)
create_project_source_tree(igdrcl_mt_tests)

21
opencl/test/unit_test/offline_compiler/CMakeLists.txt
View File

@@ -6,21 +6,20 @@
project(ocloc_tests)
set(IGDRCL_SRCS_cloc
${OCLOC_DIRECTORY}/source/decoder/binary_decoder.cpp
${OCLOC_DIRECTORY}/source/decoder/binary_encoder.cpp
${OCLOC_DIRECTORY}/source/offline_compiler.cpp
${OCLOC_DIRECTORY}/source/ocloc_fatbinary.cpp
${OCLOC_DIRECTORY}/source/decoder/binary_decoder.cpp
${OCLOC_DIRECTORY}/source/decoder/binary_encoder.cpp
${OCLOC_DIRECTORY}/source/offline_compiler.cpp
${OCLOC_DIRECTORY}/source/ocloc_fatbinary.cpp
)
set(IGDRCL_SRCS_offline_compiler_mock
${CMAKE_CURRENT_SOURCE_DIR}/decoder/mock/mock_decoder.h
${CMAKE_CURRENT_SOURCE_DIR}/decoder/mock/mock_encoder.h
${CMAKE_CURRENT_SOURCE_DIR}/decoder/mock/mock_iga_wrapper.h
${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_argument_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_offline_compiler.h
${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_sip_ocloc_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/decoder/mock/mock_decoder.h
${CMAKE_CURRENT_SOURCE_DIR}/decoder/mock/mock_encoder.h
${CMAKE_CURRENT_SOURCE_DIR}/decoder/mock/mock_iga_wrapper.h
${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_argument_helper.h
${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_offline_compiler.h
${CMAKE_CURRENT_SOURCE_DIR}/mock/mock_sip_ocloc_tests.cpp
)
set(CLOC_LIB_SRCS_UTILITIES

8
opencl/test/unit_test/os_interface/linux/CMakeLists.txt
View File

@@ -38,15 +38,15 @@ set(IGDRCL_SRCS_tests_os_interface_linux
${CMAKE_CURRENT_SOURCE_DIR}/self_lib_lin.cpp
)
if(SUPPORT_DG1 AND "${BRANCH_TYPE}" STREQUAL "")
list(APPEND IGDRCL_SRCS_tests_os_interface_linux
list(APPEND IGDRCL_SRCS_tests_os_interface_linux
${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_info_tests_dg1.cpp
${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager_allocate_in_device_pool_tests_dg1.cpp
)
)
else()
list(APPEND IGDRCL_SRCS_tests_os_interface_linux
list(APPEND IGDRCL_SRCS_tests_os_interface_linux
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_memory_info_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_memory_manager_allocate_in_device_pool_tests.cpp
)
)
endif()
if(UNIX)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_os_interface_linux})

1
opencl/test/unit_test/perf_tests/CMakeLists.txt
View File

@@ -19,4 +19,3 @@ set(IGDRCL_SRCS_performance_tests
PARENT_SCOPE
)

3
opencl/test/unit_test/perf_tests/api/CMakeLists.txt
View File

@@ -9,4 +9,5 @@ set(IGDRCL_SRCS_perf_tests_api
"${CMAKE_CURRENT_SOURCE_DIR}/api_tests.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/api_tests.h"
"${CMAKE_CURRENT_SOURCE_DIR}/context_tests.cpp"
PARENT_SCOPE)
PARENT_SCOPE
)

2
opencl/test/unit_test/sharings/d3d/CMakeLists.txt
View File

@@ -10,4 +10,4 @@ if(WIN32)
${CMAKE_CURRENT_SOURCE_DIR}/context_d3d_tests.cpp
)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_sharings_d3d})
endif(WIN32)
endif()

2
opencl/test/unit_test/sharings/va/CMakeLists.txt
View File

@@ -23,6 +23,6 @@ set_property(GLOBAL PROPERTY IGDRCL_SRCS_tests_sharings_va ${IGDRCL_SRCS_tests_s
if(NEO__LIBVA_FOUND)
list(APPEND IGDRCL_SRCS_tests_sharings_va ${CMAKE_CURRENT_SOURCE_DIR}/va_sharing_enable_tests.cpp)
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_sharings_va})
endif(NEO__LIBVA_FOUND)
endif()
add_subdirectories()

30
opencl/test/unit_test/windows/CMakeLists.txt
View File

@@ -5,15 +5,15 @@
#
if(WIN32)
project(igdrcl_windows_dll_tests)
project(igdrcl_windows_dll_tests)
set(NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS
set(NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS
$<TARGET_OBJECTS:igdrcl_libult>
$<TARGET_OBJECTS:igdrcl_libult_env>
$<TARGET_OBJECTS:mock_gmm>
)
)
add_executable(igdrcl_windows_dll_tests
add_executable(igdrcl_windows_dll_tests
${NEO_IGDRCL_WINDOWS_DLL_TESTS_TARGET_OBJECTS}
${NEO_SOURCE_DIR}/opencl/source/aub/aub_stream_interface.cpp
${NEO_SOURCE_DIR}/opencl/source/dll/create_command_stream.cpp
@@ -25,29 +25,29 @@ add_executable(igdrcl_windows_dll_tests
${CMAKE_CURRENT_SOURCE_DIR}/os_interface_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/wddm_create_tests.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_mode.h
)
)
target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})
target_link_libraries(igdrcl_windows_dll_tests ${NEO_MOCKABLE_LIB_NAME} ${NEO_SHARED_MOCKABLE_LIB_NAME} igdrcl_mocks gmock-gtest ${IGDRCL_EXTRA_LIBS})
target_include_directories(igdrcl_windows_dll_tests PRIVATE
target_include_directories(igdrcl_windows_dll_tests PRIVATE
${NEO_SHARED_TEST_DIRECTORY}/unit_test/test_macros/header${BRANCH_DIR_SUFFIX}
${NEO_SOURCE_DIR}/opencl/test/unit_test/gen_common${BRANCH_DIR_SUFFIX}
${CMAKE_CURRENT_SOURCE_DIR}
)
)
create_project_source_tree(igdrcl_windows_dll_tests)
create_project_source_tree(igdrcl_windows_dll_tests)
add_custom_target(run_windows_dll_tests ALL DEPENDS unit_tests igdrcl_windows_dll_tests)
add_custom_command(
add_custom_target(run_windows_dll_tests ALL DEPENDS unit_tests igdrcl_windows_dll_tests)
add_custom_command(
TARGET run_windows_dll_tests
POST_BUILD
COMMAND WORKING_DIRECTORY ${TargetDir}
COMMAND echo Target Directory is: ${TargetDir}
COMMAND echo Running Windows dll tests
COMMAND igdrcl_windows_dll_tests
)
add_dependencies(run_unit_tests run_windows_dll_tests)
)
add_dependencies(run_unit_tests run_windows_dll_tests)
set_target_properties(igdrcl_windows_dll_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
set_target_properties(run_windows_dll_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
set_target_properties(igdrcl_windows_dll_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
set_target_properties(run_windows_dll_tests PROPERTIES FOLDER ${OPENCL_TEST_PROJECTS_FOLDER})
endif()

122
os_release_info.cmake
View File

@@ -1,75 +1,72 @@
#
# Copyright (C) 2018-2019 Intel Corporation
# Copyright (C) 2018-2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
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)
# of the local cmake environment.
# Set cmake policies for at least this level:
cmake_minimum_required(VERSION 2.8.12)
# Set cmake policies for at least this level:
cmake_minimum_required(VERSION 2.8.12)
# Function get_os_release_info - Determine and return OS name and version
#
# 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
#
# 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)
function(get_os_release_info _vn_id _vn_version_id _vn_codename)
set(_var_id "")
set(_var_version_id "")
set(_var_codename "")
@@ -158,7 +155,6 @@ function(get_os_release_info _vn_id _vn_version_id _vn_codename)
if(NOT "${_vn_codename}" STREQUAL "")
set(${_vn_codename} "${_var_codename}" PARENT_SCOPE)
endif()
endfunction()
endfunction()
endif(NOT DEFINED _os_release_info)
endif()

2
package.cmake
View File

@@ -176,4 +176,4 @@ if(UNIX)
if(__HAS_PARENT)
set(NEO__COMPONENT_NAME "opencl" PARENT_SCOPE)
endif()
endif(UNIX)
endif()

2
scripts/format/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
#
# Copyright (C) 2019 Intel Corporation
# Copyright (C) 2019-2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#

157
scripts/format/cmake_format.py Executable file
View File

@@ -0,0 +1,157 @@
#!/usr/bin/env python3
#
# Copyright (C) 2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#
import sys
import argparse
import re
def remove_end_args(line):
if line.startswith('endif('):
line = re.sub(r'endif\(.*\)', 'endif()', line)
elif line.startswith('endforeach('):
line = re.sub(r'endforeach\(.*\)', 'endforeach()', line)
elif line.startswith('endmacro('):
line = re.sub(r'endmacro\(.*\)', 'endmacro()', line)
elif line.startswith('endfunction('):
line = re.sub(r'endfunction\(.*\)', 'endfunction()', line)
return line
def remove_extra_spaces(line):
line = re.sub(r' +', ' ', line)
line = re.sub(r' *\( *', '(', line)
line = re.sub(r' *\) *', ')', line)
line = re.sub(r'\)AND\(', ') AND (', line)
line = re.sub(r'\)OR\(', ') OR (', line)
line = re.sub(r'NOT\(', 'NOT (', line)
return line
def process_line(line):
split = line.split('"')
opening_bracket_count = 0
closing_bracket_count = 0
new_line = []
is_string = False
is_first_part = True
for l in split:
if not is_string:
l = replace_tabs(l)
l = remove_extra_spaces(l)
l = remove_end_args(l)
if not is_first_part or not l.startswith('#'):
l = re.sub(r' *#', ' #', l)
opening_bracket_count += l.count('(')
closing_bracket_count += l.count(')')
new_line.append(l)
is_string = True
else:
new_line.append(l)
if not l.endswith('\\') or l.endswith('\\\\'):
is_string = False
is_first_part = False
return '"'.join(new_line), opening_bracket_count, closing_bracket_count
def replace_tabs(line):
return line.replace('\t', ' ')
def format_file(file):
indent_size = 2
indent_depth = 0
extra_indent = ''
previous_is_new_line = False
lines = None
with open(file) as fin:
lines = fin.readlines()
with open(file, 'w') as fout:
for line in lines:
indent = ''
line = line.strip()
if line.startswith('#'):
indent = ' ' * indent_size * indent_depth
fout.write(f'{indent}{extra_indent}{line}\n')
previous_is_new_line = False
continue
line, opening_bracket_count, closing_bracket_count = process_line(
line)
if line.startswith('endif('):
indent_depth -= 1
elif line.startswith('else('):
indent_depth -= 1
elif line.startswith('elseif('):
indent_depth -= 1
elif line.startswith('endforeach('):
indent_depth -= 1
elif line.startswith('endmacro('):
indent_depth -= 1
elif line.startswith('endfunction('):
indent_depth -= 1
if line:
indent = ' ' * indent_size * indent_depth
previous_is_new_line = False
else:
if not previous_is_new_line:
fout.write('\n')
previous_is_new_line = True
continue
if closing_bracket_count > opening_bracket_count:
if not line.startswith(')'):
line = line.replace(')', f'\n{indent})', 1)
line = f'{indent}{extra_indent}{line}'
indent = ''
extra_indent = ''
fout.write(f'{indent}{extra_indent}{line}\n')
if line.startswith('if('):
indent_depth += 1
elif line.startswith('else('):
indent_depth += 1
elif line.startswith('elseif('):
indent_depth += 1
elif line.startswith('foreach('):
indent_depth += 1
elif line.startswith('macro('):
indent_depth += 1
elif line.startswith('function('):
indent_depth += 1
if opening_bracket_count > closing_bracket_count:
extra_indent = ' ' * \
len(re.match(r'.*\(', line).group(0))
def _parse_args():
parser = argparse.ArgumentParser(
description='Usage: ./scripts/format/cmake_format.py <files>')
parser.add_argument('files', nargs='*')
args = parser.parse_args()
return vars(args)
def main(args):
for file in args['files']:
format_file(file)
return 0
if __name__ == '__main__':
sys.exit(main(_parse_args()))

2
scripts/lint/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
#
# Copyright (C) 2018-2019 Intel Corporation
# Copyright (C) 2018-2020 Intel Corporation
#
# SPDX-License-Identifier: MIT
#

2
shared/generate_cpp_array/CMakeLists.txt
View File

@@ -8,4 +8,4 @@ set(CPP_GENERATE_TOOL_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
${CMAKE_CURRENT_SOURCE_DIR}/source/generate_cpp_array.cpp
)
add_executable (cpp_generate_tool "${CPP_GENERATE_TOOL_SOURCES}")
add_executable(cpp_generate_tool "${CPP_GENERATE_TOOL_SOURCES}")

12
shared/offline_compiler/source/CMakeLists.txt
View File

@@ -151,7 +151,8 @@ target_include_directories(${OCLOC_NAME}_lib BEFORE PRIVATE ${CLOC_LIB_INCLUDES}
target_include_directories(${OCLOC_NAME}_lib BEFORE PRIVATE ${IGA_INCLUDE_DIR})
target_compile_definitions(${OCLOC_NAME}_lib PUBLIC ${CLOC_LIB_LIB_FLAGS_DEFINITIONS} ${SUPPORTED_GEN_FLAGS_DEFINITONS} DEFAULT_PLATFORM=${DEFAULT_SUPPORTED_PLATFORM}
IGA_LIBRARY_NAME=${CMAKE_SHARED_LIBRARY_PREFIX}${IGA_LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
IGA_LIBRARY_NAME=${CMAKE_SHARED_LIBRARY_PREFIX}${IGA_LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
)
target_compile_definitions(${OCLOC_NAME}_lib PUBLIC ${NEO__IGC_COMPILE_DEFINITIONS})
if(MSVC)
@@ -190,15 +191,18 @@ if(UNIX)
install(FILES $<TARGET_FILE:${OCLOC_NAME}>
DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
COMPONENT ${OCLOC_NAME})
COMPONENT ${OCLOC_NAME}
)
install(FILES $<TARGET_FILE:${OCLOC_NAME}_lib>
DESTINATION ${CMAKE_INSTALL_LIBDIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
COMPONENT ${OCLOC_NAME})
COMPONENT ${OCLOC_NAME}
)
install(FILES ${OCLOC_DIRECTORY}/source/ocloc_api.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
COMPONENT ${OCLOC_NAME})
COMPONENT ${OCLOC_NAME}
)
endif()
set(OCLOC_OUTPUT_NAME "${OCLOC_NAME}${OCLOC_BITNESS_SUFFIX}")

4
shared/source/built_ins/kernels/CMakeLists.txt
View File

@@ -23,7 +23,7 @@ set(BUILTIN_OPTIONS_STATELESS
"-cl-intel-greater-than-4GB-buffer-required"
)
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
list(APPEND __cloc__options__ "-D DEBUG")
endif()
@@ -32,7 +32,7 @@ set(BUILTIN_CPP "")
function(get_bits_for_stateless gen_type platform_type)
# Force 32bits compiling on gen9lp for stateless builtins
if( (${GEN_TYPE} STREQUAL "GEN9" ) AND ( ${PLATFORM_TYPE} STREQUAL "LP"))
if((${GEN_TYPE} STREQUAL "GEN9") AND (${PLATFORM_TYPE} STREQUAL "LP"))
set(BITS "32" PARENT_SCOPE)
else()
set(BITS ${NEO_BITS} PARENT_SCOPE)

8
shared/source/gen12lp/CMakeLists.txt
View File

@@ -5,15 +5,15 @@
#
if(SUPPORT_DG1)
set(SHARED_SRCS_ADDITIONAL_FILES_GEN12LP
set(SHARED_SRCS_ADDITIONAL_FILES_GEN12LP
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/helpers_gen12lp_dg1.cpp
${CMAKE_CURRENT_SOURCE_DIR}/helpers_gen12lp.h
)
)
else()
set(SHARED_SRCS_ADDITIONAL_FILES_GEN12LP
set(SHARED_SRCS_ADDITIONAL_FILES_GEN12LP
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/helpers_gen12lp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/helpers_gen12lp.h
)
)
endif()
set_property(GLOBAL PROPERTY SHARED_SRCS_ADDITIONAL_FILES_GEN12LP ${SHARED_SRCS_ADDITIONAL_FILES_GEN12LP})

8
shared/source/os_interface/linux/CMakeLists.txt
View File

@@ -57,15 +57,15 @@ set(NEO_CORE_OS_INTERFACE_LINUX
)
if(SUPPORT_DG1 AND "${BRANCH_TYPE}" STREQUAL "")
list(APPEND NEO_CORE_OS_INTERFACE_LINUX
list(APPEND NEO_CORE_OS_INTERFACE_LINUX
${CMAKE_CURRENT_SOURCE_DIR}/drm_memory_manager_allocate_in_device_pool_dg1.cpp
${CMAKE_CURRENT_SOURCE_DIR}/drm_query_dg1.cpp
)
)
else()
list(APPEND NEO_CORE_OS_INTERFACE_LINUX
list(APPEND NEO_CORE_OS_INTERFACE_LINUX
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_memory_manager_allocate_in_device_pool.cpp
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}/drm_query.cpp
)
)
endif()
set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_LINUX ${NEO_CORE_OS_INTERFACE_LINUX})

4
shared/test/unit_test/CMakeLists.txt
View File

@@ -62,7 +62,7 @@ if(NOT SKIP_NEO_UNIT_TESTS AND NOT SKIP_UNIT_TESTS)
$<TARGET_OBJECTS:mock_gmm>
)
if (UNIX)
if(UNIX)
target_sources(${TARGET_NAME} PRIVATE
${NEO_SOURCE_DIR}/opencl/source/dll/linux/os_interface.cpp
${NEO_SOURCE_DIR}/opencl/test/unit_test/os_interface/linux/create_drm_memory_manager.cpp
@@ -89,7 +89,7 @@ if(NOT SKIP_NEO_UNIT_TESTS AND NOT SKIP_UNIT_TESTS)
${NEO_SHARED_TEST_DIRECTORY}/unit_test/test_macros/header${BRANCH_DIR_SUFFIX}
)
if (UNIX)
if(UNIX)
target_link_libraries(${TARGET_NAME} pthread rt)
else()
target_link_libraries(${TARGET_NAME} dbghelp)

1
shared/test/unit_test/helpers/CMakeLists.txt
View File

@@ -32,7 +32,6 @@ set(NEO_CORE_HELPERS_TESTS
set_property(GLOBAL PROPERTY NEO_CORE_HELPERS_TESTS ${NEO_CORE_HELPERS_TESTS})
add_subdirectories()
target_sources(${TARGET_NAME} PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/state_base_address_tests.h
${CMAKE_CURRENT_SOURCE_DIR}/state_base_address_tests.cpp

2
version.cmake
View File

@@ -64,7 +64,7 @@ else()
set(NEO_VERSION_BUILD 0)
endif()
set(NEO_OCL_DRIVER_VERSION "${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_VERSION_BUILD}")
endif(UNIX)
endif()
# Level-Zero package version
set(NEO_L0_VERSION_MAJOR 1)