From ccad86ff6d1dd7e550aef05547bfa1639a36184c Mon Sep 17 00:00:00 2001
From: MalikBurton <burton.malik08@gmail.com>
Date: Tue, 21 Jul 2020 13:15:17 -0400
Subject: [PATCH] Makefile of vecadd along with the edited main files of
 working runtime tests

---
 runtime/tests/dev/vx_dev_main.c     |  5 +--
 runtime/tests/nlTest/vx_nl_main.c   |  6 +---
 runtime/tests/vecadd/Makefile       | 48 ++++++++++++++---------------
 runtime/tests/vecadd/vx_pocl_main.c |  6 +---
 4 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/runtime/tests/dev/vx_dev_main.c b/runtime/tests/dev/vx_dev_main.c
index 8aaa38f9..aaa56777 100644
--- a/runtime/tests/dev/vx_dev_main.c
+++ b/runtime/tests/dev/vx_dev_main.c
@@ -1,8 +1,5 @@
 
-#include "../../intrinsics/vx_intrinsics.h"
-#include "../../io/vx_io.h"
-#include "../common/tests.h"
-#include "../../vx_api/vx_api.h"
+#include <vx_intrinsics.h>
 
 
 // #include <utlist.h>
diff --git a/runtime/tests/nlTest/vx_nl_main.c b/runtime/tests/nlTest/vx_nl_main.c
index bc0e49e3..38d3d0fe 100644
--- a/runtime/tests/nlTest/vx_nl_main.c
+++ b/runtime/tests/nlTest/vx_nl_main.c
@@ -1,9 +1,5 @@
 
-#include "../../intrinsics/vx_intrinsics.h"
-#include "../../io/vx_io.h"
-#include "../common/tests.h"
-#include "../../vx_api/vx_api.h"
-#include "../../fileio/fileio.h"
+#include <vx_intrinsics.h>
 
 // #include <utlist.h>
 #include <string.h>
diff --git a/runtime/tests/vecadd/Makefile b/runtime/tests/vecadd/Makefile
index 01f35d85..5bdaa1d9 100644
--- a/runtime/tests/vecadd/Makefile
+++ b/runtime/tests/vecadd/Makefile
@@ -1,35 +1,35 @@
+RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
+VORTEX_RT_PATH ?= $(wildcard ../..)
 
-RISCV_TOOLCHAIN_PATH ?= $(wildcard ../../../../riscv-gnu-toolchain/drops)
+CC = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc
+AR = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc-ar
+DP = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-objdump
+CP = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-objcopy
 
-COMP     = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++
-# CC_FLAGS = -march=rv32im -mabi=ilp32 -O0 -Wl,-Bstatic,-T,linker.ld -ffreestanding -nostdlib
-# CC_FLAGS = -march=rv32im -mabi=ilp32 -O0 -Wl,-Bstatic,-T,linker.ld -ffreestanding -nostartfiles
-CC_FLAGS = -ffreestanding -O0 -Wl,--gc-sections -nostartfiles -nostdlib -nostartfiles -nodefaultlibs -Wl,-Bstatic,-T,../../startup/vx_link.ld -march=rv32im -mabi=ilp32
+CFLAGS += -march=rv32im -mabi=ilp32 -O3 -Wl,-Bstatic,-T,$(VORTEX_RT_PATH)/linker/vx_link.ld
+CFLAGS += -nostartfiles -ffreestanding -fno-exceptions -Wl,--gc-sections 
+CFLAGS += -I$(VORTEX_RT_PATH)/include -I./include 
 
-DMP  = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-objdump
-CPY  = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-objcopy
+LDFLAGS += $(VORTEX_RT_PATH)/libvortexrt.a
+LDFLAGS += ./libs/libOpenCL.a
 
-# VX_STR  = ../../startup/vx_start.S
+PROJECT = vx_pocl_main
 
+SRCS = vx_pocl_main.c  
 
+all: $(PROJECT).elf $(PROJECT).hex $(PROJECT).dump
 
-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
-VX_API  = ../../vx_api/vx_api.c
-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
+$(PROJECT).dump: $(PROJECT).elf
+	$(DP) -D $(PROJECT).elf > $(PROJECT).dump
 
-VX_MAIN = vx_pocl_main
+$(PROJECT).hex: $(PROJECT).elf
+	$(CP) -O ihex $(PROJECT).elf $(PROJECT).hex
 
-all: HEX DUMP ELF
+$(PROJECT).elf: $(SRCS)
+	$(CC) $(CFLAGS) $(SRCS) $(LDFLAGS) -o $(PROJECT).elf
 
-DUMP: ELF
-	$(DMP) -D $(VX_MAIN).elf > $(VX_MAIN).dump
+.depend: $(SRCS)
+	$(CC) $(CFLAGS) -MM $^ > .depend;
 
-HEX: ELF
-	$(CPY) -O ihex $(VX_MAIN).elf $(VX_MAIN).hex
-
-ELF: 
-	$(COMP) $(CC_FLAGS) $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_MAIN).c $(LIBS) -Iinclude  -o $(VX_MAIN).elf
+clean:
+	rm -rf *.elf *.hex *.dump .depend 
diff --git a/runtime/tests/vecadd/vx_pocl_main.c b/runtime/tests/vecadd/vx_pocl_main.c
index c1b12a4e..632723f1 100644
--- a/runtime/tests/vecadd/vx_pocl_main.c
+++ b/runtime/tests/vecadd/vx_pocl_main.c
@@ -1,9 +1,5 @@
 
-#include "../../intrinsics/vx_intrinsics.h"
-#include "../../io/vx_io.h"
-#include "../common/tests.h"
-#include "../../vx_api/vx_api.h"
-#include "../../fileio/fileio.h"
+#include <vx_intrinsics.h>
 #include <CL/opencl.h>
 
 // Newlib