wu-arch/vortex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed OpenCL kernels

Browse Source
This commit is contained in:
Blaise Tine
2020-06-27 19:28:00 -04:00
parent baf7d3bb92
commit d42016840b
32 changed files with 103666 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1712
benchmarks/opencl/bfs/BFS_1.dump Normal file
View File

File diff suppressed because it is too large Load Diff

1586
benchmarks/opencl/bfs/BFS_2.dump Normal file
View File

File diff suppressed because it is too large Load Diff

3
benchmarks/opencl/bfs/Makefile
View File

@@ -1,6 +1,7 @@
LLVM_HOME ?= ~/dev/llvm-project/drops LLVM_HOME ?= ~/dev/llvm-project/drops
RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf
POCL_CC_PATH ?= $(realpath ../compiler) POCL_CC_PATH ?= $(realpath ../compiler)
POCL_RT_PATH ?= $(realpath ../runtime) POCL_RT_PATH ?= $(realpath ../runtime)
VORTEX_DRV_PATH ?= $(realpath ../../../driver) VORTEX_DRV_PATH ?= $(realpath ../../../driver)
@@ -40,7 +41,7 @@ run-rtlsim: $(PROJECT) kernel.pocl
$(CXX) $(CXXFLAGS) -MM $^ > .depend; $(CXX) $(CXXFLAGS) -MM $^ > .depend;
clean: clean:
rm -rf $(PROJECT) *.o *.dump .depend rm -rf $(PROJECT) *.o .depend
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
-include .depend -include .depend

BIN
benchmarks/opencl/bfs/kernel.pocl
View File

Binary file not shown.

BIN
benchmarks/opencl/compiler/lib/libOpenCL.so.2.5.0
View File

Binary file not shown.

15
benchmarks/opencl/convolution/Makefile
View File

