From 875b7503612e6f988e88c5ed230773d6ef6cad74 Mon Sep 17 00:00:00 2001 From: dim Date: Wed, 9 Apr 2014 18:16:58 +0000 Subject: [PATCH] MFC r263778: 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 r263833: Enable parallel building for gnu/usr.bin and usr.bin/clang too. git-svn-id: svn://svn.freebsd.org/base/stable/10@264303 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- bin/Makefile | 2 ++ gnu/usr.bin/Makefile | 2 ++ lib/Makefile | 4 ++++ lib/clang/Makefile | 2 ++ sbin/Makefile | 2 ++ share/mk/bsd.subdir.mk | 19 +++++++++++++++++++ usr.bin/Makefile | 2 ++ usr.bin/clang/Makefile | 2 ++ usr.sbin/Makefile | 2 ++ 9 files changed, 37 insertions(+) diff --git a/bin/Makefile b/bin/Makefile index e4bc281db..63d96fedb 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -60,4 +60,6 @@ SUBDIR+= tests SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 663107c39..02d0b2a95 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -46,4 +46,6 @@ _cc= cc _gdb= gdb .endif +SUBDIR_PARALLEL= + .include diff --git a/lib/Makefile b/lib/Makefile index 22f3414a1..ab6c579da 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -271,4 +271,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 8b6f38588..d335d80fb 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 47728449b..c6c37866e 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -118,4 +118,6 @@ SUBDIR+= routed SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 12dd4ded5..0ceda5696 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 0a6145bc6..be3f95b52 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -376,4 +376,6 @@ SUBDIR+= svn SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile index f0ab06589..f3e29578c 100644 --- a/usr.bin/clang/Makefile +++ b/usr.bin/clang/Makefile @@ -29,4 +29,6 @@ SUBDIR+=lldb .endif .endif # TOOLS_PREFIX +SUBDIR_PARALLEL= + .include diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 5f275a643..f809688c7 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -324,4 +324,6 @@ SUBDIR+= wpa SUBDIR:= ${SUBDIR:O} +SUBDIR_PARALLEL= + .include -- 2.45.0