From b6634e9e27ad2f56039ffa31c6b651edd623156c Mon Sep 17 00:00:00 2001 From: Owen Anderson Date: Tue, 5 Aug 2008 18:19:14 +0000 Subject: [PATCH] Update the remaining tests not to use -disable-correct-folding, and remove two that couldn't be updated. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@54359 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/CodeGen/X86/2007-07-25-EpilogueBug.ll | 58 ------------------- test/CodeGen/X86/2008-04-17-CoalescerBug.ll | 2 +- test/CodeGen/X86/2008-05-06-SpillerBug.ll | 8 ++- test/CodeGen/X86/2008-05-21-CoalescerBug.ll | 7 ++- .../X86/2008-06-13-SpillerCommuting.ll | 42 -------------- test/CodeGen/X86/ins_subreg_coalesce-3.ll | 16 ++--- 6 files changed, 18 insertions(+), 115 deletions(-) delete mode 100644 test/CodeGen/X86/2007-07-25-EpilogueBug.ll delete mode 100644 test/CodeGen/X86/2008-06-13-SpillerCommuting.ll diff --git a/test/CodeGen/X86/2007-07-25-EpilogueBug.ll b/test/CodeGen/X86/2007-07-25-EpilogueBug.ll deleted file mode 100644 index 64890ef4acc..00000000000 --- a/test/CodeGen/X86/2007-07-25-EpilogueBug.ll +++ /dev/null @@ -1,58 +0,0 @@ -; Verify that the addl comes before any popl. - -; RUN: llvm-as < %s | llc -mtriple=i686-pc-linux-gnu -disable-correct-folding -mcpu=i386 | \ -; RUN: %prcontext ret 1 | grep popl -; PR1573 - - %struct.c34006f__TsB = type { i8, i32, i32, %struct.c34006f__TsB___b___XVN } - %struct.c34006f__TsB___b___XVN = type { %struct.c34006f__TsB___b___XVN___O } - %struct.c34006f__TsB___b___XVN___O = type { float } - -define fastcc i8 @c34006f__pkg__parentEQ.213(%struct.c34006f__TsB* %x, %struct.c34006f__TsB* %y) zeroext { -entry: - %tmp190 = icmp eq i8 0, 0 ; [#uses=1] - %tmp207 = icmp eq i32 0, 0 ; [#uses=1] - %bothcond = and i1 %tmp190, %tmp207 ; [#uses=1] - %tmp224 = icmp eq i32 0, 0 ; [#uses=1] - %bothcond1 = and i1 %bothcond, %tmp224 ; [#uses=1] - br i1 %bothcond1, label %cond_next229, label %UnifiedReturnBlock - -cond_next229: ; preds = %entry - %tmp234 = icmp eq i8 0, 0 ; [#uses=1] - br i1 %tmp234, label %cond_false391, label %cond_true237 - -cond_true237: ; preds = %cond_next229 - %tmp268 = icmp sgt i32 0, -1 ; [#uses=2] - %max269 = select i1 %tmp268, i32 0, i32 0 ; [#uses=1] - %tmp305.op = add i32 0, -1 ; [#uses=1] - br i1 false, label %bb328, label %cond_next315 - -cond_next315: ; preds = %cond_true237 - ret i8 0 - -bb328: ; preds = %cond_true237 - %tmp337 = select i1 %tmp268, i32 %tmp305.op, i32 -1 ; [#uses=1] - %tmp347 = icmp eq i32 %tmp337, 0 ; [#uses=1] - br i1 %tmp347, label %cond_next351, label %UnifiedReturnBlock - -cond_next351: ; preds = %bb328 - %tmp354 = getelementptr %struct.c34006f__TsB* %y, i32 0, i32 3 ; <%struct.c34006f__TsB___b___XVN*> [#uses=1] - %tmp354355 = bitcast %struct.c34006f__TsB___b___XVN* %tmp354 to i8* ; [#uses=1] - %tmp358 = getelementptr %struct.c34006f__TsB* %x, i32 0, i32 3 ; <%struct.c34006f__TsB___b___XVN*> [#uses=1] - %tmp358359 = bitcast %struct.c34006f__TsB___b___XVN* %tmp358 to i8* ; [#uses=1] - %tmp360 = tail call i32 (i8*, i8*, i32, ...)* @memcmp( i8* %tmp358359, i8* %tmp354355, i32 %max269 ) ; [#uses=0] - ret i8 0 - -cond_false391: ; preds = %cond_next229 - %tmp1 = getelementptr %struct.c34006f__TsB* %y, i32 0, i32 3, i32 0, i32 0 - %tmp2 = load float* %tmp1 - %tmp400 = fcmp une float %tmp2, 0.000000e+00 ; [#uses=1] - %not.tmp400 = xor i1 %tmp400, true ; [#uses=1] - %retval = zext i1 %not.tmp400 to i8 ; [#uses=1] - ret i8 %retval - -UnifiedReturnBlock: ; preds = %bb328, %entry - ret i8 0 -} - -declare i32 @memcmp(i8*, i8*, i32, ...) diff --git a/test/CodeGen/X86/2008-04-17-CoalescerBug.ll b/test/CodeGen/X86/2008-04-17-CoalescerBug.ll index 47dd4117253..c69ff332c2c 100644 --- a/test/CodeGen/X86/2008-04-17-CoalescerBug.ll +++ b/test/CodeGen/X86/2008-04-17-CoalescerBug.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin -disable-correct-folding | grep xorl | grep {%e} +; RUN: llvm-as < %s | llc -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* } diff --git a/test/CodeGen/X86/2008-05-06-SpillerBug.ll b/test/CodeGen/X86/2008-05-06-SpillerBug.ll index 19e8ca8159c..e13f398062e 100644 --- a/test/CodeGen/X86/2008-05-06-SpillerBug.ll +++ b/test/CodeGen/X86/2008-05-06-SpillerBug.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin -relocation-model=pic -disable-fp-elim -disable-correct-folding | grep addb | grep ebp +; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin -relocation-model=pic -disable-fp-elim | grep addb | grep ebp %struct.rc4_state = type { i32, i32, [256 x i32] } @.str1 = internal constant [65 x i8] c"m[%d] = 0x%02x, m[%d] = 0x%02x, 0x%02x, k = %d, key[k] = 0x%02x\0A\00" ; <[65 x i8]*> [#uses=1] @@ -11,10 +11,12 @@ entry: br label %bb25 bb25: ; preds = %bb25, %entry - br i1 false, label %bb.i, label %bb25 + %foo = phi i1 [ 0, %bb25], [ 1, %entry] + br i1 %foo, label %bb.i, label %bb25 bb.i: ; preds = %bb.i, %bb25 - br i1 false, label %bb21.i, label %bb.i + %foo2 = phi i1 [ 0, %bb.i], [1, %bb25] + br i1 %foo2, label %bb21.i, label %bb.i bb21.i: ; preds = %bb21.i, %bb.i %k.0.reg2mem.0.i = phi i32 [ %k.1.i, %bb21.i ], [ 0, %bb.i ] ; [#uses=2] diff --git a/test/CodeGen/X86/2008-05-21-CoalescerBug.ll b/test/CodeGen/X86/2008-05-21-CoalescerBug.ll index 62a33304fe1..7b794093a6b 100644 --- a/test/CodeGen/X86/2008-05-21-CoalescerBug.ll +++ b/test/CodeGen/X86/2008-05-21-CoalescerBug.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86 -fast -disable-correct-folding | grep mov | count 4 +; RUN: llvm-as < %s | llc -march=x86 -fast | grep mov | count 5 ; PR2343 %llvm.dbg.anchor.type = type { i32, i32 } @@ -80,10 +80,11 @@ bb483: ; preds = %bb497 bb497: ; preds = %bb483, %entry %cases.0 = phi %struct.tree_node* [ %tmp496, %bb483 ], [ null, %entry ] ; <%struct.tree_node*> [#uses=1] %last.0 = phi %struct.tree_node* [ %cases.0, %bb483 ], [ undef, %entry ] ; <%struct.tree_node*> [#uses=1] - br i1 false, label %bb483, label %bb502 + %foo = phi i1 [ 0, %bb483 ], [ 1, %entry ] + br i1 %foo, label %bb483, label %bb502 bb502: ; preds = %bb497 - br i1 false, label %bb507, label %bb841 + br i1 %foo, label %bb507, label %bb841 bb507: ; preds = %bb502 %tmp517 = getelementptr %struct.tree_node* %last.0, i32 0, i32 0 ; <%struct.tree_function_decl*> [#uses=1] diff --git a/test/CodeGen/X86/2008-06-13-SpillerCommuting.ll b/test/CodeGen/X86/2008-06-13-SpillerCommuting.ll deleted file mode 100644 index 6e4523aef4d..00000000000 --- a/test/CodeGen/X86/2008-06-13-SpillerCommuting.ll +++ /dev/null @@ -1,42 +0,0 @@ -; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin -relocation-model=pic -disable-correct-folding -stats |& grep {spiller - Number of instructions commuted} - - %struct.CABAC_context_element = type { i8, i8 } - %struct.MB_Info_CABAC = type { i8, i8, [2 x i8], i8, i8, i8, i16, i16, [4 x i8], [8 x %struct.MotionVector] } - %struct.MotionVector = type { i16, i16 } - %struct.RBSP2 = type { i32, i32, i16, i8, i16, i16, <1 x i64>, i32, i32, i32*, i32*, i32*, i32*, i32, i32, i32, i32, i32, i8, i16, i8, %struct.MB_Info_CABAC*, %struct.MB_Info_CABAC*, [2 x %struct.MB_Info_CABAC], [12 x i8], [460 x %struct.CABAC_context_element], [10 x i8], [10 x i8], [10 x i16], [4 x [120 x i32]], [15 x [36 x i8]], [6 x [8 x i8]], i16* } - %struct.Slice_Info = type { i32, i8, %struct.seq_parameter_set_rbsp_t*, %struct.seq_parameter_set_rbsp_t, i32, i16*, i8, i8, i8, i8, i16, i32 } - %struct.seq_parameter_set_rbsp_t = type { i32, i32, i32 } -@_ZL21CABAC_CTX_state_table = external constant [64 x i16] ; <[64 x i16]*> [#uses=1] -@_ZL15rLPS_table_64x4 = external constant [64 x [4 x i8]] ; <[64 x [4 x i8]]*> [#uses=1] - -define i32 @_ZN5RBSP220residual_block_cabacEP10Slice_InfoP13MB_Info_CABACS3_hjhhbPtPs(%struct.RBSP2* %this, %struct.Slice_Info* %slice, %struct.MB_Info_CABAC* %up, %struct.MB_Info_CABAC* %left, i8 zeroext %maxNumCoeff, i32 %blk_i, i8 zeroext %iCbCr, i8 zeroext %ctxBlockCat, i8 zeroext %intra_flag, i16* %mask, i16* %res) nounwind { -entry: - %tmp43.i1590 = getelementptr %struct.RBSP2* %this, i32 0, i32 0 ; [#uses=1] - br label %bb803 - -bb803: ; preds = %_ZN5RBSP211decode_1bitEP21CABAC_context_element.exit1581, %entry - %numCoeff.11749 = phi i32 [ 0, %entry ], [ %numCoeff.11749.tmp868, %_ZN5RBSP211decode_1bitEP21CABAC_context_element.exit1581 ] ; [#uses=1] - %tmp28.i1503 = load i8* null, align 1 ; [#uses=1] - %tmp30.i1504 = getelementptr %struct.RBSP2* %this, i32 0, i32 25, i32 0, i32 0 ; [#uses=2] - %tmp31.i1505 = load i8* %tmp30.i1504, align 1 ; [#uses=1] - %tmp3233.i1506 = zext i8 %tmp31.i1505 to i32 ; [#uses=2] - %tmp35.i1507 = getelementptr [64 x i16]* @_ZL21CABAC_CTX_state_table, i32 0, i32 %tmp3233.i1506 ; [#uses=1] - %tmp36.i1508 = load i16* %tmp35.i1507, align 2 ; [#uses=1] - %tmp363738.i1509 = zext i16 %tmp36.i1508 to i32 ; [#uses=1] - %tmp51.i1514 = getelementptr [64 x [4 x i8]]* @_ZL15rLPS_table_64x4, i32 0, i32 %tmp3233.i1506, i32 0 ; [#uses=1] - %tmp52.i1515 = load i8* %tmp51.i1514, align 1 ; [#uses=1] - %tmp5758.i1516 = zext i8 %tmp52.i1515 to i32 ; [#uses=1] - %tmp60.i1517 = sub i32 0, %tmp5758.i1516 ; [#uses=1] - store i32 %tmp60.i1517, i32* %tmp43.i1590, align 16 - br i1 false, label %_ZN5RBSP211decode_1bitEP21CABAC_context_element.exit1581, label %bb.i1537 - -bb.i1537: ; preds = %bb803 - unreachable - -_ZN5RBSP211decode_1bitEP21CABAC_context_element.exit1581: ; preds = %bb803 - %tmp328329.i1580 = trunc i32 %tmp363738.i1509 to i8 ; [#uses=1] - store i8 %tmp328329.i1580, i8* %tmp30.i1504, align 1 - %toBool865 = icmp eq i8 %tmp28.i1503, 0 ; [#uses=1] - %numCoeff.11749.tmp868 = select i1 %toBool865, i32 %numCoeff.11749, i32 0 ; [#uses=1] - br label %bb803 -} diff --git a/test/CodeGen/X86/ins_subreg_coalesce-3.ll b/test/CodeGen/X86/ins_subreg_coalesce-3.ll index 5bddef8140b..ee3ac66abef 100644 --- a/test/CodeGen/X86/ins_subreg_coalesce-3.ll +++ b/test/CodeGen/X86/ins_subreg_coalesce-3.ll @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s | llc -march=x86-64 -disable-correct-folding | grep mov | count 9 +; RUN: llvm-as < %s | llc -march=x86-64 | grep mov | count 11 %struct.COMPOSITE = type { i8, i16, i16 } %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 } @@ -17,21 +17,21 @@ %struct.metrics = type { i16, i16, i16, i16, i16 } %struct.rec = type { %struct.head_type } -define void @FontChange() { +define void @FontChange(i1 %foo) { entry: - br i1 false, label %bb298, label %bb49 + br i1 %foo, label %bb298, label %bb49 bb49: ; preds = %entry ret void bb298: ; preds = %entry - br i1 false, label %bb304, label %bb366 + br i1 %foo, label %bb304, label %bb366 bb304: ; preds = %bb298 - br i1 false, label %bb330, label %bb428 + br i1 %foo, label %bb330, label %bb428 bb330: ; preds = %bb366, %bb304 br label %bb366 bb366: ; preds = %bb330, %bb298 - br i1 false, label %bb330, label %bb428 + br i1 %foo, label %bb330, label %bb428 bb428: ; preds = %bb366, %bb304 - br i1 false, label %bb650, label %bb433 + br i1 %foo, label %bb650, label %bb433 bb433: ; preds = %bb428 ret void bb650: ; preds = %bb650, %bb428 @@ -56,7 +56,7 @@ bb4897: ; preds = %bb4884, %bb761 ret void bb4932: ; preds = %bb4884 %tmp4933 = load i32* null, align 4 ; [#uses=1] - br i1 false, label %bb5054, label %bb4940 + br i1 %foo, label %bb5054, label %bb4940 bb4940: ; preds = %bb4932 %tmp4943 = load i32* null, align 4 ; [#uses=2] switch i32 %tmp4933, label %bb5054 [ -- 2.34.1