@@ -1,6 +1,7 @@
LLVM_HOME ?= ~/dev/llvm-project/drops LLVM_HOME ?= ~/dev/llvm-project/drops
RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf
POCL_CC_PATH ?= $(realpath ../compiler) POCL_CC_PATH ?= $(realpath ../compiler)
POCL_RT_PATH ?= $(realpath ../runtime) POCL_RT_PATH ?= $(realpath ../runtime)
VORTEX_DRV_PATH ?= $(realpath ../../../driver) VORTEX_DRV_PATH ?= $(realpath ../../../driver)
@@ -8,9 +9,9 @@ VORTEX_RT_PATH ?= $(realpath ../../../runtime)
CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors
CXXFLAGS += -I$(POCLRT_PATH)/include CXXFLAGS += -I$(POCL_RT_PATH)/include
LDFLAGS += -L$(POCLRT_PATH)/lib -L$(DRIVER_PATH)/simx -lOpenCL -lvortex LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(DRIVER_PATH)/simx -lOpenCL -lvortex
PROJECT = convolution PROJECT = convolution
@@ -25,22 +26,22 @@ $(PROJECT): $(SRCS)
$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@ $(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
run-fpga: $(PROJECT) kernel.pocl run-fpga: $(PROJECT) kernel.pocl
LD_LIBRARY_PATH=$(POCLRT_PATH)/lib:$(DRIVER_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(DRIVER_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
run-ase: $(PROJECT) kernel.pocl run-ase: $(PROJECT) kernel.pocl
LD_LIBRARY_PATH=$(POCLRT_PATH)/lib:$(DRIVER_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(DRIVER_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
run-simx: $(PROJECT) kernel.pocl run-simx: $(PROJECT) kernel.pocl
LD_LIBRARY_PATH=$(POCLRT_PATH)/lib:$(DRIVER_PATH)/simx:$(LD_LIBRARY_PATH) ./$(PROJECT) LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(DRIVER_PATH)/simx:$(LD_LIBRARY_PATH) ./$(PROJECT)
run-rtlsim: $(PROJECT) kernel.pocl run-rtlsim: $(PROJECT) kernel.pocl
LD_LIBRARY_PATH=$(POCLRT_PATH)/lib:$(DRIVER_PATH)/rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(DRIVER_PATH)/rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT)
.depend: $(SRCS) .depend: $(SRCS)
$(CXX) $(CXXFLAGS) -MM $^ > .depend; $(CXX) $(CXXFLAGS) -MM $^ > .depend;
clean: clean:
rm -rf $(PROJECT) *.o *.dump .depend rm -rf $(PROJECT) *.o .depend
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
-include .depend -include .depend

9102
benchmarks/opencl/guassian/Fan1.dump Normal file
View File

File diff suppressed because it is too large Load Diff

12618
benchmarks/opencl/guassian/Fan2.dump Normal file
View File

File diff suppressed because it is too large Load Diff

3
benchmarks/opencl/guassian/Makefile
View File

@@ -1,6 +1,7 @@
LLVM_HOME ?= ~/dev/llvm-project/drops LLVM_HOME ?= ~/dev/llvm-project/drops
RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf
POCL_CC_PATH ?= $(realpath ../compiler) POCL_CC_PATH ?= $(realpath ../compiler)
POCL_RT_PATH ?= $(realpath ../runtime) POCL_RT_PATH ?= $(realpath ../runtime)
VORTEX_DRV_PATH ?= $(realpath ../../../driver) VORTEX_DRV_PATH ?= $(realpath ../../../driver)
@@ -40,7 +41,7 @@ run-rtlsim: $(PROJECT) kernel.pocl
$(CXX) $(CXXFLAGS) -MM $^ > .depend; $(CXX) $(CXXFLAGS) -MM $^ > .depend;
clean: clean:
rm -rf $(PROJECT) *.o *.dump .depend rm -rf $(PROJECT) *.o .depend
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
-include .depend -include .depend

BIN
benchmarks/opencl/guassian/kernel.pocl
View File

Binary file not shown.

3
benchmarks/opencl/kmeans/Makefile
View File

@@ -1,6 +1,7 @@
LLVM_HOME ?= ~/dev/llvm-project/drops LLVM_HOME ?= ~/dev/llvm-project/drops
RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf
POCL_CC_PATH ?= $(realpath ../compiler) POCL_CC_PATH ?= $(realpath ../compiler)
POCL_RT_PATH ?= $(realpath ../runtime) POCL_RT_PATH ?= $(realpath ../runtime)
VORTEX_DRV_PATH ?= $(realpath ../../../driver) VORTEX_DRV_PATH ?= $(realpath ../../../driver)
@@ -40,7 +41,7 @@ run-rtlsim: $(PROJECT) kernel.pocl
$(CXX) $(CXXFLAGS) -MM $^ > .depend; $(CXX) $(CXXFLAGS) -MM $^ > .depend;
clean: clean:
rm -rf $(PROJECT) *.o *.dump .depend rm -rf $(PROJECT) *.o .depend
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
-include .depend -include .depend

BIN
benchmarks/opencl/kmeans/kernel.pocl
View File

Binary file not shown.

18003
benchmarks/opencl/kmeans/kmeans_kernel_c.dump Normal file
View File

File diff suppressed because it is too large Load Diff

1653
benchmarks/opencl/kmeans/kmeans_swap.dump Normal file
View File

File diff suppressed because it is too large Load Diff

3
benchmarks/opencl/nearn/Makefile
View File

@@ -1,6 +1,7 @@
LLVM_HOME ?= ~/dev/llvm-project/drops LLVM_HOME ?= ~/dev/llvm-project/drops
RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf
POCL_CC_PATH ?= $(realpath ../compiler) POCL_CC_PATH ?= $(realpath ../compiler)
POCL_RT_PATH ?= $(realpath ../runtime) POCL_RT_PATH ?= $(realpath ../runtime)
VORTEX_DRV_PATH ?= $(realpath ../../../driver) VORTEX_DRV_PATH ?= $(realpath ../../../driver)
@@ -40,7 +41,7 @@ run-rtlsim: $(PROJECT) kernel.pocl
$(CXX) $(CXXFLAGS) -MM $^ > .depend; $(CXX) $(CXXFLAGS) -MM $^ > .depend;
clean: clean:
rm -rf $(PROJECT) *.o *.dump .depend rm -rf $(PROJECT) *.o .depend
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
-include .depend -include .depend

20411
benchmarks/opencl/nearn/NearestNeighbor.dump Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
benchmarks/opencl/nearn/kernel.pocl
View File

Binary file not shown.

3
benchmarks/opencl/saxpy/Makefile
View File

@@ -1,6 +1,7 @@
LLVM_HOME ?= ~/dev/llvm-project/drops LLVM_HOME ?= ~/dev/llvm-project/drops
RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf
POCL_CC_PATH ?= $(realpath ../compiler) POCL_CC_PATH ?= $(realpath ../compiler)
POCL_RT_PATH ?= $(realpath ../runtime) POCL_RT_PATH ?= $(realpath ../runtime)
VORTEX_DRV_PATH ?= $(realpath ../../../driver) VORTEX_DRV_PATH ?= $(realpath ../../../driver)
@@ -40,7 +41,7 @@ run-rtlsim: $(PROJECT) kernel.pocl
$(CXX) $(CXXFLAGS) -MM $^ > .depend; $(CXX) $(CXXFLAGS) -MM $^ > .depend;
clean: clean:
rm -rf $(PROJECT) *.o *.dump .depend rm -rf $(PROJECT) *.o .depend
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
-include .depend -include .depend

BIN
benchmarks/opencl/saxpy/kernel.pocl
View File

Binary file not shown.

12114
benchmarks/opencl/saxpy/saxpy.dump Normal file
View File

File diff suppressed because it is too large Load Diff

3
benchmarks/opencl/sfilter/Makefile
View File

@@ -1,6 +1,7 @@
LLVM_HOME ?= ~/dev/llvm-project/drops LLVM_HOME ?= ~/dev/llvm-project/drops
RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf
POCL_CC_PATH ?= $(realpath ../compiler) POCL_CC_PATH ?= $(realpath ../compiler)
POCL_RT_PATH ?= $(realpath ../runtime) POCL_RT_PATH ?= $(realpath ../runtime)
VORTEX_DRV_PATH ?= $(realpath ../../../driver) VORTEX_DRV_PATH ?= $(realpath ../../../driver)
@@ -40,7 +41,7 @@ run-rtlsim: $(PROJECT) kernel.pocl
$(CXX) $(CXXFLAGS) -MM $^ > .depend; $(CXX) $(CXXFLAGS) -MM $^ > .depend;
clean: clean:
rm -rf $(PROJECT) *.o *.dump .depend rm -rf $(PROJECT) *.o .depend
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
-include .depend -include .depend

BIN
benchmarks/opencl/sfilter/kernel.pocl
View File

Binary file not shown.

12656
benchmarks/opencl/sfilter/sfilter.dump Normal file
View File

File diff suppressed because it is too large Load Diff

3
benchmarks/opencl/sgemm/Makefile
View File

@@ -1,6 +1,7 @@
LLVM_HOME ?= ~/dev/llvm-project/drops LLVM_HOME ?= ~/dev/llvm-project/drops
RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf
POCL_CC_PATH ?= $(realpath ../compiler) POCL_CC_PATH ?= $(realpath ../compiler)
POCL_RT_PATH ?= $(realpath ../runtime) POCL_RT_PATH ?= $(realpath ../runtime)
VORTEX_DRV_PATH ?= $(realpath ../../../driver) VORTEX_DRV_PATH ?= $(realpath ../../../driver)
@@ -40,7 +41,7 @@ run-rtlsim: $(PROJECT) kernel.pocl
$(CXX) $(CXXFLAGS) -MM $^ > .depend; $(CXX) $(CXXFLAGS) -MM $^ > .depend;
clean: clean:
rm -rf $(PROJECT) *.o *.dump .depend rm -rf $(PROJECT) *.o .depend
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
-include .depend -include .depend

BIN
benchmarks/opencl/sgemm/kernel.pocl
View File

Binary file not shown.

BIN
benchmarks/opencl/sgemm/sgemm
View File

Binary file not shown.

12223
benchmarks/opencl/sgemm/sgemm.dump Normal file
View File

File diff suppressed because it is too large Load Diff

15
benchmarks/opencl/transpose/Makefile
View File

@@ -1,6 +1,7 @@
LLVM_HOME ?= ~/dev/llvm-project/drops LLVM_HOME ?= ~/dev/llvm-project/drops
RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops RISCV_TOOLCHAIN_PATH ?= ~/dev/riscv-gnu-toolchain/drops
SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf SYSROOT ?= $(RISCV_TOOLCHAIN_PATH)/riscv32-unknown-elf
POCL_CC_PATH ?= $(realpath ../compiler) POCL_CC_PATH ?= $(realpath ../compiler)
POCL_RT_PATH ?= $(realpath ../runtime) POCL_RT_PATH ?= $(realpath ../runtime)
VORTEX_DRV_PATH ?= $(realpath ../../../driver) VORTEX_DRV_PATH ?= $(realpath ../../../driver)
@@ -8,9 +9,9 @@ VORTEX_RT_PATH ?= $(realpath ../../../runtime)
CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors
CXXFLAGS += -I$(POCLRT_PATH)/include CXXFLAGS += -I$(POCL_RT_PATH)/include
LDFLAGS += -L$(POCLRT_PATH)/lib -L$(DRIVER_PATH)/simx -lOpenCL -lvortex LDFLAGS += -L$(POCL_RT_PATH)/lib -L$(VORTEX_DRV_PATH)/stub -lOpenCL -lvortex
PROJECT = transpose PROJECT = transpose
@@ -25,22 +26,22 @@ $(PROJECT): $(SRCS)
$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@ $(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@
run-fpga: $(PROJECT) kernel.pocl run-fpga: $(PROJECT) kernel.pocl
LD_LIBRARY_PATH=$(POCLRT_PATH)/lib:$(DRIVER_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT) LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae:$(LD_LIBRARY_PATH) ./$(PROJECT)
run-ase: $(PROJECT) kernel.pocl run-ase: $(PROJECT) kernel.pocl
LD_LIBRARY_PATH=$(POCLRT_PATH)/lib:$(DRIVER_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT) ASE_LOG=0 LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/opae/ase:$(LD_LIBRARY_PATH) ./$(PROJECT)
run-simx: $(PROJECT) kernel.pocl run-simx: $(PROJECT) kernel.pocl
LD_LIBRARY_PATH=$(POCLRT_PATH)/lib:$(DRIVER_PATH)/simx:$(LD_LIBRARY_PATH) ./$(PROJECT) LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/simx:$(LD_LIBRARY_PATH) ./$(PROJECT)
run-rtlsim: $(PROJECT) kernel.pocl run-rtlsim: $(PROJECT) kernel.pocl
LD_LIBRARY_PATH=$(POCLRT_PATH)/lib:$(DRIVER_PATH)/rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT) LD_LIBRARY_PATH=$(POCL_RT_PATH)/lib:$(VORTEX_DRV_PATH)/rtlsim:$(LD_LIBRARY_PATH) ./$(PROJECT)
.depend: $(SRCS) .depend: $(SRCS)
$(CXX) $(CXXFLAGS) -MM $^ > .depend; $(CXX) $(CXXFLAGS) -MM $^ > .depend;
clean: clean:
rm -rf $(PROJECT) *.o *.dump .depend rm -rf $(PROJECT) *.o .depend
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
-include .depend -include .depend

2
benchmarks/opencl/vecadd/Makefile
View File

@@ -41,7 +41,7 @@ run-rtlsim: $(PROJECT) kernel.pocl
$(CXX) $(CXXFLAGS) -MM $^ > .depend; $(CXX) $(CXXFLAGS) -MM $^ > .depend;
clean: clean:
rm -rf $(PROJECT) *.o *.dump .depend rm -rf $(PROJECT) *.o .depend
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
-include .depend -include .depend

BIN
benchmarks/opencl/vecadd/kernel.pocl
View File

Binary file not shown.

1554
benchmarks/opencl/vecadd/vecadd.dump Normal file
View File

File diff suppressed because it is too large Load Diff

6
driver/tests/demo/Makefile
View File

@@ -23,10 +23,10 @@ SRCS = demo.cpp
all: $(PROJECT) kernel.bin kernel.dump all: $(PROJECT) kernel.bin kernel.dump
kernel.dump: kernel.elf kernel.dump: kernel.elf
$(VX_DP) -D kernel.elf > kernel.dump $(VX_DP) -D kernel.elf > kernel.dump
kernel.bin: kernel.elf kernel.bin: kernel.elf
$(VX_CP) -O binary kernel.elf kernel.bin $(VX_CP) -O binary kernel.elf kernel.bin
kernel.elf: $(VX_SRCS) kernel.elf: $(VX_SRCS)