From 7e6b4f7a6dee255e381dd55b39c49fdc5bcb8d10 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Tue, 2 Jan 2007 05:55:05 +0000 Subject: [PATCH] For PR1070: Tweak the RUN: lines of these tests to accommodate the renaming of variables done by llvm-upgrade. The renaming occurs as a result of avoiding name collisons for collapsed type planes. Conflicting names have a .u (unsigned) or .s (signed) suffix added. This patch updates the grep expression to accommodate the new names. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32815 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Assembler/2004-11-28-InvalidTypeCrash.ll | 2 +- test/CodeGen/ARM/constants.ll | 18 +++++++++--------- test/CodeGen/PowerPC/darwin-labels.ll | 2 +- test/Linker/weakextern.ll | 4 ++-- test/Transforms/InstCombine/sub.ll | 3 ++- .../InstCombine/zeroext-and-reduce.ll | 3 ++- .../LCSSA/2006-06-12-MultipleExitsSameBlock.ll | 6 ++++-- test/Transforms/LCSSA/basictest.ll | 6 ++++-- 8 files changed, 25 insertions(+), 19 deletions(-) diff --git a/test/Assembler/2004-11-28-InvalidTypeCrash.ll b/test/Assembler/2004-11-28-InvalidTypeCrash.ll index 1fad05ff444..b6b03c828cc 100644 --- a/test/Assembler/2004-11-28-InvalidTypeCrash.ll +++ b/test/Assembler/2004-11-28-InvalidTypeCrash.ll @@ -1,3 +1,3 @@ -; RUN: (llvm-upgrade < %s | llvm-as -o /dev/null -f) 2>&1 | grep 'Cannot create a' +; RUN: (llvm-upgrade < %s | llvm-as -o /dev/null -f) 2>&1 | grep 'Cannot resolve type' ; Test for PR463. This program is erroneous, but should not crash llvm-as. %.FOO = internal global %struct.none zeroinitializer diff --git a/test/CodeGen/ARM/constants.ll b/test/CodeGen/ARM/constants.ll index 3d7b9a498bf..a329726a4ba 100644 --- a/test/CodeGen/ARM/constants.ll +++ b/test/CodeGen/ARM/constants.ll @@ -1,12 +1,12 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm && -; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #0" | wc -l | grep 1 && -; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #255" | wc -l | grep 1 && -; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #256" | wc -l | grep 1 && -; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep ".word.*257" | wc -l | grep 1 && -; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #-1073741761" | wc -l | grep 1 && -; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "mov r0, #1008" | wc -l | grep 1 && -; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "cmp r0, #65536" | wc -l | grep 1 && -; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm | grep "\.comm.*a,4,4" | wc -l | grep 1 +; RUN: llvm-upgrade < %s | llvm-as | llc -march=arm -o %t.s -f && +; RUN: grep "mov r0, #0" %t.s | wc -l | grep 1 && +; RUN: grep "mov r0, #255" %t.s | wc -l | grep 1 && +; RUN: grep "mov r0, #256" %t.s | wc -l | grep 1 && +; RUN: grep ".word.*257" %t.s | wc -l | grep 1 && +; RUN: grep "mov r0, #-1073741761" %t.s | wc -l | grep 1 && +; RUN: grep "mov r0, #1008" %t.s | wc -l | grep 1 && +; RUN: grep "cmp r0, #65536" %t.s | wc -l | grep 1 && +; RUN: grep "\.comm.*a.s,4,4" %t.s | wc -l | grep 1 %a = internal global int 0 diff --git a/test/CodeGen/PowerPC/darwin-labels.ll b/test/CodeGen/PowerPC/darwin-labels.ll index 8178c8401c8..c690d196a07 100644 --- a/test/CodeGen/PowerPC/darwin-labels.ll +++ b/test/CodeGen/PowerPC/darwin-labels.ll @@ -1,4 +1,4 @@ -; RUN: llvm-upgrade < %s | llvm-as | llc | grep 'foo bar":' +; RUN: llvm-upgrade < %s | llvm-as | llc | grep 'foo bar.s":' target endian = big target pointersize = 32 diff --git a/test/Linker/weakextern.ll b/test/Linker/weakextern.ll index 3bda535d0ca..f4401811c96 100644 --- a/test/Linker/weakextern.ll +++ b/test/Linker/weakextern.ll @@ -2,8 +2,8 @@ ; RUN: llvm-upgrade < `dirname %s`/testlink1.ll | llvm-as > %t2.bc ; RUN: llvm-link %t.bc %t.bc %t2.bc -o %t1.bc -f ; 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 "MyVar.s = external global i32" && +; RUN: llvm-dis < %t1.bc | grep "Inte.s = global i32" %kallsyms_names = extern_weak global [0 x ubyte] %MyVar = extern_weak global int diff --git a/test/Transforms/InstCombine/sub.ll b/test/Transforms/InstCombine/sub.ll index ebc1a6d9e2e..be38da97e1d 100644 --- a/test/Transforms/InstCombine/sub.ll +++ b/test/Transforms/InstCombine/sub.ll @@ -1,7 +1,8 @@ ; This test makes sure that these instructions are properly eliminated. ; -; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep -v 'sub i32 %Cok, %Bok' | not grep sub +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \ +; RUN: grep -v 'sub i32 %Cok.s, %Bok.s' | not grep sub implementation diff --git a/test/Transforms/InstCombine/zeroext-and-reduce.ll b/test/Transforms/InstCombine/zeroext-and-reduce.ll index 2d30f910dcd..e171f3aacb0 100644 --- a/test/Transforms/InstCombine/zeroext-and-reduce.ll +++ b/test/Transforms/InstCombine/zeroext-and-reduce.ll @@ -1,4 +1,5 @@ -; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'and i32 %Y, 8' +; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \ +; RUN: grep 'and i32 %Y.s, 8' int %test1(ubyte %X) { %Y = cast ubyte %X to int diff --git a/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll b/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll index e694ecf1ded..e88660a1fb9 100644 --- a/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll +++ b/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll @@ -1,5 +1,7 @@ -; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%X.1.lcssa" && -; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | not grep "%X.1.lcssa1" +; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \ +; RUN: grep "%X.1.s.lcssa" && +; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \ +; RUN: not grep "%X.1.s.lcssa1" declare bool %c1() declare bool %c2() diff --git a/test/Transforms/LCSSA/basictest.ll b/test/Transforms/LCSSA/basictest.ll index 7d12aee7396..92f754a157c 100644 --- a/test/Transforms/LCSSA/basictest.ll +++ b/test/Transforms/LCSSA/basictest.ll @@ -1,5 +1,7 @@ -; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "X3.lcssa = phi i32" && -; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | grep "%X4 = add i32 3, %X3.lcssa" +; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \ +; RUN: grep "X3.s.lcssa = phi i32" && +; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \ +; RUN: grep "%X4.s = add i32 3, %X3.s.lcssa" void %lcssa(bool %S2) { entry: