[SYCLomatic] Fix the build issue that dnnl_utils.hpp is not included before sycl.hpp #854

Solution: include dnnl_utils.hpp in main source file if it has used DNN syntactics.

Signed-off-by: Hao Wang <[email protected]>

Author: intwanghao

clang/lib/DPCT/AnalysisInfo.cpp

@@ -979,6 +979,12 @@ std::optional<HeaderType> DpctFileInfo::findHeaderType(StringRef Header) {
 }
 
 void DpctFileInfo::insertHeader(HeaderType Type, unsigned Offset) {
+  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 (HeaderInsertedBitMap[Type])
     return;
   HeaderInsertedBitMap[Type] = true;
@@ -996,9 +1002,6 @@ void DpctFileInfo::insertHeader(HeaderType Type, unsigned Offset) {
   case HT_DPL_Algorithm:
   case HT_DPL_Execution:
   case HT_DPCT_DNNL_Utils:
-    if (this != DpctGlobalInfo::getInstance().getMainFile().get())
-      DpctGlobalInfo::getInstance().getMainFile()->insertHeader(
-          Type, FirstIncludeOffset);
     concatHeader(OS, getHeaderSpelling(Type));
     return insertHeader(OS.str(), FirstIncludeOffset,
                         InsertPosition::IP_AlwaysLeft);

clang/test/dpct/header_order/dnn.cu

@@ -0,0 +1,12 @@
+// RUN: echo
+// CHECK: #include <dpct/dnnl_utils.hpp>
+// CHECK: #include <sycl/sycl.hpp>
+// CHECK: #include <dpct/dpct.hpp>
+#include "dnn.h"
+
+int test(cudnnHandle_t handle){
+
+ cudnnCreate(&handle);
+ return 0;
+
+}

clang/test/dpct/header_order/dnn.h

@@ -0,0 +1,3 @@
+#include <cudnn.h>
+
+int test(cudnnHandle_t handle);

clang/test/dpct/header_order/test.cu

@@ -0,0 +1,17 @@
+// RUN: dpct -in-root %S -out-root %T/header_order %S/test.cu %S/dnn.cu --cuda-include-path="%cuda-path/include" -- -std=c++14 -x cuda --cuda-host-only
+// RUN: FileCheck --input-file %T/header_order/test.dp.cpp --match-full-lines %s
+// RUN: FileCheck --input-file %T/header_order/dnn.dp.cpp --match-full-lines %s
+// CHECK: #include <dpct/dnnl_utils.hpp>
+// CHECK: #include <sycl/sycl.hpp>
+// CHECK: #include <dpct/dpct.hpp>
+#include <stdlib.h>
+#include <iostream>
+#include <algorithm>
+
+#include "dnn.h"
+
+int main(){
+  cudnnHandle_t handle;
+  test(handle);
+  return 0;
+}