From 093fcfc7e12e108f07e2ee040a1ef129e1a0eba7 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Tue, 2 Jul 2024 14:24:10 +0000 Subject: [PATCH] build: ensure cpp builtins are copied for all releases Signed-off-by: Mateusz Jablonski --- manifests/manifest.yml | 2 +- shared/source/built_ins/kernels/CMakeLists.txt | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/manifests/manifest.yml b/manifests/manifest.yml index e54592d9e5..5ffdd44e73 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -42,7 +42,7 @@ components: dest_dir: kernels_bin type: git branch: kernels_bin - revision: 2915-1944 + revision: 2915-1951 kmdaf: branch: kmdaf dest_dir: kmdaf diff --git a/shared/source/built_ins/kernels/CMakeLists.txt b/shared/source/built_ins/kernels/CMakeLists.txt index fe6e72771d..75146e0604 100644 --- a/shared/source/built_ins/kernels/CMakeLists.txt +++ b/shared/source/built_ins/kernels/CMakeLists.txt @@ -134,14 +134,12 @@ function(compile_builtin core_type platform_it builtin bits builtin_options mode endif() endforeach() set(_file_prebuilt "${NEO_KERNELS_BIN_DIR}/built_ins/${NEO_ARCH}/${core_type_lower}/${mode}_${BASENAME}_${RELEASE_FILENAME}.cpp") - if(EXISTS ${_file_prebuilt}) - add_custom_command( - OUTPUT ${OUTPUT_FILE_CPP} - COMMAND ${CMAKE_COMMAND} -E make_directory ${OUTPUTDIR} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${_file_prebuilt} ${OUTPUTDIR} - ) - list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}") - endif() + add_custom_command( + OUTPUT ${OUTPUT_FILE_CPP} + COMMAND ${CMAKE_COMMAND} -E make_directory ${OUTPUTDIR} + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${_file_prebuilt} ${OUTPUTDIR} + ) + list(APPEND BUILTINS_COMMANDS "${OUTPUT_FILE_CPP}") endif() endforeach() set(BUILTINS_COMMANDS ${BUILTINS_COMMANDS} PARENT_SCOPE) @@ -287,4 +285,4 @@ if(NOT "${OUTPUT_LIST_CPP_FILES}" STREQUAL "") ) endif() -apply_macro_for_each_core_type("SUPPORTED") \ No newline at end of file +apply_macro_for_each_core_type("SUPPORTED")