[SYCLomatic] Refine file renaming migration logic for #include stmt consistent with migrated file name (#2913)

Signed-off-by: chenwei.sun <chenwei.sun@intel.com>

Author: tomflinda

clang/lib/DPCT/AnalysisInfo.cpp

@@ -1487,9 +1487,12 @@ std::string DpctGlobalInfo::getStringForRegexReplacement(StringRef MatchedStr) {
         HelperFuncType::HFT_DefaultQueuePtr, Index);
   case 'E': {
     auto &Vec = DpctGlobalInfo::getInstance().getCSourceFileList();
-    return DpctGlobalInfo::hasCUDASyntax(Vec[Index])
-               ? ("c" + DpctGlobalInfo::getSYCLSourceExtension())
-               : "c";
+    const bool HasCUDASyntax = DpctGlobalInfo::hasCUDASyntax(Vec[Index].first);
+    const auto Extention = Vec[Index].second;
+    SourceProcessType FileType = GetSourceFileType(Vec[Index].first);
+    return HasCUDASyntax && (FileType & SPT_CppSource)
+               ? Extention + DpctGlobalInfo::getSYCLSourceExtension()
+               : Extention;
   }
   case 'P': {
     std::string ReplStr;
@@ -2523,7 +2526,9 @@ bool DpctGlobalInfo::CVersionCUDALaunchUsedFlag = false;
 unsigned int DpctGlobalInfo::ColorOption = 1;
 std::unordered_map<int, std::shared_ptr<DeviceFunctionInfo>>
     DpctGlobalInfo::CubPlaceholderIndexMap;
-std::vector<tooling::UnifiedPath> DpctGlobalInfo::CSourceFileList;
+std::vector<std::pair<tooling::UnifiedPath /*including filename*/,
+                      std::string /*extention name*/>>
+    DpctGlobalInfo::CSourceFileList;
 bool DpctGlobalInfo::OptimizeMigrationFlag = false;
 std::unordered_map<std::string, std::shared_ptr<PriorityReplInfo>>
     DpctGlobalInfo::PriorityReplInfoMap;

clang/lib/DPCT/AnalysisInfo.h

@@ -1450,7 +1450,9 @@ class DpctGlobalInfo {
   getCubPlaceholderIndexMap() {
     return CubPlaceholderIndexMap;
   }
-  std::vector<tooling::UnifiedPath> &getCSourceFileList() {
+  std::vector<std::pair<tooling::UnifiedPath /*including filename*/,
+                        std::string /*extention name*/>> &
+  getCSourceFileList() {
     return CSourceFileList;
   }
   static std::unordered_map<std::string, std::shared_ptr<PriorityReplInfo>> &
@@ -1703,7 +1705,9 @@ class DpctGlobalInfo {
   static unsigned int ColorOption;
   static std::unordered_map<int, std::shared_ptr<DeviceFunctionInfo>>
       CubPlaceholderIndexMap;
-  static std::vector<tooling::UnifiedPath> CSourceFileList;
+  static std::vector<std::pair<tooling::UnifiedPath /*including filename*/,
+                               std::string /*extention name*/>>
+      CSourceFileList;
   static bool OptimizeMigrationFlag;
   static std::unordered_map<std::string, std::shared_ptr<PriorityReplInfo>>
       PriorityReplInfoMap;

clang/lib/DPCT/FileGenerator/GenFiles.cpp

@@ -211,18 +211,12 @@ void rewriteFileName(std::string &FileName, const std::string &FullPathName) {
     if (FileType & SPT_CudaSource) {
       path::replace_extension(CanonicalPathStr,
                               DpctGlobalInfo::getSYCLSourceExtension());
-    } else if (FileType & SPT_CppSource) {
-      if (Extension == ".c") {
-        if (DpctGlobalInfo::hasCUDASyntax(FileName)) {
-          path::replace_extension(CanonicalPathStr,
-                                  Extension +
-                                      DpctGlobalInfo::getSYCLSourceExtension());
-        }
-      } else {
-        path::replace_extension(CanonicalPathStr,
-                                Extension +
-                                    DpctGlobalInfo::getSYCLSourceExtension());
-      }
+    } else if ((FileType & SPT_CppSource) &&
+               DpctGlobalInfo::hasCUDASyntax(FileName)) {
+      path::replace_extension(CanonicalPathStr,
+                              Extension +
+                                  DpctGlobalInfo::getSYCLSourceExtension());
+
     } else if (FileType & SPT_CudaHeader) {
       path::replace_extension(CanonicalPathStr,
                               DpctGlobalInfo::getSYCLHeaderExtension());

clang/lib/DPCT/RulesInclude/InclusionHeaders.cpp

@@ -175,11 +175,12 @@ void IncludesCallbacks::InclusionDirective(
     const auto Extension = path::extension(FileName);
     SmallString<512> NewFileName(FileName.str());
 
-    if (Extension == ".c") {
+    if (Extension == ".c" || Extension == ".cc") {
       auto &Vec = DpctGlobalInfo::getInstance().getCSourceFileList();
       path::replace_extension(
           NewFileName, "{{NEEDREPLACEE" + std::to_string(Vec.size()) + "}}");
-      Vec.push_back(IncludedFile);
+      Vec.push_back(std::pair<tooling::UnifiedPath, std::string>(
+          IncludedFile, Extension.substr(1)));
     } else {
       clang::tooling::UnifiedPath NewFilePath = FileName;
       rewriteFileName(NewFilePath, IncludedFile);

clang/test/dpct/include/main.cu

@@ -53,9 +53,6 @@
 // case 4: cuh file not in database.
 // CHECK: #include "test4.dp.hpp"
 #include "test4.cuh"
-// case 5: header file has CUDA syntax, in database.
-// CHECK: #include "test5.h.dp.cpp"
-#include "test5.h"
 // case 6: header file has CUDA syntax, not in database.
 // CHECK: #include "test6.h"
 #include "test6.h"

clang/test/dpct/yaml_has_cuda_syntax/MainSourceFiles.ref

@@ -0,0 +1,7 @@
+// CHECK: MainSourceFilesDigest:
+// CHECK-NEXT:   - MainSourceFile:  '{{(.+)}}common.cpp'
+// CHECK-NEXT:     Digest:          {{(.+)}}
+// CHECK-NEXT:     HasCUDASyntax:   false
+// CHECK-NEXT:   - MainSourceFile:  '{{(.+)}}yaml_has_cuda_syntax/utils.cpp'
+// CHECK-NEXT:     Digest:          {{(.+)}}
+// CHECK-NEXT:     HasCUDASyntax:   true

clang/test/dpct/yaml_has_cuda_syntax/common.cpp

@@ -0,0 +1,32 @@
+// UNSUPPORTED: system-windows
+// RUN: echo "[" > %T/compile_commands.json
+// RUN: echo "    {" >> %T/compile_commands.json
+// RUN: echo "        \"command\": \"nvcc %S/common.cpp\"," >> %T/compile_commands.json
+// RUN: echo "        \"directory\": \"%T\"," >> %T/compile_commands.json
+// RUN: echo "        \"file\": \"%S/common.cpp\"" >> %T/compile_commands.json
+// RUN: echo "    }," >> %T/compile_commands.json
+// RUN: echo "    {" >> %T/compile_commands.json
+// RUN: echo "        \"command\": \"nvcc %S/utils.cpp\"," >> %T/compile_commands.json
+// RUN: echo "        \"directory\": \"%T\"," >> %T/compile_commands.json
+// RUN: echo "        \"file\": \"%S/utils.cpp\"" >> %T/compile_commands.json
+// RUN: echo "    }" >> %T/compile_commands.json
+// RUN: echo "]" >> %T/compile_commands.json
+
+// RUN: dpct -in-root=%S -p=%T --out-root=%T/out --cuda-include-path="%cuda-path/include"
+// RUN: FileCheck %s --match-full-lines --input-file %T/out/common.cpp
+// RUN: %if build_lit %{icpx -c -fsycl %T/out/common.cpp -o %T/out/common.o %}
+
+// RUN: FileCheck %S/utils.cpp --match-full-lines --input-file %T/out/utils.cpp.dp.cpp
+// RUN: %if build_lit %{icpx -c -fsycl %T/out/utils.cpp.dp.cpp -o %T/out/utils.cpp.dp.o %}
+
+// RUN: cat %S/MainSourceFiles.ref > %T/out/check_MainSourceFiles.yaml
+// RUN: cat %T/out/MainSourceFiles.yaml >>%T/out/check_MainSourceFiles.yaml
+// RUN: FileCheck --match-full-lines --input-file %T/out/check_MainSourceFiles.yaml %T/out/check_MainSourceFiles.yaml
+
+// CHECK: #include <cmath>
+
+void test() {
+  int a = -1;
+  // CHECK: abs(a);
+  abs(a);
+}

clang/test/dpct/yaml_has_cuda_syntax/utils.cpp

@@ -0,0 +1,10 @@
+// UNSUPPORTED: system-windows
+// RUN: echo "empty command"
+
+
+#include <iostream>
+#include <cuda_runtime.h>
+
+// CHECK: void test_foo(){
+__device__ void test_foo(void){
+}