This is an automated email from the git hooks/post-receive script.
bernie.ogden pushed a commit to branch bernie/benchmarking-logging in repository toolchain/abe.
commit ff3eee7afdd534505d094e9af81b00e6e3bd557a Author: Bernard Ogden bernie.ogden@linaro.org Date: Fri Jul 31 17:37:03 2015 +0200
WIP
Change-Id: Ifb63e8d3b21febb490087855d5aa86297daa9a5b --- config/CPU2006.conf | 3 +++ config/bench/lava/host-session | 2 ++ scripts/benchmark.sh | 24 ++++++++++++++++++------ scripts/controlledrun.sh | 3 +++ 4 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/config/CPU2006.conf b/config/CPU2006.conf index b0bc925..56037c6 100644 --- a/config/CPU2006.conf +++ b/config/CPU2006.conf @@ -13,3 +13,6 @@ fi
benchlog=result safe_output=yes + +binaries='benchspec/CPU2006/{400.perlbench,401.bzip2,403.gcc,410.bwaves,416.gamess [...] + diff --git a/config/bench/lava/host-session b/config/bench/lava/host-session index ff56765..4d13088 100755 --- a/config/bench/lava/host-session +++ b/config/bench/lava/host-session @@ -70,6 +70,8 @@ mkdir ~/data || exit 1
#Need to be able to ssh to dev-private echo 'dev-private.git.linaro.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyN [...] +#Permit scping of toolchains/built benchmarks from this machine +echo '148.251.136.42 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzd [...]
#Generate config file for each target in multinode job lava-network broadcast eth0 diff --git a/scripts/benchmark.sh b/scripts/benchmark.sh index 0596a1b..e923f7b 100755 --- a/scripts/benchmark.sh +++ b/scripts/benchmark.sh @@ -181,7 +181,20 @@ else #cross-build, implies we need remote devices fi fi
+builddir="`. ${abe_top}/host.conf && . ${topdir}/lib/common.sh && if test x"${benc [...] +if test $? -ne 0; then + echo "Unable to get builddir" 1>&2 + error=1 + exit +fi + if test x"${phases}" != xrunonly; then + #Log information about build environment + env >> build.log + ${benchmark_gcc_path} -v >> build.log + ${benchmark_gcc_path} --version >> build.log + #TODO Repo and hash of source + #abe can build the benchmarks just fine (PATH="`dirname ${benchmark_gcc_path}`":${PATH} COMPILER_FLAGS=${compiler_flags} [...] if test $? -ne 0; then @@ -189,18 +202,17 @@ if test x"${phases}" != xrunonly; then error=1 exit fi + + echo >> build.log + echo >> "Sizes" + size "${builddir}"/`. ${abe_top}/host.conf && . ${topdir}/lib/common.sh && read_ [...] fi if test x"${phases}" = xbuildonly; then error=0 exit fi
-builddir="`. ${abe_top}/host.conf && . ${topdir}/lib/common.sh && if test x"${benc [...] -if test $? -ne 0; then - echo "Unable to get builddir" 1>&2 - error=1 - exit -fi +#TODO Whereever we put the build log, put the output binaries as well - that way, [...]
#Compress build to a tmpfile in our top-level working directory #This should be good for bandwidth diff --git a/scripts/controlledrun.sh b/scripts/controlledrun.sh index 612207a..1059fab 100755 --- a/scripts/controlledrun.sh +++ b/scripts/controlledrun.sh @@ -555,6 +555,9 @@ ${sudo} ifconfig | tee -a "${log}" if test $? -ne 0; then echo "*** Unable to get network info" | tee -a "${log}" fi +echo | tee -a "${log}" +echo "** Environment:" | tee -a "${log}" +env | tee -a "${log}" echo "===================" | tee -a "${log}" echo | tee -a "${log}"