[llvm-commits] [llvm] r102928 - in /llvm/trunk: lib/Transforms/Scalar/LoopIndexSplit.cpp test/Transforms/LoopIndexSplit/PR4174-2.ll test/Transforms/LoopIndexSplit/PR4174.ll

[Devang Patel]

Author: dpatel
Date: Mon May  3 13:06:58 2010
New Revision: 102928

URL: http://llvm.org/viewvc/llvm-project?rev=102928&view=rev
Log:
Check for side effects before splitting loop.
Patch by Jakub Staszak!

Added:
    llvm/trunk/test/Transforms/LoopIndexSplit/PR4174-2.ll
    llvm/trunk/test/Transforms/LoopIndexSplit/PR4174.ll
Modified:
    llvm/trunk/lib/Transforms/Scalar/LoopIndexSplit.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/LoopIndexSplit.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopIndexSplit.cpp?rev=102928&r1=102927&r2=102928&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/LoopIndexSplit.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/LoopIndexSplit.cpp Mon May  3 13:06:58 2010
@@ -948,6 +948,25 @@
   if (!IVBasedValues.count(SplitCondition->getOperand(!SVOpNum)))
     return false;
 
+  // Check for side effects.
+  for (Loop::block_iterator I = L->block_begin(), E = L->block_end();
+       I != E; ++I) {
+    BasicBlock *BB = *I;
+
+    assert(DT->dominates(Header, BB));
+    if (DT->properlyDominates(SplitCondition->getParent(), BB))
+      continue;
+
+    for (BasicBlock::iterator BI = BB->begin(), BE = BB->end();
+	 BI != BE; ++BI) {
+      Instruction *Inst = BI;
+
+      if (!Inst->isSafeToSpeculativelyExecute() && !isa<PHINode>(Inst)
+	  && !isa<BranchInst>(Inst) && !isa<DbgInfoIntrinsic>(Inst))
+        return false;
+    }
+  }
+
   // Normalize loop conditions so that it is easier to calculate new loop
   // bounds.
   if (IVisGT(*ExitCondition) || IVisGE(*ExitCondition)) {

Added: llvm/trunk/test/Transforms/LoopIndexSplit/PR4174-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopIndexSplit/PR4174-2.ll?rev=102928&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/LoopIndexSplit/PR4174-2.ll (added)
+++ llvm/trunk/test/Transforms/LoopIndexSplit/PR4174-2.ll Mon May  3 13:06:58 2010
@@ -0,0 +1,38 @@
+; RUN: llvm-as < %s | opt -loop-index-split | llvm-dis | not grep clone
+
+declare void @f()
+
+define fastcc i32 @main() nounwind {
+entry:
+        br label %bb1552
+
+bb1552:
+        %j295.0.reg2mem.0 = phi i32 [ %storemerge110, %bb1669 ], [ 0, %entry ]
+        br label %bb1553
+
+bb1553:
+        call void @f()
+        %tmp1628 = icmp sgt i32 %j295.0.reg2mem.0, -3
+        br i1 %tmp1628, label %bb1588, label %bb1616
+
+bb1588:
+        br label %bb1616
+
+bb1616:
+        %tmp1629 = icmp sgt i32 %j295.0.reg2mem.0, -3
+        br i1 %tmp1629, label %bb1649, label %bb1632
+
+bb1632:
+        br label %bb1669
+
+bb1649:
+        br label %bb1669
+
+bb1669:
+        %storemerge110 = add i32 %j295.0.reg2mem.0, 1
+        %tmp1672 = icmp sgt i32 %storemerge110, 3
+        br i1 %tmp1672, label %bb1678, label %bb1552
+
+bb1678:
+        ret i32 0
+}

Added: llvm/trunk/test/Transforms/LoopIndexSplit/PR4174.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopIndexSplit/PR4174.ll?rev=102928&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/LoopIndexSplit/PR4174.ll (added)
+++ llvm/trunk/test/Transforms/LoopIndexSplit/PR4174.ll Mon May  3 13:06:58 2010
@@ -0,0 +1,23 @@
+; RUN: llvm-as < %s | opt -loop-index-split | llvm-dis | not grep clone
+
+declare void @f()
+
+define i32 @main() {
+entry:
+        br label %head
+head:
+        %i = phi i32 [0, %entry], [%i1, %tail]
+        call void @f()
+        %splitcond = icmp slt i32 %i, 2
+        br i1 %splitcond, label %yes, label %no
+yes:
+        br label %tail
+no:
+        br label %tail
+tail:
+        %i1 = add i32 %i, 1
+        %exitcond = icmp slt i32 %i1, 4
+        br i1 %exitcond, label %head, label %exit
+exit:
+        ret i32 0
+}