commit b0573547f68078ac72d0c0cd639d53fa98f91264
author Geoff Berry <gberry@codeaurora.org> Wed Jun 28 17:01:15 2017 +0000
committer Geoff Berry <gberry@codeaurora.org> Wed Jun 28 17:01:15 2017 +0000
tree f5b4fcbb7f7beeca642c86760ad7699246153273
parent 1a132d27c6abb6e2f3caa7a9da459604bd993125

[LoopUnroll] Fix bug in computeUnrollCount causing it to not honor MaxCount

Reviewers: sanjoy, anna, reames, apilipenko, igor-laevsky, mkuper

Subscribers: mcrosier, llvm-commits, mzolotukhin

Differential Revision: https://reviews.llvm.org/D34532

llvm-svn: 306564

llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp

diff --git a/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp b/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp
index 8bdbb3f..530a684 100644
--- a/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopUnrollPass.cpp
@@ -836,6 +836,8 @@
     } else {
       UP.Count = TripCount;
     }
+    if (UP.Count > UP.MaxCount)
+      UP.Count = UP.MaxCount;
     if ((PragmaFullUnroll || PragmaEnableUnroll) && TripCount &&
         UP.Count != TripCount)
       ORE->emit(