diff --git a/.travis.yml b/.travis.yml index 8399f562e..b461c3e24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,6 @@ script: - ci/blackbox.sh -run_2c - ci/blackbox.sh -run_4c - ci/blackbox.sh -run_4c_l2 - #- travis_wait 30 ci/blackbox.sh -run_8c_2l2 #- travis_wait 30 ci/blackbox.sh -run_4c_2l2_l3 #- travis_wait 30 ci/blackbox.sh -run_8c_4l2_l3 diff --git a/ci/blackbox.sh b/ci/blackbox.sh index d78295907..8b8afa2b3 100755 --- a/ci/blackbox.sh +++ b/ci/blackbox.sh @@ -35,19 +35,11 @@ run_4c_l2() make -C benchmarks/opencl/sgemm run-vlsim } -run_8c_2l2() -{ - # test 8 cores with 2xL2 - make -C driver/opae/vlsim clean - CONFIGS="-DNUM_CLUSTERS=2 -DNUM_CORES=4 -DL2_ENABLE=1" make -C driver/opae/vlsim > /dev/null 2>&1 - make -C benchmarks/opencl/sgemm run-vlsim -} - run_4c_2l2_l3() { # test 4 cores with L2 and L3 make -C driver/opae/vlsim clean - CONFIGS="-DNUM_CLUSTERS=2 -DNUM_CORES=2 -DL2_ENABLE=1 -DL3_ENABLE=1" make -C driver/opae/vlsim > /dev/null 2>&1 + CONFIGS="-DNUM_CLUSTERS=2 -DNUM_CORES=2 -DL2_ENABLE=1" make -C driver/opae/vlsim > /dev/null 2>&1 make -C benchmarks/opencl/sgemm run-vlsim } @@ -55,7 +47,7 @@ run_8c_4l2_l3() { # test 8 cores with L2 and L3 make -C driver/opae/vlsim clean - CONFIGS="-DNUM_CLUSTERS=4 -DNUM_CORES=2 -DL2_ENABLE=1 -DL3_ENABLE=1" make -C driver/opae/vlsim > /dev/null 2>&1 + CONFIGS="-DNUM_CLUSTERS=4 -DNUM_CORES=2 -DL2_ENABLE=1" make -C driver/opae/vlsim > /dev/null 2>&1 make -C benchmarks/opencl/sgemm run-vlsim } @@ -77,7 +69,7 @@ run_scope() usage() { - echo "usage: blackbox [[-run_1c] [-run_2c] [-run_4c] [-run_4c_l2] [-run_8c_2l2] [-run_4c_2l2_l3] [-run_8c_4l2_l3] [-run_debug] [-run_scope] [-all] [-h|--help]]" + echo "usage: blackbox [[-run_1c] [-run_2c] [-run_4c] [-run_4c_l2] [-run_4c_2l2_l3] [-run_8c_4l2_l3] [-run_debug] [-run_scope] [-all] [-h|--help]]" } while [ "$1" != "" ]; do @@ -90,8 +82,6 @@ while [ "$1" != "" ]; do ;; -run_4c_l2 ) run_4c_l2 ;; - -run_8c_2l2 ) run_8c_2l2 - ;; -run_4c_2l2_l3 ) run_4c_2l2_l3 ;; -run_8c_4l2_l3 ) run_8c_4l2_l3 @@ -104,7 +94,6 @@ while [ "$1" != "" ]; do run_2c run_4c run_4c_l2 - run_8c_2l2 run_4c_2l2_l3 run_8c_4l2_l3 run_debug