From ff429c5eaf79529aacdc15582c90c0915080e082 Mon Sep 17 00:00:00 2001 From: Sven van Haastregt Date: Tue, 31 Dec 2019 15:30:02 +0000 Subject: [PATCH] [OpenCL] Remove redundant foreach in OpenCLBuiltins.td; NFC Remove various `foreach` declarations where the iterator is used only once. This makes the .td file more compact. --- clang/lib/Sema/OpenCLBuiltins.td | 108 +++++++++---------------------- 1 file changed, 32 insertions(+), 76 deletions(-) diff --git a/clang/lib/Sema/OpenCLBuiltins.td b/clang/lib/Sema/OpenCLBuiltins.td index 72b72f60a662..d4c473e2a68f 100644 --- a/clang/lib/Sema/OpenCLBuiltins.td +++ b/clang/lib/Sema/OpenCLBuiltins.td @@ -979,25 +979,21 @@ foreach AS = [GlobalAS, LocalAS] in { //-------------------------------------------------------------------- // OpenCL v1.1 s6.11.12, v1.2 s6.12.12, v2.0 s6.13.12 - Miscellaneous Vector Functions // --- Table 19 --- -foreach name = ["shuffle"] in { - foreach VSize1 = [Vec2, Vec4, Vec8, Vec16] in { - foreach VSize2 = [Vec2, Vec4, Vec8, Vec16] in { - def : Builtin, - GenericType<"TLAll" # VSize2.Name, TLAll, VSize2>, - GenericType<"TLAllUnsigned" # VSize1.Name, TLAllUnsigned, VSize1>], - Attr.Const>; - } +foreach VSize1 = [Vec2, Vec4, Vec8, Vec16] in { + foreach VSize2 = [Vec2, Vec4, Vec8, Vec16] in { + def : Builtin<"shuffle", [GenericType<"TLAll" # VSize1.Name, TLAll, VSize1>, + GenericType<"TLAll" # VSize2.Name, TLAll, VSize2>, + GenericType<"TLAllUnsigned" # VSize1.Name, TLAllUnsigned, VSize1>], + Attr.Const>; } } -foreach name = ["shuffle2"] in { - foreach VSize1 = [Vec2, Vec4, Vec8, Vec16] in { - foreach VSize2 = [Vec2, Vec4, Vec8, Vec16] in { - def : Builtin, - GenericType<"TLAll" # VSize2.Name, TLAll, VSize2>, - GenericType<"TLAll" # VSize2.Name, TLAll, VSize2>, - GenericType<"TLAllUnsigned" # VSize1.Name, TLAllUnsigned, VSize1>], - Attr.Const>; - } +foreach VSize1 = [Vec2, Vec4, Vec8, Vec16] in { + foreach VSize2 = [Vec2, Vec4, Vec8, Vec16] in { + def : Builtin<"shuffle2", [GenericType<"TLAll" # VSize1.Name, TLAll, VSize1>, + GenericType<"TLAll" # VSize2.Name, TLAll, VSize2>, + GenericType<"TLAll" # VSize2.Name, TLAll, VSize2>, + GenericType<"TLAllUnsigned" # VSize1.Name, TLAllUnsigned, VSize1>], + Attr.Const>; } } @@ -1280,79 +1276,39 @@ let Extension = FuncExtKhrMipmapImage in { // Added to section 6.13.14.4. foreach aQual = ["WO"] in { foreach imgTy = [Image2d] in { - foreach name = ["write_imagef"] in { - def : Builtin, VectorType, Int, VectorType]>; - } - foreach name = ["write_imagei"] in { - def : Builtin, VectorType, Int, VectorType]>; - } - foreach name = ["write_imageui"] in { - def : Builtin, VectorType, Int, VectorType]>; - } - } - foreach imgTy = [Image2dDepth] in { - foreach name = ["write_imagef"] in { - def : Builtin, VectorType, Int, Float]>; - } + def : Builtin<"write_imagef", [Void, ImageType, VectorType, Int, VectorType]>; + def : Builtin<"write_imagei", [Void, ImageType, VectorType, Int, VectorType]>; + def : Builtin<"write_imageui", [Void, ImageType, VectorType, Int, VectorType]>; } + def : Builtin<"write_imagef", [Void, ImageType, VectorType, Int, Float]>; foreach imgTy = [Image1d] in { - foreach name = ["write_imagef"] in { - def : Builtin, Int, Int, VectorType]>; - } - foreach name = ["write_imagei"] in { - def : Builtin, Int, Int, VectorType]>; - } - foreach name = ["write_imageui"] in { - def : Builtin, Int, Int, VectorType]>; - } + def : Builtin<"write_imagef", [Void, ImageType, Int, Int, VectorType]>; + def : Builtin<"write_imagei", [Void, ImageType, Int, Int, VectorType]>; + def : Builtin<"write_imageui", [Void, ImageType, Int, Int, VectorType]>; } foreach imgTy = [Image1dArray] in { - foreach name = ["write_imagef"] in { - def : Builtin, VectorType, Int, VectorType]>; - } - foreach name = ["write_imagei"] in { - def : Builtin, VectorType, Int, VectorType]>; - } - foreach name = ["write_imageui"] in { - def : Builtin, VectorType, Int, VectorType]>; - } + def : Builtin<"write_imagef", [Void, ImageType, VectorType, Int, VectorType]>; + def : Builtin<"write_imagei", [Void, ImageType, VectorType, Int, VectorType]>; + def : Builtin<"write_imageui", [Void, ImageType, VectorType, Int, VectorType]>; } foreach imgTy = [Image2dArray] in { - foreach name = ["write_imagef"] in { - def : Builtin, VectorType, Int, VectorType]>; - } - foreach name = ["write_imagei"] in { - def : Builtin, VectorType, Int, VectorType]>; - } - foreach name = ["write_imageui"] in { - def : Builtin, VectorType, Int, VectorType]>; - } - } - foreach imgTy = [Image2dArrayDepth] in { - foreach name = ["write_imagef"] in { - def : Builtin, VectorType, Int, Float]>; - } + def : Builtin<"write_imagef", [Void, ImageType, VectorType, Int, VectorType]>; + def : Builtin<"write_imagei", [Void, ImageType, VectorType, Int, VectorType]>; + def : Builtin<"write_imageui", [Void, ImageType, VectorType, Int, VectorType]>; } + def : Builtin<"write_imagef", [Void, ImageType, VectorType, Int, Float]>; let Extension = FuncExtKhrMipmapAndWrite3d in { foreach imgTy = [Image3d] in { - foreach name = ["write_imagef"] in { - def : Builtin, VectorType, Int, VectorType]>; - } - foreach name = ["write_imagei"] in { - def : Builtin, VectorType, Int, VectorType]>; - } - foreach name = ["write_imageui"] in { - def : Builtin, VectorType, Int, VectorType]>; - } + def : Builtin<"write_imagef", [Void, ImageType, VectorType, Int, VectorType]>; + def : Builtin<"write_imagei", [Void, ImageType, VectorType, Int, VectorType]>; + def : Builtin<"write_imageui", [Void, ImageType, VectorType, Int, VectorType]>; } } } // Added to section 6.13.14.5 foreach aQual = ["RO", "WO", "RW"] in { - foreach name = ["get_image_num_mip_levels"] in { - foreach imgTy = [Image1d, Image2d, Image3d, Image1dArray, Image2dArray, Image2dDepth, Image2dArrayDepth] in { - def : Builtin]>; - } + foreach imgTy = [Image1d, Image2d, Image3d, Image1dArray, Image2dArray, Image2dDepth, Image2dArrayDepth] in { + def : Builtin<"get_image_num_mip_levels", [Int, ImageType]>; } } }