From d1103733f57624916070554591c370486e6d19fe Mon Sep 17 00:00:00 2001 From: Blaise Tine Date: Tue, 23 Jun 2020 14:34:23 -0700 Subject: [PATCH] merge fixes --- benchmarks/opencl/bfs/Makefile | 13 ----- benchmarks/opencl/convolution/Makefile | 69 -------------------------- benchmarks/opencl/guassian/Makefile | 13 ----- benchmarks/opencl/kmeans/Makefile | 13 ----- benchmarks/opencl/nearn/Makefile | 13 ----- benchmarks/opencl/saxpy/Makefile | 13 ----- benchmarks/opencl/sfilter/Makefile | 13 ----- benchmarks/opencl/sgemm/Makefile | 13 ----- benchmarks/opencl/transpose/Makefile | 5 -- benchmarks/opencl/vecadd/Makefile | 13 ----- benchmarks/vector/saxpy/Makefile | 8 --- benchmarks/vector/sfilter/Makefile | 7 --- benchmarks/vector/sgemm_nn/Makefile | 7 --- benchmarks/vector/vecadd/Makefile | 11 ---- miscs/rvvector/benchmark_temp/Makefile | 10 ---- runtime/tests/hello/Makefile | 12 ----- runtime/tests/nativevecadd/Makefile | 13 ----- runtime/tests/nlTest/Makefile | 14 ------ runtime/tests/vecadd/Makefile | 13 ----- runtime/tests/vector_test/Makefile | 7 --- 20 files changed, 280 deletions(-) diff --git a/benchmarks/opencl/bfs/Makefile b/benchmarks/opencl/bfs/Makefile index daf0463e..627f7970 100644 --- a/benchmarks/opencl/bfs/Makefile +++ b/benchmarks/opencl/bfs/Makefile @@ -10,20 +10,7 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error CXXFLAGS += -I$(POCL_RT_PATH)/include -<<<<<<< HEAD -VX_CFLAGS = -nostartfiles -Wl,-Bstatic,-T,$(VX_RT_PATH)/mains/vortex_link.ld - -CXXFLAGS = -g -O0 -march=rv32im -mabi=ilp32 -CXXFLAGS += -ffreestanding # program may not begin at main() -CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sections -CXXFLAGS += -fno-rtti -fno-non-call-exceptions # disable RTTI and exceptions -CXXFLAGS += -I$(POCL_INC_PATH) - -VX_LIBS = -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -QEMU_LIBS = $(VX_RT_PATH)/qemu/vx_api.c -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -======= LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex ->>>>>>> fpga_synthesis PROJECT = bfs diff --git a/benchmarks/opencl/convolution/Makefile b/benchmarks/opencl/convolution/Makefile index 60798606..3ca8c4bd 100644 --- a/benchmarks/opencl/convolution/Makefile +++ b/benchmarks/opencl/convolution/Makefile @@ -1,37 +1,3 @@ -<<<<<<< HEAD -RISCV_TOOL_PATH ?= $(wildcard ../../../../riscv-gnu-toolchain/drops) -POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc) -POCL_INC_PATH ?= $(wildcard ../include) -POCL_LIB_PATH ?= $(wildcard ../lib) -VX_RT_PATH ?= $(wildcard ../../../runtime) -VX_SIMX_PATH ?= $(wildcard ../../../simX/obj_dir) - -CC = $(RISCV_TOOL_PATH)/bin/riscv32-unknown-elf-gcc -CXX = $(RISCV_TOOL_PATH)/bin/riscv32-unknown-elf-g++ -DMP = $(RISCV_TOOL_PATH)/bin/riscv32-unknown-elf-objdump -HEX = $(RISCV_TOOL_PATH)/bin/riscv32-unknown-elf-objcopy -GDB = $(RISCV_TOOL_PATH)/bin/riscv32-unknown-elf-gdb - -VX_SRCS = $(VX_RT_PATH)/newlib/newlib.c -VX_SRCS += $(VX_RT_PATH)/startup/vx_start.s -VX_SRCS += $(VX_RT_PATH)/intrinsics/vx_intrinsics.s -VX_SRCS += $(VX_RT_PATH)/io/vx_io.s $(VX_RT_PATH)/io/vx_io.c -VX_SRCS += $(VX_RT_PATH)/fileio/fileio.s -VX_SRCS += $(VX_RT_PATH)/tests/tests.c -VX_SRCS += $(VX_RT_PATH)/vx_api/vx_api.c -VX_SRCS += $(VX_STR) $(VX_FIO) $(VX_NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) - -VX_CFLAGS = -nostartfiles -Wl,-Bstatic,-T,$(VX_RT_PATH)/mains/vortex_link.ld - -CXXFLAGS = -g -O0 -march=rv32im -mabi=ilp32 -CXXFLAGS += -ffreestanding # program may not begin at main() -CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sections -CXXFLAGS += -fno-rtti -fno-non-call-exceptions # disable RTTI and exceptions -CXXFLAGS += -I$(POCL_INC_PATH) - -VX_LIBS = -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -QEMU_LIBS = $(VX_RT_PATH)/qemu/vx_api.c -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -======= LLVM_HOME ?= ~/dev/llvm-project/drops TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops SYSROOT ?= $(TOOLCHAIN_PATH)/riscv32-unknown-elf @@ -45,45 +11,11 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error CXXFLAGS += -I$(POCLRT_PATH)/include LDFLAGS += -L$(POCLRT_PATH)/lib -L$(DRIVER_PATH)/simx -lOpenCL -lvortex ->>>>>>> fpga_synthesis PROJECT = convolution SRCS = main.cpp utils.cpp -<<<<<<< HEAD -all: $(PROJECT).dump $(PROJECT).hex - -lib$(PROJECT).a: kernel.cl - POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o lib$(PROJECT).a kernel.cl - -$(PROJECT).elf: $(SRCS) lib$(PROJECT).a - $(CXX) $(CXXFLAGS) $(VX_CFLAGS) $(VX_SRCS) $(SRCS) $(VX_LIBS) -o $(PROJECT).elf - -$(PROJECT).qemu: $(SRCS) lib$(PROJECT).a - $(CXX) $(CXXFLAGS) $(SRCS) $(QEMU_LIBS) -o $(PROJECT).qemu - -$(PROJECT).hex: $(PROJECT).elf - $(HEX) -O ihex $(PROJECT).elf $(PROJECT).hex - -$(PROJECT).dump: $(PROJECT).elf - $(DMP) -D $(PROJECT).elf > $(PROJECT).dump - -run: $(PROJECT).hex - POCL_DEBUG=all $(VX_SIMX_PATH)/Vcache_simX -E -a rv32i --core $(PROJECT).hex -s -b 1> emulator.debug - -qemu: $(PROJECT).qemu - POCL_DEBUG=all $(RISCV_TOOL_PATH)/bin/qemu-riscv32 -d in_asm -D debug.log $(PROJECT).qemu - -gdb-s: $(PROJECT).qemu - POCL_DEBUG=all $(RISCV_TOOL_PATH)/bin/qemu-riscv32 -g 1234 -d in_asm -D debug.log $(PROJECT).qemu - -gdb-c: $(PROJECT).qemu - $(GDB) $(PROJECT).qemu - -clean: - rm -rf *.o *.elf *.dump *.hex *.qemu *.log *.debug -======= all: $(PROJECT) kernel.pocl: kernel.cl @@ -113,4 +45,3 @@ clean: ifneq ($(MAKECMDGOALS),clean) -include .depend endif ->>>>>>> fpga_synthesis diff --git a/benchmarks/opencl/guassian/Makefile b/benchmarks/opencl/guassian/Makefile index 371dae22..5e0dc3a2 100644 --- a/benchmarks/opencl/guassian/Makefile +++ b/benchmarks/opencl/guassian/Makefile @@ -12,20 +12,7 @@ CXXFLAGS += -I$(POCL_RT_PATH)/include LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex -<<<<<<< HEAD -CXXFLAGS = -g -O0 -march=rv32im -mabi=ilp32 -CXXFLAGS += -ffreestanding # program may not begin at main() -CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sections -CXXFLAGS += -fno-rtti -fno-non-call-exceptions # disable RTTI and exceptions -CXXFLAGS += -I$(POCL_INC_PATH) - -VX_LIBS = -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -QEMU_LIBS = $(VX_RT_PATH)/qemu/vx_api.c -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a - -PROJECT = gaussian -======= PROJECT = guassian ->>>>>>> fpga_synthesis SRCS = main.cc clutils.cpp utils.cpp diff --git a/benchmarks/opencl/kmeans/Makefile b/benchmarks/opencl/kmeans/Makefile index fa26ef3b..8c137450 100644 --- a/benchmarks/opencl/kmeans/Makefile +++ b/benchmarks/opencl/kmeans/Makefile @@ -10,20 +10,7 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error CXXFLAGS += -I$(POCL_RT_PATH)/include -<<<<<<< HEAD -VX_CFLAGS = -nostartfiles -Wl,-Bstatic,-T,$(VX_RT_PATH)/mains/vortex_link.ld - -CXXFLAGS = -g -O0 -march=rv32im -mabi=ilp32 -CXXFLAGS += -ffreestanding # program may not begin at main() -CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sections -CXXFLAGS += -fno-rtti -fno-non-call-exceptions # disable RTTI and exceptions -CXXFLAGS += -I$(POCL_INC_PATH) - -VX_LIBS = -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -QEMU_LIBS = $(VX_RT_PATH)/qemu/vx_api.c -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -======= LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex ->>>>>>> fpga_synthesis PROJECT = kmeans diff --git a/benchmarks/opencl/nearn/Makefile b/benchmarks/opencl/nearn/Makefile index cb283a1d..1e42cb81 100644 --- a/benchmarks/opencl/nearn/Makefile +++ b/benchmarks/opencl/nearn/Makefile @@ -10,20 +10,7 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error CXXFLAGS += -I$(POCL_RT_PATH)/include -<<<<<<< HEAD -VX_CFLAGS = -nostartfiles -Wl,-Bstatic,-T,$(VX_RT_PATH)/mains/vortex_link.ld - -CXXFLAGS = -g -O0 -march=rv32im -mabi=ilp32 -CXXFLAGS += -ffreestanding # program may not begin at main() -CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sections -CXXFLAGS += -fno-rtti -fno-non-call-exceptions # disable RTTI and exceptions -CXXFLAGS += -I$(POCL_INC_PATH) - -VX_LIBS = -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -QEMU_LIBS = $(VX_RT_PATH)/qemu/vx_api.c -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -======= LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex ->>>>>>> fpga_synthesis PROJECT = nearn diff --git a/benchmarks/opencl/saxpy/Makefile b/benchmarks/opencl/saxpy/Makefile index 0774ddad..c8949795 100644 --- a/benchmarks/opencl/saxpy/Makefile +++ b/benchmarks/opencl/saxpy/Makefile @@ -10,20 +10,7 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error CXXFLAGS += -I$(POCL_RT_PATH)/include -<<<<<<< HEAD -VX_CFLAGS = -nostartfiles -Wl,-Bstatic,-T,$(VX_RT_PATH)/mains/vortex_link.ld - -CXXFLAGS = -g -O0 -march=rv32im -mabi=ilp32 -CXXFLAGS += -ffreestanding # program may not begin at main() -CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sections -CXXFLAGS += -fno-rtti -fno-non-call-exceptions # disable RTTI and exceptions -CXXFLAGS += -I$(POCL_INC_PATH) - -VX_LIBS = -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -QEMU_LIBS = $(VX_RT_PATH)/qemu/vx_api.c -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -======= LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex ->>>>>>> fpga_synthesis PROJECT = saxpy diff --git a/benchmarks/opencl/sfilter/Makefile b/benchmarks/opencl/sfilter/Makefile index 3c9487ee..41917828 100644 --- a/benchmarks/opencl/sfilter/Makefile +++ b/benchmarks/opencl/sfilter/Makefile @@ -10,20 +10,7 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error CXXFLAGS += -I$(POCL_RT_PATH)/include -<<<<<<< HEAD -VX_CFLAGS = -nostartfiles -Wl,-Bstatic,-T,$(VX_RT_PATH)/mains/vortex_link.ld - -CXXFLAGS = -g -O0 -march=rv32im -mabi=ilp32 -CXXFLAGS += -ffreestanding # program may not begin at main() -CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sections -CXXFLAGS += -fno-rtti -fno-non-call-exceptions # disable RTTI and exceptions -CXXFLAGS += -I$(POCL_INC_PATH) - -VX_LIBS = -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -QEMU_LIBS = $(VX_RT_PATH)/qemu/vx_api.c -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -======= LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex ->>>>>>> fpga_synthesis PROJECT = sfilter diff --git a/benchmarks/opencl/sgemm/Makefile b/benchmarks/opencl/sgemm/Makefile index 19f82dc3..b30a7736 100644 --- a/benchmarks/opencl/sgemm/Makefile +++ b/benchmarks/opencl/sgemm/Makefile @@ -10,20 +10,7 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error CXXFLAGS += -I$(POCL_RT_PATH)/include -<<<<<<< HEAD -VX_CFLAGS = -nostartfiles -Wl,-Bstatic,-T,$(VX_RT_PATH)/mains/vortex_link.ld - -CXXFLAGS = -g -O0 -march=rv32im -mabi=ilp32 -CXXFLAGS += -ffreestanding # program may not begin at main() -CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sections -CXXFLAGS += -fno-rtti -fno-non-call-exceptions # disable RTTI and exceptions -CXXFLAGS += -I$(POCL_INC_PATH) - -VX_LIBS = -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -QEMU_LIBS = $(VX_RT_PATH)/qemu/vx_api.c -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -======= LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex ->>>>>>> fpga_synthesis PROJECT = sgemm diff --git a/benchmarks/opencl/transpose/Makefile b/benchmarks/opencl/transpose/Makefile index 99fb5276..5110f11a 100644 --- a/benchmarks/opencl/transpose/Makefile +++ b/benchmarks/opencl/transpose/Makefile @@ -14,12 +14,7 @@ LDFLAGS += -L$(POCLRT_PATH)/lib -L$(DRIVER_PATH)/simx -lOpenCL -lvortex PROJECT = transpose -<<<<<<< HEAD -VX_LIBS = -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -QEMU_LIBS = $(VX_RT_PATH)/qemu/vx_api.c -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -======= SRCS = main.cc transpose_gold.cpp ->>>>>>> fpga_synthesis all: $(PROJECT) diff --git a/benchmarks/opencl/vecadd/Makefile b/benchmarks/opencl/vecadd/Makefile index 80ab913c..a70a3a86 100644 --- a/benchmarks/opencl/vecadd/Makefile +++ b/benchmarks/opencl/vecadd/Makefile @@ -10,20 +10,7 @@ CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-error CXXFLAGS += -I$(POCL_RT_PATH)/include -<<<<<<< HEAD -VX_CFLAGS = -nostartfiles -Wl,-Bstatic,-T,$(VX_RT_PATH)/mains/vortex_link.ld - -CXXFLAGS = -g -O0 -march=rv32im -mabi=ilp32 -CXXFLAGS += -ffreestanding # program may not begin at main() -CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sections -CXXFLAGS += -fno-rtti -fno-non-call-exceptions # disable RTTI and exceptions -CXXFLAGS += -I$(POCL_INC_PATH) - -VX_LIBS = -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -QEMU_LIBS = $(VX_RT_PATH)/qemu/vx_api.c -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a -======= LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex ->>>>>>> fpga_synthesis PROJECT = vecadd diff --git a/benchmarks/vector/saxpy/Makefile b/benchmarks/vector/saxpy/Makefile index f95b5c16..b471dddc 100644 --- a/benchmarks/vector/saxpy/Makefile +++ b/benchmarks/vector/saxpy/Makefile @@ -29,12 +29,4 @@ HEX: ELF $(CPY) -O ihex $(VX_MAIN).elf $(VX_MAIN).hex ELF: -<<<<<<< HEAD - $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf - -clean: - rm -rf *.o *.elf *.dump *.hex *.qemu *.log *.debug - -======= $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf ->>>>>>> fpga_synthesis diff --git a/benchmarks/vector/sfilter/Makefile b/benchmarks/vector/sfilter/Makefile index 849b3e15..4151093e 100644 --- a/benchmarks/vector/sfilter/Makefile +++ b/benchmarks/vector/sfilter/Makefile @@ -29,11 +29,4 @@ HEX: ELF $(CPY) -O ihex $(VX_MAIN).elf $(VX_MAIN).hex ELF: -<<<<<<< HEAD - $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf - -clean: - rm -rf *.o *.elf *.dump *.hex *.qemu *.log *.debug -======= $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf ->>>>>>> fpga_synthesis diff --git a/benchmarks/vector/sgemm_nn/Makefile b/benchmarks/vector/sgemm_nn/Makefile index 2d708ed6..33ebe1e9 100644 --- a/benchmarks/vector/sgemm_nn/Makefile +++ b/benchmarks/vector/sgemm_nn/Makefile @@ -29,11 +29,4 @@ HEX: ELF $(CPY) -O ihex $(VX_MAIN).elf $(VX_MAIN).hex ELF: -<<<<<<< HEAD - $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf - -clean: - rm -rf *.o *.elf *.dump *.hex *.qemu *.log *.debug -======= $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf ->>>>>>> fpga_synthesis diff --git a/benchmarks/vector/vecadd/Makefile b/benchmarks/vector/vecadd/Makefile index 366b9b08..51ec95b3 100644 --- a/benchmarks/vector/vecadd/Makefile +++ b/benchmarks/vector/vecadd/Makefile @@ -33,19 +33,8 @@ HEX: ELF $(CPY) -O ihex $(VX_MAIN).elf $(VX_MAIN).hex ELF: -<<<<<<< HEAD - $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC1) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf -# $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC2) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf -# $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC3) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf -# $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC4) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf -# $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC5) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf~ - -clean: - rm -rf *.o *.elf *.dump *.hex *.qemu *.log *.debug -======= $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC1) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf # $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC2) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf # $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC3) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf # $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC4) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf # $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC5) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf~ ->>>>>>> fpga_synthesis diff --git a/miscs/rvvector/benchmark_temp/Makefile b/miscs/rvvector/benchmark_temp/Makefile index 43474de7..894698d9 100644 --- a/miscs/rvvector/benchmark_temp/Makefile +++ b/miscs/rvvector/benchmark_temp/Makefile @@ -33,17 +33,7 @@ HEX: ELF $(CPY) -O ihex $(VX_MAIN).elf $(VX_MAIN).hex ELF: -<<<<<<< HEAD:rvvector/benchmark_temp/Makefile - $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC2) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf -# $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC3) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf -# $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC4) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf -# $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC5) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf~ - -clean: - rm -rf *.o *.elf *.dump *.hex *.qemu *.log *.debug -======= $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC2) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf # $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC3) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf # $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC4) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf # $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC5) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf~ ->>>>>>> fpga_synthesis:miscs/rvvector/benchmark_temp/Makefile diff --git a/runtime/tests/hello/Makefile b/runtime/tests/hello/Makefile index 3c6d940e..2f8492ce 100644 --- a/runtime/tests/hello/Makefile +++ b/runtime/tests/hello/Makefile @@ -11,13 +11,8 @@ CPY = $(RISCV_TOOL_PATH)/bin/riscv32-unknown-elf-objcopy NEWLIB = ../../newlib/newlib.c VX_STR = -<<<<<<< HEAD:runtime/mains/hello/Makefile -VX_INT = ../../intrinsics/vx_intrinsics.s -VX_IO = ../../io/vx_io.s ../../io/vx_io.c -======= VX_INT = ../../intrinsics/vx_intrinsics.S VX_IO = ->>>>>>> fpga_synthesis:runtime/tests/hello/Makefile VX_API = VX_FIO = LIBS = $(RISCV_TOOL_PATH)/riscv32-unknown-elf/lib/libc.a $(RISCV_TOOL_PATH)/riscv32-unknown-elf/lib/libstdc++.a -static-libgcc -lgcc @@ -33,11 +28,4 @@ HEX: ELF $(CPY) -O ihex $(VX_MAIN).elf $(VX_MAIN).hex ELF: -<<<<<<< HEAD:runtime/mains/hello/Makefile - $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).cpp $(LIBS) -Iinclude -o $(VX_MAIN).elf - -clean: - rm -rf *.o *.elf *.dump *.hex *.qemu *.log *.debug -======= $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).cpp $(LIBS) -Iinclude -o $(VX_MAIN).elf ->>>>>>> fpga_synthesis:runtime/tests/hello/Makefile diff --git a/runtime/tests/nativevecadd/Makefile b/runtime/tests/nativevecadd/Makefile index c8722703..3d970701 100644 --- a/runtime/tests/nativevecadd/Makefile +++ b/runtime/tests/nativevecadd/Makefile @@ -18,14 +18,8 @@ VX_STR = ../../startup/vx_start.S VX_INT = ../../intrinsics/vx_intrinsics.S VX_IO = ../../io/vx_io.S ../../io/vx_io.c VX_API = ../../vx_api/vx_api.c -<<<<<<< HEAD:runtime/mains/vecadd/Makefile -VX_TEST = ../../tests/tests.c -VX_FIO = ../../fileio/fileio.s -LIBS = -Wl,--whole-archive ./libs/libvecadd.a -Wl,--no-whole-archive ./libs/libOpenCL.a $(RISCV_TOOL_PATH)/riscv32-unknown-elf/lib/libc.a $(RISCV_TOOL_PATH)/riscv32-unknown-elf/lib/libstdc++.a -static-libgcc -lgcc -======= VX_FIO = ../../fileio/fileio.S LIBS = -Wl,--whole-archive ./libs/libvecadd.a -Wl,--no-whole-archive ./libs/libOpenCL.a ../../../../riscv-gnu-toolchain/drops/riscv32-unknown-elf/lib/libc.a ../../../../riscv-gnu-toolchain/drops/riscv32-unknown-elf/lib/libstdc++.a -static-libgcc -lgcc ->>>>>>> fpga_synthesis:runtime/tests/nativevecadd/Makefile VX_MAIN = vx_pocl_main @@ -38,11 +32,4 @@ HEX: ELF $(CPY) -O ihex $(VX_MAIN).elf $(VX_MAIN).hex ELF: -<<<<<<< HEAD:runtime/mains/vecadd/Makefile - $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf - -clean: - rm -rf *.o *.elf *.dump *.hex *.qemu *.log *.debug -======= $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf ->>>>>>> fpga_synthesis:runtime/tests/nativevecadd/Makefile diff --git a/runtime/tests/nlTest/Makefile b/runtime/tests/nlTest/Makefile index 57958de8..7b868b71 100644 --- a/runtime/tests/nlTest/Makefile +++ b/runtime/tests/nlTest/Makefile @@ -9,17 +9,10 @@ DMP = $(RISCV_TOOL_PATH)/bin/riscv32-unknown-elf-objdump CPY = $(RISCV_TOOL_PATH)/bin/riscv32-unknown-elf-objcopy -<<<<<<< HEAD:runtime/mains/nlTest/Makefile -NEWLIB = ../../newlib/newlib.c -VX_STR = ../../startup/vx_start.s -VX_INT = ../../intrinsics/vx_intrinsics.s -VX_IO = ../../io/vx_io.s ../../io/vx_io.c -======= NEWLIB = ../../newlib/newlib.c ../../newlib/newlib_notimp.c ../../newlib/newlib.s VX_STR = ../../startup/vx_start.S VX_INT = ../../intrinsics/vx_intrinsics.S VX_IO = ../../io/vx_io.S ../../io/vx_io.c ->>>>>>> fpga_synthesis:runtime/tests/nlTest/Makefile VX_API = ../../vx_api/vx_api.c VX_FIO = ../../fileio/fileio.S @@ -34,11 +27,4 @@ HEX: ELF $(CPY) -O ihex vx_nl_main.elf vx_nl_main.hex ELF: -<<<<<<< HEAD:runtime/mains/nlTest/Makefile - $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN) $(RISCV_TOOL_PATH)/riscv32-unknown-elf/lib/libc.a $(RISCV_TOOL_PATH)/riscv32-unknown-elf/lib/libstdc++.a -static-libgcc -lgcc -o vx_nl_main.elf - -clean: - rm -rf *.o *.elf *.dump *.hex *.qemu *.log *.debug -======= $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN) /opt/riscv/riscv32-unknown-elf/lib/libc.a /opt/riscv/riscv32-unknown-elf/lib/libstdc++.a -static-libgcc -lgcc -o vx_nl_main.elf ->>>>>>> fpga_synthesis:runtime/tests/nlTest/Makefile diff --git a/runtime/tests/vecadd/Makefile b/runtime/tests/vecadd/Makefile index 46785f2c..3d970701 100644 --- a/runtime/tests/vecadd/Makefile +++ b/runtime/tests/vecadd/Makefile @@ -18,14 +18,8 @@ VX_STR = ../../startup/vx_start.S VX_INT = ../../intrinsics/vx_intrinsics.S VX_IO = ../../io/vx_io.S ../../io/vx_io.c VX_API = ../../vx_api/vx_api.c -<<<<<<< HEAD:runtime/mains/nativevecadd/Makefile -VX_TEST = ../../tests/tests.c -VX_FIO = ../../fileio/fileio.s -LIBS = -Wl,--whole-archive ./libs/libvecadd.a -Wl,--no-whole-archive ./libs/libOpenCL.a $(RISCV_TOOL_PATH)/riscv32-unknown-elf/lib/libc.a $(RISCV_TOOL_PATH)/riscv32-unknown-elf/lib/libstdc++.a -static-libgcc -lgcc -======= VX_FIO = ../../fileio/fileio.S LIBS = -Wl,--whole-archive ./libs/libvecadd.a -Wl,--no-whole-archive ./libs/libOpenCL.a ../../../../riscv-gnu-toolchain/drops/riscv32-unknown-elf/lib/libc.a ../../../../riscv-gnu-toolchain/drops/riscv32-unknown-elf/lib/libstdc++.a -static-libgcc -lgcc ->>>>>>> fpga_synthesis:runtime/tests/vecadd/Makefile VX_MAIN = vx_pocl_main @@ -38,11 +32,4 @@ HEX: ELF $(CPY) -O ihex $(VX_MAIN).elf $(VX_MAIN).hex ELF: -<<<<<<< HEAD:runtime/mains/nativevecadd/Makefile - $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf - -clean: - rm -rf *.o *.elf *.dump *.hex *.qemu *.log *.debug -======= $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf ->>>>>>> fpga_synthesis:runtime/tests/vecadd/Makefile diff --git a/runtime/tests/vector_test/Makefile b/runtime/tests/vector_test/Makefile index c1a4fd13..836424b5 100644 --- a/runtime/tests/vector_test/Makefile +++ b/runtime/tests/vector_test/Makefile @@ -33,11 +33,4 @@ HEX: ELF $(CPY) -O ihex $(VX_MAIN).elf $(VX_MAIN).hex ELF: -<<<<<<< HEAD:runtime/mains/vector_test/Makefile - $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf - -clean: - rm -rf *.o *.elf *.dump *.hex *.qemu *.log *.debug -======= $(COMP) $(CC_FLAGS) $(VX_STR) $(VX_VEC) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude -o $(VX_MAIN).elf ->>>>>>> fpga_synthesis:runtime/tests/vector_test/Makefile