diff --git a/benchmarks/new_opencl/convolution/.gitignore b/benchmarks/new_opencl/convolution/.gitignore new file mode 100644 index 00000000..7c2677b5 --- /dev/null +++ b/benchmarks/new_opencl/convolution/.gitignore @@ -0,0 +1 @@ +convolution diff --git a/benchmarks/new_opencl/convolution/Makefile b/benchmarks/new_opencl/convolution/Makefile index 512dfd0e..7d8df9a4 100644 --- a/benchmarks/new_opencl/convolution/Makefile +++ b/benchmarks/new_opencl/convolution/Makefile @@ -1,6 +1,6 @@ -RISCV_TOOL_PATH ?= $(wildcard ~/dev/riscv-gnu-toolchain/drops) -POCLCC_PATH ?= $(wildcard ~/dev/pocl/drops_vortex_cc) -POCLRT_PATH ?= $(wildcard ..) +LLVM_LIB_PATH ?= $(wildcard ~/dev/riscv-gnu-toolchain/drops/lib) +POCLCC_PATH ?= $(wildcard ../compiler) +POCLRT_PATH ?= $(wildcard ../runtime) DRIVER_PATH ?= $(wildcard ../../../driver/sw) CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors @@ -16,7 +16,7 @@ SRCS = main.cpp utils.cpp all: $(PROJECT) kernel.pocl: kernel.cl - POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCLCC_PATH)/lib:$(DRIVER_PATH)/simx $(POCLCC_PATH)/bin/poclcc -o kernel.pocl kernel.cl + POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(LLVM_LIB_PATH):$(POCLCC_PATH)/lib:$(DRIVER_PATH)/simx $(POCLCC_PATH)/bin/poclcc -o kernel.pocl kernel.cl $(PROJECT): $(SRCS) $(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@ @@ -41,4 +41,4 @@ clean: ifneq ($(MAKECMDGOALS),clean) -include .depend -endif \ No newline at end of file +endif diff --git a/benchmarks/new_opencl/kmeans/kmeans b/benchmarks/new_opencl/kmeans/kmeans deleted file mode 100755 index 6d3ca905..00000000 Binary files a/benchmarks/new_opencl/kmeans/kmeans and /dev/null differ diff --git a/benchmarks/new_opencl/transpose/Makefile b/benchmarks/new_opencl/transpose/Makefile index 4092ed9f..ad0f274b 100644 --- a/benchmarks/new_opencl/transpose/Makefile +++ b/benchmarks/new_opencl/transpose/Makefile @@ -1,6 +1,6 @@ -RISCV_TOOL_PATH ?= $(wildcard ~/dev/riscv-gnu-toolchain/drops) -POCLCC_PATH ?= $(wildcard ~/dev/pocl/drops_vortex_cc) -POCLRT_PATH ?= $(wildcard ..) +LLVM_LIB_PATH ?= $(wildcard ~/dev/riscv-gnu-toolchain/drops/lib) +POCLCC_PATH ?= $(wildcard ../compiler) +POCLRT_PATH ?= $(wildcard ../runtime) DRIVER_PATH ?= $(wildcard ../../../driver/sw) CXXFLAGS += -std=c++11 -O0 -g -fpermissive -Wall -Wextra -pedantic -Wfatal-errors @@ -16,7 +16,7 @@ SRCS = main.cc transpose_gold.cpp all: $(PROJECT) kernel.pocl: kernel.cl - POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(RISCV_TOOL_PATH)/lib:$(POCLCC_PATH)/lib:$(DRIVER_PATH)/simx $(POCLCC_PATH)/bin/poclcc -o kernel.pocl kernel.cl + POCL_DEBUG=all POCL_DEBUG_LLVM_PASSES=1 LD_LIBRARY_PATH=$(LLVM_LIB_PATH):$(POCLCC_PATH)/lib:$(DRIVER_PATH)/simx $(POCLCC_PATH)/bin/poclcc -o kernel.pocl kernel.cl $(PROJECT): $(SRCS) $(CXX) $(CXXFLAGS) $^ $(LDFLAGS) -o $@ @@ -41,4 +41,4 @@ clean: ifneq ($(MAKECMDGOALS),clean) -include .depend -endif \ No newline at end of file +endif