diff options
| author |   Rex Lee <limingjiang@huawei.com> | 2017-06-22 12:27:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-06-22 12:27:24 +0000 |
| commit | 9ae5680998c044bd4d9e39c6dba24ac55c252dd7 (patch) | |
| tree | 313409c59f759dd34971f1862d76f3848f53905e | |
| parent | 9e0b2465e53fda587c003e8d646308d0a2b62cbd (diff) | |
| parent | d3b6455e19f9bc291601ee6400d99552d1962711 (diff) | |
Merge "Adapt lmbench scripts for aarch64 nodes" into stable/danube
3 files changed, 25 insertions, 3 deletions
diff --git a/yardstick/benchmark/scenarios/compute/lmbench_bandwidth_benchmark.bash b/yardstick/benchmark/scenarios/compute/lmbench_bandwidth_benchmark.bash index 09993a088..1a25121c7 100644 --- a/yardstick/benchmark/scenarios/compute/lmbench_bandwidth_benchmark.bash +++ b/yardstick/benchmark/scenarios/compute/lmbench_bandwidth_benchmark.bash @@ -19,6 +19,8 @@ SIZE=$1 TEST_NAME=$2 WARMUP=$3 +NODE_CPU_ARCH="$(uname -m)" + # write the result to stdout in json format output_json() { @@ -26,4 +28,10 @@ output_json() echo $DATA | awk '/ /{printf "{\"size(MB)\": %s, \"bandwidth(MBps)\": %s}", $1, $2}' } -/usr/lib/lmbench/bin/x86_64-linux-gnu/bw_mem -W $WARMUP ${SIZE}k $TEST_NAME 2>&1 | output_json
\ No newline at end of file +if [ "${NODE_CPU_ARCH}" == "aarch64" ]; then + REL_PATH="bw_mem" +else + REL_PATH="x86_64-linux-gnu/bw_mem" +fi + +/usr/lib/lmbench/bin/${REL_PATH} -W $WARMUP ${SIZE}k $TEST_NAME 2>&1 | output_json
\ No newline at end of file diff --git a/yardstick/benchmark/scenarios/compute/lmbench_latency_benchmark.bash b/yardstick/benchmark/scenarios/compute/lmbench_latency_benchmark.bash index 04e3c1a9d..be27a87b0 100644 --- a/yardstick/benchmark/scenarios/compute/lmbench_latency_benchmark.bash +++ b/yardstick/benchmark/scenarios/compute/lmbench_latency_benchmark.bash @@ -19,6 +19,8 @@ SIZE=$1 shift STRIDE=$1 +NODE_CPU_ARCH="$(uname -m)" + # write the result to stdout in json format output_json() { @@ -37,5 +39,10 @@ output_json() echo ] } -/usr/lib/lmbench/bin/x86_64-linux-gnu/lat_mem_rd $SIZE $STRIDE 2>&1 | output_json +if [ "${NODE_CPU_ARCH}" == "aarch64" ]; then + REL_PATH="lat_mem_rd" +else + REL_PATH="x86_64-linux-gnu/lat_mem_rd" +fi +/usr/lib/lmbench/bin/${REL_PATH} $SIZE $STRIDE 2>&1 | output_json
\ No newline at end of file diff --git a/yardstick/benchmark/scenarios/compute/lmbench_latency_for_cache.bash b/yardstick/benchmark/scenarios/compute/lmbench_latency_for_cache.bash index 2ed1bbe14..dd5d6292e 100644 --- a/yardstick/benchmark/scenarios/compute/lmbench_latency_for_cache.bash +++ b/yardstick/benchmark/scenarios/compute/lmbench_latency_for_cache.bash @@ -18,6 +18,8 @@ set -e REPETITON=$1 WARMUP=$2 +NODE_CPU_ARCH="$(uname -m)" + # write the result to stdout in json format output_json() { @@ -25,5 +27,10 @@ output_json() echo $DATA | awk '{printf "{\"L1cache\": %s}", $5}' } -/usr/lib/lmbench/bin/x86_64-linux-gnu/cache -W $WARMUP -N $REPETITON 2>&1 | output_json +if [ "${NODE_CPU_ARCH}" == "aarch64" ]; then + REL_PATH="cache" +else + REL_PATH="x86_64-linux-gnu/cache" +fi +/usr/lib/lmbench/bin/${REL_PATH} -W $WARMUP -N $REPETITON 2>&1 | output_json
\ No newline at end of file |