diff --git a/.travis.yml b/.travis.yml index c6f8579f..ee775f73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,17 +25,17 @@ script: - travis_wait 45 ci/test_driver.sh - travis_wait 45 ci/test_riscv_isa.sh - travis_wait 45 ci/test_opencl.sh - - travis_wait 45 ci/blackbox.sh --driver=rtlsim - - travis_wait 45 ci/blackbox.sh --driver=vlsim - - travis_wait 45 ci/blackbox.sh --driver=vlsim --cores=1 --scope --app=demo --args="-n1" - - travis_wait 45 ci/blackbox.sh --driver=vlsim --debug - - travis_wait 45 ci/blackbox.sh --driver=vlsim --cores=1 - - travis_wait 45 ci/blackbox.sh --driver=vlsim --cores=2 - - travis_wait 45 ci/blackbox.sh --driver=vlsim --cores=4 - - travis_wait 45 ci/blackbox.sh --driver=vlsim --cores=2 --l2cache - - travis_wait 45 ci/blackbox.sh --driver=vlsim --cores=4 --l2cache - - travis_wait 45 ci/blackbox.sh --driver=vlsim --cores=2 --l2cache --clusters=2 - - travis_wait 45 ci/blackbox.sh --driver=vlsim --cores=2 --l2cache --clusters=4 + - travis_wait 45 ci/blackbox.sh --travis --driver=rtlsim + - travis_wait 45 ci/blackbox.sh --travis --driver=vlsim + - travis_wait 45 ci/blackbox.sh --travis --driver=vlsim --cores=1 --scope --app=demo --args="-n1" + - travis_wait 45 ci/blackbox.sh --travis --driver=vlsim --debug + - travis_wait 45 ci/blackbox.sh --travis --driver=vlsim --cores=1 + - travis_wait 45 ci/blackbox.sh --travis --driver=vlsim --cores=2 + - travis_wait 45 ci/blackbox.sh --travis --driver=vlsim --cores=4 + - travis_wait 45 ci/blackbox.sh --travis --driver=vlsim --cores=2 --l2cache + - travis_wait 45 ci/blackbox.sh --travis --driver=vlsim --cores=4 --l2cache + - travis_wait 45 ci/blackbox.sh --travis --driver=vlsim --cores=2 --l2cache --clusters=2 + - travis_wait 45 ci/blackbox.sh --travis --driver=vlsim --cores=2 --l2cache --clusters=4 after_success: # Gather code coverage diff --git a/ci/blackbox.sh b/ci/blackbox.sh index 42f3ecb5..1cee3f9e 100755 --- a/ci/blackbox.sh +++ b/ci/blackbox.sh @@ -6,7 +6,7 @@ set -e show_usage() { echo "Vortex BlackBox Test Driver v1.0" - echo "Usage: [[--clusters=#n] [--cores=#n] [--warps=#n] [--threads=#n] [--l2cache] [[--driver=rtlsim|vlsim] [--debug] [--scope] [--app=vecadd|sgemm|basic|demo|dogfood] [--args=] [--help]]" + echo "Usage: [[--clusters=#n] [--cores=#n] [--warps=#n] [--threads=#n] [--l2cache] [[--driver=rtlsim|vlsim] [--debug] [--scope] [--travis] [--app=vecadd|sgemm|basic|demo|dogfood] [--args=] [--help]]" } DRIVER=vlsim @@ -18,6 +18,7 @@ THREADS=4 L2=0 DEBUG=0 SCOPE=0 +TRAVIS=0 HAS_ARGS=0 for i in "$@" @@ -64,6 +65,10 @@ case $i in HAS_ARGS=1 shift ;; + --travis) + TRAVIS=1 + shift + ;; --help) show_usage exit @@ -120,6 +125,11 @@ make -C $DRIVER_PATH clean if [ $DEBUG -eq 1 ] then + if [ $TRAVIS -eq 1 ] + then + while sleep 9m; do echo "===[ $SECONDS sec still running ]==="; done & + fi + if [ $SCOPE -eq 1 ] then DEBUG=1 SCOPE=1 CONFIGS="$CONFIGS" make -C $DRIVER_PATH $DRIVER_EXTRA > build.log 2>&1 @@ -133,13 +143,28 @@ then else make -C $APP_PATH run-$DRIVER > run.log 2>&1 fi + + if [ $TRAVIS -eq 1 ] + then + kill %1 + fi else + if [ $TRAVIS -eq 1 ] + then + while sleep 9m; do echo "===[ $SECONDS sec still running ]==="; done & + fi + if [ $SCOPE -eq 1 ] then SCOPE=1 CONFIGS="$CONFIGS" make -C $DRIVER_PATH $DRIVER_EXTRA > build.log 2>&1 else CONFIGS="$CONFIGS" make -C $DRIVER_PATH $DRIVER_EXTRA > build.log 2>&1 fi + + if [ $TRAVIS -eq 1 ] + then + kill %1 + fi if [ $HAS_ARGS -eq 1 ] then