54ff5d7323
all the SUBDIR entries in parallel, instead of serially. Apply this
option to a selected number of Makefiles, which can greatly speed up the
build on multi-core machines, when using make -j.
This can be extended to more Makefiles later on, whenever they are
verified to work correctly with parallel building.
I tested this on a 24-core machine, with make -j48 buildworld (N = 6):
before stddev after stddev
======= ====== ======= ======
real time 1741.1 16.5 959.8 2.7
user time 12468.7 16.4 14393.0 16.8
sys time 1825.0 54.8 2110.6 22.8
(user+sys)/real 8.2 17.1
E.g. the build was approximately 45% faster in real time. On machines
with less cores, or with lower -j settings, the speedup will not be as
impressive. But at least you can now almost max out a machine with
buildworld!
Submitted by: jilles
MFC after: 2 weeks
119 lines
3.2 KiB
Makefile
119 lines
3.2 KiB
Makefile
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
|
|
# $FreeBSD$
|
|
#
|
|
# The include file <bsd.subdir.mk> contains the default targets
|
|
# for building subdirectories.
|
|
#
|
|
# For all of the directories listed in the variable SUBDIRS, the
|
|
# specified directory will be visited and the target made. There is
|
|
# also a default target which allows the command "make subdir" where
|
|
# subdir is any directory listed in the variable SUBDIRS.
|
|
#
|
|
#
|
|
# +++ variables +++
|
|
#
|
|
# DISTRIBUTION Name of distribution. [base]
|
|
#
|
|
# SUBDIR A list of subdirectories that should be built as well.
|
|
# Each of the targets will execute the same target in the
|
|
# subdirectories.
|
|
#
|
|
# +++ targets +++
|
|
#
|
|
# distribute:
|
|
# This is a variant of install, which will
|
|
# put the stuff into the right "distribution".
|
|
#
|
|
# afterinstall, all, all-man, beforeinstall, checkdpadd, clean,
|
|
# cleandepend, cleandir, cleanilinks depend, install, lint,
|
|
# maninstall, manlint, obj, objlink, realinstall, regress, tags
|
|
#
|
|
|
|
.if !target(__<bsd.subdir.mk>__)
|
|
__<bsd.subdir.mk>__:
|
|
|
|
.include <bsd.init.mk>
|
|
|
|
DISTRIBUTION?= base
|
|
.if !target(distribute)
|
|
distribute: .MAKE
|
|
.for dist in ${DISTRIBUTION}
|
|
${_+_}cd ${.CURDIR}; \
|
|
${MAKE} install -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies
|
|
.endfor
|
|
.endif
|
|
|
|
_SUBDIR: .USE .MAKE
|
|
.if defined(SUBDIR) && !empty(SUBDIR) && !defined(NO_SUBDIR)
|
|
@${_+_}set -e; for entry in ${SUBDIR}; do \
|
|
if test -d ${.CURDIR}/$${entry}.${MACHINE_ARCH}; then \
|
|
${ECHODIR} "===> ${DIRPRFX}$${entry}.${MACHINE_ARCH} (${.TARGET:realinstall=install})"; \
|
|
edir=$${entry}.${MACHINE_ARCH}; \
|
|
cd ${.CURDIR}/$${edir}; \
|
|
else \
|
|
${ECHODIR} "===> ${DIRPRFX}$$entry (${.TARGET:realinstall=install})"; \
|
|
edir=$${entry}; \
|
|
cd ${.CURDIR}/$${edir}; \
|
|
fi; \
|
|
${MAKE} ${.TARGET:realinstall=install} \
|
|
DIRPRFX=${DIRPRFX}$$edir/; \
|
|
done
|
|
.endif
|
|
|
|
${SUBDIR}: .PHONY .MAKE
|
|
${_+_}@if test -d ${.TARGET}.${MACHINE_ARCH}; then \
|
|
cd ${.CURDIR}/${.TARGET}.${MACHINE_ARCH}; \
|
|
else \
|
|
cd ${.CURDIR}/${.TARGET}; \
|
|
fi; \
|
|
${MAKE} all
|
|
|
|
.for __target in all all-man checkdpadd clean cleandepend cleandir \
|
|
cleanilinks depend distribute lint maninstall manlint obj objlink \
|
|
realinstall regress tags ${SUBDIR_TARGETS}
|
|
.ifdef SUBDIR_PARALLEL
|
|
.for __dir in ${SUBDIR}
|
|
${__target}: ${__target}_subdir_${__dir}
|
|
${__target}_subdir_${__dir}: .MAKE
|
|
@${_+_}set -e; \
|
|
if test -d ${.CURDIR}/${__dir}.${MACHINE_ARCH}; then \
|
|
${ECHODIR} "===> ${DIRPRFX}${__dir}.${MACHINE_ARCH} (${__target:realinstall=install})"; \
|
|
edir=${__dir}.${MACHINE_ARCH}; \
|
|
cd ${.CURDIR}/$${edir}; \
|
|
else \
|
|
${ECHODIR} "===> ${DIRPRFX}${__dir} (${__target:realinstall=install})"; \
|
|
edir=${__dir}; \
|
|
cd ${.CURDIR}/$${edir}; \
|
|
fi; \
|
|
${MAKE} ${__target:realinstall=install} \
|
|
DIRPRFX=${DIRPRFX}$$edir/
|
|
.endfor
|
|
.else
|
|
${__target}: _SUBDIR
|
|
.endif
|
|
.endfor
|
|
|
|
.for __target in files includes
|
|
.for __stage in build install
|
|
${__stage}${__target}:
|
|
.if make(${__stage}${__target})
|
|
${__stage}${__target}: _SUBDIR
|
|
.endif
|
|
.endfor
|
|
${__target}: .MAKE
|
|
${_+_}set -e; cd ${.CURDIR}; ${MAKE} build${__target}; ${MAKE} install${__target}
|
|
.endfor
|
|
|
|
.if !target(install)
|
|
.if !target(beforeinstall)
|
|
beforeinstall:
|
|
.endif
|
|
.if !target(afterinstall)
|
|
afterinstall:
|
|
.endif
|
|
install: beforeinstall realinstall afterinstall
|
|
.ORDER: beforeinstall realinstall afterinstall
|
|
.endif
|
|
|
|
.endif
|