[llvm] r221459 - Use FileCheck in a few tests.

Rafael Espindola rafael.espindola at gmail.com
Thu Nov 6 07:05:51 PST 2014


Author: rafael
Date: Thu Nov  6 09:05:51 2014
New Revision: 221459

URL: http://llvm.org/viewvc/llvm-project?rev=221459&view=rev
Log:
Use FileCheck in a few tests.

Modified:
    llvm/trunk/test/Analysis/ScalarEvolution/sext-iv-1.ll
    llvm/trunk/test/Assembler/2004-02-01-NegativeZero.ll
    llvm/trunk/test/Assembler/2004-11-28-InvalidTypeCrash.ll
    llvm/trunk/test/Assembler/2005-01-03-FPConstantDisassembly.ll
    llvm/trunk/test/Assembler/2007-01-02-Undefined-Arg-Type.ll
    llvm/trunk/test/Assembler/2007-03-19-NegValue.ll
    llvm/trunk/test/Assembler/2007-04-25-AssemblerFoldExternWeak.ll
    llvm/trunk/test/Assembler/2007-09-29-GC.ll
    llvm/trunk/test/CodeGen/ARM/2007-05-07-tailmerge-1.ll

Modified: llvm/trunk/test/Analysis/ScalarEvolution/sext-iv-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/sext-iv-1.ll?rev=221459&r1=221458&r2=221459&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/sext-iv-1.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/sext-iv-1.ll Thu Nov  6 09:05:51 2014
@@ -1,5 +1,12 @@
 ; RUN: opt < %s -scalar-evolution -analyze \
