[SYCLomatic] Fix the issue that some macro cause sycl header file inserted. (#2724)

Signed-off-by: intwanghao <hao3.wang@intel.com>

Author: intwanghao

clang/lib/DPCT/Diagnostics/Diagnostics.h

@@ -433,6 +433,7 @@ bool report(const clang::tooling::UnifiedPath &FileAbsPath, unsigned int Offset,
         nullptr);
     if (UseTextBegin)
       R->setInsertPosition(InsertPosition::IP_Right);
+    R->setSYCLHeaderNeeded(false);
     DpctGlobalInfo::getInstance().addReplacement(R);
     UniqueID++;
   }

clang/lib/DPCT/PreProcessor.cpp

@@ -136,6 +136,13 @@ bool IncludesCallbacks::ReplaceCuMacro(const Token &MacroNameTok,
                                        0, SM, LangOptions())),
                                SM, LangOptions())
                                .str());
+    } else if (MacroName == "__CUDACC_VER_MAJOR__" ||
+               MacroName == "__CUDACC_VER_MINOR__") {
+      if (MacroNameTok.getIdentifierInfo()->hasMacroDefinition()) {
+        Repl->setSYCLHeaderNeeded(false);
+      } else {
+        return false;
+      }
     }
     if (DpctGlobalInfo::getContext().getLangOpts().CUDA) {
       // These two macros are defined by CUDA compiler
@@ -757,6 +764,10 @@ void IncludesCallbacks::ReplaceCuMacro(SourceRange ConditionRange, IfType IT,
       } else if ((MacroName != "__CUDACC__" ||
                   DpctGlobalInfo::getMacroDefines().count(MacroName)) &&
                  MacroName != "__CUDA_ARCH__") {
+        if (MacroName == "__CUDACC_VER_MAJOR__" ||
+            MacroName == "__CUDACC_VER_MINOR__") {
+          Repl->setSYCLHeaderNeeded(false);
+        }
         TransformSet.emplace_back(Repl);
       }
       // check next

clang/test/dpct/c_source_file_test/test.h

@@ -5,10 +5,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-// CHECK: #if defined(__ARM_NEON) && defined(SYCL_LANGUAGE_VERSION)
+// CHECK: #if defined(__ARM_NEON) && defined(SYCL_LANGUAGE_VERSION) && (DPCT_COMPAT_RT_MAJOR_VERSION == 11 && DPCT_COMPAT_RT_MINOR_VERSION < 2)
 // CHECK: typedef uint16_t fp16_t;
 // CHECK: #endif
-#if defined(__ARM_NEON) && defined(__CUDACC__)
+#if defined(__ARM_NEON) && defined(__CUDACC__) && (__CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ < 2)
 typedef uint16_t fp16_t;
 #endif