a175970362
This speeds up buildworld by 16% on my system and buildkernel by 35%. Rather than calling mkdep(1), which is just a wrapper around 'cc -E', use the modern -MD -MT -MF flags to gather and generate dependencies during compilation. This flag was introduced in GCC "a long time ago", in GCC 3.0, and is also supported by Clang. (It appears that ICC also supports this but I do not have access to test it). This avoids running the preprocessor *twice* for every build, in both 'make depend' and 'make all'. This is especially noticeable when using ccache since it does not cache preprocessor results from mkdep(1) / 'cc -E', but still speeds up compilation with the -MD flags. For 'make depend' a tree-walk is still done to ensure that all DPSRCS are generated when expected, and that beforedepend/afterdepend and _EXTRADEPEND are all still respected. In time this may change but for now I've been conservative. The time for a tree-walk with -j combined with SUBDIR_PARALLEL is not significant. For example, it takes about 9 seconds with -j15 to walk all of src/ for 'make depend' now on my system. A .depend file is still generated with the various rules that apply to the final target, or custom rules. Otherwise there are now per-built-object-file .depend files, such as .depend.filename.o. These are included directly by make rather than populating .depend with a loop and .depend lines, which only added overhead to the now almost-NOP 'make depend' phase. Before this I experimented with having mkdep(1) called in parallel per-file. While this improved the kernel and lib/libc 'make depend' phase, it resulted in slower build times overall. The -M flags are removed from CFLAGS when linking since they have no effect. Enabling this by default, for src or out-of-src, can be done once more testing has been done, such as a ports exp-run, and with more compilers. The system I used for testing was: WITNESS Build options: -j20 WITH_LLDB=yes WITH_DEBUG_FILES=yes WITH_FAST_DEPEND=yes DISK: ZFS 3-way mirror with very slow disks using SSD l2arc/log. The arc was fully populated with src tree files. RAM: 76GiB CPU: Intel(R) Xeon(R) CPU L5520 @2.27GHz 2 package(s) x 4 core(s) x 2 SMT threads = hw.ncpu=16 buildworld: x buildworld-before + buildworld-fastdep +-------------------------------------------------------------------------------+ |+ | |+ | |+ xx x| | |_MA___|| |A | +-------------------------------------------------------------------------------+ N Min Max Median Avg Stddev x 3 3744.13 3794.31 3752.25 3763.5633 26.935139 + 3 3153.34 3155.16 3154.2 3154.2333 0.91045776 Difference at 95.0% confidence -609.33 +/- 43.1943 -16.1902% +/- 1.1477% (Student's t, pooled s = 19.0569) buildkernel: x buildkernel-before + buildkernel-fastdep +-------------------------------------------------------------------------------+ |+ x | |++ xx| | A|| |A| | +-------------------------------------------------------------------------------+ N Min Max Median Avg Stddev x 3 571.57 573.94 571.79 572.43333 1.3094401 + 3 369.12 370.57 369.3 369.66333 0.79033748 Difference at 95.0% confidence -202.77 +/- 2.45131 -35.4225% +/- 0.428227% (Student's t, pooled s = 1.0815) Sponsored by: EMC / Isilon Storage Division MFC after: 3 weeks Relnotes: yes
357 lines
11 KiB
Makefile
357 lines
11 KiB
Makefile
# $FreeBSD$
|
|
|
|
# Part of a unified Makefile for building kernels. This part includes all
|
|
# the definitions that need to be after all the % directives except %RULES
|
|
# and ones that act like they are part of %RULES.
|
|
#
|
|
# Most make variables should not be defined in this file. Instead, they
|
|
# should be defined in the kern.pre.mk so that port makefiles can
|
|
# override or augment them.
|
|
|
|
# In case the config had a makeoptions DESTDIR...
|
|
.if defined(DESTDIR)
|
|
MKMODULESENV+= DESTDIR="${DESTDIR}"
|
|
.endif
|
|
SYSDIR?= ${S:C;^[^/];${.CURDIR}/&;}
|
|
MKMODULESENV+= KERNBUILDDIR="${.CURDIR}" SYSDIR="${SYSDIR}"
|
|
|
|
.if defined(CONF_CFLAGS)
|
|
MKMODULESENV+= CONF_CFLAGS="${CONF_CFLAGS}"
|
|
.endif
|
|
|
|
.if defined(WITH_CTF)
|
|
MKMODULESENV+= WITH_CTF="${WITH_CTF}"
|
|
.endif
|
|
|
|
# Allow overriding the kernel debug directory, so kernel and user debug may be
|
|
# installed in different directories. Setting it to "" restores the historical
|
|
# behavior of installing debug files in the kernel directory.
|
|
KERN_DEBUGDIR?= ${DEBUGDIR}
|
|
|
|
.MAIN: all
|
|
|
|
.for target in all clean cleandepend cleandir clobber depend install \
|
|
obj reinstall tags
|
|
${target}: kernel-${target}
|
|
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
|
|
${target}: modules-${target}
|
|
modules-${target}:
|
|
cd $S/modules; ${MKMODULESENV} ${MAKE} \
|
|
${target:S/^reinstall$/install/:S/^clobber$/cleandir/}
|
|
.endif
|
|
.endfor
|
|
|
|
# Handle ports (as defined by the user) that build kernel modules
|
|
.if !defined(NO_MODULES) && defined(PORTS_MODULES)
|
|
#
|
|
# The ports tree needs some environment variables defined to match the new kernel
|
|
#
|
|
# Ports search for some dependencies in PATH, so add the location of the installed files
|
|
LOCALBASE?= /usr/local
|
|
# SRC_BASE is how the ports tree refers to the location of the base source files
|
|
.if !defined(SRC_BASE)
|
|
SRC_BASE!= realpath "${SYSDIR:H}/"
|
|
.endif
|
|
# OSVERSION is used by some ports to determine build options
|
|
.if !defined(OSRELDATE)
|
|
# Definition copied from src/Makefile.inc1
|
|
OSRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
|
|
${MAKEOBJDIRPREFIX}${SRC_BASE}/include/osreldate.h
|
|
.endif
|
|
# Keep the related ports builds in the obj directory so that they are only rebuilt once per kernel build
|
|
WRKDIRPREFIX?= ${MAKEOBJDIRPREFIX}${SRC_BASE}/sys/${KERNCONF}
|
|
PORTSMODULESENV=\
|
|
PATH=${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin \
|
|
SRC_BASE=${SRC_BASE} \
|
|
OSVERSION=${OSRELDATE} \
|
|
WRKDIRPREFIX=${WRKDIRPREFIX}
|
|
|
|
# The WRKDIR needs to be cleaned before building, and trying to change the target
|
|
# with a :C pattern below results in install -> instclean
|
|
all:
|
|
.for __i in ${PORTS_MODULES}
|
|
@${ECHO} "===> Ports module ${__i} (all)"
|
|
cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B clean all
|
|
.endfor
|
|
|
|
.for __target in install reinstall clean
|
|
${__target}: ports-${__target}
|
|
ports-${__target}:
|
|
.for __i in ${PORTS_MODULES}
|
|
@${ECHO} "===> Ports module ${__i} (${__target})"
|
|
cd $${PORTSDIR:-/usr/ports}/${__i}; ${PORTSMODULESENV} ${MAKE} -B ${__target:C/install/deinstall reinstall/:C/reinstall/deinstall reinstall/}
|
|
.endfor
|
|
.endfor
|
|
.endif
|
|
|
|
.ORDER: kernel-install modules-install
|
|
|
|
kernel-all: ${KERNEL_KO} ${KERNEL_EXTRA}
|
|
|
|
kernel-cleandir: kernel-clean kernel-cleandepend
|
|
|
|
kernel-clobber:
|
|
find . -maxdepth 1 ! -type d ! -name version -delete
|
|
|
|
kernel-obj:
|
|
|
|
.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules)
|
|
modules: modules-all
|
|
|
|
.if !defined(NO_MODULES_OBJ)
|
|
modules-all modules-depend: modules-obj
|
|
.endif
|
|
.endif
|
|
|
|
.if !defined(DEBUG)
|
|
FULLKERNEL= ${KERNEL_KO}
|
|
.else
|
|
FULLKERNEL= ${KERNEL_KO}.full
|
|
${KERNEL_KO}: ${FULLKERNEL} ${KERNEL_KO}.debug
|
|
${OBJCOPY} --strip-debug --add-gnu-debuglink=${KERNEL_KO}.debug \
|
|
${FULLKERNEL} ${.TARGET}
|
|
${KERNEL_KO}.debug: ${FULLKERNEL}
|
|
${OBJCOPY} --only-keep-debug ${FULLKERNEL} ${.TARGET}
|
|
install.debug reinstall.debug: gdbinit
|
|
cd ${.CURDIR}; ${MAKE} ${.TARGET:R}
|
|
|
|
# Install gdbinit files for kernel debugging.
|
|
gdbinit:
|
|
grep -v '# XXX' ${S}/../tools/debugscripts/dot.gdbinit | \
|
|
sed "s:MODPATH:${.OBJDIR}/modules:" > .gdbinit
|
|
cp ${S}/../tools/debugscripts/gdbinit.kernel ${.CURDIR}
|
|
.if exists(${S}/../tools/debugscripts/gdbinit.${MACHINE_CPUARCH})
|
|
cp ${S}/../tools/debugscripts/gdbinit.${MACHINE_CPUARCH} \
|
|
${.CURDIR}/gdbinit.machine
|
|
.endif
|
|
.endif
|
|
|
|
${FULLKERNEL}: ${SYSTEM_DEP} vers.o
|
|
@rm -f ${.TARGET}
|
|
@echo linking ${.TARGET}
|
|
${SYSTEM_LD}
|
|
.if ${MK_CTF} != "no"
|
|
@echo ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ...
|
|
@${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
|
|
.endif
|
|
.if !defined(DEBUG)
|
|
${OBJCOPY} --strip-debug ${.TARGET}
|
|
.endif
|
|
${SYSTEM_LD_TAIL}
|
|
|
|
.if !exists(${.OBJDIR}/.depend)
|
|
${SYSTEM_OBJS}: assym.s vnode_if.h ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/}
|
|
.endif
|
|
|
|
LNFILES= ${CFILES:T:S/.c$/.ln/}
|
|
|
|
.for mfile in ${MFILES}
|
|
# XXX the low quality .m.o rules gnerated by config are normally used
|
|
# instead of the .m.c rules here.
|
|
${mfile:T:S/.m$/.c/}: ${mfile}
|
|
${AWK} -f $S/tools/makeobjops.awk ${mfile} -c
|
|
${mfile:T:S/.m$/.h/}: ${mfile}
|
|
${AWK} -f $S/tools/makeobjops.awk ${mfile} -h
|
|
.endfor
|
|
|
|
kernel-clean:
|
|
rm -f *.o *.so *.So *.ko *.s eddep errs \
|
|
${FULLKERNEL} ${KERNEL_KO} ${KERNEL_KO}.debug \
|
|
linterrs tags vers.c \
|
|
vnode_if.c vnode_if.h vnode_if_newproto.h vnode_if_typedef.h \
|
|
${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \
|
|
${CLEAN}
|
|
|
|
lint: ${LNFILES}
|
|
${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC} 2>&1 | \
|
|
tee -a linterrs
|
|
|
|
# This is a hack. BFD "optimizes" away dynamic mode if there are no
|
|
# dynamic references. We could probably do a '-Bforcedynamic' mode like
|
|
# in the a.out ld. For now, this works.
|
|
HACK_EXTRA_FLAGS?= -shared
|
|
hack.So: Makefile
|
|
:> hack.c
|
|
${CC} ${HACK_EXTRA_FLAGS} -nostdlib hack.c -o hack.So
|
|
rm -f hack.c
|
|
|
|
# This rule stops ./assym.s in .depend from causing problems.
|
|
./assym.s: assym.s
|
|
|
|
assym.s: $S/kern/genassym.sh genassym.o
|
|
NM='${NM}' NMFLAGS='${NMFLAGS}' sh $S/kern/genassym.sh genassym.o > ${.TARGET}
|
|
|
|
genassym.o: $S/$M/$M/genassym.c
|
|
${CC} -c ${CFLAGS:N-fno-common} $S/$M/$M/genassym.c
|
|
|
|
${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
|
|
|
|
# We have "special" -I include paths for zfs/dtrace files in 'depend'.
|
|
CFILES_NOCDDL= ${CFILES:N*/cddl/*:N*fs/nfsclient/nfs_clkdtrace*}
|
|
SFILES_NOCDDL= ${SFILES:N*/cddl/*}
|
|
CFILES_CDDL= ${CFILES:M*/cddl/*}
|
|
SFILES_CDDL= ${SFILES:M*/cddl/*}
|
|
|
|
kernel-depend: .depend
|
|
# The argument list can be very long, so use make -V and xargs to
|
|
# pass it to mkdep.
|
|
SRCS= assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \
|
|
${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
|
|
${MFILES:T:S/.m$/.h/}
|
|
DEPENDFILES= .depend
|
|
.if ${MK_FAST_DEPEND} == "yes"
|
|
DEPENDFILES+= .depend.*
|
|
DEPEND_CFLAGS+= -MD -MP -MF.depend.${.TARGET}
|
|
DEPEND_CFLAGS+= -MT${.TARGET}
|
|
CFLAGS+= ${DEPEND_CFLAGS}
|
|
DEPENDOBJS+= ${SYSTEM_OBJS}
|
|
.for __obj in ${DEPENDOBJS:O:u}
|
|
.sinclude ".depend.${__obj}"
|
|
DEPENDFILES_OBJS+= .depend.${__obj}
|
|
.endfor
|
|
.endif # ${MK_FAST_DEPEND} == "yes"
|
|
|
|
.NOPATH: .depend ${DEPENDFILES_OBJS}
|
|
|
|
.depend: .PRECIOUS ${SRCS}
|
|
.if ${MK_FAST_DEPEND} == "no"
|
|
rm -f ${.TARGET}.tmp
|
|
${MAKE} -V CFILES_NOCDDL -V SYSTEM_CFILES -V GEN_CFILES | \
|
|
CC="${CC}" xargs mkdep -a -f ${.TARGET}.tmp ${CFLAGS}
|
|
${MAKE} -V CFILES_CDDL | \
|
|
CC="${CC}" xargs mkdep -a -f ${.TARGET}.tmp ${ZFS_CFLAGS} \
|
|
${FBT_CFLAGS} ${DTRACE_CFLAGS}
|
|
${MAKE} -V SFILES_NOCDDL | \
|
|
CC="${CC}" xargs mkdep -a -f ${.TARGET}.tmp ${ASM_CFLAGS}
|
|
${MAKE} -V SFILES_CDDL | \
|
|
CC="${CC}" xargs mkdep -a -f ${.TARGET}.tmp ${ZFS_ASM_CFLAGS}
|
|
mv ${.TARGET}.tmp ${.TARGET}
|
|
.else
|
|
: > ${.TARGET}
|
|
.endif
|
|
|
|
_ILINKS= machine
|
|
.if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64"
|
|
_ILINKS+= ${MACHINE_CPUARCH}
|
|
.endif
|
|
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
|
|
_ILINKS+= x86
|
|
.endif
|
|
|
|
# Ensure that the link exists without depending on it when it exists.
|
|
.for _link in ${_ILINKS}
|
|
.if !exists(${.OBJDIR}/${_link})
|
|
${SRCS} ${CLEAN:M*.o}: ${_link}
|
|
.endif
|
|
.endfor
|
|
|
|
${_ILINKS}:
|
|
@case ${.TARGET} in \
|
|
machine) \
|
|
path=${S}/${MACHINE}/include ;; \
|
|
*) \
|
|
path=${S}/${.TARGET}/include ;; \
|
|
esac ; \
|
|
${ECHO} ${.TARGET} "->" $$path ; \
|
|
ln -s $$path ${.TARGET}
|
|
|
|
# .depend needs include links so we remove them only together.
|
|
kernel-cleandepend: .PHONY
|
|
rm -f ${DEPENDFILES} ${_ILINKS}
|
|
|
|
kernel-tags:
|
|
@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
|
|
sh $S/conf/systags.sh
|
|
|
|
kernel-install:
|
|
@if [ ! -f ${KERNEL_KO} ] ; then \
|
|
echo "You must build a kernel first." ; \
|
|
exit 1 ; \
|
|
fi
|
|
.if exists(${DESTDIR}${KODIR})
|
|
-thiskernel=`sysctl -n kern.bootfile` ; \
|
|
if [ ! "`dirname "$$thiskernel"`" -ef ${DESTDIR}${KODIR} ] ; then \
|
|
chflags -R noschg ${DESTDIR}${KODIR} ; \
|
|
rm -rf ${DESTDIR}${KODIR} ; \
|
|
rm -rf ${DESTDIR}${KERN_DEBUGDIR}${KODIR} ; \
|
|
else \
|
|
if [ -d ${DESTDIR}${KODIR}.old ] ; then \
|
|
chflags -R noschg ${DESTDIR}${KODIR}.old ; \
|
|
rm -rf ${DESTDIR}${KODIR}.old ; \
|
|
fi ; \
|
|
mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old ; \
|
|
if [ -n "${KERN_DEBUGDIR}" -a \
|
|
-d ${DESTDIR}${KERN_DEBUGDIR}${KODIR} ]; then \
|
|
rm -rf ${DESTDIR}${KERN_DEBUGDIR}${KODIR}.old ; \
|
|
mv ${DESTDIR}${KERN_DEBUGDIR}${KODIR} ${DESTDIR}${KERN_DEBUGDIR}${KODIR}.old ; \
|
|
fi ; \
|
|
sysctl kern.bootfile=${DESTDIR}${KODIR}.old/"`basename "$$thiskernel"`" ; \
|
|
fi
|
|
.endif
|
|
mkdir -p ${DESTDIR}${KODIR}
|
|
${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}/
|
|
.if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no"
|
|
mkdir -p ${DESTDIR}${KERN_DEBUGDIR}${KODIR}
|
|
${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.debug ${DESTDIR}${KERN_DEBUGDIR}${KODIR}/
|
|
.endif
|
|
.if defined(KERNEL_EXTRA_INSTALL)
|
|
${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_EXTRA_INSTALL} ${DESTDIR}${KODIR}/
|
|
.endif
|
|
|
|
|
|
|
|
kernel-reinstall:
|
|
@-chflags -R noschg ${DESTDIR}${KODIR}
|
|
${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO} ${DESTDIR}${KODIR}/
|
|
.if defined(DEBUG) && !defined(INSTALL_NODEBUG) && ${MK_KERNEL_SYMBOLS} != "no"
|
|
${INSTALL} -p -m 555 -o ${KMODOWN} -g ${KMODGRP} ${KERNEL_KO}.debug ${DESTDIR}${KERN_DEBUGDIR}${KODIR}/
|
|
.endif
|
|
|
|
config.o env.o hints.o vers.o vnode_if.o:
|
|
${NORMAL_C}
|
|
${NORMAL_CTFCONVERT}
|
|
|
|
config.ln env.ln hints.ln vers.ln vnode_if.ln:
|
|
${NORMAL_LINT}
|
|
|
|
vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
|
|
MAKE=${MAKE} sh $S/conf/newvers.sh ${KERN_IDENT}
|
|
|
|
vnode_if.c: $S/tools/vnode_if.awk $S/kern/vnode_if.src
|
|
${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -c
|
|
|
|
vnode_if.h vnode_if_newproto.h vnode_if_typedef.h: $S/tools/vnode_if.awk \
|
|
$S/kern/vnode_if.src
|
|
vnode_if.h: vnode_if_newproto.h vnode_if_typedef.h
|
|
${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -h
|
|
vnode_if_newproto.h:
|
|
${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -p
|
|
vnode_if_typedef.h:
|
|
${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -q
|
|
|
|
.if ${MFS_IMAGE:Uno} != "no"
|
|
# Generate an object file from the file system image to embed in the kernel
|
|
# via linking. Make sure the contents are in the mfs section and rename the
|
|
# start/end/size variables to __start_mfs, __stop_mfs, and mfs_size,
|
|
# respectively.
|
|
embedfs_${MFS_IMAGE:T:R}.o: ${MFS_IMAGE}
|
|
${OBJCOPY} --input-target binary \
|
|
--output-target ${EMBEDFS_FORMAT.${MACHINE_ARCH}} \
|
|
--binary-architecture ${EMBEDFS_ARCH.${MACHINE_ARCH}} \
|
|
${MFS_IMAGE} ${.TARGET}
|
|
${OBJCOPY} \
|
|
--rename-section .data=mfs,contents,alloc,load,readonly,data \
|
|
--redefine-sym \
|
|
_binary_${MFS_IMAGE:C,[^[:alnum:]],_,g}_size=__mfs_root_size \
|
|
--redefine-sym \
|
|
_binary_${MFS_IMAGE:C,[^[:alnum:]],_,g}_start=mfs_root \
|
|
--redefine-sym \
|
|
_binary_${MFS_IMAGE:C,[^[:alnum:]],_,g}_end=mfs_root_end \
|
|
${.TARGET}
|
|
.endif
|
|
|
|
# XXX strictly, everything depends on Makefile because changes to ${PROF}
|
|
# only appear there, but we don't handle that.
|
|
|
|
.include "kern.mk"
|