Vortex 2.0 changes:

+ Microarchitecture optimizations
+ 64-bit support
+ Xilinx FPGA support
+ LLVM-16 support
+ Refactoring and quality control fixes

minor update

minor update

minor update

minor update

minor update

minor update

cleanup

cleanup

cache bindings and memory perf refactory

minor update

minor update

hw unit tests fixes

minor update

minor update

minor update

minor update

minor update

minor udpate

minor update

minor update

minor update

minor update

minor update

minor update

minor update

minor updates

minor updates

minor update

minor update

minor update

minor update

minor update

minor update

minor updates

minor updates

minor updates

minor updates

minor update

minor update

tests/opencl/stencil/Makefile

@@ -1,70 +1,9 @@
-XLEN ?= 32
-
-RISCV_TOOLCHAIN_PATH ?= $(wildcard ../../../../riscv-gnu-toolchain/drops)
-POCL_CC_PATH ?= $(wildcard ../../../../pocl/drops_riscv_cc)
-POCL_INC_PATH ?= $(wildcard ../include)
-POCL_LIB_PATH ?= $(wildcard ../lib)
-VORTEX_RT_PATH ?= $(wildcard ../../../runtime)
-VX_SIMX_PATH ?= $(wildcard ../../../simx/obj_dir)
-
-CC  = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gcc
-CXX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-g++
-DMP = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-objdump
-HEX = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-objcopy
-GDB = $(RISCV_TOOLCHAIN_PATH)/bin/riscv32-unknown-elf-gdb
-
-VX_SRCS =  $(VORTEX_RT_PATH)/newlib/newlib.c
-VX_SRCS += $(VORTEX_RT_PATH)/startup/vx_start.S
-VX_SRCS += $(VORTEX_RT_PATH)/intrinsics/vx_intrinsics.S
-VX_SRCS += $(VORTEX_RT_PATH)/io/vx_io.S $(VORTEX_RT_PATH)/io/vx_io.c
-VX_SRCS += $(VORTEX_RT_PATH)/fileio/fileio.S
-VX_SRCS += $(VORTEX_RT_PATH)/tests/tests.c
-VX_SRCS += $(VORTEX_RT_PATH)/vx_api/vx_api.c
-
-VX_CFLAGS = -nostartfiles -Wl,-Bstatic,-T,$(VORTEX_RT_PATH)/startup/vx_link$(XLEN).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) -I.
-
-VX_LIBS = -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a
-QEMU_LIBS = $(VORTEX_RT_PATH)/qemu/vx_api.c -Wl,--whole-archive lib$(PROJECT).a -Wl,--no-whole-archive $(POCL_LIB_PATH)/libOpenCL.a
-
 PROJECT = stencil
 
 SRCS = main.cc args.c parboil_opencl.c ocl.c gpu_info.c file.c
-#convert_dataset.c mmio.c 
 
-all: $(PROJECT).dump $(PROJECT).hex
+CXXFLAGS += -I.
 
-lib$(PROJECT).a: kernel.cl
-	POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOLCHAIN_PATH)/lib:$(POCL_CC_PATH)/lib $(POCL_CC_PATH)/bin/poclcc -o lib$(PROJECT).a kernel.cl
+OPTS ?= 
 
-$(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 $(PROJECT).hex -s -b 1> emulator.debug
-
-qemu: $(PROJECT).qemu
-	POCL_DEBUG=all $(RISCV_TOOLCHAIN_PATH)/bin/qemu-riscv32 -d in_asm -D debug.log $(PROJECT).qemu
-
-gdb-s: $(PROJECT).qemu
-	POCL_DEBUG=all $(RISCV_TOOLCHAIN_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
+include ../common.mk

tests/opencl/stencil/main.cc

@@ -44,6 +44,27 @@ static int read_data(float *A0, int nx,int ny,int nz,FILE *fp)
 	return 0;
 }
 
+static int read_kernel_file(const char* filename, uint8_t** data, size_t* size) {
+  if (nullptr == filename || nullptr == data || 0 == size)
+    return CL_INVALID_VALUE;
+
+  FILE* fp = fopen(filename, "r");
+  if (NULL == fp) {
+    fprintf(stderr, "Failed to load kernel.");
+    return CL_INVALID_VALUE;
+  }
+  fseek(fp , 0 , SEEK_END);
+  long fsize = ftell(fp);
+  rewind(fp);
+
+  *data = (uint8_t*)malloc(fsize);
+  *size = fread(*data, 1, fsize, fp);
+  
+  fclose(fp);
+  
+  return CL_SUCCESS;
+}
+
 int main(int argc, char** argv) {
 	struct pb_TimerSet timers;
 	struct pb_Parameters *parameters;
@@ -109,8 +130,6 @@ int main(int argc, char** argv) {
     return -1;
   }
 
-	printf("OK\n");
-
   // okay, let's deliver actual variables
   clPlatform = (cl_platform_id) pb_context->clPlatformId;
   clContext = (cl_context) pb_context->clContext;
@@ -119,14 +138,17 @@ int main(int argc, char** argv) {
 	cl_command_queue clCommandQueue = clCreateCommandQueue(clContext,clDevice,CL_QUEUE_PROFILING_ENABLE,&clStatus);
 	CHECK_ERROR("clCreateCommandQueue")
 
-	printf("OK\n");
-
   	pb_SetOpenCL(&clContext, &clCommandQueue);
 
 	//const char* clSource[] = {readFile("src/opencl_base/kernel.cl")};
 	//cl_program clProgram = clCreateProgramWithSource(clContext,1,clSource,NULL,&clStatus);
-	cl_program clProgram = clCreateProgramWithBuiltInKernels(
-      clContext, 1, &clDevice, "naive_kernel", &clStatus);
+	uint8_t *kernel_bin = NULL;
+	size_t kernel_size;
+	cl_int binary_status = 0;  
+	clStatus = read_kernel_file("kernel.pocl", &kernel_bin, &kernel_size);
+	CHECK_ERROR("read_kernel_file")  
+	cl_program clProgram = clCreateProgramWithBinary(
+		clContext, 1, &clDevice, &kernel_size, (const uint8_t**)&kernel_bin, &binary_status, &clStatus);
 	CHECK_ERROR("clCreateProgramWithSource")
 
 	char clOptions[50];
@@ -232,8 +254,7 @@ int main(int argc, char** argv) {
 	clStatus = clEnqueueReadBuffer(clCommandQueue,d_Anext,CL_TRUE,0,size*sizeof(float),h_Anext,0,NULL,NULL);
 	CHECK_ERROR("clEnqueueReadBuffer")
 
-    	clStatus = clReleaseMemObject(d_A0);
-	clStatus = clReleaseMemObject(d_Anext);
+    clStatus = clReleaseMemObject(d_A0);
 	clStatus = clReleaseKernel(clKernel);
 	clStatus = clReleaseProgram(clProgram);
 	clStatus = clReleaseCommandQueue(clCommandQueue);