[llvm] [cmake] Serialize native builds for Make generator (PR #121021)
via llvm-commits
llvm-commits at lists.llvm.org
Tue Jan 7 00:27:18 PST 2025
https://github.com/arthurqiu updated https://github.com/llvm/llvm-project/pull/121021
>From d3c3711e2ac030a2edc9c8a49b4c6c213615763a Mon Sep 17 00:00:00 2001
From: Arthurq Qiu <arthurq at nvidia.com>
Date: Mon, 23 Dec 2024 18:09:31 -0800
Subject: [PATCH 1/2] FileLock.cmake to serialize sub-make build for native
targets
---
llvm/cmake/modules/FileLock.cmake | 9 +++++++++
llvm/cmake/modules/LLVMExternalProjectUtils.cmake | 6 +++++-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 llvm/cmake/modules/FileLock.cmake
diff --git a/llvm/cmake/modules/FileLock.cmake b/llvm/cmake/modules/FileLock.cmake
new file mode 100644
index 00000000000000..0ee40a68333f2a
--- /dev/null
+++ b/llvm/cmake/modules/FileLock.cmake
@@ -0,0 +1,9 @@
+# CMake script that synchronizes process execution on a given file lock.
+#
+# Input variables:
+# LOCK_FILE_PATH - The file to be locked for the scope of the process of this cmake script.
+# COMMAND - The command to be executed.
+
+file(LOCK ${LOCK_FILE_PATH})
+separate_arguments(command_args NATIVE_COMMAND "${COMMAND}")
+execute_process(COMMAND ${command_args} COMMAND_ERROR_IS_FATAL ANY)
diff --git a/llvm/cmake/modules/LLVMExternalProjectUtils.cmake b/llvm/cmake/modules/LLVMExternalProjectUtils.cmake
index f7e1165bc4b947..3e843f178f6af5 100644
--- a/llvm/cmake/modules/LLVMExternalProjectUtils.cmake
+++ b/llvm/cmake/modules/LLVMExternalProjectUtils.cmake
@@ -9,7 +9,11 @@ function(llvm_ExternalProject_BuildCmd out_var target bin_dir)
endif()
if (CMAKE_GENERATOR MATCHES "Make")
# Use special command for Makefiles to support parallelism.
- set(${out_var} "$(MAKE)" "-C" "${bin_dir}" "${target}" PARENT_SCOPE)
+ set(make_cmd "$(MAKE)" "-C" "${bin_dir}" "${target}")
+ set(file_lock_script "${LLVM_CMAKE_DIR}/FileLock.cmake")
+ set(${out_var} ${CMAKE_COMMAND} "-DLOCK_FILE_PATH=${bin_dir}/cmake.lock"
+ "-DCOMMAND='${make_cmd}'"
+ -P "${file_lock_script}" PARENT_SCOPE)
else()
set(tool_args "${LLVM_EXTERNAL_PROJECT_BUILD_TOOL_ARGS}")
if(NOT tool_args STREQUAL "")
>From e419a5487c21cf70803cc8fd16ba81cfe2e61c92 Mon Sep 17 00:00:00 2001
From: Arthurq Qiu <arthurq at nvidia.com>
Date: Tue, 7 Jan 2025 00:26:38 -0800
Subject: [PATCH 2/2] add stamp_dir arg to llvm_ExternalProject_BuildCmd
---
llvm/cmake/modules/CrossCompile.cmake | 12 +++++++++++-
llvm/cmake/modules/LLVMExternalProjectUtils.cmake | 8 ++++----
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake
index c2cc84bec15217..6b0bf0aeaa0582 100644
--- a/llvm/cmake/modules/CrossCompile.cmake
+++ b/llvm/cmake/modules/CrossCompile.cmake
@@ -12,6 +12,14 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype)
message(STATUS "Setting native build dir to " ${${project_name}_${target_name}_BUILD})
endif(NOT DEFINED ${project_name}_${target_name}_BUILD)
+ if(NOT DEFINED ${project_name}_${target_name}_STAMP)
+ set(${project_name}_${target_name}_STAMP
+ "${CMAKE_CURRENT_BINARY_DIR}/${target_name}-stamps")
+ set(${project_name}_${target_name}_STAMP
+ ${${project_name}_${target_name}_STAMP} PARENT_SCOPE)
+ message(STATUS "Setting native stamp dir to " ${${project_name}_${target_name}_STAMP})
+ endif(NOT DEFINED ${project_name}_${target_name}_STAMP)
+
if (EXISTS ${LLVM_MAIN_SRC_DIR}/cmake/platforms/${toolchain}.cmake)
set(CROSS_TOOLCHAIN_FLAGS_INIT
-DCMAKE_TOOLCHAIN_FILE=\"${LLVM_MAIN_SRC_DIR}/cmake/platforms/${toolchain}.cmake\")
@@ -130,7 +138,9 @@ function(build_native_tool target output_path_var)
set_property(GLOBAL APPEND PROPERTY ${PROJECT_NAME}_HOST_TARGETS ${output_path})
endif()
- llvm_ExternalProject_BuildCmd(build_cmd ${target} ${${PROJECT_NAME}_NATIVE_BUILD}
+ llvm_ExternalProject_BuildCmd(build_cmd ${target}
+ ${${PROJECT_NAME}_NATIVE_BUILD}
+ ${${PROJECT_NAME}_NATIVE_STAMP}
CONFIGURATION Release)
add_custom_command(OUTPUT "${output_path}"
COMMAND ${build_cmd}
diff --git a/llvm/cmake/modules/LLVMExternalProjectUtils.cmake b/llvm/cmake/modules/LLVMExternalProjectUtils.cmake
index 3e843f178f6af5..27072e3a6e764f 100644
--- a/llvm/cmake/modules/LLVMExternalProjectUtils.cmake
+++ b/llvm/cmake/modules/LLVMExternalProjectUtils.cmake
@@ -2,7 +2,7 @@ include(ExternalProject)
# llvm_ExternalProject_BuildCmd(out_var target)
# Utility function for constructing command lines for external project targets
-function(llvm_ExternalProject_BuildCmd out_var target bin_dir)
+function(llvm_ExternalProject_BuildCmd out_var target bin_dir stamp_dir)
cmake_parse_arguments(ARG "" "CONFIGURATION" "" ${ARGN})
if(NOT ARG_CONFIGURATION)
set(ARG_CONFIGURATION "$<CONFIG>")
@@ -11,7 +11,7 @@ function(llvm_ExternalProject_BuildCmd out_var target bin_dir)
# Use special command for Makefiles to support parallelism.
set(make_cmd "$(MAKE)" "-C" "${bin_dir}" "${target}")
set(file_lock_script "${LLVM_CMAKE_DIR}/FileLock.cmake")
- set(${out_var} ${CMAKE_COMMAND} "-DLOCK_FILE_PATH=${bin_dir}/cmake.lock"
+ set(${out_var} ${CMAKE_COMMAND} "-DLOCK_FILE_PATH=${stamp_dir}/cmake.lock"
"-DCOMMAND='${make_cmd}'"
-P "${file_lock_script}" PARENT_SCOPE)
else()
@@ -413,7 +413,7 @@ function(llvm_ExternalProject_Add name source_dir)
set(force_deps DEPENDS ${TOOLCHAIN_BINS})
endif()
- llvm_ExternalProject_BuildCmd(run_clean clean ${BINARY_DIR})
+ llvm_ExternalProject_BuildCmd(run_clean clean ${BINARY_DIR} ${STAMP_DIR})
ExternalProject_Add_Step(${name} clean
COMMAND ${run_clean}
COMMENT "Cleaning ${name}..."
@@ -453,7 +453,7 @@ function(llvm_ExternalProject_Add name source_dir)
else()
set(external_target "${target}")
endif()
- llvm_ExternalProject_BuildCmd(build_runtime_cmd ${external_target} ${BINARY_DIR})
+ llvm_ExternalProject_BuildCmd(build_runtime_cmd ${external_target} ${BINARY_DIR} ${STAMP_DIR})
add_custom_target(${target}
COMMAND ${build_runtime_cmd}
DEPENDS ${name}-configure
More information about the llvm-commits
mailing list