[SYCLomatic] If sycl/sycl.hpp needs to be inserted, it also need to be inserted at the beginning of a translation unit

clang/lib/DPCT/AnalysisInfo.cpp

@@ -842,11 +842,11 @@ StringRef DpctFileInfo::getHeaderSpelling(HeaderType Value) {
 }
 void DpctFileInfo::insertHeader(HeaderType Type, unsigned Offset,
                                 ReplacementType IsForCodePin) {
-  if (Type == HT_DPL_Algorithm || Type == HT_DPL_Execution ||
-      Type == HT_DPCT_DNNL_Utils) {
-    if (this != DpctGlobalInfo::getInstance().getMainFile().get())
-      DpctGlobalInfo::getInstance().getMainFile()->insertHeader(
-          Type, FirstIncludeOffset);
+  if (Type == HT_DPL_Algorithm || Type == HT_DPL_Execution || Type == HT_SYCL) {
+    if (auto MF = DpctGlobalInfo::getInstance().getMainFile())
+      if (this != MF.get())
+        DpctGlobalInfo::getInstance().getMainFile()->insertHeader(
+            Type, FirstIncludeOffset);
   }
   if (HeaderInsertedBitMap[Type])
     return;

clang/lib/DPCT/MigrationAction.cpp

@@ -269,6 +269,14 @@ void DpctToolAction::runPasses() {
   for (auto Pass : Passes) {
     runPass(Pass);
   }
+  // Before post-processing, we need to set the MainFile to empty since it is no
+  // longer valid. Currently, DpctFileInfo::insertHeader() is executed both
+  // before and during the post-processing. In that function, the MainFile value
+  // is accessed for inserting two kinds of header files: oneDPL header and SYCL
+  // header. We assume those two headers have already been inserted before the
+  // post-processing. So, clearing the value of MainFile can avoid the MainFile
+  // value used in the post-processing.
+  DpctGlobalInfo::getInstance().setMainFile(nullptr);
   runWithCrashGuard(
       [&]() {
         Global.buildReplacements();

clang/test/dpct/d_dh_constant_db.cpp

@@ -17,6 +17,7 @@
 // RUN: echo "        \"file\": \"%/T/d_dh_constant_db/d_dh_constant_db.cpp\"" >> compile_commands.json
 // RUN: echo "    }" >> compile_commands.json
 // RUN: echo "]" >> compile_commands.json
+// RUN: rm %T/d_dh_constant_db/out/MainSourceFiles.yaml
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: FileCheck %s --match-full-lines --input-file %T/d_dh_constant_db/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/d_dh_constant_db_win.cpp

@@ -17,6 +17,7 @@
 // RUN: echo "        \"file\": \"%/T/d_dh_constant_db_win/d_dh_constant_db_win.cpp\"" >> compile_commands.json
 // RUN: echo "    }" >> compile_commands.json
 // RUN: echo "]" >> compile_commands.json
+// RUN: rm %T/d_dh_constant_db_win/out/MainSourceFiles.yaml
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: FileCheck %s --match-full-lines --input-file %T/d_dh_constant_db_win/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/d_hd_constant_db.cpp

@@ -17,6 +17,7 @@
 // RUN: echo "        \"file\": \"%/T/d_hd_constant_db/d_hd_constant_db.cpp\"" >> compile_commands.json
 // RUN: echo "    }" >> compile_commands.json
 // RUN: echo "]" >> compile_commands.json
+// RUN: rm %T/d_hd_constant_db/out/MainSourceFiles.yaml
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: FileCheck %s --match-full-lines --input-file %T/d_hd_constant_db/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/d_hd_constant_db_win.cpp

@@ -17,6 +17,7 @@
 // RUN: echo "        \"file\": \"%/T/d_hd_constant_db_win/d_hd_constant_db_win.cpp\"" >> compile_commands.json
 // RUN: echo "    }" >> compile_commands.json
 // RUN: echo "]" >> compile_commands.json
+// RUN: rm %T/d_hd_constant_db_win/out/MainSourceFiles.yaml
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: FileCheck %s --match-full-lines --input-file %T/d_hd_constant_db_win/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/dh_d_constant_db.cpp

@@ -18,6 +18,7 @@
 // RUN: echo "]" >> compile_commands.json
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: rm compile_commands.json
+// RUN: rm %T/dh_d_constant_db/out/MainSourceFiles.yaml
 // RUN: dpct dh_d_constant_db.cpp --out-root=./out --cuda-include-path="%cuda-path/include" -- -x cuda --cuda-host-only
 // RUN: FileCheck %s --match-full-lines --input-file %T/dh_d_constant_db/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/dh_d_constant_db_win.cpp

@@ -18,6 +18,7 @@
 // RUN: echo "]" >> compile_commands.json
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: rm compile_commands.json
+// RUN: rm %T/dh_d_constant_db_win/out/MainSourceFiles.yaml
 // RUN: dpct dh_d_constant_db_win.cpp --out-root=./out --cuda-include-path="%cuda-path/include" -- -x cuda --cuda-host-only
 // RUN: FileCheck %s --match-full-lines --input-file %T/dh_d_constant_db_win/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/dh_h_constant_db.cpp

@@ -18,6 +18,7 @@
 // RUN: echo "]" >> compile_commands.json
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: rm compile_commands.json
+// RUN: rm %T/dh_h_constant_db/out/MainSourceFiles.yaml
 // RUN: dpct dh_h_constant_db.cpp --out-root=./out --cuda-include-path="%cuda-path/include" -- -x c --cuda-host-only
 // RUN: FileCheck %s --match-full-lines --input-file %T/dh_h_constant_db/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/dh_h_constant_db_win.cpp

@@ -18,6 +18,7 @@
 // RUN: echo "]" >> compile_commands.json
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: rm compile_commands.json
+// RUN: rm %T/dh_h_constant_db_win/out/MainSourceFiles.yaml
 // RUN: dpct dh_h_constant_db_win.cpp --out-root=./out --cuda-include-path="%cuda-path/include" -- -x c --cuda-host-only
 // RUN: FileCheck %s --match-full-lines --input-file %T/dh_h_constant_db_win/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/h_dh_constant_db.cpp

@@ -17,6 +17,7 @@
 // RUN: echo "        \"file\": \"%/T/h_dh_constant_db/h_dh_constant_db.cpp\"" >> compile_commands.json
 // RUN: echo "    }" >> compile_commands.json
 // RUN: echo "]" >> compile_commands.json
+// RUN: rm %T/h_dh_constant_db/out/MainSourceFiles.yaml
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: FileCheck %s --match-full-lines --input-file %T/h_dh_constant_db/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/h_dh_constant_db_win.cpp

@@ -17,6 +17,7 @@
 // RUN: echo "        \"file\": \"%/T/h_dh_constant_db_win/h_dh_constant_db_win.cpp\"" >> compile_commands.json
 // RUN: echo "    }" >> compile_commands.json
 // RUN: echo "]" >> compile_commands.json
+// RUN: rm %T/h_dh_constant_db_win/out/MainSourceFiles.yaml
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: FileCheck %s --match-full-lines --input-file %T/h_dh_constant_db_win/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/h_hd_constant_db.cpp

@@ -17,6 +17,7 @@
 // RUN: echo "        \"file\": \"%/T/h_hd_constant_db/h_hd_constant_db.cpp\"" >> compile_commands.json
 // RUN: echo "    }" >> compile_commands.json
 // RUN: echo "]" >> compile_commands.json
+// RUN: rm %T/h_hd_constant_db/out/MainSourceFiles.yaml
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: FileCheck %s --match-full-lines --input-file %T/h_hd_constant_db/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/h_hd_constant_db_win.cpp

@@ -17,6 +17,7 @@
 // RUN: echo "        \"file\": \"%/T/h_hd_constant_db_win/h_hd_constant_db_win.cpp\"" >> compile_commands.json
 // RUN: echo "    }" >> compile_commands.json
 // RUN: echo "]" >> compile_commands.json
+// RUN: rm %T/h_hd_constant_db_win/out/MainSourceFiles.yaml
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: FileCheck %s --match-full-lines --input-file %T/h_hd_constant_db_win/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/hd_d_constant_db.cpp

@@ -18,6 +18,7 @@
 // RUN: echo "]" >> compile_commands.json
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: rm compile_commands.json
+// RUN: rm %T/hd_d_constant_db/out/MainSourceFiles.yaml
 // RUN: dpct hd_d_constant_db.cpp --out-root=./out --cuda-include-path="%cuda-path/include" -- -x cuda --cuda-host-only
 // RUN: FileCheck %s --match-full-lines --input-file %T/hd_d_constant_db/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/hd_d_constant_db_win.cpp

@@ -18,6 +18,7 @@
 // RUN: echo "]" >> compile_commands.json
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: rm compile_commands.json
+// RUN: rm %T/hd_d_constant_db_win/out/MainSourceFiles.yaml
 // RUN: dpct hd_d_constant_db_win.cpp --out-root=./out --cuda-include-path="%cuda-path/include" -- -x cuda --cuda-host-only
 // RUN: FileCheck %s --match-full-lines --input-file %T/hd_d_constant_db_win/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/hd_h_constant_db.cpp

@@ -18,6 +18,7 @@
 // RUN: echo "]" >> compile_commands.json
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: rm compile_commands.json
+// RUN: rm %T/hd_h_constant_db/out/MainSourceFiles.yaml
 // RUN: dpct hd_h_constant_db.cpp --out-root=./out --cuda-include-path="%cuda-path/include" -- -x c --cuda-host-only
 // RUN: FileCheck %s --match-full-lines --input-file %T/hd_h_constant_db/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/hd_h_constant_db_win.cpp

@@ -18,6 +18,7 @@
 // RUN: echo "]" >> compile_commands.json
 // RUN: dpct -p=. --out-root=./out --cuda-include-path="%cuda-path/include"
 // RUN: rm compile_commands.json
+// RUN: rm %T/hd_h_constant_db_win/out/MainSourceFiles.yaml
 // RUN: dpct hd_h_constant_db_win.cpp --out-root=./out --cuda-include-path="%cuda-path/include" -- -x c --cuda-host-only
 // RUN: FileCheck %s --match-full-lines --input-file %T/hd_h_constant_db_win/out/constant_header.h
 // RUN: cd ..

clang/test/dpct/header_insert/a.cpp

@@ -0,0 +1,11 @@
+// RUN: dpct --out-root %T/ %s --cuda-include-path="%cuda-path/include"
+// RUN: FileCheck --input-file %T/a.cpp.dp.cpp --match-full-lines %s
+
+// CHECK: #include <sycl/sycl.hpp>
+// CHECK-NEXT: #include <dpct/dpct.hpp>
+// CHECK-NEXT: #include "h1.h"
+#include "h1.h"
+
+int main() {
+  return 0;
+}

clang/test/dpct/header_insert/h1.h

@@ -0,0 +1,5 @@
+
+#include <vector>
+#include <numeric>
+#include "h2.h"
+#include "h3.h"

clang/test/dpct/header_insert/h2.h

@@ -0,0 +1,2 @@
+
+#include <bits/stdc++.h>

clang/test/dpct/header_insert/h3.h

@@ -0,0 +1,4 @@
+
+#include <iostream>
+#include <string>
+#include <cudnn.h>

clang/test/dpct/header_order/dnn.cu

@@ -2,7 +2,6 @@
 // CHECK: #include <sycl/sycl.hpp>
 // CHECK-NEXT: #include <dpct/dpct.hpp>
 // CHECK-NEXT: #include "dnn.h"
-// CHECK-NEXT: #include <dpct/dnnl_utils.hpp>
 #include "dnn.h"
 
 int test(cudnnHandle_t handle) {

clang/test/dpct/header_order/test.cu

@@ -9,7 +9,6 @@
 // CHECK-NEXT: #include <iostream>
 // CHECK-NEXT: #include <algorithm>
 // CHECK-NEXT: #include "dnn.h"
-// CHECK-NEXT: #include <dpct/dnnl_utils.hpp>
 #include <stdlib.h>
 #include <iostream>
 #include <algorithm>

clang/test/dpct/uncanonical_path/test.cpp

@@ -1,8 +1,10 @@
 // RUN: dpct --out-root %T/uncanonical_path %s --cuda-include-path="%cuda-path/include"
-// RUN: FileCheck --input-file %T/uncanonical_path/test.cpp --match-full-lines %s
-// RUN: %if build_lit %{icpx -c -fsycl %T/uncanonical_path/test.cpp -o %T/uncanonical_path/test.o %}
+// RUN: FileCheck --input-file %T/uncanonical_path/test.cpp.dp.cpp --match-full-lines %s
+// RUN: %if build_lit %{icpx -c -fsycl %T/uncanonical_path/test.cpp.dp.cpp -o %T/uncanonical_path/test.o %}
 
-// CHECK: #include "../uncanonical_path//test.h"
+// CHECK: #include <sycl/sycl.hpp>
+// CHECK-NEXT: #include <dpct/dpct.hpp>
+// CHECK-NEXT: #include "../uncanonical_path//test.h"
 #include "../uncanonical_path//test.h"
 
 int main() {