Respond to review comments.

Signed-off-by: Zahira Ammarguellat <zahira.ammarguellat@intel.com>

Author: zahiraam

clang/lib/CodeGen/CGDebugInfo.cpp

@@ -375,6 +375,19 @@ Optional<StringRef> CGDebugInfo::getSource(const SourceManager &SM,
   return Source;
 }
 
+// Compute valid FID for FileName.
+FileID ComputeValidFileID(SourceManager &SM, StringRef FileName) {
+  FileID MainFileID = SM.getMainFileID();
+  // Find the filename FileName and load it.
+  llvm::Expected<FileEntryRef>  ExpectedFileRef =
+    SM.getFileManager().getFileRef(FileName);
+  if (ExpectedFileRef) {
+    MainFileID = SM.getOrCreateFileID(ExpectedFileRef.get(),
+                                      SrcMgr::CharacteristicKind::C_User);
+  }
+  return MainFileID;
+}
+
 llvm::DIFile *CGDebugInfo::getOrCreateFile(SourceLocation Loc) {
   SourceManager &SM = CGM.getContext().getSourceManager();
   StringRef FileName;
@@ -399,18 +412,6 @@ llvm::DIFile *CGDebugInfo::getOrCreateFile(SourceLocation Loc) {
 
   // Cache the results.
   auto It = DIFileCache.find(FileName.data());
-  if (SM.getFileEntryForID(SM.getMainFileID()) &&
-      CGM.getCodeGenOpts().SYCLUseMainFileName && FID.isInvalid() &&
-      llvm::sys::path::is_absolute(FileName)) {
-    FileID MainFileID = SM.getMainFileID();
-    auto ExpectedFileRef = SM.getFileManager().getFileRef(FileName);
-    if (ExpectedFileRef) {
-      MainFileID = SM.getOrCreateFileID(ExpectedFileRef.get(),
-                                        SrcMgr::CharacteristicKind::C_User);
-      FID = MainFileID;
-    }
-  }
-
   if (It != DIFileCache.end()) {
     // Verify that the information still exists.
     if (llvm::Metadata *V = It->second)
@@ -420,15 +421,11 @@ llvm::DIFile *CGDebugInfo::getOrCreateFile(SourceLocation Loc) {
   SmallString<32> Checksum;
 
   if (SM.getFileEntryForID(SM.getMainFileID()) &&
-      CGM.getCodeGenOpts().SYCLUseMainFileName && FID.isInvalid()) {
-    FileID MainFileID = SM.getMainFileID();
-    auto ExpectedFileRef = SM.getFileManager().getFileRef(FileName);
-    if (ExpectedFileRef) {
-      MainFileID = SM.getOrCreateFileID(ExpectedFileRef.get(),
-                                        SrcMgr::CharacteristicKind::C_User);
-      FID = MainFileID;
-    }
-  }
+      CGM.getCodeGenOpts().SYCLUseMainFileName && FID.isInvalid())
+    // When an integration footer is involved, the main file is a temporary
+    // file generated by the compiler. FileName is pointing to original user
+    // source file. We use it here to properly calculate its checksum.
+    FID = ComputeValidFileID(SM, FileName);
 
   Optional<llvm::DIFile::ChecksumKind> CSKind = computeChecksum(FID, Checksum);
   Optional<llvm::DIFile::ChecksumInfo<StringRef>> CSInfo;
@@ -560,14 +557,12 @@ void CGDebugInfo::CreateCompileUnit() {
       MainFileName =
           std::string(llvm::sys::path::remove_leading_dotslash(MainFileDirSS));
     } else if (CGM.getCodeGenOpts().SYCLUseMainFileName) {
-      // When integration footer is involved, main file is a temporary file
-      // generated by the compiler, but -main-file-name is expected to contain
-      // an absolute path to the original user-provided source file. We use it
-      // here to properly calculate its checksum.
-      auto ExpectedFileRef = SM.getFileManager().getFileRef(FullMainFileName);
-      if (ExpectedFileRef)
-        MainFileID = SM.getOrCreateFileID(ExpectedFileRef.get(),
-                                          SrcMgr::CharacteristicKind::C_User);
+      // When an integration footer is involved, the main file is a temporary
+      // file generated by the compiler. FullMainFileName is pointing to
+      // original user source file. We use it here to properly calculate its
+      // checksum.
+      MainFileID = ComputeValidFileID(SM, FullMainFileName);
+      // Make sure the filename points to the original user source filename.
       MainFileName = FullMainFileName;
     }
     // If the main file name provided is identical to the input file name, and

clang/test/CodeGenSYCL/debug-info-checksum-temp-name.cpp

@@ -26,4 +26,4 @@
 // CHECK: ![[#FILE]] = !DIFile(filename: "{{.*}}clang{{.+}}test{{.+}}CodeGenSYCL{{.+}}Inputs{{.+}}debug-info-checksum.cpp"
 // CHECK-SAME: checksumkind: CSK_MD5, checksum: "f1fb5d68350b47d90a53968ac8c40529"
 
-#include "Inputs/debug-info-checksum.cpp
+#include "Inputs/debug-info-checksum.cpp"

clang/test/CodeGenSYCL/debug-info-file-checksum.cpp

@@ -1,3 +1,9 @@
+// This test checks that a checksum is created correctly for the compiled file,
+// and that the same checksum is generated for host and target compilation.
+// It also checks that DICompileUnit in host and target compilation is referring
+// to the original source file name (not the temporary file created by the
+// compilation process) .
+
 // RUN: %clang_cc1 -triple spir64-unknown-unknown -fsycl-is-device \
 // RUN: -fsycl-int-header=%t.header.h -fsycl-int-footer=%t.footer.h \
 // RUN: -main-file-name %S/Inputs/checksum.cpp -fsycl-use-main-file-name \

clang/test/Driver/sycl-int-footer.cpp

@@ -29,7 +29,7 @@
 // NO-FOOTER: clang{{.*}} "-include" "[[INTHEADER]]"{{.*}} "-fsycl-is-host"{{.*}} "-main-file-name" "sycl-int-footer.cpp"{{.*}} "-o"
 
 // Test that -fsycl-use-main-file-name is not passed if -fsycl is not passed.
-// This is test is located here, because -fsycl-use-main-file-name is tightly
+// This test is located here, because -fsycl-use-main-file-name is tightly
 // connected to the integration footer.
 // RUN: %clangxx %s -### 2>&1 | FileCheck %s --check-prefix NO-FSYCL --implicit-check-not "-fsycl-use-main-file-name"
 // NO-FSYCL: clang{{.*}} "-main-file-name" "sycl-int-footer.cpp"