minor update

2023-11-11 15:49:39 -08:00
parent c1e168fdbe
commit 62cdd8e993
13 changed files with 107 additions and 199 deletions
--- a/tests/kernel/common.mk
+++ b/tests/kernel/common.mk
@@ -0,0 +1,49 @@
+XLEN ?= 32
+TOOLDIR ?= /opt
+
+ifeq ($(XLEN),64)
+RISCV_TOOLCHAIN_PATH ?= $(TOOLDIR)/riscv64-gnu-toolchain
+CFLAGS += -march=rv64imafd -mabi=lp64d
+else
+RISCV_TOOLCHAIN_PATH ?= $(TOOLDIR)/riscv-gnu-toolchain
+CFLAGS += -march=rv32imaf -mabi=ilp32f
+endif
+
+RISCV_PREFIX ?= riscv$(XLEN)-unknown-elf
+
+VORTEX_KN_PATH ?= $(realpath ../../../kernel)
+
+CC = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-gcc
+AR = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-gcc-ar
+DP = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-objdump
+CP = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-objcopy
+
+SIM_DIR = ../../../sim
+
+CFLAGS += -O3 -mcmodel=medany -fno-exceptions -nostartfiles -fdata-sections -ffunction-sections
+CFLAGS += -I$(VORTEX_KN_PATH)/include -I$(VORTEX_KN_PATH)/../hw
+
+LDFLAGS += -lm -Wl,-Bstatic,--gc-sections,-T,$(VORTEX_KN_PATH)/linker/vx_link$(XLEN).ld,--defsym=STARTUP_ADDR=0x80000000 $(VORTEX_KN_PATH)/libvortexrt.a
+
+all: $(PROJECT).elf $(PROJECT).bin $(PROJECT).dump
+
+$(PROJECT).dump: $(PROJECT).elf
+	$(DP) -D $(PROJECT).elf > $(PROJECT).dump
+
+$(PROJECT).bin: $(PROJECT).elf
+	$(CP) -O binary $(PROJECT).elf $(PROJECT).bin
+
+$(PROJECT).elf: $(SRCS)
+	$(CC) $(CFLAGS) $(SRCS) $(LDFLAGS) -o $(PROJECT).elf
+
+run-rtlsim: $(PROJECT).bin
+	$(SIM_DIR)/rtlsim/rtlsim $(PROJECT).bin
+
+run-simx: $(PROJECT).bin
+	$(SIM_DIR)/simx/simx $(PROJECT).bin
+
+.depend: $(SRCS)
+	$(CC) $(CFLAGS) -MM $^ > .depend;
+
+clean:
+	rm -rf *.elf *.bin *.dump .depend 
--- a/tests/kernel/conform/Makefile
+++ b/tests/kernel/conform/Makefile
@@ -1,52 +1,5 @@
-XLEN ?= 32
-
-ifeq ($(XLEN),64)
-RISCV_TOOLCHAIN_PATH ?= /opt/riscv64-gnu-toolchain
-CFLAGS += -march=rv64imafd -mabi=lp64d
-else
-RISCV_TOOLCHAIN_PATH ?= /opt/riscv-gnu-toolchain
-CFLAGS += -march=rv32imaf -mabi=ilp32f
-endif
-
-RISCV_PREFIX ?= riscv$(XLEN)-unknown-elf
-
-VORTEX_KN_PATH ?= $(realpath ../../../kernel)
-
-CC = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-gcc
-AR = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-gcc-ar
-DP = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-objdump
-CP = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-objcopy
-
-SIM_DIR = ../../../sim
-
-CFLAGS += -O3 -mcmodel=medany -fno-exceptions -nostartfiles -fdata-sections -ffunction-sections
-CFLAGS += -I$(VORTEX_KN_PATH)/include -I$(VORTEX_KN_PATH)/../hw
-
-LDFLAGS += -lm -Wl,-Bstatic,--gc-sections,-T,$(VORTEX_KN_PATH)/linker/vx_link$(XLEN).ld,--defsym=STARTUP_ADDR=0x80000000 $(VORTEX_KN_PATH)/libvortexrt.a
-
 PROJECT = conform

 SRCS = main.cpp tests.cpp

