From e683c6b2e1e3d5a6b988960a7af84ed2fb2aa6ef Mon Sep 17 00:00:00 2001 From: Hans Wennborg <hans@hanshq.net> Date: Mon, 31 Aug 2015 21:48:52 +0000 Subject: [PATCH] Fix CHECK directives that weren't checking. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@246492 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/CodeGen/builtin-cpu-supports.c | 2 +- test/CodeGen/builtins-ppc-crypto.c | 17 +++++++++-------- test/CodeGen/builtins-ppc-p7.c | 10 +++++----- test/CodeGen/object-size.c | 4 ++-- test/CodeGenCXX/uncopyable-args.cpp | 6 +++--- test/CodeGenObjC/arc-loadweakretained-release.m | 2 +- test/Driver/linux-ld.c | 2 +- test/OpenMP/task_codegen.cpp | 2 +- test/OpenMP/threadprivate_codegen.cpp | 2 +- test/Preprocessor/traditional-cpp.c | 4 ++-- 10 files changed, 26 insertions(+), 25 deletions(-) diff --git a/test/CodeGen/builtin-cpu-supports.c b/test/CodeGen/builtin-cpu-supports.c index 2252b3e2b8c..96813923f27 100644 --- a/test/CodeGen/builtin-cpu-supports.c +++ b/test/CodeGen/builtin-cpu-supports.c @@ -10,7 +10,7 @@ int main() { // CHECK: [[LOAD:%[^ ]+]] = load i32, i32* getelementptr inbounds ({ i32, i32, i32, [1 x i32] }, { i32, i32, i32, [1 x i32] }* @__cpu_model, i32 0, i32 3, i32 0) // CHECK: [[AND:%[^ ]+]] = and i32 [[LOAD]], 256 - // CHECK = icmp ne i32 [[AND]], 0 + // CHECK: = icmp ne i32 [[AND]], 0 return 0; } diff --git a/test/CodeGen/builtins-ppc-crypto.c b/test/CodeGen/builtins-ppc-crypto.c index 0ade413cb6a..6daf608b6ff 100644 --- a/test/CodeGen/builtins-ppc-crypto.c +++ b/test/CodeGen/builtins-ppc-crypto.c @@ -34,7 +34,7 @@ vector unsigned char test_vpmsumb(void) vector unsigned char a = B_INIT1 vector unsigned char b = B_INIT2 return __builtin_altivec_crypto_vpmsumb(a, b); -// CHECK @llvm.ppc.altivec.crypto.vpmsumb +// CHECK: @llvm.ppc.altivec.crypto.vpmsumb } // CHECK-LABEL: define <8 x i16> @test_vpmsumh @@ -43,7 +43,7 @@ vector unsigned short test_vpmsumh(void) vector unsigned short a = H_INIT1 vector unsigned short b = H_INIT2 return __builtin_altivec_crypto_vpmsumh(a, b); -// CHECK @llvm.ppc.altivec.crypto.vpmsumh +// CHECK: @llvm.ppc.altivec.crypto.vpmsumh } // CHECK-LABEL: define <4 x i32> @test_vpmsumw @@ -52,7 +52,7 @@ vector unsigned int test_vpmsumw(void) vector unsigned int a = W_INIT1 vector unsigned int b = W_INIT2 return __builtin_altivec_crypto_vpmsumw(a, b); -// CHECK @llvm.ppc.altivec.crypto.vpmsumw +// CHECK: @llvm.ppc.altivec.crypto.vpmsumw } // CHECK-LABEL: define <2 x i64> @test_vpmsumd @@ -61,7 +61,7 @@ vector unsigned long long test_vpmsumd(void) vector unsigned long long a = D_INIT1 vector unsigned long long b = D_INIT2 return __builtin_altivec_crypto_vpmsumd(a, b); -// CHECK @llvm.ppc.altivec.crypto.vpmsumd +// CHECK: @llvm.ppc.altivec.crypto.vpmsumd } // CHECK-LABEL: define <2 x i64> @test_vsbox @@ -172,7 +172,7 @@ vector unsigned char test_vpmsumb_e(void) vector unsigned char a = B_INIT1 vector unsigned char b = B_INIT2 return __builtin_crypto_vpmsumb(a, b); -// CHECK @llvm.ppc.altivec.crypto.vpmsumb +// CHECK: @llvm.ppc.altivec.crypto.vpmsumb } // CHECK-LABEL: define <8 x i16> @test_vpmsumh_e @@ -181,7 +181,7 @@ vector unsigned short test_vpmsumh_e(void) vector unsigned short a = H_INIT1 vector unsigned short b = H_INIT2 return __builtin_crypto_vpmsumb(a, b); -// CHECK @llvm.ppc.altivec.crypto.vpmsumh +// CHECK: @llvm.ppc.altivec.crypto.vpmsumh } // CHECK-LABEL: define <4 x i32> @test_vpmsumw_e @@ -190,7 +190,7 @@ vector unsigned int test_vpmsumw_e(void) vector unsigned int a = W_INIT1 vector unsigned int b = W_INIT2 return __builtin_crypto_vpmsumb(a, b); -// CHECK @llvm.ppc.altivec.crypto.vpmsumw +// CHECK: @llvm.ppc.altivec.crypto.vpmsumw } // CHECK-LABEL: define <2 x i64> @test_vpmsumd_e @@ -199,7 +199,7 @@ vector unsigned long long test_vpmsumd_e(void) vector unsigned long long a = D_INIT1 vector unsigned long long b = D_INIT2 return __builtin_crypto_vpmsumb(a, b); -// CHECK @llvm.ppc.altivec.crypto.vpmsumd +// CHECK: @llvm.ppc.altivec.crypto.vpmsumd } // CHECK-LABEL: define <2 x i64> @test_vsbox_e @@ -227,6 +227,7 @@ vector unsigned short test_vpermxorh_e(void) vector unsigned short b = H_INIT2 vector unsigned short c = H_INIT2 return __builtin_crypto_vpermxor(a, b, c); +// CHECK: @llvm.ppc.altivec.crypto.vpermxor } // CHECK-LABEL: define <4 x i32> @test_vpermxorw_e diff --git a/test/CodeGen/builtins-ppc-p7.c b/test/CodeGen/builtins-ppc-p7.c index f5844103080..237a58fb84d 100644 --- a/test/CodeGen/builtins-ppc-p7.c +++ b/test/CodeGen/builtins-ppc-p7.c @@ -11,7 +11,7 @@ int test_divwe(void) int a = 74; int b = 32; return __builtin_divwe(a, b); -// CHECK @llvm.ppc.divwe +// CHECK: @llvm.ppc.divwe } // CHECK-LABEL: define zeroext i32 @test_divweu @@ -20,7 +20,7 @@ unsigned int test_divweu(void) unsigned int a = 74; unsigned int b = 32; return __builtin_divweu(a, b); -// CHECK @llvm.ppc.divweu +// CHECK: @llvm.ppc.divweu } // CHECK-LABEL: define i64 @test_divde @@ -29,7 +29,7 @@ long long test_divde(void) long long a = 74LL; long long b = 32LL; return __builtin_divde(a, b); -// CHECK @llvm.ppc.divde +// CHECK: @llvm.ppc.divde } // CHECK-LABEL: define i64 @test_divdeu @@ -38,7 +38,7 @@ unsigned long long test_divdeu(void) unsigned long long a = 74ULL; unsigned long long b = 32ULL; return __builtin_divdeu(a, b); -// CHECK @llvm.ppc.divdeu +// CHECK: @llvm.ppc.divdeu } // CHECK-LABEL: define i64 @test_bpermd @@ -47,6 +47,6 @@ long long test_bpermd(void) long long a = 74LL; long long b = 32LL; return __builtin_bpermd(a, b); -// CHECK @llvm.ppc.bpermd +// CHECK: @llvm.ppc.bpermd } diff --git a/test/CodeGen/object-size.c b/test/CodeGen/object-size.c index b88341b9568..ffd50cf9cf5 100644 --- a/test/CodeGen/object-size.c +++ b/test/CodeGen/object-size.c @@ -242,7 +242,7 @@ void test23(struct Test22Ty *p) { // PR24493 -- ICE if __builtin_object_size called with NULL and (Type & 1) != 0 -// CHECK @test24 +// CHECK: @test24 void test24() { // CHECK: call i64 @llvm.objectsize.i64.p0i8(i8* {{.*}}, i1 false) gi = __builtin_object_size((void*)0, 0); @@ -256,7 +256,7 @@ void test24() { gi = __builtin_object_size((void*)0, 3); } -// CHECK @test25 +// CHECK: @test25 void test25() { // CHECK: call i64 @llvm.objectsize.i64.p0i8(i8* {{.*}}, i1 false) gi = __builtin_object_size((void*)0x1000, 0); diff --git a/test/CodeGenCXX/uncopyable-args.cpp b/test/CodeGenCXX/uncopyable-args.cpp index 814cb6215d1..c1d284a7418 100644 --- a/test/CodeGenCXX/uncopyable-args.cpp +++ b/test/CodeGenCXX/uncopyable-args.cpp @@ -76,7 +76,7 @@ void bar() { // FIXME: The copy ctor is deleted. // CHECK-DISABLED-LABEL: define void @_ZN11all_deleted3barEv() // CHECK-DISABLED: call void @_Z{{.*}}C1Ev( -// CHECK-DISABLED-NOT call +// CHECK-DISABLED-NOT: call // CHECK-DISABLED: call void @_ZN11all_deleted3fooENS_1AE(%"struct.all_deleted::A"* %{{.*}}) // CHECK-DISABLED-LABEL: declare void @_ZN11all_deleted3fooENS_1AE(%"struct.all_deleted::A"*) @@ -96,7 +96,7 @@ void bar() { // FIXME: The copy and move ctors are implicitly deleted. // CHECK-DISABLED-LABEL: define void @_ZN18implicitly_deleted3barEv() // CHECK-DISABLED: call void @_Z{{.*}}C1Ev( -// CHECK-DISABLED-NOT call +// CHECK-DISABLED-NOT: call // CHECK-DISABLED: call void @_ZN18implicitly_deleted3fooENS_1AE(%"struct.implicitly_deleted::A"* %{{.*}}) // CHECK-DISABLED-LABEL: declare void @_ZN18implicitly_deleted3fooENS_1AE(%"struct.implicitly_deleted::A"*) @@ -116,7 +116,7 @@ void bar() { // FIXME: The copy constructor is implicitly deleted. // CHECK-DISABLED-LABEL: define void @_ZN11one_deleted3barEv() // CHECK-DISABLED: call void @_Z{{.*}}C1Ev( -// CHECK-DISABLED-NOT call +// CHECK-DISABLED-NOT: call // CHECK-DISABLED: call void @_ZN11one_deleted3fooENS_1AE(%"struct.one_deleted::A"* %{{.*}}) // CHECK-DISABLED-LABEL: declare void @_ZN11one_deleted3fooENS_1AE(%"struct.one_deleted::A"*) diff --git a/test/CodeGenObjC/arc-loadweakretained-release.m b/test/CodeGenObjC/arc-loadweakretained-release.m index 5d00ace6605..5392abdf8c5 100644 --- a/test/CodeGenObjC/arc-loadweakretained-release.m +++ b/test/CodeGenObjC/arc-loadweakretained-release.m @@ -66,7 +66,7 @@ void test1(int cond) { // CHECK-NEXT: br i1 [[ICRISNULL1]], label [[ICRDONE:%.*]], label [[ICRWRITEBACK:%.*]] // CHECK: [[TWO:%.*]] = load i8*, i8** [[INCRTEMP]] // CHECK-NEXT: [[THREE:%.*]] = call i8* @objc_storeWeak( -// CHECK-NEXT br label [[ICRDONE]] +// CHECK-NEXT: br label [[ICRDONE]] // CHECK: [[CLEANUPISACTIVE:%.*]] = load i1, i1* [[CONDCLEANUP]] // CHECK-NEXT: br i1 [[CLEANUPISACTIVE]], label [[CLEASNUPACTION:%.*]], label [[CLEANUPDONE:%.*]] diff --git a/test/Driver/linux-ld.c b/test/Driver/linux-ld.c index 3a326f4d017..c15e24d294a 100644 --- a/test/Driver/linux-ld.c +++ b/test/Driver/linux-ld.c @@ -102,7 +102,7 @@ // CHECK-LD-GCC: "-L[[SYSROOT]]/usr/lib/gcc/x86_64-unknown-linux/4.6.0/../../.." // CHECK-LD-GCC: "-L[[SYSROOT]]/lib" // CHECK-LD-GCC: "-L[[SYSROOT]]/usr/lib" -// CHECK-LD-GCC "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed" +// CHECK-LD-GCC: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed" // CHECK-LD-GCC: "-lc" // CHECK-LD-GCC: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed" // diff --git a/test/OpenMP/task_codegen.cpp b/test/OpenMP/task_codegen.cpp index 02141d1cc69..16a97d2ed77 100644 --- a/test/OpenMP/task_codegen.cpp +++ b/test/OpenMP/task_codegen.cpp @@ -18,7 +18,7 @@ struct S { ~S() {} }; int a; -// CHECK-LABEL : @main +// CHECK-LABEL: @main int main() { // CHECK: [[B:%.+]] = alloca i8 // CHECK: [[S:%.+]] = alloca [2 x [[STRUCT_S]]] diff --git a/test/OpenMP/threadprivate_codegen.cpp b/test/OpenMP/threadprivate_codegen.cpp index 7176e049927..bbe78b468da 100644 --- a/test/OpenMP/threadprivate_codegen.cpp +++ b/test/OpenMP/threadprivate_codegen.cpp @@ -943,7 +943,7 @@ int foobar() { // CHECK-TLS-NEXT: br i1 [[IS_INIT]], label %[[INIT_LABEL:[^,]+]], label %[[DONE_LABEL:[^,]+]]{{.*}} // CHECK-TLS: [[INIT_LABEL]] // CHECK-TLS: call void [[GS1_CXX_INIT]] -// CHECK-TLS-NOT call void [[GS2_CXX_INIT]] +// CHECK-TLS-NOT: call void [[GS2_CXX_INIT]] // CHECK-TLS: call void [[ARR_X_CXX_INIT]] // CHECK-TLS: call void [[ST_S4_ST_CXX_INIT]] // CHECK-TLS: [[DONE_LABEL]] diff --git a/test/Preprocessor/traditional-cpp.c b/test/Preprocessor/traditional-cpp.c index aa9f0f146e4..f311be0bb59 100644 --- a/test/Preprocessor/traditional-cpp.c +++ b/test/Preprocessor/traditional-cpp.c @@ -99,8 +99,8 @@ FOO_NO_STRINGIFY(foobar) */ #define FOO_NO_PASTE(a, b) test(b##a) -FOO_NO_PASTE(foo,bar) -/* CHECK {{^}}test(bar##foo){{$}} +FOO_NO_PASTE(xxx,yyy) +/* CHECK: {{^}}test(yyy##xxx){{$}} */ #define BAR_NO_STRINGIFY(a) test(#a) -- GitLab