From 905ed8bc7562473f1fbb0f4b4ae416d1819c2a6c Mon Sep 17 00:00:00 2001 From: dim Date: Wed, 26 Mar 2014 22:30:38 +0000 Subject: Add a SUBDIR_PARALLEL option to bsd.subdir.mk, to allow make to process 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 --- bin/Makefile | 2 ++ lib/Makefile | 4 ++++ lib/clang/Makefile | 2 ++ sbin/Makefile | 2 ++ share/mk/bsd.subdir.mk | 19 +++++++++++++++++++ usr.bin/Makefile | 2 ++ usr.sbin/Makefile | 2 ++ 7 files changed, 33 insertions(+) diff --git a/bin/Makefile b/bin/Makefile index e4bc281..63d96fe 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -60,4 +60,6 @@ SUBDIR+= tests SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include diff --git a/lib/Makefile b/lib/Makefile index 41eb9b5..5ef0723 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -276,4 +276,8 @@ afterinstall: ${INSTALL_SYMLINK} ../include ${DESTDIR}/usr/lib/include .endif +.if !make(install) +SUBDIR_PARALLEL= +.endif + .include diff --git a/lib/clang/Makefile b/lib/clang/Makefile index 8b6f385..d335d80 100644 --- a/lib/clang/Makefile +++ b/lib/clang/Makefile @@ -147,4 +147,6 @@ SUBDIR+=liblldb \ SUBDIR+= include +SUBDIR_PARALLEL= + .include diff --git a/sbin/Makefile b/sbin/Makefile index fcf1709..1548155 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -126,4 +126,6 @@ SUBDIR+= tests SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 12dd4de..0ceda56 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -71,7 +71,26 @@ ${SUBDIR}: .PHONY .MAKE .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 diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 007c9ab..c6727cd 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -379,4 +379,6 @@ SUBDIR+= svn SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index b709be5..45e38c1 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -320,4 +320,6 @@ SUBDIR+= wpa SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include -- cgit v1.1