[SYCLomatic] Fix migration of cv-qualified cg::thread_block in function parameter (#553)

Signed-off-by: Cai, Justin <[email protected]>

Author: jzc

clang/lib/DPCT/ASTTraversal.cpp

@@ -2674,7 +2674,8 @@ void TypeInDeclRule::runRule(const MatchFinder::MatchResult &Result) {
     }
 
     std::string CanonicalTypeStr =
-        DpctGlobalInfo::getTypeName(TL->getType().getCanonicalType());
+      DpctGlobalInfo::getUnqualifiedTypeName(
+        TL->getType().getCanonicalType());
     StringRef CanonicalTypeStrRef(CanonicalTypeStr);
     if (CanonicalTypeStrRef.startswith(
             "cooperative_groups::__v1::thread_block_tile<")) {
@@ -2702,8 +2703,7 @@ void TypeInDeclRule::runRule(const MatchFinder::MatchResult &Result) {
       }
     }
 
-    if (DpctGlobalInfo::getTypeName(TL->getType().getCanonicalType()) ==
-        "cooperative_groups::__v1::thread_block") {
+    if (CanonicalTypeStr == "cooperative_groups::__v1::thread_block") {
       // Skip migrate the type in function body.
       if (DpctGlobalInfo::findAncestor<clang::CompoundStmt>(TL) &&
           DpctGlobalInfo::findAncestor<clang::FunctionDecl>(TL))

clang/test/dpct/sync_api.cu

@@ -200,3 +200,8 @@ int foo3() {
   foo2<<<1,1>>>();
   return 0;
 }
+
+// CHECK:      void foo4(const sycl::group<3> &crtb,
+// CHECK-NEXT:           const sycl::group<3> *cptb);
+__device__ void foo4(const cg::thread_block &crtb,
+                     const cg::thread_block *cptb);