From d77a7e98a88528e267239df585dfcb48fb7a2c55 Mon Sep 17 00:00:00 2001 From: Blaise Tine Date: Fri, 22 Nov 2019 00:15:34 -0500 Subject: [PATCH 1/3] kmeans benchmark --- benchmarks/opencl/aes/Makefile | 4 ++-- benchmarks/opencl/bfs/Makefile | 2 +- benchmarks/opencl/fft/Makefile | 4 ++-- benchmarks/opencl/hotspot/Makefile | 4 ++-- benchmarks/opencl/kmeans/Makefile | 6 +++--- benchmarks/opencl/sort/Makefile | 4 ++-- benchmarks/opencl/spmv/Makefile | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/benchmarks/opencl/aes/Makefile b/benchmarks/opencl/aes/Makefile index 5ad87059..7e10d5fe 100644 --- a/benchmarks/opencl/aes/Makefile +++ b/benchmarks/opencl/aes/Makefile @@ -34,7 +34,7 @@ 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 kernel.pocl 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 @@ -49,4 +49,4 @@ 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 + rm -rf *.elf *.dump *.hex *.a *.pocl *.o diff --git a/benchmarks/opencl/bfs/Makefile b/benchmarks/opencl/bfs/Makefile index 0472f69f..ad748266 100644 --- a/benchmarks/opencl/bfs/Makefile +++ b/benchmarks/opencl/bfs/Makefile @@ -37,7 +37,7 @@ 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) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc timer.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 diff --git a/benchmarks/opencl/fft/Makefile b/benchmarks/opencl/fft/Makefile index 5ad87059..7e10d5fe 100644 --- a/benchmarks/opencl/fft/Makefile +++ b/benchmarks/opencl/fft/Makefile @@ -34,7 +34,7 @@ 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 kernel.pocl 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 @@ -49,4 +49,4 @@ 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 + rm -rf *.elf *.dump *.hex *.a *.pocl *.o diff --git a/benchmarks/opencl/hotspot/Makefile b/benchmarks/opencl/hotspot/Makefile index 5ad87059..7e10d5fe 100644 --- a/benchmarks/opencl/hotspot/Makefile +++ b/benchmarks/opencl/hotspot/Makefile @@ -34,7 +34,7 @@ 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 kernel.pocl 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 @@ -49,4 +49,4 @@ 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 + rm -rf *.elf *.dump *.hex *.a *.pocl *.o diff --git a/benchmarks/opencl/kmeans/Makefile b/benchmarks/opencl/kmeans/Makefile index 5ad87059..8cd607fe 100644 --- a/benchmarks/opencl/kmeans/Makefile +++ b/benchmarks/opencl/kmeans/Makefile @@ -29,15 +29,15 @@ CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sectio LIBS = -lOpenCL -PROJECT=saxpy +PROJECT=kmeans 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 kernel.pocl 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) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc rmse.c read_input.c cluster.c kmeans_clustering.c -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf $(PROJECT).hex: $(PROJECT).elf $(HEX) -O ihex $(PROJECT).elf $(PROJECT).hex diff --git a/benchmarks/opencl/sort/Makefile b/benchmarks/opencl/sort/Makefile index 5ad87059..7e10d5fe 100644 --- a/benchmarks/opencl/sort/Makefile +++ b/benchmarks/opencl/sort/Makefile @@ -34,7 +34,7 @@ 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 kernel.pocl 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 @@ -49,4 +49,4 @@ 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 + rm -rf *.elf *.dump *.hex *.a *.pocl *.o diff --git a/benchmarks/opencl/spmv/Makefile b/benchmarks/opencl/spmv/Makefile index 5ad87059..12aad1c4 100644 --- a/benchmarks/opencl/spmv/Makefile +++ b/benchmarks/opencl/spmv/Makefile @@ -34,7 +34,7 @@ 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 kernel.pocl 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 From b583e206a274547242ff2e4a9df530652f3bd686 Mon Sep 17 00:00:00 2001 From: "Lyons, Ethan Tyler" Date: Fri, 22 Nov 2019 09:20:20 -0500 Subject: [PATCH 2/3] Fixed GPR Stage to be Generic when ASIC is defined --- rtl/VX_gpr_stage.v | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rtl/VX_gpr_stage.v b/rtl/VX_gpr_stage.v index 89316cbb..3d556a83 100644 --- a/rtl/VX_gpr_stage.v +++ b/rtl/VX_gpr_stage.v @@ -116,7 +116,7 @@ module VX_gpr_stage ( wire store_curr_real = !delayed_lsu_last_cycle && stall_lsu; - VX_generic_register #(.N(256)) lsu_data( + VX_generic_register #(.N(`NT*32*2)) lsu_data( .clk (clk), .reset(reset), .stall(!store_curr_real), @@ -133,7 +133,7 @@ module VX_gpr_stage ( assign VX_lsu_req.base_address = (delayed_lsu_last_cycle) ? temp_base_address : real_base_address; - VX_generic_register #(.N(77 + `NW_M1 + 65*(1 + `NT))) lsu_reg( + VX_generic_register #(.N(77 + `NW_M1 + 1 + (`NT))) lsu_reg( .clk (clk), .reset(reset), .stall(stall_lsu), @@ -142,7 +142,7 @@ module VX_gpr_stage ( .out ({VX_lsu_req.valid , VX_lsu_req.lsu_pc ,VX_lsu_req.warp_num , VX_lsu_req.offset , VX_lsu_req.mem_read , VX_lsu_req.mem_write , VX_lsu_req.rd , VX_lsu_req.wb }) ); - VX_generic_register #(.N(224 + `NW_M1 + 1 + 65*(`NT))) exec_unit_reg( + VX_generic_register #(.N(224 + `NW_M1 + 1 + (`NT))) exec_unit_reg( .clk (clk), .reset(reset), .stall(stall_rest), @@ -154,7 +154,7 @@ module VX_gpr_stage ( assign VX_exec_unit_req.a_reg_data = real_base_address; assign VX_exec_unit_req.b_reg_data = real_store_data; - VX_generic_register #(.N(68 + `NW_M1 + 1 + 33*(`NT))) gpu_inst_reg( + VX_generic_register #(.N(36 + `NW_M1 + 1 + (`NT))) gpu_inst_reg( .clk (clk), .reset(reset), .stall(stall_rest), From 728e9a71b34499fb31040b2f7cff38384fc15bf8 Mon Sep 17 00:00:00 2001 From: Blaise Tine Date: Fri, 22 Nov 2019 12:30:21 -0500 Subject: [PATCH 3/3] update --- benchmarks/opencl/aes/Makefile | 10 +--------- benchmarks/opencl/bfs/Makefile | 4 ---- benchmarks/opencl/fft/Makefile | 10 +--------- benchmarks/opencl/hotspot/Makefile | 8 -------- benchmarks/opencl/kmeans/Makefile | 10 ---------- benchmarks/opencl/sort/Makefile | 8 -------- benchmarks/opencl/spmv/Makefile | 4 ---- rtl/VX_define.v | 5 ----- syn/esyn.tcl | 4 ---- 9 files changed, 2 insertions(+), 61 deletions(-) diff --git a/benchmarks/opencl/aes/Makefile b/benchmarks/opencl/aes/Makefile index 3ea71be6..47711c90 100644 --- a/benchmarks/opencl/aes/Makefile +++ b/benchmarks/opencl/aes/Makefile @@ -34,11 +34,7 @@ PROJECT=saxpy all: $(PROJECT).dump $(PROJECT).hex lib$(PROJECT).a: kernel.cl -<<<<<<< HEAD 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 -======= - 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 kernel.pocl kernel.cl ->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798 $(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 @@ -53,8 +49,4 @@ run: $(VX_SIMX_PATH)/Vcache_simX -E -a rv32i --core $(PROJECT).hex -s -b 1> emulator.debug clean: -<<<<<<< HEAD - rm -rf *.elf *.dump *.hex *.a *.pocl *.o -======= - rm -rf *.elf *.dump *.hex *.a *.pocl ->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798 + rm -rf *.elf *.dump *.hex *.a *.pocl *.o \ No newline at end of file diff --git a/benchmarks/opencl/bfs/Makefile b/benchmarks/opencl/bfs/Makefile index e9d36202..ad748266 100644 --- a/benchmarks/opencl/bfs/Makefile +++ b/benchmarks/opencl/bfs/Makefile @@ -37,11 +37,7 @@ 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 -<<<<<<< HEAD $(CXX) $(CXXFLAGS) -I$(POCL_RT_PATH)/include -L$(POCL_RT_PATH)/lib/static -L. $(VX_SRCS) main.cc timer.cc -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf -======= - $(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 ->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798 $(PROJECT).hex: $(PROJECT).elf $(HEX) -O ihex $(PROJECT).elf $(PROJECT).hex diff --git a/benchmarks/opencl/fft/Makefile b/benchmarks/opencl/fft/Makefile index 3ea71be6..47711c90 100644 --- a/benchmarks/opencl/fft/Makefile +++ b/benchmarks/opencl/fft/Makefile @@ -34,11 +34,7 @@ PROJECT=saxpy all: $(PROJECT).dump $(PROJECT).hex lib$(PROJECT).a: kernel.cl -<<<<<<< HEAD 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 -======= - 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 kernel.pocl kernel.cl ->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798 $(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 @@ -53,8 +49,4 @@ run: $(VX_SIMX_PATH)/Vcache_simX -E -a rv32i --core $(PROJECT).hex -s -b 1> emulator.debug clean: -<<<<<<< HEAD - rm -rf *.elf *.dump *.hex *.a *.pocl *.o -======= - rm -rf *.elf *.dump *.hex *.a *.pocl ->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798 + rm -rf *.elf *.dump *.hex *.a *.pocl *.o \ No newline at end of file diff --git a/benchmarks/opencl/hotspot/Makefile b/benchmarks/opencl/hotspot/Makefile index 3ea71be6..7e10d5fe 100644 --- a/benchmarks/opencl/hotspot/Makefile +++ b/benchmarks/opencl/hotspot/Makefile @@ -34,11 +34,7 @@ PROJECT=saxpy all: $(PROJECT).dump $(PROJECT).hex lib$(PROJECT).a: kernel.cl -<<<<<<< HEAD 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 -======= - 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 kernel.pocl kernel.cl ->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798 $(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 @@ -53,8 +49,4 @@ run: $(VX_SIMX_PATH)/Vcache_simX -E -a rv32i --core $(PROJECT).hex -s -b 1> emulator.debug clean: -<<<<<<< HEAD rm -rf *.elf *.dump *.hex *.a *.pocl *.o -======= - rm -rf *.elf *.dump *.hex *.a *.pocl ->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798 diff --git a/benchmarks/opencl/kmeans/Makefile b/benchmarks/opencl/kmeans/Makefile index 73034561..ef4d8ecc 100644 --- a/benchmarks/opencl/kmeans/Makefile +++ b/benchmarks/opencl/kmeans/Makefile @@ -29,26 +29,16 @@ CXXFLAGS += -Wl,--gc-sections # enable garbage collection of unused input sectio LIBS = -lOpenCL -<<<<<<< HEAD PROJECT=kmeans -======= PROJECT=saxpy ->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798 all: $(PROJECT).dump $(PROJECT).hex lib$(PROJECT).a: kernel.cl -<<<<<<< HEAD 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 rmse.c read_input.c cluster.c kmeans_clustering.c -Wl,--whole-archive -l$(PROJECT) -Wl,--no-whole-archive $(LIBS) -o $(PROJECT).elf -======= - 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 kernel.pocl 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 ->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798 $(PROJECT).hex: $(PROJECT).elf $(HEX) -O ihex $(PROJECT).elf $(PROJECT).hex diff --git a/benchmarks/opencl/sort/Makefile b/benchmarks/opencl/sort/Makefile index 3ea71be6..7e10d5fe 100644 --- a/benchmarks/opencl/sort/Makefile +++ b/benchmarks/opencl/sort/Makefile @@ -34,11 +34,7 @@ PROJECT=saxpy all: $(PROJECT).dump $(PROJECT).hex lib$(PROJECT).a: kernel.cl -<<<<<<< HEAD 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 -======= - 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 kernel.pocl kernel.cl ->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798 $(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 @@ -53,8 +49,4 @@ run: $(VX_SIMX_PATH)/Vcache_simX -E -a rv32i --core $(PROJECT).hex -s -b 1> emulator.debug clean: -<<<<<<< HEAD rm -rf *.elf *.dump *.hex *.a *.pocl *.o -======= - rm -rf *.elf *.dump *.hex *.a *.pocl ->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798 diff --git a/benchmarks/opencl/spmv/Makefile b/benchmarks/opencl/spmv/Makefile index f6895a96..12aad1c4 100644 --- a/benchmarks/opencl/spmv/Makefile +++ b/benchmarks/opencl/spmv/Makefile @@ -34,11 +34,7 @@ PROJECT=saxpy all: $(PROJECT).dump $(PROJECT).hex lib$(PROJECT).a: kernel.cl -<<<<<<< HEAD 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 -======= - 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 kernel.pocl kernel.cl ->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798 $(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 diff --git a/rtl/VX_define.v b/rtl/VX_define.v index 02bc5926..b40567f8 100644 --- a/rtl/VX_define.v +++ b/rtl/VX_define.v @@ -11,13 +11,8 @@ // `define ONLY // `define SYN 1 -<<<<<<< HEAD -//`define ASIC 1 -//`define SYN_FUNC 1 -======= // `define ASIC 1 // `define SYN_FUNC 1 ->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798 `define NUM_BARRIERS 4 diff --git a/syn/esyn.tcl b/syn/esyn.tcl index 522fb262..10fa09d9 100644 --- a/syn/esyn.tcl +++ b/syn/esyn.tcl @@ -37,11 +37,7 @@ uniquify define_name_rules verilog -remove_internal_net_bus -remove_port_bus change_names -rule verilog -hierarchy -<<<<<<< HEAD -report_qor -======= # report_qor ->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798 report_area report_hierarchy report_cell