minor update

.travis.yml

@@ -25,6 +25,7 @@ script:
   - ./ci/test_riscv_isa.sh  
   - ./ci/test_opencl.sh
   - ./ci/test_driver.sh  
+  - ./ci/travis_run.py ./ci/blackbox.sh --driver=vlsim --cores=1 --perf
   - ./ci/travis_run.py ./ci/blackbox.sh --driver=vlsim --debug 
   - ./ci/travis_run.py ./ci/blackbox.sh --driver=vlsim --cores=1 --scope --app=demo --args="-n1"
   - ./ci/travis_run.py ./ci/blackbox.sh --driver=rtlsim --cores=2 --clusters=2

ci/blackbox.sh

@@ -62,10 +62,11 @@ case $i in
         ;;
     --scope)
         SCOPE=1
+        SCOPE_FLAG=-DSCOPE
         shift
         ;;
     --perf)
-        PERF=-DPERF_ENABLE
+        PERF_FLAG=-DPERF_ENABLE
         shift
         ;;
     --args=*)
@@ -129,7 +130,7 @@ case $APP in
         ;;
 esac
 
-CONFIGS="-DNUM_CLUSTERS=$CLUSTERS -DNUM_CORES=$CORES -DNUM_WARPS=$WARPS -DNUM_THREADS=$THREADS -DL2_ENABLE=$L2 -DL3_ENABLE=$L3 $PERF"
+CONFIGS="-DNUM_CLUSTERS=$CLUSTERS -DNUM_CORES=$CORES -DNUM_WARPS=$WARPS -DNUM_THREADS=$THREADS -DL2_ENABLE=$L2 -DL3_ENABLE=$L3 $PERF_FLAG $SCOPE_FLAG"
 
 echo "CONFIGS=$CONFIGS"
 
@@ -137,12 +138,7 @@ make -C $DRIVER_PATH clean
 
 if [ $DEBUG -eq 1 ]
 then    
-    if [ $SCOPE -eq 1 ]
-    then
-        DEBUG=1 SCOPE=1 CONFIGS="$CONFIGS" make -s -C $DRIVER_PATH $DRIVER_EXTRA
-    else
-        DEBUG=1 CONFIGS="$CONFIGS" make -s -C $DRIVER_PATH $DRIVER_EXTRA
-    fi    
+    DEBUG=1 CONFIGS="$CONFIGS" make -s -C $DRIVER_PATH $DRIVER_EXTRA
     
     if [ $HAS_ARGS -eq 1 ]
     then
@@ -151,12 +147,7 @@ then
         make -C $APP_PATH run-$DRIVER > run.log 2>&1
     fi
 else
-    if [ $SCOPE -eq 1 ]
-    then
-        SCOPE=1 CONFIGS="$CONFIGS" make -s -C $DRIVER_PATH $DRIVER_EXTRA
-    else
-        CONFIGS="$CONFIGS" make -s -C $DRIVER_PATH $DRIVER_EXTRA
-    fi
+    CONFIGS="$CONFIGS" make -s -C $DRIVER_PATH $DRIVER_EXTRA
     
     if [ $HAS_ARGS -eq 1 ]
     then

driver/opae/Makefile

@@ -21,6 +21,9 @@ CXXFLAGS +=-fstack-protector
 # Position independent code
 CXXFLAGS += -fPIC
 
+# Add external configuration
+CXXFLAGS += $(CONFIGS)
+
 # Dump perf stats
 CXXFLAGS += -DDUMP_PERF_STATS