r232237 - Add a bunch of missing "CHECK" colons in tests. NFC.

David Blaikie dblaikie at gmail.com
Fri Mar 13 19:18:51 PDT 2015


On Fri, Mar 13, 2015 at 7:10 PM, Richard Smith <richard at metafoo.co.uk>
wrote:

> On Fri, Mar 13, 2015 at 6:10 PM, Ahmed Bougacha <ahmed.bougacha at gmail.com>
> wrote:
>
>> Author: ab
>> Date: Fri Mar 13 20:10:19 2015
>> New Revision: 232237
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=232237&view=rev
>> Log:
>> Add a bunch of missing "CHECK" colons in tests.  NFC.
>>
>
> Yikes! Can we make FileCheck error on a check prefix followed by a space?
>

Just make the colon optional? (I wouldn't /actually/ like that, so I sort
of favor your suggestion, but in the name of usability I wonder if there's
much point to requiring the punctuation)

Though I seem to recall someone doing some test cleanup recently involving
misspellings of the CHECK prefix (either the literal CHECK, or misspelling
custom check prefixes, etc)


>
>
>> Modified:
>>     cfe/trunk/test/CodeGen/arm64_vset_lane.c
>>     cfe/trunk/test/CodeGen/fp16-ops.c
>>     cfe/trunk/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp
>>     cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp
>>     cfe/trunk/test/CodeGenObjCXX/message-reference.mm
>>     cfe/trunk/test/FixIt/fixit-objc-bridge-related.m
>>     cfe/trunk/test/Rewriter/rewrite-captured-nested-bvar.c
>>     cfe/trunk/test/Rewriter/rewrite-modern-captured-nested-bvar.mm
>>
>> Modified: cfe/trunk/test/CodeGen/arm64_vset_lane.c
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/arm64_vset_lane.c?rev=232237&r1=232236&r2=232237&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/test/CodeGen/arm64_vset_lane.c (original)
>> +++ cfe/trunk/test/CodeGen/arm64_vset_lane.c Fri Mar 13 20:10:19 2015
>> @@ -6,13 +6,15 @@
>>  float16x4_t test_vset_lane_f16(float16_t *a1, float16x4_t a2) {
>>    // CHECK-LABEL: test_vset_lane_f16
>>    return vset_lane_f16(*a1, a2, 1);
>> -  // CHECK insertelement <4 x i16> %a2, i16 %a1, i32 1
>> +  // CHECK: [[A1:%[0-9]+]] = load i16, i16* %a1
>> +  // CHECK: insertelement <4 x i16> %a2, i16 [[A1]], i32 1
>>  }
>>
>>  float16x8_t test_vsetq_lane_f16(float16_t *a1, float16x8_t a2) {
>>    // CHECK-LABEL: test_vsetq_lane_f16
>>    return vsetq_lane_f16(*a1, a2, 4);
>> -  // CHECK insertelement <8 x i16> %a2, i16 %a1, i32 4
>> +  // CHECK: [[A1:%[0-9]+]] = load i16, i16* %a1
>> +  // CHECK: insertelement <8 x i16> %a2, i16 [[A1]], i32 4
>>  }
>>
>>  // problem with scalar_to_vector in backend.  Punt for now
>> @@ -27,5 +29,5 @@ float64x1_t test_vset_lane_f64(float64_t
>>  float64x2_t test_vsetq_lane_f64(float64_t a1, float64x2_t a2) {
>>    // CHECK-LABEL: test_vsetq_lane_f64
>>    return vsetq_lane_f64(a1, a2, 0);
>> -  // CHECK insertelement <2 x double> %a2, double %a1, i32 0
>> +  // CHECK: insertelement <2 x double> %a2, double %a1, i32 0
>>  }
>>
>> Modified: cfe/trunk/test/CodeGen/fp16-ops.c
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/fp16-ops.c?rev=232237&r1=232236&r2=232237&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/test/CodeGen/fp16-ops.c (original)
>> +++ cfe/trunk/test/CodeGen/fp16-ops.c Fri Mar 13 20:10:19 2015
>> @@ -12,7 +12,7 @@ void foo(void) {
>>    // Check unary ops
>>
>>    // CHECK: call float @llvm.convert.from.fp16.f32(
>> -  // CHECK fptoi float
>> +  // CHECK: fptoui float
>>    test = (h0);
>>    // CHECK: call float @llvm.convert.from.fp16.f32(
>>    // CHECK: fcmp une float
>>
>> Modified:
>> cfe/trunk/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp?rev=232237&r1=232236&r2=232237&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp
>> (original)
>> +++ cfe/trunk/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp
>> Fri Mar 13 20:10:19 2015
>> @@ -291,7 +291,7 @@ namespace rdar13325066 {
>>      // CHECK: br label
>>      // CHECK: br i1
>>      // CHECK: br label
>> -    // CHECK call void @_ZN12rdar133250661XD1Ev
>> +    // CHECK: call void @_ZN12rdar133250661XD1Ev
>>      // CHECK: br label
>>      // CHECK: br label
>>      // CHECK: call void @_ZN12rdar133250661XD1Ev
>>
>> Modified: cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp?rev=232237&r1=232236&r2=232237&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp (original)
>> +++ cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp Fri Mar 13
>> 20:10:19 2015
>> @@ -94,7 +94,7 @@ void B::func_fwd() {}
>>  // CHECK: [[M11]] = !MDImportedEntity(tag: DW_TAG_imported_declaration,
>> name: "X", scope: [[FUNC]], entity: [[CTXT]]
>>  // CHECK: [[M12]] = !MDImportedEntity(tag: DW_TAG_imported_declaration,
>> name: "Y", scope: [[FUNC]], entity: [[M11]]
>>  // CHECK: [[M13]] = !MDImportedEntity(tag: DW_TAG_imported_declaration,
>> scope: [[FUNC]], entity: [[VAR_DECL:![0-9]+]]
>> -// CHECK [[VAR_DECL]] = !MDGlobalVariable(name: "var_decl", scope:
>> [[NS]],{{.*}} line: 8,
>> +// CHECK: [[VAR_DECL]] = !MDGlobalVariable(name: "var_decl",
>> linkageName: "_ZN1A1B8var_declE", scope: [[NS]],{{.*}} line: 8,
>>  // CHECK: [[M14]] = !MDImportedEntity(tag: DW_TAG_imported_declaration,
>> scope: [[FUNC]], entity: [[FUNC_DECL:![0-9]+]]
>>  // CHECK: [[FUNC_DECL]] = !MDSubprogram(name: "func_decl",
>>  // CHECK-SAME:                          scope: [[NS]], file: [[FOOCPP]],
>> line: 9
>>
>> Modified: cfe/trunk/test/CodeGenObjCXX/message-reference.mm
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjCXX/message-reference.mm?rev=232237&r1=232236&r2=232237&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/test/CodeGenObjCXX/message-reference.mm (original)
>> +++ cfe/trunk/test/CodeGenObjCXX/message-reference.mm Fri Mar 13
>> 20:10:19 2015
>> @@ -17,4 +17,4 @@
>>
>>  // CHECK: [[T:%.*]] = call dereferenceable({{[0-9]+}}) i32* bitcast (i8*
>> (i8*, i8*, ...)* @objc_msgSend
>>  // CHECK: [[U:%.*]] = load i32, i32* [[T]]
>> -// CHECK  [[V:%.*]] = icmp eq i32 [[U]], 0
>> +// CHECK: [[V:%.*]] = icmp eq i32 [[U]], 0
>>
>> Modified: cfe/trunk/test/FixIt/fixit-objc-bridge-related.m
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit-objc-bridge-related.m?rev=232237&r1=232236&r2=232237&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/test/FixIt/fixit-objc-bridge-related.m (original)
>> +++ cfe/trunk/test/FixIt/fixit-objc-bridge-related.m Fri Mar 13 20:10:19
>> 2015
>> @@ -25,11 +25,11 @@ void test(UIButton *myButton) {
>>  // CHECK: {17:36-17:36}:"["
>>  // CHECK: {17:54-17:54}:" CGColor]"
>>
>> -// CHECK :{18:13-18:13}:"["
>> +// CHECK: {18:13-18:13}:"["
>>  // CHECK: {18:31-18:31}:" CGColor]"
>>
>> -// CHECK :{22:25-22:25}:"["
>> -// CHECK :{22:45-22:45}:" CGColor]"
>> +// CHECK: {22:25-22:25}:"["
>> +// CHECK: {22:45-22:45}:" CGColor]"
>>
>>  @interface ImplicitPropertyTest
>>  - (UIColor *)tintColor;
>> @@ -39,5 +39,5 @@ void test1(ImplicitPropertyTest *myImpli
>>    CGColorRef cgColor = (CGColorRef)[myImplicitPropertyTest tintColor];
>>  }
>>
>> -// CHECK :{39:36-39:36}:"["
>> -// CHECK :{39:70-39:70}:" CGColor]"
>> +// CHECK: {39:36-39:36}:"["
>> +// CHECK: {39:70-39:70}:" CGColor]"
>>
>> Modified: cfe/trunk/test/Rewriter/rewrite-captured-nested-bvar.c
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-captured-nested-bvar.c?rev=232237&r1=232236&r2=232237&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/test/Rewriter/rewrite-captured-nested-bvar.c (original)
>> +++ cfe/trunk/test/Rewriter/rewrite-captured-nested-bvar.c Fri Mar 13
>> 20:10:19 2015
>> @@ -30,6 +30,6 @@ int main() {
>>      return 0;
>>  }
>>
>> -// CHECK 2: (__Block_byref_BYREF_VAR_CHECK_0 *)BYREF_VAR_CHECK
>> +// CHECK: (__Block_byref_BYREF_VAR_CHECK_0 *)BYREF_VAR_CHECK
>>  // CHECK: (__Block_byref_BYREF_VAR_CHECK_0 *)&BYREF_VAR_CHECK
>>  // CHECK: (struct __Block_byref_BYREF_VAR_CHECK_0 *)&BYREF_VAR_CHECK,
>> (struct __Block_byref_d_1 *)&d, 570425344));
>>
>> Modified: cfe/trunk/test/Rewriter/rewrite-modern-captured-nested-bvar.mm
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-modern-captured-nested-bvar.mm?rev=232237&r1=232236&r2=232237&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/test/Rewriter/rewrite-modern-captured-nested-bvar.mm
>> (original)
>> +++ cfe/trunk/test/Rewriter/rewrite-modern-captured-nested-bvar.mm Fri
>> Mar 13 20:10:19 2015
>> @@ -30,6 +30,6 @@ int main() {
>>      return 0;
>>  }
>>
>> -// CHECK 2: (__Block_byref_BYREF_VAR_CHECK_0 *)BYREF_VAR_CHECK
>> +// CHECK: (__Block_byref_BYREF_VAR_CHECK_0 *)BYREF_VAR_CHECK
>>  // CHECK: {(void*)0,(__Block_byref_BYREF_VAR_CHECK_0 *)&BYREF_VAR_CHECK,
>> 0, sizeof(__Block_byref_BYREF_VAR_CHECK_0), 'a'}
>>  // CHECK: __Block_byref_BYREF_VAR_CHECK_0 *)&BYREF_VAR_CHECK,
>> (__Block_byref_d_1 *)&d, 570425344)));
>>
>>
>> _______________________________________________
>> cfe-commits mailing list
>> cfe-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>>
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20150313/52d74e77/attachment.html>


More information about the cfe-commits mailing list