<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Apr 10, 2013 at 4:58 PM, Reid Kleckner <span dir="ltr"><<a href="mailto:rnk@google.com" target="_blank">rnk@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Wed, Apr 10, 2013 at 4:30 PM, Eli Bendersky <<a href="mailto:eliben@google.com">eliben@google.com</a>> wrote:<br>
> Author: eliben<br>
> Date: Wed Apr 10 18:30:20 2013<br>
> New Revision: 179241<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=179241&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=179241&view=rev</a><br>
> Log:<br>
> Rewrite some of the test/CodeGen/X86 tests to use FileCheck instead of grep<br>
><br>
><br>
> Modified:<br>
> llvm/trunk/test/CodeGen/X86/2010-06-14-fast-isel-fs-load.ll<br>
> llvm/trunk/test/CodeGen/X86/fast-cc-merge-stack-adj.ll<br>
> llvm/trunk/test/CodeGen/X86/fast-isel-avoid-unnecessary-pic-base.ll<br>
> llvm/trunk/test/CodeGen/X86/fast-isel-constpool.ll<br>
> llvm/trunk/test/CodeGen/X86/fast-isel-fneg.ll<br>
> llvm/trunk/test/CodeGen/X86/fast-isel-gv.ll<br>
> llvm/trunk/test/CodeGen/X86/fast-isel-tailcall.ll<br>
> llvm/trunk/test/CodeGen/X86/fastcc-2.ll<br>
> llvm/trunk/test/CodeGen/X86/fastcc-byval.ll<br>
> llvm/trunk/test/CodeGen/X86/fastcc-sret.ll<br>
> llvm/trunk/test/CodeGen/X86/fastcc3struct.ll<br>
><br>
> Modified: llvm/trunk/test/CodeGen/X86/2010-06-14-fast-isel-fs-load.ll<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-06-14-fast-isel-fs-load.ll?rev=179241&r1=179240&r2=179241&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2010-06-14-fast-isel-fs-load.ll?rev=179241&r1=179240&r2=179241&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/test/CodeGen/X86/2010-06-14-fast-isel-fs-load.ll (original)<br>
> +++ llvm/trunk/test/CodeGen/X86/2010-06-14-fast-isel-fs-load.ll Wed Apr 10 18:30:20 2013<br>
> @@ -1,4 +1,5 @@<br>
> -; RUN: llc -fast-isel -march=x86 < %s | grep %fs:<br>
> +; RUN: llc -fast-isel -march=x86 < %s | FileCheck %s<br>
> +; CHECK: %fs:<br>
><br>
> define i32 @test1(i32 addrspace(257)* %arg) nounwind {<br>
> %tmp = load i32 addrspace(257)* %arg<br>
><br>
> Modified: llvm/trunk/test/CodeGen/X86/fast-cc-merge-stack-adj.ll<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fast-cc-merge-stack-adj.ll?rev=179241&r1=179240&r2=179241&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fast-cc-merge-stack-adj.ll?rev=179241&r1=179240&r2=179241&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/test/CodeGen/X86/fast-cc-merge-stack-adj.ll (original)<br>
> +++ llvm/trunk/test/CodeGen/X86/fast-cc-merge-stack-adj.ll Wed Apr 10 18:30:20 2013<br>
> @@ -1,5 +1,5 @@<br>
> -; RUN: llc < %s -mcpu=generic -march=x86 -x86-asm-syntax=intel | \<br>
> -; RUN: grep "add ESP, 8"<br>
> +; RUN: llc < %s -mcpu=generic -march=x86 -x86-asm-syntax=intel | FileCheck %s<br>
> +; CHECK: add ESP, 8<br>
><br>
> target triple = "i686-pc-linux-gnu"<br>
><br>
><br>
> Modified: llvm/trunk/test/CodeGen/X86/fast-isel-avoid-unnecessary-pic-base.ll<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fast-isel-avoid-unnecessary-pic-base.ll?rev=179241&r1=179240&r2=179241&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fast-isel-avoid-unnecessary-pic-base.ll?rev=179241&r1=179240&r2=179241&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/test/CodeGen/X86/fast-isel-avoid-unnecessary-pic-base.ll (original)<br>
> +++ llvm/trunk/test/CodeGen/X86/fast-isel-avoid-unnecessary-pic-base.ll Wed Apr 10 18:30:20 2013<br>
> @@ -1,4 +1,5 @@<br>
> -; RUN: llc -O0 -relocation-model=pic < %s | not grep call<br>
> +; RUN: llc -O0 -relocation-model=pic < %s | FileCheck %s<br>
> +; CHECK-NOT: call<br>
> ; rdar://8396318<br>
><br>
> ; Don't emit a PIC base register if no addresses are needed.<br>
><br>
> Modified: llvm/trunk/test/CodeGen/X86/fast-isel-constpool.ll<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fast-isel-constpool.ll?rev=179241&r1=179240&r2=179241&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fast-isel-constpool.ll?rev=179241&r1=179240&r2=179241&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/test/CodeGen/X86/fast-isel-constpool.ll (original)<br>
> +++ llvm/trunk/test/CodeGen/X86/fast-isel-constpool.ll Wed Apr 10 18:30:20 2013<br>
> @@ -1,4 +1,6 @@<br>
> -; RUN: llc < %s -fast-isel | grep "LCPI0_0(%rip)"<br>
> +; RUN: llc < %s -fast-isel | FileCheck %s<br>
> +; CHECK: LCPI0_0(%rip)<br>
> +<br>
> ; Make sure fast isel uses rip-relative addressing when required.<br>
> target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"<br>
> target triple = "x86_64-apple-darwin9.0"<br>
><br>
> Modified: llvm/trunk/test/CodeGen/X86/fast-isel-fneg.ll<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fast-isel-fneg.ll?rev=179241&r1=179240&r2=179241&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fast-isel-fneg.ll?rev=179241&r1=179240&r2=179241&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/test/CodeGen/X86/fast-isel-fneg.ll (original)<br>
> +++ llvm/trunk/test/CodeGen/X86/fast-isel-fneg.ll Wed Apr 10 18:30:20 2013<br>
> @@ -1,5 +1,8 @@<br>
> ; RUN: llc < %s -fast-isel -fast-isel-abort -mtriple=x86_64-apple-darwin10 | FileCheck %s<br>
> -; RUN: llc < %s -fast-isel -march=x86 -mattr=+sse2 | grep xor | count 2<br>
> +; RUN: llc < %s -fast-isel -march=x86 -mattr=+sse2 | FileCheck --check-prefix=SSE2 %s<br>
> +<br>
> +; SSE2: xor<br>
> +; SSE2: xor<br>
<br>
</div></div>To be perfectly pedantic, to match | count 2 you have to do a SSE2-NOT: xor<br>
<div class="HOEnZb"><div class="h5"><br></div></div></blockquote><div><br></div><div style>Thanks for the catch, I'll fix it.</div><div style><br></div><div style>Eli</div><div> </div></div></div></div>