From: Chad Rosier Date: Sat, 28 May 2011 00:15:10 +0000 (+0000) Subject: Fix test cases that were previously using grep to use FileCheck X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=20ef3439db0e3d8596d2fb743f0cacd21dcc143f Fix test cases that were previously using grep to use FileCheck git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@132237 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/Bitcode/2006-12-11-Cast-ConstExpr.ll b/test/Bitcode/2006-12-11-Cast-ConstExpr.ll index 6df8711fe70..e704627e361 100644 --- a/test/Bitcode/2006-12-11-Cast-ConstExpr.ll +++ b/test/Bitcode/2006-12-11-Cast-ConstExpr.ll @@ -1,7 +1,7 @@ ; This test ensures that we get a bitcast constant expression in and out, ; not a sitofp constant expression. -; RUN: llvm-as < %s | llvm-dis | \ -; RUN: grep {bitcast (} +; RUN: llvm-as < %s | llvm-dis | FileCheck %s +; CHECK: bitcast ( @G = external global i32 diff --git a/test/Bitcode/AutoUpgradeGlobals.ll b/test/Bitcode/AutoUpgradeGlobals.ll index 8a8767337dc..19ec45a5e45 100644 --- a/test/Bitcode/AutoUpgradeGlobals.ll +++ b/test/Bitcode/AutoUpgradeGlobals.ll @@ -1,3 +1,4 @@ ; This isn't really an assembly file. It just runs test on bitcode to ensure ; it is auto-upgraded. -; RUN: llvm-dis < %s.bc | not grep {i32 @\\.llvm\\.eh} +; RUN: llvm-dis < %s.bc | FileCheck %s +; CHECK-NOT: {i32 @\\.llvm\\.eh} \ No newline at end of file diff --git a/test/Bitcode/AutoUpgradeIntrinsics.ll b/test/Bitcode/AutoUpgradeIntrinsics.ll index 5f9bcd56f19..c3e2e9e20c3 100644 --- a/test/Bitcode/AutoUpgradeIntrinsics.ll +++ b/test/Bitcode/AutoUpgradeIntrinsics.ll @@ -1,10 +1,8 @@ ; This isn't really an assembly file. It just runs test on bitcode to ensure ; it is auto-upgraded. -; RUN: llvm-dis < %s.bc | not grep {i32 @llvm\\.ct} -; RUN: llvm-dis < %s.bc | \ -; RUN: not grep {llvm\\.part\\.set\\.i\[0-9\]*\\.i\[0-9\]*\\.i\[0-9\]*} -; RUN: llvm-dis < %s.bc | \ -; RUN: not grep {llvm\\.part\\.select\\.i\[0-9\]*\\.i\[0-9\]*} -; RUN: llvm-dis < %s.bc | \ -; RUN: not grep {llvm\\.bswap\\.i\[0-9\]*\\.i\[0-9\]*} +; RUN: llvm-dis < %s.bc | FileCheck %s +; CHECK-NOT: {i32 @llvm\\.ct} +; CHECK-NOT: {llvm\\.part\\.set\\.i\[0-9\]*\\.i\[0-9\]*\\.i\[0-9\]*} +; CHECK-NOT: {llvm\\.part\\.select\\.i\[0-9\]*\\.i\[0-9\]*} +; CHECK-NOT: {llvm\\.bswap\\.i\[0-9\]*\\.i\[0-9\]*} diff --git a/test/Bitcode/sse2_loadl_pd.ll b/test/Bitcode/sse2_loadl_pd.ll index b0bea16a338..7e277022d30 100644 --- a/test/Bitcode/sse2_loadl_pd.ll +++ b/test/Bitcode/sse2_loadl_pd.ll @@ -1,2 +1,3 @@ -; RUN: llvm-dis < %s.bc | not grep {i32 @llvm\\.loadl.pd} -; RUN: llvm-dis < %s.bc | grep shufflevector +; RUN: llvm-dis < %s.bc | FileCheck %s +; CHECK-NOT: {i32 @llvm\\.loadl.pd} +; CHECK: shufflevector \ No newline at end of file diff --git a/test/Bitcode/sse2_movl_dq.ll b/test/Bitcode/sse2_movl_dq.ll index 093d8213ed4..7629e2ed71c 100644 --- a/test/Bitcode/sse2_movl_dq.ll +++ b/test/Bitcode/sse2_movl_dq.ll @@ -1,2 +1,3 @@ -; RUN: llvm-dis < %s.bc | not grep {i32 @llvm\\.movl.dq} -; RUN: llvm-dis < %s.bc | grep shufflevector +; RUN: llvm-dis < %s.bc | FileCheck %s +; CHECK-NOT: {i32 @llvm\\.movl.dq} +; CHECK: shufflevector \ No newline at end of file diff --git a/test/Bitcode/sse2_movs_d.ll b/test/Bitcode/sse2_movs_d.ll index 25a35b6455c..ab82c438881 100644 --- a/test/Bitcode/sse2_movs_d.ll +++ b/test/Bitcode/sse2_movs_d.ll @@ -1,2 +1,3 @@ -; RUN: llvm-dis < %s.bc | not grep {i32 @llvm\\.movs.d} -; RUN: llvm-dis < %s.bc | grep shufflevector +; RUN: llvm-dis < %s.bc | FileCheck %s +; CHECK-NOT: {i32 @llvm\\.movs.d} +; CHECK: shufflevector diff --git a/test/Bitcode/sse2_punpck_qdq.ll b/test/Bitcode/sse2_punpck_qdq.ll index b9d711c1084..4c68af50e86 100644 --- a/test/Bitcode/sse2_punpck_qdq.ll +++ b/test/Bitcode/sse2_punpck_qdq.ll @@ -1,3 +1,4 @@ -; RUN: llvm-dis < %s.bc | not grep {i32 @llvm\\.punpckh.qdq} -; RUN: llvm-dis < %s.bc | not grep {i32 @llvm\\.punpckl.qdq} -; RUN: llvm-dis < %s.bc | grep shufflevector +; RUN: llvm-dis < %s.bc | FileCheck %s +; CHECK-NOT: {i32 @llvm\\.punpckh.qdq} +; CHECK-NOT: {i32 @llvm\\.punpckl.qdq} +; CHECK: shufflevector diff --git a/test/Bitcode/sse2_shuf_pd.ll b/test/Bitcode/sse2_shuf_pd.ll index 5829edbc256..1ba6a1d8b99 100644 --- a/test/Bitcode/sse2_shuf_pd.ll +++ b/test/Bitcode/sse2_shuf_pd.ll @@ -1,2 +1,3 @@ -; RUN: llvm-dis < %s.bc | not grep {i32 @llvm\\.shuf.pd} -; RUN: llvm-dis < %s.bc | grep shufflevector +; RUN: llvm-dis < %s.bc | FileCheck %s +; CHECK-NOT: {i32 @llvm\\.shuf.pd} +; CHECK: shufflevector diff --git a/test/Bitcode/sse2_unpck_pd.ll b/test/Bitcode/sse2_unpck_pd.ll index f4e5d540684..99b61b697fe 100644 --- a/test/Bitcode/sse2_unpck_pd.ll +++ b/test/Bitcode/sse2_unpck_pd.ll @@ -1,3 +1,4 @@ -; RUN: llvm-dis < %s.bc | not grep {i32 @llvm\\.unpckh.pd} -; RUN: llvm-dis < %s.bc | not grep {i32 @llvm\\.unpckl.pd} -; RUN: llvm-dis < %s.bc | grep shufflevector +; RUN: llvm-dis < %s.bc | FileCheck %s +; CHECK-NOT: {i32 @llvm\\.unpckh.pd} +; CHECK-NOT: {i32 @llvm\\.unpckl.pd} +; CHECK: shufflevector diff --git a/test/Bitcode/sse41_pmulld.ll b/test/Bitcode/sse41_pmulld.ll index 6872cc0b712..752786da932 100644 --- a/test/Bitcode/sse41_pmulld.ll +++ b/test/Bitcode/sse41_pmulld.ll @@ -1,2 +1,3 @@ -; RUN: llvm-dis < %s.bc | not grep {i32 @llvm\\.pmulld} -; RUN: llvm-dis < %s.bc | grep mul +; RUN: llvm-dis < %s.bc | FileCheck %s +; CHECK-NOT: {i32 @llvm\\.pmulld} +; CHECK: mul diff --git a/test/Bitcode/sse42_crc32.ll b/test/Bitcode/sse42_crc32.ll index 9b2fcffca8e..1c371c3a235 100644 --- a/test/Bitcode/sse42_crc32.ll +++ b/test/Bitcode/sse42_crc32.ll @@ -3,14 +3,26 @@ ; ; Rdar: 9472944 ; -; RUN: llvm-dis < %s.bc | not grep {i32 @llvm.x86.sse42.crc32.8(} -; RUN: llvm-dis < %s.bc | grep {i32 @llvm.x86.sse42.crc32.32.8(} -; RUN: llvm-dis < %s.bc | not grep {i32 @llvm.x86.sse42.crc32.16(} -; RUN: llvm-dis < %s.bc | grep {i32 @llvm.x86.sse42.crc32.32.16(} -; RUN: llvm-dis < %s.bc | not grep {i32 @llvm.x86.sse42.crc32.32(} -; RUN: llvm-dis < %s.bc | grep {i32 @llvm.x86.sse42.crc32.32.32(} -; RUN: llvm-dis < %s.bc | not grep {i64 @llvm.x86.sse42.crc64.8(} -; RUN: llvm-dis < %s.bc | grep {i64 @llvm.x86.sse42.crc32.64.8(} -; RUN: llvm-dis < %s.bc | not grep {i64 @llvm.x86.sse42.crc64.64(} -; RUN: llvm-dis < %s.bc | grep {i64 @llvm.x86.sse42.crc32.64.64(} +; RUN: llvm-dis < %s.bc | FileCheck %s + +; crc32.8 should upgrade to crc32.32.8 +; CHECK: i32 @llvm.x86.sse42.crc32.32.8( +; CHECK-NOT: i32 @llvm.x86.sse42.crc32.8( + +; crc32.16 should upgrade to crc32.32.16 +; CHECK: i32 @llvm.x86.sse42.crc32.32.16( +; CHECK-NOT: i32 @llvm.x86.sse42.crc32.16( + +; crc32.32 should upgrade to crc32.32.32 +; CHECK: i32 @llvm.x86.sse42.crc32.32.32( +; CHECK-NOT: i32 @llvm.x86.sse42.crc32.32( + +; crc64.8 should upgrade to crc32.64.8 +; CHECK: i64 @llvm.x86.sse42.crc32.64.8( +; CHECK-NOT: i64 @llvm.x86.sse42.crc64.8( + +; crc64.64 should upgrade to crc32.64.64 +; CHECK: i64 @llvm.x86.sse42.crc32.64.64( +; CHECK-NOT: i64 @llvm.x86.sse42.crc64.64( + diff --git a/test/Bitcode/ssse3_palignr.ll b/test/Bitcode/ssse3_palignr.ll index d596dd5eb36..93407f570d8 100644 --- a/test/Bitcode/ssse3_palignr.ll +++ b/test/Bitcode/ssse3_palignr.ll @@ -1 +1,2 @@ -; RUN: llvm-dis < %s.bc | not grep {@llvm\\.palign} +; RUN: llvm-dis < %s.bc | FileCheck %s +; CHECK-NOT: {@llvm\\.palign} \ No newline at end of file