[U-Boot] [PATCH v3] Allow for parallel builds and saved output
Andy Fleming
afleming at freescale.com
Wed Apr 25 07:33:51 CEST 2012
The MAKEALL script cleverly runs make with the appropriate options
to use all of the cores on the system, but your average U-Boot build
can't make much use of more than a few cores. If you happen to have
a many-core server, your builds will leave most of the system idle.
In order to make full use of such a system, we need to build multiple
targets in parallel, and this requires directing make output into
multiple directories. We add a BUILD_NBUILDS variable, which allows
users to specify how many builds to run in parallel.
When BUILD_NBUILDS is set greater than 1, we redefine BUILD_DIR for
each build to be ${BUILD_DIR}/${target}. Also, we make "./build" the
default BUILD_DIR when BUILD_NBUILDS is greater than 1.
MAKEALL now tracks which builds are still running, and when one
finishes, it starts a new build.
Once each build finishes, we run "make tidy" on its directory, to reduce
the footprint.
As a result, we are left with a build directory with all of the built
targets still there for use, which means anyone who wanted to use
MAKEALL as part of a test harness can now do so.
Signed-off-by: Andy Fleming <afleming at freescale.com>
---
v2: - Update to keep BUILD_NBUILDS builds in flight, rather than batching
- Clean up style things
- Defer error output until build completion to make output *slightly*
more readable
v3: - Add BUILD_MANY variable to clarify logic
- Added comment for done/skip prefixes, and renamed for clarity
- Changed CURRENT_COUNT to CURRENT_CNT to match TOTAL_CNT
- Put build wait logic into its own manage_build function
- Used wildcards to delete build management files
- Fixed a bug where error-less builds printed an error
Once again, my unscientific tests on my 24-thread box:
time ./MAKEALL 83xx
real 4m2.951s
user 26m6.534s
sys 4m0.070s
time ./MAKEALL 86xx
real 0m27.271s
user 3m10.706s
sys 0m27.123s
time BUILD_NBUILDS=50 BUILD_NCPUS=1 ./MAKEALL 86xx
real 0m38.430s
user 2m11.601s
sys 0m18.610s
time BUILD_NBUILDS=50 BUILD_NCPUS=1 ./MAKEALL 83xx
real 1m15.642s
user 15m2.125s
sys 2m25.818s
time BUILD_NBUILDS=50 BUILD_NCPUS=1 ./MAKEALL 85xx
real 4m29.840s
user 80m30.641s
sys 10m49.643s
Looks like 86xx was affected by having only 5 boards:
time BUILD_NBUILDS=10 BUILD_NCPUS=4 ./MAKEALL 86xx
real 0m11.887s
user 2m22.299s
sys 0m20.894s
MAKEALL | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 122 insertions(+), 15 deletions(-)
diff --git a/MAKEALL b/MAKEALL
index e5da6f1..e6c801c 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -34,6 +34,7 @@ usage()
CROSS_COMPILE cross-compiler toolchain prefix (default: "")
MAKEALL_LOGDIR output all logs to here (default: ./LOG/)
BUILD_DIR output build directory (default: ./)
+ BUILD_NBUILDS number of parallel targets (default: 1)
Examples:
- build all Power Architecture boards:
@@ -178,11 +179,22 @@ else
LOG_DIR="LOG"
fi
-if [ ! "${BUILD_DIR}" ] ; then
- BUILD_DIR="."
+: ${BUILD_NBUILDS:=1}
+BUILD_MANY=0
+
+if [ "${BUILD_NBUILDS}" -gt 1 ] ; then
+ BUILD_MANY=1
+ : ${BUILD_DIR:=./build}
+ mkdir -p "${BUILD_DIR}/ERR"
+ find "${BUILD_DIR}/ERR/" -type f -exec rm -f {} +
fi
-[ -d ${LOG_DIR} ] || mkdir ${LOG_DIR} || exit 1
+: ${BUILD_DIR:=.}
+
+OUTPUT_PREFIX="${BUILD_DIR}"
+
+[ -d ${LOG_DIR} ] || mkdir "${LOG_DIR}" || exit 1
+find "${LOG_DIR}/" -type f -exec rm -f {} +
LIST=""
@@ -190,6 +202,8 @@ LIST=""
ERR_CNT=0
ERR_LIST=""
TOTAL_CNT=0
+CURRENT_CNT=0
+OLDEST_IDX=1
RC=0
# Helper funcs for parsing boards.cfg
@@ -592,8 +606,26 @@ list_target() {
echo ""
}
+# Each finished build will have a file called ${donep}${n},
+# where n is the index of the build. Each build
+# we've already noted as finished will have ${skipp}${n}.
+# The code managing the build process will use this information
+# to ensure that only BUILD_NBUILDS builds are in flight at once
+donep="${LOG_DIR}/._done_"
+skipp="${LOG_DIR}/._skip_"
+
build_target() {
target=$1
+ build_idx=$2
+
+ if [ $BUILD_MANY == 1 ] ; then
+ output_dir="${OUTPUT_PREFIX}/${target}"
+ mkdir -p "${output_dir}"
+ else
+ output_dir="${OUTPUT_PREFIX}"
+ fi
+
+ export BUILD_DIR="${output_dir}"
if [ "$ONLY_LIST" == 'y' ] ; then
list_target ${target}
@@ -603,30 +635,75 @@ build_target() {
${MAKE} distclean >/dev/null
${MAKE} -s ${target}_config
- ${MAKE} ${JOBS} all 2>&1 >${LOG_DIR}/$target.MAKELOG \
- | tee ${LOG_DIR}/$target.ERR
+ ${MAKE} ${JOBS} all \
+ >${LOG_DIR}/$target.MAKELOG 2> ${LOG_DIR}/$target.ERR
# Check for 'make' errors
if [ ${PIPESTATUS[0]} -ne 0 ] ; then
RC=1
fi
- if [ -s ${LOG_DIR}/$target.ERR ] ; then
- ERR_CNT=$((ERR_CNT + 1))
- ERR_LIST="${ERR_LIST} $target"
+ if [ $BUILD_MANY == 1 ] ; then
+ ${MAKE} tidy
+
+ if [ -s ${LOG_DIR}/${target}.ERR ] ; then
+ touch ${OUTPUT_PREFIX}/ERR/${target}
+ else
+ rm ${LOG_DIR}/${target}.ERR
+ fi
else
- rm ${LOG_DIR}/$target.ERR
+ if [ -s ${LOG_DIR}/${target}.ERR ] ; then
+ : $(( ERR_CNT += 1 ))
+ ERR_LIST="${ERR_LIST} $target"
+ else
+ rm ${LOG_DIR}/${target}.ERR
+ fi
fi
- TOTAL_CNT=$((TOTAL_CNT + 1))
-
- OBJS=${BUILD_DIR}/u-boot
- if [ -e ${BUILD_DIR}/spl/u-boot-spl ]; then
- OBJS="${OBJS} ${BUILD_DIR}/spl/u-boot-spl"
+ OBJS=${output_dir}/u-boot
+ if [ -e ${output_dir}/spl/u-boot-spl ]; then
+ OBJS="${OBJS} ${output_dir}/spl/u-boot-spl"
fi
${CROSS_COMPILE}size ${OBJS} | tee -a ${LOG_DIR}/$target.MAKELOG
+
+ [ -e "${LOG_DIR}/${target}.ERR" ] && cat "${LOG_DIR}/${target}.ERR"
+
+ #echo "Writing ${donep}${build_idx}"
+ touch "${donep}${build_idx}"
}
+
+manage_builds() {
+ search_idx=${OLDEST_IDX}
+ #echo "Searching ${OLDEST_IDX} to ${TOTAL_CNT}"
+ while true; do
+ if [ -e "${donep}${search_idx}" ] ; then
+ # echo "Found ${donep}${search_idx}"
+ : $(( CURRENT_CNT-- ))
+ [ ${OLDEST_IDX} -eq ${search_idx} ] &&
+ : $(( OLDEST_IDX++ ))
+
+ # Only want to count it once
+ rm -f "${donep}${search_idx}"
+ touch "${skipp}${search_idx}"
+ elif [ -e "${skipp}${search_idx}" ] ; then
+ [ ${OLDEST_IDX} -eq ${search_idx} ] &&
+ : $(( OLDEST_IDX++ ))
+ fi
+ #echo "Checking search ${search_idx} vs ${TOTAL_CNT}"
+ : $(( search_idx++ ))
+ if [ ${search_idx} -gt ${TOTAL_CNT} ] ; then
+ #echo "Checking current ${CURRENT_CNT} vs ${BUILD_NBUILDS}"
+ if [ ${CURRENT_CNT} -ge ${BUILD_NBUILDS} ] ; then
+ search_idx=${OLDEST_IDX}
+ sleep 1
+ else
+ break
+ fi
+ fi
+ done
+}
+
build_targets() {
for t in "$@" ; do
# If a LIST_xxx var exists, use it. But avoid variable
@@ -639,7 +716,26 @@ build_targets() {
if [ -n "${list}" ] ; then
build_targets ${list}
else
- build_target ${t}
+ : $((TOTAL_CNT += 1))
+ : $((CURRENT_CNT += 1))
+ rm -f "${donep}${TOTAL_CNT}"
+ rm -f "${skipp}${TOTAL_CNT}"
+ build_target ${t} ${TOTAL_CNT} &
+ fi
+
+ # We maintain a running count of all the builds we have done.
+ # Each finished build will have a file called ${donep}${n},
+ # where n is the index of the build. Each build
+ # we've already noted as finished will have ${skipp}${n}.
+ # We track the current index via TOTAL_CNT, and the oldest
+ # index. When we exceed the maximum number of parallel builds,
+ # We look from oldest to current for builds that have completed,
+ # and update the current count and oldest index as appropriate.
+ # If we've gone through the entire list, wait a second, and
+ # reprocess the entire list until we find a build that has
+ # completed
+ if [ ${CURRENT_CNT} -ge ${BUILD_NBUILDS} ] ; then
+ manage_builds
fi
done
}
@@ -648,6 +744,16 @@ build_targets() {
print_stats() {
if [ "$ONLY_LIST" == 'y' ] ; then return ; fi
+
+ rm -f ${donep}* ${skipp}*
+
+ if [ $BUILD_MANY == 1 ] && [ -e "${OUTPUT_PREFIX}/ERR" ] ; then
+ ERR_LIST=$(ls ${OUTPUT_PREFIX}/ERR/)
+ ERR_CNT=`ls -1 ${OUTPUT_PREFIX}/ERR/ | wc | awk '{print $1}'`
+ else
+ ERR_CNT=0
+ fi
+
echo ""
echo "--------------------- SUMMARY ----------------------------"
echo "Boards compiled: ${TOTAL_CNT}"
@@ -666,3 +772,4 @@ set -- ${SELECTED} "$@"
# run PowerPC by default
[ $# = 0 ] && set -- powerpc
build_targets "$@"
+wait
--
1.7.3.4
More information about the U-Boot
mailing list