Modified for WebAssembly

examples/Makefile

@@ -7,9 +7,7 @@
 all:
 	@$(MAKE) -C benchmark all
 	@$(MAKE) -C hello all
-	@$(MAKE) -C mnist all
 
 clean:
 	@$(MAKE) -C benchmark clean
 	@$(MAKE) -C hello clean
-	@$(MAKE) -C mnist clean

examples/benchmark/Makefile

@@ -2,10 +2,11 @@
 # Makefile for application
 #
 
+WASI_SDK_PATH ?= /home/nskernel/wasi/wasi-sdk-20.0
 CROSS_COMPILE	?= 
 
 AS			:= $(CROSS_COMPILE)gcc -x assembler-with-cpp
-CC			:= $(CROSS_COMPILE)gcc
+CC			:= $(WASI_SDK_PATH)/bin/clang
 CXX			:= $(CROSS_COMPILE)g++
 LD			:= $(CROSS_COMPILE)ld
 AR			:= $(CROSS_COMPILE)ar
@@ -14,9 +15,9 @@ OD			:= $(CROSS_COMPILE)objdump
 RM			:= rm -fr
 
 ASFLAGS		:= -g -ggdb -Wall -O3
-CFLAGS		:= -g -ggdb -Wall -O3
+CFLAGS		:= $(TARGET) -D_WASI_EMULATED_PROCESS_CLOCKS --sysroot=$(WASI_SDK_PATH)/share/wasi-sysroot/ 
 CXXFLAGS	:= -g -ggdb -Wall -O3
-LDFLAGS		:=
+LDFLAGS		:= $(TARGET) -Wl,-lc -Wl,--allow-undefined -Wl,--export=main -Wl,--export=__wasm_call_ctors -Wl,--export=__heap_base,--export=__data_end
 OCFLAGS		:= -v -O binary
 ODFLAGS		:=
 MCFLAGS		:=
@@ -45,13 +46,15 @@ OBJDIRS		:= $(patsubst %, %, $(SRCDIRS))
 NAME		:= benchmark
 VPATH		:= $(OBJDIRS)
 
+LIBOBJS     := $(foreach dir, ../../src ../../src/default, $(wildcard $(dir)/*.o))
+
 .PHONY: all clean
 
 all : $(NAME)
 
-$(NAME) : $(OBJS)
+$(NAME) : $(OBJS) $(LIBOBJS) 
 	@echo [LD] Linking $@
-	@$(CC) $(LDFLAGS) $(LIBDIRS) $^ -o $@ $(LIBS) -static
+	@$(CC) $(LDFLAGS) $(LIBDIRS) $^ -o $@ -static
 
 $(SOBJS) : %.o : %.S
 	@echo [AS] $<

examples/benchmark/main.c

@@ -87,7 +87,7 @@ static void profiler_dump(struct hmap_t * m, int count)
 		{
 			p = (struct profiler_t *)e->value;
 			total += p->elapsed;
-			printf("%-32s %ld %12.3f(us)\r\n", e->key, p->count, (p->count > 0) ? ((double)p->elapsed / 1000.0f) / (double)p->count : 0);
+			printf("%-32s %lld %12.3f(us)\r\n", e->key, p->count, (p->count > 0) ? ((double)p->elapsed / 1000.0f) / (double)p->count : 0);
 		}
 		if(count > 0)
 		{

examples/hello/Makefile

@@ -2,10 +2,11 @@
 # Makefile for application
 #
 
+WASI_SDK_PATH ?= /home/nskernel/wasi/wasi-sdk-20.0
 CROSS_COMPILE	?= 
 
 AS			:= $(CROSS_COMPILE)gcc -x assembler-with-cpp
-CC			:= $(CROSS_COMPILE)gcc
+CC			:= $(WASI_SDK_PATH)/bin/clang
 CXX			:= $(CROSS_COMPILE)g++
 LD			:= $(CROSS_COMPILE)ld
 AR			:= $(CROSS_COMPILE)ar
@@ -14,9 +15,9 @@ OD			:= $(CROSS_COMPILE)objdump
 RM			:= rm -fr
 
 ASFLAGS		:= -g -ggdb -Wall -O3
-CFLAGS		:= -g -ggdb -Wall -O3
+CFLAGS		:= $(TARGET) -D_WASI_EMULATED_PROCESS_CLOCKS --sysroot=$(WASI_SDK_PATH)/share/wasi-sysroot/ 
 CXXFLAGS	:= -g -ggdb -Wall -O3
-LDFLAGS		:=
+LDFLAGS		:= $(TARGET) -Wl,-lc -Wl,--allow-undefined -Wl,--export=main -Wl,--export=__wasm_call_ctors -Wl,--export=__heap_base,--export=__data_end
 OCFLAGS		:= -v -O binary
 ODFLAGS		:=
 MCFLAGS		:=
@@ -45,13 +46,15 @@ OBJDIRS		:= $(patsubst %, %, $(SRCDIRS))
 NAME		:= hello
 VPATH		:= $(OBJDIRS)
 
+LIBOBJS     := $(foreach dir, ../../src ../../src/default, $(wildcard $(dir)/*.o))
+
 .PHONY: all clean
 
 all : $(NAME)
 
-$(NAME) : $(OBJS)
+$(NAME) : $(OBJS) $(LIBOBJS)
 	@echo [LD] Linking $@
-	@$(CC) $(LDFLAGS) $(LIBDIRS) $^ -o $@ $(LIBS) -static
+	@$(CC) $(LDFLAGS) $(LIBDIRS) $^ -o $@ -static
 
 $(SOBJS) : %.o : %.S
 	@echo [AS] $<

examples/hello/main.c

@@ -2254,7 +2254,7 @@ int main(int argc, char * argv[])
 		/*
 		 * Dump onnx context
 		 */
-		onnx_context_dump(ctx, 0);
+		//onnx_context_dump(ctx, 0);
 
 		/*
 		 * Get input tensor by name
@@ -2274,7 +2274,7 @@ int main(int argc, char * argv[])
 		/*
 		 * Dump input tensor
 		 */
-		onnx_tensor_dump(input, 1);
+		//onnx_tensor_dump(input, 1);
 
 		/*
 		 * Run inference