Patch set updated for coreboot: c6e87f5 abuild: Build boards in parallel if possible

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/409

-gerrit

commit c6e87f58ee36cc8af723f8027287158a8c91fed8
Author: Patrick Georgi 
Date:   Sat Nov 5 14:44:41 2011 +0100

abuild: Build boards in parallel if possible

Determine if xargs -P works. If yes, use that to build multiple
    boards in parallel, instead of relying on make -j X, when doing
    a full abuild run (instead of single boards).

make -j X isn't able to make use of several cores at various
    serialization points in our build process, so this change results
    in a >25% speed up for a full abuild run in my tests.

Change-Id: Id484a4211c84a3a24115278e0fbe92345f346596
    Signed-off-by: Patrick Georgi 
---
 Makefile.inc       |    2 +
 util/abuild/abuild |   73 ++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/Makefile.inc b/Makefile.inc
index 01fb41f..176ff67 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -298,3 +298,5 @@ crosstools: clean-for-update
 crossgcc-clean: clean-for-update
    $(MAKE) -C util/crossgcc clean

+tools: $(objutil)/kconfig/conf $(objutil)/cbfstool/cbfstool $(objutil)/nvramtool/nvramtool $(objutil)/romcc/romcc $(objutil)/sconfig/sconfig
+
diff --git a/util/abuild/abuild b/util/abuild/abuild
index e514db6..50e9e39 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -573,6 +573,9 @@ test "$ROOT" = "" && ROOT=$( cd ../..; pwd )
 export PATH=$PATH:util/abuild
 getopt - > /dev/null 2>/dev/null || gcc -o util/abuild/getopt util/abuild/getopt.c

+# command line for xargs parallelization. Thus overwrite -c X
+cmdline="$* -c 1"
+
 # parse parameters.. try to find out whether we're running GNU getopt
 getoptbrand="`getopt -V`"
 if [ "${getoptbrand:0:6}" == "getopt" ]; then
@@ -618,8 +621,48 @@ while true ; do
    esac
 done

+USE_XARGS=0
 if [ "$cpus" != "1" ]; then
-	export MAKEFLAGS="-j $cpus"
+	if [ "$target" = "" ]; then
+		# Test if xargs supports the non-standard -P flag
+		echo | xargs -P 0$cpus -n 1 echo 2>/dev/null >/dev/null && USE_XARGS=1
+	fi
+fi
+
+if [ "$USE_XARGS" = "0" ]; then
+export MAKEFLAGS="-j $cpus"
+build_all_targets()
+{
+	for VENDOR in $( vendors ); do
+		for MAINBOARD in $( mainboards $VENDOR ); do
+			build_target $VENDOR $MAINBOARD
+			test_target $VENDOR $MAINBOARD
+			remove_target $VENDOR $MAINBOARD
+		done
+	done
+}
+else
+# Limit to 32 parallel builds for now.
+# Thrashing all caches because we run
+# 160 abuilds in parallel is no fun.
+if [ "$cpus" = "" ]; then
+	cpus=32
+fi
+build_all_targets()
+{
+	# seed shared utils
+	TMPCFG=`mktemp`
+	if [ "$enable_blobs" = "true" ]; then
+		echo "CONFIG_USE_BLOBS=y" > $TMPCFG
+	fi
+	make -j $cpus DOTCONFIG=$TMPCFG obj=coreboot-builds/temp objutil=coreboot-builds/sharedutils tools
+	rm -rf coreboot-builds/temp $TMPCFG
+	for VENDOR in $( vendors ); do
+		for MAINBOARD in $( mainboards $VENDOR ); do
+			echo $VENDOR/$MAINBOARD
+		done
+	done | xargs -P 0$cpus -n 1 $0 $cmdline -t
+}
 fi

# /path/to/freebios2/
@@ -640,23 +683,21 @@ if [ "$target" != "" ]; then
    CONFIG=`printf $target|cut -f3 -d/`
    if [ ! -r $ROOT/src/mainboard/$target ]; then
    	printf "No such target: $target\n"
-		xml '</abuild>'
-		junit '</testsuite>'
-		exit 1
+		failed=1
+	else
+		build_target $VENDOR $MAINBOARD $CONFIG
+		test_target $VENDOR $MAINBOARD
+		test "$mode" != "text" && cat $TARGET/${VENDOR}_${MAINBOARD}/abuild.xml >> $REAL_XMLFILE
+		XMLFILE=$REAL_XMLFILE
    fi
-	build_target $VENDOR $MAINBOARD $CONFIG
-	test_target $VENDOR $MAINBOARD
-	test "$mode" != "text" && cat $TARGET/${VENDOR}_${MAINBOARD}/abuild.xml >> $REAL_XMLFILE
-	XMLFILE=$REAL_XMLFILE
 else
-	# build all boards per default
-	for VENDOR in $( vendors ); do
-		for MAINBOARD in $( mainboards $VENDOR ); do
-			build_target $VENDOR $MAINBOARD
-			test_target $VENDOR $MAINBOARD
-			remove_target $VENDOR $MAINBOARD
-		done
-	done
+	build_all_targets
+	rm -f $REAL_XMLFILE
+	xml '<?xml version="1.0" encoding="utf-8"?>'
+	xml '<abuild>'
+
+	junit '<?xml version="1.0" encoding="utf-8"?>'
+	junit '<testsuite>'
    if [ "$mode" != "text" ]; then
    	for xmlfile in $TARGET/*_*/abuild.xml; do
    		cat $xmlfile >> $REAL_XMLFILE