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-30 04:19:59 -07:00
parent 284d438acd
commit 19484a531a
5 changed files with 46 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

30
.travis.yml
View file

@ -3,10 +3,10 @@ dist: focal
os: linux
compiler: gcc
addons:
addons:
apt:
packages:
- build-essential
- build-essential
- valgrind
- libstdc++6
- binutils
@ -25,19 +25,19 @@ cache:
- $HOME/build64
install:
- if [ ! -d "$TOOLDIR" ] || [ -z "$(ls -A $TOOLDIR)" ] || [ "$(cat "$TOOLDIR/version.txt")" != "v0" ]; then
- if [ ! -d "$TOOLDIR" ] || [ -z "$(ls -A $TOOLDIR)" ] || [ "$(cat "$TOOLDIR/version.txt")" != "v0.1" ]; then
rm -rf $TOOLDIR;
mkdir -p $TOOLDIR;
cd $HOME/build$XLEN;
./ci/toolchain_install.sh --all;
echo "v0" > "$TOOLDIR/version.txt";
echo "v0.1" > "$TOOLDIR/version.txt";
fi
- if [ ! -d "$HOME/third_party" ] || [ -z "$(ls -A $HOME/third_party)" ] || [ "$(cat "$HOME/third_party/version.txt")" != "v0" ]; then
- if [ ! -d "$HOME/third_party" ] || [ -z "$(ls -A $HOME/third_party)" ] || [ "$(cat "$HOME/third_party/version.txt")" != "v0.1" ]; then
rm -rf $HOME/third_party;
cd $TRAVIS_BUILD_DIR;
make -C third_party > /dev/null;
make -C third_party > /dev/null;
cp -r third_party $HOME;
echo "v0" > "$HOME/third_party/version.txt";
echo "v0.1" > "$HOME/third_party/version.txt";
else
rm -rf $TRAVIS_BUILD_DIR/third_party;
cp -r $HOME/third_party $TRAVIS_BUILD_DIR;
@ -50,8 +50,8 @@ stages:
- build
- test
jobs:
include:
jobs:
include:
- stage: build
name: build32
env: XLEN=32
@ -68,33 +68,33 @@ jobs:
- cd $HOME/build$XLEN && TOOLDIR=$TOOLDIR XLEN=$XLEN $TRAVIS_BUILD_DIR/configure
script:
- cd $HOME/build$XLEN && make build -s > /dev/null
- stage: test
- stage: test
name: unittest
env: XLEN=32
script: cp -r $HOME/build$XLEN build && cd build && ./ci/travis_run.py ./ci/regression.sh --unittest
script: cp -r $HOME/build$XLEN build && cd build && ./ci/travis_run.py ./ci/regression.sh --isa
script: cp -r $HOME/build$XLEN build && cd build && ./ci/travis_run.py ./ci/regression.sh --kernel
script: cp -r $HOME/build$XLEN build && cd build && ./ci/travis_run.py ./ci/regression.sh --synthesis
- stage: test
- stage: test
name: unittest64
env: XLEN=64
script: cp -r $HOME/build$XLEN build && cd build && ./ci/travis_run.py ./ci/regression.sh --isa
script: cp -r $HOME/build$XLEN build && cd build && ./ci/travis_run.py ./ci/regression.sh --kernel
script: cp -r $HOME/build$XLEN build && cd build && ./ci/travis_run.py ./ci/regression.sh --synthesis
- stage: test
- stage: test
name: regression
env: XLEN=32
script: cp -r $HOME/build$XLEN build && cd build && ./ci/travis_run.py ./ci/regression.sh --regression
script: cp -r $HOME/build$XLEN build && cd build && ./ci/travis_run.py ./ci/regression.sh --opencl
- stage: test
- stage: test
name: regression64
env: XLEN=64
script: cp -r $HOME/build$XLEN build && cd build && ./ci/travis_run.py ./ci/regression.sh --regression
- stage: test
- stage: test
name: cluster
env: XLEN=32
script: cp -r $HOME/build$XLEN build && cd build && ./ci/travis_run.py ./ci/regression.sh --cluster
- stage: test
- stage: test
name: config
env: XLEN=32
script: cp -r $HOME/build$XLEN build && cd build && ./ci/travis_run.py ./ci/regression.sh --config

12
tests/opencl/Makefile
View file

