[SYCLomatic] Refine the migration of attribute __noinline__ to cover more scenarios (#2445)

Signed-off-by: intwanghao <[email protected]>

Author: intwanghao

clang/lib/DPCT/ASTTraversal.cpp

@@ -281,7 +281,10 @@ void IncludesCallbacks::MacroDefined(const Token &MacroNameTok,
 
     // The "__noinline__" macro is re-defined and it is used in
     // "__attribute__()", do not migrate it.
-    if (II->hasMacroDefinition() && (II->getName() == "__noinline__")) {
+    if ((GetSourceFileType(
+             DpctGlobalInfo::getInstance().getMainFile()->getFilePath()) ==
+         SPT_CppSource) &&
+        (II->getName() == "__noinline__")) {
       continue;
     }
 

clang/lib/Lex/Preprocessor.cpp

@@ -818,7 +818,7 @@ bool Preprocessor::HandleIdentifier(Token &Identifier) {
 #ifdef SYCLomatic_CUSTOMIZATION
   // The "__noinline__" macro is re-defined and it is used in "__attribute__()",
   // do not handle it.
-  if (LangOpts.CUDA && Identifier.is(tok::TokenKind::kw___noinline__) &&
+  if ((II.getName() == "__noinline__") &&
       IsInAnalysisScopeFunc(Identifier.getLocation()) && IsInAttr) {
     return true;
   }

clang/test/dpct/cppnoinline.cpp

@@ -0,0 +1,10 @@
+// RUN: dpct --format-range=none -out-root %T/cppnoinline %s --cuda-include-path="%cuda-path/include" -- -xc++
+// RUN: FileCheck %s --match-full-lines --input-file %T/cppnoinline/cppnoinline.cpp.dp.cpp
+// RUN: %if build_lit %{icpx -c -fsycl %T/cppnoinline/cppnoinline.cpp.dp.cpp -o %T/cppnoinline/cppnoinline.cpp.dp.o %}
+
+#include <cuda_runtime.h>
+
+// CHECK: #define NOINLINE __attribute__((__noinline__))
+#define NOINLINE __attribute__((__noinline__))
+// CHECK: NOINLINE void macro_in_macro_with_attr() {}
+NOINLINE void macro_in_macro_with_attr() {}

clang/test/dpct/noinline.cu

@@ -52,7 +52,3 @@ __noinline__ __host__ __device__ scalar_t calc_igammac(scalar_t a, scalar_t b) {
 
 // CHECK: __attribute__((__noinline__)) void macro_with_attr() {}
 __attribute__((__noinline__)) void macro_with_attr() {}
-// CHECK: #define NOINLINE __attribute__((__noinline__))
-#define NOINLINE __attribute__((__noinline__))
-// CHECK: NOINLINE void macro_in_macro_with_attr() {}
-NOINLINE void macro_in_macro_with_attr() {}