github-mirrors/vortex
1
0
Fork 0
mirror of https://github.com/vortexgpgpu/vortex.git synced 2025-04-23 21:39:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor update

Browse source
This commit is contained in:
Blaise Tine 2024-04-07 03:20:19 -07:00
parent 6400e73c42
commit e9b66d5a1c
5 changed files with 88 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

16
.travis.yml
View file

@ -22,16 +22,16 @@ cache:
- $HOME/build64
install:
- if [ ! -d "$TOOLDIR" ] || [ -z "$(ls -A $TOOLDIR)" ] || [ "$(cat "$TOOLDIR/version.txt")" != "v2" ]; then
- if [ ! -d "$TOOLDIR" ] || [ -z "$(ls -A $TOOLDIR)" ] || [ "$(cat "$TOOLDIR/version.txt")" != "v2.1" ]; then
rm -rf $TOOLDIR;
mkdir -p $TOOLDIR;
cd $HOME/build$XLEN && ./ci/toolchain_install.sh --all;
echo "v2" > "$TOOLDIR/version.txt";
echo "v2.1" > "$TOOLDIR/version.txt";
fi
- if [ ! -d "$HOME/third_party" ] || [ -z "$(ls -A $HOME/third_party)" ] || [ "$(cat "$HOME/third_party/version.txt")" != "v2" ]; then
- if [ ! -d "$HOME/third_party" ] || [ -z "$(ls -A $HOME/third_party)" ] || [ "$(cat "$HOME/third_party/version.txt")" != "v2.1" ]; then
make -C third_party > /dev/null;
cp -r third_party $HOME;
echo "v2" > "$HOME/third_party/version.txt";
echo "v2.1" > "$HOME/third_party/version.txt";
else
cp -r $HOME/third_party . ;
fi
@ -73,6 +73,14 @@ jobs:
name: isa64
env: XLEN=64
script: cp -r $HOME/build$XLEN build && cd build && ./ci/travis_run.py ./ci/regression.sh --isa
- stage: test
name: kernel
env: XLEN=32
script: cp -r $HOME/build$XLEN build && cd build && ./ci/travis_run.py ./ci/regression.sh --kernel
- stage: test
name: kernel64
env: XLEN=64
script: cp -r $HOME/build$XLEN build && cd build && ./ci/travis_run.py ./ci/regression.sh --kernel
- stage: test
name: regression
env: XLEN=32

17
ci/regression.sh
View file

@ -62,13 +62,20 @@ isa()
echo "isa tests done!"
}
regression()
kernel()
{
echo "begin regression tests..."
echo "begin kernel tests..."
make -C tests/kernel run-simx
make -C tests/kernel run-rtlsim
echo "kernel tests done!"
}
regression()
{
echo "begin regression tests..."
make -C tests/regression run-simx
make -C tests/regression run-rtlsim
@ -278,7 +285,7 @@ synthesis()
show_usage()
{
echo "Vortex Regression Test"
echo "Usage: $0 [--clean] [--unittest] [--isa] [--regression] [--opencl] [--cluster] [--debug] [--config] [--stress[#n]] [--synthesis] [--all] [--h|--help]"
echo "Usage: $0 [--clean] [--unittest] [--isa] [--kernel] [--regression] [--opencl] [--cluster] [--debug] [--config] [--stress[#n]] [--synthesis] [--all] [--h|--help]"
}
start=$SECONDS
@ -297,6 +304,9 @@ while [ "$1" != "" ]; do
--isa )
tests+=("isa")
;;
--kernel )
tests+=("kernel")
;;
--regression )
tests+=("regression")
;;
@ -329,6 +339,7 @@ while [ "$1" != "" ]; do
tests=()
tests+=("unittest")
tests+=("isa")
tests+=("kernel")
tests+=("regression")
tests+=("opencl")
tests+=("cluster")

71
ci/toolchain_install.sh.in
View file

