Fix typo BUIILINS -> BUILTINS
Signed-off-by: Pawel Cieslak <pawel.cieslak@intel.com>
This commit is contained in:
parent
0e69eb47b5
commit
c5dc389cb9
|
@ -15,7 +15,7 @@ endif()
|
||||||
project(neo)
|
project(neo)
|
||||||
set(MSVC_DEF_ADDITIONAL_EXPORTS "")
|
set(MSVC_DEF_ADDITIONAL_EXPORTS "")
|
||||||
set(OPENCL_RUNTIME_PROJECTS_FOLDER "opencl runtime")
|
set(OPENCL_RUNTIME_PROJECTS_FOLDER "opencl runtime")
|
||||||
set(OPENCL_BUIILINS_PROJECTS_FOLDER "built_ins")
|
set(OPENCL_BUILTINS_PROJECTS_FOLDER "built_ins")
|
||||||
|
|
||||||
if(NOT TARGET ${BIKSIM_LIB_NAME})
|
if(NOT TARGET ${BIKSIM_LIB_NAME})
|
||||||
add_subdirectory(builtin_kernels_simulation)
|
add_subdirectory(builtin_kernels_simulation)
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
|
if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
|
||||||
add_custom_target(builtins_vme_sources)
|
add_custom_target(builtins_vme_sources)
|
||||||
set_target_properties(builtins_vme_sources PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUIILINS_PROJECTS_FOLDER}")
|
set_target_properties(builtins_vme_sources PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUILTINS_PROJECTS_FOLDER}")
|
||||||
set(BUILTINS_OUTDIR_WITH_ARCH "${TargetDir}/built_ins/${NEO_ARCH}")
|
set(BUILTINS_OUTDIR_WITH_ARCH "${TargetDir}/built_ins/${NEO_ARCH}")
|
||||||
add_dependencies(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} builtins_vme_sources)
|
add_dependencies(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} builtins_vme_sources)
|
||||||
add_subdirectories()
|
add_subdirectories()
|
||||||
|
|
|
@ -9,7 +9,7 @@ add_library(${BUILTINS_VME_LIB_NAME} OBJECT EXCLUDE_FROM_ALL
|
||||||
register_ext_vme_source.cpp
|
register_ext_vme_source.cpp
|
||||||
)
|
)
|
||||||
set_target_properties(${BUILTINS_VME_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
set_target_properties(${BUILTINS_VME_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
||||||
set_target_properties(${BUILTINS_VME_LIB_NAME} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUIILINS_PROJECTS_FOLDER}")
|
set_target_properties(${BUILTINS_VME_LIB_NAME} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUILTINS_PROJECTS_FOLDER}")
|
||||||
|
|
||||||
target_include_directories(${BUILTINS_VME_LIB_NAME} PRIVATE
|
target_include_directories(${BUILTINS_VME_LIB_NAME} PRIVATE
|
||||||
${KHRONOS_HEADERS_DIR}
|
${KHRONOS_HEADERS_DIR}
|
||||||
|
|
|
@ -57,5 +57,5 @@ target_include_directories(${BIKSIM_LIB_NAME} BEFORE PRIVATE
|
||||||
${NEO__IGC_INCLUDE_DIR}
|
${NEO__IGC_INCLUDE_DIR}
|
||||||
${THIRD_PARTY_DIR}
|
${THIRD_PARTY_DIR}
|
||||||
)
|
)
|
||||||
set_target_properties(${BIKSIM_LIB_NAME} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUIILINS_PROJECTS_FOLDER}")
|
set_target_properties(${BIKSIM_LIB_NAME} PROPERTIES FOLDER "${OPENCL_RUNTIME_PROJECTS_FOLDER}/${OPENCL_BUILTINS_PROJECTS_FOLDER}")
|
||||||
target_compile_definitions(${BIKSIM_LIB_NAME} PUBLIC ${SUPPORTED_GEN_FLAGS_DEFINITONS} ${DEFAULT_GEN_PLATFORMS_DEFITIONS} MOCKABLE_VIRTUAL=)
|
target_compile_definitions(${BIKSIM_LIB_NAME} PUBLIC ${SUPPORTED_GEN_FLAGS_DEFINITONS} ${DEFAULT_GEN_PLATFORMS_DEFITIONS} MOCKABLE_VIRTUAL=)
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# SPDX-License-Identifier: MIT
|
# SPDX-License-Identifier: MIT
|
||||||
#
|
#
|
||||||
|
|
||||||
set(SHARED_BUIILINS_PROJECTS_FOLDER "built_ins")
|
set(SHARED_BUILTINS_PROJECTS_FOLDER "built_ins")
|
||||||
set(NEO_CORE_SRCS_BUILT_INS
|
set(NEO_CORE_SRCS_BUILT_INS
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
|
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/built_ins_storage.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/built_ins_storage.cpp
|
||||||
|
|
|
@ -65,7 +65,7 @@ endif()
|
||||||
|
|
||||||
set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX)
|
set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX)
|
||||||
set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
||||||
set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}")
|
set_target_properties(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUILTINS_PROJECTS_FOLDER}")
|
||||||
|
|
||||||
target_include_directories(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PRIVATE
|
target_include_directories(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} PRIVATE
|
||||||
${ENGINE_NODE_DIR}
|
${ENGINE_NODE_DIR}
|
||||||
|
@ -83,7 +83,7 @@ endif()
|
||||||
|
|
||||||
set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX)
|
set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES LINKER_LANGUAGE CXX)
|
||||||
set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
||||||
set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}")
|
set_target_properties(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUILTINS_PROJECTS_FOLDER}")
|
||||||
|
|
||||||
target_include_directories(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PRIVATE
|
target_include_directories(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} PRIVATE
|
||||||
${ENGINE_NODE_DIR}
|
${ENGINE_NODE_DIR}
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
|
if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
|
||||||
add_custom_target(builtins)
|
add_custom_target(builtins)
|
||||||
set_target_properties(builtins PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}")
|
set_target_properties(builtins PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUILTINS_PROJECTS_FOLDER}")
|
||||||
set(BUILTINS_OUTDIR_WITH_ARCH "${TargetDir}/built_ins/${NEO_ARCH}")
|
set(BUILTINS_OUTDIR_WITH_ARCH "${TargetDir}/built_ins/${NEO_ARCH}")
|
||||||
add_dependencies(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} builtins)
|
add_dependencies(${BUILTINS_BINARIES_BINDFUL_LIB_NAME} builtins)
|
||||||
add_dependencies(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} builtins)
|
add_dependencies(${BUILTINS_BINARIES_BINDLESS_LIB_NAME} builtins)
|
||||||
|
@ -164,7 +164,7 @@ if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
|
||||||
set(target_name builtins_${family_name_with_type})
|
set(target_name builtins_${family_name_with_type})
|
||||||
add_custom_target(${target_name})
|
add_custom_target(${target_name})
|
||||||
add_dependencies(builtins ${target_name})
|
add_dependencies(builtins ${target_name})
|
||||||
set_target_properties(${target_name} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}/${family_name_with_type}")
|
set_target_properties(${target_name} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUILTINS_PROJECTS_FOLDER}/${family_name_with_type}")
|
||||||
foreach(MODE ${BIND_MODES})
|
foreach(MODE ${BIND_MODES})
|
||||||
unset(BUILTINS_COMMANDS)
|
unset(BUILTINS_COMMANDS)
|
||||||
foreach(GENERATED_BUILTIN ${GENERATED_BUILTINS})
|
foreach(GENERATED_BUILTIN ${GENERATED_BUILTINS})
|
||||||
|
@ -193,7 +193,7 @@ if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
|
||||||
set_property(GLOBAL PROPERTY GENERATED_BUILTINS_CPPS_${MODE} ${GENERATED_BUILTINS_CPPS_${MODE}})
|
set_property(GLOBAL PROPERTY GENERATED_BUILTINS_CPPS_${MODE} ${GENERATED_BUILTINS_CPPS_${MODE}})
|
||||||
add_custom_target(${target_name}_${MODE} DEPENDS ${BUILTINS_COMMANDS})
|
add_custom_target(${target_name}_${MODE} DEPENDS ${BUILTINS_COMMANDS})
|
||||||
add_dependencies(${target_name} ${target_name}_${MODE})
|
add_dependencies(${target_name} ${target_name}_${MODE})
|
||||||
set_target_properties(${target_name}_${MODE} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}/${family_name_with_type}")
|
set_target_properties(${target_name}_${MODE} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUILTINS_PROJECTS_FOLDER}/${family_name_with_type}")
|
||||||
endforeach()
|
endforeach()
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
@ -218,7 +218,7 @@ if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
|
||||||
add_library(${BUILTINS_SPIRV_LIB_NAME} OBJECT ${OUTPUT_LIST_CPP_FILES})
|
add_library(${BUILTINS_SPIRV_LIB_NAME} OBJECT ${OUTPUT_LIST_CPP_FILES})
|
||||||
set_target_properties(${BUILTINS_SPIRV_LIB_NAME} PROPERTIES
|
set_target_properties(${BUILTINS_SPIRV_LIB_NAME} PROPERTIES
|
||||||
POSITION_INDEPENDENT_CODE ON
|
POSITION_INDEPENDENT_CODE ON
|
||||||
FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}"
|
FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUILTINS_PROJECTS_FOLDER}"
|
||||||
)
|
)
|
||||||
|
|
||||||
apply_macro_for_each_gen("SUPPORTED")
|
apply_macro_for_each_gen("SUPPORTED")
|
||||||
|
|
|
@ -11,7 +11,7 @@ add_library(${BUILTINS_SOURCES_LIB_NAME} OBJECT EXCLUDE_FROM_ALL
|
||||||
)
|
)
|
||||||
|
|
||||||
set_target_properties(${BUILTINS_SOURCES_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
set_target_properties(${BUILTINS_SOURCES_LIB_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
|
||||||
set_target_properties(${BUILTINS_SOURCES_LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUIILINS_PROJECTS_FOLDER}")
|
set_target_properties(${BUILTINS_SOURCES_LIB_NAME} PROPERTIES FOLDER "${SHARED_SOURCE_PROJECTS_FOLDER}/${SHARED_BUILTINS_PROJECTS_FOLDER}")
|
||||||
|
|
||||||
target_include_directories(${BUILTINS_SOURCES_LIB_NAME} PRIVATE
|
target_include_directories(${BUILTINS_SOURCES_LIB_NAME} PRIVATE
|
||||||
${ENGINE_NODE_DIR}
|
${ENGINE_NODE_DIR}
|
||||||
|
|
Loading…
Reference in New Issue