[llvm-commits] [llvm] r159525 - in /llvm/trunk/test: ./ Analysis/LoopInfo/ Analysis/ScalarEvolution/ Assembler/ CodeGen/ARM/ CodeGen/CellSPU/ CodeGen/PowerPC/ CodeGen/Thumb/ CodeGen/Thumb2/ CodeGen/X86/ Feature/ Integer/ Linker/ MC/Disassembler/ARM/ MC/Disassembler/X86/ Other/ TableGen/ Transforms/ArgumentPromotion/ Transforms/ConstProp/ Transforms/DeadArgElim/ Transforms/FunctionAttrs/ Transforms/GVN/ Transforms/GlobalOpt/ Transforms/IPConstantProp/ Transforms/IndVarSimplify/ Transforms/Inline/ Transforms/InstCombine/...

Chandler Carruth chandlerc at gmail.com
Mon Jul 2 05:47:26 PDT 2012


Author: chandlerc
Date: Mon Jul  2 07:47:22 2012
New Revision: 159525

URL: http://llvm.org/viewvc/llvm-project?rev=159525&view=rev
Log:
Convert all tests using TCL-style quoting to use shell-style quoting.

This was done through the aid of a terrible Perl creation. I will not
paste any of the horrors here. Suffice to say, it require multiple
staged rounds of replacements, state carried between, and a few
nested-construct-parsing hacks that I'm not proud of. It happens, by
luck, to be able to deal with all the TCL-quoting patterns in evidence
in the LLVM test suite.

If anyone is maintaining large out-of-tree test trees, feel free to poke
me and I'll send you the steps I used to convert things, as well as
answer any painful questions etc. IRC works best for this type of thing
I find.

Once converted, switch the LLVM lit config to use ShTests the same as
Clang. In addition to being able to delete large amounts of Python code
from 'lit', this will also simplify the entire test suite and some of
lit's architecture.

Finally, the test suite runs 33% faster on Linux now. ;]
For my 16-hardware-thread (2x 4-core xeon e5520): 36s -> 24s

Modified:
    llvm/trunk/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll
    llvm/trunk/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll
    llvm/trunk/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll
    llvm/trunk/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll
    llvm/trunk/test/Analysis/ScalarEvolution/2008-02-11-ReversedCondition.ll
    llvm/trunk/test/Analysis/ScalarEvolution/2008-05-25-NegativeStepToZero.ll
    llvm/trunk/test/Analysis/ScalarEvolution/2008-07-19-WrappingIV.ll
    llvm/trunk/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll
    llvm/trunk/test/Analysis/ScalarEvolution/2008-11-18-Stride1.ll
    llvm/trunk/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll
    llvm/trunk/test/Analysis/ScalarEvolution/2009-04-22-TruncCast.ll
    llvm/trunk/test/Analysis/ScalarEvolution/2009-05-09-PointerEdgeCount.ll
    llvm/trunk/test/Analysis/ScalarEvolution/and-xor.ll
    llvm/trunk/test/Analysis/ScalarEvolution/avoid-smax-0.ll
    llvm/trunk/test/Analysis/ScalarEvolution/div-overflow.ll
    llvm/trunk/test/Analysis/ScalarEvolution/sext-inreg.ll
    llvm/trunk/test/Analysis/ScalarEvolution/sext-iv-1.ll
    llvm/trunk/test/Analysis/ScalarEvolution/smax.ll
    llvm/trunk/test/Analysis/ScalarEvolution/trip-count.ll
    llvm/trunk/test/Analysis/ScalarEvolution/trip-count2.ll
    llvm/trunk/test/Analysis/ScalarEvolution/trip-count3.ll
    llvm/trunk/test/Analysis/ScalarEvolution/trip-count4.ll
    llvm/trunk/test/Analysis/ScalarEvolution/trip-count5.ll
    llvm/trunk/test/Analysis/ScalarEvolution/trip-count6.ll
    llvm/trunk/test/Analysis/ScalarEvolution/trip-count7.ll
    llvm/trunk/test/Analysis/ScalarEvolution/trip-count8.ll
    llvm/trunk/test/Analysis/ScalarEvolution/xor-and.ll
    llvm/trunk/test/Assembler/2003-11-12-ConstantExprCast.ll
    llvm/trunk/test/Assembler/2003-11-24-SymbolTableCrash.ll
    llvm/trunk/test/Assembler/2004-03-30-UnclosedFunctionCrash.ll
    llvm/trunk/test/Assembler/2004-11-28-InvalidTypeCrash.ll
    llvm/trunk/test/Assembler/2007-01-02-Undefined-Arg-Type.ll
    llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast.ll
    llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast2.ll
    llvm/trunk/test/Assembler/2007-03-19-NegValue.ll
    llvm/trunk/test/Assembler/2007-04-20-AlignedLoad.ll
    llvm/trunk/test/Assembler/2007-04-20-AlignedStore.ll
    llvm/trunk/test/Assembler/2007-04-25-AssemblerFoldExternWeak.ll
    llvm/trunk/test/Assembler/2007-09-29-GC.ll
    llvm/trunk/test/Assembler/2007-12-11-AddressSpaces.ll
    llvm/trunk/test/Assembler/2008-02-18-IntPointerCrash.ll
    llvm/trunk/test/Assembler/ConstantExprFold.ll
    llvm/trunk/test/CodeGen/ARM/2009-04-06-AsmModifier.ll
    llvm/trunk/test/CodeGen/ARM/aliases.ll
    llvm/trunk/test/CodeGen/ARM/cse-libcalls.ll
    llvm/trunk/test/CodeGen/ARM/lsr-scale-addr-mode.ll
    llvm/trunk/test/CodeGen/ARM/str_pre.ll
    llvm/trunk/test/CodeGen/ARM/thread_pointer.ll
    llvm/trunk/test/CodeGen/ARM/tls1.ll
    llvm/trunk/test/CodeGen/ARM/tls3.ll
    llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll
    llvm/trunk/test/CodeGen/CellSPU/stores.ll
    llvm/trunk/test/CodeGen/CellSPU/trunc.ll
    llvm/trunk/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll
    llvm/trunk/test/CodeGen/PowerPC/2006-04-05-splat-ish.ll
    llvm/trunk/test/CodeGen/PowerPC/2007-04-24-InlineAsm-I-Modifier.ll
    llvm/trunk/test/CodeGen/PowerPC/2007-05-30-dagcombine-miscomp.ll
    llvm/trunk/test/CodeGen/PowerPC/Frames-leaf.ll
    llvm/trunk/test/CodeGen/PowerPC/Frames-small.ll
    llvm/trunk/test/CodeGen/PowerPC/LargeAbsoluteAddr.ll
    llvm/trunk/test/CodeGen/PowerPC/and-imm.ll
    llvm/trunk/test/CodeGen/PowerPC/big-endian-actual-args.ll
    llvm/trunk/test/CodeGen/PowerPC/big-endian-call-result.ll
    llvm/trunk/test/CodeGen/PowerPC/branch-opt.ll
    llvm/trunk/test/CodeGen/PowerPC/calls.ll
    llvm/trunk/test/CodeGen/PowerPC/compare-simm.ll
    llvm/trunk/test/CodeGen/PowerPC/constants.ll
    llvm/trunk/test/CodeGen/PowerPC/darwin-labels.ll
    llvm/trunk/test/CodeGen/PowerPC/fabs.ll
    llvm/trunk/test/CodeGen/PowerPC/fma.ll
    llvm/trunk/test/CodeGen/PowerPC/fsqrt.ll
    llvm/trunk/test/CodeGen/PowerPC/iabs.ll
    llvm/trunk/test/CodeGen/PowerPC/ispositive.ll
    llvm/trunk/test/CodeGen/PowerPC/no-dead-strip.ll
    llvm/trunk/test/CodeGen/PowerPC/retaddr.ll
    llvm/trunk/test/CodeGen/PowerPC/rlwimi3.ll
    llvm/trunk/test/CodeGen/PowerPC/seteq-0.ll
    llvm/trunk/test/CodeGen/PowerPC/small-arguments.ll
    llvm/trunk/test/CodeGen/PowerPC/stack-protector.ll
    llvm/trunk/test/CodeGen/PowerPC/trampoline.ll
    llvm/trunk/test/CodeGen/Thumb/asmprinter-bug.ll
    llvm/trunk/test/CodeGen/Thumb/iabs.ll
    llvm/trunk/test/CodeGen/Thumb2/thumb2-ldr_pre.ll
    llvm/trunk/test/CodeGen/Thumb2/tls1.ll
    llvm/trunk/test/CodeGen/X86/2004-02-13-FrameReturnAddress.ll
    llvm/trunk/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll
    llvm/trunk/test/CodeGen/X86/2006-05-11-InstrSched.ll
    llvm/trunk/test/CodeGen/X86/2006-07-31-SingleRegClass.ll
    llvm/trunk/test/CodeGen/X86/2006-11-17-IllegalMove.ll
    llvm/trunk/test/CodeGen/X86/2007-01-13-StackPtrIndex.ll
    llvm/trunk/test/CodeGen/X86/2007-03-24-InlineAsmPModifier.ll
    llvm/trunk/test/CodeGen/X86/2007-03-24-InlineAsmVectorOp.ll
    llvm/trunk/test/CodeGen/X86/2007-08-10-SignExtSubreg.ll
    llvm/trunk/test/CodeGen/X86/2007-11-04-rip-immediate-constant.ll
    llvm/trunk/test/CodeGen/X86/2007-12-18-LoadCSEBug.ll
    llvm/trunk/test/CodeGen/X86/2008-02-18-TailMergingBug.ll
    llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll
    llvm/trunk/test/CodeGen/X86/2008-08-06-CmpStride.ll
    llvm/trunk/test/CodeGen/X86/2008-12-23-crazy-address.ll
    llvm/trunk/test/CodeGen/X86/2009-01-31-BigShift2.ll
    llvm/trunk/test/CodeGen/X86/2009-02-26-MachineLICMBug.ll
    llvm/trunk/test/CodeGen/X86/2009-04-24.ll
    llvm/trunk/test/CodeGen/X86/2009-04-29-IndirectDestOperands.ll
    llvm/trunk/test/CodeGen/X86/MachineSink-PHIUse.ll
    llvm/trunk/test/CodeGen/X86/addr-label-difference.ll
    llvm/trunk/test/CodeGen/X86/aligned-comm.ll
    llvm/trunk/test/CodeGen/X86/break-anti-dependencies.ll
    llvm/trunk/test/CodeGen/X86/call-imm.ll
    llvm/trunk/test/CodeGen/X86/coalesce-esp.ll
    llvm/trunk/test/CodeGen/X86/epilogue.ll
    llvm/trunk/test/CodeGen/X86/extractps.ll
    llvm/trunk/test/CodeGen/X86/fast-cc-merge-stack-adj.ll
    llvm/trunk/test/CodeGen/X86/fast-isel-constpool.ll
    llvm/trunk/test/CodeGen/X86/fast-isel-gv.ll
    llvm/trunk/test/CodeGen/X86/fastcc-byval.ll
    llvm/trunk/test/CodeGen/X86/fp-immediate-shorten.ll
    llvm/trunk/test/CodeGen/X86/fp_load_fold.ll
    llvm/trunk/test/CodeGen/X86/full-lsr.ll
    llvm/trunk/test/CodeGen/X86/h-register-addressing-32.ll
    llvm/trunk/test/CodeGen/X86/h-register-addressing-64.ll
    llvm/trunk/test/CodeGen/X86/h-registers-1.ll
    llvm/trunk/test/CodeGen/X86/illegal-vector-args-return.ll
    llvm/trunk/test/CodeGen/X86/inline-asm-modifier-n.ll
    llvm/trunk/test/CodeGen/X86/isel-sink2.ll
    llvm/trunk/test/CodeGen/X86/ispositive.ll
    llvm/trunk/test/CodeGen/X86/label-redefinition.ll
    llvm/trunk/test/CodeGen/X86/lea-2.ll
    llvm/trunk/test/CodeGen/X86/peep-vector-extract-insert.ll
    llvm/trunk/test/CodeGen/X86/phi-immediate-factoring.ll
    llvm/trunk/test/CodeGen/X86/pr2656.ll
    llvm/trunk/test/CodeGen/X86/rotate.ll
    llvm/trunk/test/CodeGen/X86/shift-coalesce.ll
    llvm/trunk/test/CodeGen/X86/shift-double.ll
    llvm/trunk/test/CodeGen/X86/shl_elim.ll
    llvm/trunk/test/CodeGen/X86/stack-protector-linux.ll
    llvm/trunk/test/CodeGen/X86/subreg-to-reg-1.ll
    llvm/trunk/test/CodeGen/X86/tailcallbyval.ll
    llvm/trunk/test/CodeGen/X86/twoaddr-coalesce-2.ll
    llvm/trunk/test/CodeGen/X86/twoaddr-pass-sink.ll
    llvm/trunk/test/CodeGen/X86/vec_call.ll
    llvm/trunk/test/CodeGen/X86/vec_ins_extract-1.ll
    llvm/trunk/test/CodeGen/X86/vec_set-9.ll
    llvm/trunk/test/CodeGen/X86/x86-64-arg.ll
    llvm/trunk/test/CodeGen/X86/x86-64-pic-1.ll
    llvm/trunk/test/CodeGen/X86/x86-64-pic-10.ll
    llvm/trunk/test/CodeGen/X86/x86-64-pic-11.ll
    llvm/trunk/test/CodeGen/X86/x86-64-pic-2.ll
    llvm/trunk/test/CodeGen/X86/x86-64-pic-3.ll
    llvm/trunk/test/CodeGen/X86/x86-64-pic-4.ll
    llvm/trunk/test/CodeGen/X86/x86-64-pic-5.ll
    llvm/trunk/test/CodeGen/X86/x86-64-pic-6.ll
    llvm/trunk/test/CodeGen/X86/x86-64-pic-7.ll
    llvm/trunk/test/CodeGen/X86/x86-64-pic-8.ll
    llvm/trunk/test/CodeGen/X86/x86-64-pic-9.ll
    llvm/trunk/test/Feature/globalredefinition3.ll
    llvm/trunk/test/Feature/packed_struct.ll
    llvm/trunk/test/Feature/vector-cast-constant-exprs.ll
    llvm/trunk/test/Integer/packed_struct_bt.ll
    llvm/trunk/test/Linker/2003-01-30-LinkerRename.ll
    llvm/trunk/test/Linker/2003-01-30-LinkerTypeRename.ll
    llvm/trunk/test/Linker/2003-04-23-LinkOnceLost.ll
    llvm/trunk/test/Linker/2003-04-26-NullPtrLinkProblem.ll
    llvm/trunk/test/Linker/2003-05-15-TypeProblem.ll
    llvm/trunk/test/Linker/2003-05-31-LinkerRename.ll
    llvm/trunk/test/Linker/2003-06-02-TypeResolveProblem.ll
    llvm/trunk/test/Linker/2003-06-02-TypeResolveProblem2.ll
    llvm/trunk/test/Linker/2003-08-20-OpaqueTypeResolve.ll
    llvm/trunk/test/Linker/2003-08-23-GlobalVarLinking.ll
    llvm/trunk/test/Linker/2003-08-24-InheritPtrSize.ll
    llvm/trunk/test/Linker/2004-12-03-DisagreeingType.ll
    llvm/trunk/test/Linker/2005-02-12-ConstantGlobals-2.ll
    llvm/trunk/test/Linker/2005-02-12-ConstantGlobals.ll
    llvm/trunk/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll
    llvm/trunk/test/Linker/2006-06-15-GlobalVarAlignment.ll
    llvm/trunk/test/Linker/2008-06-13-LinkOnceRedefinition.ll
    llvm/trunk/test/Linker/2008-06-26-AddressSpace.ll
    llvm/trunk/test/Linker/AppendingLinkage.ll
    llvm/trunk/test/Linker/AppendingLinkage2.ll
    llvm/trunk/test/Linker/ConstantGlobals1.ll
    llvm/trunk/test/Linker/ConstantGlobals2.ll
    llvm/trunk/test/Linker/ConstantGlobals3.ll
    llvm/trunk/test/Linker/link-global-to-func.ll
    llvm/trunk/test/Linker/redefinition.ll
    llvm/trunk/test/Linker/weakextern.ll
    llvm/trunk/test/MC/Disassembler/ARM/invalid-BFI-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-Bcc-thumb.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-CPS2p-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-CPS3p-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-DMB-thumb.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-DSB-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-IT-CBNZ-thumb.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-IT-thumb.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-LDC-form-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-LDM-thumb.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-LDRB_POST-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-LDRD_PRE-thumb.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-LDR_PRE-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-LDRrs-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-MCR-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVTi16-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVr-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVs-LSL-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVs-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-MSRi-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-RFEorLDMIA-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-SBFX-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-SMLAD-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-SRS-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-STMIA_UPD-thumb.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-SXTB-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-UMAAL-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-VLD3DUPd32_UPD-thumb.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-VLDMSDB_UPD-arm.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-VST1d8Twb_register-thumb.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-t2Bcc-thumb.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-t2LDRBT-thumb.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-t2LDRSHi12-thumb.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-t2LDRSHi8-thumb.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-t2PUSH-thumb.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-t2STREXD-thumb.txt
    llvm/trunk/test/MC/Disassembler/ARM/invalid-t2STR_POST-thumb.txt
    llvm/trunk/test/MC/Disassembler/X86/invalid-VEX-vvvv.txt
    llvm/trunk/test/MC/Disassembler/X86/invalid-cmp-imm.txt
    llvm/trunk/test/Other/2003-02-19-LoopInfoNestingBug.ll
    llvm/trunk/test/Other/invalid-commandline-option.ll
    llvm/trunk/test/TableGen/DefmInherit.td
    llvm/trunk/test/TableGen/LazyChange.td
    llvm/trunk/test/TableGen/ListOfList.td
    llvm/trunk/test/TableGen/MultiClass.td
    llvm/trunk/test/TableGen/MultiClassInherit.td
    llvm/trunk/test/TableGen/Slice.td
    llvm/trunk/test/TableGen/TargetInstrSpec.td
    llvm/trunk/test/TableGen/cast.td
    llvm/trunk/test/TableGen/foreach.td
    llvm/trunk/test/TableGen/lisp.td
    llvm/trunk/test/TableGen/subst.td
    llvm/trunk/test/Transforms/ArgumentPromotion/2008-07-02-array-indexing.ll
    llvm/trunk/test/Transforms/ArgumentPromotion/byval-2.ll
    llvm/trunk/test/Transforms/ArgumentPromotion/control-flow2.ll
    llvm/trunk/test/Transforms/ConstProp/2006-11-30-vector-cast.ll
    llvm/trunk/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll
    llvm/trunk/test/Transforms/ConstProp/2006-12-01-bool-casts.ll
    llvm/trunk/test/Transforms/ConstProp/2007-02-23-sdiv.ll
    llvm/trunk/test/Transforms/ConstProp/2007-11-23-cttz.ll
    llvm/trunk/test/Transforms/ConstProp/div-zero.ll
    llvm/trunk/test/Transforms/DeadArgElim/2007-02-07-FuncRename.ll
    llvm/trunk/test/Transforms/DeadArgElim/canon.ll
    llvm/trunk/test/Transforms/DeadArgElim/keepalive.ll
    llvm/trunk/test/Transforms/FunctionAttrs/2009-01-02-LocalStores.ll
    llvm/trunk/test/Transforms/GVN/2007-07-31-NoDomInherit.ll
    llvm/trunk/test/Transforms/GVN/2008-07-02-Unreachable.ll
    llvm/trunk/test/Transforms/GVN/calls-readonly.ll
    llvm/trunk/test/Transforms/GVN/load-constant-mem.ll
    llvm/trunk/test/Transforms/GVN/local-pre.ll
    llvm/trunk/test/Transforms/GVN/nonescaping-malloc.ll
    llvm/trunk/test/Transforms/GVN/pre-basic-add.ll
    llvm/trunk/test/Transforms/GVN/rle-must-alias.ll
    llvm/trunk/test/Transforms/GVN/rle-semidominated.ll
    llvm/trunk/test/Transforms/GlobalOpt/2008-01-13-OutOfRangeSROA.ll
    llvm/trunk/test/Transforms/GlobalOpt/2008-01-29-VolatileGlobal.ll
    llvm/trunk/test/Transforms/GlobalOpt/2008-04-26-SROA-Global-Align.ll
    llvm/trunk/test/Transforms/GlobalOpt/2009-01-13-phi-user.ll
    llvm/trunk/test/Transforms/GlobalOpt/2009-03-07-PromotePtrToBool.ll
    llvm/trunk/test/Transforms/GlobalOpt/constantexpr-dangle.ll
    llvm/trunk/test/Transforms/GlobalOpt/globalsra-unknown-index.ll
    llvm/trunk/test/Transforms/GlobalOpt/heap-sra-phi.ll
    llvm/trunk/test/Transforms/GlobalOpt/integer-bool.ll
    llvm/trunk/test/Transforms/GlobalOpt/memcpy.ll
    llvm/trunk/test/Transforms/GlobalOpt/storepointer-compare.ll
    llvm/trunk/test/Transforms/IPConstantProp/2008-06-09-WeakProp.ll
    llvm/trunk/test/Transforms/IPConstantProp/return-argument.ll
    llvm/trunk/test/Transforms/IPConstantProp/return-constant.ll
    llvm/trunk/test/Transforms/IPConstantProp/return-constants.ll
    llvm/trunk/test/Transforms/IndVarSimplify/2005-02-26-ExitValueCompute.ll
    llvm/trunk/test/Transforms/IndVarSimplify/2006-03-31-NegativeStride.ll
    llvm/trunk/test/Transforms/IndVarSimplify/eliminate-max.ll
    llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate_3.ll
    llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate_4.ll
    llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate_5.ll
    llvm/trunk/test/Transforms/IndVarSimplify/shrunk-constant.ll
    llvm/trunk/test/Transforms/Inline/casts.ll
    llvm/trunk/test/Transforms/Inline/delete-call.ll
    llvm/trunk/test/Transforms/Inline/externally_available.ll
    llvm/trunk/test/Transforms/Inline/inline_prune.ll
    llvm/trunk/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll
    llvm/trunk/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll
    llvm/trunk/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll
    llvm/trunk/test/Transforms/InstCombine/2006-12-15-Range-Test.ll
    llvm/trunk/test/Transforms/InstCombine/2007-01-13-ExtCompareMiscompile.ll
    llvm/trunk/test/Transforms/InstCombine/2007-01-14-FcmpSelf.ll
    llvm/trunk/test/Transforms/InstCombine/2007-01-27-AndICmp.ll
    llvm/trunk/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll
    llvm/trunk/test/Transforms/InstCombine/2007-03-13-CompareMerge.ll
    llvm/trunk/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll
    llvm/trunk/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll
    llvm/trunk/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll
    llvm/trunk/test/Transforms/InstCombine/2007-05-18-CastFoldBug.ll
    llvm/trunk/test/Transforms/InstCombine/2007-06-06-AshrSignBit.ll
    llvm/trunk/test/Transforms/InstCombine/2007-06-21-DivCompareMiscomp.ll
    llvm/trunk/test/Transforms/InstCombine/2007-10-28-stacksave.ll
    llvm/trunk/test/Transforms/InstCombine/2007-11-15-CompareMiscomp.ll
    llvm/trunk/test/Transforms/InstCombine/2007-12-18-AddSelCmpSub.ll
    llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow.ll
    llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow2.ll
    llvm/trunk/test/Transforms/InstCombine/2008-03-13-IntToPtr.ll
    llvm/trunk/test/Transforms/InstCombine/2008-04-28-VolatileStore.ll
    llvm/trunk/test/Transforms/InstCombine/2008-04-29-VolatileLoadDontMerge.ll
    llvm/trunk/test/Transforms/InstCombine/2008-04-29-VolatileLoadMerge.ll
    llvm/trunk/test/Transforms/InstCombine/2008-05-08-LiveStoreDelete.ll
    llvm/trunk/test/Transforms/InstCombine/2008-05-18-FoldIntToPtr.ll
    llvm/trunk/test/Transforms/InstCombine/2008-05-23-CompareFold.ll
    llvm/trunk/test/Transforms/InstCombine/2008-05-31-AddBool.ll
    llvm/trunk/test/Transforms/InstCombine/2008-05-31-Bools.ll
    llvm/trunk/test/Transforms/InstCombine/2008-06-08-ICmpPHI.ll
    llvm/trunk/test/Transforms/InstCombine/2008-06-13-InfiniteLoopStore.ll
    llvm/trunk/test/Transforms/InstCombine/2008-06-13-ReadOnlyCallStore.ll
    llvm/trunk/test/Transforms/InstCombine/2008-06-21-CompareMiscomp.ll
    llvm/trunk/test/Transforms/InstCombine/2008-06-24-StackRestore.ll
    llvm/trunk/test/Transforms/InstCombine/2008-07-08-ShiftOneAndOne.ll
    llvm/trunk/test/Transforms/InstCombine/2008-07-08-SubAnd.ll
    llvm/trunk/test/Transforms/InstCombine/2008-07-08-VolatileLoadMerge.ll
    llvm/trunk/test/Transforms/InstCombine/2008-07-10-CastSextBool.ll
    llvm/trunk/test/Transforms/InstCombine/2008-07-13-DivZero.ll
    llvm/trunk/test/Transforms/InstCombine/2008-09-29-FoldingOr.ll
    llvm/trunk/test/Transforms/InstCombine/2008-10-11-DivCompareFold.ll
    llvm/trunk/test/Transforms/InstCombine/2008-11-01-SRemDemandedBits.ll
    llvm/trunk/test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll
    llvm/trunk/test/Transforms/InstCombine/2009-01-08-AlignAlloca.ll
    llvm/trunk/test/Transforms/InstCombine/2009-01-16-PointerAddrSpace.ll
    llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll
    llvm/trunk/test/Transforms/InstCombine/2009-01-31-Pressure.ll
    llvm/trunk/test/Transforms/InstCombine/2009-02-21-LoadCST.ll
    llvm/trunk/test/Transforms/InstCombine/2009-03-20-AShrOverShift.ll
    llvm/trunk/test/Transforms/InstCombine/2009-04-07-MulPromoteToI96.ll
    llvm/trunk/test/Transforms/InstCombine/2009-06-11-StoreAddrSpace.ll
    llvm/trunk/test/Transforms/InstCombine/JavaCompare.ll
    llvm/trunk/test/Transforms/InstCombine/add-shrink.ll
    llvm/trunk/test/Transforms/InstCombine/add-sitofp.ll
    llvm/trunk/test/Transforms/InstCombine/addnegneg.ll
    llvm/trunk/test/Transforms/InstCombine/adjust-for-sminmax.ll
    llvm/trunk/test/Transforms/InstCombine/align-2d-gep.ll
    llvm/trunk/test/Transforms/InstCombine/and-not-or.ll
    llvm/trunk/test/Transforms/InstCombine/and-or.ll
    llvm/trunk/test/Transforms/InstCombine/apint-shift-simplify.ll
    llvm/trunk/test/Transforms/InstCombine/bitcount.ll
    llvm/trunk/test/Transforms/InstCombine/bswap.ll
    llvm/trunk/test/Transforms/InstCombine/dce-iterate.ll
    llvm/trunk/test/Transforms/InstCombine/deadcode.ll
    llvm/trunk/test/Transforms/InstCombine/enforce-known-alignment.ll
    llvm/trunk/test/Transforms/InstCombine/fp-ret-bitcast.ll
    llvm/trunk/test/Transforms/InstCombine/known_align.ll
    llvm/trunk/test/Transforms/InstCombine/loadstore-alignment.ll
    llvm/trunk/test/Transforms/InstCombine/memcpy-to-load.ll
    llvm/trunk/test/Transforms/InstCombine/multi-use-or.ll
    llvm/trunk/test/Transforms/InstCombine/narrow.ll
    llvm/trunk/test/Transforms/InstCombine/odr-linkage.ll
    llvm/trunk/test/Transforms/InstCombine/or-to-xor.ll
    llvm/trunk/test/Transforms/InstCombine/phi-merge-gep.ll
    llvm/trunk/test/Transforms/InstCombine/pr2645-0.ll
    llvm/trunk/test/Transforms/InstCombine/select-load-call.ll
    llvm/trunk/test/Transforms/InstCombine/shufflevec-constant.ll
    llvm/trunk/test/Transforms/InstCombine/signed-comparison.ll
    llvm/trunk/test/Transforms/InstCombine/srem-simplify-bug.ll
    llvm/trunk/test/Transforms/InstCombine/stack-overalign.ll
    llvm/trunk/test/Transforms/InstCombine/stacksaverestore.ll
    llvm/trunk/test/Transforms/InstCombine/udiv-simplify-bug-0.ll
    llvm/trunk/test/Transforms/InstCombine/urem-simplify-bug.ll
    llvm/trunk/test/Transforms/InstCombine/vec_insertelt.ll
    llvm/trunk/test/Transforms/InstCombine/vec_narrow.ll
    llvm/trunk/test/Transforms/InstCombine/vector-srem.ll
    llvm/trunk/test/Transforms/InstCombine/volatile_store.ll
    llvm/trunk/test/Transforms/InstCombine/zeroext-and-reduce.ll
    llvm/trunk/test/Transforms/InstCombine/zext-fold.ll
    llvm/trunk/test/Transforms/JumpThreading/2008-11-27-EntryMunge.ll
    llvm/trunk/test/Transforms/JumpThreading/no-irreducible-loops.ll
    llvm/trunk/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
    llvm/trunk/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll
    llvm/trunk/test/Transforms/LCSSA/basictest.ll
    llvm/trunk/test/Transforms/LCSSA/unreachable-use.ll
    llvm/trunk/test/Transforms/LICM/2007-05-22-VolatileSink.ll
    llvm/trunk/test/Transforms/LoopSimplify/indirectbr.ll
    llvm/trunk/test/Transforms/LoopSimplify/merge-exits.ll
    llvm/trunk/test/Transforms/LoopSimplify/preserve-scev.ll
    llvm/trunk/test/Transforms/LoopStrengthReduce/dont_reverse.ll
    llvm/trunk/test/Transforms/LoopStrengthReduce/pr2570.ll
    llvm/trunk/test/Transforms/LoopStrengthReduce/quadradic-exit-value.ll
    llvm/trunk/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll
    llvm/trunk/test/Transforms/MergeFunc/phi-speculation2.ll
    llvm/trunk/test/Transforms/MergeFunc/vector.ll
    llvm/trunk/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll
    llvm/trunk/test/Transforms/Reassociate/shifttest.ll
    llvm/trunk/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
    llvm/trunk/test/Transforms/SCCP/2006-12-19-UndefBug.ll
    llvm/trunk/test/Transforms/SCCP/2008-04-22-multiple-ret-sccp.ll
    llvm/trunk/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll
    llvm/trunk/test/Transforms/SCCP/apint-array.ll
    llvm/trunk/test/Transforms/SCCP/apint-basictest4.ll
    llvm/trunk/test/Transforms/SCCP/apint-ipsccp1.ll
    llvm/trunk/test/Transforms/SCCP/logical-nuke.ll
    llvm/trunk/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
    llvm/trunk/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
    llvm/trunk/test/Transforms/ScalarRepl/2008-01-29-PromoteBug.ll
    llvm/trunk/test/Transforms/ScalarRepl/2008-06-22-LargeArray.ll
    llvm/trunk/test/Transforms/ScalarRepl/2008-08-22-out-of-range-array-promote.ll
    llvm/trunk/test/Transforms/ScalarRepl/2009-02-02-ScalarPromoteOutOfRange.ll
    llvm/trunk/test/Transforms/ScalarRepl/2009-02-05-LoadFCA.ll
    llvm/trunk/test/Transforms/ScalarRepl/2009-03-04-MemCpyAlign.ll
    llvm/trunk/test/Transforms/ScalarRepl/memset-aggregate.ll
    llvm/trunk/test/Transforms/ScalarRepl/not-a-vector.ll
    llvm/trunk/test/Transforms/ScalarRepl/union-fp-int.ll
    llvm/trunk/test/Transforms/ScalarRepl/union-pointer.ll
    llvm/trunk/test/Transforms/ScalarRepl/vector_memcpy.ll
    llvm/trunk/test/Transforms/ScalarRepl/volatile.ll
    llvm/trunk/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
    llvm/trunk/test/Transforms/SimplifyCFG/2008-01-02-hoist-fp-add.ll
    llvm/trunk/test/Transforms/SimplifyCFG/2008-05-16-PHIBlockMerge.ll
    llvm/trunk/test/Transforms/SimplifyCFG/2008-07-13-InfLoopMiscompile.ll
    llvm/trunk/test/Transforms/SimplifyCFG/duplicate-phis.ll
    llvm/trunk/test/Transforms/SimplifyLibCalls/2007-04-06-strchr-miscompile.ll
    llvm/trunk/test/Transforms/SimplifyLibCalls/2009-05-30-memcmp-byte.ll
    llvm/trunk/test/Transforms/SimplifyLibCalls/StrCat.ll
    llvm/trunk/test/Transforms/SimplifyLibCalls/StrNCat.ll
    llvm/trunk/test/Transforms/SimplifyLibCalls/abs.ll
    llvm/trunk/test/Transforms/SimplifyLibCalls/exp2.ll
    llvm/trunk/test/Transforms/SimplifyLibCalls/memmove.ll
    llvm/trunk/test/Transforms/SimplifyLibCalls/memset-64.ll
    llvm/trunk/test/Transforms/SimplifyLibCalls/memset.ll
    llvm/trunk/test/Transforms/TailCallElim/ackermann.ll
    llvm/trunk/test/Transforms/TailCallElim/dont-tce-tail-marked-call.ll
    llvm/trunk/test/Transforms/TailCallElim/dup_tail.ll
    llvm/trunk/test/Transforms/TailCallElim/trivial_codegen_tailcall.ll
    llvm/trunk/test/Verifier/2002-04-13-RetTypes.ll
    llvm/trunk/test/Verifier/2002-11-05-GetelementptrPointers.ll
    llvm/trunk/test/Verifier/2006-12-12-IntrinsicDefine.ll
    llvm/trunk/test/Verifier/2008-03-01-AllocaSized.ll
    llvm/trunk/test/Verifier/2008-08-22-MemCpyAlignment.ll
    llvm/trunk/test/Verifier/2008-11-15-RetVoid.ll
    llvm/trunk/test/Verifier/2010-08-07-PointerIntrinsic.ll
    llvm/trunk/test/Verifier/AmbiguousPhi.ll
    llvm/trunk/test/Verifier/PhiGrouping.ll
    llvm/trunk/test/Verifier/SelfReferential.ll
    llvm/trunk/test/Verifier/aliasing-chain.ll
    llvm/trunk/test/lit.cfg

