diff --git a/benchmarks/opencl/aes/Makefile b/benchmarks/opencl/aes/Makefile
deleted file mode 100644
index 47711c90..00000000
--- a/benchmarks/opencl/aes/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-
-RISCV_TOOL_PATH=$(wildcard ~/dev/riscv-gnu-toolchain/drops)
-
-POCL_CC_PATH=$(wildcard ~/dev/pocl/drops_riscv_cc)
-POCL_RT_PATH=$(wildcard ~/dev/pocl/drops_riscv_rt)
-
-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
-NEWLIB_PATH=$(RISCV_TOOL_PATH)/riscv32-unknown-elf/lib
-
-VX_NEWLIB = $(VX_RT_PATH)/newlib/newlib.c
-VX_STR  = $(VX_RT_PATH)/startup/vx_start.s
-VX_INT  = $(VX_RT_PATH)/intrinsics/vx_intrinsics.s
-VX_IO   = $(VX_RT_PATH)/io/vx_io.s $(VX_RT_PATH)/io/vx_io.c
-VX_FIO  = $(VX_RT_PATH)/fileio/fileio.s
-VX_API  = $(VX_RT_PATH)/vx_api/vx_api.c
-
-VX_SRCS  = $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST)
-
-CXXFLAGS = -g -O0 -nostartfiles -Wl,-Bstatic,-T,$(VX_RT_PATH)/mains/vortex_link.ld -march=rv32im -mabi=ilp32 
-CXXFLAGS += -ffreestanding # program may not begin at main()
-CXXFLAGS += -fno-rtti -fno-non-call-exceptions # disable RTTI and exceptions
-CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sections
-
-LIBS = -lOpenCL
-
-PROJECT=saxpy
-
-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: main.cc lib$(PROJECT).a
-	$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
-
-$(PROJECT).hex: $(PROJECT).elf
-	$(HEX) -O ihex $(PROJECT).elf $(PROJECT).hex
-
-$(PROJECT).dump: $(PROJECT).elf
-	$(DMP) -D $(PROJECT).elf > $(PROJECT).dump
-
-run:
-	$(VX_SIMX_PATH)/Vcache_simX -E -a rv32i --core $(PROJECT).hex  -s -b 1> emulator.debug
-
-clean:
-	rm -rf *.elf *.dump *.hex *.a *.pocl *.o
\ No newline at end of file
diff --git a/benchmarks/opencl/fft/Makefile b/benchmarks/opencl/fft/Makefile
deleted file mode 100644
index 47711c90..00000000
--- a/benchmarks/opencl/fft/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-
-RISCV_TOOL_PATH=$(wildcard ~/dev/riscv-gnu-toolchain/drops)
-
-POCL_CC_PATH=$(wildcard ~/dev/pocl/drops_riscv_cc)
-POCL_RT_PATH=$(wildcard ~/dev/pocl/drops_riscv_rt)
-
-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
-NEWLIB_PATH=$(RISCV_TOOL_PATH)/riscv32-unknown-elf/lib
-
-VX_NEWLIB = $(VX_RT_PATH)/newlib/newlib.c
-VX_STR  = $(VX_RT_PATH)/startup/vx_start.s
-VX_INT  = $(VX_RT_PATH)/intrinsics/vx_intrinsics.s
-VX_IO   = $(VX_RT_PATH)/io/vx_io.s $(VX_RT_PATH)/io/vx_io.c
-VX_FIO  = $(VX_RT_PATH)/fileio/fileio.s
-VX_API  = $(VX_RT_PATH)/vx_api/vx_api.c
-
-VX_SRCS  = $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST)
-
-CXXFLAGS = -g -O0 -nostartfiles -Wl,-Bstatic,-T,$(VX_RT_PATH)/mains/vortex_link.ld -march=rv32im -mabi=ilp32 
-CXXFLAGS += -ffreestanding # program may not begin at main()
-CXXFLAGS += -fno-rtti -fno-non-call-exceptions # disable RTTI and exceptions
-CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sections
-
-LIBS = -lOpenCL
-
-PROJECT=saxpy
-
-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: main.cc lib$(PROJECT).a
-	$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
-
-$(PROJECT).hex: $(PROJECT).elf
-	$(HEX) -O ihex $(PROJECT).elf $(PROJECT).hex
-
-$(PROJECT).dump: $(PROJECT).elf
-	$(DMP) -D $(PROJECT).elf > $(PROJECT).dump
-
-run:
-	$(VX_SIMX_PATH)/Vcache_simX -E -a rv32i --core $(PROJECT).hex  -s -b 1> emulator.debug
-
-clean:
-	rm -rf *.elf *.dump *.hex *.a *.pocl *.o
\ No newline at end of file
diff --git a/benchmarks/opencl/fft/README b/benchmarks/opencl/fft/README
deleted file mode 100644
index e69de29b..00000000
diff --git a/benchmarks/opencl/hotspot/Makefile b/benchmarks/opencl/hotspot/Makefile
deleted file mode 100644
index 7e10d5fe..00000000
--- a/benchmarks/opencl/hotspot/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-
-RISCV_TOOL_PATH=$(wildcard ~/dev/riscv-gnu-toolchain/drops)
-
-POCL_CC_PATH=$(wildcard ~/dev/pocl/drops_riscv_cc)
-POCL_RT_PATH=$(wildcard ~/dev/pocl/drops_riscv_rt)
-
-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
-NEWLIB_PATH=$(RISCV_TOOL_PATH)/riscv32-unknown-elf/lib
-
-VX_NEWLIB = $(VX_RT_PATH)/newlib/newlib.c
-VX_STR  = $(VX_RT_PATH)/startup/vx_start.s
-VX_INT  = $(VX_RT_PATH)/intrinsics/vx_intrinsics.s
-VX_IO   = $(VX_RT_PATH)/io/vx_io.s $(VX_RT_PATH)/io/vx_io.c
-VX_FIO  = $(VX_RT_PATH)/fileio/fileio.s
-VX_API  = $(VX_RT_PATH)/vx_api/vx_api.c
-
-VX_SRCS  = $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST)
-
-CXXFLAGS = -g -O0 -nostartfiles -Wl,-Bstatic,-T,$(VX_RT_PATH)/mains/vortex_link.ld -march=rv32im -mabi=ilp32 
-CXXFLAGS += -ffreestanding # program may not begin at main()
-CXXFLAGS += -fno-rtti -fno-non-call-exceptions # disable RTTI and exceptions
-CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sections
-
-LIBS = -lOpenCL
-
-PROJECT=saxpy
-
-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: main.cc lib$(PROJECT).a
-	$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
-
-$(PROJECT).hex: $(PROJECT).elf
-	$(HEX) -O ihex $(PROJECT).elf $(PROJECT).hex
-
-$(PROJECT).dump: $(PROJECT).elf
-	$(DMP) -D $(PROJECT).elf > $(PROJECT).dump
-
-run:
-	$(VX_SIMX_PATH)/Vcache_simX -E -a rv32i --core $(PROJECT).hex  -s -b 1> emulator.debug
-
-clean:
-	rm -rf *.elf *.dump *.hex *.a *.pocl *.o
diff --git a/benchmarks/opencl/hotspot/README b/benchmarks/opencl/hotspot/README
deleted file mode 100644
index e69de29b..00000000
diff --git a/benchmarks/opencl/sgemm/Makefile b/benchmarks/opencl/sgemm/Makefile
index 109f355b..b28ffc8d 100644
--- a/benchmarks/opencl/sgemm/Makefile
+++ b/benchmarks/opencl/sgemm/Makefile
@@ -3,6 +3,7 @@ RISCV_TOOL_PATH=$(wildcard ~/dev/riscv-gnu-toolchain/drops)
 
 POCL_CC_PATH=$(wildcard ~/dev/pocl/drops_riscv_cc)
 POCL_RT_PATH=$(wildcard ~/dev/pocl/drops_riscv_rt)