@ -22,22 +22,22 @@ OSDIR=${OSDIR:=@OSDIR@}
OS="${OS:=ubuntu/bionic}"
riscv()
riscv32()
{
case $OSDIR in
"centos/7") parts=$(eval echo {a..h}) ;;
*) parts=$(eval echo {a..j}) ;;
esac
rm -f riscv-gnu-toolchain.tar.bz2.parta*
rm -f riscv32-gnu-toolchain.tar.bz2.parta*
for x in $parts
do
wget $REPOSITORY/riscv-gnu-toolchain/$OSDIR/riscv-gnu-toolchain.tar.bz2.parta$x
wget $REPOSITORY/riscv32-gnu-toolchain/$OSDIR/riscv32-gnu-toolchain.tar.bz2.parta$x
done
cat riscv-gnu-toolchain.tar.bz2.parta* > riscv-gnu-toolchain.tar.bz2
tar -xvf riscv-gnu-toolchain.tar.bz2
cp -r riscv-gnu-toolchain $TOOLDIR
rm -f riscv-gnu-toolchain.tar.bz2*
rm -rf riscv-gnu-toolchain
cat riscv32-gnu-toolchain.tar.bz2.parta* > riscv32-gnu-toolchain.tar.bz2
tar -xvf riscv32-gnu-toolchain.tar.bz2
cp -r riscv32-gnu-toolchain $TOOLDIR
rm -f riscv32-gnu-toolchain.tar.bz2*
rm -rf riscv32-gnu-toolchain
}
riscv64()
@ -58,7 +58,7 @@ riscv64()
rm -rf riscv64-gnu-toolchain
}
llvm-vortex()
llvm()
{
case $OSDIR in
"centos/7") parts=$(eval echo {a..b}) ;;
@ -77,32 +77,22 @@ llvm-vortex()
rm -rf llvm-vortex
}
libc-vortex()
libc32()
{
wget $REPOSITORY/libc-vortex/$OSDIR/libc-vortex.tar.bz2
tar -xvf libc-vortex.tar.bz2
rm -f libc-vortex.tar.bz2
cp -r libc-vortex $TOOLDIR
rm -rf libc-vortex
wget $REPOSITORY/libc32/libc32.tar.bz2
tar -xvf libc32.tar.bz2
rm -f libc32.tar.bz2
cp -r libc32 $TOOLDIR
rm -rf libc32
}
llvm-pocl()
libc64()
{
case $OSDIR in
"centos/7") parts=$(eval echo {a..b}) ;;
*) parts=$(eval echo {a..b}) ;;
esac
echo $parts
rm -f llvm-pocl.tar.bz2.parta*
for x in $parts
do
wget $REPOSITORY/llvm-pocl/$OSDIR/llvm-pocl.tar.bz2.parta$x
done
cat llvm-pocl.tar.bz2.parta* > llvm-pocl.tar.bz2
tar -xvf llvm-pocl.tar.bz2
cp -r llvm-pocl $TOOLDIR
rm -f llvm-pocl.tar.bz2*
rm -rf llvm-pocl
wget $REPOSITORY/libc64/libc64.tar.bz2
tar -xvf libc64.tar.bz2
rm -f libc64.tar.bz2
cp -r libc64 $TOOLDIR
rm -rf libc64
}
pocl()
@ -154,7 +144,7 @@ yosys()
show_usage()
{
echo "Install Pre-built Vortex Toolchain"
echo "Usage: $0 [[--riscv] [--riscv64] [--llvm-vortex] [--libc-vortex] [--llvm-pocl] [--pocl] [--verilator] [--sv2v] [--yosys] [--all] [-h|--help]]"
echo "Usage: $0 [--pocl] [--verilator] [--riscv32] [--riscv64] [--llvm] [--libc32] [--libc64] [--sv2v] [--yosys] [--all] [-h|--help]"
}
while [ "$1" != "" ]; do
@ -163,15 +153,15 @@ while [ "$1" != "" ]; do
;;
--verilator ) verilator
;;
--riscv ) riscv
--riscv32 ) riscv32
;;
--riscv64 ) riscv64
;;
--llvm-vortex ) llvm-vortex
--llvm ) llvm
;;
--libc-vortex ) libc-vortex
--libc32 ) libc32
;;
--llvm-pocl ) llvm-pocl
--libc64 ) libc64
;;
--sv2v ) sv2v
;;
@ -179,12 +169,13 @@ while [ "$1" != "" ]; do
;;
--all ) pocl
verilator
llvm
libc32
libc64
riscv32
riscv64
sv2v
yosys
llvm-vortex
libc-vortex
riscv
riscv64
;;
-h | --help ) show_usage
exit

60
ci/toolchain_prebuilt.sh.in
View file

