From 3dd4766499d25e5978a5d90001f18e657e875da0 Mon Sep 17 00:00:00 2001 From: haonanya Date: Thu, 12 Aug 2021 15:48:34 +0800 Subject: [PATCH 5/7] Remove __IMAGE_SUPPORT__ macro for SPIR since SPIR doesn't require image support Upstream-Status: Backport [Taken from opencl-clang patches; https://github.com/intel/opencl-clang/blob/ocl-open-100/patches/clang/0003-Remove-__IMAGE_SUPPORT__-macro-for-SPIR.patch] Signed-off-by: haonanya Signed-off-by: Naveen Saini --- clang/lib/Frontend/InitPreprocessor.cpp | 3 --- clang/test/Preprocessor/predefined-macros.c | 4 ---- 2 files changed, 7 deletions(-) diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp index aefd208e6cd3..b4a84636673a 100644 --- a/clang/lib/Frontend/InitPreprocessor.cpp +++ b/clang/lib/Frontend/InitPreprocessor.cpp @@ -1108,9 +1108,6 @@ static void InitializePredefinedMacros(const TargetInfo &TI, if (TI.getSupportedOpenCLOpts().isSupported(#Ext)) \ Builder.defineMacro(#Ext); #include "clang/Basic/OpenCLExtensions.def" - - if (TI.getTriple().isSPIR()) - Builder.defineMacro("__IMAGE_SUPPORT__"); } if (TI.hasInt128Type() && LangOpts.CPlusPlus && LangOpts.GNUMode) { diff --git a/clang/test/Preprocessor/predefined-macros.c b/clang/test/Preprocessor/predefined-macros.c index b088a37ba665..39a222d02faf 100644 --- a/clang/test/Preprocessor/predefined-macros.c +++ b/clang/test/Preprocessor/predefined-macros.c @@ -184,10 +184,6 @@ // MSCOPE:#define __OPENCL_MEMORY_SCOPE_WORK_GROUP 1 // MSCOPE:#define __OPENCL_MEMORY_SCOPE_WORK_ITEM 0 -// 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 - // RUN: %clang_cc1 %s -E -dM -o - -x hip -triple amdgcn-amd-amdhsa \ // RUN: | FileCheck -match-full-lines %s --check-prefix=CHECK-HIP // CHECK-HIP-NOT: #define __CUDA_ARCH__ -- 2.17.1