-all: $(PROJECT).elf $(PROJECT).bin $(PROJECT).dump
-
-$(PROJECT).dump: $(PROJECT).elf
-	$(DP) -D $(PROJECT).elf > $(PROJECT).dump
-
-$(PROJECT).bin: $(PROJECT).elf
-	$(CP) -O binary $(PROJECT).elf $(PROJECT).bin
-
-$(PROJECT).elf: $(SRCS)
-	$(CC) $(CFLAGS) $(SRCS) $(LDFLAGS) -o $(PROJECT).elf
-
-run-rtlsim: $(PROJECT).bin
-	$(SIM_DIR)/rtlsim/rtlsim $(PROJECT).bin
-
-run-simx: $(PROJECT).bin
-	$(SIM_DIR)/simx/simx $(PROJECT).bin
-
-.depend: $(SRCS)
-	$(CC) $(CFLAGS) -MM $^ > .depend;
-
-clean:
-	rm -rf *.elf *.bin *.dump .depend 
+include ../common.mk
--- a/tests/kernel/fibonacci/Makefile
+++ b/tests/kernel/fibonacci/Makefile
@@ -1,52 +1,5 @@
-XLEN ?= 32
-
-ifeq ($(XLEN),64)
-RISCV_TOOLCHAIN_PATH ?= /opt/riscv64-gnu-toolchain
-CFLAGS += -march=rv64imafd -mabi=lp64d
-else
-RISCV_TOOLCHAIN_PATH ?= /opt/riscv-gnu-toolchain
-CFLAGS += -march=rv32imaf -mabi=ilp32f
-endif
-
-RISCV_PREFIX ?= riscv$(XLEN)-unknown-elf
-
-VORTEX_KN_PATH ?= $(realpath ../../../kernel)
-
-CC = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-gcc
-AR = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-gcc-ar
-DP = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-objdump
-CP = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-objcopy
-
-SIM_DIR = ../../../sim
-
-CFLAGS += -O3 -mcmodel=medany -fno-exceptions -nostartfiles -fdata-sections -ffunction-sections
-CFLAGS += -I$(VORTEX_KN_PATH)/include -I$(VORTEX_KN_PATH)/../hw
-
-LDFLAGS += -lm -Wl,-Bstatic,--gc-sections,-T,$(VORTEX_KN_PATH)/linker/vx_link$(XLEN).ld,--defsym=STARTUP_ADDR=0x80000000 $(VORTEX_KN_PATH)/libvortexrt.a
-
 PROJECT = fibonacci

 SRCS = main.cpp

-all: $(PROJECT).elf $(PROJECT).bin $(PROJECT).dump
-
-$(PROJECT).dump: $(PROJECT).elf
-	$(DP) -D $(PROJECT).elf > $(PROJECT).dump
-
-$(PROJECT).bin: $(PROJECT).elf
-	$(CP) -O binary $(PROJECT).elf $(PROJECT).bin
-
-$(PROJECT).elf: $(SRCS)
-	$(CC) $(CFLAGS) $(SRCS) $(LDFLAGS) -o $(PROJECT).elf
-
-run-rtlsim: $(PROJECT).bin
-	$(SIM_DIR)/rtlsim/rtlsim $(PROJECT).bin
-
-run-simx: $(PROJECT).bin
-	$(SIM_DIR)/simx/simx $(PROJECT).bin
-
-.depend: $(SRCS)
-	$(CC) $(CFLAGS) -MM $^ > .depend;
-
-clean:
-	rm -rf *.elf *.bin *.dump .depend 
+include ../common.mk
--- a/tests/kernel/hello/Makefile
+++ b/tests/kernel/hello/Makefile
@@ -1,52 +1,5 @@
-XLEN ?= 32
-
-ifeq ($(XLEN),64)
-RISCV_TOOLCHAIN_PATH ?= /opt/riscv64-gnu-toolchain
-CFLAGS += -march=rv64imafd -mabi=lp64d
-else
-RISCV_TOOLCHAIN_PATH ?= /opt/riscv-gnu-toolchain
-CFLAGS += -march=rv32imaf -mabi=ilp32f
-endif
-
-RISCV_PREFIX ?= riscv$(XLEN)-unknown-elf
-
-VORTEX_KN_PATH ?= $(realpath ../../../kernel)
-
-CC = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-gcc
-AR = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-gcc-ar
-DP = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-objdump
-CP = $(RISCV_TOOLCHAIN_PATH)/bin/$(RISCV_PREFIX)-objcopy
-
-SIM_DIR = ../../../sim
-
-CFLAGS += -O3 -v -mcmodel=medany -fno-exceptions -nostartfiles -fdata-sections -ffunction-sections
-CFLAGS += -I$(VORTEX_KN_PATH)/include -I$(VORTEX_KN_PATH)/../hw
-
-LDFLAGS += -lm -Wl,-Bstatic,--gc-sections,-T,$(VORTEX_KN_PATH)/linker/vx_link$(XLEN).ld,--defsym=STARTUP_ADDR=0x80000000 $(VORTEX_KN_PATH)/libvortexrt.a
-
 PROJECT = hello

 SRCS = main.cpp

