Author: tbrethou Date: Mon Feb 18 19:44:26 2008 New Revision: 47297 URL: http://llvm.org/viewvc/llvm-project?rev=47297&view=rev Log: Remove llvm-upgrade and update tests.
Modified: llvm/trunk/test/Other/2002-01-31-CallGraph.ll llvm/trunk/test/Other/2002-02-24-InlineBrokePHINodes.ll llvm/trunk/test/Other/2002-03-11-ConstPropCrash.ll llvm/trunk/test/Other/2003-02-19-LoopInfoNestingBug.ll llvm/trunk/test/Other/2004-08-16-LowerPacked.ll llvm/trunk/test/Other/2004-08-16-PackedConstantInlineStore.ll llvm/trunk/test/Other/2004-08-16-PackedGlobalConstant.ll llvm/trunk/test/Other/2004-08-16-PackedSelect.ll llvm/trunk/test/Other/2004-08-16-PackedSimple.ll llvm/trunk/test/Other/2004-08-20-PackedControlFlow.ll llvm/trunk/test/Other/2007-04-24-eliminate-mostly-empty-blocks.ll Modified: llvm/trunk/test/Other/2002-01-31-CallGraph.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/2002-01-31-CallGraph.ll?rev=47297&r1=47296&r2=47297&view=diff ============================================================================== --- llvm/trunk/test/Other/2002-01-31-CallGraph.ll (original) +++ llvm/trunk/test/Other/2002-01-31-CallGraph.ll Mon Feb 18 19:44:26 2008 @@ -1,15 +1,13 @@ ; Call graph construction crash: Not handling indirect calls right ; -; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -callgraph +; RUN: llvm-as < %s | opt -analyze -callgraph ; -%FunTy = type int(int) + %FunTy = type i32 (i32) -implementation +define void @invoke(%FunTy* %x) { + %foo = call i32 %x( i32 123 ) ; <i32> [#uses=0] + ret void +} -void "invoke"(%FunTy *%x) -begin - %foo = call %FunTy* %x(int 123) - ret void -end Modified: llvm/trunk/test/Other/2002-02-24-InlineBrokePHINodes.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/2002-02-24-InlineBrokePHINodes.ll?rev=47297&r1=47296&r2=47297&view=diff ============================================================================== --- llvm/trunk/test/Other/2002-02-24-InlineBrokePHINodes.ll (original) +++ llvm/trunk/test/Other/2002-02-24-InlineBrokePHINodes.ll Mon Feb 18 19:44:26 2008 @@ -1,26 +1,23 @@ -; Inlining used to break PHI nodes. This tests that they are correctly updated +; Inlining used to break PHI nodes. This tests that they are correctly updated ; when a node is split around the call instruction. The verifier caught the error. ; -; RUN: llvm-upgrade < %s | llvm-as | opt -inline +; RUN: llvm-as < %s | opt -inline ; -implementation -ulong "test"(ulong %X) -begin - ret ulong %X -end +define i64 @test(i64 %X) { + ret i64 %X +} -ulong "fib"(ulong %n) -begin - %T = setlt ulong %n, 2 ; {bool}:0 - br bool %T, label %BaseCase, label %RecurseCase +define i64 @fib(i64 %n) { +; <label>:0 + %T = icmp ult i64 %n, 2 ; <i1> [#uses=1] + br i1 %T, label %BaseCase, label %RecurseCase -RecurseCase: - %result = call ulong %test(ulong %n) - br label %BaseCase - -BaseCase: - %X = phi ulong [1, %0], [2, %RecurseCase] - ret ulong %X -end +RecurseCase: ; preds = %0 + %result = call i64 @test( i64 %n ) ; <i64> [#uses=0] + br label %BaseCase +BaseCase: ; preds = %RecurseCase, %0 + %X = phi i64 [ 1, %0 ], [ 2, %RecurseCase ] ; <i64> [#uses=1] + ret i64 %X +} Modified: llvm/trunk/test/Other/2002-03-11-ConstPropCrash.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/2002-03-11-ConstPropCrash.ll?rev=47297&r1=47296&r2=47297&view=diff ============================================================================== --- llvm/trunk/test/Other/2002-03-11-ConstPropCrash.ll (original) +++ llvm/trunk/test/Other/2002-03-11-ConstPropCrash.ll Mon Feb 18 19:44:26 2008 @@ -5,21 +5,20 @@ ; ; Fixed by adding new arguments to ConstantFoldTerminator ; -; RUN: llvm-upgrade < %s | llvm-as | opt -constprop +; RUN: llvm-as < %s | opt -constprop -implementation +define void @build_tree(i32 %ml) { +; <label>:0 + br label %bb2 -void "build_tree"(int %ml) -begin - br label %bb2 +bb2: ; preds = %bb2, %0 + %reg137 = phi i32 [ %reg140, %bb2 ], [ 12, %0 ] ; <i32> [#uses=1] + %reg138 = phi i32 [ %reg139, %bb2 ], [ 0, %0 ] ; <i32> [#uses=1] + %reg139 = add i32 %reg138, 1 ; <i32> [#uses=1] + %reg140 = add i32 %reg137, -1 ; <i32> [#uses=1] + br i1 false, label %bb2, label %bb3 -bb2: - %reg137 = phi int [ %reg140, %bb2 ], [ 12, %0 ] ; <int> [#uses=2] - %reg138 = phi uint [ %reg139, %bb2 ], [ 0, %0 ] ; <uint> [#uses=3] - %reg139 = add uint %reg138, 1 ; <uint> [#uses=1] - %reg140 = add int %reg137, -1 ; <int> [#uses=1] - br bool false, label %bb2, label %bb3 +bb3: ; preds = %bb2 + ret void +} -bb3: - ret void -end 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=47297&r1=47296&r2=47297&view=diff ============================================================================== --- llvm/trunk/test/Other/2003-02-19-LoopInfoNestingBug.ll (original) +++ llvm/trunk/test/Other/2003-02-19-LoopInfoNestingBug.ll Mon Feb 18 19:44:26 2008 @@ -2,27 +2,28 @@ ; figure out that loop "Inner" should be nested inside of leep "LoopHeader", ; and instead nests it just inside loop "Top" ; -; RUN: llvm-upgrade < %s | llvm-as | opt -analyze -loops | \ +; RUN: llvm-as < %s | opt -analyze -loops | \ ; RUN: grep { Loop Containing:\[ \]*%Inner} ; +define void @test() { + br label %Top -implementation +Top: ; preds = %Out, %0 + br label %LoopHeader -void %test() { - br label %Top -Top: - br label %LoopHeader -Next: - br bool false, label %Inner, label %Out -Inner: - br bool false, label %Inner, label %LoopHeader +Next: ; preds = %LoopHeader + br i1 false, label %Inner, label %Out -LoopHeader: - br label %Next +Inner: ; preds = %Inner, %Next + br i1 false, label %Inner, label %LoopHeader -Out: - br bool false, label %Top, label %Done +LoopHeader: ; preds = %Inner, %Top + br label %Next -Done: - ret void +Out: ; preds = %Next + br i1 false, label %Top, label %Done + +Done: ; preds = %Out + ret void } + Modified: llvm/trunk/test/Other/2004-08-16-LowerPacked.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/2004-08-16-LowerPacked.ll?rev=47297&r1=47296&r2=47297&view=diff ============================================================================== --- llvm/trunk/test/Other/2004-08-16-LowerPacked.ll (original) +++ llvm/trunk/test/Other/2004-08-16-LowerPacked.ll Mon Feb 18 19:44:26 2008 @@ -1,20 +1,16 @@ -; RUN: llvm-upgrade < %s | llvm-as | opt -lower-packed | llvm-dis +; RUN: llvm-as < %s | opt -lower-packed | llvm-dis [EMAIL PROTECTED] = external global <2 x i32> ; <<2 x i32>*> [#uses=2] [EMAIL PROTECTED] = external global <2 x i32> ; <<2 x i32>*> [#uses=1] -%foo = uninitialized global <2 x int>; -%bar = uninitialized global <2 x int>; - -implementation ; Functions: - -void %main() -{ - %t0 = load <2 x int>* %foo - %t2 = add <2 x int> %t0, %t0 - %t3 = select bool false, <2 x int> %t0, <2 x int> %t2 - store <2 x int> %t3, <2 x int>* %bar - - %c0 = add <2 x int> <int 1, int 1>, %t0 - %c1 = add <2 x int> %t0, <int 0, int 0> - %c2 = select bool true, <2 x int> <int 1, int 1>, <2 x int> %t0 - store <2 x int> <int 4, int 4>, <2 x int>* %foo - ret void +define void @main() { + %t0 = load <2 x i32>* @foo ; <<2 x i32>> [#uses=6] + %t2 = add <2 x i32> %t0, %t0 ; <<2 x i32>> [#uses=1] + %t3 = select i1 false, <2 x i32> %t0, <2 x i32> %t2 ; <<2 x i32>> [#uses=1] + store <2 x i32> %t3, <2 x i32>* @bar + %c0 = add <2 x i32> < i32 1, i32 1 >, %t0 ; <<2 x i32>> [#uses=0] + %c1 = add <2 x i32> %t0, zeroinitializer ; <<2 x i32>> [#uses=0] + %c2 = select i1 true, <2 x i32> < i32 1, i32 1 >, <2 x i32> %t0 ; <<2 x i32>> [#uses=0] + store <2 x i32> < i32 4, i32 4 >, <2 x i32>* @foo + ret void } + Modified: llvm/trunk/test/Other/2004-08-16-PackedConstantInlineStore.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/2004-08-16-PackedConstantInlineStore.ll?rev=47297&r1=47296&r2=47297&view=diff ============================================================================== --- llvm/trunk/test/Other/2004-08-16-PackedConstantInlineStore.ll (original) +++ llvm/trunk/test/Other/2004-08-16-PackedConstantInlineStore.ll Mon Feb 18 19:44:26 2008 @@ -1,11 +1,8 @@ -; RUN: llvm-upgrade < %s | llvm-as | llvm-dis +; RUN: llvm-as < %s | llvm-dis [EMAIL PROTECTED] = external global <2 x i32> ; <<2 x i32>*> [#uses=1] -%bar = external global <2 x int> ; <<2 x int>*> [#uses=1] - -implementation ; Functions: - -void %main() -{ - store <2 x int> < int 0, int 1 >, <2 x int>* %bar - ret void +define void @main() { + store <2 x i32> < i32 0, i32 1 >, <2 x i32>* @bar + ret void } + Modified: llvm/trunk/test/Other/2004-08-16-PackedGlobalConstant.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/2004-08-16-PackedGlobalConstant.ll?rev=47297&r1=47296&r2=47297&view=diff ============================================================================== --- llvm/trunk/test/Other/2004-08-16-PackedGlobalConstant.ll (original) +++ llvm/trunk/test/Other/2004-08-16-PackedGlobalConstant.ll Mon Feb 18 19:44:26 2008 @@ -1,13 +1,11 @@ -; RUN: llvm-upgrade < %s | llvm-as | llvm-dis +; RUN: llvm-as < %s | llvm-dis -%foo = global <2 x int> <int 0, int 1>; -%bar = uninitialized global <2 x int>; [EMAIL PROTECTED] = global <2 x i32> < i32 0, i32 1 > ; <<2 x i32>*> [#uses=1] [EMAIL PROTECTED] = external global <2 x i32> ; <<2 x i32>*> [#uses=1] -implementation ; Functions: - -void %main() -{ - %t0 = load <2 x int>* %foo; - store <2 x int> %t0, <2 x int>* %bar - ret void +define void @main() { + %t0 = load <2 x i32>* @foo ; <<2 x i32>> [#uses=1] + store <2 x i32> %t0, <2 x i32>* @bar + ret void } + Modified: llvm/trunk/test/Other/2004-08-16-PackedSelect.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/2004-08-16-PackedSelect.ll?rev=47297&r1=47296&r2=47297&view=diff ============================================================================== --- llvm/trunk/test/Other/2004-08-16-PackedSelect.ll (original) +++ llvm/trunk/test/Other/2004-08-16-PackedSelect.ll Mon Feb 18 19:44:26 2008 @@ -1,15 +1,13 @@ -; RUN: llvm-upgrade < %s | llvm-as | llvm-dis +; RUN: llvm-as < %s | llvm-dis -%foo = uninitialized global <4 x float>; -%bar = uninitialized global <4 x float>; [EMAIL PROTECTED] = external global <4 x float> ; <<4 x float>*> [#uses=1] [EMAIL PROTECTED] = external global <4 x float> ; <<4 x float>*> [#uses=1] -implementation ; Functions: - -void %main() -{ - %t0 = load <4 x float>* %foo - %t1 = add <4 x float> %t0, %t0 - %t2 = select bool true, <4 x float> %t0, <4 x float> %t1 - store <4 x float> %t2, <4 x float>* %bar - ret void +define void @main() { + %t0 = load <4 x float>* @foo ; <<4 x float>> [#uses=3] + %t1 = add <4 x float> %t0, %t0 ; <<4 x float>> [#uses=1] + %t2 = select i1 true, <4 x float> %t0, <4 x float> %t1 ; <<4 x float>> [#uses=1] + store <4 x float> %t2, <4 x float>* @bar + ret void } + Modified: llvm/trunk/test/Other/2004-08-16-PackedSimple.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/2004-08-16-PackedSimple.ll?rev=47297&r1=47296&r2=47297&view=diff ============================================================================== --- llvm/trunk/test/Other/2004-08-16-PackedSimple.ll (original) +++ llvm/trunk/test/Other/2004-08-16-PackedSimple.ll Mon Feb 18 19:44:26 2008 @@ -1,15 +1,13 @@ -; RUN: llvm-upgrade < %s | llvm-as | llvm-dis +; RUN: llvm-as < %s | llvm-dis -%foo = uninitialized global <4 x float>; -%bar = uninitialized global <4 x float>; [EMAIL PROTECTED] = external global <4 x float> ; <<4 x float>*> [#uses=1] [EMAIL PROTECTED] = external global <4 x float> ; <<4 x float>*> [#uses=1] -implementation ; Functions: - -void %main() -{ - %t0 = load <4 x float>* %foo - %t2 = add <4 x float> %t0, %t0 - %t3 = select bool false, <4 x float> %t0, <4 x float> %t2 - store <4 x float> %t3, <4 x float>* %bar - ret void +define void @main() { + %t0 = load <4 x float>* @foo ; <<4 x float>> [#uses=3] + %t2 = add <4 x float> %t0, %t0 ; <<4 x float>> [#uses=1] + %t3 = select i1 false, <4 x float> %t0, <4 x float> %t2 ; <<4 x float>> [#uses=1] + store <4 x float> %t3, <4 x float>* @bar + ret void } + Modified: llvm/trunk/test/Other/2004-08-20-PackedControlFlow.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/2004-08-20-PackedControlFlow.ll?rev=47297&r1=47296&r2=47297&view=diff ============================================================================== --- llvm/trunk/test/Other/2004-08-20-PackedControlFlow.ll (original) +++ llvm/trunk/test/Other/2004-08-20-PackedControlFlow.ll Mon Feb 18 19:44:26 2008 @@ -1,23 +1,22 @@ -; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | llvm-as > /dev/null +; RUN: llvm-as < %s | llvm-dis | llvm-as > /dev/null -%v4f = type <4 x float> - -%foo = uninitialized global %v4f -%bar = uninitialized global %v4f - -implementation ; Functions: - -void %main() { - br label %A -C: - store %v4f %t2, %v4f* %bar - ret void - -B: - %t2 = add %v4f %t0, %t0 - br label %C - -A: - %t0 = load %v4f* %foo - br label %B + %v4f = type <4 x float> [EMAIL PROTECTED] = external global %v4f ; <%v4f*> [#uses=1] [EMAIL PROTECTED] = external global %v4f ; <%v4f*> [#uses=1] + +define void @main() { + br label %A + +C: ; preds = %B + store %v4f %t2, %v4f* @bar + ret void + +B: ; preds = %A + %t2 = add %v4f %t0, %t0 ; <%v4f> [#uses=1] + br label %C + +A: ; preds = %0 + %t0 = load %v4f* @foo ; <%v4f> [#uses=2] + br label %B } + Modified: llvm/trunk/test/Other/2007-04-24-eliminate-mostly-empty-blocks.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/2007-04-24-eliminate-mostly-empty-blocks.ll?rev=47297&r1=47296&r2=47297&view=diff ============================================================================== --- llvm/trunk/test/Other/2007-04-24-eliminate-mostly-empty-blocks.ll (original) +++ llvm/trunk/test/Other/2007-04-24-eliminate-mostly-empty-blocks.ll Mon Feb 18 19:44:26 2008 @@ -1,6 +1,6 @@ -;RUN: llvm-upgrade < %s | llvm-as | opt -codegenprepare -disable-output +;RUN: llvm-as < %s | opt -codegenprepare -disable-output -void @foo() { +define void @foo() { entry: br i1 false, label %cond_next31, label %cond_true _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits