[PATCH] D71286: [SYCL] Add support for auxiliary triple specification to Frontend

[Alexey Bader via Phabricator via cfe-commits]

bader created this revision.
bader added a reviewer: ABataev.
Herald added subscribers: cfe-commits, Anastasia, ebevhan.
Herald added a reviewer: jdoerfert.
Herald added a project: clang.
bader added a comment.

I'm looking for test suggestions as I was not able to find tests covering similar changes for OpenMP compiler.

https://github.com/llvm/llvm-project/commit/59d7b77b16bf11810091fe75a4348198783d3fbc modifies driver and front-end, but adds only driver tests.


Add host predefined macros to compilation for SYCL device, which is
required for pre-processing host specific includes (e.g. system
headers).


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D71286

Files:
  clang/lib/Frontend/CompilerInstance.cpp
  clang/lib/Frontend/InitPreprocessor.cpp


Index: clang/lib/Frontend/InitPreprocessor.cpp
===================================================================
--- clang/lib/Frontend/InitPreprocessor.cpp
+++ clang/lib/Frontend/InitPreprocessor.cpp
@@ -1124,7 +1124,8 @@
   if (InitOpts.UsePredefines) {
     // FIXME: This will create multiple definitions for most of the predefined
     // macros. This is not the right way to handle this.
-    if ((LangOpts.CUDA || LangOpts.OpenMPIsDevice) && PP.getAuxTargetInfo())
+    if ((LangOpts.CUDA || LangOpts.OpenMPIsDevice || LangOpts.SYCLIsDevice) &&
+        PP.getAuxTargetInfo())
       InitializePredefinedMacros(*PP.getAuxTargetInfo(), LangOpts, FEOpts,
                                  PP.getPreprocessorOpts(), Builder);
 
Index: clang/lib/Frontend/CompilerInstance.cpp
===================================================================
--- clang/lib/Frontend/CompilerInstance.cpp
+++ clang/lib/Frontend/CompilerInstance.cpp
@@ -917,8 +917,9 @@
   if (!hasTarget())
     return false;
 
-  // Create TargetInfo for the other side of CUDA and OpenMP compilation.
-  if ((getLangOpts().CUDA || getLangOpts().OpenMPIsDevice) &&
+  // Create TargetInfo for the other side of CUDA/OpenMP/SYCL compilation.
+  if ((getLangOpts().CUDA || getLangOpts().OpenMPIsDevice ||
+       getLangOpts().SYCLIsDevice) &&
       !getFrontendOpts().AuxTriple.empty()) {
     auto TO = std::make_shared<TargetOptions>();
     TO->Triple = llvm::Triple::normalize(getFrontendOpts().AuxTriple);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D71286.233141.patch
Type: text/x-patch
Size: 1483 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20191210/b70be70c/attachment.bin>