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 ed817cd81ef08e6fa32f9ed55666086463d186d3 Author: Bernard Ogden bernie.ogden@linaro.org Date: Fri Jul 31 13:47:11 2015 +0200
Support makeflags in multinode jobs
Change-Id: I4ce8da39f0489f78313d6d85c3319011d78317ac --- config/bench/lava/host-session | 7 ++++++- config/bench/lava/host-session.yaml | 3 ++- scripts/Benchmark.job | 4 ++-- scripts/benchmark.sh | 5 +++-- 4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/config/bench/lava/host-session b/config/bench/lava/host-session index 6a65074..ff56765 100755 --- a/config/bench/lava/host-session +++ b/config/bench/lava/host-session @@ -38,9 +38,14 @@ else export compiler_flags="$5" fi if test x"$6" = xNone; then + export make_flags= +else + export make_flags="$6" +fi +if test x"$7" = xNone; then export prebuilt= else - export prebuilt="$6" + export prebuilt="$7" fi
#Non-parameters that we need to pass to Benchmark.job diff --git a/config/bench/lava/host-session.yaml b/config/bench/lava/host-session.yaml index 26b4030..95ebaef 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 + MAKE_FLAGS: None PREBUILT: None BENCH_DEBUG: None
@@ -36,4 +37,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 33fa4bb..9f78fd0 100755 --- a/scripts/Benchmark.job +++ b/scripts/Benchmark.job @@ -64,8 +64,8 @@ fi
#Build 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 [...] + 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}`" diff --git a/scripts/benchmark.sh b/scripts/benchmark.sh index 7f9aaaf..0596a1b 100755 --- a/scripts/benchmark.sh +++ b/scripts/benchmark.sh @@ -91,7 +91,7 @@ keep= #'-p' (polite) - clean up and release target even if there [...] #'-k' (keep) - unconditionally keep target-side data and target target= post_target_cmd= -while getopts a:b:ce:f:g:hi:kps: flag; do +while getopts a:b:ce:f:g:hi:km:ps: flag; do case "${flag}" in a) run_benchargs="${OPTARG}";; b) benchmark="${OPTARG}";; @@ -118,6 +118,7 @@ while getopts a:b:ce:f:g:hi:kps: flag; do exit fi ;; + m) make_flags="${OPTARG}";; p) if test x"${keep}" = 'x-k'; then echo '-p overriding earlier -k' @@ -182,7 +183,7 @@ fi
if test x"${phases}" != xrunonly; then #abe can build the benchmarks just fine - (PATH="`dirname ${benchmark_gcc_path}`":${PATH} COMPILER_FLAGS=${compiler_flags} [...] + (PATH="`dirname ${benchmark_gcc_path}`":${PATH} COMPILER_FLAGS=${compiler_flags} [...] if test $? -ne 0; then echo "Error while building benchmark ${benchmark}" 1>&2 error=1