diff options
author | Andrew Savonichev <andrew.savonichev@intel.com> | 2018-11-07 18:34:19 +0000 |
---|---|---|
committer | Andrew Savonichev <andrew.savonichev@intel.com> | 2018-11-07 18:34:19 +0000 |
commit | 3b12b7e702b2647593f234e8b06757ba19fec663 (patch) | |
tree | 3bd5a6b0f9a2f3bb7ed3464bc3cc64c213457e70 /clang/include | |
parent | d47d188b6ff1800c126f97f9759267219ceaf9fd (diff) | |
download | bcm5719-llvm-3b12b7e702b2647593f234e8b06757ba19fec663.tar.gz bcm5719-llvm-3b12b7e702b2647593f234e8b06757ba19fec663.zip |
Revert r346326 [OpenCL] Add support of cl_intel_device_side_avc_motion_estimation
This patch breaks Index/opencl-types.cl LIT test:
Script:
--
: 'RUN: at line 1'; stage1/bin/c-index-test -test-print-type llvm/tools/clang/test/Index/opencl-types.cl -cl-std=CL2.0 | stage1/bin/FileCheck llvm/tools/clang/test/Index/opencl-types.cl
--
Command Output (stderr):
--
llvm/tools/clang/test/Index/opencl-types.cl:3:26: warning: unsupported OpenCL extension 'cl_khr_fp16' - ignoring [-Wignored-pragmas]
llvm/tools/clang/test/Index/opencl-types.cl:4:26: warning: unsupported OpenCL extension 'cl_khr_fp64' - ignoring [-Wignored-pragmas]
llvm/tools/clang/test/Index/opencl-types.cl:8:9: error: use of type 'double' requires cl_khr_fp64 extension to be enabled
llvm/tools/clang/test/Index/opencl-types.cl:11:8: error: declaring variable of type 'half' is not allowed
llvm/tools/clang/test/Index/opencl-types.cl:15:3: error: use of type 'double' requires cl_khr_fp64 extension to be enabled
llvm/tools/clang/test/Index/opencl-types.cl:16:3: error: use of type 'double4' (vector of 4 'double' values) requires cl_khr_fp64 extension to be enabled
llvm/tools/clang/test/Index/opencl-types.cl:26:26: warning: unsupported OpenCL extension 'cl_khr_gl_msaa_sharing' - ignoring [-Wignored-pragmas]
llvm/tools/clang/test/Index/opencl-types.cl:35:44: error: use of type '__read_only image2d_msaa_t' requires cl_khr_gl_msaa_sharing extension to be enabled
llvm/tools/clang/test/Index/opencl-types.cl:36:49: error: use of type '__read_only image2d_array_msaa_t' requires cl_khr_gl_msaa_sharing extension to be enabled
llvm/tools/clang/test/Index/opencl-types.cl:37:49: error: use of type '__read_only image2d_msaa_depth_t' requires cl_khr_gl_msaa_sharing extension to be enabled
llvm/tools/clang/test/Index/opencl-types.cl:38:54: error: use of type '__read_only image2d_array_msaa_depth_t' requires cl_khr_gl_msaa_sharing extension to be enabled
llvm-svn: 346338
Diffstat (limited to 'clang/include')
-rw-r--r-- | clang/include/clang-c/Index.h | 16 | ||||
-rw-r--r-- | clang/include/clang/AST/ASTContext.h | 3 | ||||
-rw-r--r-- | clang/include/clang/AST/Type.h | 33 | ||||
-rw-r--r-- | clang/include/clang/Basic/OpenCLExtensionTypes.def | 41 | ||||
-rw-r--r-- | clang/include/clang/Basic/OpenCLExtensions.def | 1 | ||||
-rw-r--r-- | clang/include/clang/Sema/Initialization.h | 4 | ||||
-rw-r--r-- | clang/include/clang/Serialization/ASTBitCodes.h | 4 | ||||
-rw-r--r-- | clang/include/clang/module.modulemap | 1 |
8 files changed, 2 insertions, 101 deletions
diff --git a/clang/include/clang-c/Index.h b/clang/include/clang-c/Index.h index aaacb8d7976..56b510d03ab 100644 --- a/clang/include/clang-c/Index.h +++ b/clang/include/clang-c/Index.h @@ -3297,21 +3297,7 @@ enum CXTypeKind { CXType_ObjCObject = 161, CXType_ObjCTypeParam = 162, - CXType_Attributed = 163, - - CXType_OCLIntelSubgroupAVCMcePayload = 164, - CXType_OCLIntelSubgroupAVCImePayload = 165, - CXType_OCLIntelSubgroupAVCRefPayload = 166, - CXType_OCLIntelSubgroupAVCSicPayload = 167, - CXType_OCLIntelSubgroupAVCMceResult = 168, - CXType_OCLIntelSubgroupAVCImeResult = 169, - CXType_OCLIntelSubgroupAVCRefResult = 170, - CXType_OCLIntelSubgroupAVCSicResult = 171, - CXType_OCLIntelSubgroupAVCImeResultSingleRefStreamout = 172, - CXType_OCLIntelSubgroupAVCImeResultDualRefStreamout = 173, - CXType_OCLIntelSubgroupAVCImeSingleRefStreamin = 174, - - CXType_OCLIntelSubgroupAVCImeDualRefStreamin = 175 + CXType_Attributed = 163 }; /** diff --git a/clang/include/clang/AST/ASTContext.h b/clang/include/clang/AST/ASTContext.h index b90552596e1..5b693eb97f5 100644 --- a/clang/include/clang/AST/ASTContext.h +++ b/clang/include/clang/AST/ASTContext.h @@ -1062,9 +1062,6 @@ public: CanQualType OCLSamplerTy, OCLEventTy, OCLClkEventTy; CanQualType OCLQueueTy, OCLReserveIDTy; CanQualType OMPArraySectionTy; -#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) \ - CanQualType Id##Ty; -#include "clang/Basic/OpenCLExtensionTypes.def" // Types for deductions in C++0x [stmt.ranged]'s desugaring. Built on demand. mutable QualType AutoDeductTy; // Deduction against 'auto'. diff --git a/clang/include/clang/AST/Type.h b/clang/include/clang/AST/Type.h index 4a9decf6a7e..f69e1172ace 100644 --- a/clang/include/clang/AST/Type.h +++ b/clang/include/clang/AST/Type.h @@ -2046,13 +2046,6 @@ public: bool isQueueT() const; // OpenCL queue_t bool isReserveIDT() const; // OpenCL reserve_id_t -#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) \ - bool is##Id##Type() const; -#include "clang/Basic/OpenCLExtensionTypes.def" - // Type defined in cl_intel_device_side_avc_motion_estimation OpenCL extension - bool isOCLIntelSubgroupAVCType() const; - bool isOCLExtOpaqueType() const; // Any OpenCL extension type - bool isPipeType() const; // OpenCL pipe type bool isOpenCLSpecificType() const; // Any OpenCL specific type @@ -2400,9 +2393,6 @@ public: // OpenCL image types #define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) Id, #include "clang/Basic/OpenCLImageTypes.def" -// OpenCL extension types -#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) Id, -#include "clang/Basic/OpenCLExtensionTypes.def" // All other builtin types #define BUILTIN_TYPE(Id, SingletonId) Id, #define LAST_BUILTIN_TYPE(Id) LastKind = Id @@ -6464,30 +6454,9 @@ inline bool Type::isPipeType() const { return isa<PipeType>(CanonicalType); } -#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) \ - inline bool Type::is##Id##Type() const { \ - return isSpecificBuiltinType(BuiltinType::Id); \ - } -#include "clang/Basic/OpenCLExtensionTypes.def" - -inline bool Type::isOCLIntelSubgroupAVCType() const { -#define INTEL_SUBGROUP_AVC_TYPE(ExtType, Id) \ - isOCLIntelSubgroupAVC##Id##Type() || - return -#include "clang/Basic/OpenCLExtensionTypes.def" - false; // end of boolean or operation -} - -inline bool Type::isOCLExtOpaqueType() const { -#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) is##Id##Type() || - return -#include "clang/Basic/OpenCLExtensionTypes.def" - false; // end of boolean or operation -} - inline bool Type::isOpenCLSpecificType() const { return isSamplerT() || isEventT() || isImageType() || isClkEventT() || - isQueueT() || isReserveIDT() || isPipeType() || isOCLExtOpaqueType(); + isQueueT() || isReserveIDT() || isPipeType(); } inline bool Type::isTemplateTypeParmType() const { diff --git a/clang/include/clang/Basic/OpenCLExtensionTypes.def b/clang/include/clang/Basic/OpenCLExtensionTypes.def deleted file mode 100644 index b72f7efd6f2..00000000000 --- a/clang/include/clang/Basic/OpenCLExtensionTypes.def +++ /dev/null @@ -1,41 +0,0 @@ -//===-- OpenCLExtensionTypes.def - Metadata about BuiltinTypes ------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// This file extends builtin types database with OpenCL extension types. -// Custom code should define this macro: -// EXT_OPAQUE_TYPE(Name, Id, Ext) - -#ifdef EXT_OPAQUE_TYPE - -#ifndef INTEL_SUBGROUP_AVC_TYPE -#define INTEL_SUBGROUP_AVC_TYPE(Name, Id) \ - EXT_OPAQUE_TYPE(intel_sub_group_avc_##Name, OCLIntelSubgroupAVC##Id, \ - cl_intel_device_side_avc_motion_estimation) -#endif - -#endif - -#ifdef INTEL_SUBGROUP_AVC_TYPE -INTEL_SUBGROUP_AVC_TYPE(mce_payload_t, McePayload) -INTEL_SUBGROUP_AVC_TYPE(ime_payload_t, ImePayload) -INTEL_SUBGROUP_AVC_TYPE(ref_payload_t, RefPayload) -INTEL_SUBGROUP_AVC_TYPE(sic_payload_t, SicPayload) -INTEL_SUBGROUP_AVC_TYPE(mce_result_t, MceResult) -INTEL_SUBGROUP_AVC_TYPE(ime_result_t, ImeResult) -INTEL_SUBGROUP_AVC_TYPE(ref_result_t, RefResult) -INTEL_SUBGROUP_AVC_TYPE(sic_result_t, SicResult) -INTEL_SUBGROUP_AVC_TYPE(ime_result_single_reference_streamout_t, ImeResultSingleRefStreamout) -INTEL_SUBGROUP_AVC_TYPE(ime_result_dual_reference_streamout_t, ImeResultDualRefStreamout) -INTEL_SUBGROUP_AVC_TYPE(ime_single_reference_streamin_t, ImeSingleRefStreamin) -INTEL_SUBGROUP_AVC_TYPE(ime_dual_reference_streamin_t, ImeDualRefStreamin) - -#undef INTEL_SUBGROUP_AVC_TYPE -#endif // INTEL_SUBGROUP_AVC_TYPE - -#undef EXT_OPAQUE_TYPE - diff --git a/clang/include/clang/Basic/OpenCLExtensions.def b/clang/include/clang/Basic/OpenCLExtensions.def index 5e7d2cb473c..13cb12e7c58 100644 --- a/clang/include/clang/Basic/OpenCLExtensions.def +++ b/clang/include/clang/Basic/OpenCLExtensions.def @@ -85,7 +85,6 @@ OPENCLEXT_INTERNAL(cl_amd_media_ops2, 100, ~0U) // Intel OpenCL extensions OPENCLEXT_INTERNAL(cl_intel_subgroups, 120, ~0U) OPENCLEXT_INTERNAL(cl_intel_subgroups_short, 120, ~0U) -OPENCLEXT_INTERNAL(cl_intel_device_side_avc_motion_estimation, 120, ~0U) #undef OPENCLEXT_INTERNAL diff --git a/clang/include/clang/Sema/Initialization.h b/clang/include/clang/Sema/Initialization.h index 3a2d6275650..8b9f96417ee 100644 --- a/clang/include/clang/Sema/Initialization.h +++ b/clang/include/clang/Sema/Initialization.h @@ -1335,10 +1335,6 @@ public: /// from a zero constant. void AddOCLZeroOpaqueTypeStep(QualType T); - /// Add a step to initialize by zero types defined in the - /// cl_intel_device_side_avc_motion_estimation OpenCL extension - void AddOCLIntelSubgroupAVCZeroInitStep(QualType T); - /// Add steps to unwrap a initializer list for a reference around a /// single element and rewrap it at the end. void RewrapReferenceInitList(QualType T, InitListExpr *Syntactic); diff --git a/clang/include/clang/Serialization/ASTBitCodes.h b/clang/include/clang/Serialization/ASTBitCodes.h index ec752fb7c79..a49295b9623 100644 --- a/clang/include/clang/Serialization/ASTBitCodes.h +++ b/clang/include/clang/Serialization/ASTBitCodes.h @@ -1015,10 +1015,6 @@ namespace serialization { #define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix) \ PREDEF_TYPE_##Id##_ID, #include "clang/Basic/OpenCLImageTypes.def" - /// \brief OpenCL extension types with auto numeration -#define EXT_OPAQUE_TYPE(ExtType, Id, Ext) \ - PREDEF_TYPE_##Id##_ID, -#include "clang/Basic/OpenCLExtensionTypes.def" }; /// The number of predefined type IDs that are reserved for diff --git a/clang/include/clang/module.modulemap b/clang/include/clang/module.modulemap index b9ffb46ba1c..60febd2f6a4 100644 --- a/clang/include/clang/module.modulemap +++ b/clang/include/clang/module.modulemap @@ -52,7 +52,6 @@ module Clang_Basic { textual header "Basic/LangOptions.def" textual header "Basic/OpenCLExtensions.def" textual header "Basic/OpenCLImageTypes.def" - textual header "Basic/OpenCLExtensionTypes.def" textual header "Basic/OpenMPKinds.def" textual header "Basic/OperatorKinds.def" textual header "Basic/Sanitizers.def" |