project tests refactoring

ci/blackbox.sh

@@ -120,12 +120,15 @@ case $DRIVER in
         ;;
 esac
 
-if [ -d "$VORTEX_HOME/driver/tests/$APP" ]; 
+if [ -d "$VORTEX_HOME/tests/opencl/$APP" ];
 then
-    APP_PATH=$VORTEX_HOME/driver/tests/$APP
-elif [ -d "$VORTEX_HOME/benchmarks/opencl/$APP" ];
+    APP_PATH=$VORTEX_HOME/tests/opencl/$APP
+elif [ -d "$VORTEX_HOME/tests/regression/$APP" ];
 then
-    APP_PATH=$VORTEX_HOME/benchmarks/opencl/$APP
+    APP_PATH=$VORTEX_HOME/tests/regression/$APP
+elif [ -d "$VORTEX_HOME/tests/driver/$APP" ];
+then
+    APP_PATH=$VORTEX_HOME/tests/driver/$APP
 else
     echo "Application folder found: $APP"
     exit -1

ci/regression.sh

@@ -6,11 +6,11 @@ set -e
 make -s
 
 # Dogfood tests
-./ci/test_runtime.sh
-./ci/test_riscv_isa.sh  
-./ci/test_opencl.sh
-./ci/test_driver.sh  
-./ci/test_simx.sh
+make -C tests/runtime run
+make -C tests/riscv/isa run
+make -C tests/driver run
+make -C tests/opencl run
+make -C simX run-tests
 
 # warp/threads configurations
 ./ci/travis_run.py ./ci/blackbox.sh --driver=rtlsim --cores=1 --warps=2 --threads=2 --app=demo

ci/test_compiler.sh

@@ -7,12 +7,15 @@ set -e
 make -C runtime clean
 make -C runtime
 
+# clear POCL cache
+rm -rf ~/.cache/pocl
+
 # rebuild native kernel
-make -C driver/tests/dogfood clean-all
-make -C driver/tests/dogfood
+make -C tests/driver/dogfood clean-all
+make -C tests/driver/dogfood
 ./ci/blackbox.sh --driver=vlsim --cores=1 --app=dogfood
 
 # rebuild opencl kernel
-make -C benchmarks/opencl/sgemm clean-all
-make -C benchmarks/opencl/sgemm
+make -C tests/opencl/sgemm clean-all
+make -C tests/opencl/sgemm
 ./ci/blackbox.sh --driver=vlsim --cores=1 --app=sgemm

ci/test_driver.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# exit when any command fails
-set -e
-
-make -C driver/tests run

ci/test_opencl.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# exit when any command fails
-set -e
-
-make -C benchmarks/opencl run

ci/test_riscv_isa.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# exit when any command fails
-set -e
-
-make -C benchmarks/riscv_tests/isa run

ci/test_runtime.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# exit when any command fails
-set -e
-
-make -C runtime/tests run

ci/test_simx.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# exit when any command fails
-set -e
-
-make -C simX run