@ -36,8 +36,8 @@ run-simx:
$(MAKE) -C nearn run-simx
$(MAKE) -C guassian run-simx
$(MAKE) -C kmeans run-simx
# $(MAKE) -C blackscholes run-simx
# $(MAKE) -C bfs run-simx
$(MAKE) -C blackscholes run-simx
$(MAKE) -C bfs run-simx
run-rtlsim:
$(MAKE) -C vecadd run-rtlsim
@ -55,8 +55,8 @@ run-rtlsim:
$(MAKE) -C nearn run-rtlsim
$(MAKE) -C guassian run-rtlsim
$(MAKE) -C kmeans run-rtlsim
# $(MAKE) -C blackscholes run-rtlsim
# $(MAKE) -C bfs run-rtlsim
$(MAKE) -C blackscholes run-rtlsim
$(MAKE) -C bfs run-rtlsim
run-opae:
$(MAKE) -C vecadd run-opae
@ -74,8 +74,8 @@ run-opae:
$(MAKE) -C nearn run-opae
$(MAKE) -C guassian run-opae
$(MAKE) -C kmeans run-opae
# $(MAKE) -C blackscholes run-opae
# $(MAKE) -C bfs run-opae
$(MAKE) -C blackscholes run-opae
$(MAKE) -C bfs run-opae
clean:
$(MAKE) -C vecadd clean

21
tests/opencl/common.mk
View file

@ -20,7 +20,10 @@ POCL_RT_PATH ?= $(TOOLDIR)/pocl/runtime
LLVM_POCL ?= $(TOOLDIR)/llvm-vortex
LIBC_LIB += -L$(LIBC_VORTEX)/lib -lm -lc -lgcc
VX_LIBS += -L$(LIBC_VORTEX)/lib -lm -lc
VX_LIBS += libclang_rt.builtins-riscv32.a
#VX_LIBS += -lgcc
VX_CFLAGS += -O3 -mcmodel=medany --sysroot=$(RISCV_SYSROOT) --gcc-toolchain=$(RISCV_TOOLCHAIN_PATH) -Xclang -target-feature -Xclang +vortex
VX_CFLAGS += -fno-rtti -fno-exceptions -nostartfiles -nostdlib -fdata-sections -ffunction-sections
@ -29,7 +32,7 @@ VX_CFLAGS += -mllvm -disable-loop-idiom-all # disable memset/memcpy loop idiom
#VX_CFLAGS += -mllvm -vortex-branch-divergence=0
#VX_CFLAGS += -mllvm -print-after-all
VX_LDFLAGS += -Wl,-Bstatic,--gc-sections,-T$(VORTEX_KN_PATH)/scripts/link$(XLEN).ld,--defsym=STARTUP_ADDR=$(STARTUP_ADDR) $(ROOT_DIR)/kernel/libvortexrt.a $(LIBC_LIB)
VX_LDFLAGS += -Wl,-Bstatic,--gc-sections,-T$(VORTEX_KN_PATH)/scripts/link$(XLEN).ld,--defsym=STARTUP_ADDR=$(STARTUP_ADDR) $(ROOT_DIR)/kernel/libvortexrt.a $(VX_LIBS)
CXXFLAGS += -std=c++11 -Wall -Wextra -Wfatal-errors
CXXFLAGS += -Wno-deprecated-declarations -Wno-unused-parameter -Wno-narrowing
@ -39,7 +42,7 @@ CXXFLAGS += -I$(POCL_RT_PATH)/include
# Debugigng
ifdef DEBUG
CXXFLAGS += -g -O0
else
else
CXXFLAGS += -O2 -DNDEBUG
endif
@ -51,7 +54,7 @@ ifeq ($(TARGET), asesim)
else
ifeq ($(TARGET), opaesim)
OPAE_DRV_PATHS ?= libopae-c-sim.so
endif
endif
endif
endif
@ -60,13 +63,13 @@ OBJS_HOST := $(addsuffix .host.o, $(notdir $(SRCS)))
.DEFAULT_GOAL := all
all: $(PROJECT) kernel.pocl
kernel.cl: $(SRC_DIR)/kernel.cl
cp $< $@
kernel.pocl: $(SRC_DIR)/kernel.cl
LD_LIBRARY_PATH=$(LLVM_POCL)/lib:$(POCL_CC_PATH)/lib:$(LLVM_VORTEX)/lib:$(LD_LIBRARY_PATH) LLVM_PREFIX=$(LLVM_VORTEX) POCL_DEBUG=all POCL_KERNEL_CACHE=0 POCL_VORTEX_BINTOOL="OBJCOPY=$(LLVM_VORTEX)/bin/llvm-objcopy $(VORTEX_HOME)/kernel/scripts/vxbin.py" POCL_VORTEX_CFLAGS="$(VX_CFLAGS)" POCL_VORTEX_LDFLAGS="$(VX_LDFLAGS)" $(POCL_CC_PATH)/bin/poclcc -o $@ $<
%.cc.o: $(SRC_DIR)/%.cc
$(CXX) $(CXXFLAGS) -c $< -o $@
@ -92,16 +95,16 @@ endif
$(PROJECT): setup $(OBJS)
$(CXX) $(CXXFLAGS) $(filter-out setup, $^) $(LDFLAGS) -L$(ROOT_DIR)/runtime/stub -lvortex -L$(POCL_RT_PATH)/lib -lOpenCL -o $@
$(PROJECT).host: setup $(OBJS_HOST)
$(PROJECT).host: setup $(OBJS_HOST)
$(CXX) $(CXXFLAGS) $(filter-out setup, $^) $(LDFLAGS) -lOpenCL -o $@
run-gpu: $(PROJECT).host kernel.cl
./$(PROJECT).host $(OPTS)
run-simx: $(PROJECT) kernel.pocl
run-simx: $(PROJECT) kernel.pocl
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(ROOT_DIR)/runtime/simx:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
run-rtlsim: $(PROJECT) kernel.pocl
run-rtlsim: $(PROJECT) kernel.pocl
LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(ROOT_DIR)/runtime/rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
run-opae: $(PROJECT) kernel.pocl

