//
//===----------------------------------------------------------------------===//
-#include "llvm/Transforms/Scalar/IndVarSimplify.h"
+#include "llvm/Transforms/Scalar.h"
#include "llvm/Analysis/InductionVariable.h"
#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/Dominators.h"
+#include "llvm/Analysis/Writer.h"
#include "llvm/iPHINode.h"
#include "llvm/iOther.h"
#include "llvm/Type.h"
-#include "llvm/ConstantVals.h"
+#include "llvm/Constants.h"
+#include "llvm/Support/CFG.h"
#include "Support/STLExtras.h"
+#include "Support/StatisticReporter.h"
+
+static Statistic<> NumRemoved ("indvars\t\t- Number of aux indvars removed");
+static Statistic<> NumInserted("indvars\t\t- Number of cannonical indvars added");
-#if 0
-#define DEBUG
-#include "llvm/Analysis/Writer.h"
-#endif
// InsertCast - Cast Val to Ty, setting a useful name on the cast if Val has a
// name...
return Cast;
}
-static bool TransformLoop(cfg::LoopInfo *Loops, cfg::Loop *Loop) {
+static bool TransformLoop(LoopInfo *Loops, Loop *Loop) {
// Transform all subloops before this loop...
bool Changed = reduce_apply_bool(Loop->getSubLoops().begin(),
Loop->getSubLoops().end(),
- std::bind1st(ptr_fun(TransformLoop), Loops));
+ std::bind1st(std::ptr_fun(TransformLoop), Loops));
// Get the header node for this loop. All of the phi nodes that could be
// induction variables must live in this basic block.
- BasicBlock *Header = (BasicBlock*)Loop->getBlocks().front();
+ //
+ BasicBlock *Header = Loop->getBlocks().front();
// Loop over all of the PHI nodes in the basic block, calculating the
// induction variables that they represent... stuffing the induction variable
// info into a vector...
//
- vector<InductionVariable> IndVars; // Induction variables for block
+ std::vector<InductionVariable> IndVars; // Induction variables for block
for (BasicBlock::iterator I = Header->begin();
PHINode *PN = dyn_cast<PHINode>(*I); ++I)
IndVars.push_back(InductionVariable(PN, Loops));
// Figure out which block is incoming and which is the backedge for the loop
BasicBlock *Incoming, *BackEdgeBlock;
- BasicBlock::pred_iterator PI = Header->pred_begin();
- assert(PI != Header->pred_end() && "Loop headers should have 2 preds!");
+ pred_iterator PI = pred_begin(Header);
+ assert(PI != pred_end(Header) && "Loop headers should have 2 preds!");
if (Loop->contains(*PI)) { // First pred is back edge...
BackEdgeBlock = *PI++;
Incoming = *PI++;
Incoming = *PI++;
BackEdgeBlock = *PI++;
}
- assert(PI == Header->pred_end() && "Loop headers should have 2 preds!");
+ assert(PI == pred_end(Header) && "Loop headers should have 2 preds!");
// Add incoming values for the PHI node...
- PN->addIncoming(Constant::getNullConstant(Type::UIntTy), Incoming);
+ PN->addIncoming(Constant::getNullValue(Type::UIntTy), Incoming);
PN->addIncoming(Add, BackEdgeBlock);
// Analyze the new induction variable...
assert(IndVars.back().InductionType == InductionVariable::Cannonical &&
"Just inserted cannonical indvar that is not cannonical!");
Cannonical = &IndVars.back();
+ ++NumInserted;
+ Changed = true;
}
-#ifdef DEBUG
- cerr << "Induction variables:\n";
-#endif
+ DEBUG(cerr << "Induction variables:\n");
// Get the current loop iteration count, which is always the value of the
// cannonical phi node...
unsigned InsertPos = IndVars.size();
for (unsigned i = 0; i < IndVars.size(); ++i) {
InductionVariable *IV = &IndVars[i];
-#ifdef DEBUG
- cerr << IndVars[i];
-#endif
+
+ DEBUG(cerr << IV);
+
// Don't modify the cannonical indvar or unrecognized indvars...
if (IV != Cannonical && IV->InductionType != InductionVariable::Unknown) {
Instruction *Val = IterCount;
if (!isa<ConstantInt>(IV->Step) || // If the step != 1
!cast<ConstantInt>(IV->Step)->equalsInt(1)) {
- string Name; // Create a scale by the step value...
+ std::string Name; // Create a scale by the step value...
if (IV->Phi->hasName()) Name = IV->Phi->getName()+"-scale";
// If the types are not compatible, insert a cast now...
if (!isa<Constant>(IV->Start) || // If the start != 0
!cast<Constant>(IV->Start)->isNullValue()) {
- string Name; // Create a offset by the start value...
+ std::string Name; // Create a offset by the start value...
if (IV->Phi->hasName()) Name = IV->Phi->getName()+"-offset";
// If the types are not compatible, insert a cast now...
IV->Phi->replaceAllUsesWith(Val);
// Move the PHI name to it's new equivalent value...
- string OldName = IV->Phi->getName();
+ std::string OldName = IV->Phi->getName();
IV->Phi->setName("");
Val->setName(OldName);
Header->getInstList().remove(IV->Phi);
delete IV->Phi;
InsertPos--; // Deleted an instr, decrement insert position
+ Changed = true;
+ ++NumRemoved;
}
}
return Changed;
}
-bool InductionVariableSimplify::doit(Method *M) {
- if (M->isExternal()) return false;
+namespace {
+ struct InductionVariableSimplify : public FunctionPass {
+ const char *getPassName() const {
+ return "Induction Variable Cannonicalize";
+ }
- // Figure out the loop structure of the method...
- cfg::LoopInfo Loops(M);
+ virtual bool runOnFunction(Function *F) {
+ LoopInfo &LI = getAnalysis<LoopInfo>();
- // Induction Variables live in the header nodes of the loops of the method...
- return reduce_apply_bool(Loops.getTopLevelLoops().begin(),
- Loops.getTopLevelLoops().end(),
- std::bind1st(std::ptr_fun(TransformLoop), &Loops));
+ // Induction Variables live in the header nodes of loops
+ return reduce_apply_bool(LI.getTopLevelLoops().begin(),
+ LI.getTopLevelLoops().end(),
+ std::bind1st(std::ptr_fun(TransformLoop), &LI));
+ }
+
+ virtual void getAnalysisUsage(AnalysisUsage &AU) const {
+ AU.addRequired(LoopInfo::ID);
+ AU.preservesCFG();
+ }
+ };
}
+
+Pass *createIndVarSimplifyPass() {
+ return new InductionVariableSimplify();
+}
+