-; RUN:  | grep " -->  (sext i. {.*,+,.*}<%bb1> to i64)" | count 5
+; RUN:  | FileCheck %s
+
+; CHECK: -->  (sext i{{.}} {{{.*}},+,{{.*}}}<%bb1> to i64)
+; CHECK: -->  (sext i{{.}} {{{.*}},+,{{.*}}}<%bb1> to i64)
+; CHECK: -->  (sext i{{.}} {{{.*}},+,{{.*}}}<%bb1> to i64)
+; CHECK: -->  (sext i{{.}} {{{.*}},+,{{.*}}}<%bb1> to i64)
+; CHECK: -->  (sext i{{.}} {{{.*}},+,{{.*}}}<%bb1> to i64)
+; CHECK-NOT: -->  (sext
 
 ; Don't convert (sext {...,+,...}) to {sext(...),+,sext(...)} in cases
 ; where the trip count is not within range.

Modified: llvm/trunk/test/Assembler/2004-02-01-NegativeZero.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2004-02-01-NegativeZero.ll?rev=221459&r1=221458&r2=221459&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2004-02-01-NegativeZero.ll (original)
+++ llvm/trunk/test/Assembler/2004-02-01-NegativeZero.ll Thu Nov  6 09:05:51 2014
@@ -1,6 +1,9 @@
-; RUN: llvm-as < %s | llvm-dis | grep -- -0.0
+; RUN: llvm-as < %s | llvm-dis | FileCheck %s
 ; RUN: verify-uselistorder %s
 
+; CHECK: global double -0.000000e+00
 global double 0x8000000000000000
+
+; CHECK: global float -0.000000e+00
 global float -0.0
 

Modified: llvm/trunk/test/Assembler/2004-11-28-InvalidTypeCrash.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2004-11-28-InvalidTypeCrash.ll?rev=221459&r1=221458&r2=221459&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2004-11-28-InvalidTypeCrash.ll (original)
+++ llvm/trunk/test/Assembler/2004-11-28-InvalidTypeCrash.ll Thu Nov  6 09:05:51 2014
@@ -1,4 +1,5 @@
 ; Test for PR463.  This program is erroneous, but should not crash llvm-as.
-; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "use of undefined type named 'struct.none'"
+; RUN: not llvm-as %s -o /dev/null 2>&1 | FileCheck %s
+; CHECK: use of undefined type named 'struct.none'
 
 @.FOO  = internal global %struct.none zeroinitializer

Modified: llvm/trunk/test/Assembler/2005-01-03-FPConstantDisassembly.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2005-01-03-FPConstantDisassembly.ll?rev=221459&r1=221458&r2=221459&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2005-01-03-FPConstantDisassembly.ll (original)
+++ llvm/trunk/test/Assembler/2005-01-03-FPConstantDisassembly.ll Thu Nov  6 09:05:51 2014
@@ -1,7 +1,8 @@
-; RUN: llvm-as < %s | llvm-dis | grep 1.0
+; RUN: llvm-as < %s | llvm-dis | FileCheck %s
 ; RUN: verify-uselistorder %s
 
 define double @test() {
+; CHECK: ret double 1.0
         ret double 1.0   ;; This should not require hex notation
 }
 

Modified: llvm/trunk/test/Assembler/2007-01-02-Undefined-Arg-Type.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-01-02-Undefined-Arg-Type.ll?rev=221459&r1=221458&r2=221459&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2007-01-02-Undefined-Arg-Type.ll (original)
+++ llvm/trunk/test/Assembler/2007-01-02-Undefined-Arg-Type.ll Thu Nov  6 09:05:51 2014
@@ -1,5 +1,7 @@
 ; The assembler should catch an undefined argument type .
-; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "use of undefined type named 'typedef.bc_struct'"
+; RUN: not llvm-as %s -o /dev/null 2>&1 | FileCheck %s
+
+; CHECK: use of undefined type named 'typedef.bc_struct'
 
 ; %typedef.bc_struct = type opaque
 

Modified: llvm/trunk/test/Assembler/2007-03-19-NegValue.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-03-19-NegValue.ll?rev=221459&r1=221458&r2=221459&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2007-03-19-NegValue.ll (original)
+++ llvm/trunk/test/Assembler/2007-03-19-NegValue.ll Thu Nov  6 09:05:51 2014
@@ -1,8 +1,9 @@
 ; Test whether negative values > 64 bits retain their negativeness.
-; RUN: llvm-as < %s | llvm-dis | grep "add i65.*, -1"
+; RUN: llvm-as < %s | llvm-dis | FileCheck %s
 ; RUN: verify-uselistorder %s
 
 define i65 @testConsts(i65 %N) {
+; CHECK: add i65 %N, -1
   %a = add i65 %N, -1
   ret i65 %a
 }

Modified: llvm/trunk/test/Assembler/2007-04-25-AssemblerFoldExternWeak.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-04-25-AssemblerFoldExternWeak.ll?rev=221459&r1=221458&r2=221459&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2007-04-25-AssemblerFoldExternWeak.ll (original)
+++ llvm/trunk/test/Assembler/2007-04-25-AssemblerFoldExternWeak.ll Thu Nov  6 09:05:51 2014
@@ -1,6 +1,8 @@
-; RUN: llvm-as < %s | llvm-dis | grep "icmp.*test_weak.*null"
+; RUN: llvm-as < %s | llvm-dis | FileCheck %s
 ; RUN: verify-uselistorder %s
 ; PR1358
+
+; CHECK: icmp ne (i32 (...)* @test_weak, i32 (...)* null)
 @G = global i1 icmp ne (i32 (...)* @test_weak, i32 (...)* null)
 
 declare extern_weak i32 @test_weak(...)

Modified: llvm/trunk/test/Assembler/2007-09-29-GC.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-09-29-GC.ll?rev=221459&r1=221458&r2=221459&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2007-09-29-GC.ll (original)
+++ llvm/trunk/test/Assembler/2007-09-29-GC.ll Thu Nov  6 09:05:51 2014
@@ -1,7 +1,10 @@
-; RUN: llvm-as < %s | llvm-dis | grep "@f.*gc.*shadowstack"
-; RUN: llvm-as < %s | llvm-dis | grep "@g.*gc.*java"
+; RUN: llvm-as < %s | llvm-dis | FileCheck %s
 ; RUN: verify-uselistorder %s
 
+
+; CHECK: define void @f() gc "shadowstack"
+; CHECK: define void @g() gc "java"
+
 define void @f() gc "shadowstack" {
 entry:
 	ret void

Modified: llvm/trunk/test/CodeGen/ARM/2007-05-07-tailmerge-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2007-05-07-tailmerge-1.ll?rev=221459&r1=221458&r2=221459&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2007-05-07-tailmerge-1.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2007-05-07-tailmerge-1.ll Thu Nov  6 09:05:51 2014
@@ -1,11 +1,14 @@
-; RUN: llc < %s -march=arm -enable-tail-merge | grep bl.*baz | count 1
-; RUN: llc < %s -march=arm -enable-tail-merge | grep bl.*quux | count 1
+; RUN: llc < %s -enable-tail-merge | FileCheck %s
 ; Check that calls to baz and quux are tail-merged.
 ; PR1628
 
+; CHECK: bl _baz
+; CHECK-NOT: bl _baz
+; CHECK: bl _quux
+; CHECK-NOT: bl _quux
+
 ; ModuleID = 'tail.c'
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"
-target triple = "i686-apple-darwin8"
+target triple = "arm-apple-darwin8"
 
 define i32 @f(i32 %i, i32 %q) {
 entry:





More information about the llvm-commits mailing list