From 548ed30a1cd2d6a92fac270c647069cc3e34e0e0 Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Mon, 19 Dec 2016 18:56:26 -0800 Subject: [PATCH 1/3] Added an OpenCL regression test --- unsupported/test/cxx11_tensor_sycl.cpp | 44 ++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/unsupported/test/cxx11_tensor_sycl.cpp b/unsupported/test/cxx11_tensor_sycl.cpp index 4e17a7328..d5c0cbaad 100644 --- a/unsupported/test/cxx11_tensor_sycl.cpp +++ b/unsupported/test/cxx11_tensor_sycl.cpp @@ -26,6 +26,7 @@ using Eigen::array; using Eigen::SyclDevice; using Eigen::Tensor; using Eigen::TensorMap; + template void test_sycl_mem_transfers(const Eigen::SyclDevice &sycl_device) { int sizeDim1 = 100; @@ -52,6 +53,7 @@ void test_sycl_mem_transfers(const Eigen::SyclDevice &sycl_device) { sycl_device.memcpyDeviceToHost(out1.data(), gpu_data1,(out1.size())*sizeof(DataType)); sycl_device.memcpyDeviceToHost(out2.data(), gpu_data1,(out2.size())*sizeof(DataType)); sycl_device.memcpyDeviceToHost(out3.data(), gpu_data2,(out3.size())*sizeof(DataType)); + sycl_device.synchronize(); for (int i = 0; i < in1.size(); ++i) { VERIFY_IS_APPROX(out1(i), in1(i) * 3.14f); @@ -62,6 +64,35 @@ void test_sycl_mem_transfers(const Eigen::SyclDevice &sycl_device) { sycl_device.deallocate(gpu_data1); sycl_device.deallocate(gpu_data2); } + +template +void test_sycl_mem_sync(const Eigen::SyclDevice &sycl_device) { + int size = 20; + array tensorRange = {{size}}; + Tensor in1(tensorRange); + Tensor in2(tensorRange); + Tensor out(tensorRange); + + in1 = in1.random(); + in2 = in1; + + DataType* gpu_data = static_cast(sycl_device.allocate(in1.size()*sizeof(DataType))); + + TensorMap> gpu1(gpu_data, tensorRange); + sycl_device.memcpyHostToDevice(gpu_data, in1.data(),(in1.size())*sizeof(DataType)); + sycl_device.synchronize(); + in1.setZero(); + + sycl_device.memcpyDeviceToHost(out.data(), gpu_data, out.size()*sizeof(DataType)); + sycl_device.synchronize(); + + for (int i = 0; i < in1.size(); ++i) { + VERIFY_IS_APPROX(out(i), in2(i)); + } + + sycl_device.deallocate(gpu_data); +} + template void test_sycl_computations(const Eigen::SyclDevice &sycl_device) { @@ -90,6 +121,8 @@ void test_sycl_computations(const Eigen::SyclDevice &sycl_device) { /// a=1.2f gpu_in1.device(sycl_device) = gpu_in1.constant(1.2f); sycl_device.memcpyDeviceToHost(in1.data(), gpu_in1_data ,(in1.size())*sizeof(DataType)); + sycl_device.synchronize(); + for (int i = 0; i < sizeDim1; ++i) { for (int j = 0; j < sizeDim2; ++j) { for (int k = 0; k < sizeDim3; ++k) { @@ -102,6 +135,8 @@ void test_sycl_computations(const Eigen::SyclDevice &sycl_device) { /// a=b*1.2f gpu_out.device(sycl_device) = gpu_in1 * 1.2f; sycl_device.memcpyDeviceToHost(out.data(), gpu_out_data ,(out.size())*sizeof(DataType)); + sycl_device.synchronize(); + for (int i = 0; i < sizeDim1; ++i) { for (int j = 0; j < sizeDim2; ++j) { for (int k = 0; k < sizeDim3; ++k) { @@ -116,6 +151,8 @@ void test_sycl_computations(const Eigen::SyclDevice &sycl_device) { sycl_device.memcpyHostToDevice(gpu_in2_data, in2.data(),(in2.size())*sizeof(DataType)); gpu_out.device(sycl_device) = gpu_in1 * gpu_in2; sycl_device.memcpyDeviceToHost(out.data(), gpu_out_data,(out.size())*sizeof(DataType)); + sycl_device.synchronize(); + for (int i = 0; i < sizeDim1; ++i) { for (int j = 0; j < sizeDim2; ++j) { for (int k = 0; k < sizeDim3; ++k) { @@ -130,6 +167,7 @@ void test_sycl_computations(const Eigen::SyclDevice &sycl_device) { /// c=a+b gpu_out.device(sycl_device) = gpu_in1 + gpu_in2; sycl_device.memcpyDeviceToHost(out.data(), gpu_out_data,(out.size())*sizeof(DataType)); + sycl_device.synchronize(); for (int i = 0; i < sizeDim1; ++i) { for (int j = 0; j < sizeDim2; ++j) { for (int k = 0; k < sizeDim3; ++k) { @@ -144,6 +182,7 @@ void test_sycl_computations(const Eigen::SyclDevice &sycl_device) { /// c=a*a gpu_out.device(sycl_device) = gpu_in1 * gpu_in1; sycl_device.memcpyDeviceToHost(out.data(), gpu_out_data,(out.size())*sizeof(DataType)); + sycl_device.synchronize(); for (int i = 0; i < sizeDim1; ++i) { for (int j = 0; j < sizeDim2; ++j) { for (int k = 0; k < sizeDim3; ++k) { @@ -158,6 +197,7 @@ void test_sycl_computations(const Eigen::SyclDevice &sycl_device) { //a*3.14f + b*2.7f gpu_out.device(sycl_device) = gpu_in1 * gpu_in1.constant(3.14f) + gpu_in2 * gpu_in2.constant(2.7f); sycl_device.memcpyDeviceToHost(out.data(),gpu_out_data,(out.size())*sizeof(DataType)); + sycl_device.synchronize(); for (int i = 0; i < sizeDim1; ++i) { for (int j = 0; j < sizeDim2; ++j) { for (int k = 0; k < sizeDim3; ++k) { @@ -173,6 +213,7 @@ void test_sycl_computations(const Eigen::SyclDevice &sycl_device) { sycl_device.memcpyHostToDevice(gpu_in3_data, in3.data(),(in3.size())*sizeof(DataType)); gpu_out.device(sycl_device) =(gpu_in1 > gpu_in1.constant(0.5f)).select(gpu_in2, gpu_in3); sycl_device.memcpyDeviceToHost(out.data(), gpu_out_data,(out.size())*sizeof(DataType)); + sycl_device.synchronize(); for (int i = 0; i < sizeDim1; ++i) { for (int j = 0; j < sizeDim2; ++j) { for (int k = 0; k < sizeDim3; ++k) { @@ -193,9 +234,12 @@ template void sycl_computing_test_per_ auto sycl_device = Eigen::SyclDevice(&queueInterface); test_sycl_mem_transfers(sycl_device); test_sycl_computations(sycl_device); + test_sycl_mem_sync(sycl_device); test_sycl_mem_transfers(sycl_device); test_sycl_computations(sycl_device); + test_sycl_mem_sync(sycl_device); } + void test_cxx11_tensor_sycl() { for (const auto& device :Eigen::get_sycl_supported_devices()) { CALL_SUBTEST(sycl_computing_test_per_device(device)); From 8245851d1b08886bb395471ba3ba8ab8a29f4c58 Mon Sep 17 00:00:00 2001 From: Luke Iwanski Date: Tue, 20 Dec 2016 16:18:15 +0000 Subject: [PATCH 2/3] Matching parameters order between lambda and the functor. --- unsupported/Eigen/CXX11/src/Tensor/TensorSyclRun.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorSyclRun.h b/unsupported/Eigen/CXX11/src/Tensor/TensorSyclRun.h index 5862c9795..481635fd5 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorSyclRun.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorSyclRun.h @@ -31,16 +31,11 @@ namespace TensorSycl { typedef typename internal::createPlaceHolderExpression::Type PlaceHolderExpr; typedef typename Expr::Index Index; - Index range; FunctorExpr functors; TupleType tuple_of_accessors; - ExecExprFunctorKernel(Index range_ - , - FunctorExpr functors_, TupleType tuple_of_accessors_ - ) - :range(range_) - , functors(functors_), tuple_of_accessors(tuple_of_accessors_) - {} + Index range; + ExecExprFunctorKernel(Index range_, FunctorExpr functors_, TupleType tuple_of_accessors_) + :range(range_), functors(functors_), tuple_of_accessors(tuple_of_accessors_){} void operator()(cl::sycl::nd_item<1> itemID) { typedef typename internal::ConvertToDeviceExpression::Type DevExpr; auto device_expr =internal::createDeviceExpression(functors, tuple_of_accessors); From 29186f766f7e36dd8dbe933e035f6bcccc8fe70d Mon Sep 17 00:00:00 2001 From: Luke Iwanski Date: Tue, 20 Dec 2016 21:32:42 +0000 Subject: [PATCH 3/3] Fixed order of initialisation in ExecExprFunctorKernel functor. --- unsupported/Eigen/CXX11/src/Tensor/TensorSyclRun.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorSyclRun.h b/unsupported/Eigen/CXX11/src/Tensor/TensorSyclRun.h index 481635fd5..11e4ddc56 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorSyclRun.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorSyclRun.h @@ -35,7 +35,7 @@ namespace TensorSycl { TupleType tuple_of_accessors; Index range; ExecExprFunctorKernel(Index range_, FunctorExpr functors_, TupleType tuple_of_accessors_) - :range(range_), functors(functors_), tuple_of_accessors(tuple_of_accessors_){} + : functors(functors_), tuple_of_accessors(tuple_of_accessors_), range(range_){} void operator()(cl::sycl::nd_item<1> itemID) { typedef typename internal::ConvertToDeviceExpression::Type DevExpr; auto device_expr =internal::createDeviceExpression(functors, tuple_of_accessors);