+POCL_RT0_PATH=$(wildcard ~/dev/pocl/drops_riscv_rt0)
 
 VX_RT_PATH=$(wildcard ../../../runtime)
 VX_SIMX_PATH=$(wildcard ../../../simX/obj_dir)
@@ -22,7 +23,9 @@ VX_API  = $(VX_RT_PATH)/vx_api/vx_api.c
 
 VX_SRCS  = $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST)
 
-CXXFLAGS = -g -O0 -nostartfiles -Wl,-Bstatic,-T,$(VX_RT_PATH)/mains/vortex_link.ld -march=rv32im -mabi=ilp32 
+#CXXFLAGS = -g -O0 -nostartfiles -Wl,-Bstatic,-T,$(VX_RT_PATH)/mains/vortex_link.ld -march=rv32im -mabi=ilp32 
+
+CXXFLAGS = -g -O0 -march=rv32im -mabi=ilp32 
 CXXFLAGS += -ffreestanding # program may not begin at main()
 CXXFLAGS += -fno-rtti -fno-non-call-exceptions # disable RTTI and exceptions
 CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sections
@@ -39,14 +42,20 @@ lib$(PROJECT).a: kernel.cl
 $(PROJECT).elf: main.cc lib$(PROJECT).a
 	$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
 
+$(PROJECT).qemu: main.cc lib$(PROJECT).a
+	$(CXX) $(CXXFLAGS) -I$(POCL_RT0_PATH)/include -L$(POCL_RT0_PATH)/lib/static -L. main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(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:
+run: $(PROJECT).hex
 	$(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
+
 clean:
 	rm -rf *.elf *.dump *.hex *.a *.pocl
diff --git a/benchmarks/opencl/sort/Makefile b/benchmarks/opencl/sort/Makefile
deleted file mode 100644
index 7e10d5fe..00000000
--- a/benchmarks/opencl/sort/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-
-RISCV_TOOL_PATH=$(wildcard ~/dev/riscv-gnu-toolchain/drops)
-
-POCL_CC_PATH=$(wildcard ~/dev/pocl/drops_riscv_cc)
-POCL_RT_PATH=$(wildcard ~/dev/pocl/drops_riscv_rt)
-
-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
-NEWLIB_PATH=$(RISCV_TOOL_PATH)/riscv32-unknown-elf/lib
-
-VX_NEWLIB = $(VX_RT_PATH)/newlib/newlib.c
-VX_STR  = $(VX_RT_PATH)/startup/vx_start.s
-VX_INT  = $(VX_RT_PATH)/intrinsics/vx_intrinsics.s
-VX_IO   = $(VX_RT_PATH)/io/vx_io.s $(VX_RT_PATH)/io/vx_io.c
-VX_FIO  = $(VX_RT_PATH)/fileio/fileio.s
-VX_API  = $(VX_RT_PATH)/vx_api/vx_api.c
-
-VX_SRCS  = $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST)
-
-CXXFLAGS = -g -O0 -nostartfiles -Wl,-Bstatic,-T,$(VX_RT_PATH)/mains/vortex_link.ld -march=rv32im -mabi=ilp32 
-CXXFLAGS += -ffreestanding # program may not begin at main()
-CXXFLAGS += -fno-rtti -fno-non-call-exceptions # disable RTTI and exceptions
-CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sections
-
-LIBS = -lOpenCL
-
-PROJECT=saxpy
-
-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: main.cc lib$(PROJECT).a
-	$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
-
-$(PROJECT).hex: $(PROJECT).elf
-	$(HEX) -O ihex $(PROJECT).elf $(PROJECT).hex
-
-$(PROJECT).dump: $(PROJECT).elf
-	$(DMP) -D $(PROJECT).elf > $(PROJECT).dump
-
-run:
-	$(VX_SIMX_PATH)/Vcache_simX -E -a rv32i --core $(PROJECT).hex  -s -b 1> emulator.debug
-
-clean:
-	rm -rf *.elf *.dump *.hex *.a *.pocl *.o
diff --git a/benchmarks/opencl/sort/README b/benchmarks/opencl/sort/README
deleted file mode 100644
index e69de29b..00000000
diff --git a/benchmarks/opencl/spmv/README b/benchmarks/opencl/spmv/README
deleted file mode 100644
index e69de29b..00000000
diff --git a/benchmarks/opencl/spmv/Makefile b/benchmarks/opencl/vecadd/Makefile
similarity index 69%
rename from benchmarks/opencl/spmv/Makefile
rename to benchmarks/opencl/vecadd/Makefile
index 12aad1c4..839bf6da 100644
--- a/benchmarks/opencl/spmv/Makefile
+++ b/benchmarks/opencl/vecadd/Makefile
@@ -3,6 +3,7 @@ RISCV_TOOL_PATH=$(wildcard ~/dev/riscv-gnu-toolchain/drops)
 
 POCL_CC_PATH=$(wildcard ~/dev/pocl/drops_riscv_cc)
 POCL_RT_PATH=$(wildcard ~/dev/pocl/drops_riscv_rt)
+POCL_RT0_PATH=$(wildcard ~/dev/pocl/drops_riscv_rt0)
 
 VX_RT_PATH=$(wildcard ../../../runtime)
 VX_SIMX_PATH=$(wildcard ../../../simX/obj_dir)
@@ -22,14 +23,16 @@ VX_API  = $(VX_RT_PATH)/vx_api/vx_api.c
 
 VX_SRCS  = $(VX_STR) $(VX_FIO) $(NEWLIB) $(VX_INT) $(VX_IO) $(VX_API) $(VX_TEST)
 
-CXXFLAGS = -g -O0 -nostartfiles -Wl,-Bstatic,-T,$(VX_RT_PATH)/mains/vortex_link.ld -march=rv32im -mabi=ilp32 
+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 += -fno-rtti -fno-non-call-exceptions # disable RTTI and exceptions
 CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sections
 
 LIBS = -lOpenCL
 
-PROJECT=saxpy
+PROJECT=vecadd
 
 all: $(PROJECT).dump $(PROJECT).hex
 
@@ -37,7 +40,10 @@ 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: main.cc lib$(PROJECT).a
-	$(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
+	$(CXX) $(CXXFLAGS) $(VX_CFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf
+
+$(PROJECT).qemu: main.cc lib$(PROJECT).a
+	$(CXX) $(CXXFLAGS) -I$(POCL_RT0_PATH)/include -L$(POCL_RT0_PATH)/lib/static -L. main.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).qemu
 
 $(PROJECT).hex: $(PROJECT).elf
 	$(HEX) -O ihex $(PROJECT).elf $(PROJECT).hex
@@ -45,8 +51,11 @@ $(PROJECT).hex: $(PROJECT).elf
 $(PROJECT).dump: $(PROJECT).elf
 	$(DMP) -D $(PROJECT).elf > $(PROJECT).dump
 
-run:
+run: $(PROJECT).hex
 	$(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
+
 clean:
 	rm -rf *.elf *.dump *.hex *.a *.pocl
diff --git a/benchmarks/opencl/aes/README b/benchmarks/opencl/vecadd/README
similarity index 100%
rename from benchmarks/opencl/aes/README
rename to benchmarks/opencl/vecadd/README
diff --git a/benchmarks/opencl/vecadd/kernel.cl b/benchmarks/opencl/vecadd/kernel.cl
new file mode 100644
index 00000000..16b243d5
--- /dev/null
+++ b/benchmarks/opencl/vecadd/kernel.cl
@@ -0,0 +1,8 @@
+kernel void
+vecadd (__global const int *a,
+	__global const int *b,
+	__global int *c)
+{
+  int gid = get_global_id(0);
+  c[gid] = a[gid] + b[gid];
+}
\ No newline at end of file
diff --git a/benchmarks/opencl/vecadd/libvecadd.a b/benchmarks/opencl/vecadd/libvecadd.a
new file mode 100644
index 00000000..86850f28
Binary files /dev/null and b/benchmarks/opencl/vecadd/libvecadd.a differ
diff --git a/benchmarks/opencl/vecadd/main.cc b/benchmarks/opencl/vecadd/main.cc
new file mode 100644
index 00000000..d70d19a1
--- /dev/null
+++ b/benchmarks/opencl/vecadd/main.cc
@@ -0,0 +1,177 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <CL/opencl.h>
+#include <string.h>
+
+#define MAX_KERNELS 1
+#define KERNEL_NAME "vecadd"
+#define KERNEL_FILE_NAME "vecadd.pocl"
+#define SIZE 4
+#define NUM_WORK_GROUPS 2
+
+#define CL_CHECK(_expr)                                                \
+   do {                                                                \
+     cl_int _err = _expr;                                              \
+     if (_err == CL_SUCCESS)                                           \
+       break;                                                          \
+     printf("OpenCL Error: '%s' returned %d!\n", #_expr, (int)_err);   \
+	 cleanup();			                                                     \
+     exit(-1);                                                         \
+   } while (0)
+
+#define CL_CHECK2(_expr)                                               \
+   ({                                                                  \
+     cl_int _err = CL_INVALID_VALUE;                                   \
+     typeof(_expr) _ret = _expr;                                       \
+     if (_err != CL_SUCCESS) {                                         \
+       printf("OpenCL Error: '%s' returned %d!\n", #_expr, (int)_err); \
+	   cleanup();			                                                   \
+       exit(-1);                                                       \
+     }                                                                 \
+     _ret;                                                             \
+   })
+
+typedef struct {
+  const char* name;
+  const void* pfn;
+  uint32_t num_args;
+  uint32_t num_locals;
+  const uint8_t* arg_types;
+  const uint32_t* local_sizes;
+} kernel_info_t;
+
+static int g_num_kernels = 0;
+static kernel_info_t g_kernels [MAX_KERNELS];
+
+int _pocl_register_kernel(const char* name, const void* pfn, uint32_t num_args, uint32_t num_locals, const uint8_t* arg_types, const uint32_t* local_sizes) {
+  if (g_num_kernels == MAX_KERNELS)
+    return -1;
+  kernel_info_t* kernel = g_kernels + g_num_kernels++;
+  kernel->name = name;
+  kernel->pfn = pfn;
+  kernel->num_args = num_args;
+  kernel->num_locals = num_locals;
+  kernel->arg_types = arg_types;
+  kernel->local_sizes = local_sizes;
+  return 0;
+}
+
+int _pocl_query_kernel(const char* name, const void** p_pfn, uint32_t* p_num_args, uint32_t* p_num_locals, const uint8_t** p_arg_types, const uint32_t** p_local_sizes) {
+  for (int i = 0; i < g_num_kernels; ++i) {
+    kernel_info_t* kernel = g_kernels + i;
+    if (strcmp(kernel->name, name) != 0)
+      continue;
+    if (p_pfn) *p_pfn = kernel->pfn;
+    if (p_num_args) *p_num_args = kernel->num_args;
+    if (p_num_locals) *p_num_locals = kernel->num_locals;
+    if (p_arg_types) *p_arg_types = kernel->arg_types;
+    if (p_local_sizes) *p_local_sizes = kernel->local_sizes;
+    return 0;
+  }
+  return -1;
+}
+
+int exitcode = 0;
+cl_context context = NULL;
+cl_command_queue commandQueue = NULL;
+cl_program program = NULL;
+cl_kernel kernel = NULL;
+cl_mem a_memobj = NULL;
+cl_mem b_memobj = NULL;
+cl_mem c_memobj = NULL;  
+cl_int *A = NULL;
+cl_int *B = NULL;
+cl_int *C = NULL;
+char *binary = NULL;
+
+void cleanup() {
+  if (commandQueue) clReleaseCommandQueue(commandQueue);
+  if (kernel) clReleaseKernel(kernel);
+  if (program) clReleaseProgram(program);
+  if (a_memobj) clReleaseMemObject(a_memobj);
+  if (b_memobj) clReleaseMemObject(b_memobj);
+  if (c_memobj) clReleaseMemObject(c_memobj);  
+  if (context) clReleaseContext(context);
+  if (binary) free(binary);
+  if (A) free(A);
+  if (B) free(B);
+  if (C) free(C);
+}
+
+int main (int argc, char **argv) {  
+  cl_platform_id platform_id;
+  cl_device_id device_id;
+  size_t binary_size;
+  int i;
+  
+  // Getting platform and device information
+  CL_CHECK(clGetPlatformIDs(1, &platform_id, NULL));
+  CL_CHECK(clGetDeviceIDs(platform_id, CL_DEVICE_TYPE_DEFAULT, 1, &device_id, NULL));
+
+  // Creating context.
+  context = CL_CHECK2(clCreateContext(NULL, 1, &device_id, NULL, NULL,  &_err));
+
+  // Memory buffers for each array
+  a_memobj = CL_CHECK2(clCreateBuffer(context, CL_MEM_READ_ONLY, SIZE * sizeof(cl_int), NULL, &_err));
+  b_memobj = CL_CHECK2(clCreateBuffer(context, CL_MEM_READ_ONLY, SIZE * sizeof(cl_int), NULL, &_err));
+  c_memobj = CL_CHECK2(clCreateBuffer(context, CL_MEM_WRITE_ONLY, SIZE * sizeof(cl_int), NULL, &_err));
+
+  // Allocate memories for input arrays and output arrays.  
+  A = (cl_int*)malloc(sizeof(cl_int)*SIZE);
+  B = (cl_int*)malloc(sizeof(cl_int)*SIZE);
+  C = (cl_int*)malloc(sizeof(cl_int)*SIZE);	
+	
+  // Initialize values for array members.  
+  for (i=0; i<SIZE; ++i) {
+    A[i] = i*2+0;
+    B[i] = i*2+1;
+  }
+
+  // Create program from kernel source
+  program = CL_CHECK2(clCreateProgramWithBuiltInKernels(context, 1, &device_id, KERNEL_NAME, &_err));	
+
+  // Build program
+  CL_CHECK(clBuildProgram(program, 1, &device_id, NULL, NULL, NULL));
+  
+  // Create kernel
+  kernel = CL_CHECK2(clCreateKernel(program, KERNEL_NAME, &_err));
+
+  // Set arguments for kernel
+  CL_CHECK(clSetKernelArg(kernel, 0, sizeof(cl_mem), (void *)&a_memobj));	
+  CL_CHECK(clSetKernelArg(kernel, 1, sizeof(cl_mem), (void *)&b_memobj));	
+  CL_CHECK(clSetKernelArg(kernel, 2, sizeof(cl_mem), (void *)&c_memobj));
+
+  // Creating command queue
+  commandQueue = CL_CHECK2(clCreateCommandQueue(context, device_id, 0, &_err));
+
+	// Copy lists to memory buffers
+  CL_CHECK(clEnqueueWriteBuffer(commandQueue, a_memobj, CL_TRUE, 0, SIZE * sizeof(float), A, 0, NULL, NULL));
+  CL_CHECK(clEnqueueWriteBuffer(commandQueue, b_memobj, CL_TRUE, 0, SIZE * sizeof(float), B, 0, NULL, NULL));
+
+  // Execute the kernel
+  size_t globalItemSize = SIZE;
+  size_t localItemSize = SIZE/NUM_WORK_GROUPS;
+  CL_CHECK(clEnqueueNDRangeKernel(commandQueue, kernel, 1, NULL, &globalItemSize, &localItemSize, 0, NULL, NULL));
+  CL_CHECK(clFinish(commandQueue));
+
+  // Read from device back to host.
+  CL_CHECK(clEnqueueReadBuffer(commandQueue, c_memobj, CL_TRUE, 0, SIZE * sizeof(float), C, 0, NULL, NULL));
+
+  // Test if correct answer
+  int exitcode = 0;
+  for (i=0; i<SIZE; ++i) {
+    if (C[i] != (A[i] + B[i])) {
+      printf("Failed!\n");
+      exitcode = 1;
+      break;
+    }
+  }
+  if (i == SIZE) {
+    printf("Ok!\n");
+  }
+
+  // Clean up		
+  cleanup();  
+
+  return exitcode;
+}