diff options
| author | Bill Wendling <isanbard@gmail.com> | 2012-04-30 17:12:42 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2012-04-30 17:12:42 +0000 |
| commit | ee386407f0fb7b356583cf5ac873d19626f97d4f (patch) | |
| tree | b1e5e1fa91093822afbccb2f8041be192f115246 | |
| parent | e8a900fc8c3dfc3d59f5c3a094ebf06e2c4da0cf (diff) | |
| download | llvm-ee386407f0fb7b356583cf5ac873d19626f97d4f.zip llvm-ee386407f0fb7b356583cf5ac873d19626f97d4f.tar.gz llvm-ee386407f0fb7b356583cf5ac873d19626f97d4f.tar.bz2 | |
Merging r155809:
------------------------------------------------------------------------
r155809 | rafael | 2012-04-29 20:53:06 -0700 (Sun, 29 Apr 2012) | 2 lines
Make sure HoistInsertPosition finds a position that is dominated by all
inputs.
------------------------------------------------------------------------
llvm-svn: 155828
| -rw-r--r-- | llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/Transforms/LoopStrengthReduce/pr12691.ll | 34 |
2 files changed, 35 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp b/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp index fe4700b..b085b00 100644 --- a/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp +++ b/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp @@ -4108,7 +4108,7 @@ LSRInstance::HoistInsertPosition(BasicBlock::iterator IP, // Attempt to find an insert position in the middle of the block, // instead of at the end, so that it can be used for other expansions. if (IDom == Inst->getParent() && - (!BetterPos || DT.dominates(BetterPos, Inst))) + (!BetterPos || !DT.dominates(Inst, BetterPos))) BetterPos = llvm::next(BasicBlock::iterator(Inst)); } if (!AllDominate) diff --git a/llvm/test/Transforms/LoopStrengthReduce/pr12691.ll b/llvm/test/Transforms/LoopStrengthReduce/pr12691.ll new file mode 100644 index 0000000..8399434 --- /dev/null +++ b/llvm/test/Transforms/LoopStrengthReduce/pr12691.ll @@ -0,0 +1,34 @@ +; RUN: opt < %s -loop-reduce -S | FileCheck %s + +@d = common global i32 0, align 4 + +define void @fn2(i32 %x) nounwind uwtable { +entry: + br label %for.cond + +for.cond: + %g.0 = phi i32 [ 0, %entry ], [ %dec, %for.cond ] + %tobool = icmp eq i32 %x, 0 + %dec = add nsw i32 %g.0, -1 + br i1 %tobool, label %for.cond, label %for.end + +for.end: +; CHECK: %tmp1 = load i32* @d, align 4 +; CHECK-NEXT: %tmp2 = load i32* @d, align 4 +; CHECK-NEXT: %0 = sub i32 %tmp1, %tmp2 + + %tmp1 = load i32* @d, align 4 + %add = add nsw i32 %tmp1, %g.0 + %tmp2 = load i32* @d, align 4 + %tobool26 = icmp eq i32 %x, 0 + br i1 %tobool26, label %for.end5, label %for.body.lr.ph + +for.body.lr.ph: + %tobool3 = icmp ne i32 %tmp2, %add + br label %for.end5 + +for.end5: + ret void +} + + |