projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small refactor on VectorizerHint for deduplication
[oota-llvm.git]
/
lib
/
Analysis
/
ScalarEvolutionExpander.cpp
diff --git
a/lib/Analysis/ScalarEvolutionExpander.cpp
b/lib/Analysis/ScalarEvolutionExpander.cpp
index b5070434d14dbbd7e34b65a6b3a8314b63c3dfe8..968c619a48ddfae989f5921b06827f5fa7f38eea 100644
(file)
--- a/
lib/Analysis/ScalarEvolutionExpander.cpp
+++ b/
lib/Analysis/ScalarEvolutionExpander.cpp
@@
-16,6
+16,7
@@
#include "llvm/Analysis/ScalarEvolutionExpander.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallSet.h"
#include "llvm/Analysis/ScalarEvolutionExpander.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallSet.h"
+#include "llvm/Analysis/InstructionSimplify.h"
#include "llvm/Analysis/LoopInfo.h"
#include "llvm/Analysis/TargetTransformInfo.h"
#include "llvm/IR/DataLayout.h"
#include "llvm/Analysis/LoopInfo.h"
#include "llvm/Analysis/TargetTransformInfo.h"
#include "llvm/IR/DataLayout.h"
@@
-1442,8
+1443,12
@@
Value *SCEVExpander::visitAddRecExpr(const SCEVAddRecExpr *S) {
Constant *One = ConstantInt::get(Ty, 1);
for (pred_iterator HPI = HPB; HPI != HPE; ++HPI) {
BasicBlock *HP = *HPI;
Constant *One = ConstantInt::get(Ty, 1);
for (pred_iterator HPI = HPB; HPI != HPE; ++HPI) {
BasicBlock *HP = *HPI;
- if (!PredSeen.insert(HP))
+ if (!PredSeen.insert(HP)) {
+ // There must be an incoming value for each predecessor, even the
+ // duplicates!
+ CanonicalIV->addIncoming(CanonicalIV->getIncomingValueForBlock(HP), HP);
continue;
continue;
+ }
if (L->contains(HP)) {
// Insert a unit add instruction right before the terminator
if (L->contains(HP)) {
// Insert a unit add instruction right before the terminator
@@
-1706,7
+1711,7
@@
unsigned SCEVExpander::replaceCongruentIVs(Loop *L, const DominatorTree *DT,
// Fold constant phis. They may be congruent to other constant phis and
// would confuse the logic below that expects proper IVs.
// Fold constant phis. They may be congruent to other constant phis and
// would confuse the logic below that expects proper IVs.
- if (Value *V =
Phi->hasConstantValue(
)) {
+ if (Value *V =
SimplifyInstruction(Phi, SE.DL, SE.TLI, SE.DT
)) {
Phi->replaceAllUsesWith(V);
DeadInsts.push_back(Phi);
++NumElim;
Phi->replaceAllUsesWith(V);
DeadInsts.push_back(Phi);
++NumElim;