[oe-commits] Darren Hart : bb-matrix: Fix min and max calculations

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 90dc44c8246f2a580fe4a41ce28c201e52307500
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=90dc44c8246f2a580fe4a41ce28c201e52307500

Author: Darren Hart <dvhart at linux.intel.com>
Date:   Fri Jan 18 23:13:52 2013 +0000

bb-matrix: Fix min and max calculations

The BB and PM ranges were originally intended to use leading 0s to
ensure all the values were the same string length, making for nice log
filenames and columnar dat files. However, not everyone will do this -
especially if it isn't documented.

Document the intent. Make the generation and parsing of dat files robust
to either method.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/contrib/bb-perf/bb-matrix-plot.sh |   12 ++++++------
 scripts/contrib/bb-perf/bb-matrix.sh      |    5 ++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/scripts/contrib/bb-perf/bb-matrix-plot.sh b/scripts/contrib/bb-perf/bb-matrix-plot.sh
index 62aa66d..87e8cb1 100755
--- a/scripts/contrib/bb-perf/bb-matrix-plot.sh
+++ b/scripts/contrib/bb-perf/bb-matrix-plot.sh
@@ -101,12 +101,12 @@ if [ -z "$TITLE" ]; then
 fi
 
 # Determine the dgrid3d mesh dimensions size
-MIN=$(tail -n +2 "$DATFILE" | cut -d ' ' -f 1 | sort | uniq | head -n1)
-MAX=$(tail -n +2 "$DATFILE" | cut -d ' ' -f 1 | sort | uniq | tail -n1)
-BB_CNT=$[${MAX#*0} - $MIN + 1]
-MIN=$(tail -n +2 "$DATFILE" | cut -d ' ' -f 2 | sort | uniq | head -n1)
-MAX=$(tail -n +2 "$DATFILE" | cut -d ' ' -f 2 | sort | uniq | tail -n1)
-PM_CNT=$[${MAX#*0} - $MIN + 1]
+MIN=$(tail -n +2 "$DATFILE" | cut -d ' ' -f 1 | sed 's/^0*//' | sort -n | uniq | head -n1)
+MAX=$(tail -n +2 "$DATFILE" | cut -d ' ' -f 1 | sed 's/^0*//' | sort -n | uniq | tail -n1)
+BB_CNT=$[${MAX} - $MIN + 1]
+MIN=$(tail -n +2 "$DATFILE" | cut -d ' ' -f 2 | sed 's/^0*//' | sort -n | uniq | head -n1)
+MAX=$(tail -n +2 "$DATFILE" | cut -d ' ' -f 2 | sed 's/^0*//' | sort -n | uniq | tail -n1)
+PM_CNT=$[${MAX} - $MIN + 1]
 
 
 (cat <<EOF
diff --git a/scripts/contrib/bb-perf/bb-matrix.sh b/scripts/contrib/bb-perf/bb-matrix.sh
index b9edd5f..37721fe 100755
--- a/scripts/contrib/bb-perf/bb-matrix.sh
+++ b/scripts/contrib/bb-perf/bb-matrix.sh
@@ -33,6 +33,8 @@
 #
 
 # The following ranges are appropriate for a 4 core system with 8 logical units
+# Use leading 0s to ensure all digits are the same string length, this results
+# in nice log file names and columnar dat files.
 BB_RANGE="04 05 06 07 08 09 10 11 12 13 14 15 16"
 PM_RANGE="04 05 06 07 08 09 10 11 12 13 14 15 16"
 
@@ -62,10 +64,11 @@ for BB in $BB_RANGE; do
 		echo "BB=$BB PM=$PM Logging to $BB_LOG"
 
 		# Export the variables under test and run the bitbake command
+		# Strip any leading zeroes before passing to bitbake
 		export BB_NUMBER_THREADS=$(echo $BB | sed 's/^0*//')
 		export PARALLEL_MAKE="-j $(echo $PM | sed 's/^0*//')"
 		/usr/bin/time -f "$BB $PM $TIME_STR" -a -o $RUNTIME_LOG $BB_CMD &> $BB_LOG
-		
+
 		echo "  $(tail -n1 $RUNTIME_LOG)"
 		echo -n "  Cleaning up..."
 		mv tmp/buildstats $RUNDIR/$BB-$PM-buildstats