From cadff791abf527ffce86e4cdb646e691619d27f0 Mon Sep 17 00:00:00 2001 From: Blaise Tine Date: Sun, 13 Jun 2021 17:59:06 -0700 Subject: [PATCH] test layout fixes --- ci/regression.sh | 3 +- tests/Makefile | 8 +--- tests/driver/Makefile | 16 -------- tests/regression/Makefile | 8 ++++ tests/{driver => regression}/basic/Makefile | 0 tests/{driver => regression}/basic/common.h | 0 tests/{driver => regression}/basic/kernel.bin | Bin tests/{driver => regression}/basic/kernel.c | 0 .../{driver => regression}/basic/kernel.dump | 0 tests/{driver => regression}/basic/kernel.elf | Bin .../basic/kernel_scheduler.h | 0 tests/{driver => regression}/basic/main.cpp | 0 tests/{driver => regression}/demo/Makefile | 0 tests/{driver => regression}/demo/common.h | 0 tests/{driver => regression}/demo/kernel.bin | Bin tests/{driver => regression}/demo/kernel.c | 0 tests/{driver => regression}/demo/kernel.dump | 0 tests/{driver => regression}/demo/kernel.elf | Bin tests/{driver => regression}/demo/main.cpp | 0 tests/regression/dogfood/Makefile | 35 ++++++++++-------- tests/regression/dogfood/main.cpp | 1 - tests/regression/io_addr/Makefile | 35 ++++++++++-------- tests/regression/mstress/Makefile | 35 ++++++++++-------- 23 files changed, 68 insertions(+), 73 deletions(-) delete mode 100644 tests/driver/Makefile rename tests/{driver => regression}/basic/Makefile (100%) rename tests/{driver => regression}/basic/common.h (100%) rename tests/{driver => regression}/basic/kernel.bin (100%) rename tests/{driver => regression}/basic/kernel.c (100%) rename tests/{driver => regression}/basic/kernel.dump (100%) rename tests/{driver => regression}/basic/kernel.elf (100%) rename tests/{driver => regression}/basic/kernel_scheduler.h (100%) rename tests/{driver => regression}/basic/main.cpp (100%) rename tests/{driver => regression}/demo/Makefile (100%) rename tests/{driver => regression}/demo/common.h (100%) rename tests/{driver => regression}/demo/kernel.bin (100%) rename tests/{driver => regression}/demo/kernel.c (100%) rename tests/{driver => regression}/demo/kernel.dump (100%) rename tests/{driver => regression}/demo/kernel.elf (100%) rename tests/{driver => regression}/demo/main.cpp (100%) diff --git a/ci/regression.sh b/ci/regression.sh index 3a722317..16030ccf 100755 --- a/ci/regression.sh +++ b/ci/regression.sh @@ -5,10 +5,9 @@ set -e make -s -# Dogfood tests +# coverage tests 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 diff --git a/tests/Makefile b/tests/Makefile index ca2e7051..7c387b7b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,7 +1,4 @@ -all: driver runtime regression opencl riscv - -driver: - $(MAKE) -C driver +all: runtime regression opencl riscv runtime: $(MAKE) -C runtime @@ -16,10 +13,9 @@ riscv: $(MAKE) -C riscv clean: - $(MAKE) clean -C driver $(MAKE) clean -C runtime $(MAKE) clean -C regression $(MAKE) clean -C opencl $(MAKE) clean -C riscv -.PHONY: all driver runtime regression opencl riscv \ No newline at end of file +.PHONY: all runtime regression opencl riscv \ No newline at end of file diff --git a/tests/driver/Makefile b/tests/driver/Makefile deleted file mode 100644 index d035e4f5..00000000 --- a/tests/driver/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -all: - $(MAKE) -C basic - $(MAKE) -C demo - -run: - $(MAKE) -C basic run-vlsim - $(MAKE) -C demo run-vlsim - -clean: - $(MAKE) -C basic clean - $(MAKE) -C demo clean - -clean-all: - $(MAKE) -C basic clean-all - $(MAKE) -C demo clean-all - diff --git a/tests/regression/Makefile b/tests/regression/Makefile index 9cc8d715..9cddd258 100644 --- a/tests/regression/Makefile +++ b/tests/regression/Makefile @@ -1,19 +1,27 @@ all: + $(MAKE) -C basic + $(MAKE) -C demo $(MAKE) -C dogfood $(MAKE) -C mstress $(MAKE) -C io_addr run: + $(MAKE) -C basic run-vlsim + $(MAKE) -C demo run-vlsim $(MAKE) -C dogfood run-vlsim $(MAKE) -C mstress run-vlsim $(MAKE) -C io_addr run-vlsim clean: + $(MAKE) -C basic clean + $(MAKE) -C demo clean $(MAKE) -C dogfood clean $(MAKE) -C mstress clean $(MAKE) -C io_addr clean clean-all: + $(MAKE) -C basic clean-all + $(MAKE) -C demo clean-all $(MAKE) -C dogfood clean-all $(MAKE) -C mstress clean-all $(MAKE) -C io_addr clean-all diff --git a/tests/driver/basic/Makefile b/tests/regression/basic/Makefile similarity index 100% rename from tests/driver/basic/Makefile rename to tests/regression/basic/Makefile diff --git a/tests/driver/basic/common.h b/tests/regression/basic/common.h similarity index 100% rename from tests/driver/basic/common.h rename to tests/regression/basic/common.h diff --git a/tests/driver/basic/kernel.bin b/tests/regression/basic/kernel.bin similarity index 100% rename from tests/driver/basic/kernel.bin rename to tests/regression/basic/kernel.bin diff --git a/tests/driver/basic/kernel.c b/tests/regression/basic/kernel.c similarity index 100% rename from tests/driver/basic/kernel.c rename to tests/regression/basic/kernel.c diff --git a/tests/driver/basic/kernel.dump b/tests/regression/basic/kernel.dump similarity index 100% rename from tests/driver/basic/kernel.dump rename to tests/regression/basic/kernel.dump diff --git a/tests/driver/basic/kernel.elf b/tests/regression/basic/kernel.elf similarity index 100% rename from tests/driver/basic/kernel.elf rename to tests/regression/basic/kernel.elf diff --git a/tests/driver/basic/kernel_scheduler.h b/tests/regression/basic/kernel_scheduler.h similarity index 100% rename from tests/driver/basic/kernel_scheduler.h rename to tests/regression/basic/kernel_scheduler.h diff --git a/tests/driver/basic/main.cpp b/tests/regression/basic/main.cpp similarity index 100% rename from tests/driver/basic/main.cpp rename to tests/regression/basic/main.cpp diff --git a/tests/driver/demo/Makefile b/tests/regression/demo/Makefile similarity index 100% rename from tests/driver/demo/Makefile rename to tests/regression/demo/Makefile diff --git a/tests/driver/demo/common.h b/tests/regression/demo/common.h similarity index 100% rename from tests/driver/demo/common.h rename to tests/regression/demo/common.h diff --git a/tests/driver/demo/kernel.bin b/tests/regression/demo/kernel.bin similarity index 100% rename from tests/driver/demo/kernel.bin rename to tests/regression/demo/kernel.bin diff --git a/tests/driver/demo/kernel.c b/tests/regression/demo/kernel.c similarity index 100% rename from tests/driver/demo/kernel.c rename to tests/regression/demo/kernel.c diff --git a/tests/driver/demo/kernel.dump b/tests/regression/demo/kernel.dump similarity index 100% rename from tests/driver/demo/kernel.dump rename to tests/regression/demo/kernel.dump diff --git a/tests/driver/demo/kernel.elf b/tests/regression/demo/kernel.elf similarity index 100% rename from tests/driver/demo/kernel.elf rename to tests/regression/demo/kernel.elf diff --git a/tests/driver/demo/main.cpp b/tests/regression/demo/main.cpp similarity index 100% rename from tests/driver/demo/main.cpp rename to tests/regression/demo/main.cpp diff --git a/tests/regression/dogfood/Makefile b/tests/regression/dogfood/Makefile index e8ba0530..2f89afc6 100644 --- a/tests/regression/dogfood/Makefile +++ b/tests/regression/dogfood/Makefile @@ -1,5 +1,6 @@ RISCV_TOOLCHAIN_PATH ?= /opt/riscv-gnu-toolchain -VORTEX_RT_PATH ?= $(wildcard ../../../runtime) +VORTEX_DRV_PATH ?= $(realpath ../../../driver) +VORTEX_RT_PATH ?= $(realpath ../../../runtime) OPTS ?= -n64 @@ -20,7 +21,9 @@ VX_SRCS = kernel.c #CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -pedantic -Wfatal-errors CXXFLAGS += -std=c++11 -O0 -g -Wall -Wextra -pedantic -Wfatal-errors -CXXFLAGS += -I../../include -I../../../hw +CXXFLAGS += -I$(VORTEX_DRV_PATH)/include + +LDFLAGS += -L$(VORTEX_DRV_PATH)/stub -lvortex PROJECT = dogfood @@ -38,22 +41,22 @@ kernel.elf: $(VX_SRCS) $(VX_CC) $(VX_CFLAGS) $(VX_SRCS) $(VX_LDFLAGS) -o kernel.elf $(PROJECT): $(SRCS) - $(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -L../../stub -lvortex -o $@ + $(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@ -run-fpga: $(PROJECT) - LD_LIBRARY_PATH=../../opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) - -run-asesim: $(PROJECT) - ASE_LOG=0 LD_LIBRARY_PATH=../../opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) - -run-vlsim: $(PROJECT) - ASE_LOG=0 LD_LIBRARY_PATH=../../opae/vlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) - -run-rtlsim: $(PROJECT) - LD_LIBRARY_PATH=../../rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) +run-simx: $(PROJECT) kernel.bin + LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/simx:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) -run-simx: $(PROJECT) - LD_LIBRARY_PATH=../../simx:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) +run-fpga: $(PROJECT) kernel.bin + LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) + +run-asesim: $(PROJECT) kernel.bin + LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) + +run-vlsim: $(PROJECT) kernel.bin + LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/vlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) + +run-rtlsim: $(PROJECT) kernel.bin + LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) .depend: $(SRCS) $(CXX) $(CXXFLAGS) -MM $^ > .depend; diff --git a/tests/regression/dogfood/main.cpp b/tests/regression/dogfood/main.cpp index 5246fc92..6c304d69 100644 --- a/tests/regression/dogfood/main.cpp +++ b/tests/regression/dogfood/main.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include "testcases.h" #include "common.h" diff --git a/tests/regression/io_addr/Makefile b/tests/regression/io_addr/Makefile index 3888cc3e..667cce0d 100644 --- a/tests/regression/io_addr/Makefile +++ b/tests/regression/io_addr/Makefile @@ -1,5 +1,6 @@ RISCV_TOOLCHAIN_PATH ?= /opt/riscv-gnu-toolchain -VORTEX_RT_PATH ?= $(wildcard ../../../runtime) +VORTEX_DRV_PATH ?= $(realpath ../../../driver) +VORTEX_RT_PATH ?= $(realpath ../../../runtime) OPTS ?= -n1 @@ -18,7 +19,9 @@ VX_SRCS = kernel.c #CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -pedantic -Wfatal-errors CXXFLAGS += -std=c++11 -O0 -g -Wall -Wextra -pedantic -Wfatal-errors -CXXFLAGS += -I../../include -I$(VORTEX_RT_PATH)/../hw +CXXFLAGS += -I$(VORTEX_DRV_PATH)/include -I../../../hw + +LDFLAGS += -L$(VORTEX_DRV_PATH)/stub -lvortex PROJECT = io_addr @@ -36,22 +39,22 @@ kernel.elf: $(VX_SRCS) $(VX_CC) $(VX_CFLAGS) $(VX_SRCS) $(VX_LDFLAGS) -o kernel.elf $(PROJECT): $(SRCS) - $(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -L../../stub -lvortex -o $@ + $(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@ -run-fpga: $(PROJECT) - LD_LIBRARY_PATH=../../opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) - -run-asesim: $(PROJECT) - ASE_LOG=0 LD_LIBRARY_PATH=../../opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) - -run-vlsim: $(PROJECT) - LD_LIBRARY_PATH=../../opae/vlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) - -run-rtlsim: $(PROJECT) - LD_LIBRARY_PATH=../../rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) +run-simx: $(PROJECT) kernel.bin + LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/simx:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) -run-simx: $(PROJECT) - LD_LIBRARY_PATH=../../simx:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) +run-fpga: $(PROJECT) kernel.bin + LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) + +run-asesim: $(PROJECT) kernel.bin + LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) + +run-vlsim: $(PROJECT) kernel.bin + LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/vlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) + +run-rtlsim: $(PROJECT) kernel.bin + LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) .depend: $(SRCS) $(CXX) $(CXXFLAGS) -MM $^ > .depend; diff --git a/tests/regression/mstress/Makefile b/tests/regression/mstress/Makefile index 3cbf57ea..14e40685 100644 --- a/tests/regression/mstress/Makefile +++ b/tests/regression/mstress/Makefile @@ -1,5 +1,6 @@ RISCV_TOOLCHAIN_PATH ?= /opt/riscv-gnu-toolchain -VORTEX_RT_PATH ?= $(wildcard ../../../runtime) +VORTEX_DRV_PATH ?= $(realpath ../../../driver) +VORTEX_RT_PATH ?= $(realpath ../../../runtime) OPTS ?= -n64 @@ -18,7 +19,9 @@ VX_SRCS = kernel.c #CXXFLAGS += -std=c++11 -O2 -Wall -Wextra -pedantic -Wfatal-errors CXXFLAGS += -std=c++11 -O0 -g -Wall -Wextra -pedantic -Wfatal-errors -CXXFLAGS += -I../../include +CXXFLAGS += -I$(VORTEX_DRV_PATH)/include + +LDFLAGS += -L$(VORTEX_DRV_PATH)/stub -lvortex PROJECT = mstress @@ -36,22 +39,22 @@ kernel.elf: $(VX_SRCS) $(VX_CC) $(VX_CFLAGS) $(VX_SRCS) $(VX_LDFLAGS) -o kernel.elf $(PROJECT): $(SRCS) - $(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -L../../stub -lvortex -o $@ + $(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@ -run-fpga: $(PROJECT) - LD_LIBRARY_PATH=../../opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) - -run-asesim: $(PROJECT) - ASE_LOG=0 LD_LIBRARY_PATH=../../opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) - -run-vlsim: $(PROJECT) - LD_LIBRARY_PATH=../../opae/vlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) - -run-rtlsim: $(PROJECT) - LD_LIBRARY_PATH=../../rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) +run-simx: $(PROJECT) kernel.bin + LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/simx:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) -run-simx: $(PROJECT) - LD_LIBRARY_PATH=../../simx:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) +run-fpga: $(PROJECT) kernel.bin + LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) + +run-asesim: $(PROJECT) kernel.bin + LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) + +run-vlsim: $(PROJECT) kernel.bin + LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/vlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) + +run-rtlsim: $(PROJECT) kernel.bin + LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS) .depend: $(SRCS) $(CXX) $(CXXFLAGS) -MM $^ > .depend;