Prep for merging 3.4: Undo changes from 3.3 branch

test/Transforms/LoopUnroll/unloop.ll

 ; RUN: opt < %s -S -loop-unroll -verify-loop-info | FileCheck %s
 ;
 ; Unit tests for LoopInfo::updateUnloop.
 
 declare i1 @check() nounwind
 
 ; Ensure that tail->inner is removed and rely on verify-loopinfo to
 ; check soundness.
 ;
 ; CHECK: @skiplevelexit
 ; CHECK: tail:
 ; CHECK-NOT: br
 ; CHECK: ret void
 define void @skiplevelexit() nounwind {
 entry:
   br label %outer
 
 outer:
   br label %inner
 
 inner:
   %iv = phi i32 [ 0, %outer ], [ %inc, %tail ]
   %inc = add i32 %iv, 1
-  call zeroext i1 @check()
-  br i1 true, label %outer.backedge, label %tail
+  %wbucond = call zeroext i1 @check()
+  br i1 %wbucond, label %outer.backedge, label %tail
 
 tail:
   br i1 false, label %inner, label %exit
 
 outer.backedge:
   br label %outer
 
 exit:
   ret void
 }
@@ skipping 83 matching lines @@
   br label %return
 
 return:
   ret void
 }
 
 ; Remove the middle loop of a deeply nested loop tree.
 ; Ensure that only the middle loop is removed and rely on verify-loopinfo to
 ; check soundness.
 ;
-; This test must be disabled until trip count computation can be optimized...
-; rdar:14038809 [SCEV]: Optimize trip count computation for multi-exit loops.
-; CHECKFIXME: @unloopDeepNested
+; CHECK: @unloopDeepNested
 ; Inner-inner loop control.
-; CHECKFIXME: while.cond.us.i:
-; CHECKFIXME: br i1 %cmp.us.i, label %next_data.exit, label %while.body.us.i
-; CHECKFIXME: if.then.us.i:
-; CHECKFIXME: br label %while.cond.us.i
+; CHECK: while.cond.us.i:
+; CHECK: br i1 %cmp.us.i, label %next_data.exit, label %while.body.us.i
+; CHECK: if.then.us.i:
+; CHECK: br label %while.cond.us.i
 ; Inner loop tail.
-; CHECKFIXME: if.else.i:
-; CHECKFIXME: br label %while.cond.outer.i
+; CHECK: if.else.i:
+; CHECK: br label %while.cond.outer.i
 ; Middle loop control (removed).
-; CHECKFIXME: valid_data.exit:
-; CHECKFIXME-NOT: br
-; CHECKFIXME: %cmp = call zeroext i1 @check()
+; CHECK: valid_data.exit:
+; CHECK-NOT: br
+; CHECK: %cmp = call zeroext i1 @check()
 ; Outer loop control.
-; CHECKFIXME: copy_data.exit:
-; CHECKFIXME: br i1 %cmp38, label %if.then39, label %while.cond.outer
+; CHECK: copy_data.exit:
+; CHECK: br i1 %cmp38, label %if.then39, label %while.cond.outer
 ; Outer-outer loop tail.
-; CHECKFIXME: while.cond.outer.outer.backedge:
-; CHECKFIXME: br label %while.cond.outer.outer
+; CHECK: while.cond.outer.outer.backedge:
+; CHECK: br label %while.cond.outer.outer
 define void @unloopDeepNested() nounwind {
 for.cond8.preheader.i:
   %cmp113.i = call zeroext i1 @check()
   br i1 %cmp113.i, label %make_data.exit, label %for.body13.lr.ph.i
 
 for.body13.lr.ph.i:
   br label %make_data.exit
 
 make_data.exit:
   br label %while.cond.outer.outer
@@ skipping 303 matching lines @@
 
 for.cond.i:                                       ; preds = %for.cond.i, %for.body2
   br i1 %tobool.i, label %for.cond.i, label %for.cond1.loopexit
 
 for.cond3:                                        ; preds = %for.cond1
   br i1 false, label %for.cond, label %if.end
 
 if.end:                                           ; preds = %for.cond3
   ret void
 }