wrap variables in runtest

This commit is contained in:
abejgonzalez
2019-07-10 09:29:06 -07:00
parent fdf0edf8e0
commit 6469045989
2 changed files with 86 additions and 18 deletions

View File

@@ -262,7 +262,7 @@ jobs:
key: hwacha-{{ .Branch }}-{{ .Revision }}
paths:
- "/home/riscvuser/project"
example-run-benchmark-tests:
example-run-tests:
docker:
- image: riscvboom/riscvboom-images:0.0.10
environment:
@@ -280,10 +280,13 @@ jobs:
- restore_cache:
keys:
- example-{{ .Branch }}-{{ .Revision }}
- restore_cache:
keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }}
- run:
name: Run example benchmark tests
command: make run-bmark-tests -C sims/verisim SUB_PROJECT=example
boomexample-run-benchmark-tests:
command: .circleci/run-tests.sh example
boomexample-run-tests:
docker:
- image: riscvboom/riscvboom-images:0.0.10
environment:
@@ -301,10 +304,13 @@ jobs:
- restore_cache:
keys:
- boomexample-{{ .Branch }}-{{ .Revision }}
- restore_cache:
keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }}
- run:
name: Run boomexample benchmark tests
command: make run-bmark-tests -C sims/verisim SUB_PROJECT=example CONFIG=SmallDefaultBoomConfig
boomrocketexample-run-benchmark-tests:
command: .circleci/run-tests.sh boomexample
boomrocketexample-run-tests:
docker:
- image: riscvboom/riscvboom-images:0.0.10
environment:
@@ -322,10 +328,13 @@ jobs:
- restore_cache:
keys:
- boomrocketexample-{{ .Branch }}-{{ .Revision }}
- restore_cache:
keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }}
- run:
name: Run boomrocketexample benchmark tests
command: make run-bmark-tests -C sims/verisim SUB_PROJECT=example CONFIG=SmallDefaultBoomAndRocketConfig
boom-run-benchmark-tests:
command: .circleci/run-tests.sh boomrocketexample
boom-run-tests:
docker:
- image: riscvboom/riscvboom-images:0.0.10
environment:
@@ -343,10 +352,13 @@ jobs:
- restore_cache:
keys:
- boom-{{ .Branch }}-{{ .Revision }}
- restore_cache:
keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }}
- run:
name: Run boom benchmark tests
command: make run-bmark-tests -C sims/verisim SUB_PROJECT=boom
rocketchip-run-benchmark-tests:
command: .circleci/run-tests.sh boom
rocketchip-run-tests:
docker:
- image: riscvboom/riscvboom-images:0.0.10
environment:
@@ -364,10 +376,13 @@ jobs:
- restore_cache:
keys:
- rocketchip-{{ .Branch }}-{{ .Revision }}
- restore_cache:
keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }}
- run:
name: Run rocketchip benchmark tests
command: make run-bmark-tests -C sims/verisim SUB_PROJECT=rocketchip
hwacha-run-benchmark-tests:
command: .circleci/run-tests.sh rocketchip
hwacha-run-tests:
docker:
- image: riscvboom/riscvboom-images:0.0.10
environment:
@@ -385,9 +400,12 @@ jobs:
- restore_cache:
keys:
- hwacha-{{ .Branch }}-{{ .Revision }}
- restore_cache:
keys:
- verilator-installed-v3-{{ checksum "sims/verisim/verilator.mk" }}
- run:
name: Run hwacha benchmark tests
command: export RISCV=/home/riscvuser/esp-tools-install; export LD_LIBRARY_PATH=$RISCV/lib; make run-bmark-tests -C sims/verisim SUB_PROJECT=hwacha
command: export RISCV=/home/riscvuser/esp-tools-install; export LD_LIBRARY_PATH=$RISCV/lib; .circleci/run-tests.sh hwacha
# Order and dependencies of jobs to run
workflows:
@@ -439,26 +457,26 @@ workflows:
# Run the respective tests
# Run the example tests
- example-run-benchmark-tests:
- example-run-tests:
requires:
- prepare-example
- boomexample-run-benchmark-tests:
- boomexample-run-tests:
requires:
- prepare-boomexample
- boomrocketexample-run-benchmark-tests:
- boomrocketexample-run-tests:
requires:
- prepare-boomrocketexample
- boom-run-benchmark-tests:
- boom-run-tests:
requires:
- prepare-boom
- rocketchip-run-benchmark-tests:
- rocketchip-run-tests:
requires:
- prepare-rocketchip
- hwacha-run-benchmark-tests:
- hwacha-run-tests:
requires:
- prepare-hwacha

50
.circleci/run-tests.sh Executable file
View File

@@ -0,0 +1,50 @@
#!/bin/bash
# run the different tests
# turn echo on and error on earliest command
set -ex
# get remote exec variables
SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
source $SCRIPT_DIR/defaults.sh
run_bmark () {
export VERILATOR_ROOT=$LOCAL_VERILATOR_DIR/install/share/verilator
make run-bmark-tests-fast -C $LOCAL_SIM_DIR VERILATOR_INSTALL_DIR=$LOCAL_VERILATOR_DIR $@
}
run_asm () {
export VERILATOR_ROOT=$LOCAL_VERILATOR_DIR/install/share/verilator
make run-asm-tests-fast -C $LOCAL_SIM_DIR VERILATOR_INSTALL_DIR=$LOCAL_VERILATOR_DIR $@
}
run_both () {
run_bmark $@
run_asm $@
}
case $1 in
example)
run_bmark SUB_PROJECT=example
;;
boomexample)
run_bmark SUB_PROJECT=example CONFIG=DefaultBoomConfig
;;
boomrocketexample)
run_bmark SUB_PROJECT=example CONFIG=DefaultBoomAndRocketConfig
;;
boom)
run_bmark SUB_PROJECT=boom
;;
rocketchip)
run_bmark SUB_PROJECT=rocketchip
;;
hwacha)
run_bmark SUB_PROJECT=hwacha
;;
*)
echo "No set of tests for $1. Did you spell it right?"
exit 1
;;
esac