test layout fixes

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
 

tests/Makefile

@@ -1,7 +1,4 @@
-all: driver runtime regression opencl riscv
+all: runtime regression opencl riscv
-
-driver:
-	$(MAKE) -C driver
 
 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
+.PHONY: all runtime regression opencl riscv

tests/driver/Makefile

@@ -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
-

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

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)
+run-simx: $(PROJECT) kernel.bin   
-	LD_LIBRARY_PATH=../../opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/simx:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 	
-run-asesim: $(PROJECT)
+run-fpga: $(PROJECT) kernel.bin   
-	ASE_LOG=0 LD_LIBRARY_PATH=../../opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 
-run-vlsim: $(PROJECT)
+run-asesim: $(PROJECT) kernel.bin   
-	ASE_LOG=0 LD_LIBRARY_PATH=../../opae/vlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 	
-run-rtlsim: $(PROJECT)
+run-vlsim: $(PROJECT) kernel.bin   
-	LD_LIBRARY_PATH=../../rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/vlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 
-run-simx: $(PROJECT)
+run-rtlsim: $(PROJECT) kernel.bin   
-	LD_LIBRARY_PATH=../../simx:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 
 .depend: $(SRCS)
 	$(CXX) $(CXXFLAGS) -MM $^ > .depend;

tests/regression/dogfood/main.cpp

@@ -3,7 +3,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <vortex.h>
-#include <VX_config.h>
 #include "testcases.h"
 #include "common.h"
 

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)
+run-simx: $(PROJECT) kernel.bin   
-	LD_LIBRARY_PATH=../../opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/simx:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 	
-run-asesim: $(PROJECT)
+run-fpga: $(PROJECT) kernel.bin   
-	ASE_LOG=0 LD_LIBRARY_PATH=../../opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 
-run-vlsim: $(PROJECT)
+run-asesim: $(PROJECT) kernel.bin   
-	LD_LIBRARY_PATH=../../opae/vlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 	
-run-rtlsim: $(PROJECT)
+run-vlsim: $(PROJECT) kernel.bin   
-	LD_LIBRARY_PATH=../../rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/vlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 
-run-simx: $(PROJECT)
+run-rtlsim: $(PROJECT) kernel.bin   
-	LD_LIBRARY_PATH=../../simx:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 
 .depend: $(SRCS)
 	$(CXX) $(CXXFLAGS) -MM $^ > .depend;

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)
+run-simx: $(PROJECT) kernel.bin   
-	LD_LIBRARY_PATH=../../opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/simx:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 	
-run-asesim: $(PROJECT)
+run-fpga: $(PROJECT) kernel.bin   
-	ASE_LOG=0 LD_LIBRARY_PATH=../../opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 
-run-vlsim: $(PROJECT)
+run-asesim: $(PROJECT) kernel.bin   
-	LD_LIBRARY_PATH=../../opae/vlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 	
-run-rtlsim: $(PROJECT)
+run-vlsim: $(PROJECT) kernel.bin   
-	LD_LIBRARY_PATH=../../rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/vlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 
-run-simx: $(PROJECT)
+run-rtlsim: $(PROJECT) kernel.bin   
-	LD_LIBRARY_PATH=../../simx:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
+	LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) $(OPTS)
 
 .depend: $(SRCS)
 	$(CXX) $(CXXFLAGS) -MM $^ > .depend;