runtime static library

runtime/tests/simple/Makefile

@@ -1,40 +1,34 @@
+RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
+VORTEX_RT_PATH ?= $(wildcard ../..)
 
-COMP     = ~/dev/riscv-gnu-toolchain/drops/bin/riscv32-unknown-elf-g++
+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
 
-CC_FLAGS = -march=rv32im -mabi=ilp32 -O3 -Wl,-Bstatic,-T,../../startup/vx_link.ld 
-CC_FLAGS += -nostartfiles -ffreestanding -fno-rtti -fno-exceptions -Wl,--gc-sections 
+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
 
-CC_FLAGS += -I../../../hw
+LDFLAGS += $(VORTEX_RT_PATH)/libvortexrt.a
 
-DMP  = ~/dev/riscv-gnu-toolchain/drops/bin/riscv32-unknown-elf-objdump
-CPY  = ~/dev/riscv-gnu-toolchain/drops/bin/riscv32-unknown-elf-objcopy
+PROJECT = vx_simple
 
+SRCS = main.c tests.c
 
-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
+all: $(PROJECT).elf $(PROJECT).hex $(PROJECT).dump
 
-VX_MAIN = vx_simple_main
+$(PROJECT).dump: $(PROJECT).elf
+	$(DP) -D $(PROJECT).elf > $(PROJECT).dump
 
-#LIBS  += ~/dev/riscv-gnu-toolchain/drops/riscv32-unknown-elf/lib/libc.a 
-#LIBS  += ~/dev/riscv-gnu-toolchain/drops/riscv32-unknown-elf/lib/libstdc++.a 
-#LIBS  += -static-libgcc -lgcc
+$(PROJECT).hex: $(PROJECT).elf
+	$(CP) -O ihex $(PROJECT).elf $(PROJECT).hex
 
-VX_SRCS = vx_simple_main.c tests.c
+$(PROJECT).elf: $(SRCS)
+	$(CC) $(CFLAGS) $(SRCS) $(LDFLAGS) -o $(PROJECT).elf
 
-all: HEX DUMP ELF BIN
+.depend: $(SRCS)
+	$(CC) $(CFLAGS) -MM $^ > .depend;
 
-DUMP: ELF
-	$(DMP) -D $(VX_MAIN).elf > $(VX_MAIN).dump
-
-HEX: ELF
-	$(CPY) -O ihex $(VX_MAIN).elf $(VX_MAIN).hex
-
-BIN: ELF
-	$(CPY) -O binary $(VX_MAIN).elf $(VX_MAIN).bin
-
-ELF: 
-	$(COMP) $(CC_FLAGS) $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_SRCS) $(LIBS) -Iinclude  -o $(VX_MAIN).elf
+clean:
+	rm -rf *.elf *.hex *.dump .depend 

runtime/tests/simple/main.c

@@ -1,8 +1,8 @@
 
-#include "../../intrinsics/vx_intrinsics.h"
-#include "../../io/vx_io.h"
 #include "tests.h"
-#include "../../vx_api/vx_api.h"
+#include <vx_intrinsics.h>
+#include <vx_print.h>
+#include <vx_spawn.h>
 
 
 typedef struct

runtime/tests/simple/tests.c

@@ -1,8 +1,6 @@
-
-
 #include "tests.h"
-#include "../../intrinsics/vx_intrinsics.h"
-#include "../../io/vx_io.h"
+#include <vx_intrinsics.h>
+#include <vx_print.h>
 
 int tmc_array[4] = {5,5,5,5};
 

runtime/tests/simple/tests.h

@@ -1,5 +1,3 @@
-
-
 #ifndef TESTS
 #define TESTS
 

runtime/tests/simple/vx_tempelate.c

@@ -1,42 +0,0 @@
-
-
-
-#include "io/io.h" // Printing functions
-#include "intrinsics/instrinsics.h" // vx_thread_id and vx_WarpID
-
-struct args
-{
-	void * data;
-};
-
-
-void function(void * arg)
-{
-	struct args * real_arg = (struct args *) arg;
-
-	unsigned tid = vx_thread_id();
-	unsigned wid = vx_WarpID();
-
-	__if(something) // Control divergent if
-	{
-
-	}
-	__else
-	{
-
-	}
-	__endif
-}
-
-int main()
-{
-
-	void * data = vx_loadfile("filename.txt"); // The raw char data will be returned by vx_loadfile
-
-	struct args arg;
-	arg.data = data;
-
-	vx_spawn_warps(numWarps, numThreads, function, &data);
-
-
-}