[SYCLomatic] Add migration support for CUstreamCallback type (#2614)

Author: Deepak Raj H R

clang/lib/DPCT/RuleInfra/MapNames.cpp

@@ -343,6 +343,9 @@ void MapNames::setExplicitNamespaceMap(
                                       HelperFeatureEnum::device_ext)},
       {"CUstream_st",
        std::make_shared<TypeNameRule>(getClNamespace() + "queue")},
+      {"CUstreamCallback",
+       std::make_shared<TypeNameRule>(getDpctNamespace() + "queue_callback",
+                                      HelperFeatureEnum::device_ext)},
       {"char1", std::make_shared<TypeNameRule>("int8_t")},
       {"char2", std::make_shared<TypeNameRule>(getClNamespace() + "char2")},
       {"char3", std::make_shared<TypeNameRule>(getClNamespace() + "char3")},

clang/lib/DPCT/RulesLang/RulesLang.cpp

@@ -345,7 +345,8 @@ void TypeInDeclRule::registerMatcher(MatchFinder &MF) {
               "cublasLtEpilogue_t", "cublasLtMatmulPreference_t",
               "cublasLtMatmulHeuristicResult_t", "CUjit_target",
               "cublasLtMatrixTransformDesc_t", "cudaGraphicsMapFlags",
-              "cudaGraphicsRegisterFlags", "cudaExternalMemoryHandleType"))))))
+              "cudaGraphicsRegisterFlags", "cudaExternalMemoryHandleType",
+              "CUstreamCallback"))))))
           .bind("cudaTypeDef"),
       this);
 

clang/runtime/dpct-rt/include/dpct/device.hpp

@@ -13,6 +13,7 @@
 #include <array>
 #include <climits>
 #include <cstring>
+#include <functional>
 #include <iostream>
 #include <map>
 #include <mutex>
@@ -84,6 +85,8 @@ typedef sycl::queue *queue_ptr;
 
 typedef char *device_ptr;
 
+using queue_callback = std::function<void (queue_ptr, int, void*)>;
+
 /// Destroy \p event pointed memory.
 ///
 /// \param event Pointer to the sycl::event address.

clang/test/dpct/driver-stream-and-event.cu

@@ -130,6 +130,11 @@ void test_stream() {
   // CHECK: int result = DPCT_CHECK_ERROR(std::async([&]() { hStream->wait(); callback<char>(hStream, 0, data); }));
   CUresult result = cuStreamAddCallback(hStream, callback<char>, data, flag);
 
+  // CHECK dpct::queue_callback cbptr = callback<char>;
+  CUstreamCallback cbptr = callback<char>;
+  // CHECK: std::async([&]() { hStream->wait(); cbptr(hStream, 0, data); });
+  cuStreamAddCallback(hStream, cbptr, data, flag);
+
   //CHECK: /*
   //CHECK-NEXT: DPCT1026:{{[0-9]+}}: The call to cuStreamAttachMemAsync was removed because SYCL currently does not support associating USM with a specific queue.
   //CHECK-NEXT: */