@ -19,14 +19,14 @@ set -e
TOOLDIR=${TOOLDIR:=@TOOLDIR@}
OSDIR=${OSDIR:=@OSDIR@}
riscv()
riscv32()
{
echo "prebuilt riscv-gnu-toolchain..."
tar -C $TOOLDIR -cvjf riscv-gnu-toolchain.tar.bz2 riscv-gnu-toolchain
split -b 50M riscv-gnu-toolchain.tar.bz2 "riscv-gnu-toolchain.tar.bz2.part"
mkdir -p ./riscv-gnu-toolchain/$OSDIR
mv riscv-gnu-toolchain.tar.bz2.part* ./riscv-gnu-toolchain/$OSDIR
rm riscv-gnu-toolchain.tar.bz2
echo "prebuilt riscv32-gnu-toolchain..."
tar -C $TOOLDIR -cvjf riscv32-gnu-toolchain.tar.bz2 riscv32-gnu-toolchain
split -b 50M riscv32-gnu-toolchain.tar.bz2 "riscv32-gnu-toolchain.tar.bz2.part"
mkdir -p ./riscv32-gnu-toolchain/$OSDIR
mv riscv32-gnu-toolchain.tar.bz2.part* ./riscv32-gnu-toolchain/$OSDIR
rm riscv32-gnu-toolchain.tar.bz2
}
riscv64()
@ -39,7 +39,7 @@ riscv64()
rm riscv64-gnu-toolchain.tar.bz2
}
llvm-vortex()
llvm()
{
echo "prebuilt llvm-vortex..."
tar -C $TOOLDIR -cvjf llvm-vortex.tar.bz2 llvm-vortex
@ -49,22 +49,20 @@ llvm-vortex()
rm llvm-vortex.tar.bz2
}
libc-vortex()
libc32()
{
echo "prebuilt libc-vortex..."
tar -C $TOOLDIR -cvjf libc-vortex.tar.bz2 libc-vortex
mkdir -p ./libc-vortex/$OSDIR
mv libc-vortex.tar.bz2 ./libc-vortex/$OSDIR
echo "prebuilt libc32..."
tar -C $TOOLDIR -cvjf libc32.tar.bz2 libc32
mkdir -p ./libc32
mv libc32.tar.bz2 ./libc32
}
llvm-pocl()
libc64()
{
echo "prebuilt llvm-pocl..."
tar -C $TOOLDIR -cvjf llvm-pocl.tar.bz2 llvm-pocl
split -b 50M llvm-pocl.tar.bz2 "llvm-pocl.tar.bz2.part"
mkdir -p ./llvm-pocl/$OSDIR
mv llvm-pocl.tar.bz2.part* ./llvm-pocl/$OSDIR
rm llvm-pocl.tar.bz2
echo "prebuilt libc64..."
tar -C $TOOLDIR -cvjf libc64.tar.bz2 libc64
mkdir -p ./libc64
mv libc64.tar.bz2 ./libc64
}
pocl()
@ -104,7 +102,7 @@ yosys()
show_usage()
{
echo "Setup Pre-built Vortex Toolchain"
echo "Usage: $0 [[--riscv] [--llvm-vortex] [--libc-vortex] [--llvm-pocl] [--pocl] [--verilator] [--sv2v] [-yosys] [--all] [-h|--help]]"
echo "Usage: $0 [--pocl] [--verilator] [--riscv32] [--riscv64] [--llvm] [--libc32] [--libc64] [--sv2v] [-yosys] [--all] [-h|--help]"
}
while [ "$1" != "" ]; do
@ -113,27 +111,27 @@ while [ "$1" != "" ]; do
;;
--verilator ) verilator
;;
--riscv ) riscv
--riscv32 ) riscv32
;;
--riscv64 ) riscv64
;;
--llvm-vortex ) llvm-vortex
--llvm ) llvm
;;
--libc-vortex ) libc-vortex
--libc32 ) libc32
;;
--llvm-pocl ) llvm-pocl
--libc64 ) libc64
;;
--sv2v ) sv2v
;;
--yosys ) yosys
;;
--all ) riscv
riscv64
llvm-vortex
libc-vortex
llvm-pocl
pocl
--all ) pocl
verilator
riscv32
riscv64
llvm
libc32
libc64
sv2v
yosys
;;

8
config.mk.in
View file

@ -19,13 +19,9 @@ TOOLDIR ?= @TOOLDIR@
LLVM_VORTEX ?= $(TOOLDIR)/llvm-vortex
LIBC_VORTEX ?= $(TOOLDIR)/libc-vortex
LIBC_VORTEX ?= $(TOOLDIR)/libc$(XLEN)
ifeq ($(XLEN),64)
RISCV_TOOLCHAIN_PATH ?= $(TOOLDIR)/riscv64-gnu-toolchain
else
RISCV_TOOLCHAIN_PATH ?= $(TOOLDIR)/riscv-gnu-toolchain
endif
RISCV_TOOLCHAIN_PATH ?= $(TOOLDIR)/riscv$(XLEN)-gnu-toolchain
RISCV_PREFIX ?= riscv$(XLEN)-unknown-elf
RISCV_SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/$(RISCV_PREFIX)