Modified: llvm/trunk/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll (original)
+++ llvm/trunk/test/Analysis/LoopInfo/2003-05-15-NestingProblem.ll Mon Jul  2 07:47:22 2012
@@ -2,7 +2,7 @@
 ; not a child of the loopentry.6 loop.
 ;
 ; RUN: opt < %s -analyze -loops | \
-; RUN:   grep {^            Loop at depth 4 containing: %loopentry.7<header><latch><exiting>}
+; RUN:   grep "^            Loop at depth 4 containing: %loopentry.7<header><latch><exiting>"
 
 define void @getAndMoveToFrontDecode() {
 	br label %endif.2

Modified: llvm/trunk/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/2007-07-15-NegativeStride.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -analyze -scalar-evolution \
-; RUN:   -scalar-evolution-max-iterations=0 | grep {Loop %bb: backedge-taken count is 100}
+; RUN:   -scalar-evolution-max-iterations=0 | grep "Loop %bb: backedge-taken count is 100"
 ; PR1533
 
 @array = weak global [101 x i32] zeroinitializer, align 32		; <[100 x i32]*> [#uses=1]

Modified: llvm/trunk/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/2007-08-06-Unsigned.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -scalar-evolution -analyze | grep {Loop %bb: backedge-taken count is (-1 + (-1 \\* %x) + %y)}
+; RUN: opt < %s -scalar-evolution -analyze | grep "Loop %bb: backedge-taken count is (-1 + (-1 \* %x) + %y)"
 ; PR1597
 
 define i32 @f(i32 %x, i32 %y) {

Modified: llvm/trunk/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/2007-09-27-LargeStepping.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -analyze -scalar-evolution \
-; RUN:   -scalar-evolution-max-iterations=0 | grep {backedge-taken count is 13}
+; RUN:   -scalar-evolution-max-iterations=0 | grep "backedge-taken count is 13"
 ; PR1706
 
 define i32 @f() {

Modified: llvm/trunk/test/Analysis/ScalarEvolution/2008-02-11-ReversedCondition.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2008-02-11-ReversedCondition.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/2008-02-11-ReversedCondition.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/2008-02-11-ReversedCondition.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -scalar-evolution -analyze | grep {Loop %header: backedge-taken count is (0 smax %n)}
+; RUN: opt < %s -scalar-evolution -analyze | grep "Loop %header: backedge-taken count is (0 smax %n)"
 
 define void @foo(i32 %n) {
 entry:

Modified: llvm/trunk/test/Analysis/ScalarEvolution/2008-05-25-NegativeStepToZero.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2008-05-25-NegativeStepToZero.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/2008-05-25-NegativeStepToZero.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/2008-05-25-NegativeStepToZero.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -analyze -scalar-evolution \
-; RUN:   -scalar-evolution-max-iterations=0 | grep {backedge-taken count is 61}
+; RUN:   -scalar-evolution-max-iterations=0 | grep "backedge-taken count is 61"
 ; PR2364
 
 define i32 @func_6() nounwind  {

Modified: llvm/trunk/test/Analysis/ScalarEvolution/2008-07-19-WrappingIV.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2008-07-19-WrappingIV.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/2008-07-19-WrappingIV.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/2008-07-19-WrappingIV.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -analyze -scalar-evolution \
-; RUN:   -scalar-evolution-max-iterations=0 | grep {backedge-taken count is 113}
+; RUN:   -scalar-evolution-max-iterations=0 | grep "backedge-taken count is 113"
 ; PR2088
 
 define void @fun() {

Modified: llvm/trunk/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/2008-11-18-LessThanOrEqual.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -analyze -scalar-evolution |& \
-; RUN: grep {Loop %bb: backedge-taken count is (7 + (-1 \\* %argc))}
+; RUN: grep "Loop %bb: backedge-taken count is (7 + (-1 \* %argc))"
 
 define i32 @main(i32 %argc, i8** %argv) nounwind {
 entry:

Modified: llvm/trunk/test/Analysis/ScalarEvolution/2008-11-18-Stride1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2008-11-18-Stride1.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/2008-11-18-Stride1.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/2008-11-18-Stride1.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -analyze -scalar-evolution \
-; RUN:  | grep {Loop %bb: Unpredictable backedge-taken count\\.}
+; RUN:  | grep "Loop %bb: Unpredictable backedge-taken count\."
 
 ; ScalarEvolution can't compute a trip count because it doesn't know if
 ; dividing by the stride will have a remainder. This could theoretically

Modified: llvm/trunk/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -analyze -scalar-evolution | grep {backedge-taken count is 255}
+; RUN: opt < %s -analyze -scalar-evolution | grep "backedge-taken count is 255"
 
 define i32 @foo(i32 %x, i32 %y, i32* %lam, i32* %alp) nounwind {
 bb1.thread:

Modified: llvm/trunk/test/Analysis/ScalarEvolution/2009-04-22-TruncCast.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2009-04-22-TruncCast.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/2009-04-22-TruncCast.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/2009-04-22-TruncCast.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -analyze -scalar-evolution | grep {(trunc i} | not grep ext
+; RUN: opt < %s -analyze -scalar-evolution | grep "(trunc i" | not grep ext
 
 define i16 @test1(i8 %x) {
   %A = sext i8 %x to i32

Modified: llvm/trunk/test/Analysis/ScalarEvolution/2009-05-09-PointerEdgeCount.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2009-05-09-PointerEdgeCount.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/2009-05-09-PointerEdgeCount.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/2009-05-09-PointerEdgeCount.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -analyze -scalar-evolution | grep {count is 2}
+; RUN: opt < %s -analyze -scalar-evolution | grep "count is 2"
 ; PR3171
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 

Modified: llvm/trunk/test/Analysis/ScalarEvolution/and-xor.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/and-xor.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/and-xor.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/and-xor.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -scalar-evolution -analyze \
-; RUN:   | grep {\\-->  (zext} | count 2
+; RUN:   | grep "\-->  (zext" | count 2
 
 define i32 @foo(i32 %x) {
   %n = and i32 %x, 255

Modified: llvm/trunk/test/Analysis/ScalarEvolution/avoid-smax-0.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/avoid-smax-0.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/avoid-smax-0.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/avoid-smax-0.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -scalar-evolution -analyze | grep {Loop %bb3: backedge-taken count is (-1 + %n)}
+; RUN: opt < %s -scalar-evolution -analyze | grep "Loop %bb3: backedge-taken count is (-1 + %n)"
 
 ; We don't want to use a max in the trip count expression in
 ; this testcase.

Modified: llvm/trunk/test/Analysis/ScalarEvolution/div-overflow.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/div-overflow.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/div-overflow.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/div-overflow.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -scalar-evolution -analyze \
-; RUN:  | grep {\\-->  ((-128 \\* %a) /u -128)}
+; RUN:  | grep "\-->  ((-128 \* %a) /u -128)"
 
 ; Don't let ScalarEvolution fold this div away.
 

Modified: llvm/trunk/test/Analysis/ScalarEvolution/sext-inreg.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/sext-inreg.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/sext-inreg.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/sext-inreg.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: opt < %s -analyze -scalar-evolution > %t
-; RUN: grep {sext i57 \{0,+,199\}<%bb> to i64} %t | count 1
-; RUN: grep {sext i59 \{0,+,199\}<%bb> to i64} %t | count 1
+; RUN: grep "sext i57 {0,+,199}<%bb> to i64" %t | count 1
+; RUN: grep "sext i59 {0,+,199}<%bb> to i64" %t | count 1
 
 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-f80:128:128"
 target triple = "i386-apple-darwin9.6"

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=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/sext-iv-1.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/sext-iv-1.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -scalar-evolution -analyze \
-; RUN:  | grep { -->  (sext i. \{.\*,+,.\*\}<%bb1> to i64)} | count 5
+; RUN:  | grep " -->  (sext i. {.*,+,.*}<%bb1> to i64)" | count 5
 
 ; Don't convert (sext {...,+,...}) to {sext(...),+,sext(...)} in cases
 ; where the trip count is not within range.

Modified: llvm/trunk/test/Analysis/ScalarEvolution/smax.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/smax.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/smax.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/smax.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: opt < %s -analyze -scalar-evolution | grep smax | count 2
 ; RUN: opt < %s -analyze -scalar-evolution | grep \
-; RUN:     {%. smax %. smax %.}
+; RUN:     "%. smax %. smax %."
 ; PR1614
 
 define i32 @x(i32 %a, i32 %b, i32 %c) {

Modified: llvm/trunk/test/Analysis/ScalarEvolution/trip-count.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/trip-count.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/trip-count.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/trip-count.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -analyze -scalar-evolution \
-; RUN:   -scalar-evolution-max-iterations=0 | grep {backedge-taken count is 10000}
+; RUN:   -scalar-evolution-max-iterations=0 | grep "backedge-taken count is 10000"
 ; PR1101
 
 @A = weak global [1000 x i32] zeroinitializer, align 32         

Modified: llvm/trunk/test/Analysis/ScalarEvolution/trip-count2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/trip-count2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/trip-count2.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/trip-count2.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -analyze -scalar-evolution | \
-; RUN:   grep {backedge-taken count is 4}
+; RUN:   grep "backedge-taken count is 4"
 ; PR1101
 
 @A = weak global [1000 x i32] zeroinitializer, align 32         

Modified: llvm/trunk/test/Analysis/ScalarEvolution/trip-count3.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/trip-count3.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/trip-count3.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/trip-count3.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -scalar-evolution -analyze \
-; RUN:  | grep {Loop %bb3\\.i: Unpredictable backedge-taken count\\.}
+; RUN:  | grep "Loop %bb3\.i: Unpredictable backedge-taken count\."
 
 ; ScalarEvolution can't compute a trip count because it doesn't know if
 ; dividing by the stride will have a remainder. This could theoretically

Modified: llvm/trunk/test/Analysis/ScalarEvolution/trip-count4.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/trip-count4.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/trip-count4.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/trip-count4.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -analyze -scalar-evolution \
-; RUN:   | grep {sext.*trunc.*Exits: 11}
+; RUN:   | grep "sext.*trunc.*Exits: 11"
 
 ; ScalarEvolution should be able to compute a loop exit value for %indvar.i8.
 

Modified: llvm/trunk/test/Analysis/ScalarEvolution/trip-count5.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/trip-count5.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/trip-count5.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/trip-count5.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: opt < %s -analyze -scalar-evolution > %t
 ; RUN: grep sext %t | count 2
-; RUN: not grep {(sext} %t
+; RUN: not grep "(sext" %t
 
 ; ScalarEvolution should be able to compute a maximum trip count
 ; value sufficient to fold away both sext casts.

Modified: llvm/trunk/test/Analysis/ScalarEvolution/trip-count6.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/trip-count6.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/trip-count6.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/trip-count6.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -analyze -scalar-evolution \
-; RUN:  | grep {max backedge-taken count is 1\$}
+; RUN:  | grep "max backedge-taken count is 1$"
 
 @mode_table = global [4 x i32] zeroinitializer          ; <[4 x i32]*> [#uses=1]
 

Modified: llvm/trunk/test/Analysis/ScalarEvolution/trip-count7.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/trip-count7.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/trip-count7.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/trip-count7.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -analyze -scalar-evolution \
-; RUN:   | grep {Loop %bb7.i: Unpredictable backedge-taken count\\.}
+; RUN:   | grep "Loop %bb7.i: Unpredictable backedge-taken count\."
 
 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"
 

Modified: llvm/trunk/test/Analysis/ScalarEvolution/trip-count8.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/trip-count8.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/trip-count8.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/trip-count8.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -analyze -scalar-evolution \
-; RUN:  | grep {Loop %for\\.body: backedge-taken count is (-1 + \[%\]ecx)}
+; RUN:  | grep "Loop %for\.body: backedge-taken count is (-1 + [%]ecx)"
 ; PR4599
 
 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"

Modified: llvm/trunk/test/Analysis/ScalarEvolution/xor-and.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/xor-and.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/xor-and.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/xor-and.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -scalar-evolution -analyze \
-; RUN:   | grep {\\-->  (zext i4 (-8 + (trunc i64 (8 \\* %x) to i4)) to i64)}
+; RUN:   | grep "\-->  (zext i4 (-8 + (trunc i64 (8 \* %x) to i4)) to i64)"
 
 ; ScalarEvolution shouldn't try to analyze %z into something like
 ;   -->  (zext i4 (-1 + (-1 * (trunc i64 (8 * %x) to i4))) to i64)

Modified: llvm/trunk/test/Assembler/2003-11-12-ConstantExprCast.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2003-11-12-ConstantExprCast.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2003-11-12-ConstantExprCast.ll (original)
+++ llvm/trunk/test/Assembler/2003-11-12-ConstantExprCast.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | not grep { bitcast (}
+; RUN: llvm-as < %s | llvm-dis | not grep " bitcast ("
 
 @.Base64_1 = external constant [4 x i8]         ; <[4 x i8]*> [#uses=1]
 

Modified: llvm/trunk/test/Assembler/2003-11-24-SymbolTableCrash.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2003-11-24-SymbolTableCrash.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2003-11-24-SymbolTableCrash.ll (original)
+++ llvm/trunk/test/Assembler/2003-11-24-SymbolTableCrash.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep {multiple definition}
+; RUN: not llvm-as < %s |& grep "multiple definition"
 
 define void @test() {
 	%tmp.1 = add i32 0, 1

Modified: llvm/trunk/test/Assembler/2004-03-30-UnclosedFunctionCrash.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2004-03-30-UnclosedFunctionCrash.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2004-03-30-UnclosedFunctionCrash.ll (original)
+++ llvm/trunk/test/Assembler/2004-03-30-UnclosedFunctionCrash.ll Mon Jul  2 07:47:22 2012
@@ -1,3 +1,3 @@
-; RUN: not llvm-as %s |& grep {found end of file when expecting more instructions}
+; RUN: not llvm-as %s |& grep "found end of file when expecting more instructions"
 
 define void @foo() {

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=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2004-11-28-InvalidTypeCrash.ll (original)
+++ llvm/trunk/test/Assembler/2004-11-28-InvalidTypeCrash.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
 ; Test for PR463.  This program is erroneous, but should not crash llvm-as.
-; RUN: not llvm-as %s -o /dev/null |& grep {use of undefined type named 'struct.none'}
+; RUN: not llvm-as %s -o /dev/null |& grep "use of undefined type named 'struct.none'"
 
 @.FOO  = internal global %struct.none zeroinitializer

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=159525&r1=159524&r2=159525&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 Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; The assembler should catch an undefined argument type .
-; RUN: not llvm-as %s -o /dev/null |& grep {use of undefined type named 'typedef.bc_struct'}
+; RUN: not llvm-as %s -o /dev/null |& grep "use of undefined type named 'typedef.bc_struct'"
 
 ; %typedef.bc_struct = type opaque
 

Modified: llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast.ll (original)
+++ llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; PR1117
-; RUN: not llvm-as %s -o /dev/null |& grep {invalid cast opcode for cast from}
+; RUN: not llvm-as %s -o /dev/null |& grep "invalid cast opcode for cast from"
 
 define i8* @nada(i64 %X) {
     %result = trunc i64 %X to i8*

Modified: llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast2.ll (original)
+++ llvm/trunk/test/Assembler/2007-01-16-CrashOnBadCast2.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
 ; PR1117
-; RUN: not llvm-as %s -o /dev/null |& grep {invalid cast opcode for cast from}
+; RUN: not llvm-as %s -o /dev/null |& grep "invalid cast opcode for cast from"
 
 @X = constant i8* trunc (i64 0 to i8*)

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=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2007-03-19-NegValue.ll (original)
+++ llvm/trunk/test/Assembler/2007-03-19-NegValue.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; 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 | grep "add i65.*, -1"
 
 define i65 @testConsts(i65 %N) {
   %a = add i65 %N, -1

Modified: llvm/trunk/test/Assembler/2007-04-20-AlignedLoad.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-04-20-AlignedLoad.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2007-04-20-AlignedLoad.ll (original)
+++ llvm/trunk/test/Assembler/2007-04-20-AlignedLoad.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | grep {align 1024}
+; RUN: llvm-as < %s | llvm-dis | grep "align 1024"
 
 define i32 @test(i32* %arg) {
 entry:

Modified: llvm/trunk/test/Assembler/2007-04-20-AlignedStore.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-04-20-AlignedStore.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2007-04-20-AlignedStore.ll (original)
+++ llvm/trunk/test/Assembler/2007-04-20-AlignedStore.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | grep {align 1024}
+; RUN: llvm-as < %s | llvm-dis | grep "align 1024"
 
 define void @test(i32* %arg) {
 entry:

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=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2007-04-25-AssemblerFoldExternWeak.ll (original)
+++ llvm/trunk/test/Assembler/2007-04-25-AssemblerFoldExternWeak.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | grep {icmp.*test_weak.*null}
+; RUN: llvm-as < %s | llvm-dis | grep "icmp.*test_weak.*null"
 ; PR1358
 @G = global i1 icmp ne (i32 (...)* @test_weak, i32 (...)* null)
 

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=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2007-09-29-GC.ll (original)
+++ llvm/trunk/test/Assembler/2007-09-29-GC.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-; 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 | grep "@f.*gc.*shadowstack"
+; RUN: llvm-as < %s | llvm-dis | grep "@g.*gc.*java"
 
 define void @f() gc "shadowstack" {
 entry:

Modified: llvm/trunk/test/Assembler/2007-12-11-AddressSpaces.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2007-12-11-AddressSpaces.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2007-12-11-AddressSpaces.ll (original)
+++ llvm/trunk/test/Assembler/2007-12-11-AddressSpaces.ll Mon Jul  2 07:47:22 2012
@@ -1,8 +1,8 @@
-; RUN: llvm-as < %s | llvm-dis | grep {addrspace(33)} | count 7
-; RUN: llvm-as < %s | llvm-dis | grep {addrspace(42)} | count 2
-; RUN: llvm-as < %s | llvm-dis | grep {addrspace(66)} | count 2
-; RUN: llvm-as < %s | llvm-dis | grep {addrspace(11)} | count 6
-; RUN: llvm-as < %s | llvm-dis | grep {addrspace(22)} | count 5
+; RUN: llvm-as < %s | llvm-dis | grep "addrspace(33)" | count 7
+; RUN: llvm-as < %s | llvm-dis | grep "addrspace(42)" | count 2
+; RUN: llvm-as < %s | llvm-dis | grep "addrspace(66)" | count 2
+; RUN: llvm-as < %s | llvm-dis | grep "addrspace(11)" | count 6
+; RUN: llvm-as < %s | llvm-dis | grep "addrspace(22)" | count 5
 
 	%struct.mystruct = type { i32, i32 addrspace(33)*, i32, i32 addrspace(33)* }
 @input = weak addrspace(42) global %struct.mystruct zeroinitializer  		; <%struct.mystruct addrspace(42)*> [#uses=1]

Modified: llvm/trunk/test/Assembler/2008-02-18-IntPointerCrash.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2008-02-18-IntPointerCrash.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/2008-02-18-IntPointerCrash.ll (original)
+++ llvm/trunk/test/Assembler/2008-02-18-IntPointerCrash.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: not llvm-as %s |& grep {integer constant must have integer type}
+; RUN: not llvm-as %s |& grep "integer constant must have integer type"
 ; PR2060
 
 define i8* @foo() {

Modified: llvm/trunk/test/Assembler/ConstantExprFold.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/ConstantExprFold.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/ConstantExprFold.ll (original)
+++ llvm/trunk/test/Assembler/ConstantExprFold.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; This test checks to make sure that constant exprs fold in some simple 
 ; situations
 
-; RUN: llvm-as < %s | llvm-dis | not grep {(}
+; RUN: llvm-as < %s | llvm-dis | not grep "("
 
 @A = global i64 0
 

Modified: llvm/trunk/test/CodeGen/ARM/2009-04-06-AsmModifier.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2009-04-06-AsmModifier.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2009-04-06-AsmModifier.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/2009-04-06-AsmModifier.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=arm | grep {swi 107}
+; RUN: llc < %s -march=arm | grep "swi 107"
 
 define i32 @_swilseek(i32) nounwind {
 entry:

Modified: llvm/trunk/test/CodeGen/ARM/aliases.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/aliases.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/aliases.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/aliases.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -mtriple=arm-linux-gnueabi -o %t
-; RUN: grep { = } %t   | count 5
+; RUN: grep " = " %t   | count 5
 ; RUN: grep globl %t | count 4
 ; RUN: grep weak %t  | count 1
 

Modified: llvm/trunk/test/CodeGen/ARM/cse-libcalls.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/cse-libcalls.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/cse-libcalls.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/cse-libcalls.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=arm | grep {bl.\*__ltdf} | count 1
+; RUN: llc < %s -march=arm | grep "bl.*__ltdf" | count 1
 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-f80:128:128"
 target triple = "i386-apple-darwin8"
 

Modified: llvm/trunk/test/CodeGen/ARM/lsr-scale-addr-mode.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/lsr-scale-addr-mode.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/lsr-scale-addr-mode.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/lsr-scale-addr-mode.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=arm | grep lsl | grep -F {lsl #2\]}
+; RUN: llc < %s -march=arm | grep lsl | grep -F "lsl #2]"
 ; Should use scaled addressing mode.
 
 define void @sintzero(i32* %a) nounwind {

Modified: llvm/trunk/test/CodeGen/ARM/str_pre.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/str_pre.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/str_pre.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/str_pre.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=arm | \
-; RUN:   grep {str.*\\!} | count 2
+; RUN:   grep "str.*\!" | count 2
 
 define void @test1(i32* %X, i32* %A, i32** %dest) {
         %B = load i32* %A               ; <i32> [#uses=1]

Modified: llvm/trunk/test/CodeGen/ARM/thread_pointer.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/thread_pointer.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/thread_pointer.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/thread_pointer.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=arm -mtriple=arm-linux-gnueabi | \
-; RUN:     grep {__aeabi_read_tp}
+; RUN:     grep "__aeabi_read_tp"
 
 define i8* @test() {
 entry:

Modified: llvm/trunk/test/CodeGen/ARM/tls1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/tls1.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/tls1.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/tls1.ll Mon Jul  2 07:47:22 2012
@@ -1,9 +1,9 @@
 ; RUN: llc < %s -march=arm -mtriple=arm-linux-gnueabi | \
-; RUN:     grep {i(tpoff)}
+; RUN:     grep "i(tpoff)"
 ; RUN: llc < %s -march=arm -mtriple=arm-linux-gnueabi | \
-; RUN:     grep {__aeabi_read_tp}
+; RUN:     grep "__aeabi_read_tp"
 ; RUN: llc < %s -march=arm -mtriple=arm-linux-gnueabi \
-; RUN:     -relocation-model=pic | grep {__tls_get_addr}
+; RUN:     -relocation-model=pic | grep "__tls_get_addr"
 
 
 @i = thread_local global i32 15		; <i32*> [#uses=2]

Modified: llvm/trunk/test/CodeGen/ARM/tls3.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/tls3.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/ARM/tls3.ll (original)
+++ llvm/trunk/test/CodeGen/ARM/tls3.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=arm -mtriple=arm-linux-gnueabi | \
-; RUN:     grep {tbss}
+; RUN:     grep "tbss"
 
 %struct.anon = type { i32, i32 }
 @teste = internal thread_local global %struct.anon zeroinitializer		; <%struct.anon*> [#uses=1]

Modified: llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll (original)
+++ llvm/trunk/test/CodeGen/CellSPU/shift_ops.ll Mon Jul  2 07:47:22 2012
@@ -1,20 +1,20 @@
 ; RUN: llc < %s -march=cellspu > %t1.s
-; RUN: grep {shlh	}  %t1.s | count 10
-; RUN: grep {shlhi	}  %t1.s | count 3
-; RUN: grep {shl	}  %t1.s | count 10
-; RUN: grep {shli	}  %t1.s | count 3
-; RUN: grep {xshw	}  %t1.s | count 5
-; RUN: grep {and	}  %t1.s | count 15
-; RUN: grep {andi	}  %t1.s | count 4
-; RUN: grep {rotmi	}  %t1.s | count 4
-; RUN: grep {rotqmbyi	}  %t1.s | count 1
-; RUN: grep {rotqmbii	}  %t1.s | count 2
-; RUN: grep {rotqmby	}  %t1.s | count 1
-; RUN: grep {rotqmbi	}  %t1.s | count 2
-; RUN: grep {rotqbyi	}  %t1.s | count 1
-; RUN: grep {rotqbii	}  %t1.s | count 2
-; RUN: grep {rotqbybi	}  %t1.s | count 1
-; RUN: grep {sfi	}  %t1.s | count 6
+; RUN: grep "shlh	"  %t1.s | count 10
+; RUN: grep "shlhi	"  %t1.s | count 3
+; RUN: grep "shl	"  %t1.s | count 10
+; RUN: grep "shli	"  %t1.s | count 3
+; RUN: grep "xshw	"  %t1.s | count 5
+; RUN: grep "and	"  %t1.s | count 15
+; RUN: grep "andi	"  %t1.s | count 4
+; RUN: grep "rotmi	"  %t1.s | count 4
+; RUN: grep "rotqmbyi	"  %t1.s | count 1
+; RUN: grep "rotqmbii	"  %t1.s | count 2
+; RUN: grep "rotqmby	"  %t1.s | count 1
+; RUN: grep "rotqmbi	"  %t1.s | count 2
+; RUN: grep "rotqbyi	"  %t1.s | count 1
+; RUN: grep "rotqbii	"  %t1.s | count 2
+; RUN: grep "rotqbybi	"  %t1.s | count 1
+; RUN: grep "sfi	"  %t1.s | count 6
 ; RUN: cat %t1.s | FileCheck %s
 
 target datalayout = "E-p:32:32:128-f64:64:128-f32:32:128-i64:32:128-i32:32:128-i16:16:128-i8:8:128-i1:8:128-a0:0:128-v128:128:128-s0:128:128"

Modified: llvm/trunk/test/CodeGen/CellSPU/stores.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/CellSPU/stores.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/CellSPU/stores.ll (original)
+++ llvm/trunk/test/CodeGen/CellSPU/stores.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: llc < %s -march=cellspu > %t1.s
-; RUN: grep {stqd.*0(\$3)}      %t1.s | count 4
-; RUN: grep {stqd.*16(\$3)}     %t1.s | count 4
+; RUN: grep 'stqd.*0($3)'       %t1.s | count 4
+; RUN: grep 'stqd.*16($3)'      %t1.s | count 4
 ; RUN: grep 16256               %t1.s | count 2
 ; RUN: grep 16384               %t1.s | count 1
 ; RUN: grep 771                 %t1.s | count 4
@@ -8,7 +8,7 @@
 ; RUN: grep 1799                %t1.s | count 2
 ; RUN: grep 1543                %t1.s | count 5
 ; RUN: grep 1029                %t1.s | count 3
-; RUN: grep {shli.*, 4}         %t1.s | count 4
+; RUN: grep 'shli.*, 4'         %t1.s | count 4
 ; RUN: grep stqx                %t1.s | count 4
 ; RUN: grep ilhu                %t1.s | count 11
 ; RUN: grep iohl                %t1.s | count 8

Modified: llvm/trunk/test/CodeGen/CellSPU/trunc.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/CellSPU/trunc.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/CellSPU/trunc.ll (original)
+++ llvm/trunk/test/CodeGen/CellSPU/trunc.ll Mon Jul  2 07:47:22 2012
@@ -1,19 +1,19 @@
 ; RUN: llc < %s -march=cellspu > %t1.s
 ; RUN: grep shufb   %t1.s | count 19
-; RUN: grep {ilhu.*1799}  %t1.s | count 1
-; RUN: grep {ilhu.*771}  %t1.s | count 2
-; RUN: grep {ilhu.*1543}  %t1.s | count 1
-; RUN: grep {ilhu.*1029}  %t1.s | count 1
-; RUN: grep {ilhu.*515}  %t1.s | count 1
-; RUN: grep {ilhu.*3855}  %t1.s | count 1
-; RUN: grep {ilhu.*3599}  %t1.s | count 1
-; RUN: grep {ilhu.*3085}  %t1.s | count 1
-; RUN: grep {iohl.*3855}  %t1.s | count 1
-; RUN: grep {iohl.*3599}  %t1.s | count 2
-; RUN: grep {iohl.*1543}  %t1.s | count 2
-; RUN: grep {iohl.*771}  %t1.s | count 2
-; RUN: grep {iohl.*515}  %t1.s | count 1
-; RUN: grep {iohl.*1799}  %t1.s | count 1
+; RUN: grep "ilhu.*1799"  %t1.s | count 1
+; RUN: grep "ilhu.*771"  %t1.s | count 2
+; RUN: grep "ilhu.*1543"  %t1.s | count 1
+; RUN: grep "ilhu.*1029"  %t1.s | count 1
+; RUN: grep "ilhu.*515"  %t1.s | count 1
+; RUN: grep "ilhu.*3855"  %t1.s | count 1
+; RUN: grep "ilhu.*3599"  %t1.s | count 1
+; RUN: grep "ilhu.*3085"  %t1.s | count 1
+; RUN: grep "iohl.*3855"  %t1.s | count 1
+; RUN: grep "iohl.*3599"  %t1.s | count 2
+; RUN: grep "iohl.*1543"  %t1.s | count 2
+; RUN: grep "iohl.*771"  %t1.s | count 2
+; RUN: grep "iohl.*515"  %t1.s | count 1
+; RUN: grep "iohl.*1799"  %t1.s | count 1
 ; RUN: grep lqa  %t1.s | count 1
 ; RUN: grep cbd  %t1.s | count 4
 ; RUN: grep chd  %t1.s | count 3

Modified: llvm/trunk/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/2005-09-02-LegalizeDuplicatesCalls.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; This function should have exactly one call to fixdfdi, no more!
 
 ; RUN: llc < %s -march=ppc32 -mattr=-64bit | \
-; RUN:    grep {bl .*fixdfdi} | count 1
+; RUN:    grep "bl .*fixdfdi" | count 1
 
 define double @test2(double %tmp.7705) {
         %mem_tmp.2.0.in = fptosi double %tmp.7705 to i64                ; <i64> [#uses=1]

Modified: llvm/trunk/test/CodeGen/PowerPC/2006-04-05-splat-ish.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/2006-04-05-splat-ish.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/2006-04-05-splat-ish.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/2006-04-05-splat-ish.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 -mcpu=g5 | \
-; RUN:   grep {vspltish v.*, 10}
+; RUN:   grep "vspltish v.*, 10"
 
 define void @test(<8 x i16>* %P) {
         %tmp = load <8 x i16>* %P               ; <<8 x i16>> [#uses=1]

Modified: llvm/trunk/test/CodeGen/PowerPC/2007-04-24-InlineAsm-I-Modifier.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/2007-04-24-InlineAsm-I-Modifier.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/2007-04-24-InlineAsm-I-Modifier.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/2007-04-24-InlineAsm-I-Modifier.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8.8.0 | grep {foo r3, r4}
-; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8.8.0 | grep {bari r3, 47}
+; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8.8.0 | grep "foo r3, r4"
+; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8.8.0 | grep "bari r3, 47"
 
 ; PR1351
 

Modified: llvm/trunk/test/CodeGen/PowerPC/2007-05-30-dagcombine-miscomp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/2007-05-30-dagcombine-miscomp.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/2007-05-30-dagcombine-miscomp.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/2007-05-30-dagcombine-miscomp.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 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 = "powerpc-apple-darwin8.8.0"
 
-; RUN: llc < %s -march=ppc32 | grep {rlwinm r3, r3, 23, 30, 30}
+; RUN: llc < %s -march=ppc32 | grep "rlwinm r3, r3, 23, 30, 30"
 ; PR1473
 
 define zeroext i8 @foo(i16 zeroext  %a)   {

Modified: llvm/trunk/test/CodeGen/PowerPC/Frames-leaf.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/Frames-leaf.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/Frames-leaf.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/Frames-leaf.ll Mon Jul  2 07:47:22 2012
@@ -1,35 +1,35 @@
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   not grep {stw r31, 20(r1)}
+; RUN:   not grep "stw r31, 20(r1)"
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   not grep {stwu r1, -.*(r1)}
+; RUN:   not grep "stwu r1, -.*(r1)"
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   not grep {addi r1, r1, }
+; RUN:   not grep "addi r1, r1, "
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   not grep {lwz r31, 20(r1)}
+; RUN:   not grep "lwz r31, 20(r1)"
 ; RUN: llc < %s -march=ppc32 -disable-fp-elim | \
-; RUN:   not grep {stw r31, 20(r1)}
+; RUN:   not grep "stw r31, 20(r1)"
 ; RUN: llc < %s -march=ppc32 -disable-fp-elim | \
-; RUN:   not grep {stwu r1, -.*(r1)}
+; RUN:   not grep "stwu r1, -.*(r1)"
 ; RUN: llc < %s -march=ppc32 -disable-fp-elim | \
-; RUN:   not grep {addi r1, r1, }
+; RUN:   not grep "addi r1, r1, "
 ; RUN: llc < %s -march=ppc32 -disable-fp-elim | \
-; RUN:   not grep {lwz r31, 20(r1)}
+; RUN:   not grep "lwz r31, 20(r1)"
 ; RUN: llc < %s -march=ppc64 | \
-; RUN:   not grep {std r31, 40(r1)}
+; RUN:   not grep "std r31, 40(r1)"
 ; RUN: llc < %s -march=ppc64 | \
-; RUN:   not grep {stdu r1, -.*(r1)}
+; RUN:   not grep "stdu r1, -.*(r1)"
 ; RUN: llc < %s -march=ppc64 | \
-; RUN:   not grep {addi r1, r1, }
+; RUN:   not grep "addi r1, r1, "
 ; RUN: llc < %s -march=ppc64 | \
-; RUN:   not grep {ld r31, 40(r1)}
+; RUN:   not grep "ld r31, 40(r1)"
 ; RUN: llc < %s -march=ppc64 -disable-fp-elim | \
-; RUN:   not grep {stw r31, 40(r1)}
+; RUN:   not grep "stw r31, 40(r1)"
 ; RUN: llc < %s -march=ppc64 -disable-fp-elim | \
-; RUN:   not grep {stdu r1, -.*(r1)}
+; RUN:   not grep "stdu r1, -.*(r1)"
 ; RUN: llc < %s -march=ppc64 -disable-fp-elim | \
-; RUN:   not grep {addi r1, r1, }
+; RUN:   not grep "addi r1, r1, "
 ; RUN: llc < %s -march=ppc64 -disable-fp-elim | \
-; RUN:   not grep {ld r31, 40(r1)}
+; RUN:   not grep "ld r31, 40(r1)"
 
 define i32* @f1() {
         %tmp = alloca i32, i32 2                ; <i32*> [#uses=1]

Modified: llvm/trunk/test/CodeGen/PowerPC/Frames-small.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/Frames-small.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/Frames-small.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/Frames-small.ll Mon Jul  2 07:47:22 2012
@@ -1,26 +1,26 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 -o %t1
-; RUN: not grep {stw r31, -4(r1)} %t1
-; RUN: grep {stwu r1, -16448(r1)} %t1
-; RUN: grep {addi r1, r1, 16448} %t1
+; RUN: not grep "stw r31, -4(r1)" %t1
+; RUN: grep "stwu r1, -16448(r1)" %t1
+; RUN: grep "addi r1, r1, 16448" %t1
 ; RUN: llc < %s -march=ppc32 | \
-; RUN: not grep {lwz r31, -4(r1)}
+; RUN: not grep "lwz r31, -4(r1)"
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 -disable-fp-elim \
 ; RUN:   -o %t2
-; RUN: grep {stw r31, -4(r1)} %t2
-; RUN: grep {stwu r1, -16448(r1)} %t2
-; RUN: grep {addi r1, r1, 16448} %t2
-; RUN: grep {lwz r31, -4(r1)} %t2
+; RUN: grep "stw r31, -4(r1)" %t2
+; RUN: grep "stwu r1, -16448(r1)" %t2
+; RUN: grep "addi r1, r1, 16448" %t2
+; RUN: grep "lwz r31, -4(r1)" %t2
 ; RUN: llc < %s -march=ppc64 -mtriple=powerpc-apple-darwin8 -o %t3
-; RUN: not grep {std r31, -8(r1)} %t3
-; RUN: grep {stdu r1, -16496(r1)} %t3
-; RUN: grep {addi r1, r1, 16496} %t3
-; RUN: not grep {ld r31, -8(r1)} %t3
+; RUN: not grep "std r31, -8(r1)" %t3
+; RUN: grep "stdu r1, -16496(r1)" %t3
+; RUN: grep "addi r1, r1, 16496" %t3
+; RUN: not grep "ld r31, -8(r1)" %t3
 ; RUN: llc < %s -march=ppc64 -mtriple=powerpc-apple-darwin8 -disable-fp-elim \
 ; RUN:   -o %t4
-; RUN: grep {std r31, -8(r1)} %t4
-; RUN: grep {stdu r1, -16512(r1)} %t4
-; RUN: grep {addi r1, r1, 16512} %t4
-; RUN: grep {ld r31, -8(r1)} %t4
+; RUN: grep "std r31, -8(r1)" %t4
+; RUN: grep "stdu r1, -16512(r1)" %t4
+; RUN: grep "addi r1, r1, 16512" %t4
+; RUN: grep "ld r31, -8(r1)" %t4
 
 define i32* @f1() {
         %tmp = alloca i32, i32 4095             ; <i32*> [#uses=1]

Modified: llvm/trunk/test/CodeGen/PowerPC/LargeAbsoluteAddr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/LargeAbsoluteAddr.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/LargeAbsoluteAddr.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/LargeAbsoluteAddr.ll Mon Jul  2 07:47:22 2012
@@ -1,9 +1,9 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin | \
-; RUN:   grep {stw r4, 32751}
+; RUN:   grep "stw r4, 32751"
 ; RUN: llc < %s -march=ppc64 -mtriple=powerpc-apple-darwin | \
-; RUN:   grep {stw r4, 32751}
+; RUN:   grep "stw r4, 32751"
 ; RUN: llc < %s -march=ppc64 -mtriple=powerpc-apple-darwin | \
-; RUN:   grep {std r4, 9024}
+; RUN:   grep "std r4, 9024"
 
 define void @test() nounwind {
 	store i32 0, i32* inttoptr (i64 48725999 to i32*)

Modified: llvm/trunk/test/CodeGen/PowerPC/and-imm.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/and-imm.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/and-imm.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/and-imm.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=ppc32 | not grep {ori\\|lis}
+; RUN: llc < %s -march=ppc32 | not grep "ori\|lis"
 
 ; andi. r3, r3, 32769	
 define i32 @test(i32 %X) {

Modified: llvm/trunk/test/CodeGen/PowerPC/big-endian-actual-args.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/big-endian-actual-args.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/big-endian-actual-args.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/big-endian-actual-args.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-unknown-linux-gnu | \
-; RUN:   grep {addc 4, 4, 6}
+; RUN:   grep "addc 4, 4, 6"
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-unknown-linux-gnu | \
-; RUN:   grep {adde 3, 3, 5}
+; RUN:   grep "adde 3, 3, 5"
 
 define i64 @foo(i64 %x, i64 %y) {
   %z = add i64 %x, %y

Modified: llvm/trunk/test/CodeGen/PowerPC/big-endian-call-result.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/big-endian-call-result.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/big-endian-call-result.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/big-endian-call-result.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-unknown-linux-gnu | \
-; RUN:   grep {addic 4, 4, 1}
+; RUN:   grep "addic 4, 4, 1"
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-unknown-linux-gnu | \
-; RUN:   grep {addze 3, 3}
+; RUN:   grep "addze 3, 3"
 
 declare i64 @foo()
 

Modified: llvm/trunk/test/CodeGen/PowerPC/branch-opt.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/branch-opt.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/branch-opt.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/branch-opt.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   grep {b LBB.*} | count 4
+; RUN:   grep "b LBB.*" | count 4
 
 target datalayout = "E-p:32:32"
 target triple = "powerpc-apple-darwin8.7.0"

Modified: llvm/trunk/test/CodeGen/PowerPC/calls.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/calls.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/calls.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/calls.ll Mon Jul  2 07:47:22 2012
@@ -1,11 +1,11 @@
 ; Test various forms of calls.
 
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   grep {bl } | count 1
+; RUN:   grep "bl " | count 1
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   grep {bctrl} | count 1
+; RUN:   grep "bctrl" | count 1
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   grep {bla } | count 1
+; RUN:   grep "bla " | count 1
 
 declare void @foo()
 

Modified: llvm/trunk/test/CodeGen/PowerPC/compare-simm.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/compare-simm.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/compare-simm.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/compare-simm.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 | \
-; RUN:   grep {cmpwi cr0, r3, -1}
+; RUN:   grep "cmpwi cr0, r3, -1"
 
 define i32 @test(i32 %x) nounwind {
         %c = icmp eq i32 %x, -1

Modified: llvm/trunk/test/CodeGen/PowerPC/constants.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/constants.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/constants.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/constants.ll Mon Jul  2 07:47:22 2012
@@ -4,7 +4,7 @@
 ; RUN: llc < %s -march=ppc32 | \
 ; RUN:   grep ori | count 3
 ; RUN: llc < %s -march=ppc32 | \
-; RUN:   grep {li } | count 4
+; RUN:   grep "li " | count 4
 
 define i32 @f1() {
 entry:

Modified: llvm/trunk/test/CodeGen/PowerPC/darwin-labels.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/darwin-labels.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/darwin-labels.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/darwin-labels.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s | grep {foo bar":}
+; RUN: llc < %s | grep 'foo bar":'
 
 target datalayout = "E-p:32:32"
 target triple = "powerpc-apple-darwin8.2.0"

Modified: llvm/trunk/test/CodeGen/PowerPC/fabs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/fabs.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/fabs.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/fabs.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin | grep {fabs f1, f1}
+; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin | grep "fabs f1, f1"
 
 define double @fabs(double %f) {
 entry:

Modified: llvm/trunk/test/CodeGen/PowerPC/fma.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/fma.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/fma.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/fma.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 -fp-contract=fast | \
-; RUN:   egrep {fn?madd|fn?msub} | count 8
+; RUN:   egrep "fn?madd|fn?msub" | count 8
 
 define double @test_FMADD1(double %A, double %B, double %C) {
 	%D = fmul double %A, %B		; <double> [#uses=1]

Modified: llvm/trunk/test/CodeGen/PowerPC/fsqrt.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/fsqrt.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/fsqrt.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/fsqrt.ll Mon Jul  2 07:47:22 2012
@@ -2,13 +2,13 @@
 ; otherwise.
 
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 -mattr=+fsqrt | \
-; RUN:   grep {fsqrt f1, f1}
+; RUN:   grep "fsqrt f1, f1"
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 -mcpu=g5 | \
-; RUN:   grep {fsqrt f1, f1}
+; RUN:   grep "fsqrt f1, f1"
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 -mattr=-fsqrt | \
-; RUN:   not grep {fsqrt f1, f1}
+; RUN:   not grep "fsqrt f1, f1"
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 -mcpu=g4 | \
-; RUN:   not grep {fsqrt f1, f1}
+; RUN:   not grep "fsqrt f1, f1"
 
 declare double @llvm.sqrt.f64(double)
 

Modified: llvm/trunk/test/CodeGen/PowerPC/iabs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/iabs.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/iabs.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/iabs.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 -stats |& \
-; RUN:   grep {4 .*Number of machine instrs printed}
+; RUN:   grep "4 .*Number of machine instrs printed"
 
 ;; Integer absolute value, should produce something as good as:
 ;;      srawi r2, r3, 31

Modified: llvm/trunk/test/CodeGen/PowerPC/ispositive.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/ispositive.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/ispositive.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/ispositive.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 | \
-; RUN:   grep {srwi r3, r3, 31}
+; RUN:   grep "srwi r3, r3, 31"
 
 define i32 @test1(i32 %X) {
 entry:

Modified: llvm/trunk/test/CodeGen/PowerPC/no-dead-strip.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/no-dead-strip.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/no-dead-strip.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/no-dead-strip.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s | grep {no_dead_strip.*_X}
+; RUN: llc < %s | grep "no_dead_strip.*_X"
 
 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 = "powerpc-apple-darwin8.8.0"

Modified: llvm/trunk/test/CodeGen/PowerPC/retaddr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/retaddr.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/retaddr.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/retaddr.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: llc < %s -march=ppc32 | grep mflr
 ; RUN: llc < %s -march=ppc32 | grep lwz
-; RUN: llc < %s -march=ppc64 | grep {ld r., 16(r1)}
+; RUN: llc < %s -march=ppc64 | grep "ld r., 16(r1)"
 
 target triple = "powerpc-apple-darwin8"
 

Modified: llvm/trunk/test/CodeGen/PowerPC/rlwimi3.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/rlwimi3.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/rlwimi3.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/rlwimi3.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 -stats |& \
-; RUN:   grep {Number of machine instrs printed} | grep 12
+; RUN:   grep "Number of machine instrs printed" | grep 12
 
 define i16 @Trans16Bit(i32 %srcA, i32 %srcB, i32 %alpha) {
 	%tmp1 = shl i32 %srcA, 15		; <i32> [#uses=1]

Modified: llvm/trunk/test/CodeGen/PowerPC/seteq-0.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/seteq-0.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/seteq-0.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/seteq-0.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=ppc32 -mtriple=powerpc-apple-darwin8 | \
-; RUN:   grep {srwi r., r., 5}
+; RUN:   grep "srwi r., r., 5"
 
 define i32 @eq0(i32 %a) {
         %tmp.1 = icmp eq i32 %a, 0              ; <i1> [#uses=1]

Modified: llvm/trunk/test/CodeGen/PowerPC/small-arguments.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/small-arguments.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/small-arguments.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/small-arguments.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=ppc32 | not grep {extsh\\|rlwinm}
+; RUN: llc < %s -march=ppc32 | not grep "extsh\|rlwinm"
 
 declare signext i16 @foo()  
 

Modified: llvm/trunk/test/CodeGen/PowerPC/stack-protector.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/stack-protector.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/stack-protector.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/stack-protector.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-; RUN: llc -march=ppc32 < %s -o - | grep {__stack_chk_guard}
-; RUN: llc -march=ppc32 < %s -o - | grep {__stack_chk_fail}
+; RUN: llc -march=ppc32 < %s -o - | grep "__stack_chk_guard"
+; RUN: llc -march=ppc32 < %s -o - | grep "__stack_chk_fail"
 
 @"\01LC" = internal constant [11 x i8] c"buf == %s\0A\00"		; <[11 x i8]*> [#uses=1]
 

Modified: llvm/trunk/test/CodeGen/PowerPC/trampoline.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/trampoline.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/trampoline.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/trampoline.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=ppc32 | grep {__trampoline_setup}
+; RUN: llc < %s -march=ppc32 | grep "__trampoline_setup"
 
 module asm "\09.lazy_reference .objc_class_name_NSImageRep"
 module asm "\09.objc_class_name_NSBitmapImageRep=0"

Modified: llvm/trunk/test/CodeGen/Thumb/asmprinter-bug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Thumb/asmprinter-bug.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Thumb/asmprinter-bug.ll (original)
+++ llvm/trunk/test/CodeGen/Thumb/asmprinter-bug.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -mtriple=thumbv6-apple-darwin10 | grep rsbs | grep {#0}
+; RUN: llc < %s -mtriple=thumbv6-apple-darwin10 | grep rsbs | grep "#0"
 
 	%struct.FILE = type { i8*, i32, i32, i16, i16, %struct.__sbuf, i32, i8*, i32 (i8*)*, i32 (i8*, i8*, i32)*, i64 (i8*, i64, i32)*, i32 (i8*, i8*, i32)*, %struct.__sbuf, %struct.__sFILEX*, i32, [3 x i8], [1 x i8], %struct.__sbuf, i32, i64 }
 	%struct.__sFILEX = type opaque

Modified: llvm/trunk/test/CodeGen/Thumb/iabs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Thumb/iabs.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Thumb/iabs.ll (original)
+++ llvm/trunk/test/CodeGen/Thumb/iabs.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=thumb -stats |& \
-; RUN:   grep {4 .*Number of machine instrs printed}
+; RUN:   grep "4 .*Number of machine instrs printed"
 
 ;; Integer absolute value, should produce something as good as:
 ;; Thumb:

Modified: llvm/trunk/test/CodeGen/Thumb2/thumb2-ldr_pre.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Thumb2/thumb2-ldr_pre.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Thumb2/thumb2-ldr_pre.ll (original)
+++ llvm/trunk/test/CodeGen/Thumb2/thumb2-ldr_pre.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -march=thumb -mattr=+thumb2 | \
-; RUN:   grep {ldr.*\\!} | count 3
+; RUN:   grep "ldr.*\!" | count 3
 ; RUN: llc < %s -march=thumb -mattr=+thumb2 | \
-; RUN:   grep {ldrsb.*\\!} | count 1
+; RUN:   grep "ldrsb.*\!" | count 1
 
 define i32* @test1(i32* %X, i32* %dest) {
         %Y = getelementptr i32* %X, i32 4               ; <i32*> [#uses=2]

Modified: llvm/trunk/test/CodeGen/Thumb2/tls1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Thumb2/tls1.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/Thumb2/tls1.ll (original)
+++ llvm/trunk/test/CodeGen/Thumb2/tls1.ll Mon Jul  2 07:47:22 2012
@@ -1,9 +1,9 @@
 ; RUN: llc < %s -mtriple=thumbv7-linux-gnueabi | \
-; RUN:     grep {i(tpoff)}
+; RUN:     grep "i(tpoff)"
 ; RUN: llc < %s -mtriple=thumbv7-linux-gnueabi | \
-; RUN:     grep {__aeabi_read_tp}
+; RUN:     grep "__aeabi_read_tp"
 ; RUN: llc < %s -mtriple=thumbv7-linux-gnueabi \
-; RUN:     -relocation-model=pic | grep {__tls_get_addr}
+; RUN:     -relocation-model=pic | grep "__tls_get_addr"
 
 
 @i = thread_local global i32 15		; <i32*> [#uses=2]

Modified: llvm/trunk/test/CodeGen/X86/2004-02-13-FrameReturnAddress.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2004-02-13-FrameReturnAddress.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2004-02-13-FrameReturnAddress.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2004-02-13-FrameReturnAddress.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
-; RUN: llc < %s -march=x86 | grep {(%esp}
-; RUN: llc < %s -march=x86 | grep {pushl	%ebp} | count 1
-; RUN: llc < %s -march=x86 | grep {popl	%ebp} | count 1
+; RUN: llc < %s -march=x86 | grep "(%esp"
+; RUN: llc < %s -march=x86 | grep "pushl	%ebp" | count 1
+; RUN: llc < %s -march=x86 | grep "popl	%ebp" | count 1
 
 declare i8* @llvm.returnaddress(i32)
 

Modified: llvm/trunk/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2006-04-27-ISelFoldingBug.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: llc < %s -march=x86 -mtriple=i686-apple-darwin8 -relocation-model=static > %t
-; RUN: grep {movl	_last} %t | count 1
-; RUN: grep {cmpl.*_last} %t | count 1
+; RUN: grep "movl	_last" %t | count 1
+; RUN: grep "cmpl.*_last" %t | count 1
 
 @block = external global i8*            ; <i8**> [#uses=1]
 @last = external global i32             ; <i32*> [#uses=3]

Modified: llvm/trunk/test/CodeGen/X86/2006-05-11-InstrSched.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2006-05-11-InstrSched.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2006-05-11-InstrSched.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2006-05-11-InstrSched.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=x86 -mtriple=i386-linux-gnu -mcpu=penryn -mattr=+sse2 -stats -realign-stack=0 |&\
-; RUN:     grep {asm-printer} | grep 35
+; RUN:     grep "asm-printer" | grep 35
 
 target datalayout = "e-p:32:32"
 define void @foo(i32* %mc, i32* %bp, i32* %ms, i32* %xmb, i32* %mpp, i32* %tpmm, i32* %ip, i32* %tpim, i32* %dpp, i32* %tpdm, i32* %bpi, i32 %M) nounwind {

Modified: llvm/trunk/test/CodeGen/X86/2006-07-31-SingleRegClass.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2006-07-31-SingleRegClass.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2006-07-31-SingleRegClass.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2006-07-31-SingleRegClass.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; PR850
 ; RUN: llc < %s -march=x86 -x86-asm-syntax=att > %t
-; RUN: grep {movl 4(%eax),%ebp} %t
-; RUN: grep {movl 0(%eax), %ebx} %t
+; RUN: grep "movl 4(%eax),%ebp" %t
+; RUN: grep "movl 0(%eax), %ebx" %t
 
 define i32 @foo(i32 %__s.i.i, i32 %tmp5.i.i, i32 %tmp6.i.i, i32 %tmp7.i.i, i32 %tmp8.i.i) {
 	%tmp9.i.i = call i32 asm sideeffect "push %ebp\0Apush %ebx\0Amovl 4($2),%ebp\0Amovl 0($2), %ebx\0Amovl $1,%eax\0Aint  $$0x80\0Apop  %ebx\0Apop %ebp", "={ax},i,0,{cx},{dx},{si},{di}"( i32 192, i32 %__s.i.i, i32 %tmp5.i.i, i32 %tmp6.i.i, i32 %tmp7.i.i, i32 %tmp8.i.i )		; <i32> [#uses=1]

Modified: llvm/trunk/test/CodeGen/X86/2006-11-17-IllegalMove.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2006-11-17-IllegalMove.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2006-11-17-IllegalMove.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2006-11-17-IllegalMove.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: llc < %s -march=x86-64 > %t
 ; RUN: grep movb %t | count 2
-; RUN: grep {movzb\[wl\]} %t
+; RUN: grep "movzb[wl]" %t
 
 
 define void @handle_vector_size_attribute() nounwind {

Modified: llvm/trunk/test/CodeGen/X86/2007-01-13-StackPtrIndex.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2007-01-13-StackPtrIndex.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2007-01-13-StackPtrIndex.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2007-01-13-StackPtrIndex.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=x86-64 > %t
-; RUN: not grep {,%rsp)} %t
+; RUN: not grep ",%rsp)" %t
 ; PR1103
 
 target datalayout = "e-p:64:64"

Modified: llvm/trunk/test/CodeGen/X86/2007-03-24-InlineAsmPModifier.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2007-03-24-InlineAsmPModifier.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2007-03-24-InlineAsmPModifier.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2007-03-24-InlineAsmPModifier.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 | grep {mov %gs:72, %eax}
+; RUN: llc < %s -march=x86 | grep "mov %gs:72, %eax"
 target datalayout = "e-p:32:32"
 target triple = "i686-apple-darwin9"
 

Modified: llvm/trunk/test/CodeGen/X86/2007-03-24-InlineAsmVectorOp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2007-03-24-InlineAsmVectorOp.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2007-03-24-InlineAsmVectorOp.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2007-03-24-InlineAsmVectorOp.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -mcpu=yonah -march=x86 | \
-; RUN:   grep {cmpltsd %xmm0, %xmm0}
+; RUN:   grep "cmpltsd %xmm0, %xmm0"
 target datalayout = "e-p:32:32"
 target triple = "i686-apple-darwin9"
 

Modified: llvm/trunk/test/CodeGen/X86/2007-08-10-SignExtSubreg.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2007-08-10-SignExtSubreg.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2007-08-10-SignExtSubreg.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2007-08-10-SignExtSubreg.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 | grep {movsbl}
+; RUN: llc < %s -march=x86 | grep "movsbl"
 
 @X = global i32 0               ; <i32*> [#uses=1]
 

Modified: llvm/trunk/test/CodeGen/X86/2007-11-04-rip-immediate-constant.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2007-11-04-rip-immediate-constant.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2007-11-04-rip-immediate-constant.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2007-11-04-rip-immediate-constant.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -relocation-model=static | grep {foo str$}
+; RUN: llc < %s -relocation-model=static | grep "foo str$"
 ; PR1761
 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"
 target triple = "x86_64-pc-linux"

Modified: llvm/trunk/test/CodeGen/X86/2007-12-18-LoadCSEBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2007-12-18-LoadCSEBug.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2007-12-18-LoadCSEBug.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2007-12-18-LoadCSEBug.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -mcpu=generic | grep {(%esp)} | count 2
+; RUN: llc < %s -march=x86 -mcpu=generic | grep "(%esp)" | count 2
 ; PR1872
 
 	%struct.c34007g__designated___XUB = type { i32, i32, i32, i32 }

Modified: llvm/trunk/test/CodeGen/X86/2008-02-18-TailMergingBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-02-18-TailMergingBug.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2008-02-18-TailMergingBug.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2008-02-18-TailMergingBug.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -mcpu=yonah -stats |& grep {Number of block tails merged} | grep 16
+; RUN: llc < %s -march=x86 -mcpu=yonah -stats |& grep "Number of block tails merged" | grep 16
 ; PR1909
 
 @.str = internal constant [48 x i8] c"transformed bounds: (%.2f, %.2f), (%.2f, %.2f)\0A\00"		; <[48 x i8]*> [#uses=1]

Modified: llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -mtriple=i386-apple-darwin | grep xorl | grep {%e}
+; RUN: llc < %s -mtriple=i386-apple-darwin | grep xorl | grep "%e"
 ; Make sure xorl operands are 32-bit registers.
 
 	%struct.tm = type { i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i8* }

Modified: llvm/trunk/test/CodeGen/X86/2008-08-06-CmpStride.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-08-06-CmpStride.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2008-08-06-CmpStride.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2008-08-06-CmpStride.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc -march=x86-64 < %s -o - | grep {cmpl	\\$\[1\], %}
+; RUN: llc -march=x86-64 < %s -o - | grep "cmpl	\$[1], %"
 
 @.str = internal constant [4 x i8] c"%d\0A\00"
 

Modified: llvm/trunk/test/CodeGen/X86/2008-12-23-crazy-address.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-12-23-crazy-address.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2008-12-23-crazy-address.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2008-12-23-crazy-address.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -relocation-model=static | grep {lea.*X.*esp} | count 2
+; RUN: llc < %s -march=x86 -relocation-model=static | grep "lea.*X.*esp" | count 2
 
 @X = external global [0 x i32]
 

Modified: llvm/trunk/test/CodeGen/X86/2009-01-31-BigShift2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2009-01-31-BigShift2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2009-01-31-BigShift2.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2009-01-31-BigShift2.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 | grep {mov.*56}
+; RUN: llc < %s -march=x86 | grep "mov.*56"
 ; PR3449
 
 define void @test(<8 x double>* %P, i64* %Q) nounwind {

Modified: llvm/trunk/test/CodeGen/X86/2009-02-26-MachineLICMBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2009-02-26-MachineLICMBug.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2009-02-26-MachineLICMBug.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2009-02-26-MachineLICMBug.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86-64 -mattr=+sse3,+sse41 -mcpu=penryn -stats |& grep {8 machine-licm}
+; RUN: llc < %s -march=x86-64 -mattr=+sse3,+sse41 -mcpu=penryn -stats |& grep "8 machine-licm"
 ; RUN: llc < %s -march=x86-64 -mattr=+sse3,+sse41 -mcpu=penryn | FileCheck %s
 ; rdar://6627786
 ; rdar://7792037

Modified: llvm/trunk/test/CodeGen/X86/2009-04-24.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2009-04-24.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2009-04-24.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2009-04-24.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: llc < %s -march=x86-64 -mtriple=x86_64-linux-gnu -regalloc=fast -optimize-regalloc=0 -relocation-model=pic > %t2
-; RUN: grep {leaq.*TLSGD} %t2
-; RUN: grep {__tls_get_addr} %t2
+; RUN: grep "leaq.*TLSGD" %t2
+; RUN: grep "__tls_get_addr" %t2
 ; PR4004
 
 @i = thread_local global i32 15

Modified: llvm/trunk/test/CodeGen/X86/2009-04-29-IndirectDestOperands.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2009-04-29-IndirectDestOperands.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/2009-04-29-IndirectDestOperands.ll (original)
+++ llvm/trunk/test/CodeGen/X86/2009-04-29-IndirectDestOperands.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s | grep {movl.*%ebx, 8(%esi)}
+; RUN: llc < %s | grep "movl.*%ebx, 8(%esi)"
 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-f80:128:128"
 target triple = "i386-apple-darwin9.0"
 

Modified: llvm/trunk/test/CodeGen/X86/MachineSink-PHIUse.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/MachineSink-PHIUse.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/MachineSink-PHIUse.ll (original)
+++ llvm/trunk/test/CodeGen/X86/MachineSink-PHIUse.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -mtriple=x86_64-appel-darwin -disable-cgp-branch-opts -stats |& grep {machine-sink}
+; RUN: llc < %s -mtriple=x86_64-appel-darwin -disable-cgp-branch-opts -stats |& grep "machine-sink"
 
 define fastcc void @t() nounwind ssp {
 entry:

Modified: llvm/trunk/test/CodeGen/X86/addr-label-difference.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/addr-label-difference.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/addr-label-difference.ll (original)
+++ llvm/trunk/test/CodeGen/X86/addr-label-difference.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc %s -o - | grep {__TEXT,__const}
+; RUN: llc %s -o - | grep "__TEXT,__const"
 ; PR5929
 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-f80:128:128-n8:16:32"
 target triple = "i386-apple-darwin10.0"

Modified: llvm/trunk/test/CodeGen/X86/aligned-comm.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/aligned-comm.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/aligned-comm.ll (original)
+++ llvm/trunk/test/CodeGen/X86/aligned-comm.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: llc < %s -march=x86
-; RUN: llc < %s -mtriple=i386-apple-darwin10 | grep {array,16512,7}
-; RUN: llc < %s -mtriple=i386-apple-darwin9 | grep {array,16512,7}
+; RUN: llc < %s -mtriple=i386-apple-darwin10 | grep "array,16512,7"
+; RUN: llc < %s -mtriple=i386-apple-darwin9 | grep "array,16512,7"
 
 ; Darwin 9+ should get alignment on common symbols.
 @array = common global [4128 x i32] zeroinitializer, align 128

Modified: llvm/trunk/test/CodeGen/X86/break-anti-dependencies.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/break-anti-dependencies.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/break-anti-dependencies.ll (original)
+++ llvm/trunk/test/CodeGen/X86/break-anti-dependencies.ll Mon Jul  2 07:47:22 2012
@@ -2,11 +2,11 @@
 ; Use a subtarget that has post-RA scheduling enabled because the anti-dependency
 ; breaker requires liveness information to be kept.
 ; RUN: llc < %s -march=x86-64 -mcpu=atom -post-RA-scheduler -pre-RA-sched=list-burr -break-anti-dependencies=none > %t
-; RUN:   grep {%xmm0} %t | count 14
-; RUN:   not grep {%xmm1} %t
+; RUN:   grep "%xmm0" %t | count 14
+; RUN:   not grep "%xmm1" %t
 ; RUN: llc < %s -march=x86-64 -mcpu=atom -post-RA-scheduler -break-anti-dependencies=critical > %t
-; RUN:   grep {%xmm0} %t | count 7
-; RUN:   grep {%xmm1} %t | count 7
+; RUN:   grep "%xmm0" %t | count 7
+; RUN:   grep "%xmm1" %t | count 7
 
 define void @goo(double* %r, double* %p, double* %q) nounwind {
 entry:

Modified: llvm/trunk/test/CodeGen/X86/call-imm.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/call-imm.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/call-imm.ll (original)
+++ llvm/trunk/test/CodeGen/X86/call-imm.ll Mon Jul  2 07:47:22 2012
@@ -1,11 +1,11 @@
-; RUN: llc < %s -mtriple=i386-apple-darwin -relocation-model=static | grep {call.*12345678}
-; RUN: llc < %s -mtriple=i386-apple-darwin -relocation-model=pic | not grep {call.*12345678}
-; RUN: llc < %s -mtriple=i386-pc-linux -relocation-model=dynamic-no-pic | grep {call.*12345678}
+; RUN: llc < %s -mtriple=i386-apple-darwin -relocation-model=static | grep "call.*12345678"
+; RUN: llc < %s -mtriple=i386-apple-darwin -relocation-model=pic | not grep "call.*12345678"
+; RUN: llc < %s -mtriple=i386-pc-linux -relocation-model=dynamic-no-pic | grep "call.*12345678"
 
 ; Call to immediate is not safe on x86-64 unless we *know* that the
 ; call will be within 32-bits pcrel from the dest immediate.
 
-; RUN: llc < %s -march=x86-64 | grep {call.*\\*%rax}
+; RUN: llc < %s -march=x86-64 | grep "call.*\*%rax"
 
 ; PR3666
 ; PR3773

Modified: llvm/trunk/test/CodeGen/X86/coalesce-esp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/coalesce-esp.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/coalesce-esp.ll (original)
+++ llvm/trunk/test/CodeGen/X86/coalesce-esp.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s | grep {movl	%esp, %ebp}
+; RUN: llc < %s | grep "movl	%esp, %ebp"
 ; PR4572
 
 ; Don't coalesce with %esp if it would end up putting %esp in

Modified: llvm/trunk/test/CodeGen/X86/epilogue.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/epilogue.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/epilogue.ll (original)
+++ llvm/trunk/test/CodeGen/X86/epilogue.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -mcpu=generic -march=x86 | not grep lea
-; RUN: llc < %s -mcpu=generic -march=x86 | grep {movl	%ebp}
+; RUN: llc < %s -mcpu=generic -march=x86 | grep "movl	%ebp"
 
 declare void @bar(<2 x i64>* %n)
 

Modified: llvm/trunk/test/CodeGen/X86/extractps.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/extractps.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/extractps.ll (original)
+++ llvm/trunk/test/CodeGen/X86/extractps.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -march=x86 -mcpu=penryn > %t
 ; RUN: not grep movd %t
-; RUN: grep {movss	%xmm} %t | count 1
-; RUN: grep {extractps	\\\$1, %xmm0, } %t | count 1
+; RUN: grep "movss	%xmm" %t | count 1
+; RUN: grep "extractps	\$1, %xmm0, " %t | count 1
 ; PR2647
 
 external global float, align 16         ; <float*>:0 [#uses=2]

Modified: llvm/trunk/test/CodeGen/X86/fast-cc-merge-stack-adj.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fast-cc-merge-stack-adj.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/fast-cc-merge-stack-adj.ll (original)
+++ llvm/trunk/test/CodeGen/X86/fast-cc-merge-stack-adj.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -mcpu=generic -march=x86 -x86-asm-syntax=intel | \
-; RUN:   grep {add	ESP, 8}
+; RUN:   grep "add	ESP, 8"
 
 target triple = "i686-pc-linux-gnu"
 

Modified: llvm/trunk/test/CodeGen/X86/fast-isel-constpool.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fast-isel-constpool.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/fast-isel-constpool.ll (original)
+++ llvm/trunk/test/CodeGen/X86/fast-isel-constpool.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -fast-isel | grep {LCPI0_0(%rip)}
+; RUN: llc < %s -fast-isel | grep "LCPI0_0(%rip)"
 ; Make sure fast isel uses rip-relative addressing when required.
 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"
 target triple = "x86_64-apple-darwin9.0"

Modified: llvm/trunk/test/CodeGen/X86/fast-isel-gv.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fast-isel-gv.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/fast-isel-gv.ll (original)
+++ llvm/trunk/test/CodeGen/X86/fast-isel-gv.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -fast-isel | grep {_kill at GOTPCREL(%rip)}
+; RUN: llc < %s -fast-isel | grep "_kill at GOTPCREL(%rip)"
 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"
 target triple = "x86_64-apple-darwin10.0"
 @f = global i8 (...)* @kill		; <i8 (...)**> [#uses=1]

Modified: llvm/trunk/test/CodeGen/X86/fastcc-byval.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fastcc-byval.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/fastcc-byval.ll (original)
+++ llvm/trunk/test/CodeGen/X86/fastcc-byval.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -tailcallopt=false | grep {movl\[\[:space:\]\]*8(%esp), %eax} | count 2
+; RUN: llc < %s -tailcallopt=false | grep "movl[[:space:]]*8(%esp), %eax" | count 2
 ; PR3122
 ; rdar://6400815
 

Modified: llvm/trunk/test/CodeGen/X86/fp-immediate-shorten.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fp-immediate-shorten.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/fp-immediate-shorten.ll (original)
+++ llvm/trunk/test/CodeGen/X86/fp-immediate-shorten.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ;; Test that this FP immediate is stored in the constant pool as a float.
 
 ; RUN: llc < %s -march=x86 -mattr=-sse2,-sse3 | \
-; RUN:   grep {.long.1123418112}
+; RUN:   grep ".long.1123418112"
 
 define double @D() {
         ret double 1.230000e+02

Modified: llvm/trunk/test/CodeGen/X86/fp_load_fold.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fp_load_fold.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/fp_load_fold.ll (original)
+++ llvm/trunk/test/CodeGen/X86/fp_load_fold.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=x86 -x86-asm-syntax=intel | \
-; RUN:   grep -i ST | not grep {fadd\\|fsub\\|fdiv\\|fmul}
+; RUN:   grep -i ST | not grep "fadd\|fsub\|fdiv\|fmul"
 
 ; Test that the load of the memory location is folded into the operation.
 

Modified: llvm/trunk/test/CodeGen/X86/full-lsr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/full-lsr.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/full-lsr.ll (original)
+++ llvm/trunk/test/CodeGen/X86/full-lsr.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -march=x86 >%t
 
-; RUN: grep {addl	\\\$4,} %t | count 3
-; RUN: not grep {,%} %t
+; RUN: grep "addl	\$4," %t | count 3
+; RUN: not grep ",%" %t
 
 define void @foo(float* nocapture %A, float* nocapture %B, float* nocapture %C, i32 %N) nounwind {
 entry:

Modified: llvm/trunk/test/CodeGen/X86/h-register-addressing-32.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/h-register-addressing-32.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/h-register-addressing-32.ll (original)
+++ llvm/trunk/test/CodeGen/X86/h-register-addressing-32.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 | grep {movzbl	%\[abcd\]h,} | count 7
+; RUN: llc < %s -march=x86 | grep "movzbl	%[abcd]h," | count 7
 
 ; Use h-register extract and zero-extend.
 

Modified: llvm/trunk/test/CodeGen/X86/h-register-addressing-64.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/h-register-addressing-64.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/h-register-addressing-64.ll (original)
+++ llvm/trunk/test/CodeGen/X86/h-register-addressing-64.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86-64 | grep {movzbl	%\[abcd\]h,} | count 7
+; RUN: llc < %s -march=x86-64 | grep "movzbl	%[abcd]h," | count 7
 
 ; Use h-register extract and zero-extend.
 

Modified: llvm/trunk/test/CodeGen/X86/h-registers-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/h-registers-1.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/h-registers-1.ll (original)
+++ llvm/trunk/test/CodeGen/X86/h-registers-1.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: llc < %s -mtriple=x86_64-linux > %t
-; RUN: grep {movzbl	%\[abcd\]h,} %t | count 8
-; RUN: grep {%\[abcd\]h} %t | not grep {%r\[\[:digit:\]\]*d}
+; RUN: grep "movzbl	%[abcd]h," %t | count 8
+; RUN: grep "%[abcd]h" %t | not grep "%r[[:digit:]]*d"
 
 ; LLVM creates virtual registers for values live across blocks
 ; based on the type of the value. Make sure that the extracts

Modified: llvm/trunk/test/CodeGen/X86/illegal-vector-args-return.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/illegal-vector-args-return.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/illegal-vector-args-return.ll (original)
+++ llvm/trunk/test/CodeGen/X86/illegal-vector-args-return.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
-; RUN: llc < %s -march=x86 -mattr=+sse2 -mcpu=nehalem | grep {mulpd	%xmm3, %xmm1}
-; RUN: llc < %s -march=x86 -mattr=+sse2 -mcpu=nehalem | grep {mulpd	%xmm2, %xmm0}
-; RUN: llc < %s -march=x86 -mattr=+sse2 -mcpu=nehalem | grep {addps	%xmm3, %xmm1}
-; RUN: llc < %s -march=x86 -mattr=+sse2 -mcpu=nehalem | grep {addps	%xmm2, %xmm0}
+; RUN: llc < %s -march=x86 -mattr=+sse2 -mcpu=nehalem | grep "mulpd	%xmm3, %xmm1"
+; RUN: llc < %s -march=x86 -mattr=+sse2 -mcpu=nehalem | grep "mulpd	%xmm2, %xmm0"
+; RUN: llc < %s -march=x86 -mattr=+sse2 -mcpu=nehalem | grep "addps	%xmm3, %xmm1"
+; RUN: llc < %s -march=x86 -mattr=+sse2 -mcpu=nehalem | grep "addps	%xmm2, %xmm0"
 
 define <4 x double> @foo(<4 x double> %x, <4 x double> %z) {
   %y = fmul <4 x double> %x, %z

Modified: llvm/trunk/test/CodeGen/X86/inline-asm-modifier-n.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/inline-asm-modifier-n.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/inline-asm-modifier-n.ll (original)
+++ llvm/trunk/test/CodeGen/X86/inline-asm-modifier-n.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 | grep { 37}
+; RUN: llc < %s -march=x86 | grep " 37"
 ; rdar://7008959
 
 define void @bork() nounwind {

Modified: llvm/trunk/test/CodeGen/X86/isel-sink2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/isel-sink2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/isel-sink2.ll (original)
+++ llvm/trunk/test/CodeGen/X86/isel-sink2.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=x86 > %t
-; RUN: grep {movb.7(%...)} %t
+; RUN: grep "movb.7(%...)" %t
 ; RUN: not grep leal %t
 
 define i8 @test(i32 *%P) nounwind {

Modified: llvm/trunk/test/CodeGen/X86/ispositive.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/ispositive.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/ispositive.ll (original)
+++ llvm/trunk/test/CodeGen/X86/ispositive.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 | grep {shrl.*31}
+; RUN: llc < %s -march=x86 | grep "shrl.*31"
 
 define i32 @test1(i32 %X) {
 entry:

Modified: llvm/trunk/test/CodeGen/X86/label-redefinition.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/label-redefinition.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/label-redefinition.ll (original)
+++ llvm/trunk/test/CodeGen/X86/label-redefinition.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; PR7054
-; RUN: not llc %s -o - |& grep {'_foo' label emitted multiple times to assembly}
+; RUN: not llc %s -o - |& grep "'_foo' label emitted multiple times to assembly"
 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-f80:128:128-n8:16:32"
 target triple = "i386-apple-darwin10.0.0"
 

Modified: llvm/trunk/test/CodeGen/X86/lea-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/lea-2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/lea-2.ll (original)
+++ llvm/trunk/test/CodeGen/X86/lea-2.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=x86 -x86-asm-syntax=intel | \
-; RUN:   grep {lea	EAX, DWORD PTR \\\[... + 4\\*... - 5\\\]}
+; RUN:   grep "lea	EAX, DWORD PTR \[... + 4\*... - 5\]"
 ; RUN: llc < %s -march=x86 -x86-asm-syntax=intel | \
 ; RUN:   not grep add
 

Modified: llvm/trunk/test/CodeGen/X86/peep-vector-extract-insert.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/peep-vector-extract-insert.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/peep-vector-extract-insert.ll (original)
+++ llvm/trunk/test/CodeGen/X86/peep-vector-extract-insert.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86-64 | grep {xorps	%xmm0, %xmm0} | count 2
+; RUN: llc < %s -march=x86-64 | grep "xorps	%xmm0, %xmm0" | count 2
 
 define float @foo(<4 x float> %a) {
   %b = insertelement <4 x float> %a, float 0.0, i32 3

Modified: llvm/trunk/test/CodeGen/X86/phi-immediate-factoring.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/phi-immediate-factoring.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/phi-immediate-factoring.ll (original)
+++ llvm/trunk/test/CodeGen/X86/phi-immediate-factoring.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -stats |& grep {Number of blocks eliminated} | grep 6
+; RUN: llc < %s -march=x86 -stats |& grep "Number of blocks eliminated" | grep 6
 ; PR1296
 
 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"

Modified: llvm/trunk/test/CodeGen/X86/pr2656.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pr2656.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/pr2656.ll (original)
+++ llvm/trunk/test/CodeGen/X86/pr2656.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -mattr=+sse2 | grep {xorps.\*sp} | count 1
+; RUN: llc < %s -march=x86 -mattr=+sse2 | grep "xorps.*sp" | count 1
 ; PR2656
 
 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-f80:128:128"

Modified: llvm/trunk/test/CodeGen/X86/rotate.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/rotate.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/rotate.ll (original)
+++ llvm/trunk/test/CodeGen/X86/rotate.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=x86 -x86-asm-syntax=intel | \
-; RUN:   grep {ro\[rl\]} | count 12
+; RUN:   grep "ro[rl]" | count 12
 
 define i32 @rotl32(i32 %A, i8 %Amt) {
 	%shift.upgrd.1 = zext i8 %Amt to i32		; <i32> [#uses=1]

Modified: llvm/trunk/test/CodeGen/X86/shift-coalesce.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/shift-coalesce.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/shift-coalesce.ll (original)
+++ llvm/trunk/test/CodeGen/X86/shift-coalesce.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -march=x86 -x86-asm-syntax=intel | \
-; RUN:   grep {shld.*CL}
+; RUN:   grep "shld.*CL"
 ; RUN: llc < %s -march=x86 -x86-asm-syntax=intel | \
-; RUN:   not grep {mov CL, BL}
+; RUN:   not grep "mov CL, BL"
 
 ; PR687
 

Modified: llvm/trunk/test/CodeGen/X86/shift-double.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/shift-double.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/shift-double.ll (original)
+++ llvm/trunk/test/CodeGen/X86/shift-double.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=x86 -x86-asm-syntax=intel | \
-; RUN:   grep {sh\[lr\]d} | count 5
+; RUN:   grep "sh[lr]d" | count 5
 
 define i64 @test1(i64 %X, i8 %C) {
         %shift.upgrd.1 = zext i8 %C to i64              ; <i64> [#uses=1]

Modified: llvm/trunk/test/CodeGen/X86/shl_elim.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/shl_elim.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/shl_elim.ll (original)
+++ llvm/trunk/test/CodeGen/X86/shl_elim.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
-; RUN: llc < %s -march=x86 | grep {movl	8(.esp), %eax}
-; RUN: llc < %s -march=x86 | grep {shrl	.eax}
-; RUN: llc < %s -march=x86 | grep {movswl	.ax, .eax}
+; RUN: llc < %s -march=x86 | grep "movl	8(.esp), %eax"
+; RUN: llc < %s -march=x86 | grep "shrl	.eax"
+; RUN: llc < %s -march=x86 | grep "movswl	.ax, .eax"
 
 define i32 @test1(i64 %a) nounwind {
         %tmp29 = lshr i64 %a, 24                ; <i64> [#uses=1]

Modified: llvm/trunk/test/CodeGen/X86/stack-protector-linux.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/stack-protector-linux.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/stack-protector-linux.ll (original)
+++ llvm/trunk/test/CodeGen/X86/stack-protector-linux.ll Mon Jul  2 07:47:22 2012
@@ -1,8 +1,8 @@
 ; RUN: llc -mtriple=i386-pc-linux-gnu < %s -o - | grep %gs:
 ; RUN: llc -mtriple=x86_64-pc-linux-gnu < %s -o - | grep %fs:
 ; RUN: llc -code-model=kernel -mtriple=x86_64-pc-linux-gnu < %s -o - | grep %gs:
-; RUN: llc -mtriple=x86_64-apple-darwin < %s -o - | grep {__stack_chk_guard}
-; RUN: llc -mtriple=x86_64-apple-darwin < %s -o - | grep {__stack_chk_fail}
+; RUN: llc -mtriple=x86_64-apple-darwin < %s -o - | grep "__stack_chk_guard"
+; RUN: llc -mtriple=x86_64-apple-darwin < %s -o - | grep "__stack_chk_fail"
 
 @"\01LC" = internal constant [11 x i8] c"buf == %s\0A\00"		; <[11 x i8]*> [#uses=1]
 

Modified: llvm/trunk/test/CodeGen/X86/subreg-to-reg-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/subreg-to-reg-1.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/subreg-to-reg-1.ll (original)
+++ llvm/trunk/test/CodeGen/X86/subreg-to-reg-1.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86-64 | grep {leal	.*), %e.\*} | count 1
+; RUN: llc < %s -march=x86-64 | grep "leal	.*), %e.*" | count 1
 
 ; Don't eliminate or coalesce away the explicit zero-extension!
 ; This is currently using an leal because of a 3-addressification detail,

Modified: llvm/trunk/test/CodeGen/X86/tailcallbyval.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/tailcallbyval.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/tailcallbyval.ll (original)
+++ llvm/trunk/test/CodeGen/X86/tailcallbyval.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=x86 -tailcallopt | grep TAILCALL
-; RUN: llc < %s -march=x86 -tailcallopt | grep {movl\[\[:space:\]\]*4(%esp), %eax} | count 1
+; RUN: llc < %s -march=x86 -tailcallopt | grep "movl[[:space:]]*4(%esp), %eax" | count 1
 %struct.s = type {i32, i32, i32, i32, i32, i32, i32, i32,
                   i32, i32, i32, i32, i32, i32, i32, i32,
                   i32, i32, i32, i32, i32, i32, i32, i32 }

Modified: llvm/trunk/test/CodeGen/X86/twoaddr-coalesce-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/twoaddr-coalesce-2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/twoaddr-coalesce-2.ll (original)
+++ llvm/trunk/test/CodeGen/X86/twoaddr-coalesce-2.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=x86 -mattr=+sse2 -mcpu=penryn -stats |& \
-; RUN:   grep {twoaddrinstr} | grep {Number of instructions aggressively commuted}
+; RUN:   grep "twoaddrinstr" | grep "Number of instructions aggressively commuted"
 ; rdar://6480363
 
 target triple = "i386-apple-darwin9.6"

Modified: llvm/trunk/test/CodeGen/X86/twoaddr-pass-sink.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/twoaddr-pass-sink.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/twoaddr-pass-sink.ll (original)
+++ llvm/trunk/test/CodeGen/X86/twoaddr-pass-sink.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -mattr=+sse2 -stats |& grep {Number of 3-address instructions sunk}
+; RUN: llc < %s -march=x86 -mattr=+sse2 -stats |& grep "Number of 3-address instructions sunk"
 
 define void @t2(<2 x i64>* %vDct, <2 x i64>* %vYp, i8* %skiplist, <2 x i64> %a1) nounwind  {
 entry:

Modified: llvm/trunk/test/CodeGen/X86/vec_call.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/vec_call.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/vec_call.ll (original)
+++ llvm/trunk/test/CodeGen/X86/vec_call.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; RUN: llc < %s -mcpu=generic -march=x86 -mattr=+sse2 -mtriple=i686-apple-darwin8 | \
-; RUN:   grep {subl.*60}
+; RUN:   grep "subl.*60"
 ; RUN: llc < %s -mcpu=generic -march=x86 -mattr=+sse2 -mtriple=i686-apple-darwin8 | \
-; RUN:   grep {movaps.*32}
+; RUN:   grep "movaps.*32"
 
 
 define void @test() {

Modified: llvm/trunk/test/CodeGen/X86/vec_ins_extract-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/vec_ins_extract-1.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/vec_ins_extract-1.ll (original)
+++ llvm/trunk/test/CodeGen/X86/vec_ins_extract-1.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=x86 -mcpu=yonah | grep {(%esp,%eax,4)} | count 4
+; RUN: llc < %s -march=x86 -mcpu=yonah | grep "(%esp,%eax,4)" | count 4
 
 ; Inserts and extracts with variable indices must be lowered
 ; to memory accesses.

Modified: llvm/trunk/test/CodeGen/X86/vec_set-9.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/vec_set-9.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/vec_set-9.ll (original)
+++ llvm/trunk/test/CodeGen/X86/vec_set-9.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -march=x86-64 | grep movd | count 1
-; RUN: llc < %s -march=x86-64 | grep {movlhps.*%xmm0, %xmm0}
+; RUN: llc < %s -march=x86-64 | grep "movlhps.*%xmm0, %xmm0"
 
 define <2 x i64> @test3(i64 %A) nounwind {
 entry:

Modified: llvm/trunk/test/CodeGen/X86/x86-64-arg.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-64-arg.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/x86-64-arg.ll (original)
+++ llvm/trunk/test/CodeGen/X86/x86-64-arg.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llc < %s | grep {movl	%edi, %eax}
+; RUN: llc < %s | grep "movl	%edi, %eax"
 ; The input value is already sign extended, don't re-extend it.
 ; This testcase corresponds to:
 ;   int test(short X) { return (int)X; }

Modified: llvm/trunk/test/CodeGen/X86/x86-64-pic-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-64-pic-1.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/x86-64-pic-1.ll (original)
+++ llvm/trunk/test/CodeGen/X86/x86-64-pic-1.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -mtriple=x86_64-pc-linux -relocation-model=pic -o %t1
-; RUN: grep {callq	f at PLT} %t1
+; RUN: grep "callq	f at PLT" %t1
 
 define void @g() {
 entry:

Modified: llvm/trunk/test/CodeGen/X86/x86-64-pic-10.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-64-pic-10.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/x86-64-pic-10.ll (original)
+++ llvm/trunk/test/CodeGen/X86/x86-64-pic-10.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -mtriple=x86_64-pc-linux -relocation-model=pic -o %t1
-; RUN: grep {callq	g at PLT} %t1
+; RUN: grep "callq	g at PLT" %t1
 
 @g = alias weak i32 ()* @f
 

Modified: llvm/trunk/test/CodeGen/X86/x86-64-pic-11.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-64-pic-11.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/x86-64-pic-11.ll (original)
+++ llvm/trunk/test/CodeGen/X86/x86-64-pic-11.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -mtriple=x86_64-pc-linux -relocation-model=pic -o %t1
-; RUN: grep {callq	__fixunsxfti at PLT} %t1
+; RUN: grep "callq	__fixunsxfti at PLT" %t1
 
 define i128 @f(x86_fp80 %a) nounwind {
 entry:

Modified: llvm/trunk/test/CodeGen/X86/x86-64-pic-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-64-pic-2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/x86-64-pic-2.ll (original)
+++ llvm/trunk/test/CodeGen/X86/x86-64-pic-2.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: llc < %s -mtriple=x86_64-pc-linux -relocation-model=pic -o %t1
-; RUN: grep {callq	f} %t1
-; RUN: not grep {callq	f at PLT} %t1
+; RUN: grep "callq	f" %t1
+; RUN: not grep "callq	f at PLT" %t1
 
 define void @g() {
 entry:

Modified: llvm/trunk/test/CodeGen/X86/x86-64-pic-3.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-64-pic-3.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/x86-64-pic-3.ll (original)
+++ llvm/trunk/test/CodeGen/X86/x86-64-pic-3.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: llc < %s -mtriple=x86_64-pc-linux -relocation-model=pic -o %t1
-; RUN: grep {callq	f} %t1
-; RUN: not grep {callq	f at PLT} %t1
+; RUN: grep "callq	f" %t1
+; RUN: not grep "callq	f at PLT" %t1
 
 define void @g() {
 entry:

Modified: llvm/trunk/test/CodeGen/X86/x86-64-pic-4.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-64-pic-4.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/x86-64-pic-4.ll (original)
+++ llvm/trunk/test/CodeGen/X86/x86-64-pic-4.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -mtriple=x86_64-pc-linux -relocation-model=pic -o %t1
-; RUN: grep {movq	a at GOTPCREL(%rip),} %t1
+; RUN: grep "movq	a at GOTPCREL(%rip)," %t1
 
 @a = global i32 0
 

Modified: llvm/trunk/test/CodeGen/X86/x86-64-pic-5.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-64-pic-5.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/x86-64-pic-5.ll (original)
+++ llvm/trunk/test/CodeGen/X86/x86-64-pic-5.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -mtriple=x86_64-pc-linux -relocation-model=pic -o %t1
-; RUN: grep {movl	a(%rip),} %t1
+; RUN: grep "movl	a(%rip)," %t1
 ; RUN: not grep GOTPCREL %t1
 
 @a = hidden global i32 0

Modified: llvm/trunk/test/CodeGen/X86/x86-64-pic-6.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-64-pic-6.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/x86-64-pic-6.ll (original)
+++ llvm/trunk/test/CodeGen/X86/x86-64-pic-6.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -mtriple=x86_64-pc-linux -relocation-model=pic -o %t1
-; RUN: grep {movl	a(%rip),} %t1
+; RUN: grep "movl	a(%rip)," %t1
 ; RUN: not grep GOTPCREL %t1
 
 @a = internal global i32 0

Modified: llvm/trunk/test/CodeGen/X86/x86-64-pic-7.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-64-pic-7.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/x86-64-pic-7.ll (original)
+++ llvm/trunk/test/CodeGen/X86/x86-64-pic-7.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -mtriple=x86_64-pc-linux -relocation-model=pic -o %t1
-; RUN: grep {movq	f at GOTPCREL(%rip),} %t1
+; RUN: grep "movq	f at GOTPCREL(%rip)," %t1
 
 define void ()* @g() nounwind {
 entry:

Modified: llvm/trunk/test/CodeGen/X86/x86-64-pic-8.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-64-pic-8.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/x86-64-pic-8.ll (original)
+++ llvm/trunk/test/CodeGen/X86/x86-64-pic-8.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -mtriple=x86_64-pc-linux -relocation-model=pic -o %t1
-; RUN: grep {leaq	f(%rip),} %t1
+; RUN: grep "leaq	f(%rip)," %t1
 ; RUN: not grep GOTPCREL %t1
 
 define void ()* @g() {

Modified: llvm/trunk/test/CodeGen/X86/x86-64-pic-9.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/x86-64-pic-9.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/x86-64-pic-9.ll (original)
+++ llvm/trunk/test/CodeGen/X86/x86-64-pic-9.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llc < %s -mtriple=x86_64-pc-linux -relocation-model=pic -o %t1
-; RUN: grep {leaq	f(%rip),} %t1
+; RUN: grep "leaq	f(%rip)," %t1
 ; RUN: not grep GOTPCREL %t1
 
 define void ()* @g() nounwind {

Modified: llvm/trunk/test/Feature/globalredefinition3.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Feature/globalredefinition3.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Feature/globalredefinition3.ll (original)
+++ llvm/trunk/test/Feature/globalredefinition3.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: not llvm-as %s -o /dev/null |& grep {redefinition of global '@B'}
+; RUN: not llvm-as %s -o /dev/null |& grep "redefinition of global '@B'"
 
 @B = global i32 7
 @B = global i32 7

Modified: llvm/trunk/test/Feature/packed_struct.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Feature/packed_struct.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Feature/packed_struct.ll (original)
+++ llvm/trunk/test/Feature/packed_struct.ll Mon Jul  2 07:47:22 2012
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 ; RUN: not grep cast %t2.ll
-; RUN: grep {\\}>} %t2.ll
+; RUN: grep "}>" %t2.ll
 ; END.
 
 %struct.anon = type <{ i8, i32, i32, i32 }>

Modified: llvm/trunk/test/Feature/vector-cast-constant-exprs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Feature/vector-cast-constant-exprs.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Feature/vector-cast-constant-exprs.ll (original)
+++ llvm/trunk/test/Feature/vector-cast-constant-exprs.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | not grep {ret.*(}
+; RUN: llvm-as < %s | llvm-dis | not grep "ret.*("
 
 ; All of these constant expressions should fold.
 

Modified: llvm/trunk/test/Integer/packed_struct_bt.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Integer/packed_struct_bt.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Integer/packed_struct_bt.ll (original)
+++ llvm/trunk/test/Integer/packed_struct_bt.ll Mon Jul  2 07:47:22 2012
@@ -2,7 +2,7 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 ; RUN: not grep cast %t2.ll
-; RUN: grep {\\}>} %t2.ll
+; RUN: grep "}>" %t2.ll
 ; END.
 
 %struct.anon = type <{ i8, i35, i35, i35 }>

Modified: llvm/trunk/test/Linker/2003-01-30-LinkerRename.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-01-30-LinkerRename.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-01-30-LinkerRename.ll (original)
+++ llvm/trunk/test/Linker/2003-01-30-LinkerRename.ll Mon Jul  2 07:47:22 2012
@@ -1,9 +1,9 @@
 ; This fails because the linker renames the external symbol not the internal 
 ; one...
 
-; RUN: echo {define internal i32 @foo() \{ ret i32 7 \} } | llvm-as > %t.1.bc
+; RUN: echo "define internal i32 @foo() { ret i32 7 } " | llvm-as > %t.1.bc
 ; RUN: llvm-as %s -o %t.2.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep {@foo()} | grep -v internal
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep "@foo()" | grep -v internal
 
 define i32 @foo() { ret i32 0 }
 

Modified: llvm/trunk/test/Linker/2003-01-30-LinkerTypeRename.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-01-30-LinkerTypeRename.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-01-30-LinkerTypeRename.ll (original)
+++ llvm/trunk/test/Linker/2003-01-30-LinkerTypeRename.ll Mon Jul  2 07:47:22 2012
@@ -1,9 +1,9 @@
 ; This fails because the linker renames the non-opaque type not the opaque
 ; one...
 
-; RUN: echo {%%Ty = type opaque @GV = external global %%Ty*} | llvm-as > %t.1.bc
+; RUN: echo "%%Ty = type opaque @GV = external global %%Ty*" | llvm-as > %t.1.bc
 ; RUN: llvm-as < %s > %t.2.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep {%%Ty } | not grep opaque
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep "%%Ty " | not grep opaque
 
 %Ty = type {i32}
 

Modified: llvm/trunk/test/Linker/2003-04-23-LinkOnceLost.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-04-23-LinkOnceLost.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-04-23-LinkOnceLost.ll (original)
+++ llvm/trunk/test/Linker/2003-04-23-LinkOnceLost.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; This fails because the linker renames the non-opaque type not the opaque 
 ; one...
 
-; RUN: echo { define linkonce void @foo() \{ ret void \} } | \
+; RUN: echo " define linkonce void @foo() { ret void } " | \
 ; RUN:   llvm-as -o %t.2.bc
 ; RUN: llvm-as %s -o %t.1.bc
 ; RUN: llvm-link %t.1.bc %t.2.bc -S | grep foo | grep linkonce

Modified: llvm/trunk/test/Linker/2003-04-26-NullPtrLinkProblem.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-04-26-NullPtrLinkProblem.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-04-26-NullPtrLinkProblem.ll (original)
+++ llvm/trunk/test/Linker/2003-04-26-NullPtrLinkProblem.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; This one fails because the LLVM runtime is allowing two null pointers of
 ; the same type to be created!
 
-; RUN: echo {%%T = type i32} | llvm-as > %t.2.bc
+; RUN: echo "%%T = type i32" | llvm-as > %t.2.bc
 ; RUN: llvm-as %s -o %t.1.bc
 ; RUN: llvm-link %t.1.bc %t.2.bc
 

Modified: llvm/trunk/test/Linker/2003-05-15-TypeProblem.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-05-15-TypeProblem.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-05-15-TypeProblem.ll (original)
+++ llvm/trunk/test/Linker/2003-05-15-TypeProblem.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; This one fails because the LLVM runtime is allowing two null pointers of
 ; the same type to be created!
 
-; RUN: echo {%M = type \{ %N*\} %N = type opaque} | llvm-as > %t.2.bc
+; RUN: echo "%M = type { %N*} %N = type opaque" | llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
 ; RUN: llvm-link %t.1.bc %t.2.bc
 

Modified: llvm/trunk/test/Linker/2003-05-31-LinkerRename.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-05-31-LinkerRename.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-05-31-LinkerRename.ll (original)
+++ llvm/trunk/test/Linker/2003-05-31-LinkerRename.ll Mon Jul  2 07:47:22 2012
@@ -4,9 +4,9 @@
 ; the function name, we must rename the internal function to something that 
 ; does not conflict.
 
-; RUN: echo { define internal i32 @foo() \{ ret i32 7 \} } | llvm-as > %t.1.bc
+; RUN: echo " define internal i32 @foo() { ret i32 7 } " | llvm-as > %t.1.bc
 ; RUN: llvm-as < %s > %t.2.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep internal | not grep {@foo(}
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep internal | not grep "@foo("
 
 declare i32 @foo() 
 

Modified: llvm/trunk/test/Linker/2003-06-02-TypeResolveProblem.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-06-02-TypeResolveProblem.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-06-02-TypeResolveProblem.ll (original)
+++ llvm/trunk/test/Linker/2003-06-02-TypeResolveProblem.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: echo {%%T = type opaque} | llvm-as > %t.2.bc
+; RUN: echo "%%T = type opaque" | llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
 ; RUN: llvm-link %t.1.bc %t.2.bc
 

Modified: llvm/trunk/test/Linker/2003-06-02-TypeResolveProblem2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-06-02-TypeResolveProblem2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-06-02-TypeResolveProblem2.ll (original)
+++ llvm/trunk/test/Linker/2003-06-02-TypeResolveProblem2.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: echo {%%T = type i32} | llvm-as > %t.1.bc
+; RUN: echo "%%T = type i32" | llvm-as > %t.1.bc
 ; RUN: llvm-as < %s > %t.2.bc
 ; RUN: llvm-link %t.1.bc %t.2.bc
 

Modified: llvm/trunk/test/Linker/2003-08-20-OpaqueTypeResolve.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-08-20-OpaqueTypeResolve.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-08-20-OpaqueTypeResolve.ll (original)
+++ llvm/trunk/test/Linker/2003-08-20-OpaqueTypeResolve.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo {%M = type \{ i32, i32* \} } | llvm-as > %t.out2.bc
+; RUN: echo "%M = type { i32, i32* } " | llvm-as > %t.out2.bc
 ; RUN: llvm-link %t.out1.bc %t.out2.bc
 
 %M = type { i32, %N* }

Modified: llvm/trunk/test/Linker/2003-08-23-GlobalVarLinking.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-08-23-GlobalVarLinking.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-08-23-GlobalVarLinking.ll (original)
+++ llvm/trunk/test/Linker/2003-08-23-GlobalVarLinking.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo {%%T1 = type opaque %%T2 = type opaque @S = external global \{ i32, %%T1* \} declare void @F(%%T2*)}\
+; RUN: echo "%%T1 = type opaque %%T2 = type opaque @S = external global { i32, %%T1* } declare void @F(%%T2*)"\
 ; RUN:   | llvm-as > %t.out2.bc
 ; RUN: llvm-link %t.out1.bc %t.out2.bc -S | not grep opaque
 

Modified: llvm/trunk/test/Linker/2003-08-24-InheritPtrSize.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2003-08-24-InheritPtrSize.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2003-08-24-InheritPtrSize.ll (original)
+++ llvm/trunk/test/Linker/2003-08-24-InheritPtrSize.ll Mon Jul  2 07:47:22 2012
@@ -2,7 +2,7 @@
 ; specified pointer size should not cause a warning!
 
 ; RUN: llvm-as < %s > %t.out1.bc
-; RUN: echo {} | llvm-as > %t.out2.bc
+; RUN: echo "" | llvm-as > %t.out2.bc
 ; RUN: llvm-link %t.out1.bc %t.out2.bc |& not grep warning
 
 target datalayout = "e-p:64:64"

Modified: llvm/trunk/test/Linker/2004-12-03-DisagreeingType.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2004-12-03-DisagreeingType.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2004-12-03-DisagreeingType.ll (original)
+++ llvm/trunk/test/Linker/2004-12-03-DisagreeingType.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
-; RUN: echo {@G = weak global \{\{\{\{double\}\}\}\} zeroinitializer } | \
+; RUN: echo "@G = weak global {{{{double}}}} zeroinitializer " | \
 ; RUN:   llvm-as > %t.out2.bc
 ; RUN: llvm-as < %s > %t.out1.bc
-; RUN: llvm-link %t.out1.bc %t.out2.bc -S | not grep {\\}}
+; RUN: llvm-link %t.out1.bc %t.out2.bc -S | not grep "}"
 
 ; When linked, the global above should be eliminated, being merged with the 
 ; global below.

Modified: llvm/trunk/test/Linker/2005-02-12-ConstantGlobals-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2005-02-12-ConstantGlobals-2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2005-02-12-ConstantGlobals-2.ll (original)
+++ llvm/trunk/test/Linker/2005-02-12-ConstantGlobals-2.ll Mon Jul  2 07:47:22 2012
@@ -1,8 +1,8 @@
 ; Test that a prototype can be marked const, and the definition is allowed
 ; to be nonconst.
 
-; RUN: echo {@X = external constant i32} | llvm-as > %t.2.bc
+; RUN: echo "@X = external constant i32" | llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep {global i32 7}
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep "global i32 7"
 
 @X = global i32 7

Modified: llvm/trunk/test/Linker/2005-02-12-ConstantGlobals.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2005-02-12-ConstantGlobals.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2005-02-12-ConstantGlobals.ll (original)
+++ llvm/trunk/test/Linker/2005-02-12-ConstantGlobals.ll Mon Jul  2 07:47:22 2012
@@ -1,8 +1,8 @@
 ; Test that a prototype can be marked const, and the definition is allowed
 ; to be nonconst.
 
-; RUN: echo {@X = global i32 7} | llvm-as > %t.2.bc
+; RUN: echo "@X = global i32 7" | llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep {global i32 7}
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep "global i32 7"
 
 @X = external constant i32		; <i32*> [#uses=0]

Modified: llvm/trunk/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll (original)
+++ llvm/trunk/test/Linker/2005-12-06-AppendingZeroLengthArrays.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
-; RUN: echo { @G = appending global \[0 x i32\] zeroinitializer } | \
+; RUN: echo " @G = appending global [0 x i32] zeroinitializer " | \
 ; RUN:   llvm-as > %t.out2.bc
 ; RUN: llvm-as < %s > %t.out1.bc
-; RUN: llvm-link %t.out1.bc %t.out2.bc -S | grep {@G =}
+; RUN: llvm-link %t.out1.bc %t.out2.bc -S | grep "@G ="
 
 ; When linked, the globals should be merged, and the result should still 
 ; be named '@G'.

Modified: llvm/trunk/test/Linker/2006-06-15-GlobalVarAlignment.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2006-06-15-GlobalVarAlignment.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2006-06-15-GlobalVarAlignment.ll (original)
+++ llvm/trunk/test/Linker/2006-06-15-GlobalVarAlignment.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; The linker should choose the largest alignment when linking.
 
-; RUN: echo {@X = global i32 7, align 8} | llvm-as > %t.2.bc
+; RUN: echo "@X = global i32 7, align 8" | llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
-; RUN: llvm-link %t.1.bc %t.2.bc -S | grep {align 8}
+; RUN: llvm-link %t.1.bc %t.2.bc -S | grep "align 8"
 
 @X = weak global i32 7, align 4

Modified: llvm/trunk/test/Linker/2008-06-13-LinkOnceRedefinition.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2008-06-13-LinkOnceRedefinition.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2008-06-13-LinkOnceRedefinition.ll (original)
+++ llvm/trunk/test/Linker/2008-06-13-LinkOnceRedefinition.ll Mon Jul  2 07:47:22 2012
@@ -2,7 +2,7 @@
 ; in different modules.
 ; RUN: llvm-as %s -o %t.foo1.bc
 ; RUN: llvm-as %s -o %t.foo2.bc
-; RUN: echo {define linkonce void @foo(i32 %x) { ret void }} | llvm-as -o %t.foo3.bc
+; RUN: echo "define linkonce void @foo(i32 %x) { ret void }" | llvm-as -o %t.foo3.bc
 ; RUN: llvm-link %t.foo1.bc %t.foo2.bc -S
 ; RUN: llvm-link %t.foo1.bc %t.foo3.bc -S
 define linkonce void @foo() { ret void }

Modified: llvm/trunk/test/Linker/2008-06-26-AddressSpace.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/2008-06-26-AddressSpace.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/2008-06-26-AddressSpace.ll (original)
+++ llvm/trunk/test/Linker/2008-06-26-AddressSpace.ll Mon Jul  2 07:47:22 2012
@@ -2,8 +2,8 @@
 ; in different modules.
 ; RUN: llvm-as %s -o %t.foo1.bc
 ; RUN: echo | llvm-as -o %t.foo2.bc
-; RUN: llvm-link %t.foo2.bc %t.foo1.bc -S | grep {addrspace(2)}
-; RUN: llvm-link %t.foo1.bc %t.foo2.bc -S | grep {addrspace(2)}
+; RUN: llvm-link %t.foo2.bc %t.foo1.bc -S | grep "addrspace(2)"
+; RUN: llvm-link %t.foo1.bc %t.foo2.bc -S | grep "addrspace(2)"
 ; rdar://6038021
 
 @G = addrspace(2) global i32 256 

Modified: llvm/trunk/test/Linker/AppendingLinkage.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/AppendingLinkage.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/AppendingLinkage.ll (original)
+++ llvm/trunk/test/Linker/AppendingLinkage.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; Test that appending linkage works correctly.
 
-; RUN: echo {@X = appending global \[1 x i32\] \[i32 8\] } | \
+; RUN: echo "@X = appending global [1 x i32] [i32 8] " | \
 ; RUN:   llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
 ; RUN: llvm-link %t.1.bc %t.2.bc -S | grep 7 | grep 4 | grep 8

Modified: llvm/trunk/test/Linker/AppendingLinkage2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/AppendingLinkage2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/AppendingLinkage2.ll (original)
+++ llvm/trunk/test/Linker/AppendingLinkage2.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; Test that appending linkage works correctly when arrays are the same size.
 
-; RUN: echo {@X = appending global \[1 x i32\] \[i32 8\] } | \
+; RUN: echo "@X = appending global [1 x i32] [i32 8] " | \
 ; RUN:   llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
 ; RUN: llvm-link %t.1.bc %t.2.bc -S | grep 7 | grep 8

Modified: llvm/trunk/test/Linker/ConstantGlobals1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/ConstantGlobals1.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/ConstantGlobals1.ll (original)
+++ llvm/trunk/test/Linker/ConstantGlobals1.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; Test that appending linkage works correctly when arrays are the same size.
 
-; RUN: echo {@X = constant \[1 x i32\] \[i32 8\] } | \
+; RUN: echo "@X = constant [1 x i32] [i32 8] " | \
 ; RUN:   llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
 ; RUN: llvm-link %t.1.bc %t.2.bc -S | grep constant

Modified: llvm/trunk/test/Linker/ConstantGlobals2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/ConstantGlobals2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/ConstantGlobals2.ll (original)
+++ llvm/trunk/test/Linker/ConstantGlobals2.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; Test that appending linkage works correctly when arrays are the same size.
 
-; RUN: echo {@X = external global \[1 x i32\] } | \
+; RUN: echo "@X = external global [1 x i32] " | \
 ; RUN:   llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
 ; RUN: llvm-link %t.1.bc %t.2.bc -S | grep constant

Modified: llvm/trunk/test/Linker/ConstantGlobals3.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/ConstantGlobals3.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/ConstantGlobals3.ll (original)
+++ llvm/trunk/test/Linker/ConstantGlobals3.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; Test that appending linkage works correctly when arrays are the same size.
 
-; RUN: echo {@X = external constant \[1 x i32\] } | \
+; RUN: echo "@X = external constant [1 x i32] " | \
 ; RUN:   llvm-as > %t.2.bc
 ; RUN: llvm-as < %s > %t.1.bc
 ; RUN: llvm-link %t.1.bc %t.2.bc -S | grep constant

Modified: llvm/trunk/test/Linker/link-global-to-func.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/link-global-to-func.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/link-global-to-func.ll (original)
+++ llvm/trunk/test/Linker/link-global-to-func.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: llvm-as %s -o %t1.bc
-; RUN: echo {declare void @__eprintf(i8*, i8*, i32, i8*) noreturn     define void @foo() {      tail call void @__eprintf( i8* undef, i8* undef, i32 4, i8* null ) noreturn nounwind       unreachable }} | llvm-as -o %t2.bc
+; RUN: echo "declare void @__eprintf(i8*, i8*, i32, i8*) noreturn     define void @foo() {      tail call void @__eprintf( i8* undef, i8* undef, i32 4, i8* null ) noreturn nounwind       unreachable }" | llvm-as -o %t2.bc
 ; RUN: llvm-link %t2.bc %t1.bc -S | grep __eprintf
 ; RUN: llvm-link %t1.bc %t2.bc -S | grep __eprintf
 

Modified: llvm/trunk/test/Linker/redefinition.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/redefinition.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/redefinition.ll (original)
+++ llvm/trunk/test/Linker/redefinition.ll Mon Jul  2 07:47:22 2012
@@ -2,9 +2,9 @@
 ; in different modules.
 ; RUN: llvm-as %s -o %t.foo1.bc
 ; RUN: llvm-as %s -o %t.foo2.bc
-; RUN: echo {define void @foo(i32 %x) { ret void }} | llvm-as -o %t.foo3.bc
+; RUN: echo "define void @foo(i32 %x) { ret void }" | llvm-as -o %t.foo3.bc
 ; RUN: not llvm-link %t.foo1.bc %t.foo2.bc -o %t.bc |& \
-; RUN:   grep {symbol multiply defined}
+; RUN:   grep "symbol multiply defined"
 ; RUN: not llvm-link %t.foo1.bc %t.foo3.bc -o %t.bc |& \
-; RUN:   grep {symbol multiply defined}
+; RUN:   grep "symbol multiply defined"
 define void @foo() { ret void }

Modified: llvm/trunk/test/Linker/weakextern.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Linker/weakextern.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Linker/weakextern.ll (original)
+++ llvm/trunk/test/Linker/weakextern.ll Mon Jul  2 07:47:22 2012
@@ -1,9 +1,9 @@
 ; RUN: llvm-as < %s > %t.bc
 ; RUN: llvm-as < %p/testlink1.ll > %t2.bc
 ; RUN: llvm-link %t.bc %t.bc %t2.bc -o %t1.bc
-; RUN: llvm-dis < %t1.bc | grep {kallsyms_names = extern_weak}
-; RUN: llvm-dis < %t1.bc | grep {MyVar = external global i32}
-; RUN: llvm-dis < %t1.bc | grep {Inte = global i32}
+; RUN: llvm-dis < %t1.bc | grep "kallsyms_names = extern_weak"
+; RUN: llvm-dis < %t1.bc | grep "MyVar = external global i32"
+; RUN: llvm-dis < %t1.bc | grep "Inte = global i32"
 
 @kallsyms_names = extern_weak global [0 x i8]		; <[0 x i8]*> [#uses=0]
 @MyVar = extern_weak global i32		; <i32*> [#uses=0]

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-BFI-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-BFI-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-BFI-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-BFI-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=60 Name=BFI Format=ARM_FORMAT_DPFRM(4)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-Bcc-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-Bcc-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-Bcc-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-Bcc-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=2249 Name=tBcc Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-CPS2p-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-CPS2p-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-CPS2p-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-CPS2p-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # invalid imod value (0b01)
 0xc0 0x67 0x4 0xf1

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-CPS3p-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-CPS3p-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-CPS3p-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-CPS3p-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {potentially undefined instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "potentially undefined instruction encoding"
 
 # invalid (imod, M, iflags) combination
 0x93 0x00 0x02 0xf1

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-DMB-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-DMB-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-DMB-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-DMB-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=1908 Name=t2DMB Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-DSB-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-DSB-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-DSB-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-DSB-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=102 Name=DSB Format=ARM_FORMAT_MISCFRM(26)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-IT-CBNZ-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-IT-CBNZ-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-IT-CBNZ-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-IT-CBNZ-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 |& grep {potentially undefined instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 |& grep "potentially undefined instruction encoding"
 
 # CBZ / CBNZ not allowed in IT block.
 

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-IT-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-IT-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-IT-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-IT-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,3 +1,3 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7-unknown-unknown |& grep {potentially undefined instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumbv7-unknown-unknown |& grep "potentially undefined instruction encoding"
 
 0xff 0xbf 0x6b 0x80 0x00 0x75

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-LDC-form-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-LDC-form-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-LDC-form-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-LDC-form-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=0 Name=PHI Format=(42)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-LDM-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-LDM-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-LDM-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-LDM-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 |& grep {potentially undefined instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 |& grep "potentially undefined instruction encoding"
 
 # Writeback is not allowed is Rn is in the target register list.
 

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-LDRB_POST-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-LDRB_POST-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-LDRB_POST-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-LDRB_POST-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {potentially undefined instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "potentially undefined instruction encoding"
 
 # Opcode=140 Name=LDRB_POST Format=ARM_FORMAT_LDFRM(6)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-LDRD_PRE-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-LDRD_PRE-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-LDRD_PRE-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-LDRD_PRE-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=1930 Name=t2LDRD_PRE Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0 

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-LDR_PRE-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-LDR_PRE-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-LDR_PRE-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-LDR_PRE-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {potentially undefined instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "potentially undefined instruction encoding"
 
 # Opcode=165 Name=LDR_PRE Format=ARM_FORMAT_LDFRM(6)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-LDRrs-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-LDRrs-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-LDRrs-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-LDRrs-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # LDR (register) has encoding Inst{4} = 0.
 0xba 0xae 0x9f 0x57

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-MCR-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-MCR-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-MCR-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-MCR-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=171 Name=MCR Format=ARM_FORMAT_BRFRM(2)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVTi16-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVTi16-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVTi16-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVTi16-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=185 Name=MOVTi16 Format=ARM_FORMAT_DPFRM(4)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVr-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVr-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVr-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVr-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=0 Name=PHI Format=(42)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVs-LSL-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVs-LSL-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVs-LSL-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVs-LSL-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=196 Name=MOVs Format=ARM_FORMAT_DPSOREGFRM(5)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVs-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVs-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVs-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-MOVs-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=0 Name=PHI Format=(42)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-MSRi-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-MSRi-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-MSRi-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-MSRi-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=206 Name=MSRi Format=ARM_FORMAT_BRFRM(2)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-RFEorLDMIA-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-RFEorLDMIA-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-RFEorLDMIA-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-RFEorLDMIA-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=134 Name=LDMIA Format=ARM_FORMAT_LDSTMULFRM(10)
 # 31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-SBFX-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-SBFX-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-SBFX-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-SBFX-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=271 Name=SBFX Format=ARM_FORMAT_DPFRM(4)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-SMLAD-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-SMLAD-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-SMLAD-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-SMLAD-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=284 Name=SMLAD Format=ARM_FORMAT_MULFRM(1)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-SRS-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-SRS-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-SRS-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-SRS-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=0 Name=PHI Format=(42)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-STMIA_UPD-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-STMIA_UPD-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-STMIA_UPD-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-STMIA_UPD-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=2313 Name=tSTMIA_UPD Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-SXTB-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-SXTB-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-SXTB-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-SXTB-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=390 Name=SXTBr_rot Format=ARM_FORMAT_EXTFRM(14)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-UMAAL-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-UMAAL-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-UMAAL-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-UMAAL-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=419 Name=UMAAL Format=ARM_FORMAT_MULFRM(1)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-VLD3DUPd32_UPD-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-VLD3DUPd32_UPD-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-VLD3DUPd32_UPD-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-VLD3DUPd32_UPD-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=871 Name=VLD3DUPd32_UPD Format=ARM_FORMAT_NLdSt(30)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-VLDMSDB_UPD-arm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-VLDMSDB_UPD-arm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-VLDMSDB_UPD-arm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-VLDMSDB_UPD-arm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=arm-apple-darwin9 |& grep "invalid instruction encoding"
 
 # core registers out of range
 0xa5 0xba 0x72 0xed

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-VST1d8Twb_register-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-VST1d8Twb_register-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-VST1d8Twb_register-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-VST1d8Twb_register-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=1839 Name=VST1d8Twb_register Format=ARM_FORMAT_NLdSt(30)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-t2Bcc-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-t2Bcc-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-t2Bcc-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-t2Bcc-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=1894 Name=t2Bcc Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-t2LDRBT-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-t2LDRBT-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-t2LDRBT-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-t2LDRBT-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=1922 Name=t2LDRBT Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-t2LDRSHi12-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-t2LDRSHi12-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-t2LDRSHi12-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-t2LDRSHi12-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=1953 Name=t2LDRSHi12 Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-t2LDRSHi8-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-t2LDRSHi8-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-t2LDRSHi8-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-t2LDRSHi8-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=1954 Name=t2LDRSHi8 Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-t2PUSH-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-t2PUSH-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-t2PUSH-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-t2PUSH-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumbv7-apple-darwin9 |& grep "invalid instruction encoding"
 
 # SP and PC are not allowed in the register list on STM instructions in Thumb2.
 

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-t2STREXD-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-t2STREXD-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-t2STREXD-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-t2STREXD-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=2128 Name=t2STREXD Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/ARM/invalid-t2STR_POST-thumb.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/ARM/invalid-t2STR_POST-thumb.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/ARM/invalid-t2STR_POST-thumb.txt (original)
+++ llvm/trunk/test/MC/Disassembler/ARM/invalid-t2STR_POST-thumb.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=thumb-apple-darwin9 |& grep "invalid instruction encoding"
 
 # Opcode=2137 Name=t2STR_POST Format=ARM_FORMAT_THUMBFRM(25)
 #  31 30 29 28 27 26 25 24 23 22 21 20 19 18 17 16 15 14 13 12 11 10  9  8  7  6  5  4  3  2  1  0

Modified: llvm/trunk/test/MC/Disassembler/X86/invalid-VEX-vvvv.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/X86/invalid-VEX-vvvv.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/X86/invalid-VEX-vvvv.txt (original)
+++ llvm/trunk/test/MC/Disassembler/X86/invalid-VEX-vvvv.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=x86_64-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=x86_64-apple-darwin9 |& grep "invalid instruction encoding"
 
 # This instruction would decode as movmskps if the vvvv field in the VEX prefix was all 1s.
 0xc5 0xf0 0x50 0xc0

Modified: llvm/trunk/test/MC/Disassembler/X86/invalid-cmp-imm.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Disassembler/X86/invalid-cmp-imm.txt?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/MC/Disassembler/X86/invalid-cmp-imm.txt (original)
+++ llvm/trunk/test/MC/Disassembler/X86/invalid-cmp-imm.txt Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-# RUN: llvm-mc --disassemble %s -triple=x86_64-apple-darwin9 |& grep {invalid instruction encoding}
+# RUN: llvm-mc --disassemble %s -triple=x86_64-apple-darwin9 |& grep "invalid instruction encoding"
 
 # This instruction would decode as cmpordps if the immediate byte was less than 8.
 0x0f 0xc2 0xc7 0x08

Modified: llvm/trunk/test/Other/2003-02-19-LoopInfoNestingBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/2003-02-19-LoopInfoNestingBug.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Other/2003-02-19-LoopInfoNestingBug.ll (original)
+++ llvm/trunk/test/Other/2003-02-19-LoopInfoNestingBug.ll Mon Jul  2 07:47:22 2012
@@ -3,7 +3,7 @@
 ; and instead nests it just inside loop "Top"
 ;
 ; RUN: opt < %s -analyze -loops | \
-; RUN:   grep {     Loop at depth 3 containing: %Inner<header><latch><exiting>}
+; RUN:   grep "     Loop at depth 3 containing: %Inner<header><latch><exiting>"
 ;
 define void @test() {
         br label %Top

Modified: llvm/trunk/test/Other/invalid-commandline-option.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/invalid-commandline-option.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Other/invalid-commandline-option.ll (original)
+++ llvm/trunk/test/Other/invalid-commandline-option.ll Mon Jul  2 07:47:22 2012
@@ -1,3 +1,3 @@
-; RUN: not opt --foo |& grep {Unknown command line argument}
+; RUN: not opt --foo |& grep "Unknown command line argument"
 
 ; there is no --foo

Modified: llvm/trunk/test/TableGen/DefmInherit.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/TableGen/DefmInherit.td?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/TableGen/DefmInherit.td (original)
+++ llvm/trunk/test/TableGen/DefmInherit.td Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-// RUN: llvm-tblgen %s | grep {zing = 4} | count 4
+// RUN: llvm-tblgen %s | grep "zing = 4" | count 4
 // XFAIL: vg_leak
 
 class C1<int A, string B> { 

Modified: llvm/trunk/test/TableGen/LazyChange.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/TableGen/LazyChange.td?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/TableGen/LazyChange.td (original)
+++ llvm/trunk/test/TableGen/LazyChange.td Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-// RUN: llvm-tblgen %s | grep {int Y = 3}
+// RUN: llvm-tblgen %s | grep "int Y = 3"
 // XFAIL: vg_leak
 
 class C {

Modified: llvm/trunk/test/TableGen/ListOfList.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/TableGen/ListOfList.td?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/TableGen/ListOfList.td (original)
+++ llvm/trunk/test/TableGen/ListOfList.td Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 // RUN llvm-tblgen %s | FileCheck %s
 
-// RUN: llvm-tblgen %s | grep {foo} | count 1
+// RUN: llvm-tblgen %s | grep "foo" | count 1
 // XFAIL: vg_leak
 
 class Base<string t> {

Modified: llvm/trunk/test/TableGen/MultiClass.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/TableGen/MultiClass.td?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/TableGen/MultiClass.td (original)
+++ llvm/trunk/test/TableGen/MultiClass.td Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-// RUN: llvm-tblgen %s | grep {zing = 4} | count 2
+// RUN: llvm-tblgen %s | grep "zing = 4" | count 2
 // XFAIL: vg_leak
 
 class C1<int A, string B> { 

Modified: llvm/trunk/test/TableGen/MultiClassInherit.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/TableGen/MultiClassInherit.td?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/TableGen/MultiClassInherit.td (original)
+++ llvm/trunk/test/TableGen/MultiClassInherit.td Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-// RUN: llvm-tblgen %s | grep {zing = 4} | count 28
+// RUN: llvm-tblgen %s | grep "zing = 4" | count 28
 // XFAIL: vg_leak
 
 class C1<int A, string B> { 

Modified: llvm/trunk/test/TableGen/Slice.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/TableGen/Slice.td?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/TableGen/Slice.td (original)
+++ llvm/trunk/test/TableGen/Slice.td Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-// RUN: llvm-tblgen %s | grep {\\\[(set} | count 2
-// RUN: llvm-tblgen %s | grep {\\\[\\\]} | count 2
+// RUN: llvm-tblgen %s | grep "\[(set" | count 2
+// RUN: llvm-tblgen %s | grep "\[\]" | count 2
 // XFAIL: vg_leak
 
 class ValueType<int size, int value> {

Modified: llvm/trunk/test/TableGen/TargetInstrSpec.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/TableGen/TargetInstrSpec.td?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/TableGen/TargetInstrSpec.td (original)
+++ llvm/trunk/test/TableGen/TargetInstrSpec.td Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-// RUN: llvm-tblgen %s | grep {\\\[(set VR128:\$dst, (int_x86_sse2_add_pd VR128:\$src1, VR128:\$src2))\\\]} | count 1
-// RUN: llvm-tblgen %s | grep {\\\[(set VR128:\$dst, (int_x86_sse2_add_ps VR128:\$src1, VR128:\$src2))\\\]} | count 1
+// RUN: llvm-tblgen %s | grep '\[(set VR128:$dst, (int_x86_sse2_add_pd VR128:$src1, VR128:$src2))\]' | count 1
+// RUN: llvm-tblgen %s | grep '\[(set VR128:$dst, (int_x86_sse2_add_ps VR128:$src1, VR128:$src2))\]' | count 1
 // XFAIL: vg_leak
 
 class ValueType<int size, int value> {

Modified: llvm/trunk/test/TableGen/cast.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/TableGen/cast.td?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/TableGen/cast.td (original)
+++ llvm/trunk/test/TableGen/cast.td Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-// RUN: llvm-tblgen %s | grep {add_ps} | count 3
+// RUN: llvm-tblgen %s | grep "add_ps" | count 3
 // XFAIL: vg_leak
 
 class ValueType<int size, int value> {

Modified: llvm/trunk/test/TableGen/foreach.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/TableGen/foreach.td?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/TableGen/foreach.td (original)
+++ llvm/trunk/test/TableGen/foreach.td Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
-// RUN: llvm-tblgen %s | grep {Jr} | count 2
-// RUN: llvm-tblgen %s | grep {Sr} | count 2
-// RUN: llvm-tblgen %s | grep {"NAME"} | count 1
+// RUN: llvm-tblgen %s | grep 'Jr' | count 2
+// RUN: llvm-tblgen %s | grep 'Sr' | count 2
+// RUN: llvm-tblgen %s | grep '"NAME"' | count 1
 // XFAIL: vg_leak
 
 // Variables for foreach

Modified: llvm/trunk/test/TableGen/lisp.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/TableGen/lisp.td?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/TableGen/lisp.td (original)
+++ llvm/trunk/test/TableGen/lisp.td Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-// RUN: llvm-tblgen %s | grep {}
+// RUN: llvm-tblgen %s | grep ""
 // XFAIL: vg_leak
 
 class List<list<string> n> {

Modified: llvm/trunk/test/TableGen/subst.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/TableGen/subst.td?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/TableGen/subst.td (original)
+++ llvm/trunk/test/TableGen/subst.td Mon Jul  2 07:47:22 2012
@@ -1,9 +1,9 @@
-// RUN: llvm-tblgen %s | grep {Smith} | count 7
-// RUN: llvm-tblgen %s | grep {Johnson} | count 2
-// RUN: llvm-tblgen %s | grep {FIRST} | count 1
-// RUN: llvm-tblgen %s | grep {LAST} | count 1
-// RUN: llvm-tblgen %s | grep {TVAR} | count 2
-// RUN: llvm-tblgen %s | grep {Bogus} | count 1
+// RUN: llvm-tblgen %s | grep "Smith" | count 7
+// RUN: llvm-tblgen %s | grep "Johnson" | count 2
+// RUN: llvm-tblgen %s | grep "FIRST" | count 1
+// RUN: llvm-tblgen %s | grep "LAST" | count 1
+// RUN: llvm-tblgen %s | grep "TVAR" | count 2
+// RUN: llvm-tblgen %s | grep "Bogus" | count 1
 // XFAIL: vg_leak
 
 class Honorific<string t> {

Modified: llvm/trunk/test/Transforms/ArgumentPromotion/2008-07-02-array-indexing.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ArgumentPromotion/2008-07-02-array-indexing.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ArgumentPromotion/2008-07-02-array-indexing.ll (original)
+++ llvm/trunk/test/Transforms/ArgumentPromotion/2008-07-02-array-indexing.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -argpromotion -S > %t
-; RUN: cat %t | grep {define.*@callee(.*i32\\*}
+; RUN: cat %t | grep "define.*@callee(.*i32\*"
 ; PR2498
 
 ; This test tries to convince argpromotion about promoting the load from %A + 2,

Modified: llvm/trunk/test/Transforms/ArgumentPromotion/byval-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ArgumentPromotion/byval-2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ArgumentPromotion/byval-2.ll (original)
+++ llvm/trunk/test/Transforms/ArgumentPromotion/byval-2.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -argpromotion -S | grep -F {i32* byval} | count 2
+; RUN: opt < %s -argpromotion -S | grep -F "i32* byval" | count 2
 ; Argpromote + scalarrepl should change this to passing the two integers by value.
 
 	%struct.ss = type { i32, i64 }

Modified: llvm/trunk/test/Transforms/ArgumentPromotion/control-flow2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ArgumentPromotion/control-flow2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ArgumentPromotion/control-flow2.ll (original)
+++ llvm/trunk/test/Transforms/ArgumentPromotion/control-flow2.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -argpromotion -S | \
-; RUN:   grep {load i32\\* %A}
+; RUN:   grep "load i32\* %A"
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 define internal i32 @callee(i1 %C, i32* %P) {

Modified: llvm/trunk/test/Transforms/ConstProp/2006-11-30-vector-cast.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ConstProp/2006-11-30-vector-cast.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ConstProp/2006-11-30-vector-cast.ll (original)
+++ llvm/trunk/test/Transforms/ConstProp/2006-11-30-vector-cast.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -constprop -S | \
-; RUN:   grep {i32 -1}
+; RUN:   grep "i32 -1"
 ; RUN: opt < %s -constprop -S | \
 ; RUN:   not grep zeroinitializer
 

Modified: llvm/trunk/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll (original)
+++ llvm/trunk/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -instcombine -S | \
-; RUN:   grep {ret i1 false}
+; RUN:   grep "ret i1 false"
 define i1 @test() {
         %X = trunc i32 320 to i1                ; <i1> [#uses=1]
         ret i1 %X

Modified: llvm/trunk/test/Transforms/ConstProp/2006-12-01-bool-casts.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ConstProp/2006-12-01-bool-casts.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ConstProp/2006-12-01-bool-casts.ll (original)
+++ llvm/trunk/test/Transforms/ConstProp/2006-12-01-bool-casts.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; RUN: opt < %s -constprop -S | \
-; RUN:    grep {ret i32 -1}
+; RUN:    grep "ret i32 -1"
 ; RUN: opt < %s -constprop -S | \
-; RUN:    grep {ret i32 1}
+; RUN:    grep "ret i32 1"
 
 define i32 @test1() {
         %A = sext i1 true to i32                ; <i32> [#uses=1]

Modified: llvm/trunk/test/Transforms/ConstProp/2007-02-23-sdiv.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ConstProp/2007-02-23-sdiv.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ConstProp/2007-02-23-sdiv.ll (original)
+++ llvm/trunk/test/Transforms/ConstProp/2007-02-23-sdiv.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llvm-dis | grep {global i32 0}
+; RUN: llvm-as < %s | llvm-dis | grep "global i32 0"
 ; PR1215
 
 @G = global i32 sdiv (i32 0, i32 -1)

Modified: llvm/trunk/test/Transforms/ConstProp/2007-11-23-cttz.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ConstProp/2007-11-23-cttz.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ConstProp/2007-11-23-cttz.ll (original)
+++ llvm/trunk/test/Transforms/ConstProp/2007-11-23-cttz.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -constprop -S | grep {ret i13 13}
+; RUN: opt < %s -constprop -S | grep "ret i13 13"
 ; PR1816
 declare i13 @llvm.cttz.i13(i13, i1)
 

Modified: llvm/trunk/test/Transforms/ConstProp/div-zero.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ConstProp/div-zero.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ConstProp/div-zero.ll (original)
+++ llvm/trunk/test/Transforms/ConstProp/div-zero.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret i32 0}
+; RUN: opt < %s -instcombine -S | grep "ret i32 0"
 ; PR4424
 declare void @ext()
 

Modified: llvm/trunk/test/Transforms/DeadArgElim/2007-02-07-FuncRename.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/DeadArgElim/2007-02-07-FuncRename.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/DeadArgElim/2007-02-07-FuncRename.ll (original)
+++ llvm/trunk/test/Transforms/DeadArgElim/2007-02-07-FuncRename.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -deadargelim -S | grep {@test(}
+; RUN: opt < %s -deadargelim -S | grep "@test("
 ; RUN: opt < %s -deadargelim -S | not grep dead
 
 define internal i32 @test(i32 %X, i32 %dead) {

Modified: llvm/trunk/test/Transforms/DeadArgElim/canon.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/DeadArgElim/canon.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/DeadArgElim/canon.ll (original)
+++ llvm/trunk/test/Transforms/DeadArgElim/canon.ll Mon Jul  2 07:47:22 2012
@@ -1,9 +1,9 @@
 ; This test shows a few canonicalizations made by deadargelim
 ; RUN: opt < %s -deadargelim -S > %t
 ; This test should remove {} and replace it with void
-; RUN: cat %t | grep {define internal void @test}
+; RUN: cat %t | grep "define internal void @test"
 ; This test shouls replace the {i32} return value with just i32
-; RUN: cat %t | grep {define internal i32 @test2}
+; RUN: cat %t | grep "define internal i32 @test2"
 
 define internal {} @test() {
   ret {} undef

Modified: llvm/trunk/test/Transforms/DeadArgElim/keepalive.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/DeadArgElim/keepalive.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/DeadArgElim/keepalive.ll (original)
+++ llvm/trunk/test/Transforms/DeadArgElim/keepalive.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: opt < %s -deadargelim -S > %t
-; RUN: grep {define internal zeroext i32 @test1() nounwind} %t
-; RUN: grep {define internal <{ i32, i32 }> @test2} %t
+; RUN: grep "define internal zeroext i32 @test1() nounwind" %t
+; RUN: grep "define internal <{ i32, i32 }> @test2" %t
 
 %Ty = type <{ i32, i32 }>
 

Modified: llvm/trunk/test/Transforms/FunctionAttrs/2009-01-02-LocalStores.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/FunctionAttrs/2009-01-02-LocalStores.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/FunctionAttrs/2009-01-02-LocalStores.ll (original)
+++ llvm/trunk/test/Transforms/FunctionAttrs/2009-01-02-LocalStores.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-; RUN: opt < %s -functionattrs -S | not grep {nocapture *%%q}
-; RUN: opt < %s -functionattrs -S | grep {nocapture *%%p}
+; RUN: opt < %s -functionattrs -S | not grep "nocapture *%%q"
+; RUN: opt < %s -functionattrs -S | grep "nocapture *%%p"
 
 define i32* @a(i32** %p) {
 	%tmp = load i32** %p

Modified: llvm/trunk/test/Transforms/GVN/2007-07-31-NoDomInherit.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/2007-07-31-NoDomInherit.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GVN/2007-07-31-NoDomInherit.ll (original)
+++ llvm/trunk/test/Transforms/GVN/2007-07-31-NoDomInherit.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -gvn -S | grep {tmp47 = phi i32 }
+; RUN: opt < %s -basicaa -gvn -S | grep "tmp47 = phi i32 "
 
 	%struct.anon = type { i32 (i32, i32, i32)*, i32, i32, [3 x i32], i8*, i8*, i8* }
 @debug = external constant i32		; <i32*> [#uses=0]

Modified: llvm/trunk/test/Transforms/GVN/2008-07-02-Unreachable.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/2008-07-02-Unreachable.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GVN/2008-07-02-Unreachable.ll (original)
+++ llvm/trunk/test/Transforms/GVN/2008-07-02-Unreachable.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -gvn -S | grep {ret i8 \[%\]tmp3}
+; RUN: opt < %s -basicaa -gvn -S | grep "ret i8 [%]tmp3"
 ; PR2503
 
 @g_3 = external global i8		; <i8*> [#uses=2]

Modified: llvm/trunk/test/Transforms/GVN/calls-readonly.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/calls-readonly.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GVN/calls-readonly.ll (original)
+++ llvm/trunk/test/Transforms/GVN/calls-readonly.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -gvn -S | grep {call.*strlen} | count 1
+; RUN: opt < %s -basicaa -gvn -S | grep "call.*strlen" | count 1
 ; Should delete the second call to strlen even though the intervening strchr call exists.
 
 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-f80:128:128"

Modified: llvm/trunk/test/Transforms/GVN/load-constant-mem.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/load-constant-mem.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GVN/load-constant-mem.ll (original)
+++ llvm/trunk/test/Transforms/GVN/load-constant-mem.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -gvn -instcombine -S | grep {ret i32 0}
+; RUN: opt < %s -basicaa -gvn -instcombine -S | grep "ret i32 0"
 ; PR4189
 @G = external constant [4 x i32]
 

Modified: llvm/trunk/test/Transforms/GVN/local-pre.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/local-pre.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GVN/local-pre.ll (original)
+++ llvm/trunk/test/Transforms/GVN/local-pre.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -enable-pre -S | grep {b.pre}
+; RUN: opt < %s -gvn -enable-pre -S | grep "b.pre"
 
 define i32 @main(i32 %p) {
 block1:

Modified: llvm/trunk/test/Transforms/GVN/nonescaping-malloc.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/nonescaping-malloc.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GVN/nonescaping-malloc.ll (original)
+++ llvm/trunk/test/Transforms/GVN/nonescaping-malloc.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -gvn -stats -disable-output |& grep {Number of loads deleted}
+; RUN: opt < %s -basicaa -gvn -stats -disable-output |& grep "Number of loads deleted"
 ; rdar://7363102
 
 ; GVN should be able to eliminate load %tmp22.i, because it is redundant with

Modified: llvm/trunk/test/Transforms/GVN/pre-basic-add.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/pre-basic-add.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GVN/pre-basic-add.ll (original)
+++ llvm/trunk/test/Transforms/GVN/pre-basic-add.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -gvn -enable-pre -S | grep {.pre}
+; RUN: opt < %s -gvn -enable-pre -S | grep ".pre"
 
 @H = common global i32 0		; <i32*> [#uses=2]
 @G = common global i32 0		; <i32*> [#uses=1]

Modified: llvm/trunk/test/Transforms/GVN/rle-must-alias.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/rle-must-alias.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GVN/rle-must-alias.ll (original)
+++ llvm/trunk/test/Transforms/GVN/rle-must-alias.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -gvn -S | grep {DEAD = phi i32 }
+; RUN: opt < %s -basicaa -gvn -S | grep "DEAD = phi i32 "
 
 ; GVN should eliminate the fully redundant %9 GEP which 
 ; allows DEAD to be removed.  This is PR3198.

Modified: llvm/trunk/test/Transforms/GVN/rle-semidominated.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/rle-semidominated.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GVN/rle-semidominated.ll (original)
+++ llvm/trunk/test/Transforms/GVN/rle-semidominated.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -basicaa -gvn -S | grep {DEAD = phi i32 }
+; RUN: opt < %s -basicaa -gvn -S | grep "DEAD = phi i32 "
 
 define i32 @main(i32* %p) {
 block1:

Modified: llvm/trunk/test/Transforms/GlobalOpt/2008-01-13-OutOfRangeSROA.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/2008-01-13-OutOfRangeSROA.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/2008-01-13-OutOfRangeSROA.ll (original)
+++ llvm/trunk/test/Transforms/GlobalOpt/2008-01-13-OutOfRangeSROA.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | grep {16 x .31 x double.. zeroinitializer}
+; RUN: opt < %s -globalopt -S | grep "16 x .31 x double.. zeroinitializer"
 
 ; The 'X' indices could be larger than 31.  Do not SROA the outer indices of this array.
 @mm = internal global [16 x [31 x double]] zeroinitializer, align 32

Modified: llvm/trunk/test/Transforms/GlobalOpt/2008-01-29-VolatileGlobal.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/2008-01-29-VolatileGlobal.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/2008-01-29-VolatileGlobal.ll (original)
+++ llvm/trunk/test/Transforms/GlobalOpt/2008-01-29-VolatileGlobal.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | grep {load volatile}
+; RUN: opt < %s -globalopt -S | grep "load volatile"
 @t0.1441 = internal global double 0x3FD5555555555555, align 8		; <double*> [#uses=1]
 
 define double @foo() nounwind  {

Modified: llvm/trunk/test/Transforms/GlobalOpt/2008-04-26-SROA-Global-Align.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/2008-04-26-SROA-Global-Align.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/2008-04-26-SROA-Global-Align.ll (original)
+++ llvm/trunk/test/Transforms/GlobalOpt/2008-04-26-SROA-Global-Align.ll Mon Jul  2 07:47:22 2012
@@ -2,9 +2,9 @@
 ; alignments.  Elements 0 and 2 must be 16-byte aligned, and element 
 ; 1 must be at least 8 byte aligned (but could be more). 
 
-; RUN: opt < %s -globalopt -S | grep {@G.0 = internal unnamed_addr global .*align 16}
-; RUN: opt < %s -globalopt -S | grep {@G.1 = internal unnamed_addr global .*align 8}
-; RUN: opt < %s -globalopt -S | grep {@G.2 = internal unnamed_addr global .*align 16}
+; RUN: opt < %s -globalopt -S | grep "@G.0 = internal unnamed_addr global .*align 16"
+; RUN: opt < %s -globalopt -S | grep "@G.1 = internal unnamed_addr global .*align 8"
+; RUN: opt < %s -globalopt -S | grep "@G.2 = internal unnamed_addr global .*align 16"
 ; rdar://5891920
 
 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:32:32-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"

Modified: llvm/trunk/test/Transforms/GlobalOpt/2009-01-13-phi-user.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/2009-01-13-phi-user.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/2009-01-13-phi-user.ll (original)
+++ llvm/trunk/test/Transforms/GlobalOpt/2009-01-13-phi-user.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | grep {phi.*@head}
+; RUN: opt < %s -globalopt -S | grep "phi.*@head"
 ; PR3321
 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"
 target triple = "x86_64-unknown-linux-gnu"

Modified: llvm/trunk/test/Transforms/GlobalOpt/2009-03-07-PromotePtrToBool.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/2009-03-07-PromotePtrToBool.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/2009-03-07-PromotePtrToBool.ll (original)
+++ llvm/trunk/test/Transforms/GlobalOpt/2009-03-07-PromotePtrToBool.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -globalopt -S | grep {@X = internal unnamed_addr global i32}
+; RUN: opt < %s -globalopt -S | grep "@X = internal unnamed_addr global i32"
 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-f80:128:128"
 target triple = "i386-apple-darwin7"
 @X = internal global i32* null		; <i32**> [#uses=2]

Modified: llvm/trunk/test/Transforms/GlobalOpt/constantexpr-dangle.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/constantexpr-dangle.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/constantexpr-dangle.ll (original)
+++ llvm/trunk/test/Transforms/GlobalOpt/constantexpr-dangle.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -instcombine -globalopt -S | \
-; RUN:   grep {internal fastcc float @foo}
+; RUN:   grep "internal fastcc float @foo"
 
 define internal float @foo() {
         ret float 0.000000e+00

Modified: llvm/trunk/test/Transforms/GlobalOpt/globalsra-unknown-index.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/globalsra-unknown-index.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/globalsra-unknown-index.ll (original)
+++ llvm/trunk/test/Transforms/GlobalOpt/globalsra-unknown-index.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; RUN: opt < %s -globalopt -S > %t
-; RUN: grep {@Y = internal unnamed_addr global \\\[3 x \[%\]struct.X\\\] zeroinitializer} %t
+; RUN: grep "@Y = internal unnamed_addr global \[3 x [%]struct.X\] zeroinitializer" %t
 ; RUN: grep load %t | count 6
-; RUN: grep {add i32 \[%\]a, \[%\]b} %t | count 3
+; RUN: grep "add i32 [%]a, [%]b" %t | count 3
 
 ; globalopt should not sra the global, because it can't see the index.
 

Modified: llvm/trunk/test/Transforms/GlobalOpt/heap-sra-phi.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/heap-sra-phi.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/heap-sra-phi.ll (original)
+++ llvm/trunk/test/Transforms/GlobalOpt/heap-sra-phi.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-; RUN: opt < %s -globalopt -S | grep {tmp.f1 = phi i32. }
-; RUN: opt < %s -globalopt -S | grep {tmp.f0 = phi i32. }
+; RUN: opt < %s -globalopt -S | grep "tmp.f1 = phi i32. "
+; RUN: opt < %s -globalopt -S | grep "tmp.f0 = phi i32. "
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 	%struct.foo = type { i32, i32 }

Modified: llvm/trunk/test/Transforms/GlobalOpt/integer-bool.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/integer-bool.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/integer-bool.ll (original)
+++ llvm/trunk/test/Transforms/GlobalOpt/integer-bool.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -globalopt -instcombine | \
-; RUN:    llvm-dis | grep {ret i1 true}
+; RUN:    llvm-dis | grep "ret i1 true"
 
 ;; check that global opt turns integers that only hold 0 or 1 into bools.
 

Modified: llvm/trunk/test/Transforms/GlobalOpt/memcpy.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/memcpy.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/memcpy.ll (original)
+++ llvm/trunk/test/Transforms/GlobalOpt/memcpy.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -globalopt -S | \
-; RUN:   grep {G1 = internal unnamed_addr constant}
+; RUN:   grep "G1 = internal unnamed_addr constant"
 
 @G1 = internal global [58 x i8] c"asdlfkajsdlfkajsd;lfkajds;lfkjasd;flkajsd;lkfja;sdlkfjasd\00"         ; <[58 x i8]*> [#uses=1]
 

Modified: llvm/trunk/test/Transforms/GlobalOpt/storepointer-compare.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/storepointer-compare.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/storepointer-compare.ll (original)
+++ llvm/trunk/test/Transforms/GlobalOpt/storepointer-compare.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -globalopt -S | \
-; RUN:   grep {call void @Actual}
+; RUN:   grep "call void @Actual"
 
 ; Check that a comparison does not prevent an indirect call from being made 
 ; direct.  The global will still remain, but indirect call elim is still good.

Modified: llvm/trunk/test/Transforms/IPConstantProp/2008-06-09-WeakProp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/IPConstantProp/2008-06-09-WeakProp.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/IPConstantProp/2008-06-09-WeakProp.ll (original)
+++ llvm/trunk/test/Transforms/IPConstantProp/2008-06-09-WeakProp.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -ipconstprop -S | grep {ret i32 %r}
+; RUN: opt < %s -ipconstprop -S | grep "ret i32 %r"
 ; Should not propagate the result of a weak function.
 ; PR2411
 

Modified: llvm/trunk/test/Transforms/IPConstantProp/return-argument.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/IPConstantProp/return-argument.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/IPConstantProp/return-argument.ll (original)
+++ llvm/trunk/test/Transforms/IPConstantProp/return-argument.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: opt < %s -ipconstprop -S > %t
-; RUN: cat %t | grep {store i32 %Z, i32\\* %Q}
-; RUN: cat %t | grep {add i32 1, 3}
+; RUN: cat %t | grep "store i32 %Z, i32\* %Q"
+; RUN: cat %t | grep "add i32 1, 3"
 
 ;; This function returns its second argument on all return statements
 define internal i32* @incdec(i1 %C, i32* %V) {

Modified: llvm/trunk/test/Transforms/IPConstantProp/return-constant.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/IPConstantProp/return-constant.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/IPConstantProp/return-constant.ll (original)
+++ llvm/trunk/test/Transforms/IPConstantProp/return-constant.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -ipconstprop -instcombine | \
-; RUN:    llvm-dis | grep {ret i1 true} | count 2
+; RUN:    llvm-dis | grep "ret i1 true" | count 2
 define internal i32 @foo(i1 %C) {
         br i1 %C, label %T, label %F
 

Modified: llvm/trunk/test/Transforms/IPConstantProp/return-constants.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/IPConstantProp/return-constants.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/IPConstantProp/return-constants.ll (original)
+++ llvm/trunk/test/Transforms/IPConstantProp/return-constants.ll Mon Jul  2 07:47:22 2012
@@ -1,8 +1,8 @@
 ; RUN: opt < %s -ipconstprop -S > %t
 ;; Check that the 21 constants got propagated properly
-; RUN: cat %t | grep {%M = add i32 21, 21}
+; RUN: cat %t | grep "%M = add i32 21, 21"
 ;; Check that the second return values didn't get propagated
-; RUN: cat %t | grep {%N = add i32 %B, %D}
+; RUN: cat %t | grep "%N = add i32 %B, %D"
 
 %0 = type { i32, i32 }
 

Modified: llvm/trunk/test/Transforms/IndVarSimplify/2005-02-26-ExitValueCompute.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/IndVarSimplify/2005-02-26-ExitValueCompute.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/IndVarSimplify/2005-02-26-ExitValueCompute.ll (original)
+++ llvm/trunk/test/Transforms/IndVarSimplify/2005-02-26-ExitValueCompute.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -indvars -S | \
-; RUN:   grep {ret i32 152}
+; RUN:   grep "ret i32 152"
 
 define i32 @main() {
 entry:

Modified: llvm/trunk/test/Transforms/IndVarSimplify/2006-03-31-NegativeStride.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/IndVarSimplify/2006-03-31-NegativeStride.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/IndVarSimplify/2006-03-31-NegativeStride.ll (original)
+++ llvm/trunk/test/Transforms/IndVarSimplify/2006-03-31-NegativeStride.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; PR726
 ; RUN: opt < %s -indvars -S | \
-; RUN:   grep {ret i32 27}
+; RUN:   grep "ret i32 27"
 
 ; Make sure to compute the right exit value based on negative strides.
 

Modified: llvm/trunk/test/Transforms/IndVarSimplify/eliminate-max.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/IndVarSimplify/eliminate-max.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/IndVarSimplify/eliminate-max.ll (original)
+++ llvm/trunk/test/Transforms/IndVarSimplify/eliminate-max.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -S -indvars | grep {= icmp} | count 3
+; RUN: opt < %s -S -indvars | grep "= icmp" | count 3
 ; PR4914.ll
 
 ; Indvars should be able to do range analysis and eliminate icmps.

Modified: llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate_3.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate_3.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate_3.ll (original)
+++ llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate_3.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars -S | grep {ret i32 600000}
+; RUN: opt < %s -indvars -S | grep "ret i32 600000"
 ; PR1179
 
 define i32 @foo() {

Modified: llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate_4.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate_4.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate_4.ll (original)
+++ llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate_4.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars -S | grep {ret i32 9900}
+; RUN: opt < %s -indvars -S | grep "ret i32 9900"
 ; PR1179
 
 define i32 @test4() {

Modified: llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate_5.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate_5.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate_5.ll (original)
+++ llvm/trunk/test/Transforms/IndVarSimplify/loop_evaluate_5.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -indvars -S | grep {120, %bb2.bb3_crit_edge}
+; RUN: opt < %s -indvars -S | grep "120, %bb2.bb3_crit_edge"
 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-pc-linux-gnu"
 

Modified: llvm/trunk/test/Transforms/IndVarSimplify/shrunk-constant.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/IndVarSimplify/shrunk-constant.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/IndVarSimplify/shrunk-constant.ll (original)
+++ llvm/trunk/test/Transforms/IndVarSimplify/shrunk-constant.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -scalar-evolution -analyze \
-; RUN:  | grep {\\-->  (zext i4 {-7,+,-8}<%loop> to i32)}
+; RUN:  | grep "\-->  (zext i4 {-7,+,-8}<%loop> to i32)"
 
 define fastcc void @foo() nounwind {
 entry:

Modified: llvm/trunk/test/Transforms/Inline/casts.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Inline/casts.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/Inline/casts.ll (original)
+++ llvm/trunk/test/Transforms/Inline/casts.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -inline -S | grep {ret i32 1}
+; RUN: opt < %s -inline -S | grep "ret i32 1"
 ; ModuleID = 'short.opt.bc'
 
 define i32 @testBool(i1 %X) {

Modified: llvm/trunk/test/Transforms/Inline/delete-call.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Inline/delete-call.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/Inline/delete-call.ll (original)
+++ llvm/trunk/test/Transforms/Inline/delete-call.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-; RUN: opt %s -S  -inline -functionattrs -stats |& grep {Number of call sites deleted, not inlined}
-; RUN: opt %s -S  -inline -stats |& grep {Number of functions inlined}
+; RUN: opt %s -S  -inline -functionattrs -stats |& grep "Number of call sites deleted, not inlined"
+; RUN: opt %s -S  -inline -stats |& grep "Number of functions inlined"
 
 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-f80:128:128-n8:16:32"
 target triple = "i386-apple-darwin9.8"

Modified: llvm/trunk/test/Transforms/Inline/externally_available.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Inline/externally_available.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/Inline/externally_available.ll (original)
+++ llvm/trunk/test/Transforms/Inline/externally_available.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: opt < %s -inline -constprop -S > %t
 ; RUN: not grep test_function %t
-; RUN: grep {ret i32 5} %t
+; RUN: grep "ret i32 5" %t
 
 
 ; test_function should not be emitted to the .s file.

Modified: llvm/trunk/test/Transforms/Inline/inline_prune.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Inline/inline_prune.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/Inline/inline_prune.ll (original)
+++ llvm/trunk/test/Transforms/Inline/inline_prune.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -inline -S | \
-; RUN:    not grep {callee\[12\](}
+; RUN:    not grep "callee[12]("
 ; RUN: opt < %s -inline -S | not grep mul
 
 define internal i32 @callee1(i32 %A, i32 %B) {

Modified: llvm/trunk/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -instcombine -S | \
-; RUN:    grep {ret i1 false}
+; RUN:    grep "ret i1 false"
 
 define i1 @test(i1 %V) {
         %Y = icmp ult i1 %V, false              ; <i1> [#uses=1]

Modified: llvm/trunk/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -instcombine -S | \
-; RUN:   grep {ret i1 true}
+; RUN:   grep "ret i1 true"
 ; PR586
 
 @g_07918478 = external global i32               ; <i32*> [#uses=1]

Modified: llvm/trunk/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2006-12-08-Phi-ICmp-Op-Fold.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -instcombine -S | \
-; RUN:   grep {icmp sgt}
+; RUN:   grep "icmp sgt"
 ; END.
 target datalayout = "e-p:32:32"
 target triple = "i686-pc-linux-gnu"

Modified: llvm/trunk/test/Transforms/InstCombine/2006-12-15-Range-Test.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2006-12-15-Range-Test.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2006-12-15-Range-Test.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2006-12-15-Range-Test.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; RUN: opt < %s -instcombine -S | \
 ; RUN:   grep icmp | count 1
 ; RUN: opt < %s -instcombine -S | \
-; RUN:   grep {icmp ugt} | count 1
+; RUN:   grep "icmp ugt" | count 1
 ; END.
 
 target datalayout = "e-p:32:32"

Modified: llvm/trunk/test/Transforms/InstCombine/2007-01-13-ExtCompareMiscompile.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2007-01-13-ExtCompareMiscompile.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2007-01-13-ExtCompareMiscompile.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2007-01-13-ExtCompareMiscompile.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {icmp ugt}
+; RUN: opt < %s -instcombine -S | grep "icmp ugt"
 ; PR1107
 ; PR1940
 

Modified: llvm/trunk/test/Transforms/InstCombine/2007-01-14-FcmpSelf.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2007-01-14-FcmpSelf.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2007-01-14-FcmpSelf.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2007-01-14-FcmpSelf.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {fcmp uno.*0.0}
+; RUN: opt < %s -instcombine -S | grep "fcmp uno.*0.0"
 ; PR1111
 define i1 @test(double %X) {
   %tmp = fcmp une double %X, %X

Modified: llvm/trunk/test/Transforms/InstCombine/2007-01-27-AndICmp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2007-01-27-AndICmp.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2007-01-27-AndICmp.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2007-01-27-AndICmp.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ugt.*, 1}
+; RUN: opt < %s -instcombine -S | grep "ugt.*, 1"
 
 define i1 @test(i32 %tmp1030) {
 	%tmp1037 = icmp ne i32 %tmp1030, 40		; <i1> [#uses=1]

Modified: llvm/trunk/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2007-02-01-LoadSinkAlloca.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
-; RUN: opt < %s -instcombine -mem2reg -S | grep {%A = alloca} 
+; RUN: opt < %s -instcombine -mem2reg -S | grep "%A = alloca" 
 ; RUN: opt < %s -instcombine -mem2reg -S | \
-; RUN:    not grep {%B = alloca}
+; RUN:    not grep "%B = alloca"
 ; END.
 
 ; Ensure that instcombine doesn't sink the loads in entry/cond_true into 

Modified: llvm/trunk/test/Transforms/InstCombine/2007-03-13-CompareMerge.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2007-03-13-CompareMerge.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2007-03-13-CompareMerge.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2007-03-13-CompareMerge.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {icmp sle}
+; RUN: opt < %s -instcombine -S | grep "icmp sle"
 ; PR1244
 
 define i1 @test(i32 %c.3.i, i32 %d.292.2.i) {

Modified: llvm/trunk/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; For PR1248
-; RUN: opt < %s -instcombine -S | grep {ugt i32 .*, 11}
+; RUN: opt < %s -instcombine -S | grep "ugt i32 .*, 11"
 define i1 @test(i32 %tmp6) {
   %tmp7 = sdiv i32 %tmp6, 12     ; <i32> [#uses=1]
   icmp ne i32 %tmp7, -6           ; <i1>:1 [#uses=1]

Modified: llvm/trunk/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2007-03-25-BadShiftMask.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; PR1271
 ; RUN: opt < %s -instcombine -S | \
-; RUN:    grep {icmp eq i32 .tmp.*, 2146435072}
+; RUN:    grep "icmp eq i32 .tmp.*, 2146435072"
 %struct..0anon = type { i32, i32 }
 %struct..1anon = type { double }
 

Modified: llvm/trunk/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2007-03-26-BadShiftMask.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; PR1271
 ; RUN: opt < %s -instcombine -S | \
-; RUN:    grep {ashr exact i32 %.mp137, 2}
+; RUN:    grep "ashr exact i32 %.mp137, 2"
 
 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-pc-linux-gnu"

Modified: llvm/trunk/test/Transforms/InstCombine/2007-05-18-CastFoldBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2007-05-18-CastFoldBug.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2007-05-18-CastFoldBug.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2007-05-18-CastFoldBug.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {call.*sret}
+; RUN: opt < %s -instcombine -S | grep "call.*sret"
 ; Make sure instcombine doesn't drop the sret attribute.
 
 define void @blah(i16* %tmp10) {

Modified: llvm/trunk/test/Transforms/InstCombine/2007-06-06-AshrSignBit.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2007-06-06-AshrSignBit.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2007-06-06-AshrSignBit.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2007-06-06-AshrSignBit.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ashr}
+; RUN: opt < %s -instcombine -S | grep "ashr"
 ; PR1499
 
 define void @av_cmp_q_cond_true(i32* %retval, i32* %tmp9, i64* %tmp10) {

Modified: llvm/trunk/test/Transforms/InstCombine/2007-06-21-DivCompareMiscomp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2007-06-21-DivCompareMiscomp.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2007-06-21-DivCompareMiscomp.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2007-06-21-DivCompareMiscomp.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret i1 true}
+; RUN: opt < %s -instcombine -S | grep "ret i1 true"
 ; rdar://5278853
 
 define i1 @test(i32 %tmp468) {

Modified: llvm/trunk/test/Transforms/InstCombine/2007-10-28-stacksave.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2007-10-28-stacksave.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2007-10-28-stacksave.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2007-10-28-stacksave.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {call.*stacksave}
+; RUN: opt < %s -instcombine -S | grep "call.*stacksave"
 ; PR1745
 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-f80:128:128"
 target triple = "i686-apple-darwin8"

Modified: llvm/trunk/test/Transforms/InstCombine/2007-11-15-CompareMiscomp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2007-11-15-CompareMiscomp.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2007-11-15-CompareMiscomp.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2007-11-15-CompareMiscomp.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {icmp eq i32 %In, 1}
+; RUN: opt < %s -instcombine -S | grep "icmp eq i32 %In, 1"
 ; PR1800
 
 define i1 @test(i32 %In) {

Modified: llvm/trunk/test/Transforms/InstCombine/2007-12-18-AddSelCmpSub.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2007-12-18-AddSelCmpSub.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2007-12-18-AddSelCmpSub.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2007-12-18-AddSelCmpSub.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {add} | count 1
+; RUN: opt < %s -instcombine -S | grep "add" | count 1
 
 define i32 @foo(i32 %a) {
 entry:

Modified: llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret i.* 0} | count 2
+; RUN: opt < %s -instcombine -S | grep "ret i.* 0" | count 2
 ; PR2048
 
 define i32 @i(i32 %a) {

Modified: llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow2.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-02-16-SDivOverflow2.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {sdiv i8 \%a, 9}
+; RUN: opt < %s -instcombine -S | grep "sdiv i8 \%a, 9"
 ; PR2048
 
 define i8 @i(i8 %a) {

Modified: llvm/trunk/test/Transforms/InstCombine/2008-03-13-IntToPtr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-03-13-IntToPtr.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-03-13-IntToPtr.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-03-13-IntToPtr.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {16} | count 1
+; RUN: opt < %s -instcombine -S | grep "16" | count 1
 
 define i8* @bork(i8** %qux) {
   %tmp275 = load i8** %qux, align 1

Modified: llvm/trunk/test/Transforms/InstCombine/2008-04-28-VolatileStore.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-04-28-VolatileStore.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-04-28-VolatileStore.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-04-28-VolatileStore.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {store volatile}
+; RUN: opt < %s -instcombine -S | grep "store volatile"
 
 define void @test() {
 	%votf = alloca <4 x float>		; <<4 x float>*> [#uses=1]

Modified: llvm/trunk/test/Transforms/InstCombine/2008-04-29-VolatileLoadDontMerge.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-04-29-VolatileLoadDontMerge.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-04-29-VolatileLoadDontMerge.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-04-29-VolatileLoadDontMerge.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {load volatile} | count 2
+; RUN: opt < %s -instcombine -S | grep "load volatile" | count 2
 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-f80:128:128"
 target triple = "i386-apple-darwin8"
 @g_1 = internal global i32 0		; <i32*> [#uses=3]

Modified: llvm/trunk/test/Transforms/InstCombine/2008-04-29-VolatileLoadMerge.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-04-29-VolatileLoadMerge.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-04-29-VolatileLoadMerge.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-04-29-VolatileLoadMerge.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {load volatile} | count 2
+; RUN: opt < %s -instcombine -S | grep "load volatile" | count 2
 ; PR2262
 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-f80:128:128"
 target triple = "i386-apple-darwin8"

Modified: llvm/trunk/test/Transforms/InstCombine/2008-05-08-LiveStoreDelete.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-05-08-LiveStoreDelete.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-05-08-LiveStoreDelete.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-05-08-LiveStoreDelete.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {store i8} | count 3
+; RUN: opt < %s -instcombine -S | grep "store i8" | count 3
 ; PR2297
 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-f80:128:128"
 target triple = "i386-apple-darwin8"

Modified: llvm/trunk/test/Transforms/InstCombine/2008-05-18-FoldIntToPtr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-05-18-FoldIntToPtr.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-05-18-FoldIntToPtr.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-05-18-FoldIntToPtr.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret i1 false} | count 2
+; RUN: opt < %s -instcombine -S | grep "ret i1 false" | count 2
 ; PR2329
 
 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-f80:32:32"

Modified: llvm/trunk/test/Transforms/InstCombine/2008-05-23-CompareFold.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-05-23-CompareFold.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-05-23-CompareFold.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-05-23-CompareFold.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret i1 false}
+; RUN: opt < %s -instcombine -S | grep "ret i1 false"
 ; PR2359
 define i1 @f(i8* %x) {
 entry:

Modified: llvm/trunk/test/Transforms/InstCombine/2008-05-31-AddBool.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-05-31-AddBool.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-05-31-AddBool.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-05-31-AddBool.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {xor}
+; RUN: opt < %s -instcombine -S | grep "xor"
 ; PR2389
 
 define i1 @test(i1 %a, i1 %b) {

Modified: llvm/trunk/test/Transforms/InstCombine/2008-05-31-Bools.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-05-31-Bools.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-05-31-Bools.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-05-31-Bools.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; RUN: opt < %s -instcombine -S > %t
-; RUN: grep {xor} %t
-; RUN: grep {and} %t
-; RUN: not grep {div} %t
+; RUN: grep "xor" %t
+; RUN: grep "and" %t
+; RUN: not grep "div" %t
 
 define i1 @foo1(i1 %a, i1 %b) {
   %A = sub i1 %a, %b

Modified: llvm/trunk/test/Transforms/InstCombine/2008-06-08-ICmpPHI.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-06-08-ICmpPHI.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-06-08-ICmpPHI.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-06-08-ICmpPHI.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {phi i32} | count 2
+; RUN: opt < %s -instcombine -S | grep "phi i32" | count 2
 
 define void @test() nounwind  {
 entry:

Modified: llvm/trunk/test/Transforms/InstCombine/2008-06-13-InfiniteLoopStore.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-06-13-InfiniteLoopStore.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-06-13-InfiniteLoopStore.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-06-13-InfiniteLoopStore.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {store i32} | count 2
+; RUN: opt < %s -instcombine -S | grep "store i32" | count 2
 
 @g_139 = global i32 0           ; <i32*> [#uses=2]
 

Modified: llvm/trunk/test/Transforms/InstCombine/2008-06-13-ReadOnlyCallStore.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-06-13-ReadOnlyCallStore.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-06-13-ReadOnlyCallStore.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-06-13-ReadOnlyCallStore.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {store i8} | count 2
+; RUN: opt < %s -instcombine -S | grep "store i8" | count 2
 
 define i32 @a(i8* %s) nounwind  {
 entry:

Modified: llvm/trunk/test/Transforms/InstCombine/2008-06-21-CompareMiscomp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-06-21-CompareMiscomp.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-06-21-CompareMiscomp.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-06-21-CompareMiscomp.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {icmp eq i32 %In, 15}
+; RUN: opt < %s -instcombine -S | grep "icmp eq i32 %In, 15"
 ; PR2479
 ; (See also PR1800.)
 

Modified: llvm/trunk/test/Transforms/InstCombine/2008-06-24-StackRestore.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-06-24-StackRestore.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-06-24-StackRestore.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-06-24-StackRestore.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {call.*llvm.stackrestore}
+; RUN: opt < %s -instcombine -S | grep "call.*llvm.stackrestore"
 ; PR2488
 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-f80:32:32"
 target triple = "i386-pc-linux-gnu"

Modified: llvm/trunk/test/Transforms/InstCombine/2008-07-08-ShiftOneAndOne.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-07-08-ShiftOneAndOne.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-07-08-ShiftOneAndOne.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-07-08-ShiftOneAndOne.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {icmp ne i32 \%a}
+; RUN: opt < %s -instcombine -S | grep "icmp ne i32 \%a"
 ; PR2330
 
 define i1 @foo(i32 %a) nounwind  {

Modified: llvm/trunk/test/Transforms/InstCombine/2008-07-08-SubAnd.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-07-08-SubAnd.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-07-08-SubAnd.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-07-08-SubAnd.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep -v {i32 8}
+; RUN: opt < %s -instcombine -S | grep -v "i32 8"
 ; PR2330
 
 define i32 @a(i32 %a) nounwind  {

Modified: llvm/trunk/test/Transforms/InstCombine/2008-07-08-VolatileLoadMerge.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-07-08-VolatileLoadMerge.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-07-08-VolatileLoadMerge.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-07-08-VolatileLoadMerge.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {load volatile} | count 2
+; RUN: opt < %s -instcombine -S | grep "load volatile" | count 2
 ; PR2496
 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-f80:128:128"
 target triple = "i386-apple-darwin8"

Modified: llvm/trunk/test/Transforms/InstCombine/2008-07-10-CastSextBool.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-07-10-CastSextBool.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-07-10-CastSextBool.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-07-10-CastSextBool.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-; RUN: opt < %s -instcombine -S | grep {%C = xor i1 %A, true}
-; RUN: opt < %s -instcombine -S | grep {ret i1 false}
+; RUN: opt < %s -instcombine -S | grep "%C = xor i1 %A, true"
+; RUN: opt < %s -instcombine -S | grep "ret i1 false"
 ; PR2539
 
 define i1 @test1(i1 %A) {

Modified: llvm/trunk/test/Transforms/InstCombine/2008-07-13-DivZero.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-07-13-DivZero.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-07-13-DivZero.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-07-13-DivZero.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-; RUN: opt < %s -instcombine -S | grep {lshr.*3}
-; RUN: opt < %s -instcombine -S | grep {call .*%cond}
+; RUN: opt < %s -instcombine -S | grep "lshr.*3"
+; RUN: opt < %s -instcombine -S | grep "call .*%cond"
 ; PR2506
 
 ; We can simplify the operand of udiv to '8', but not the operand to the

Modified: llvm/trunk/test/Transforms/InstCombine/2008-09-29-FoldingOr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-09-29-FoldingOr.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-09-29-FoldingOr.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-09-29-FoldingOr.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {or i1}
+; RUN: opt < %s -instcombine -S | grep "or i1"
 ; PR2844
 
 define i32 @test(i32 %p_74) {

Modified: llvm/trunk/test/Transforms/InstCombine/2008-10-11-DivCompareFold.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-10-11-DivCompareFold.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-10-11-DivCompareFold.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-10-11-DivCompareFold.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret i1 false}
+; RUN: opt < %s -instcombine -S | grep "ret i1 false"
 ; PR2697
 
 define i1 @x(i32 %x) nounwind {

Modified: llvm/trunk/test/Transforms/InstCombine/2008-11-01-SRemDemandedBits.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-11-01-SRemDemandedBits.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-11-01-SRemDemandedBits.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-11-01-SRemDemandedBits.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret i1 true}
+; RUN: opt < %s -instcombine -S | grep "ret i1 true"
 ; PR2993
 
 define i1 @foo(i32 %x) {

Modified: llvm/trunk/test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {i8 2, i8 2}
+; RUN: opt < %s -instcombine -S | grep "i8 2, i8 2"
 ; PR2756
 
 define <2 x i8> @foo(<2 x i8> %x) {

Modified: llvm/trunk/test/Transforms/InstCombine/2009-01-08-AlignAlloca.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2009-01-08-AlignAlloca.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2009-01-08-AlignAlloca.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2009-01-08-AlignAlloca.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: opt < %s -instcombine -S > %t
-; RUN: grep {, align 4} %t | count 3
-; RUN: grep {, align 8} %t | count 3
+; RUN: grep ", align 4" %t | count 3
+; RUN: grep ", align 8" %t | count 3
 ; rdar://6480438
 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-f80:128:128"
 target triple = "i386-apple-darwin9.6"

Modified: llvm/trunk/test/Transforms/InstCombine/2009-01-16-PointerAddrSpace.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2009-01-16-PointerAddrSpace.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2009-01-16-PointerAddrSpace.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2009-01-16-PointerAddrSpace.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {store.*addrspace(1)}
+; RUN: opt < %s -instcombine -S | grep "store.*addrspace(1)"
 ; PR3335
 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-f80:128:128"
 target triple = "i386-apple-darwin9.6"

Modified: llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2009-01-19-fmod-constant-float-specials.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: opt < %s -simplifycfg -instcombine -S | grep 0x7FF8000000000000 | count 12
-; RUN: opt < %s -simplifycfg -instcombine -S | grep {0\\.0} | count 3
-; RUN: opt < %s -simplifycfg -instcombine -S | grep {3\\.5} | count 1
+; RUN: opt < %s -simplifycfg -instcombine -S | grep "0\.0" | count 3
+; RUN: opt < %s -simplifycfg -instcombine -S | grep "3\.5" | count 1
 ;
 
 ; ModuleID = 'apf.c'

Modified: llvm/trunk/test/Transforms/InstCombine/2009-01-31-Pressure.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2009-01-31-Pressure.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2009-01-31-Pressure.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2009-01-31-Pressure.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {%B = add i8 %b, %x}
+; RUN: opt < %s -instcombine -S | grep "%B = add i8 %b, %x"
 ; PR2698
 
 declare void @use1(i1)

Modified: llvm/trunk/test/Transforms/InstCombine/2009-02-21-LoadCST.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2009-02-21-LoadCST.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2009-02-21-LoadCST.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2009-02-21-LoadCST.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret i32 3679669}
+; RUN: opt < %s -instcombine -S | grep "ret i32 3679669"
 ; PR3595
 
 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-f80:32:32"

Modified: llvm/trunk/test/Transforms/InstCombine/2009-03-20-AShrOverShift.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2009-03-20-AShrOverShift.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2009-03-20-AShrOverShift.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2009-03-20-AShrOverShift.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ashr i32 %val, 31}
+; RUN: opt < %s -instcombine -S | grep "ashr i32 %val, 31"
 ; PR3851
 
 define i32 @foo2(i32 %val) nounwind {

Modified: llvm/trunk/test/Transforms/InstCombine/2009-04-07-MulPromoteToI96.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2009-04-07-MulPromoteToI96.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2009-04-07-MulPromoteToI96.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2009-04-07-MulPromoteToI96.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {mul i64}
+; RUN: opt < %s -instcombine -S | grep "mul i64"
 ; rdar://6762288
 
 ; Instcombine should not promote the mul to i96 because it is definitely

Modified: llvm/trunk/test/Transforms/InstCombine/2009-06-11-StoreAddrSpace.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2009-06-11-StoreAddrSpace.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2009-06-11-StoreAddrSpace.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/2009-06-11-StoreAddrSpace.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {store i32 0,}
+; RUN: opt < %s -instcombine -S | grep "store i32 0,"
 ; PR4366
 
 define void @a() {

Modified: llvm/trunk/test/Transforms/InstCombine/JavaCompare.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/JavaCompare.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/JavaCompare.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/JavaCompare.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; This is the sequence of stuff that the Java front-end expands for a single 
 ; <= comparison.  Check to make sure we turn it into a <= (only)
 
-; RUN: opt < %s -instcombine -S | grep {icmp sle i32 %A, %B}
+; RUN: opt < %s -instcombine -S | grep "icmp sle i32 %A, %B"
 
 define i1 @le(i32 %A, i32 %B) {
         %c1 = icmp sgt i32 %A, %B               ; <i1> [#uses=1]

Modified: llvm/trunk/test/Transforms/InstCombine/add-shrink.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/add-shrink.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/add-shrink.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/add-shrink.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {add nsw i32}
+; RUN: opt < %s -instcombine -S | grep "add nsw i32"
 ; RUN: opt < %s -instcombine -S | grep sext | count 1
 
 ; Should only have one sext and the add should be i32 instead of i64.

Modified: llvm/trunk/test/Transforms/InstCombine/add-sitofp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/add-sitofp.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/add-sitofp.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/add-sitofp.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {add nsw i32}
+; RUN: opt < %s -instcombine -S | grep "add nsw i32"
 
 define double @x(i32 %a, i32 %b) nounwind {
   %m = lshr i32 %a, 24

Modified: llvm/trunk/test/Transforms/InstCombine/addnegneg.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/addnegneg.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/addnegneg.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/addnegneg.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep { sub } | count 1
+; RUN: opt < %s -instcombine -S | grep " sub " | count 1
 ; PR2047
 
 define i32 @l(i32 %a, i32 %b, i32 %c, i32 %d) {

Modified: llvm/trunk/test/Transforms/InstCombine/adjust-for-sminmax.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/adjust-for-sminmax.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/adjust-for-sminmax.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/adjust-for-sminmax.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {icmp s\[lg\]t i32 %n, 0} | count 16
+; RUN: opt < %s -instcombine -S | grep "icmp s[lg]t i32 %n, 0" | count 16
 
 ; Instcombine should recognize that this code can be adjusted
 ; to fit the canonical smax/smin pattern.

Modified: llvm/trunk/test/Transforms/InstCombine/align-2d-gep.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/align-2d-gep.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/align-2d-gep.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/align-2d-gep.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {align 16} | count 1
+; RUN: opt < %s -instcombine -S | grep "align 16" | count 1
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 ; A multi-dimensional array in a nested loop doing vector stores that

Modified: llvm/trunk/test/Transforms/InstCombine/and-not-or.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/and-not-or.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/and-not-or.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/and-not-or.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-; RUN: opt < %s -instcombine -S | grep {and i32 %x, %y} | count 4
-; RUN: opt < %s -instcombine -S | not grep {or}
+; RUN: opt < %s -instcombine -S | grep "and i32 %x, %y" | count 4
+; RUN: opt < %s -instcombine -S | not grep "or"
 
 define i32 @func1(i32 %x, i32 %y) nounwind {
 entry:

Modified: llvm/trunk/test/Transforms/InstCombine/and-or.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/and-or.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/and-or.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/and-or.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-; RUN: opt < %s -instcombine -S | grep {and i32 %a, 1} | count 4
-; RUN: opt < %s -instcombine -S | grep {or i32 %0, %b} | count 4
+; RUN: opt < %s -instcombine -S | grep "and i32 %a, 1" | count 4
+; RUN: opt < %s -instcombine -S | grep "or i32 %0, %b" | count 4
 
 
 define i32 @func1(i32 %a, i32 %b) nounwind readnone {

Modified: llvm/trunk/test/Transforms/InstCombine/apint-shift-simplify.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/apint-shift-simplify.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/apint-shift-simplify.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/apint-shift-simplify.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -instcombine -S | \
-; RUN:    egrep {shl|lshr|ashr} | count 3
+; RUN:    egrep "shl|lshr|ashr" | count 3
 
 define i41 @test0(i41 %A, i41 %B, i41 %C) {
 	%X = shl i41 %A, %C

Modified: llvm/trunk/test/Transforms/InstCombine/bitcount.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/bitcount.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/bitcount.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/bitcount.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; Tests to make sure bit counts of constants are folded
-; RUN: opt < %s -instcombine -S | grep {ret i32 19}
+; RUN: opt < %s -instcombine -S | grep "ret i32 19"
 ; RUN: opt < %s -instcombine -S | \
 ; RUN:   grep -v declare | not grep llvm.ct
 

Modified: llvm/trunk/test/Transforms/InstCombine/bswap.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/bswap.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/bswap.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/bswap.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 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-f80:128:128-n8:16:32"
 
 ; RUN: opt < %s -instcombine -S | \
-; RUN:    grep {call.*llvm.bswap} | count 6
+; RUN:    grep "call.*llvm.bswap" | count 6
 
 define i32 @test1(i32 %i) {
 	%tmp1 = lshr i32 %i, 24		; <i32> [#uses=1]

Modified: llvm/trunk/test/Transforms/InstCombine/dce-iterate.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/dce-iterate.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/dce-iterate.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/dce-iterate.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret double .sy}
+; RUN: opt < %s -instcombine -S | grep "ret double .sy"
 
 define internal double @ScaleObjectAdd(double %sx, double %sy, double %sz) nounwind {
 entry:

Modified: llvm/trunk/test/Transforms/InstCombine/deadcode.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/deadcode.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/deadcode.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/deadcode.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret i32 %A}
+; RUN: opt < %s -instcombine -S | grep "ret i32 %A"
 ; RUN: opt < %s -die -S | not grep call.*llvm
 
 define i32 @test(i32 %A) {

Modified: llvm/trunk/test/Transforms/InstCombine/enforce-known-alignment.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/enforce-known-alignment.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/enforce-known-alignment.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/enforce-known-alignment.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep alloca | grep {align 16}
+; RUN: opt < %s -instcombine -S | grep alloca | grep "align 16"
 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-f80:128:128"
 target triple = "i386-apple-darwin9.6"
 

Modified: llvm/trunk/test/Transforms/InstCombine/fp-ret-bitcast.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/fp-ret-bitcast.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/fp-ret-bitcast.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/fp-ret-bitcast.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -instcombine -S | \
-; RUN:    grep {call float bitcast} | count 1
+; RUN:    grep "call float bitcast" | count 1
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 	%struct.NSObject = type { %struct.objc_class* }
  	%struct.NSArray = type { %struct.NSObject }

Modified: llvm/trunk/test/Transforms/InstCombine/known_align.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/known_align.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/known_align.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/known_align.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {align 1}
+; RUN: opt < %s -instcombine -S | grep "align 1"
 ; END.
 
 	%struct.p = type <{ i8, i32 }>

Modified: llvm/trunk/test/Transforms/InstCombine/loadstore-alignment.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/loadstore-alignment.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/loadstore-alignment.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/loadstore-alignment.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {, align 16} | count 14
+; RUN: opt < %s -instcombine -S | grep ", align 16" | count 14
 target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
 
 @x = external global <2 x i64>, align 16

Modified: llvm/trunk/test/Transforms/InstCombine/memcpy-to-load.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/memcpy-to-load.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/memcpy-to-load.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/memcpy-to-load.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {load double}
+; RUN: opt < %s -instcombine -S | grep "load double"
 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-f80:128:128"
 target triple = "i686-apple-darwin8"
 

Modified: llvm/trunk/test/Transforms/InstCombine/multi-use-or.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/multi-use-or.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/multi-use-or.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/multi-use-or.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {fadd double .sx, .sy}
+; RUN: opt < %s -instcombine -S | grep "fadd double .sx, .sy"
 ; The 'or' has multiple uses, make sure that this doesn't prevent instcombine
 ; from propagating the extends to the truncs.
 

Modified: llvm/trunk/test/Transforms/InstCombine/narrow.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/narrow.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/narrow.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/narrow.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; This file contains various testcases that check to see that instcombine
 ; is narrowing computations when possible.
 ; RUN: opt < %s -instcombine -S | \
-; RUN:    grep {ret i1 false}
+; RUN:    grep "ret i1 false"
 
 ; test1 - Eliminating the casts in this testcase (by narrowing the AND
 ; operation) allows instcombine to realize the function always returns false.

Modified: llvm/trunk/test/Transforms/InstCombine/odr-linkage.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/odr-linkage.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/odr-linkage.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/odr-linkage.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret i32 10}
+; RUN: opt < %s -instcombine -S | grep "ret i32 10"
 
 @g1 = available_externally constant i32 1
 @g2 = linkonce_odr constant i32 2

Modified: llvm/trunk/test/Transforms/InstCombine/or-to-xor.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/or-to-xor.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/or-to-xor.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/or-to-xor.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-; RUN: opt < %s -instcombine -S | grep {xor i32 %a, %b} | count 4
-; RUN: opt < %s -instcombine -S | not grep {and}
+; RUN: opt < %s -instcombine -S | grep "xor i32 %a, %b" | count 4
+; RUN: opt < %s -instcombine -S | not grep "and"
 
 define i32 @func1(i32 %a, i32 %b) nounwind readnone {
 entry:

Modified: llvm/trunk/test/Transforms/InstCombine/phi-merge-gep.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/phi-merge-gep.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/phi-merge-gep.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/phi-merge-gep.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: opt < %s -S -instcombine > %t
-; RUN: grep {= getelementptr} %t | count 20
-; RUN: grep {= phi} %t | count 13
+; RUN: grep "= getelementptr" %t | count 20
+; RUN: grep "= phi" %t | count 13
 
 ; Don't push the geps through these phis, because they would require
 ; two phis each, which burdens the loop with high register pressure.

Modified: llvm/trunk/test/Transforms/InstCombine/pr2645-0.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/pr2645-0.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/pr2645-0.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/pr2645-0.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {insertelement <4 x float> undef}
+; RUN: opt < %s -instcombine -S | grep "insertelement <4 x float> undef"
 
 ; Instcombine should be able to prove that none of the
 ; insertelement's first operand's elements are needed.

Modified: llvm/trunk/test/Transforms/InstCombine/select-load-call.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/select-load-call.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/select-load-call.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/select-load-call.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret i32 1}
+; RUN: opt < %s -instcombine -S | grep "ret i32 1"
 
 declare void @test2()
 

Modified: llvm/trunk/test/Transforms/InstCombine/shufflevec-constant.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/shufflevec-constant.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/shufflevec-constant.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/shufflevec-constant.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret <4 x float> <float 0.000000e+00, float 0.000000e+00, float 0x7FF0000000000000, float 0x7FF0000000000000>}
+; RUN: opt < %s -instcombine -S | grep "ret <4 x float> <float 0.000000e+00, float 0.000000e+00, float 0x7FF0000000000000, float 0x7FF0000000000000>"
 
 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-f80:128:128"
 target triple = "i386-apple-darwin9"

Modified: llvm/trunk/test/Transforms/InstCombine/signed-comparison.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/signed-comparison.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/signed-comparison.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/signed-comparison.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; RUN: opt < %s -instcombine -S > %t
 ; RUN: not grep zext %t
 ; RUN: not grep slt %t
-; RUN: grep {icmp ult} %t
+; RUN: grep "icmp ult" %t
 
 ; Instcombine should convert the zext+slt into a simple ult.
 

Modified: llvm/trunk/test/Transforms/InstCombine/srem-simplify-bug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/srem-simplify-bug.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/srem-simplify-bug.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/srem-simplify-bug.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret i1 false}
+; RUN: opt < %s -instcombine -S | grep "ret i1 false"
 ; PR2276
 
 define i1 @f(i32 %x) {

Modified: llvm/trunk/test/Transforms/InstCombine/stack-overalign.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/stack-overalign.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/stack-overalign.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/stack-overalign.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {align 32} | count 1
+; RUN: opt < %s -instcombine -S | grep "align 32" | count 1
 
 ; It's tempting to have an instcombine in which the src pointer of a
 ; memcpy is aligned up to the alignment of the destination, however

Modified: llvm/trunk/test/Transforms/InstCombine/stacksaverestore.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/stacksaverestore.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/stacksaverestore.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/stacksaverestore.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {call.*stackrestore} | count 1
+; RUN: opt < %s -instcombine -S | grep "call.*stackrestore" | count 1
 
 declare i8* @llvm.stacksave()
 declare void @llvm.stackrestore(i8*)

Modified: llvm/trunk/test/Transforms/InstCombine/udiv-simplify-bug-0.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/udiv-simplify-bug-0.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/udiv-simplify-bug-0.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/udiv-simplify-bug-0.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret i64 0} | count 2
+; RUN: opt < %s -instcombine -S | grep "ret i64 0" | count 2
 
 define i64 @foo(i32 %x) nounwind {
   %y = lshr i32 %x, 1

Modified: llvm/trunk/test/Transforms/InstCombine/urem-simplify-bug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/urem-simplify-bug.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/urem-simplify-bug.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/urem-simplify-bug.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {= or i32 %x, -5}
+; RUN: opt < %s -instcombine -S | grep "= or i32 %x, -5"
 
 @.str = internal constant [5 x i8] c"foo\0A\00"		; <[5 x i8]*> [#uses=1]
 @.str1 = internal constant [5 x i8] c"bar\0A\00"		; <[5 x i8]*> [#uses=1]

Modified: llvm/trunk/test/Transforms/InstCombine/vec_insertelt.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/vec_insertelt.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/vec_insertelt.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/vec_insertelt.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {ret <4 x i32> %A}
+; RUN: opt < %s -instcombine -S | grep "ret <4 x i32> %A"
 
 ; PR1286
 define <4 x i32> @test1(<4 x i32> %A) {

Modified: llvm/trunk/test/Transforms/InstCombine/vec_narrow.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/vec_narrow.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/vec_narrow.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/vec_narrow.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {fadd float}
+; RUN: opt < %s -instcombine -S | grep "fadd float"
 
 
 define float @test(<4 x float> %A, <4 x float> %B, float %f) {

Modified: llvm/trunk/test/Transforms/InstCombine/vector-srem.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/vector-srem.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/vector-srem.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/vector-srem.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {srem <4 x i32>}
+; RUN: opt < %s -instcombine -S | grep "srem <4 x i32>"
 
 define <4 x i32> @foo(<4 x i32> %t, <4 x i32> %u)
 {

Modified: llvm/trunk/test/Transforms/InstCombine/volatile_store.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/volatile_store.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/volatile_store.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/volatile_store.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-; RUN: opt < %s -instcombine -S | grep {store volatile}
-; RUN: opt < %s -instcombine -S | grep {load volatile}
+; RUN: opt < %s -instcombine -S | grep "store volatile"
+; RUN: opt < %s -instcombine -S | grep "load volatile"
 
 @x = weak global i32 0		; <i32*> [#uses=2]
 

Modified: llvm/trunk/test/Transforms/InstCombine/zeroext-and-reduce.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/zeroext-and-reduce.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/zeroext-and-reduce.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/zeroext-and-reduce.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -instcombine -S | \
-; RUN:   grep {and i32 %Y, 8}
+; RUN:   grep "and i32 %Y, 8"
 
 define i32 @test1(i8 %X) {
         %Y = zext i8 %X to i32          ; <i32> [#uses=1]

Modified: llvm/trunk/test/Transforms/InstCombine/zext-fold.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/zext-fold.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/zext-fold.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/zext-fold.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -S | grep {zext } | count 1
+; RUN: opt < %s -instcombine -S | grep "zext " | count 1
 ; PR1570
 
 define i32 @test2(float %X, float %Y) {

Modified: llvm/trunk/test/Transforms/JumpThreading/2008-11-27-EntryMunge.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/JumpThreading/2008-11-27-EntryMunge.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/JumpThreading/2008-11-27-EntryMunge.ll (original)
+++ llvm/trunk/test/Transforms/JumpThreading/2008-11-27-EntryMunge.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -S | grep {ret i32 0}
+; RUN: opt < %s -jump-threading -S | grep "ret i32 0"
 ; PR3138
 
 define i32 @jt() {

Modified: llvm/trunk/test/Transforms/JumpThreading/no-irreducible-loops.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/JumpThreading/no-irreducible-loops.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/JumpThreading/no-irreducible-loops.ll (original)
+++ llvm/trunk/test/Transforms/JumpThreading/no-irreducible-loops.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: opt < %s -jump-threading -loop-rotate -instcombine -indvars -loop-unroll -simplifycfg -S -verify-dom-info -verify-loop-info > %t
-; RUN: grep {store volatile} %t | count 3
-; RUN: not grep {br label} %t
+; RUN: grep "store volatile" %t | count 3
+; RUN: not grep "br label" %t
 
 ; Jump threading should not prevent this loop from being unrolled.
 

Modified: llvm/trunk/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll (original)
+++ llvm/trunk/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -loop-simplify -lcssa -S | \
-; RUN:   grep {%%SJE.0.0.lcssa = phi .struct.SetJmpMapEntry}
+; RUN:   grep "%%SJE.0.0.lcssa = phi .struct.SetJmpMapEntry"
 
         %struct.SetJmpMapEntry = type { i8*, i32, %struct.SetJmpMapEntry* }
 

Modified: llvm/trunk/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll (original)
+++ llvm/trunk/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; RUN: opt < %s -lcssa -S | \
-; RUN:    grep {%X.1.lcssa}
+; RUN:    grep "%X.1.lcssa"
 ; RUN: opt < %s -lcssa -S | \
-; RUN:    not grep {%X.1.lcssa1}
+; RUN:    not grep "%X.1.lcssa1"
 
 declare i1 @c1()
 

Modified: llvm/trunk/test/Transforms/LCSSA/basictest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LCSSA/basictest.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LCSSA/basictest.ll (original)
+++ llvm/trunk/test/Transforms/LCSSA/basictest.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; RUN: opt < %s -lcssa -S | \
-; RUN:   grep {X3.lcssa = phi i32}
+; RUN:   grep "X3.lcssa = phi i32"
 ; RUN: opt < %s -lcssa -S | \
-; RUN:   grep {X4 = add i32 3, %X3.lcssa}
+; RUN:   grep "X4 = add i32 3, %X3.lcssa"
 
 define void @lcssa(i1 %S2) {
 entry:

Modified: llvm/trunk/test/Transforms/LCSSA/unreachable-use.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LCSSA/unreachable-use.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LCSSA/unreachable-use.ll (original)
+++ llvm/trunk/test/Transforms/LCSSA/unreachable-use.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -lcssa -S -verify-loop-info | grep {\[%\]tmp33 = load i1\\*\\* \[%\]tmp}
+; RUN: opt < %s -lcssa -S -verify-loop-info | grep "[%]tmp33 = load i1\*\* [%]tmp"
 ; PR6546
 
 ; LCSSA doesn't need to transform uses in blocks not reachable

Modified: llvm/trunk/test/Transforms/LICM/2007-05-22-VolatileSink.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LICM/2007-05-22-VolatileSink.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LICM/2007-05-22-VolatileSink.ll (original)
+++ llvm/trunk/test/Transforms/LICM/2007-05-22-VolatileSink.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -licm -S | grep {store volatile}
+; RUN: opt < %s -licm -S | grep "store volatile"
 ; PR1435
 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"

Modified: llvm/trunk/test/Transforms/LoopSimplify/indirectbr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopSimplify/indirectbr.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LoopSimplify/indirectbr.ll (original)
+++ llvm/trunk/test/Transforms/LoopSimplify/indirectbr.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -loop-simplify -lcssa -verify-loop-info -verify-dom-info -S \
-; RUN:   | grep -F {indirectbr i8* %x, \[label %L0, label %L1\]} \
+; RUN:   | grep -F "indirectbr i8* %x, [label %L0, label %L1]" \
 ; RUN:   | count 6
 
 ; LoopSimplify should not try to transform loops when indirectbr is involved.

Modified: llvm/trunk/test/Transforms/LoopSimplify/merge-exits.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopSimplify/merge-exits.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LoopSimplify/merge-exits.ll (original)
+++ llvm/trunk/test/Transforms/LoopSimplify/merge-exits.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: opt < %s -loop-simplify -loop-rotate -instcombine -indvars -S -verify-loop-info -verify-dom-info > %t
 ; RUN: not grep sext %t
-; RUN: grep {phi i64} %t | count 1
+; RUN: grep "phi i64" %t | count 1
 
 ; Loopsimplify should be able to merge the two loop exits
 ; into one, so that loop rotate can rotate the loop, so

Modified: llvm/trunk/test/Transforms/LoopSimplify/preserve-scev.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopSimplify/preserve-scev.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LoopSimplify/preserve-scev.ll (original)
+++ llvm/trunk/test/Transforms/LoopSimplify/preserve-scev.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt -S < %s -indvars | opt -analyze -iv-users | grep {%cmp = icmp slt i32} | grep {= \{%\\.ph,+,1\}<%for.cond>}
+; RUN: opt -S < %s -indvars | opt -analyze -iv-users | grep "%cmp = icmp slt i32" | grep "= {%\.ph,+,1}<%for.cond>"
 ; PR8079
 
 ; LoopSimplify should invalidate indvars when splitting out the

Modified: llvm/trunk/test/Transforms/LoopStrengthReduce/dont_reverse.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopStrengthReduce/dont_reverse.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LoopStrengthReduce/dont_reverse.ll (original)
+++ llvm/trunk/test/Transforms/LoopStrengthReduce/dont_reverse.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -loop-reduce -S \
-; RUN:    | grep {icmp eq i2 %lsr.iv.next, %xmp4344}
+; RUN:    | grep "icmp eq i2 %lsr.iv.next, %xmp4344"
 
 ; Don't reverse the iteration if the rhs of the compare is defined
 ; inside the loop.

Modified: llvm/trunk/test/Transforms/LoopStrengthReduce/pr2570.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopStrengthReduce/pr2570.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LoopStrengthReduce/pr2570.ll (original)
+++ llvm/trunk/test/Transforms/LoopStrengthReduce/pr2570.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -loop-reduce -S | grep {phi\\>} | count 8
+; RUN: opt < %s -loop-reduce -S | grep "phi\>" | count 8
 ; PR2570
 
 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-f80:32:32"

Modified: llvm/trunk/test/Transforms/LoopStrengthReduce/quadradic-exit-value.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopStrengthReduce/quadradic-exit-value.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LoopStrengthReduce/quadradic-exit-value.ll (original)
+++ llvm/trunk/test/Transforms/LoopStrengthReduce/quadradic-exit-value.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -analyze -iv-users | grep {\{1,+,3,+,2\}<%loop> (post-inc with loop %loop)}
+; RUN: opt < %s -analyze -iv-users | grep "{1,+,3,+,2}<%loop> (post-inc with loop %loop)"
 
 ; The value of %r is dependent on a polynomial iteration expression.
 

Modified: llvm/trunk/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll (original)
+++ llvm/trunk/test/Transforms/LoopStrengthReduce/use_postinc_value_outside_loop.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -loop-reduce -S | \
-; RUN:   grep {add i32 %indvar630.ui, 1}
+; RUN:   grep "add i32 %indvar630.ui, 1"
 ;
 ; Make sure that the use of the IV outside of the loop (the store) uses the 
 ; post incremented value of the IV, not the preincremented value.  This 

Modified: llvm/trunk/test/Transforms/MergeFunc/phi-speculation2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/MergeFunc/phi-speculation2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/MergeFunc/phi-speculation2.ll (original)
+++ llvm/trunk/test/Transforms/MergeFunc/phi-speculation2.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -mergefunc -stats -disable-output |& grep {functions merged}
+; RUN: opt < %s -mergefunc -stats -disable-output |& grep "functions merged"
 
 define i32 @foo1(i32 %x) {
 entry:

Modified: llvm/trunk/test/Transforms/MergeFunc/vector.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/MergeFunc/vector.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/MergeFunc/vector.ll (original)
+++ llvm/trunk/test/Transforms/MergeFunc/vector.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt -mergefunc -stats -disable-output < %s |& grep {functions merged}
+; RUN: opt -mergefunc -stats -disable-output < %s |& grep "functions merged"
 
 ; This test is checks whether we can merge
 ;   vector<intptr_t>::push_back(0)

Modified: llvm/trunk/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll (original)
+++ llvm/trunk/test/Transforms/Reassociate/2005-09-01-ArrayOutOfBounds.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -reassociate -instcombine -S |\
-; RUN:   grep {ret i32 0}
+; RUN:   grep "ret i32 0"
 
 define i32 @f(i32 %a0, i32 %a1, i32 %a2, i32 %a3, i32 %a4) {
 	%tmp.2 = add i32 %a4, %a3		; <i32> [#uses=1]

Modified: llvm/trunk/test/Transforms/Reassociate/shifttest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Reassociate/shifttest.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/Reassociate/shifttest.ll (original)
+++ llvm/trunk/test/Transforms/Reassociate/shifttest.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; With shl->mul reassociation, we can see that this is (shl A, 9) * A
 ;
 ; RUN: opt < %s -reassociate -instcombine -S |\
-; RUN:    grep {shl .*, 9}
+; RUN:    grep "shl .*, 9"
 
 define i32 @test(i32 %A, i32 %B) {
 	%X = shl i32 %A, 5		; <i32> [#uses=1]

Modified: llvm/trunk/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll (original)
+++ llvm/trunk/test/Transforms/SCCP/2004-12-10-UndefBranchBug.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | grep {ret i32 1}
+; RUN: opt < %s -sccp -S | grep "ret i32 1"
 
 ; This function definitely returns 1, even if we don't know the direction
 ; of the branch.

Modified: llvm/trunk/test/Transforms/SCCP/2006-12-19-UndefBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SCCP/2006-12-19-UndefBug.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SCCP/2006-12-19-UndefBug.ll (original)
+++ llvm/trunk/test/Transforms/SCCP/2006-12-19-UndefBug.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -sccp -S | \
-; RUN:   grep {ret i1 false}
+; RUN:   grep "ret i1 false"
 
 define i1 @foo() {
 	%X = and i1 false, undef		; <i1> [#uses=1]

Modified: llvm/trunk/test/Transforms/SCCP/2008-04-22-multiple-ret-sccp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SCCP/2008-04-22-multiple-ret-sccp.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SCCP/2008-04-22-multiple-ret-sccp.ll (original)
+++ llvm/trunk/test/Transforms/SCCP/2008-04-22-multiple-ret-sccp.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | grep {ret i32 %Z}
+; RUN: opt < %s -sccp -S | grep "ret i32 %Z"
 ; rdar://5778210
 
 declare {i32, i32} @bar(i32 %A) 

Modified: llvm/trunk/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll (original)
+++ llvm/trunk/test/Transforms/SCCP/2009-01-14-IPSCCP-Invoke.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-; RUN: opt < %s -ipsccp -S | grep {ret i32 42}
-; RUN: opt < %s -ipsccp -S | grep {ret i32 undef}
+; RUN: opt < %s -ipsccp -S | grep "ret i32 42"
+; RUN: opt < %s -ipsccp -S | grep "ret i32 undef"
 ; PR3325
 
 define i32 @main() {

Modified: llvm/trunk/test/Transforms/SCCP/apint-array.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SCCP/apint-array.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SCCP/apint-array.ll (original)
+++ llvm/trunk/test/Transforms/SCCP/apint-array.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | grep {ret i101 12}
+; RUN: opt < %s -sccp -S | grep "ret i101 12"
 
 @Y = constant [6 x i101] [ i101 12, i101 123456789000000, i101 -12,i101 
 -123456789000000, i101 0,i101 9123456789000000]

Modified: llvm/trunk/test/Transforms/SCCP/apint-basictest4.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SCCP/apint-basictest4.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SCCP/apint-basictest4.ll (original)
+++ llvm/trunk/test/Transforms/SCCP/apint-basictest4.ll Mon Jul  2 07:47:22 2012
@@ -4,7 +4,7 @@
 
 ; RUN: opt < %s -sccp -S | not grep and
 ; RUN: opt < %s -sccp -S | not grep trunc
-; RUN: opt < %s -sccp -S | grep {ret i100 -1}
+; RUN: opt < %s -sccp -S | grep "ret i100 -1"
 
 define i100 @test(i133 %A) {
         %B = and i133 0, %A

Modified: llvm/trunk/test/Transforms/SCCP/apint-ipsccp1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SCCP/apint-ipsccp1.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SCCP/apint-ipsccp1.ll (original)
+++ llvm/trunk/test/Transforms/SCCP/apint-ipsccp1.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-; RUN: opt < %s -ipsccp -S | grep -v {ret i512 undef} | \
-; RUN:   grep {ret i8 2}
+; RUN: opt < %s -ipsccp -S | grep -v "ret i512 undef" | \
+; RUN:   grep "ret i8 2"
 
 define internal i512 @test(i1 %B) {
 	br i1 %B, label %BB1, label %BB2

Modified: llvm/trunk/test/Transforms/SCCP/logical-nuke.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SCCP/logical-nuke.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SCCP/logical-nuke.ll (original)
+++ llvm/trunk/test/Transforms/SCCP/logical-nuke.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -sccp -S | grep {ret i32 0}
+; RUN: opt < %s -sccp -S | grep "ret i32 0"
 
 ; Test that SCCP has basic knowledge of when and/or nuke overdefined values.
 

Modified: llvm/trunk/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/2003-09-12-IncorrectPromote.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; Scalar replacement was incorrectly promoting this alloca!!
 ;
 ; RUN: opt < %s -scalarrepl -S | \
-; RUN:   sed {s/;.*//g} | grep {\\\[}
+; RUN:   sed "s/;.*//g" | grep "\["
 
 define i8* @test() {
 	%A = alloca [30 x i8]		; <[30 x i8]*> [#uses=1]

Modified: llvm/trunk/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/2003-10-29-ArrayProblem.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -scalarrepl -S | grep {alloca %%T}
+; RUN: opt < %s -scalarrepl -S | grep "alloca %%T"
 
 %T = type { [80 x i8], i32, i32 }
 declare i32 @.callback_1(i8*)

Modified: llvm/trunk/test/Transforms/ScalarRepl/2008-01-29-PromoteBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/2008-01-29-PromoteBug.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/2008-01-29-PromoteBug.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/2008-01-29-PromoteBug.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -scalarrepl -instcombine -S | grep {ret i8 17}
+; RUN: opt < %s -scalarrepl -instcombine -S | grep "ret i8 17"
 ; rdar://5707076
 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-f80:128:128-n8:16:32"
 target triple = "i386-apple-darwin9.1.0"

Modified: llvm/trunk/test/Transforms/ScalarRepl/2008-06-22-LargeArray.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/2008-06-22-LargeArray.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/2008-06-22-LargeArray.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/2008-06-22-LargeArray.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -scalarrepl -S | grep {call.*mem} 
+; RUN: opt < %s -scalarrepl -S | grep "call.*mem" 
 ; PR2369
 
 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-f80:128:128"

Modified: llvm/trunk/test/Transforms/ScalarRepl/2008-08-22-out-of-range-array-promote.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/2008-08-22-out-of-range-array-promote.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/2008-08-22-out-of-range-array-promote.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/2008-08-22-out-of-range-array-promote.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -scalarrepl -S | grep {s = alloca .struct.x}
+; RUN: opt < %s -scalarrepl -S | grep "s = alloca .struct.x"
 ; PR2423
 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-f80:128:128"
 target triple = "i386-apple-darwin8"

Modified: llvm/trunk/test/Transforms/ScalarRepl/2009-02-02-ScalarPromoteOutOfRange.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/2009-02-02-ScalarPromoteOutOfRange.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/2009-02-02-ScalarPromoteOutOfRange.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/2009-02-02-ScalarPromoteOutOfRange.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -scalarrepl -instcombine -S | grep {ret i32 %x}
+; RUN: opt < %s -scalarrepl -instcombine -S | grep "ret i32 %x"
 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-f80:32:32"
 target triple = "i386-pc-linux-gnu"
 

Modified: llvm/trunk/test/Transforms/ScalarRepl/2009-02-05-LoadFCA.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/2009-02-05-LoadFCA.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/2009-02-05-LoadFCA.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/2009-02-05-LoadFCA.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -scalarrepl -instcombine -inline -instcombine -S | grep {ret i32 42}
+; RUN: opt < %s -scalarrepl -instcombine -inline -instcombine -S | grep "ret i32 42"
 ; PR3489
 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-f80:128:128"
 target triple = "x86_64-apple-darwin10.0"

Modified: llvm/trunk/test/Transforms/ScalarRepl/2009-03-04-MemCpyAlign.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/2009-03-04-MemCpyAlign.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/2009-03-04-MemCpyAlign.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/2009-03-04-MemCpyAlign.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; The store into %p should end up with a known alignment of 1, since the memcpy
 ; is only known to access it with 1-byte alignment.
-; RUN: opt < %s -scalarrepl -S | grep {store i16 1, .*, align 1}
+; RUN: opt < %s -scalarrepl -S | grep "store i16 1, .*, align 1"
 ; PR3720
 target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
 

Modified: llvm/trunk/test/Transforms/ScalarRepl/memset-aggregate.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/memset-aggregate.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/memset-aggregate.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/memset-aggregate.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; PR1226
-; RUN: opt < %s -scalarrepl -S | grep {ret i32 16843009}
+; RUN: opt < %s -scalarrepl -S | grep "ret i32 16843009"
 ; RUN: opt < %s -scalarrepl -S | not grep alloca
-; RUN: opt < %s -scalarrepl -instcombine -S | grep {ret i16 514}
+; RUN: opt < %s -scalarrepl -instcombine -S | grep "ret i16 514"
 
 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"

Modified: llvm/trunk/test/Transforms/ScalarRepl/not-a-vector.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/not-a-vector.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/not-a-vector.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/not-a-vector.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: opt < %s -scalarrepl -S | not grep alloca
-; RUN: opt < %s -scalarrepl -S | not grep {7 x double}
-; RUN: opt < %s -scalarrepl -instcombine -S | grep {ret double %B}
+; RUN: opt < %s -scalarrepl -S | not grep "7 x double"
+; RUN: opt < %s -scalarrepl -instcombine -S | grep "ret double %B"
 target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
 
 define double @test(double %A, double %B) {

Modified: llvm/trunk/test/Transforms/ScalarRepl/union-fp-int.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/union-fp-int.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/union-fp-int.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/union-fp-int.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; RUN: opt < %s -scalarrepl -S | \
 ; RUN:   not grep alloca
 ; RUN: opt < %s -scalarrepl -S | \
-; RUN:   grep {bitcast.*float.*i32}
+; RUN:   grep "bitcast.*float.*i32"
 target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
 
 define i32 @test(float %X) {

Modified: llvm/trunk/test/Transforms/ScalarRepl/union-pointer.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/union-pointer.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/union-pointer.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/union-pointer.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; PR892
 ; RUN: opt < %s -scalarrepl -S | \
 ; RUN:   not grep alloca
-; RUN: opt < %s -scalarrepl -S | grep {ret i8}
+; RUN: opt < %s -scalarrepl -S | grep "ret i8"
 
 target datalayout = "e-p:32:32-n8:16:32"
 target triple = "i686-apple-darwin8.7.2"

Modified: llvm/trunk/test/Transforms/ScalarRepl/vector_memcpy.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/vector_memcpy.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/vector_memcpy.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/vector_memcpy.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: opt < %s -scalarrepl -S > %t
-; RUN: grep {ret <16 x float> %A} %t
-; RUN: grep {ret <16 x float> zeroinitializer} %t
+; RUN: grep "ret <16 x float> %A" %t
+; RUN: grep "ret <16 x float> zeroinitializer" %t
 target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
 
 define <16 x float> @foo(<16 x float> %A) nounwind {

Modified: llvm/trunk/test/Transforms/ScalarRepl/volatile.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/ScalarRepl/volatile.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/ScalarRepl/volatile.ll (original)
+++ llvm/trunk/test/Transforms/ScalarRepl/volatile.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
-; RUN: opt < %s -scalarrepl -S | grep {load volatile}
-; RUN: opt < %s -scalarrepl -S | grep {store volatile}
+; RUN: opt < %s -scalarrepl -S | grep "load volatile"
+; RUN: opt < %s -scalarrepl -S | grep "store volatile"
 
 define i32 @voltest(i32 %T) {
 	%A = alloca {i32, i32}

Modified: llvm/trunk/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyCFG/2002-05-05-EmptyBlockMerge.ll Mon Jul  2 07:47:22 2012
@@ -1,7 +1,7 @@
 ; Basic block #2 should not be merged into BB #3!
 ;
 ; RUN: opt < %s -simplifycfg -S | \
-; RUN:   grep {br label}
+; RUN:   grep "br label"
 ;
 
 declare void @foo()

Modified: llvm/trunk/test/Transforms/SimplifyCFG/2008-01-02-hoist-fp-add.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2008-01-02-hoist-fp-add.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyCFG/2008-01-02-hoist-fp-add.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyCFG/2008-01-02-hoist-fp-add.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; The phi should not be eliminated in this case, because the fp op could trap.
-; RUN: opt < %s -simplifycfg -S | grep {= phi double}
+; RUN: opt < %s -simplifycfg -S | grep "= phi double"
 
 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-f80:128:128"
 target triple = "i686-apple-darwin8"

Modified: llvm/trunk/test/Transforms/SimplifyCFG/2008-05-16-PHIBlockMerge.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2008-05-16-PHIBlockMerge.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyCFG/2008-05-16-PHIBlockMerge.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyCFG/2008-05-16-PHIBlockMerge.ll Mon Jul  2 07:47:22 2012
@@ -1,6 +1,6 @@
 ; RUN: opt < %s -simplifycfg -S > %t
-; RUN: not grep {^BB.tomerge} %t
-; RUN: grep {^BB.nomerge} %t | count 2
+; RUN: not grep "^BB.tomerge" %t
+; RUN: grep "^BB.nomerge" %t | count 2
 
 ; ModuleID = '<stdin>' 
 declare i1 @foo()

Modified: llvm/trunk/test/Transforms/SimplifyCFG/2008-07-13-InfLoopMiscompile.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2008-07-13-InfLoopMiscompile.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyCFG/2008-07-13-InfLoopMiscompile.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyCFG/2008-07-13-InfLoopMiscompile.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -simplifycfg -S | grep {%outval = phi i32 .*mux}
+; RUN: opt < %s -simplifycfg -S | grep "%outval = phi i32 .*mux"
 ; PR2540
 ; Outval should end up with a select from 0/2, not all constants.
 

Modified: llvm/trunk/test/Transforms/SimplifyCFG/duplicate-phis.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/duplicate-phis.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyCFG/duplicate-phis.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyCFG/duplicate-phis.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -instcombine -simplifycfg -S | grep { = phi } | count 1
+; RUN: opt < %s -instcombine -simplifycfg -S | grep " = phi " | count 1
 
 ; instcombine should sort the PHI operands so that simplifycfg can see the
 ; duplicate and remove it.

Modified: llvm/trunk/test/Transforms/SimplifyLibCalls/2007-04-06-strchr-miscompile.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyLibCalls/2007-04-06-strchr-miscompile.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyLibCalls/2007-04-06-strchr-miscompile.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyLibCalls/2007-04-06-strchr-miscompile.ll Mon Jul  2 07:47:22 2012
@@ -1,8 +1,8 @@
 ; PR1307
 ; RUN: opt < %s -simplify-libcalls -instcombine -S > %t
-; RUN: grep {@str,.*i64 3} %t
-; RUN: grep {@str1,.*i64 7} %t
-; RUN: grep {ret i8.*null} %t
+; RUN: grep "@str,.*i64 3" %t
+; RUN: grep "@str1,.*i64 7" %t
+; RUN: grep "ret i8.*null" %t
 ; END.
 
 @str = internal constant [5 x i8] c"foog\00"

Modified: llvm/trunk/test/Transforms/SimplifyLibCalls/2009-05-30-memcmp-byte.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyLibCalls/2009-05-30-memcmp-byte.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyLibCalls/2009-05-30-memcmp-byte.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyLibCalls/2009-05-30-memcmp-byte.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -simplify-libcalls -instcombine -S | grep {ret i32 -65}
+; RUN: opt < %s -simplify-libcalls -instcombine -S | grep "ret i32 -65"
 ; PR4284
 
 define i32 @test() nounwind {

Modified: llvm/trunk/test/Transforms/SimplifyLibCalls/StrCat.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyLibCalls/StrCat.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyLibCalls/StrCat.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyLibCalls/StrCat.ll Mon Jul  2 07:47:22 2012
@@ -1,9 +1,9 @@
 ; Test that the StrCatOptimizer works correctly
 ; PR3661
 ; RUN: opt < %s -simplify-libcalls -S | \
-; RUN:   not grep {call.*strcat}
+; RUN:   not grep "call.*strcat"
 ; RUN: opt < %s -simplify-libcalls -S | \
-; RUN:   grep {puts.*%arg1}
+; RUN:   grep "puts.*%arg1"
 
 ; This transformation requires the pointer size, as it assumes that size_t is
 ; the size of a pointer.

Modified: llvm/trunk/test/Transforms/SimplifyLibCalls/StrNCat.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyLibCalls/StrNCat.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyLibCalls/StrNCat.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyLibCalls/StrNCat.ll Mon Jul  2 07:47:22 2012
@@ -1,8 +1,8 @@
 ; Test that the StrNCatOptimizer works correctly
 ; RUN: opt < %s -simplify-libcalls -S | \
-; RUN:   not grep {call.*strncat}
+; RUN:   not grep "call.*strncat"
 ; RUN: opt < %s -simplify-libcalls -S | \
-; RUN:   grep {puts.*%arg1}
+; RUN:   grep "puts.*%arg1"
 
 ; This transformation requires the pointer size, as it assumes that size_t is
 ; the size of a pointer.

Modified: llvm/trunk/test/Transforms/SimplifyLibCalls/abs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyLibCalls/abs.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyLibCalls/abs.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyLibCalls/abs.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -simplify-libcalls -S | grep {select i1 %ispos}
+; RUN: opt < %s -simplify-libcalls -S | grep "select i1 %ispos"
 ; PR2337
 
 define i32 @test(i32 %x) {

Modified: llvm/trunk/test/Transforms/SimplifyLibCalls/exp2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyLibCalls/exp2.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyLibCalls/exp2.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyLibCalls/exp2.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -simplify-libcalls -S | grep {call.*ldexp} | count 4
+; RUN: opt < %s -simplify-libcalls -S | grep "call.*ldexp" | count 4
 ; rdar://5852514
 
 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-f80:128:128"

Modified: llvm/trunk/test/Transforms/SimplifyLibCalls/memmove.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyLibCalls/memmove.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyLibCalls/memmove.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyLibCalls/memmove.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -simplify-libcalls -S | grep {llvm.memmove}
+; RUN: opt < %s -simplify-libcalls -S | grep "llvm.memmove"
 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-f80:32:32"
 target triple = "i686-pc-linux-gnu"
 

Modified: llvm/trunk/test/Transforms/SimplifyLibCalls/memset-64.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyLibCalls/memset-64.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyLibCalls/memset-64.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyLibCalls/memset-64.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -simplify-libcalls -S | grep {llvm.memset}
+; RUN: opt < %s -simplify-libcalls -S | grep "llvm.memset"
 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"
 target triple = "x86_64-pc-linux-gnu"
 

Modified: llvm/trunk/test/Transforms/SimplifyLibCalls/memset.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyLibCalls/memset.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/SimplifyLibCalls/memset.ll (original)
+++ llvm/trunk/test/Transforms/SimplifyLibCalls/memset.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: opt < %s -simplify-libcalls -S | grep {llvm.memset}
+; RUN: opt < %s -simplify-libcalls -S | grep "llvm.memset"
 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-f80:32:32"
 target triple = "i686-pc-linux-gnu"
 

Modified: llvm/trunk/test/Transforms/TailCallElim/ackermann.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/TailCallElim/ackermann.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/TailCallElim/ackermann.ll (original)
+++ llvm/trunk/test/Transforms/TailCallElim/ackermann.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; This function contains two tail calls, which should be eliminated
-; RUN: opt < %s -tailcallelim -stats -disable-output |& grep {2 tailcallelim}
+; RUN: opt < %s -tailcallelim -stats -disable-output |& grep "2 tailcallelim"
 
 define i32 @Ack(i32 %M.1, i32 %N.1) {
 entry:

Modified: llvm/trunk/test/Transforms/TailCallElim/dont-tce-tail-marked-call.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/TailCallElim/dont-tce-tail-marked-call.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/TailCallElim/dont-tce-tail-marked-call.ll (original)
+++ llvm/trunk/test/Transforms/TailCallElim/dont-tce-tail-marked-call.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -tailcallelim -S | \
-; RUN:    grep {call i32 @foo}
+; RUN:    grep "call i32 @foo"
 
 declare void @bar(i32*)
 

Modified: llvm/trunk/test/Transforms/TailCallElim/dup_tail.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/TailCallElim/dup_tail.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/TailCallElim/dup_tail.ll (original)
+++ llvm/trunk/test/Transforms/TailCallElim/dup_tail.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; Duplicate the return into if.end to enable TCE.
-; RUN: opt %s -tailcallelim -stats -disable-output |& grep {Number of return duplicated}
+; RUN: opt %s -tailcallelim -stats -disable-output |& grep "Number of return duplicated"
 
 define i32 @fib(i32 %n) nounwind ssp {
 entry:

Modified: llvm/trunk/test/Transforms/TailCallElim/trivial_codegen_tailcall.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/TailCallElim/trivial_codegen_tailcall.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/TailCallElim/trivial_codegen_tailcall.ll (original)
+++ llvm/trunk/test/Transforms/TailCallElim/trivial_codegen_tailcall.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: opt < %s -tailcallelim -S | \
-; RUN:    grep {tail call void @foo}
+; RUN:    grep "tail call void @foo"
 
 
 declare void @foo()

Modified: llvm/trunk/test/Verifier/2002-04-13-RetTypes.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/2002-04-13-RetTypes.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Verifier/2002-04-13-RetTypes.ll (original)
+++ llvm/trunk/test/Verifier/2002-04-13-RetTypes.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep {value doesn't match function result type 'i32'}
+; RUN: not llvm-as < %s |& grep "value doesn't match function result type 'i32'"
 
 ; Verify the the operand type of the ret instructions in a function match the
 ; delcared return type of the function they live in.

Modified: llvm/trunk/test/Verifier/2002-11-05-GetelementptrPointers.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/2002-11-05-GetelementptrPointers.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Verifier/2002-11-05-GetelementptrPointers.ll (original)
+++ llvm/trunk/test/Verifier/2002-11-05-GetelementptrPointers.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep {invalid getelementptr indices}
+; RUN: not llvm-as < %s |& grep "invalid getelementptr indices"
 
 ; This testcase is invalid because we are indexing into a pointer that is 
 ; contained WITHIN a structure.

Modified: llvm/trunk/test/Verifier/2006-12-12-IntrinsicDefine.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/2006-12-12-IntrinsicDefine.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Verifier/2006-12-12-IntrinsicDefine.ll (original)
+++ llvm/trunk/test/Verifier/2006-12-12-IntrinsicDefine.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep {llvm intrinsics cannot be defined}
+; RUN: not llvm-as < %s |& grep "llvm intrinsics cannot be defined"
 ; PR1047
 
 define void @llvm.memcpy.p0i8.p0i8.i32(i8*, i8*, i32, i32, i1) {

Modified: llvm/trunk/test/Verifier/2008-03-01-AllocaSized.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/2008-03-01-AllocaSized.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Verifier/2008-03-01-AllocaSized.ll (original)
+++ llvm/trunk/test/Verifier/2008-03-01-AllocaSized.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: not llvm-as %s -o /dev/null |& grep {Cannot allocate unsized type}
+; RUN: not llvm-as %s -o /dev/null |& grep "Cannot allocate unsized type"
 ; PR2113
 
 define void @test() {

Modified: llvm/trunk/test/Verifier/2008-08-22-MemCpyAlignment.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/2008-08-22-MemCpyAlignment.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Verifier/2008-08-22-MemCpyAlignment.ll (original)
+++ llvm/trunk/test/Verifier/2008-08-22-MemCpyAlignment.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: not llvm-as %s -o /dev/null |& grep {alignment argument of memory intrinsics must be a constant int}
+; RUN: not llvm-as %s -o /dev/null |& grep "alignment argument of memory intrinsics must be a constant int"
 ; PR2318
 
 define void @x(i8* %a, i8* %src, i64 %len, i32 %align) nounwind  {

Modified: llvm/trunk/test/Verifier/2008-11-15-RetVoid.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/2008-11-15-RetVoid.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Verifier/2008-11-15-RetVoid.ll (original)
+++ llvm/trunk/test/Verifier/2008-11-15-RetVoid.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep {value doesn't match function result type 'void'}
+; RUN: not llvm-as < %s |& grep "value doesn't match function result type 'void'"
 
 define void @foo() {
   ret i32 0

Modified: llvm/trunk/test/Verifier/2010-08-07-PointerIntrinsic.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/2010-08-07-PointerIntrinsic.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Verifier/2010-08-07-PointerIntrinsic.ll (original)
+++ llvm/trunk/test/Verifier/2010-08-07-PointerIntrinsic.ll Mon Jul  2 07:47:22 2012
@@ -1,5 +1,5 @@
 ; RUN: not llvm-as < %s 2> %t
-; RUN: grep {Broken module} %t
+; RUN: grep "Broken module" %t
 ; PR7316
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:32"

Modified: llvm/trunk/test/Verifier/AmbiguousPhi.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/AmbiguousPhi.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Verifier/AmbiguousPhi.ll (original)
+++ llvm/trunk/test/Verifier/AmbiguousPhi.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep {multiple entries for the same basic block}
+; RUN: not llvm-as < %s |& grep "multiple entries for the same basic block"
 
 
 

Modified: llvm/trunk/test/Verifier/PhiGrouping.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/PhiGrouping.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Verifier/PhiGrouping.ll (original)
+++ llvm/trunk/test/Verifier/PhiGrouping.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep {PHI nodes not grouped at top}
+; RUN: not llvm-as < %s |& grep "PHI nodes not grouped at top"
 
 
 

Modified: llvm/trunk/test/Verifier/SelfReferential.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/SelfReferential.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Verifier/SelfReferential.ll (original)
+++ llvm/trunk/test/Verifier/SelfReferential.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN: not llvm-as %s -o /dev/null |& grep {Only PHI nodes may reference their own value}
+; RUN: not llvm-as %s -o /dev/null |& grep "Only PHI nodes may reference their own value"
 
 ; Test that self referential instructions are not allowed
 

Modified: llvm/trunk/test/Verifier/aliasing-chain.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/aliasing-chain.ll?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/Verifier/aliasing-chain.ll (original)
+++ llvm/trunk/test/Verifier/aliasing-chain.ll Mon Jul  2 07:47:22 2012
@@ -1,4 +1,4 @@
-; RUN:  not llvm-as %s -o /dev/null |& grep {Aliasing chain should end with function or global variable}
+; RUN:  not llvm-as %s -o /dev/null |& grep "Aliasing chain should end with function or global variable"
 
 ; Test that alising chain does not create a cycle
 

Modified: llvm/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lit.cfg?rev=159525&r1=159524&r2=159525&view=diff
==============================================================================
--- llvm/trunk/test/lit.cfg (original)
+++ llvm/trunk/test/lit.cfg Mon Jul  2 07:47:22 2012
@@ -10,7 +10,9 @@
 config.name = 'LLVM'
 
 # testFormat: The test format to use to interpret tests.
-config.test_format = lit.formats.TclTest()
+execute_external = (sys.platform in ['win32']
+                    or lit.getBashPath() not in [None, ""])
+config.test_format = lit.formats.ShTest(execute_external)
 
 # To ignore test output on stderr so it doesn't trigger failures uncomment this:
 #config.test_format = lit.formats.TclTest(ignoreStdErr=True)





More information about the llvm-commits mailing list