Define __IMAGE_SUPPORT__ macro for SPIR

[dmitry]

Summary

Add missing #define IMAGE_SUPPORT 1 for SPIR targets to indicate that SPIR supports images.

[Anastasia]

lib/Frontend/InitPreprocessor.cpp

1035 ↗

(On Diff #123591)

I am not sure if we should be checking for OpenCL too depending how SPIR target is used with non-OpenCL sources. Sam might be able to comment.

[dmitry]

Ping. @yaxunl, could you kindly review the patch? It's just a few lines of code.

[yaxunl]

lib/Frontend/InitPreprocessor.cpp

1035 ↗

(On Diff #123591)

Since this is part of OpenCL spec, I think better limit it to OpenCL.

[dmitry]

Guarded #define IMAGE_SUPPORT 1 with OpenCL

[dmitry]

@yaxunl, I moved IMAGE_SUPPORT macro definition so that now it's guarded by LangOpts.OpenCL
Could you kindly take a second look to the review. Thanks.

[yaxunl]

LGTM. Thanks!

cfe/trunk/lib/Frontend/InitPreprocessor.cpp

#undef DEFINE_LOCK_FREE_MACRO
 
   // OpenCL definitions.
   if (LangOpts.OpenCL) {
 #define OPENCLEXT(Ext) \
     if (TI.getSupportedOpenCLOpts().isSupported(#Ext, \
         LangOpts.OpenCLVersion)) \
       Builder.defineMacro(#Ext);
 #include "clang/Basic/OpenCLExtensions.def"
+
+    auto Arch = TI.getTriple().getArch();
+    if (Arch == llvm::Triple::spir || Arch == llvm::Triple::spir64)
+      Builder.defineMacro("__IMAGE_SUPPORT__");
   }
 
   if (TI.hasInt128Type() && LangOpts.CPlusPlus && LangOpts.GNUMode) {
     // For each extended integer type, g++ defines a macro mapping the
     // index of the type (0 in this case) in some list of extended types
     // to the type.
     Builder.defineMacro("__GLIBCXX_TYPE_INT_N_0", "__int128");
     Builder.defineMacro("__GLIBCXX_BITSIZE_INT_N_0", "128");

cfe/trunk/test/Preprocessor/predefined-macros.c

 
 // CHECK-ARM64-MINGW-NOT: #define _M_ARM64 1
 // CHECK-ARM64-MINGW: #define WIN32 1
 // CHECK-ARM64-MINGW: #define WIN64 1
 // CHECK-ARM64-MINGW: #define WINNT 1
 // CHECK-ARM64-MINGW: #define _WIN32 1
 // CHECK-ARM64-MINGW: #define _WIN64 1
 // CHECK-ARM64-MINGW: #define __aarch64__ 1
+
+// RUN: %clang_cc1 %s -E -dM -o - -x cl -triple spir-unknown-unknown \
+// RUN:   | FileCheck -match-full-lines %s --check-prefix=CHECK-SPIR
+// CHECK-SPIR: #define __IMAGE_SUPPORT__ 1