wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor update

Browse Source
This commit is contained in:
Blaise Tine
2020-12-08 21:37:53 -08:00
parent d5438fd591
commit 707ba3760f
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

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

19
ci/blackbox.sh
View File

@@ -62,10 +62,11 @@ case $i in
;; ;;
--scope) --scope)
SCOPE=1 SCOPE=1
SCOPE_FLAG=-DSCOPE
shift shift
;; ;;
--perf) --perf)
PERF=-DPERF_ENABLE PERF_FLAG=-DPERF_ENABLE
shift shift
;; ;;
--args=*) --args=*)
@@ -129,7 +130,7 @@ case $APP in
;; ;;
esac 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" echo "CONFIGS=$CONFIGS"
@@ -137,12 +138,7 @@ make -C $DRIVER_PATH clean
if [ $DEBUG -eq 1 ] if [ $DEBUG -eq 1 ]
then then
if [ $SCOPE -eq 1 ] DEBUG=1 CONFIGS="$CONFIGS" make -s -C $DRIVER_PATH $DRIVER_EXTRA
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
if [ $HAS_ARGS -eq 1 ] if [ $HAS_ARGS -eq 1 ]
then then
@@ -151,12 +147,7 @@ then
make -C $APP_PATH run-$DRIVER > run.log 2>&1 make -C $APP_PATH run-$DRIVER > run.log 2>&1
fi fi
else else
if [ $SCOPE -eq 1 ] CONFIGS="$CONFIGS" make -s -C $DRIVER_PATH $DRIVER_EXTRA
then
SCOPE=1 CONFIGS="$CONFIGS" make -s -C $DRIVER_PATH $DRIVER_EXTRA
else
CONFIGS="$CONFIGS" make -s -C $DRIVER_PATH $DRIVER_EXTRA
fi
if [ $HAS_ARGS -eq 1 ] if [ $HAS_ARGS -eq 1 ]
then then

3
driver/opae/Makefile
View File

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