-all: $(PROJECT).elf $(PROJECT).bin $(PROJECT).dump
-
-$(PROJECT).dump: $(PROJECT).elf
-	$(DP) -D $(PROJECT).elf > $(PROJECT).dump
-
-$(PROJECT).bin: $(PROJECT).elf
-	$(CP) -O binary $(PROJECT).elf $(PROJECT).bin
-
-$(PROJECT).elf: $(SRCS)
-	$(CC) $(CFLAGS) $(SRCS) $(LDFLAGS) -o $(PROJECT).elf
-
-run-rtlsim: $(PROJECT).bin
-	$(SIM_DIR)/rtlsim/rtlsim $(PROJECT).bin
-
-run-simx: $(PROJECT).bin
-	$(SIM_DIR)/simx/simx $(PROJECT).bin
-
-.depend: $(SRCS)
-	$(CC) $(CFLAGS) -MM $^ > .depend;
-
-clean:
-	rm -rf *.elf *.bin *.dump .depend 
+include ../common.mk
--- a/tests/opencl/common.mk
+++ b/tests/opencl/common.mk
@@ -1,4 +1,5 @@
 XLEN ?= 32
+TOOLDIR ?= /opt

 TARGET ?= opaesim

@@ -6,12 +7,12 @@ XRT_SYN_DIR  ?= ../../../hw/syn/xilinx/xrt
 XRT_DEVICE_INDEX ?= 0

 ifeq ($(XLEN),64)
-RISCV_TOOLCHAIN_PATH ?= /opt/riscv64-gnu-toolchain
+RISCV_TOOLCHAIN_PATH ?= $(TOOLDIR)/riscv64-gnu-toolchain
 VX_CFLAGS += -march=rv64imafd -mabi=lp64d
 K_CFLAGS += -march=rv64imafd -mabi=ilp64d
 STARTUP_ADDR ?= 0x180000000
 else
-RISCV_TOOLCHAIN_PATH ?= /opt/riscv-gnu-toolchain
+RISCV_TOOLCHAIN_PATH ?= $(TOOLDIR)/riscv-gnu-toolchain
 VX_CFLAGS += -march=rv32imaf -mabi=ilp32f
 K_CFLAGS += -march=rv32imaf -mabi=ilp32f
 STARTUP_ADDR ?= 0x80000000
@@ -20,16 +21,16 @@ endif
 RISCV_PREFIX ?= riscv$(XLEN)-unknown-elf
 RISCV_SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/$(RISCV_PREFIX)

-POCL_CC_PATH ?= /opt/pocl/compiler
-POCL_RT_PATH ?= /opt/pocl/runtime
+POCL_CC_PATH ?= $(TOOLDIR)/pocl/compiler
+POCL_RT_PATH ?= $(TOOLDIR)/pocl/runtime

 VORTEX_RT_PATH ?= $(realpath ../../../runtime)
 VORTEX_KN_PATH ?= $(realpath ../../../kernel)

 FPGA_BIN_DIR ?= $(VORTEX_RT_PATH)/opae

