[llvm-commits] CVS: llvm/lib/Transforms/ExprTypeConvert.cpp LevelRaise.cpp TransformInternals.cpp TransformInternals.h
Chris Lattner
lattner at cs.uiuc.edu
Thu Apr 24 13:26:01 PDT 2003
Changes in directory llvm/lib/Transforms:
ExprTypeConvert.cpp updated: 1.69 -> 1.70
LevelRaise.cpp updated: 1.76 -> 1.77
TransformInternals.cpp updated: 1.32 -> 1.33
TransformInternals.h updated: 1.16 -> 1.17
---
Log message:
Make the levelraise pass be well behaved w.r.t the TargetData that the current
PassMAnager provides.
---
Diffs of the changes:
Index: llvm/lib/Transforms/ExprTypeConvert.cpp
diff -u llvm/lib/Transforms/ExprTypeConvert.cpp:1.69 llvm/lib/Transforms/ExprTypeConvert.cpp:1.70
--- llvm/lib/Transforms/ExprTypeConvert.cpp:1.69 Thu Feb 13 21:07:17 2003
+++ llvm/lib/Transforms/ExprTypeConvert.cpp Thu Apr 24 13:25:27 2003
@@ -18,10 +18,11 @@
using std::cerr;
static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
- ValueTypeCache &ConvertedTypes);
+ ValueTypeCache &ConvertedTypes,
+ const TargetData &TD);
static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
- ValueMapCache &VMC);
+ ValueMapCache &VMC, const TargetData &TD);
// Peephole Malloc instructions: we take a look at the use chain of the
// malloc instruction, and try to find out if the following conditions hold:
@@ -35,7 +36,8 @@
// element. TODO: This comment is out of date WRT arrays
//
static bool MallocConvertableToType(MallocInst *MI, const Type *Ty,
- ValueTypeCache &CTMap) {
+ ValueTypeCache &CTMap,
+ const TargetData &TD) {
if (!isa<PointerType>(Ty)) return false; // Malloc always returns pointers
// Deal with the type to allocate, not the pointer type...
@@ -73,7 +75,8 @@
static Instruction *ConvertMallocToType(MallocInst *MI, const Type *Ty,
const std::string &Name,
- ValueMapCache &VMC){
+ ValueMapCache &VMC,
+ const TargetData &TD){
BasicBlock *BB = MI->getParent();
BasicBlock::iterator It = BB->end();
@@ -131,7 +134,7 @@
// ExpressionConvertableToType - Return true if it is possible
bool ExpressionConvertableToType(Value *V, const Type *Ty,
- ValueTypeCache &CTMap) {
+ ValueTypeCache &CTMap, const TargetData &TD) {
// Expression type must be holdable in a register.
if (!Ty->isFirstClassType())
return false;
@@ -172,8 +175,8 @@
case Instruction::Add:
case Instruction::Sub:
if (!Ty->isInteger() && !Ty->isFloatingPoint()) return false;
- if (!ExpressionConvertableToType(I->getOperand(0), Ty, CTMap) ||
- !ExpressionConvertableToType(I->getOperand(1), Ty, CTMap))
+ if (!ExpressionConvertableToType(I->getOperand(0), Ty, CTMap, TD) ||
+ !ExpressionConvertableToType(I->getOperand(1), Ty, CTMap, TD))
return false;
break;
case Instruction::Shr:
@@ -182,27 +185,27 @@
// FALL THROUGH
case Instruction::Shl:
if (!Ty->isInteger()) return false;
- if (!ExpressionConvertableToType(I->getOperand(0), Ty, CTMap))
+ if (!ExpressionConvertableToType(I->getOperand(0), Ty, CTMap, TD))
return false;
break;
case Instruction::Load: {
LoadInst *LI = cast<LoadInst>(I);
if (!ExpressionConvertableToType(LI->getPointerOperand(),
- PointerType::get(Ty), CTMap))
+ PointerType::get(Ty), CTMap, TD))
return false;
break;
}
case Instruction::PHINode: {
PHINode *PN = cast<PHINode>(I);
for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i)
- if (!ExpressionConvertableToType(PN->getIncomingValue(i), Ty, CTMap))
+ if (!ExpressionConvertableToType(PN->getIncomingValue(i), Ty, CTMap, TD))
return false;
break;
}
case Instruction::Malloc:
- if (!MallocConvertableToType(cast<MallocInst>(I), Ty, CTMap))
+ if (!MallocConvertableToType(cast<MallocInst>(I), Ty, CTMap, TD))
return false;
break;
@@ -258,10 +261,10 @@
// the appropriate size... if so, allow it.
//
std::vector<Value*> Indices;
- const Type *ElTy = ConvertableToGEP(PTy, I->getOperand(1), Indices);
+ const Type *ElTy = ConvertableToGEP(PTy, I->getOperand(1), Indices, TD);
if (ElTy == PVTy) {
if (!ExpressionConvertableToType(I->getOperand(0),
- PointerType::get(ElTy), CTMap))
+ PointerType::get(ElTy), CTMap, TD))
return false; // Can't continue, ExConToTy might have polluted set!
break;
}
@@ -278,7 +281,7 @@
TD.getTypeSize(PTy->getElementType()) ==
TD.getTypeSize(GEP->getType()->getElementType())) {
const PointerType *NewSrcTy = PointerType::get(PVTy);
- if (!ExpressionConvertableToType(I->getOperand(0), NewSrcTy, CTMap))
+ if (!ExpressionConvertableToType(I->getOperand(0), NewSrcTy, CTMap, TD))
return false;
break;
}
@@ -300,7 +303,7 @@
const FunctionType *NewTy =
FunctionType::get(Ty, ArgTys, FT->isVarArg());
if (!ExpressionConvertableToType(I->getOperand(0),
- PointerType::get(NewTy), CTMap))
+ PointerType::get(NewTy), CTMap, TD))
return false;
break;
}
@@ -313,14 +316,15 @@
// recursion.
//
for (Value::use_iterator It = I->use_begin(), E = I->use_end(); It != E; ++It)
- if (!OperandConvertableToType(*It, I, Ty, CTMap))
+ if (!OperandConvertableToType(*It, I, Ty, CTMap, TD))
return false;
return true;
}
-Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
+Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC,
+ const TargetData &TD) {
if (V->getType() == Ty) return V; // Already where we need to be?
ValueMapCache::ExprMapTy::iterator VMCI = VMC.ExprMap.find(V);
@@ -373,8 +377,8 @@
Dummy, Dummy, Name);
VMC.ExprMap[I] = Res; // Add node to expression eagerly
- Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), Ty, VMC));
- Res->setOperand(1, ConvertExpressionToType(I->getOperand(1), Ty, VMC));
+ Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), Ty, VMC, TD));
+ Res->setOperand(1, ConvertExpressionToType(I->getOperand(1), Ty, VMC, TD));
break;
case Instruction::Shl:
@@ -382,7 +386,7 @@
Res = new ShiftInst(cast<ShiftInst>(I)->getOpcode(), Dummy,
I->getOperand(1), Name);
VMC.ExprMap[I] = Res;
- Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), Ty, VMC));
+ Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), Ty, VMC, TD));
break;
case Instruction::Load: {
@@ -391,7 +395,7 @@
Res = new LoadInst(Constant::getNullValue(PointerType::get(Ty)), Name);
VMC.ExprMap[I] = Res;
Res->setOperand(0, ConvertExpressionToType(LI->getPointerOperand(),
- PointerType::get(Ty), VMC));
+ PointerType::get(Ty), VMC, TD));
assert(Res->getOperand(0)->getType() == PointerType::get(Ty));
assert(Ty == Res->getType());
assert(Res->getType()->isFirstClassType() && "Load of structure or array!");
@@ -408,7 +412,7 @@
Value *OldVal = OldPN->getIncomingValue(0);
ValueHandle OldValHandle(VMC, OldVal);
OldPN->removeIncomingValue(BB, false);
- Value *V = ConvertExpressionToType(OldVal, Ty, VMC);
+ Value *V = ConvertExpressionToType(OldVal, Ty, VMC, TD);
NewPN->addIncoming(V, BB);
}
Res = NewPN;
@@ -416,7 +420,7 @@
}
case Instruction::Malloc: {
- Res = ConvertMallocToType(cast<MallocInst>(I), Ty, Name, VMC);
+ Res = ConvertMallocToType(cast<MallocInst>(I), Ty, Name, VMC, TD);
break;
}
@@ -468,14 +472,14 @@
//
std::vector<Value*> Indices;
const Type *ElTy = ConvertableToGEP(NewSrcTy, I->getOperand(1),
- Indices, &It);
+ Indices, TD, &It);
if (ElTy) {
assert(ElTy == PVTy && "Internal error, setup wrong!");
Res = new GetElementPtrInst(Constant::getNullValue(NewSrcTy),
Indices, Name);
VMC.ExprMap[I] = Res;
Res->setOperand(0, ConvertExpressionToType(I->getOperand(0),
- NewSrcTy, VMC));
+ NewSrcTy, VMC, TD));
}
}
@@ -491,7 +495,7 @@
Indices, Name);
VMC.ExprMap[I] = Res;
Res->setOperand(0, ConvertExpressionToType(I->getOperand(0),
- NewSrcTy, VMC));
+ NewSrcTy, VMC, TD));
}
@@ -519,7 +523,7 @@
std::vector<Value*>(I->op_begin()+1, I->op_end()),
Name);
VMC.ExprMap[I] = Res;
- Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), NewPTy, VMC));
+ Res->setOperand(0, ConvertExpressionToType(I->getOperand(0),NewPTy,VMC,TD));
break;
}
default:
@@ -541,7 +545,7 @@
unsigned NumUses = I->use_size();
for (unsigned It = 0; It < NumUses; ) {
unsigned OldSize = NumUses;
- ConvertOperandToType(*(I->use_begin()+It), I, Res, VMC);
+ ConvertOperandToType(*(I->use_begin()+It), I, Res, VMC, TD);
NumUses = I->use_size();
if (NumUses == OldSize) ++It;
}
@@ -556,7 +560,8 @@
// ValueConvertableToType - Return true if it is possible
bool ValueConvertableToType(Value *V, const Type *Ty,
- ValueTypeCache &ConvertedTypes) {
+ ValueTypeCache &ConvertedTypes,
+ const TargetData &TD) {
ValueTypeCache::iterator I = ConvertedTypes.find(V);
if (I != ConvertedTypes.end()) return I->second == Ty;
ConvertedTypes[V] = Ty;
@@ -566,7 +571,7 @@
//
if (V->getType() != Ty) {
for (Value::use_iterator I = V->use_begin(), E = V->use_end(); I != E; ++I)
- if (!OperandConvertableToType(*I, V, Ty, ConvertedTypes))
+ if (!OperandConvertableToType(*I, V, Ty, ConvertedTypes, TD))
return false;
}
@@ -584,7 +589,8 @@
// the expression, not the static current type.
//
static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
- ValueTypeCache &CTMap) {
+ ValueTypeCache &CTMap,
+ const TargetData &TD) {
// if (V->getType() == Ty) return true; // Operand already the right type?
// Expression type must be holdable in a register.
@@ -630,11 +636,11 @@
if (isa<PointerType>(Ty)) {
Value *IndexVal = I->getOperand(V == I->getOperand(0) ? 1 : 0);
std::vector<Value*> Indices;
- if (const Type *ETy = ConvertableToGEP(Ty, IndexVal, Indices)) {
+ if (const Type *ETy = ConvertableToGEP(Ty, IndexVal, Indices, TD)) {
const Type *RetTy = PointerType::get(ETy);
// Only successful if we can convert this type to the required type
- if (ValueConvertableToType(I, RetTy, CTMap)) {
+ if (ValueConvertableToType(I, RetTy, CTMap, TD)) {
CTMap[I] = RetTy;
return true;
}
@@ -648,13 +654,13 @@
if (!Ty->isInteger() && !Ty->isFloatingPoint()) return false;
Value *OtherOp = I->getOperand((V == I->getOperand(0)) ? 1 : 0);
- return ValueConvertableToType(I, Ty, CTMap) &&
- ExpressionConvertableToType(OtherOp, Ty, CTMap);
+ return ValueConvertableToType(I, Ty, CTMap, TD) &&
+ ExpressionConvertableToType(OtherOp, Ty, CTMap, TD);
}
case Instruction::SetEQ:
case Instruction::SetNE: {
Value *OtherOp = I->getOperand((V == I->getOperand(0)) ? 1 : 0);
- return ExpressionConvertableToType(OtherOp, Ty, CTMap);
+ return ExpressionConvertableToType(OtherOp, Ty, CTMap, TD);
}
case Instruction::Shr:
if (Ty->isSigned() != V->getType()->isSigned()) return false;
@@ -662,7 +668,7 @@
case Instruction::Shl:
if (I->getOperand(1) == V) return false; // Cannot change shift amount type
if (!Ty->isInteger()) return false;
- return ValueConvertableToType(I, Ty, CTMap);
+ return ValueConvertableToType(I, Ty, CTMap, TD);
case Instruction::Free:
assert(I->getOperand(0) == V);
@@ -681,7 +687,7 @@
if (const CompositeType *CT = dyn_cast<CompositeType>(LoadedTy)) {
unsigned Offset = 0; // No offset, get first leaf.
std::vector<Value*> Indices; // Discarded...
- LoadedTy = getStructOffsetType(CT, Offset, Indices, false);
+ LoadedTy = getStructOffsetType(CT, Offset, Indices, TD, false);
assert(Offset == 0 && "Offset changed from zero???");
}
@@ -691,7 +697,7 @@
if (TD.getTypeSize(LoadedTy) != TD.getTypeSize(LI->getType()))
return false;
- return ValueConvertableToType(LI, LoadedTy, CTMap);
+ return ValueConvertableToType(LI, LoadedTy, CTMap, TD);
}
return false;
@@ -722,7 +728,7 @@
if (const StructType *SElTy = dyn_cast<StructType>(ElTy)) {
unsigned Offset = 0;
std::vector<Value*> Indices;
- ElTy = getStructOffsetType(ElTy, Offset, Indices, false);
+ ElTy = getStructOffsetType(ElTy, Offset, Indices, TD, false);
assert(Offset == 0 && "Offset changed!");
if (ElTy == 0) // Element at offset zero in struct doesn't exist!
return false; // Can only happen for {}*
@@ -738,7 +744,7 @@
// Can convert the store if we can convert the pointer operand to match
// the new value type...
return ExpressionConvertableToType(I->getOperand(1), PointerType::get(Ty),
- CTMap);
+ CTMap, TD);
} else if (const PointerType *PT = dyn_cast<PointerType>(Ty)) {
const Type *ElTy = PT->getElementType();
assert(V == I->getOperand(1));
@@ -749,7 +755,7 @@
//
unsigned Offset = 0;
std::vector<Value*> Indices;
- ElTy = getStructOffsetType(ElTy, Offset, Indices, false);
+ ElTy = getStructOffsetType(ElTy, Offset, Indices, TD, false);
assert(Offset == 0 && "Offset changed!");
if (ElTy == 0) // Element at offset zero in struct doesn't exist!
return false; // Can only happen for {}*
@@ -761,7 +767,7 @@
return false;
// Can convert store if the incoming value is convertable...
- return ExpressionConvertableToType(I->getOperand(0), ElTy, CTMap);
+ return ExpressionConvertableToType(I->getOperand(0), ElTy, CTMap, TD);
}
return false;
}
@@ -795,20 +801,20 @@
// be converted to the appropriate size... if so, allow it.
//
std::vector<Value*> Indices;
- const Type *ElTy = ConvertableToGEP(Ty, Index, Indices);
+ const Type *ElTy = ConvertableToGEP(Ty, Index, Indices, TD);
delete TempScale; // Free our temporary multiply if we made it
if (ElTy == 0) return false; // Cannot make conversion...
- return ValueConvertableToType(I, PointerType::get(ElTy), CTMap);
+ return ValueConvertableToType(I, PointerType::get(ElTy), CTMap, TD);
}
return false;
case Instruction::PHINode: {
PHINode *PN = cast<PHINode>(I);
for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i)
- if (!ExpressionConvertableToType(PN->getIncomingValue(i), Ty, CTMap))
+ if (!ExpressionConvertableToType(PN->getIncomingValue(i), Ty, CTMap, TD))
return false;
- return ValueConvertableToType(PN, Ty, CTMap);
+ return ValueConvertableToType(PN, Ty, CTMap, TD);
}
case Instruction::Call: {
@@ -859,7 +865,7 @@
// converted. We succeed if we can change the return type if
// neccesary...
//
- return ValueConvertableToType(I, FTy->getReturnType(), CTMap);
+ return ValueConvertableToType(I, FTy->getReturnType(), CTMap, TD);
}
const PointerType *MPtr = cast<PointerType>(I->getOperand(0)->getType());
@@ -879,13 +885,14 @@
}
-void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC) {
+void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC,
+ const TargetData &TD) {
ValueHandle VH(VMC, V);
unsigned NumUses = V->use_size();
for (unsigned It = 0; It < NumUses; ) {
unsigned OldSize = NumUses;
- ConvertOperandToType(*(V->use_begin()+It), V, NewVal, VMC);
+ ConvertOperandToType(*(V->use_begin()+It), V, NewVal, VMC, TD);
NumUses = V->use_size();
if (NumUses == OldSize) ++It;
}
@@ -894,7 +901,7 @@
static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
- ValueMapCache &VMC) {
+ ValueMapCache &VMC, const TargetData &TD) {
if (isa<ValueHandle>(U)) return; // Valuehandles don't let go of operands...
if (VMC.OperandsMapped.count(U)) return;
@@ -944,7 +951,7 @@
std::vector<Value*> Indices;
BasicBlock::iterator It = I;
- if (const Type *ETy = ConvertableToGEP(NewTy, IndexVal, Indices, &It)) {
+ if (const Type *ETy = ConvertableToGEP(NewTy, IndexVal, Indices, TD,&It)){
// If successful, convert the add to a GEP
//const Type *RetTy = PointerType::get(ETy);
// First operand is actually the given pointer...
@@ -965,7 +972,7 @@
unsigned OtherIdx = (OldVal == I->getOperand(0)) ? 1 : 0;
Value *OtherOp = I->getOperand(OtherIdx);
- Value *NewOther = ConvertExpressionToType(OtherOp, NewTy, VMC);
+ Value *NewOther = ConvertExpressionToType(OtherOp, NewTy, VMC, TD);
Res->setOperand(OtherIdx, NewOther);
Res->setOperand(!OtherIdx, NewVal);
@@ -996,7 +1003,7 @@
Indices.push_back(ConstantSInt::get(Type::LongTy, 0));
unsigned Offset = 0; // No offset, get first leaf.
- LoadedTy = getStructOffsetType(CT, Offset, Indices, false);
+ LoadedTy = getStructOffsetType(CT, Offset, Indices, TD, false);
assert(LoadedTy->isFirstClassType());
if (Indices.size() != 1) { // Do not generate load X, 0
@@ -1032,7 +1039,7 @@
Indices.push_back(Constant::getNullValue(Type::LongTy));
unsigned Offset = 0;
- const Type *Ty = getStructOffsetType(ElTy, Offset, Indices, false);
+ const Type *Ty = getStructOffsetType(ElTy, Offset, Indices, TD,false);
assert(Offset == 0 && "Offset changed!");
assert(NewTy == Ty && "Did not convert to correct type!");
@@ -1049,7 +1056,7 @@
Res = new StoreInst(NewVal, Constant::getNullValue(NewPT));
VMC.ExprMap[I] = Res;
Res->setOperand(1, ConvertExpressionToType(I->getOperand(1),
- NewPT, VMC));
+ NewPT, VMC, TD));
}
} else { // Replace the source pointer
const Type *ValTy = cast<PointerType>(NewTy)->getElementType();
@@ -1061,7 +1068,7 @@
Indices.push_back(Constant::getNullValue(Type::LongTy));
unsigned Offset = 0;
- ValTy = getStructOffsetType(ValTy, Offset, Indices, false);
+ ValTy = getStructOffsetType(ValTy, Offset, Indices, TD, false);
assert(Offset == 0 && ValTy);
@@ -1072,7 +1079,8 @@
Res = new StoreInst(Constant::getNullValue(ValTy), SrcPtr);
VMC.ExprMap[I] = Res;
- Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), ValTy, VMC));
+ Res->setOperand(0, ConvertExpressionToType(I->getOperand(0),
+ ValTy, VMC, TD));
}
break;
}
@@ -1097,7 +1105,7 @@
// Perform the conversion now...
//
std::vector<Value*> Indices;
- const Type *ElTy = ConvertableToGEP(NewVal->getType(), Index, Indices, &It);
+ const Type *ElTy = ConvertableToGEP(NewVal->getType(),Index,Indices,TD,&It);
assert(ElTy != 0 && "GEP Conversion Failure!");
Res = new GetElementPtrInst(NewVal, Indices, Name);
assert(Res->getType() == PointerType::get(ElTy) &&
@@ -1115,7 +1123,7 @@
//
std::vector<Value*> Indices;
const Type *ElTy = ConvertableToGEP(NewVal->getType(), I->getOperand(1),
- Indices, &It);
+ Indices, TD, &It);
assert(ElTy != 0 && "GEP Conversion Failure!");
Res = new GetElementPtrInst(NewVal, Indices, Name);
@@ -1140,7 +1148,7 @@
BasicBlock *BB = OldPN->getIncomingBlock(0);
Value *OldVal = OldPN->getIncomingValue(0);
OldPN->removeIncomingValue(BB, false);
- Value *V = ConvertExpressionToType(OldVal, NewTy, VMC);
+ Value *V = ConvertExpressionToType(OldVal, NewTy, VMC, TD);
NewPN->addIncoming(V, BB);
}
Res = NewPN;
@@ -1211,7 +1219,7 @@
VMC.ExprMap[I] = Res;
if (I->getType() != Res->getType())
- ConvertValueToNewType(I, Res, VMC);
+ ConvertValueToNewType(I, Res, VMC, TD);
else {
for (unsigned It = 0; It < I->use_size(); ) {
User *Use = *(I->use_begin()+It);
Index: llvm/lib/Transforms/LevelRaise.cpp
diff -u llvm/lib/Transforms/LevelRaise.cpp:1.76 llvm/lib/Transforms/LevelRaise.cpp:1.77
--- llvm/lib/Transforms/LevelRaise.cpp:1.76 Wed Nov 20 12:34:35 2002
+++ llvm/lib/Transforms/LevelRaise.cpp Thu Apr 24 13:25:27 2003
@@ -62,6 +62,28 @@
do { PRINT_PEEPHOLE(ID, 0, I1); PRINT_PEEPHOLE(ID, 1, I2); \
PRINT_PEEPHOLE(ID, 2, I3); PRINT_PEEPHOLE(ID, 3, I4); } while (0)
+namespace {
+ struct RPR : public FunctionPass {
+ virtual bool runOnFunction(Function &F);
+
+ virtual void getAnalysisUsage(AnalysisUsage &AU) const {
+ AU.setPreservesCFG();
+ AU.addRequired<TargetData>();
+ }
+
+ private:
+ bool DoRaisePass(Function &F);
+ bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI);
+ };
+
+ RegisterOpt<RPR> X("raise", "Raise Pointer References");
+}
+
+Pass *createRaisePointerReferencesPass() {
+ return new RPR();
+}
+
+
// isReinterpretingCast - Return true if the cast instruction specified will
// cause the operand to be "reinterpreted". A value is reinterpreted if the
@@ -80,7 +102,8 @@
// %t2 = cast <eltype> * %t3 to {<...>}*
//
static bool HandleCastToPointer(BasicBlock::iterator BI,
- const PointerType *DestPTy) {
+ const PointerType *DestPTy,
+ const TargetData &TD) {
CastInst &CI = cast<CastInst>(*BI);
if (CI.use_empty()) return false;
@@ -101,7 +124,7 @@
std::vector<Value*> Indices;
Value *Src = CI.getOperand(0);
- const Type *Result = ConvertableToGEP(DestPTy, Src, Indices, &BI);
+ const Type *Result = ConvertableToGEP(DestPTy, Src, Indices, TD, &BI);
if (Result == 0) return false; // Not convertable...
PRINT_PEEPHOLE2("cast-add-to-gep:in", Src, CI);
@@ -155,7 +178,8 @@
// %t2 = cast <eltype> * %t3 to {<...>}*
//
static bool PeepholeOptimizeAddCast(BasicBlock *BB, BasicBlock::iterator &BI,
- Value *AddOp1, CastInst *AddOp2) {
+ Value *AddOp1, CastInst *AddOp2,
+ const TargetData &TD) {
const CompositeType *CompTy;
Value *OffsetVal = AddOp2->getOperand(0);
Value *SrcPtr = 0; // Of type pointer to struct...
@@ -172,7 +196,7 @@
return false;
std::vector<Value*> Indices;
- if (!ConvertableToGEP(SrcPtr->getType(), OffsetVal, Indices, &BI))
+ if (!ConvertableToGEP(SrcPtr->getType(), OffsetVal, Indices, TD, &BI))
return false; // Not convertable... perhaps next time
if (getPointedToComposite(AddOp1->getType())) { // case 1
@@ -190,8 +214,9 @@
return true;
}
-static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
+bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
Instruction *I = BI;
+ const TargetData &TD = getAnalysis<TargetData>();
if (CastInst *CI = dyn_cast<CastInst>(I)) {
Value *Src = CI->getOperand(0);
@@ -230,13 +255,13 @@
// destination type of the cast...
//
ConvertedTypes[CI] = CI->getType(); // Make sure the cast doesn't change
- if (ExpressionConvertableToType(Src, DestTy, ConvertedTypes)) {
+ if (ExpressionConvertableToType(Src, DestTy, ConvertedTypes, TD)) {
PRINT_PEEPHOLE3("CAST-SRC-EXPR-CONV:in ", Src, CI, BB->getParent());
DEBUG(cerr << "\nCONVERTING SRC EXPR TYPE:\n");
{ // ValueMap must be destroyed before function verified!
ValueMapCache ValueMap;
- Value *E = ConvertExpressionToType(Src, DestTy, ValueMap);
+ Value *E = ConvertExpressionToType(Src, DestTy, ValueMap, TD);
if (Constant *CPV = dyn_cast<Constant>(E))
CI->replaceAllUsesWith(CPV);
@@ -258,13 +283,13 @@
ConvertedTypes.clear();
// Make sure the source doesn't change type
ConvertedTypes[Src] = Src->getType();
- if (ValueConvertableToType(CI, Src->getType(), ConvertedTypes)) {
+ if (ValueConvertableToType(CI, Src->getType(), ConvertedTypes, TD)) {
PRINT_PEEPHOLE3("CAST-DEST-EXPR-CONV:in ", Src, CI, BB->getParent());
DEBUG(cerr << "\nCONVERTING EXPR TYPE:\n");
{ // ValueMap must be destroyed before function verified!
ValueMapCache ValueMap;
- ConvertValueToNewType(CI, Src, ValueMap); // This will delete CI!
+ ConvertValueToNewType(CI, Src, ValueMap, TD); // This will delete CI!
}
PRINT_PEEPHOLE1("CAST-DEST-EXPR-CONV:out", Src);
@@ -283,7 +308,7 @@
// so, convert the add into a getelementptr instruction...
//
if (const PointerType *DestPTy = dyn_cast<PointerType>(DestTy)) {
- if (HandleCastToPointer(BI, DestPTy)) {
+ if (HandleCastToPointer(BI, DestPTy, TD)) {
BI = BB->begin(); // Rescan basic block. BI might be invalidated.
++NumGEPInstFormed;
return true;
@@ -454,7 +479,7 @@
isa<CastInst>(I->getOperand(1))) {
if (PeepholeOptimizeAddCast(BB, BI, I->getOperand(0),
- cast<CastInst>(I->getOperand(1)))) {
+ cast<CastInst>(I->getOperand(1)), TD)) {
++NumGEPInstFormed;
return true;
}
@@ -500,7 +525,7 @@
-static bool DoRaisePass(Function &F) {
+bool RPR::DoRaisePass(Function &F) {
bool Changed = false;
for (Function::iterator BB = F.begin(), BBE = F.end(); BB != BBE; ++BB)
for (BasicBlock::iterator BI = BB->begin(); BI != BB->end();) {
@@ -520,17 +545,14 @@
}
-// RaisePointerReferences::doit - Raise a function representation to a higher
-// level.
-//
-static bool doRPR(Function &F) {
+// runOnFunction - Raise a function representation to a higher level.
+bool RPR::runOnFunction(Function &F) {
DEBUG(cerr << "\n\n\nStarting to work on Function '" << F.getName() << "'\n");
// Insert casts for all incoming pointer pointer values that are treated as
// arrays...
//
bool Changed = false, LocalChange;
-
// If the StartInst option was specified, then Peephole optimize that
// instruction first if it occurs in this function.
@@ -559,24 +581,3 @@
return Changed;
}
-
-namespace {
- struct RaisePointerReferences : public FunctionPass {
-
- // FIXME: constructor should save and use target data here!!
- RaisePointerReferences(const TargetData &TD) {}
-
- virtual bool runOnFunction(Function &F) { return doRPR(F); }
-
- virtual void getAnalysisUsage(AnalysisUsage &AU) const {
- AU.setPreservesCFG();
- }
- };
-}
-
-Pass *createRaisePointerReferencesPass(const TargetData &TD) {
- return new RaisePointerReferences(TD);
-}
-
-static RegisterOpt<RaisePointerReferences>
-X("raise", "Raise Pointer References", createRaisePointerReferencesPass);
Index: llvm/lib/Transforms/TransformInternals.cpp
diff -u llvm/lib/Transforms/TransformInternals.cpp:1.32 llvm/lib/Transforms/TransformInternals.cpp:1.33
--- llvm/lib/Transforms/TransformInternals.cpp:1.32 Wed Jan 22 20:39:10 2003
+++ llvm/lib/Transforms/TransformInternals.cpp Thu Apr 24 13:25:27 2003
@@ -11,15 +11,9 @@
#include "llvm/Function.h"
#include "llvm/iOther.h"
-// TargetData Hack: Eventually we will have annotations given to us by the
-// backend so that we know stuff about type size and alignments. For now
-// though, just use this, because it happens to match the model that GCC uses.
-//
-const TargetData TD("LevelRaise: Should be GCC though!");
-
-
static const Type *getStructOffsetStep(const StructType *STy, uint64_t &Offset,
- std::vector<Value*> &Indices) {
+ std::vector<Value*> &Indices,
+ const TargetData &TD) {
assert(Offset < TD.getTypeSize(STy) && "Offset not in composite!");
const StructLayout *SL = TD.getStructLayout(STy);
@@ -52,7 +46,7 @@
//
const Type *getStructOffsetType(const Type *Ty, unsigned &Offset,
std::vector<Value*> &Indices,
- bool StopEarly) {
+ const TargetData &TD, bool StopEarly) {
if (Offset == 0 && StopEarly && !Indices.empty())
return Ty; // Return the leaf type
@@ -60,7 +54,7 @@
const Type *NextType;
if (const StructType *STy = dyn_cast<StructType>(Ty)) {
ThisOffset = Offset;
- NextType = getStructOffsetStep(STy, ThisOffset, Indices);
+ NextType = getStructOffsetStep(STy, ThisOffset, Indices, TD);
} else if (const ArrayType *ATy = dyn_cast<ArrayType>(Ty)) {
assert(Offset < TD.getTypeSize(ATy) && "Offset not in composite!");
@@ -75,7 +69,7 @@
unsigned SubOffs = Offset - ThisOffset;
const Type *LeafTy = getStructOffsetType(NextType, SubOffs,
- Indices, StopEarly);
+ Indices, TD, StopEarly);
Offset = ThisOffset + SubOffs;
return LeafTy;
}
@@ -87,6 +81,7 @@
//
const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal,
std::vector<Value*> &Indices,
+ const TargetData &TD,
BasicBlock::iterator *BI) {
const CompositeType *CompTy = dyn_cast<CompositeType>(Ty);
if (CompTy == 0) return 0;
@@ -116,7 +111,7 @@
if (const StructType *StructTy = dyn_cast<StructType>(CompTy)) {
// Step into the appropriate element of the structure...
uint64_t ActualOffset = (Offset < 0) ? 0 : (uint64_t)Offset;
- NextTy = getStructOffsetStep(StructTy, ActualOffset, Indices);
+ NextTy = getStructOffsetStep(StructTy, ActualOffset, Indices, TD);
Offset -= ActualOffset;
} else {
const Type *ElTy = cast<SequentialType>(CompTy)->getElementType();
Index: llvm/lib/Transforms/TransformInternals.h
diff -u llvm/lib/Transforms/TransformInternals.h:1.16 llvm/lib/Transforms/TransformInternals.h:1.17
--- llvm/lib/Transforms/TransformInternals.h:1.16 Mon Sep 16 13:32:33 2002
+++ llvm/lib/Transforms/TransformInternals.h Thu Apr 24 13:25:27 2003
@@ -15,14 +15,6 @@
#include <map>
#include <set>
-// TargetData Hack: Eventually we will have annotations given to us by the
-// backend so that we know stuff about type size and alignments. For now
-// though, just use this, because it happens to match the model that GCC uses.
-//
-// FIXME: This should use annotations
-//
-extern const TargetData TD;
-
static inline int64_t getConstantValue(const ConstantInt *CPI) {
if (const ConstantSInt *CSI = dyn_cast<ConstantSInt>(CPI))
return CSI->getValue();
@@ -49,6 +41,7 @@
//
const Type *ConvertableToGEP(const Type *Ty, Value *V,
std::vector<Value*> &Indices,
+ const TargetData &TD,
BasicBlock::iterator *BI = 0);
@@ -112,14 +105,18 @@
};
-bool ExpressionConvertableToType(Value *V, const Type *Ty, ValueTypeCache &Map);
-Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC);
+bool ExpressionConvertableToType(Value *V, const Type *Ty, ValueTypeCache &Map,
+ const TargetData &TD);
+Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC,
+ const TargetData &TD);
// ValueConvertableToType - Return true if it is possible
bool ValueConvertableToType(Value *V, const Type *Ty,
- ValueTypeCache &ConvertedTypes);
+ ValueTypeCache &ConvertedTypes,
+ const TargetData &TD);
-void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC);
+void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC,
+ const TargetData &TD);
// getStructOffsetType - Return a vector of offsets that are to be used to index
@@ -135,6 +132,6 @@
//
const Type *getStructOffsetType(const Type *Ty, unsigned &Offset,
std::vector<Value*> &Offsets,
- bool StopEarly = true);
+ const TargetData &TD, bool StopEarly = true);
#endif
More information about the llvm-commits
mailing list