[SYCLomatic] Refine SYCLCompat support for CUB (#2302)

Signed-off-by: Wang, Yihan <yihan.wang@intel.com>
oneapi-src · Sep 2, 2024 · 9b3c121 · 9b3c121
1 parent 28e58b7
commit 9b3c121
Show file tree

Hide file tree

Showing 5 changed files with 245 additions and 316 deletions.
diff --git a/clang/lib/DPCT/CallExprRewriter.cpp b/clang/lib/DPCT/CallExprRewriter.cpp
@@ -129,8 +129,10 @@ std::unique_ptr<std::unordered_map<
     std::string, std::shared_ptr<CallExprRewriterFactoryBase>>>();
 
 void CallExprRewriterFactoryBase::initRewriterMap() {
-  if (DpctGlobalInfo::useSYCLCompat())
+  if (DpctGlobalInfo::useSYCLCompat()) {
     initRewriterMapSYCLcompat(*RewriterMap);
+    initRewriterMethodMapSYCLcompat(*MethodRewriterMap);
+  }
   initRewriterMapAtomic();
   initRewriterMapCUB();
   initRewriterMapCUFFT();

diff --git a/clang/lib/DPCT/CallExprRewriter.h b/clang/lib/DPCT/CallExprRewriter.h
@@ -51,6 +51,10 @@ class CallExprRewriterFactoryBase {
       std::unordered_map<std::string,
                          std::shared_ptr<CallExprRewriterFactoryBase>>
           &RewriterMap);
+  static void initRewriterMethodMapSYCLcompat(
+      std::unordered_map<std::string,
+                         std::shared_ptr<CallExprRewriterFactoryBase>>
+          &MethodRewriterMap);
   static void initRewriterMapAtomic();
   static void initRewriterMapCUB();
   static void initRewriterMapCUFFT();