[SYCLomatic] Remove duplicated replacement of host_ct function. (#2017)

Signed-off-by: Tang, Jiajun [email protected]

Author: tangjj11

clang/lib/DPCT/AnalysisInfo.cpp

@@ -1850,24 +1850,21 @@ void DpctGlobalInfo::processCudaArchMacro() {
   }
 }
 
-void DpctGlobalInfo::generateHostCode(
-    std::multimap<unsigned int, std::shared_ptr<clang::dpct::ExtReplacement>>
-        &ProcessedReplList,
-    HostDeviceFuncLocInfo Info, unsigned ID) {
+void DpctGlobalInfo::generateHostCode(tooling::Replacements &ProcessedReplList,
+                                      HostDeviceFuncLocInfo Info, unsigned ID) {
   std::vector<std::shared_ptr<ExtReplacement>> ExtraRepl;
 
   unsigned int Pos, Len;
   std::string OriginText = Info.FuncContentCache;
   StringRef SR(OriginText);
   RewriteBuffer RB;
   RB.Initialize(SR.begin(), SR.end());
-  for (auto &Element : ProcessedReplList) {
-    auto R = Element.second;
-    unsigned ROffset = R->getOffset();
+  for (const auto &R : ProcessedReplList) {
+    unsigned ROffset = R.getOffset();
     if (ROffset >= Info.FuncStartOffset && ROffset <= Info.FuncEndOffset) {
       Pos = ROffset - Info.FuncStartOffset;
-      Len = R->getLength();
-      RB.ReplaceText(Pos, Len, R->getReplacementText());
+      Len = R.getLength();
+      RB.ReplaceText(Pos, Len, R.getReplacementText());
     }
   }
   Pos = Info.FuncNameOffset - Info.FuncStartOffset;
@@ -1953,8 +1950,9 @@ void DpctGlobalInfo::postProcess() {
           if (LocInfo.Type == HDFuncInfoType::HDFI_Call) {
             continue;
           }
-          auto &ReplLists =
-              FileMap[LocInfo.FilePath]->getReplsSYCL()->getReplMap();
+          tooling::Replacements ReplLists;
+          FileMap[LocInfo.FilePath]->getReplsSYCL()->emplaceIntoReplSet(
+              ReplLists);
           generateHostCode(ReplLists, LocInfo, Info.PostFixId);
         }
       }

clang/lib/DPCT/AnalysisInfo.h

@@ -1106,10 +1106,8 @@ class DpctGlobalInfo {
   void buildKernelInfo();
   void buildReplacements();
   void processCudaArchMacro();
-  void generateHostCode(
-      std::multimap<unsigned int, std::shared_ptr<clang::dpct::ExtReplacement>>
-          &ProcessedReplList,
-      HostDeviceFuncLocInfo Info, unsigned ID);
+  void generateHostCode(tooling::Replacements &ProcessedReplList,
+                        HostDeviceFuncLocInfo Info, unsigned ID);
   void postProcess();
   void cacheFileRepl(clang::tooling::UnifiedPath FilePath,
                      std::pair<std::shared_ptr<ExtReplacements>,

clang/test/dpct/cuda_arch_test/math_in_cuda_arch.cu

@@ -0,0 +1,21 @@
+// RUN: dpct --format-range=none -out-root %T/cuda_arch_test/math_in_cuda_arch %s --cuda-include-path="%cuda-path/include" -- -x cuda --cuda-host-only -std=c++14
+// RUN: FileCheck --input-file %T/cuda_arch_test/math_in_cuda_arch/math_in_cuda_arch.dp.cpp --match-full-lines %s
+// RUN: %if build_lit %{icpx -c -fsycl %T/cuda_arch_test/math_in_cuda_arch/math_in_cuda_arch.dp.cpp -o %T/cuda_arch_test/math_in_cuda_arch/math_in_cuda_arch.dp.o %}
+
+// CHECK: float f(float x) {
+// CHECK-EMPTY: 
+// CHECK-NEXT:   return expf(x);
+// CHECK-EMPTY: 
+// CHECK-NEXT: }
+// CHECK-NEXT: float f_host_ct0(float x) {
+// CHECK-EMPTY: 
+// CHECK-NEXT:   return sycl::exp(x);
+// CHECK-EMPTY: 
+// CHECK-NEXT: }
+__device__ __host__ float f(float x) {
+#if defined(__CUDA_ARCH__)
+  return ::expf(x);
+#else
+  return std::exp(x);
+#endif
+}