<div dir="ltr">Nevermind, just saw the discussion on phab. Reverting while debugging is of course fine.</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Jun 14, 2019 at 8:26 AM Nico Weber <<a href="mailto:thakis@chromium.org">thakis@chromium.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">Most builds seem to be happy. Since you're seeing this problem, maybe you could debug it a bit?</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Jun 14, 2019 at 8:11 AM Sven van Haastregt via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Author: svenvh<br>
Date: Fri Jun 14 05:14:58 2019<br>
New Revision: 363376<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=363376&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=363376&view=rev</a><br>
Log:<br>
Revert "[OpenCL] Move OpenCLBuiltins.td and remove unused include"<br>
<br>
This reverts commit r363242 as it broke some builds with<br>
<br>
make[2]: *** No rule to make target 'ClangOpenCLBuiltinsImpl', needed by<br>
'tools/clang/lib/Sema/CMakeFiles/obj.clangSema.dir/SemaLookup.cpp.o'.<br>
<br>
Added:<br>
cfe/trunk/include/clang/Basic/OpenCLBuiltins.td<br>
- copied, changed from r363369, cfe/trunk/lib/Sema/OpenCLBuiltins.td<br>
Removed:<br>
cfe/trunk/lib/Sema/OpenCLBuiltins.td<br>
Modified:<br>
cfe/trunk/include/clang/Basic/CMakeLists.txt<br>
cfe/trunk/lib/Sema/CMakeLists.txt<br>
cfe/trunk/lib/Sema/SemaLookup.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Basic/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/CMakeLists.txt?rev=363376&r1=363375&r2=363376&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/CMakeLists.txt?rev=363376&r1=363375&r2=363376&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/CMakeLists.txt (original)<br>
+++ cfe/trunk/include/clang/Basic/CMakeLists.txt Fri Jun 14 05:14:58 2019<br>
@@ -41,6 +41,12 @@ clang_tablegen(AttrHasAttributeImpl.inc<br>
TARGET ClangAttrHasAttributeImpl<br>
)<br>
<br>
+clang_tablegen(OpenCLBuiltins.inc<br>
+ -I ${CMAKE_CURRENT_SOURCE_DIR}/../../ -gen-clang-opencl-builtins<br>
+ SOURCE OpenCLBuiltins.td<br>
+ TARGET ClangOpenCLBuiltinsImpl<br>
+ )<br>
+<br>
# ARM NEON<br>
clang_tablegen(arm_neon.inc -gen-arm-neon-sema<br>
SOURCE <a href="http://arm_neon.td" rel="noreferrer" target="_blank">arm_neon.td</a><br>
<br>
Copied: cfe/trunk/include/clang/Basic/OpenCLBuiltins.td (from r363369, cfe/trunk/lib/Sema/OpenCLBuiltins.td)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenCLBuiltins.td?p2=cfe/trunk/include/clang/Basic/OpenCLBuiltins.td&p1=cfe/trunk/lib/Sema/OpenCLBuiltins.td&r1=363369&r2=363376&rev=363376&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenCLBuiltins.td?p2=cfe/trunk/include/clang/Basic/OpenCLBuiltins.td&p1=cfe/trunk/lib/Sema/OpenCLBuiltins.td&r1=363369&r2=363376&rev=363376&view=diff</a><br>
==============================================================================<br>
(empty)<br>
<br>
Modified: cfe/trunk/lib/Sema/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/CMakeLists.txt?rev=363376&r1=363375&r2=363376&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/CMakeLists.txt?rev=363376&r1=363375&r2=363376&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/CMakeLists.txt (original)<br>
+++ cfe/trunk/lib/Sema/CMakeLists.txt Fri Jun 14 05:14:58 2019<br>
@@ -66,10 +66,3 @@ add_clang_library(clangSema<br>
clangEdit<br>
clangLex<br>
)<br>
-<br>
-clang_tablegen(OpenCLBuiltins.inc -gen-clang-opencl-builtins<br>
- SOURCE OpenCLBuiltins.td<br>
- TARGET ClangOpenCLBuiltinsImpl<br>
- )<br>
-<br>
-set_source_files_properties(SemaLookup.cpp OBJECT_DEPENDS ClangOpenCLBuiltinsImpl)<br>
<br>
Removed: cfe/trunk/lib/Sema/OpenCLBuiltins.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/OpenCLBuiltins.td?rev=363375&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/OpenCLBuiltins.td?rev=363375&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/OpenCLBuiltins.td (original)<br>
+++ cfe/trunk/lib/Sema/OpenCLBuiltins.td (removed)<br>
@@ -1,296 +0,0 @@<br>
-//==--- OpenCLBuiltins.td - OpenCL builtin declarations -------------------===//<br>
-//<br>
-// The LLVM Compiler Infrastructure<br>
-//<br>
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.<br>
-// See <a href="https://llvm.org/LICENSE.txt" rel="noreferrer" target="_blank">https://llvm.org/LICENSE.txt</a> for license information.<br>
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception<br>
-//<br>
-//===----------------------------------------------------------------------===//<br>
-//<br>
-// This file contains TableGen definitions for OpenCL builtin function<br>
-// declarations. In case of an unresolved function name in OpenCL, Clang will<br>
-// check for a function described in this file when -fdeclare-opencl-builtins<br>
-// is specified.<br>
-//<br>
-//===----------------------------------------------------------------------===//<br>
-<br>
-//===----------------------------------------------------------------------===//<br>
-// Definitions of miscellaneous basic entities.<br>
-//===----------------------------------------------------------------------===//<br>
-// Versions of OpenCL<br>
-class Version<int _Version> {<br>
- int Version = _Version;<br>
-}<br>
-def CL10: Version<100>;<br>
-def CL11: Version<110>;<br>
-def CL12: Version<120>;<br>
-def CL20: Version<200>;<br>
-<br>
-// Address spaces<br>
-// Pointer types need to be assigned an address space.<br>
-class AddressSpace<string _AS> {<br>
- string AddrSpace = _AS;<br>
-}<br>
-def default_as : AddressSpace<"clang::LangAS::Default">;<br>
-def private_as : AddressSpace<"clang::LangAS::opencl_private">;<br>
-def global_as : AddressSpace<"clang::LangAS::opencl_global">;<br>
-def constant_as : AddressSpace<"clang::LangAS::opencl_constant">;<br>
-def local_as : AddressSpace<"clang::LangAS::opencl_local">;<br>
-def generic_as : AddressSpace<"clang::LangAS::opencl_generic">;<br>
-<br>
-<br>
-// Qualified Type. Allow to retrieve one ASTContext QualType.<br>
-class QualType<string _Name> {<br>
- // Name of the field or function in a clang::ASTContext<br>
- // E.g. Name="IntTy" for the int type, and "getIntPtrType()" for an intptr_t<br>
- string Name = _Name;<br>
-}<br>
-<br>
-// Helper class to store type access qualifiers (volatile, const, ...).<br>
-class Qualifier<string _QualName> {<br>
- string QualName = _QualName;<br>
-}<br>
-<br>
-//===----------------------------------------------------------------------===//<br>
-// OpenCL C classes for types<br>
-//===----------------------------------------------------------------------===//<br>
-// OpenCL types (int, float, ...)<br>
-class Type<string _Name, QualType _QTName> {<br>
- // Name of the Type<br>
- string Name = _Name;<br>
- // QualType associated with this type<br>
- QualType QTName = _QTName;<br>
- // Size of the vector (if applicable)<br>
- int VecWidth = 0;<br>
- // Is pointer<br>
- bit IsPointer = 0;<br>
- // List of qualifiers associated with the type (volatile, ...)<br>
- list<Qualifier> QualList = [];<br>
- // Address space<br>
- string AddrSpace = "clang::LangAS::Default";<br>
- // Access qualifier. Must be one of ("RO", "WO", "RW").<br>
- string AccessQualifier = "";<br>
-}<br>
-<br>
-// OpenCL vector types (e.g. int2, int3, int16, float8, ...)<br>
-class VectorType<Type _Ty, int _VecWidth> : Type<_Ty.Name, _Ty.QTName> {<br>
- int VecWidth = _VecWidth;<br>
-}<br>
-<br>
-// OpenCL pointer types (e.g. int*, float*, ...)<br>
-class PointerType<Type _Ty, AddressSpace _AS = global_as> :<br>
- Type<_Ty.Name, _Ty.QTName> {<br>
- bit IsPointer = 1;<br>
- string AddrSpace = _AS.AddrSpace;<br>
-}<br>
-<br>
-// OpenCL image types (e.g. image2d_t, ...)<br>
-class ImageType<Type _Ty, QualType _QTName, string _AccessQualifier> :<br>
- Type<_Ty.Name, _QTName> {<br>
- let AccessQualifier = _AccessQualifier;<br>
-}<br>
-<br>
-//===----------------------------------------------------------------------===//<br>
-// OpenCL C class for builtin functions<br>
-//===----------------------------------------------------------------------===//<br>
-class Builtin<string _Name, list<Type> _Signature> {<br>
- // Name of the builtin function<br>
- string Name = _Name;<br>
- // List of types used by the function. The first one is the return type and<br>
- // the following are the arguments. The list must have at least one element<br>
- // (the return type).<br>
- list<Type> Signature = _Signature;<br>
- // OpenCL Extension to which the function belongs (cl_khr_subgroups, ...)<br>
- string Extension = "";<br>
- // OpenCL Version to which the function belongs (CL10, ...)<br>
- Version Version = CL10;<br>
-}<br>
-<br>
-//===----------------------------------------------------------------------===//<br>
-// Multiclass definitions<br>
-//===----------------------------------------------------------------------===//<br>
-// multiclass BifN: Creates Builtin class instances for OpenCL builtin<br>
-// functions with N arguments.<br>
-// _Name : Name of the function<br>
-// _Signature : Signature of the function (list of the Type used by the<br>
-// function, the first one being the return type).<br>
-// _IsVector : List of bit indicating if the type in the _Signature at the<br>
-// same index is to be a vector in the multiple overloads. The<br>
-// list must have at least one non-zero value.<br>
-multiclass Bif0<string _Name, list<Type> _Signature, list<bit> _IsVector> {<br>
- def : Builtin<_Name, _Signature>;<br>
- foreach v = [2, 3, 4, 8, 16] in {<br>
- def : Builtin<_Name,<br>
- [!if(_IsVector[0], VectorType<_Signature[0], v>, _Signature[0])]>;<br>
- }<br>
-}<br>
-multiclass Bif1<string _Name, list<Type> _Signature, list<bit> _IsVector> {<br>
- def : Builtin<_Name, _Signature>;<br>
- foreach v = [2, 3, 4, 8, 16] in {<br>
- def : Builtin<_Name,<br>
- [!if(_IsVector[0], VectorType<_Signature[0], v>, _Signature[0]),<br>
- !if(_IsVector[1], VectorType<_Signature[1], v>, _Signature[1])]>;<br>
- }<br>
-}<br>
-multiclass Bif2<string _Name, list<Type> _Signature, list<bit> _IsVector> {<br>
- def : Builtin<_Name, _Signature>;<br>
- foreach v = [2, 3, 4, 8, 16] in {<br>
- def : Builtin<_Name,<br>
- [!if(_IsVector[0], VectorType<_Signature[0], v>, _Signature[0]),<br>
- !if(_IsVector[1], VectorType<_Signature[1], v>, _Signature[1]),<br>
- !if(_IsVector[2], VectorType<_Signature[2], v>, _Signature[2])]>;<br>
- }<br>
-}<br>
-multiclass Bif3<string _Name, list<Type> _Signature, list<bit> _IsVector> {<br>
- def : Builtin<_Name, _Signature>;<br>
- foreach v = [2, 3, 4, 8, 16] in {<br>
- def : Builtin<_Name,<br>
- [!if(_IsVector[0], VectorType<_Signature[0], v>, _Signature[0]),<br>
- !if(_IsVector[1], VectorType<_Signature[1], v>, _Signature[1]),<br>
- !if(_IsVector[2], VectorType<_Signature[2], v>, _Signature[2]),<br>
- !if(_IsVector[3], VectorType<_Signature[3], v>, _Signature[3])]>;<br>
- }<br>
-}<br>
-//===----------------------------------------------------------------------===//<br>
-// Definitions of OpenCL C types<br>
-//===----------------------------------------------------------------------===//<br>
-// OpenCL v1.2 s6.1.1: Built-in Scalar Data Types<br>
-def bool_t : Type<"bool", QualType<"BoolTy">>;<br>
-def char_t : Type<"char", QualType<"CharTy">>;<br>
-def uchar_t : Type<"uchar", QualType<"UnsignedCharTy">>;<br>
-def short_t : Type<"short", QualType<"ShortTy">>;<br>
-def ushort_t : Type<"ushort", QualType<"UnsignedShortTy">>;<br>
-def int_t : Type<"int", QualType<"IntTy">>;<br>
-def uint_t : Type<"uint", QualType<"UnsignedIntTy">>;<br>
-def long_t : Type<"long", QualType<"LongTy">>;<br>
-def ulong_t : Type<"ulong", QualType<"UnsignedLongTy">>;<br>
-def float_t : Type<"float", QualType<"FloatTy">>;<br>
-def double_t : Type<"double", QualType<"DoubleTy">>;<br>
-def half_t : Type<"half", QualType<"HalfTy">>;<br>
-def size_t : Type<"size_t", QualType<"getSizeType()">>;<br>
-def ptrdiff_t : Type<"ptrdiff_t", QualType<"getPointerDiffType()">>;<br>
-def intptr_t : Type<"intptr_t", QualType<"getIntPtrType()">>;<br>
-def uintptr_t : Type<"uintptr_t", QualType<"getUIntPtrType()">>;<br>
-def void_t : Type<"void", QualType<"VoidTy">>;<br>
-<br>
-// OpenCL v1.2 s6.1.2: Built-in Vector Data Types<br>
-foreach v = [2, 3, 4, 8, 16] in {<br>
- def char#v#_t : VectorType<char_t, v>;<br>
- def uchar#v#_t : VectorType<uchar_t, v>;<br>
- def short#v#_t : VectorType<short_t, v>;<br>
- def ushort#v#_t : VectorType<ushort_t, v>;<br>
- def "int"#v#_t : VectorType<int_t, v>;<br>
- def uint#v#_t : VectorType<uint_t, v>;<br>
- def long#v#_t : VectorType<long_t, v>;<br>
- def ulong#v#_t : VectorType<ulong_t, v>;<br>
- def float#v#_t : VectorType<float_t, v>;<br>
- def double#v#_t : VectorType<double_t, v>;<br>
- def half#v#_t : VectorType<half_t, v>;<br>
-}<br>
-<br>
-// OpenCL v1.2 s6.1.3: Other Built-in Data Types<br>
-// These definitions with a "null" name are "abstract". They should not<br>
-// be used in definitions of Builtin functions.<br>
-def image2d_t : Type<"image2d_t", QualType<"null">>;<br>
-def image3d_t : Type<"image3d_t", QualType<"null">>;<br>
-def image2d_array_t : Type<"image2d_array_t", QualType<"null">>;<br>
-def image1d_t : Type<"image1d_t", QualType<"null">>;<br>
-def image1d_buffer_t : Type<"image1d_buffer_t", QualType<"null">>;<br>
-def image1d_array_t : Type<"image1d_array_t", QualType<"null">>;<br>
-// Unlike the few functions above, the following definitions can be used<br>
-// in definitions of Builtin functions (they have a QualType with a name).<br>
-foreach v = ["RO", "WO", "RW"] in {<br>
- def image2d_#v#_t : ImageType<image2d_t,<br>
- QualType<"OCLImage2d"#v#"Ty">,<br>
- v>;<br>
- def image3d_#v#_t : ImageType<image3d_t,<br>
- QualType<"OCLImage3d"#v#"Ty">,<br>
- v>;<br>
- def image2d_array#v#_t : ImageType<image2d_array_t,<br>
- QualType<"OCLImage2dArray"#v#"Ty">,<br>
- v>;<br>
- def image1d_#v#_t : ImageType<image1d_t,<br>
- QualType<"OCLImage1d"#v#"Ty">,<br>
- v>;<br>
- def image1d_buffer#v#_t : ImageType<image1d_buffer_t,<br>
- QualType<"OCLImage1dBuffer"#v#"Ty">,<br>
- v>;<br>
- def image1d_array#v#_t : ImageType<image1d_array_t,<br>
- QualType<"OCLImage1dArray"#v#"Ty">,<br>
- v>;<br>
-}<br>
-<br>
-def sampler_t : Type<"sampler_t", QualType<"OCLSamplerTy">>;<br>
-def event_t : Type<"event_t", QualType<"OCLEventTy">>;<br>
-<br>
-//===----------------------------------------------------------------------===//<br>
-// Definitions of OpenCL builtin functions<br>
-//===----------------------------------------------------------------------===//<br>
-// OpenCL v1.2 s6.2.3: Explicit Conversions<br>
-// Generate the convert_ builtins.<br>
-foreach RType = [float_t, double_t, char_t, uchar_t, short_t, ushort_t,<br>
- int_t, uint_t, long_t, ulong_t] in {<br>
- foreach IType = [float_t, double_t, char_t, uchar_t, short_t, ushort_t,<br>
- int_t, uint_t, long_t, ulong_t] in {<br>
- foreach sat = ["", "_sat"] in {<br>
- foreach rte = ["", "_rte", "_rtz", "_rtp", "_rtn"] in {<br>
- def : Builtin<"convert_" # RType.Name # sat # rte, [RType, IType]>;<br>
- foreach v = [2, 3, 4, 8, 16] in {<br>
- def : Builtin<"convert_" # RType.Name # v # sat # rte,<br>
- [VectorType<RType, v>,<br>
- VectorType<IType, v>]>;<br>
- }<br>
- }<br>
- }<br>
- }<br>
-}<br>
-<br>
-// OpenCL v1.2 s6.12.1: Work-Item Functions<br>
-def get_work_dim : Builtin<"get_work_dim", [uint_t]>;<br>
-foreach name = ["get_global_size", "get_global_id", "get_local_size",<br>
- "get_local_id", "get_num_groups", "get_group_id",<br>
- "get_global_offset"] in {<br>
- def : Builtin<name, [size_t, uint_t]>;<br>
-}<br>
-<br>
-// OpenCL v1.2 s6.12.2: Math Functions<br>
-foreach name = ["acos", "acosh", "acospi",<br>
- "asin", "asinh", "asinpi",<br>
- "atan", "atanh", "atanpi"] in {<br>
- foreach type = [float_t, double_t, half_t] in {<br>
- defm : Bif1<name, [type, type], [1, 1]>;<br>
- }<br>
-}<br>
-<br>
-foreach name = ["atan2", "atan2pi"] in {<br>
- foreach type = [float_t, double_t, half_t] in {<br>
- defm : Bif2<name, [type, type, type], [1, 1, 1]>;<br>
- }<br>
-}<br>
-<br>
-foreach name = ["fmax", "fmin"] in {<br>
- foreach type = [float_t, double_t, half_t] in {<br>
- defm : Bif2<name, [type, type, type], [1, 1, 1]>;<br>
- defm : Bif2<name, [type, type, type], [1, 1, 0]>;<br>
- }<br>
-}<br>
-<br>
-// OpenCL v1.2 s6.12.14: Built-in Image Read Functions<br>
-def read_imagef : Builtin<"read_imagef",<br>
- [float4_t, image2d_RO_t, VectorType<int_t, 2>]>;<br>
-def write_imagef : Builtin<"write_imagef",<br>
- [void_t,<br>
- image2d_WO_t,<br>
- VectorType<int_t, 2>,<br>
- VectorType<float_t, 4>]>;<br>
-<br>
-<br>
-// OpenCL v2.0 s9.17.3: Additions to section 6.13.1: Work-Item Functions<br>
-let Version = CL20 in {<br>
- let Extension = "cl_khr_subgroups" in {<br>
- def get_sub_group_size : Builtin<"get_sub_group_size", [uint_t]>;<br>
- def get_max_sub_group_size : Builtin<"get_max_sub_group_size", [uint_t]>;<br>
- def get_num_sub_groups : Builtin<"get_num_sub_groups", [uint_t]>;<br>
- }<br>
-}<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaLookup.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaLookup.cpp?rev=363376&r1=363375&r2=363376&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaLookup.cpp?rev=363376&r1=363375&r2=363376&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaLookup.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaLookup.cpp Fri Jun 14 05:14:58 2019<br>
@@ -46,7 +46,7 @@<br>
#include <utility><br>
#include <vector><br>
<br>
-#include "OpenCLBuiltins.inc"<br>
+#include "clang/Basic/OpenCLBuiltins.inc"<br>
<br>
using namespace clang;<br>
using namespace sema;<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>
</blockquote></div>