[SYCLomatic] Skip CUDA SDK header path specified by the option "-isystem" in the auto-generated Makefile (#2241)

Signed-off-by: chenwei.sun <[email protected]>

Author: tomflinda

clang/lib/DPCT/GenMakefile.cpp

@@ -12,12 +12,16 @@
 #include "Utility.h"
 #include "ValidateArguments.h"
 
+#include "ToolChains/Cuda.h"
+#include "clang/Driver/Driver.h"
+#include "clang/Driver/Options.h"
 #include "clang/Tooling/Refactoring.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/raw_os_ostream.h"
+#include "llvm/TargetParser/Host.h"
 
 #include <fstream>
 #include <string>
@@ -210,6 +214,27 @@ static void getCompileInfo(
         clang::tooling::UnifiedPath IncPath = Option;
         rewriteCanonicalDir(IncPath, InRoot, OutRoot);
 
+        unsigned MissingArgIndex, MissingArgCount;
+        MissingArgIndex = MissingArgCount = 0;
+        auto &Opts = clang::driver::getDriverOptTable();
+        llvm::opt::InputArgList ParsedArgs =
+            Opts.ParseArgs(nullptr, MissingArgIndex, MissingArgCount);
+
+        // Create minimalist CudaInstallationDetector to call the member
+        // function validateCudaHeaderDirectory()
+        DiagnosticsEngine E(nullptr, nullptr, nullptr, false);
+        clang::driver::Driver Driver("", llvm::sys::getDefaultTargetTriple(),
+                                     E);
+        clang::driver::CudaInstallationDetector CudaIncludeDetector(
+            Driver, llvm::Triple(Driver.getTargetTriple()), ParsedArgs);
+        bool Ret = CudaIncludeDetector.validateCudaHeaderDirectory(
+            IncPath.getCanonicalPath().str(), Driver);
+        if (Ret) {
+          // Skip CUDA SDK header path specified by option "-isystem" in the
+          // auto-generated Makefile.
+          continue;
+        }
+
         NewOptions += "-isystem ";
         SmallString<512> OutDirectory(IncPath.getCanonicalPath());
         llvm::sys::path::replace_path_prefix(OutDirectory,

clang/lib/Tooling/Core/UnifiedPath.cpp

@@ -12,6 +12,10 @@
 namespace clang {
 namespace tooling {
 void UnifiedPath::makeCanonical(const std::string &CWD) {
+  // To remove quotation marks from _Path
+  if (_Path.size() >= 2 && _Path.front() == '"' && _Path.back() == '"') {
+    _Path = _Path.substr(1, _Path.size() - 2);
+  }
   if (_Path.empty()) {
     return;
   }

clang/test/dpct/gen-build-script.cpp

@@ -28,7 +28,7 @@
 // RUN: cd ..
 // RUN: rm -rf ./gen-build-script
 
-// CHECK: -DFOOBAR -msse4.1 -mavx512vl -O2 -isystem {{.*}}/include
+// CHECK: -DFOOBAR -msse4.1 -mavx512vl -O2
 
 void foo() {
 }