allow disable builtins compilation

Related-To: NEO-6011
Signed-off-by: Artur Harasimiuk <artur.harasimiuk@intel.com>
This commit is contained in:
Artur Harasimiuk
2021-09-03 00:47:40 +00:00
committed by Compute-Runtime-Automation
parent 10a6934119
commit 5be234111c
11 changed files with 319 additions and 285 deletions

View File

@@ -1024,8 +1024,12 @@ macro(generate_runtime_lib LIB_NAME MOCKABLE GENERATE_EXEC)
target_compile_definitions(${BUILTINS_VME_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
target_compile_definitions(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
target_compile_definitions(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
if(TARGET ${BUILTINS_SPIRV_LIB_NAME})
target_compile_definitions(${BUILTINS_SPIRV_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
endif()
if(TARGET ${SCHEDULER_BINARY_LIB_NAME})
target_compile_definitions(${SCHEDULER_BINARY_LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=)
endif()
if(${MOCKABLE})
target_compile_definitions(${LIB_NAME} PUBLIC MOCKABLE_VIRTUAL=virtual)

View File

@@ -282,10 +282,12 @@ if(BUILD_WITH_L0)
$<TARGET_OBJECTS:aub_stream_all_hw>
)
endif()
if(TARGET ${BUILTINS_SPIRV_LIB_NAME})
target_sources(${TARGET_NAME_L0}
PRIVATE
$<TARGET_OBJECTS:${BUILTINS_SPIRV_LIB_NAME}>
)
endif()
if(NOT ${DONT_USE_PREBUILT_KERNELS_L0})
message("Prebuilt kernels are linked to Level Zero.")
target_sources(${TARGET_NAME_L0}

View File

@@ -72,10 +72,14 @@ target_sources(${TARGET_NAME} PRIVATE
$<TARGET_OBJECTS:${TARGET_NAME_L0}_fixtures>
$<TARGET_OBJECTS:${TARGET_NAME_L0}_mocks>
$<TARGET_OBJECTS:igdrcl_libult_common>
$<TARGET_OBJECTS:${BUILTINS_SPIRV_LIB_NAME}>
$<TARGET_OBJECTS:${BUILTINS_BINARIES_BINDFUL_LIB_NAME}>
$<TARGET_OBJECTS:${BUILTINS_BINARIES_BINDLESS_LIB_NAME}>
)
if(TARGET ${BUILTINS_SPIRV_LIB_NAME})
target_sources(${TARGET_NAME} PRIVATE
$<TARGET_OBJECTS:${BUILTINS_SPIRV_LIB_NAME}>
)
endif()
target_sources(${TARGET_NAME} PRIVATE
${NEO_SOURCE_DIR}/opencl/test/unit_test/helpers${BRANCH_DIR_SUFFIX}/kernel_binary_helper_hash_value.cpp

View File

@@ -126,10 +126,14 @@ target_sources(${TARGET_NAME} PRIVATE
$<TARGET_OBJECTS:mock_gmm>
$<TARGET_OBJECTS:${TARGET_NAME_L0}_fixtures>
$<TARGET_OBJECTS:${TARGET_NAME_L0}_mocks>
$<TARGET_OBJECTS:${BUILTINS_SPIRV_LIB_NAME}>
$<TARGET_OBJECTS:${BUILTINS_BINARIES_BINDFUL_LIB_NAME}>
$<TARGET_OBJECTS:${BUILTINS_BINARIES_BINDLESS_LIB_NAME}>
)
if(TARGET ${BUILTINS_SPIRV_LIB_NAME})
target_sources(${TARGET_NAME} PRIVATE
$<TARGET_OBJECTS:${BUILTINS_SPIRV_LIB_NAME}>
)
endif()
set(TEST_MODULES
${CMAKE_CURRENT_SOURCE_DIR}/test_modules/test_kernel.cl

View File

@@ -116,10 +116,14 @@ target_sources(${TARGET_NAME} PRIVATE
$<TARGET_OBJECTS:mock_gmm>
$<TARGET_OBJECTS:${TARGET_NAME_L0}_fixtures>
$<TARGET_OBJECTS:${TARGET_NAME_L0}_mocks>
$<TARGET_OBJECTS:${BUILTINS_SPIRV_LIB_NAME}>
$<TARGET_OBJECTS:${BUILTINS_BINARIES_BINDFUL_LIB_NAME}>
$<TARGET_OBJECTS:${BUILTINS_BINARIES_BINDLESS_LIB_NAME}>
)
if(TARGET ${BUILTINS_SPIRV_LIB_NAME})
target_sources(${TARGET_NAME} PRIVATE
$<TARGET_OBJECTS:${BUILTINS_SPIRV_LIB_NAME}>
)
endif()
option(L0_ULT_VERBOSE "Use the default/verbose test output" OFF)
if(NOT L0_ULT_VERBOSE)

View File

@@ -123,8 +123,12 @@ if(${GENERATE_EXECUTABLE})
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
$<TARGET_OBJECTS:${BUILTINS_VME_LIB_NAME}>
$<TARGET_OBJECTS:${BUILTINS_BINARIES_BINDFUL_LIB_NAME}>
)
if(TARGET ${SCHEDULER_BINARY_LIB_NAME})
list(APPEND NEO_DYNAMIC_LIB__TARGET_OBJECTS
$<TARGET_OBJECTS:${SCHEDULER_BINARY_LIB_NAME}>
)
endif()
if(DEFINED AUB_STREAM_PROJECT_NAME)
list(APPEND NEO_DYNAMIC_LIB__TARGET_OBJECTS $<TARGET_OBJECTS:${AUB_STREAM_PROJECT_NAME}_all_hw>)

View File

@@ -4,6 +4,7 @@
# SPDX-License-Identifier: MIT
#
if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
add_custom_target(builtins_vme_sources)
set_target_properties(builtins_vme_sources PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUIILINS_PROJECTS_FOLDER}")
set(BUILTINS_OUTDIR_WITH_ARCH "${TargetDir}/built_ins/${NEO_ARCH}")
@@ -105,3 +106,4 @@ macro(macro_for_each_gen)
endmacro()
apply_macro_for_each_gen("SUPPORTED")
endif()

View File

@@ -13,6 +13,6 @@ set(RUNTIME_SRCS_SCHEDULER
target_sources(${NEO_STATIC_LIB_NAME} PRIVATE ${RUNTIME_SRCS_SCHEDULER})
set_property(GLOBAL PROPERTY RUNTIME_SRCS_SCHEDULER ${RUNTIME_SRCS_SCHEDULER})
if(NOT (TARGET ${SCHEDULER_BINARY_LIB_NAME}))
if(NOT NEO_DISABLE_BUILTINS_COMPILATION AND NOT (TARGET ${SCHEDULER_BINARY_LIB_NAME}))
include(scheduler_binary.cmake)
endif()

View File

@@ -70,8 +70,12 @@ set(NEO_IGDRCL_TESTS__TARGET_OBJECTS
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
$<TARGET_OBJECTS:${BUILTINS_VME_LIB_NAME}>
$<TARGET_OBJECTS:${BUILTINS_BINARIES_BINDFUL_LIB_NAME}>
)
if(TARGET ${SCHEDULER_BINARY_LIB_NAME})
list(APPEND NEO_IGDRCL_TESTS__TARGET_OBJECTS
$<TARGET_OBJECTS:${SCHEDULER_BINARY_LIB_NAME}>
)
endif()
if(DEFINED AUB_STREAM_PROJECT_NAME)
add_library(aub_stream_mock_lib OBJECT EXCLUDE_FROM_ALL

View File

@@ -17,12 +17,16 @@ list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS
${NEO_SOURCE_DIR}/shared/test/common/test_macros/test_checks_shared.cpp
${NEO_SHARED_aub_tests_configurations}
$<TARGET_OBJECTS:${BUILTINS_SOURCES_LIB_NAME}>
$<TARGET_OBJECTS:${SCHEDULER_BINARY_LIB_NAME}>
$<TARGET_OBJECTS:igdrcl_libult>
$<TARGET_OBJECTS:igdrcl_libult_common>
$<TARGET_OBJECTS:igdrcl_libult_cs>
$<TARGET_OBJECTS:igdrcl_libult_env>
)
if(TARGET ${SCHEDULER_BINARY_LIB_NAME})
list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS
$<TARGET_OBJECTS:${SCHEDULER_BINARY_LIB_NAME}>
)
endif()
if(DEFINED AUB_STREAM_PROJECT_NAME)
list(APPEND IGDRCL_AUB_TESTS__TARGET_OBJECTS $<TARGET_OBJECTS:${AUB_STREAM_PROJECT_NAME}_all_hw>)

View File

@@ -4,6 +4,7 @@
# SPDX-License-Identifier: MIT
#
if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
add_custom_target(builtins)
set_target_properties(builtins PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}")
set(BUILTINS_OUTDIR_WITH_ARCH "${TargetDir}/built_ins/${NEO_ARCH}")
@@ -210,3 +211,4 @@ set_target_properties(${BUILTINS_SPIRV_LIB_NAME} PROPERTIES
)
apply_macro_for_each_gen("SUPPORTED")
endif()