21
tests/regression/common.mk
View file

@ -19,14 +19,14 @@ LLVM_CFLAGS += -Xclang -target-feature -Xclang +vortex
LLVM_CFLAGS += -mllvm -disable-loop-idiom-all # disable memset/memcpy loop idiom
#LLVM_CFLAGS += -mllvm -vortex-branch-divergence=0
#LLVM_CFLAGS += -mllvm -print-after-all
#LLVM_CFLAGS += -I$(RISCV_SYSROOT)/include/c++/9.2.0/$(RISCV_PREFIX)
#LLVM_CFLAGS += -I$(RISCV_SYSROOT)/include/c++/9.2.0/$(RISCV_PREFIX)
#LLVM_CFLAGS += -I$(RISCV_SYSROOT)/include/c++/9.2.0
#LLVM_CFLAGS += -Wl,-L$(RISCV_TOOLCHAIN_PATH)/lib/gcc/$(RISCV_PREFIX)/9.2.0
#LLVM_CFLAGS += --rtlib=libgcc
VX_CC = $(LLVM_VORTEX)/bin/clang $(LLVM_CFLAGS)
VX_CXX = $(LLVM_VORTEX)/bin/clang++ $(LLVM_CFLAGS)
VX_DP = $(LLVM_VORTEX)/bin/llvm-objdump
VX_DP = $(LLVM_VORTEX)/bin/llvm-objdump
VX_CP = $(LLVM_VORTEX)/bin/llvm-objcopy
#VX_CC = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-gcc
@ -39,7 +39,10 @@ VX_CFLAGS += -I$(VORTEX_KN_PATH)/include -I$(ROOT_DIR)/hw
VX_CFLAGS += -DXLEN_$(XLEN)
VX_CFLAGS += -DNDEBUG
VX_LIBS += -L$(LIBC_VORTEX)/lib -lm -lc -lgcc
VX_LIBS += -L$(LIBC_VORTEX)/lib -lm -lc
VX_LIBS += libclang_rt.builtins-riscv32.a
#VX_LIBS += -lgcc
VX_LDFLAGS += -Wl,-Bstatic,--gc-sections,-T,$(VORTEX_KN_PATH)/scripts/link$(XLEN).ld,--defsym=STARTUP_ADDR=$(STARTUP_ADDR) $(ROOT_DIR)/kernel/libvortexrt.a $(VX_LIBS)
@ -51,7 +54,7 @@ LDFLAGS += -L$(ROOT_DIR)/runtime/stub -lvortex
# Debugigng
ifdef DEBUG
CXXFLAGS += -g -O0
else
else
CXXFLAGS += -O2 -DNDEBUG
endif
@ -63,7 +66,7 @@ ifeq ($(TARGET), asesim)
else
ifeq ($(TARGET), opaesim)
OPAE_DRV_PATHS ?= libopae-c-sim.so
endif
endif
endif
endif
@ -81,13 +84,13 @@ kernel.elf: $(VX_SRCS)
$(PROJECT): $(SRCS)
$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
run-simx: $(PROJECT) kernel.vxbin
run-simx: $(PROJECT) kernel.vxbin
LD_LIBRARY_PATH=$(ROOT_DIR)/runtime/simx:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
run-opae: $(PROJECT) kernel.vxbin
run-opae: $(PROJECT) kernel.vxbin
SCOPE_JSON_PATH=$(ROOT_DIR)/runtime/opae/scope.json OPAE_DRV_PATHS=$(OPAE_DRV_PATHS) LD_LIBRARY_PATH=$(ROOT_DIR)/runtime/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
run-rtlsim: $(PROJECT) kernel.vxbin
run-rtlsim: $(PROJECT) kernel.vxbin
LD_LIBRARY_PATH=$(ROOT_DIR)/runtime/rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
run-xrt: $(PROJECT) kernel.vxbin

2
tests/regression/dogfood/Makefile
View file

@ -9,6 +9,6 @@ SRCS := $(SRC_DIR)/main.cpp
VX_SRCS := $(SRC_DIR)/kernel.cpp
OPTS ?= -n64 -xtrig -xbar -xgbar
OPTS ?= -n64 -xbar -xgbar
include ../common.mk