This is an automated email from the git hooks/post-receive script.
bernie.ogden pushed a commit to branch bernie/benchmarking in repository toolchain/abe.
commit 75250495b9f60a12fe3b4e511e0f02951b8e07b8 Author: Bernard Ogden bernie.ogden@linaro.org Date: Fri Jul 31 12:23:46 2015 +0200
Permit benchmarking with prebuilt benchmark
Benchmark must be delivered as a tarball that just unpacks into expected abe location.
Change-Id: Ia045f7522acb80d9389e963e525b456504efec09 --- config/bench/lava/host-session | 5 +++++ config/bench/lava/host-session.yaml | 3 ++- scripts/Benchmark.job | 10 ++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/config/bench/lava/host-session b/config/bench/lava/host-session index bb21e34..8c4b71a 100755 --- a/config/bench/lava/host-session +++ b/config/bench/lava/host-session @@ -37,6 +37,11 @@ if test x"$5" = xNone; then else export compiler_flags="$5" fi +if test x"$6" = xNone; then + export prebuilt= +else + export prebuilt="$6" +fi
#Non-parameters that we need to pass to Benchmark.job export ABE_DIR diff --git a/config/bench/lava/host-session.yaml b/config/bench/lava/host-session.yaml index b4ada28..26b4030 100644 --- a/config/bench/lava/host-session.yaml +++ b/config/bench/lava/host-session.yaml @@ -10,6 +10,7 @@ params: TOOLCHAIN: https://releases.linaro.org/14.11/components/toolchain/binaries/arm [...] RUN_FLAGS: None COMPILER_FLAGS: None + PREBUILT: None BENCH_DEBUG: None
install: @@ -35,4 +36,4 @@ install: run: steps: - ./config/bench/lava/setup "$PUB_KEY" - - env ABE_DIR=`pwd` BENCH_DEBUG="$BENCH_DEBUG" ./config/bench/lava/host-se [...] + - env ABE_DIR=`pwd` BENCH_DEBUG="$BENCH_DEBUG" ./config/bench/lava/host-se [...] diff --git a/scripts/Benchmark.job b/scripts/Benchmark.job index 35332a6..33fa4bb 100755 --- a/scripts/Benchmark.job +++ b/scripts/Benchmark.job @@ -63,8 +63,14 @@ if test x"${benchgccpath}" != x; then fi
#Build -echo "${ABE_DIR}"/scripts/benchmark.sh -s buildonly ${compiler_flags:+-f "${compi [...] - "${ABE_DIR}"/scripts/benchmark.sh -s buildonly ${compiler_flags:+-f "${compi [...] +if test x"${prebuilt:-}" = x; then + echo "${ABE_DIR}"/scripts/benchmark.sh -s buildonly ${compiler_flags:+-f "${com [...] + "${ABE_DIR}"/scripts/benchmark.sh -s buildonly ${compiler_flags:+-f "${com [...] +else + #TODO: Store tarball in a tmpdir + tar xf "`get_thing ${prebuilt}`" + rm "${prebuilt#*:}" +fi
#Post-build command ${post_build_cmd:-}
-
git