[dl-cifar][SYCL] Use extensions to submit native commands when available

Add new wrapper functions in infrastructure/SYCL.h to call either
host_task or native command submission extensions when available.

Author: rafbiels

dl-cifar/SYCL/basic-dl/softmax_layer.cpp

@@ -108,9 +108,7 @@ SoftmaxLayer::SoftmaxLayer(LangHandle *langHandle, Timer* timer,
 void SoftmaxLayer::doFw() {  
 #if defined(USE_CUBLAS)
 
-    langHandle_->getSyclQueue()->submit([&](sycl::handler &cgh) {
-        //auto d_A = b_A.get_access<sycl::access::mode::read_write>(cgh);
-        cgh.host_task([=](sycl::interop_handle ih) {
+    SYCL::ExecNativeCommand(*langHandle_->getSyclQueue(), [=](sycl::interop_handle ih) {
             cuCtxSetCurrent(ih.get_native_context<sycl::backend::ext_oneapi_cuda>());
             cublasSetStream(*(langHandle_->getCublasHandle()), ih.get_native_queue<sycl::backend::ext_oneapi_cuda>());
 
@@ -129,14 +127,9 @@ void SoftmaxLayer::doFw() {
                                     d_output_));
             //cublasDestroy(handle);
             //cudaStreamSynchronize(cudaStreamHandle);
-            assertDevApiInvar(cudaDeviceSynchronize());
-        });
-    });
-    langHandle_->getSyclQueue()->wait_and_throw();
+        }, []{assertDevApiInvar(cudaDeviceSynchronize())});
 #elif defined(USE_ROCBLAS) 
-    langHandle_->getSyclQueue()->submit([&](sycl::handler &cgh) {
-        //auto d_A = b_A.get_access<sycl::access::mode::read_write>(cgh);
-        cgh.host_task([=](sycl::interop_handle ih) {
+    SYCL::ExecNativeCommand(*langHandle_->getSyclQueue(), [=](sycl::interop_handle ih) {
             //cuCtxSetCurrent(ih.get_native_context<sycl::backend::ext_oneapi_cuda>());
             //cublasSetStream(*(langHandle_->getCublasHandle()), ih.get_native_queue<sycl::backend::ext_oneapi_cuda>());
 
@@ -153,10 +146,7 @@ void SoftmaxLayer::doFw() {
                                     d_output_));
             //cublasDestroy(handle);
             //cudaStreamSynchronize(cudaStreamHandle);
-            assertDevApiInvar(hipDeviceSynchronize());
-        });
-    });
-    langHandle_->getSyclQueue()->wait_and_throw();
+        }, []{assertDevApiInvar(hipDeviceSynchronize())});
 #else
     std::unordered_map<int, memory> softmax_args;
     softmax_args.insert({DNNL_ARG_SRC, src_mem});
@@ -170,9 +160,7 @@ void SoftmaxLayer::doFw() {
 void SoftmaxLayer::doBw() {
 #if defined(USE_CUBLAS)
 
-    langHandle_->getSyclQueue()->submit([&](sycl::handler &cgh) {
-        //auto d_A = b_A.get_access<sycl::access::mode::read_write>(cgh);
-        cgh.host_task([=](sycl::interop_handle ih) {
+    SYCL::ExecNativeCommand(*langHandle_->getSyclQueue(), [=](sycl::interop_handle ih) {
             cuCtxSetCurrent(ih.get_native_context<sycl::backend::ext_oneapi_cuda>());
             cublasSetStream(*(langHandle_->getCublasHandle()), ih.get_native_queue<sycl::backend::ext_oneapi_cuda>());
 
@@ -193,14 +181,9 @@ void SoftmaxLayer::doBw() {
                                     d_d_input_));
             //cublasDestroy(handle);
             //cudaStreamSynchronize(cudaStreamHandle);
-            assertDevApiInvar(cudaDeviceSynchronize());
-        });
-    });
-    langHandle_->getSyclQueue()->wait_and_throw();
+        }, []{assertDevApiInvar(cudaDeviceSynchronize())});
 #elif defined(USE_ROCBLAS)
-    langHandle_->getSyclQueue()->submit([&](sycl::handler &cgh) {
-        //auto d_A = b_A.get_access<sycl::access::mode::read_write>(cgh);
-        cgh.host_task([=](sycl::interop_handle ih) {
+    SYCL::ExecNativeCommand(*langHandle_->getSyclQueue(), [=](sycl::interop_handle ih) {
             //cuCtxSetCurrent(ih.get_native_context<sycl::backend::ext_oneapi_cuda>());
             //cublasSetStream(*(langHandle_->getCublasHandle()), ih.get_native_queue<sycl::backend::ext_oneapi_cuda>());
 
@@ -219,10 +202,7 @@ void SoftmaxLayer::doBw() {
                                     d_d_input_));
             //cublasDestroy(handle);
             //cudaStreamSynchronize(cudaStreamHandle);
-            assertDevApiInvar(hipDeviceSynchronize());
-        });
-    });
-    langHandle_->getSyclQueue()->wait_and_throw();
+        }, []{assertDevApiInvar(hipDeviceSynchronize())});
 #else    
     std::unordered_map<int, memory> softmax_args;
     softmax_args.insert({DNNL_ARG_SRC, src_mem});
@@ -237,4 +217,4 @@ void SoftmaxLayer::doBw() {
 
 SoftmaxLayer::~SoftmaxLayer() {
 
-}
+}

dl-cifar/SYCL/basic-dl/softmax_layer.h

@@ -28,6 +28,7 @@
 #include "timing.h"
 #include "tracing.h"
 #include "handle.h"
+#include "SYCL.h"
 
 #include <sycl/sycl.hpp>
 
@@ -108,4 +109,4 @@ class SoftmaxLayer {
 };
 
 
-#endif
+#endif