<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Mar 13, 2015 at 7:10 PM, Richard Smith <span dir="ltr"><<a href="mailto:richard@metafoo.co.uk" target="_blank">richard@metafoo.co.uk</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><span class="">On Fri, Mar 13, 2015 at 6:10 PM, Ahmed Bougacha <span dir="ltr"><<a href="mailto:ahmed.bougacha@gmail.com" target="_blank">ahmed.bougacha@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ab<br>
Date: Fri Mar 13 20:10:19 2015<br>
New Revision: 232237<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=232237&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=232237&view=rev</a><br>
Log:<br>
Add a bunch of missing "CHECK" colons in tests. NFC.<br></blockquote><div><br></div></span><div>Yikes! Can we make FileCheck error on a check prefix followed by a space?</div></div></div></div></blockquote><div><br>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)<br><br>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)<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="h5"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Modified:<br>
cfe/trunk/test/CodeGen/arm64_vset_lane.c<br>
cfe/trunk/test/CodeGen/fp16-ops.c<br>
cfe/trunk/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp<br>
cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp<br>
cfe/trunk/test/CodeGenObjCXX/<a href="http://message-reference.mm" target="_blank">message-reference.mm</a><br>
cfe/trunk/test/FixIt/fixit-objc-bridge-related.m<br>
cfe/trunk/test/Rewriter/rewrite-captured-nested-bvar.c<br>
cfe/trunk/test/Rewriter/<a href="http://rewrite-modern-captured-nested-bvar.mm" target="_blank">rewrite-modern-captured-nested-bvar.mm</a><br>
<br>
Modified: cfe/trunk/test/CodeGen/arm64_vset_lane.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/arm64_vset_lane.c?rev=232237&r1=232236&r2=232237&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/arm64_vset_lane.c?rev=232237&r1=232236&r2=232237&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGen/arm64_vset_lane.c (original)<br>
+++ cfe/trunk/test/CodeGen/arm64_vset_lane.c Fri Mar 13 20:10:19 2015<br>
@@ -6,13 +6,15 @@<br>
float16x4_t test_vset_lane_f16(float16_t *a1, float16x4_t a2) {<br>
// CHECK-LABEL: test_vset_lane_f16<br>
return vset_lane_f16(*a1, a2, 1);<br>
- // CHECK insertelement <4 x i16> %a2, i16 %a1, i32 1<br>
+ // CHECK: [[A1:%[0-9]+]] = load i16, i16* %a1<br>
+ // CHECK: insertelement <4 x i16> %a2, i16 [[A1]], i32 1<br>
}<br>
<br>
float16x8_t test_vsetq_lane_f16(float16_t *a1, float16x8_t a2) {<br>
// CHECK-LABEL: test_vsetq_lane_f16<br>
return vsetq_lane_f16(*a1, a2, 4);<br>
- // CHECK insertelement <8 x i16> %a2, i16 %a1, i32 4<br>
+ // CHECK: [[A1:%[0-9]+]] = load i16, i16* %a1<br>
+ // CHECK: insertelement <8 x i16> %a2, i16 [[A1]], i32 4<br>
}<br>
<br>
// problem with scalar_to_vector in backend. Punt for now<br>
@@ -27,5 +29,5 @@ float64x1_t test_vset_lane_f64(float64_t<br>
float64x2_t test_vsetq_lane_f64(float64_t a1, float64x2_t a2) {<br>
// CHECK-LABEL: test_vsetq_lane_f64<br>
return vsetq_lane_f64(a1, a2, 0);<br>
- // CHECK insertelement <2 x double> %a2, double %a1, i32 0<br>
+ // CHECK: insertelement <2 x double> %a2, double %a1, i32 0<br>
}<br>
<br>
Modified: cfe/trunk/test/CodeGen/fp16-ops.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/fp16-ops.c?rev=232237&r1=232236&r2=232237&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/fp16-ops.c?rev=232237&r1=232236&r2=232237&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGen/fp16-ops.c (original)<br>
+++ cfe/trunk/test/CodeGen/fp16-ops.c Fri Mar 13 20:10:19 2015<br>
@@ -12,7 +12,7 @@ void foo(void) {<br>
// Check unary ops<br>
<br>
// CHECK: call float @llvm.convert.from.fp16.f32(<br>
- // CHECK fptoi float<br>
+ // CHECK: fptoui float<br>
test = (h0);<br>
// CHECK: call float @llvm.convert.from.fp16.f32(<br>
// CHECK: fcmp une float<br>
<br>
Modified: cfe/trunk/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp?rev=232237&r1=232236&r2=232237&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp?rev=232237&r1=232236&r2=232237&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp (original)<br>
+++ cfe/trunk/test/CodeGenCXX/cxx0x-initializer-stdinitializerlist.cpp Fri Mar 13 20:10:19 2015<br>
@@ -291,7 +291,7 @@ namespace rdar13325066 {<br>
// CHECK: br label<br>
// CHECK: br i1<br>
// CHECK: br label<br>
- // CHECK call void @_ZN12rdar133250661XD1Ev<br>
+ // CHECK: call void @_ZN12rdar133250661XD1Ev<br>
// CHECK: br label<br>
// CHECK: br label<br>
// CHECK: call void @_ZN12rdar133250661XD1Ev<br>
<br>
Modified: cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp?rev=232237&r1=232236&r2=232237&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp?rev=232237&r1=232236&r2=232237&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp (original)<br>
+++ cfe/trunk/test/CodeGenCXX/debug-info-namespace.cpp Fri Mar 13 20:10:19 2015<br>
@@ -94,7 +94,7 @@ void B::func_fwd() {}<br>
// CHECK: [[M11]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, name: "X", scope: [[FUNC]], entity: [[CTXT]]<br>
// CHECK: [[M12]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, name: "Y", scope: [[FUNC]], entity: [[M11]]<br>
// CHECK: [[M13]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[VAR_DECL:![0-9]+]]<br>
-// CHECK [[VAR_DECL]] = !MDGlobalVariable(name: "var_decl", scope: [[NS]],{{.*}} line: 8,<br>
+// CHECK: [[VAR_DECL]] = !MDGlobalVariable(name: "var_decl", linkageName: "_ZN1A1B8var_declE", scope: [[NS]],{{.*}} line: 8,<br>
// CHECK: [[M14]] = !MDImportedEntity(tag: DW_TAG_imported_declaration, scope: [[FUNC]], entity: [[FUNC_DECL:![0-9]+]]<br>
// CHECK: [[FUNC_DECL]] = !MDSubprogram(name: "func_decl",<br>
// CHECK-SAME: scope: [[NS]], file: [[FOOCPP]], line: 9<br>
<br>
Modified: cfe/trunk/test/CodeGenObjCXX/<a href="http://message-reference.mm" target="_blank">message-reference.mm</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjCXX/message-reference.mm?rev=232237&r1=232236&r2=232237&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjCXX/message-reference.mm?rev=232237&r1=232236&r2=232237&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenObjCXX/<a href="http://message-reference.mm" target="_blank">message-reference.mm</a> (original)<br>
+++ cfe/trunk/test/CodeGenObjCXX/<a href="http://message-reference.mm" target="_blank">message-reference.mm</a> Fri Mar 13 20:10:19 2015<br>
@@ -17,4 +17,4 @@<br>
<br>
// CHECK: [[T:%.*]] = call dereferenceable({{[0-9]+}}) i32* bitcast (i8* (i8*, i8*, ...)* @objc_msgSend<br>
// CHECK: [[U:%.*]] = load i32, i32* [[T]]<br>
-// CHECK [[V:%.*]] = icmp eq i32 [[U]], 0<br>
+// CHECK: [[V:%.*]] = icmp eq i32 [[U]], 0<br>
<br>
Modified: cfe/trunk/test/FixIt/fixit-objc-bridge-related.m<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit-objc-bridge-related.m?rev=232237&r1=232236&r2=232237&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/FixIt/fixit-objc-bridge-related.m?rev=232237&r1=232236&r2=232237&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/FixIt/fixit-objc-bridge-related.m (original)<br>
+++ cfe/trunk/test/FixIt/fixit-objc-bridge-related.m Fri Mar 13 20:10:19 2015<br>
@@ -25,11 +25,11 @@ void test(UIButton *myButton) {<br>
// CHECK: {17:36-17:36}:"["<br>
// CHECK: {17:54-17:54}:" CGColor]"<br>
<br>
-// CHECK :{18:13-18:13}:"["<br>
+// CHECK: {18:13-18:13}:"["<br>
// CHECK: {18:31-18:31}:" CGColor]"<br>
<br>
-// CHECK :{22:25-22:25}:"["<br>
-// CHECK :{22:45-22:45}:" CGColor]"<br>
+// CHECK: {22:25-22:25}:"["<br>
+// CHECK: {22:45-22:45}:" CGColor]"<br>
<br>
@interface ImplicitPropertyTest<br>
- (UIColor *)tintColor;<br>
@@ -39,5 +39,5 @@ void test1(ImplicitPropertyTest *myImpli<br>
CGColorRef cgColor = (CGColorRef)[myImplicitPropertyTest tintColor];<br>
}<br>
<br>
-// CHECK :{39:36-39:36}:"["<br>
-// CHECK :{39:70-39:70}:" CGColor]"<br>
+// CHECK: {39:36-39:36}:"["<br>
+// CHECK: {39:70-39:70}:" CGColor]"<br>
<br>
Modified: cfe/trunk/test/Rewriter/rewrite-captured-nested-bvar.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-captured-nested-bvar.c?rev=232237&r1=232236&r2=232237&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-captured-nested-bvar.c?rev=232237&r1=232236&r2=232237&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Rewriter/rewrite-captured-nested-bvar.c (original)<br>
+++ cfe/trunk/test/Rewriter/rewrite-captured-nested-bvar.c Fri Mar 13 20:10:19 2015<br>
@@ -30,6 +30,6 @@ int main() {<br>
return 0;<br>
}<br>
<br>
-// CHECK 2: (__Block_byref_BYREF_VAR_CHECK_0 *)BYREF_VAR_CHECK<br>
+// CHECK: (__Block_byref_BYREF_VAR_CHECK_0 *)BYREF_VAR_CHECK<br>
// CHECK: (__Block_byref_BYREF_VAR_CHECK_0 *)&BYREF_VAR_CHECK<br>
// CHECK: (struct __Block_byref_BYREF_VAR_CHECK_0 *)&BYREF_VAR_CHECK, (struct __Block_byref_d_1 *)&d, 570425344));<br>
<br>
Modified: cfe/trunk/test/Rewriter/<a href="http://rewrite-modern-captured-nested-bvar.mm" target="_blank">rewrite-modern-captured-nested-bvar.mm</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-modern-captured-nested-bvar.mm?rev=232237&r1=232236&r2=232237&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Rewriter/rewrite-modern-captured-nested-bvar.mm?rev=232237&r1=232236&r2=232237&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Rewriter/<a href="http://rewrite-modern-captured-nested-bvar.mm" target="_blank">rewrite-modern-captured-nested-bvar.mm</a> (original)<br>
+++ cfe/trunk/test/Rewriter/<a href="http://rewrite-modern-captured-nested-bvar.mm" target="_blank">rewrite-modern-captured-nested-bvar.mm</a> Fri Mar 13 20:10:19 2015<br>
@@ -30,6 +30,6 @@ int main() {<br>
return 0;<br>
}<br>
<br>
-// CHECK 2: (__Block_byref_BYREF_VAR_CHECK_0 *)BYREF_VAR_CHECK<br>
+// CHECK: (__Block_byref_BYREF_VAR_CHECK_0 *)BYREF_VAR_CHECK<br>
// CHECK: {(void*)0,(__Block_byref_BYREF_VAR_CHECK_0 *)&BYREF_VAR_CHECK, 0, sizeof(__Block_byref_BYREF_VAR_CHECK_0), 'a'}<br>
// CHECK: __Block_byref_BYREF_VAR_CHECK_0 *)&BYREF_VAR_CHECK, (__Block_byref_d_1 *)&d, 570425344)));<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div></div></div><br></div></div>
<br>_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
<br></blockquote></div><br></div></div>