cory-master/BabelStream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #51 from Ruyk/master

Browse Source 
Minor SYCL and OpenCL fixes
This commit is contained in:
Tom Deakin 2018-09-14 12:56:07 +01:00 committed by GitHub
commit a88ebd7b38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OCLStream.cpp
View File

@ -186,6 +186,8 @@ OCLStream<T>::~OCLStream()
delete mul_kernel; delete mul_kernel;
delete add_kernel; delete add_kernel;
delete triad_kernel; delete triad_kernel;
devices.clear();
} }
template <class T> template <class T>

14
SYCL.make
View File

@ -1,12 +1,18 @@
COMPUTECPP_FLAGS = $(shell $(COMPUTECPP_PACKAGE_ROOT_DIR)/bin/computecpp_info --dump-device-compiler-flags) COMPUTECPP_FLAGS = $(shell $(COMPUTECPP_PACKAGE_ROOT_DIR)/bin/computecpp_info --dump-device-compiler-flags)
sycl-stream: main.cpp SYCLStream.cpp SYCLStream.sycl sycl-stream: main.o SYCLStream.o SYCLStream.sycl
$(CXX) -O3 -std=c++11 -DSYCL main.cpp SYCLStream.cpp -I$(COMPUTECPP_PACKAGE_ROOT_DIR)/include -include SYCLStream.sycl $(EXTRA_FLAGS) -L$(COMPUTECPP_PACKAGE_ROOT_DIR)/lib -lComputeCpp -lOpenCL -Wl,--rpath=$(COMPUTECPP_PACKAGE_ROOT_DIR)/lib/ -o $@ $(CXX) -O3 -std=c++11 -DSYCL main.o SYCLStream.o $(EXTRA_FLAGS) -L$(COMPUTECPP_PACKAGE_ROOT_DIR)/lib -lComputeCpp -lOpenCL -Wl,--rpath=$(COMPUTECPP_PACKAGE_ROOT_DIR)/lib/ -o $@
main.o: main.cpp
$(CXX) -O3 -std=c++11 -DSYCL main.cpp -c -I$(COMPUTECPP_PACKAGE_ROOT_DIR)/include $(EXTRA_FLAGS) -o $@
SYCLStream.o: SYCLStream.cpp SYCLStream.sycl
$(CXX) -O3 -std=c++11 -DSYCL SYCLStream.cpp -c -I$(COMPUTECPP_PACKAGE_ROOT_DIR)/include -include SYCLStream.sycl $(EXTRA_FLAGS) -o $@
SYCLStream.sycl: SYCLStream.cpp SYCLStream.sycl: SYCLStream.cpp
$(COMPUTECPP_PACKAGE_ROOT_DIR)/bin/compute++ SYCLStream.cpp $(COMPUTECPP_FLAGS) -c -I$(COMPUTECPP_PACKAGE_ROOT_DIR)/include -o $@ $(COMPUTECPP_PACKAGE_ROOT_DIR)/bin/compute++ -DSYCL SYCLStream.cpp $(COMPUTECPP_FLAGS) -c -I$(COMPUTECPP_PACKAGE_ROOT_DIR)/include -o $@
.PHONY: clean .PHONY: clean
clean: clean:
rm -f sycl-stream SYCLStream.sycl SYCLStream.bc rm -f sycl-stream SYCLStream.sycl main.o SYCLStream.o

2
SYCLStream.cpp
View File

@ -94,6 +94,7 @@ SYCLStream<T>::~SYCLStream()
delete p; delete p;
delete queue; delete queue;
devices.clear();
} }
template <class T> template <class T>
@ -322,7 +323,6 @@ std::string getDeviceDriver(const int device)
return driver; return driver;
} }
// TODO: Fix kernel names to allow multiple template specializations // TODO: Fix kernel names to allow multiple template specializations
template class SYCLStream<float>; template class SYCLStream<float>;
template class SYCLStream<double>; template class SYCLStream<double>;