-LLVM_VORTEX ?= /opt/llvm-vortex
-LLVM_POCL ?= /opt/llvm-vortex
+LLVM_VORTEX ?= $(TOOLDIR)/llvm-vortex
+LLVM_POCL ?= $(TOOLDIR)/llvm-vortex

 K_CFLAGS   += -v -O3 --sysroot=$(RISCV_SYSROOT) --gcc-toolchain=$(RISCV_TOOLCHAIN_PATH) -Xclang -target-feature -Xclang +vortex
 K_CFLAGS   += -fno-rtti -fno-exceptions -nostartfiles -fdata-sections -ffunction-sections
--- a/tests/regression/common.mk
+++ b/tests/regression/common.mk
@@ -1,16 +1,18 @@
 XLEN ?= 32

+TOOLDIR ?= /opt
+
 TARGET ?= opaesim

 XRT_SYN_DIR ?= ../../../hw/syn/xilinx/xrt
 XRT_DEVICE_INDEX ?= 0

 ifeq ($(XLEN),64)
-RISCV_TOOLCHAIN_PATH ?= /opt/riscv64-gnu-toolchain
+RISCV_TOOLCHAIN_PATH ?= $(TOOLDIR)/riscv64-gnu-toolchain
 VX_CFLAGS += -march=rv64imafd -mabi=lp64d
 STARTUP_ADDR ?= 0x180000000
 else
-RISCV_TOOLCHAIN_PATH ?= /opt/riscv-gnu-toolchain
+RISCV_TOOLCHAIN_PATH ?= $(TOOLDIR)/riscv-gnu-toolchain
 VX_CFLAGS += -march=rv32imaf -mabi=ilp32f
 STARTUP_ADDR ?= 0x80000000
 endif
@@ -23,7 +25,7 @@ VORTEX_KN_PATH ?= $(realpath ../../../kernel)

 FPGA_BIN_DIR ?= $(VORTEX_RT_PATH)/opae

-LLVM_VORTEX ?= /opt/llvm-vortex
+LLVM_VORTEX ?= $(TOOLDIR)/llvm-vortex

 LLVM_CFLAGS += --sysroot=$(RISCV_SYSROOT)
 LLVM_CFLAGS += --gcc-toolchain=$(RISCV_TOOLCHAIN_PATH)
--- a/tests/unittest/common.mk
+++ b/tests/unittest/common.mk
@@ -0,0 +1,30 @@
+VORTEX_RT_PATH ?= $(realpath ../../../runtime)
+
+CXXFLAGS += -std=c++11 -Wall -Wextra -pedantic -Wfatal-errors
+
+CXXFLAGS += -I$(VORTEX_RT_PATH)/common
+
+# Debugigng
+ifdef DEBUG
+	CXXFLAGS += -g -O0
+else    
+	CXXFLAGS += -O2 -DNDEBUG
+endif
+
+all: $(PROJECT)
+
+$(PROJECT): $(SRCS)
+	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
+
+run:
+	./$(PROJECT)
+
+clean:
+	rm -rf $(PROJECT) *.o .depend
+
+clean-all: clean
+	rm -rf *.elf *.bin *.dump
+
+ifneq ($(MAKECMDGOALS),clean)
+    -include .depend
+endif
--- a/tests/unittest/vx_malloc/Makefile
+++ b/tests/unittest/vx_malloc/Makefile
@@ -1,34 +1,5 @@
-VORTEX_RT_PATH ?= $(realpath ../../../runtime)
-
-CXXFLAGS += -std=c++11 -Wall -Wextra -pedantic -Wfatal-errors
-
-CXXFLAGS += -I$(VORTEX_RT_PATH)/common
-
-# Debugigng
-ifdef DEBUG
-	CXXFLAGS += -g -O0
-else    
-	CXXFLAGS += -O2 -DNDEBUG
-endif
-
 PROJECT = vx_malloc

 SRCS = main.cpp

-all: $(PROJECT)
-
-$(PROJECT): $(SRCS)
-	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
-
-run:
-	./$(PROJECT)
-
-clean:
-	rm -rf $(PROJECT) *.o .depend
-
-clean-all: clean
-	rm -rf *.elf *.bin *.dump
-
-ifneq ($(MAKECMDGOALS),clean)
-    -include .depend
-endif
+include ../common.mk