-//===- LevelRaise.cpp - Code to change LLVM to higher level -----------------=//
+//===- LevelRaise.cpp - Code to change LLVM to higher level ---------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
//
// This file implements the 'raising' part of the LevelChange API. This is
// useful because, in general, it makes the LLVM code terser and easier to
//
//===----------------------------------------------------------------------===//
-#include "llvm/Transforms/RaisePointerReferences.h"
+#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/Utils/Local.h"
#include "TransformInternals.h"
#include "llvm/iOther.h"
#include "llvm/Analysis/Expressions.h"
#include "llvm/Analysis/Verifier.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
-#include "Support/STLExtras.h"
-#include "Support/Statistic.h"
#include "Support/CommandLine.h"
+#include "Support/Debug.h"
+#include "Support/Statistic.h"
+#include "Support/STLExtras.h"
#include <algorithm>
-using std::cerr;
+
+namespace llvm {
// StartInst - This enables the -raise-start-inst=foo option to cause the level
// raising pass to start at instruction "foo", which is immensely useful for
static Statistic<>
NumVarargCallChanges("raise", "Number of vararg call peepholes");
-
#define PRINT_PEEPHOLE(ID, NUM, I) \
DEBUG(std::cerr << "Inst P/H " << ID << "[" << NUM << "] " << I)
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
// cast instruction would cause the underlying bits to change.
//
static inline bool isReinterpretingCast(const CastInst *CI) {
- return!CI->getOperand(0)->getType()->isLosslesslyConvertableTo(CI->getType());
+ return!CI->getOperand(0)->getType()->isLosslesslyConvertibleTo(CI->getType());
}
CastInst &CI = cast<CastInst>(*BI);
if (CI.use_empty()) return false;
- // Scan all of the uses, looking for any uses that are not add
+ // Scan all of the uses, looking for any uses that are not add or sub
// instructions. If we have non-adds, do not make this transformation.
//
+ bool HasSubUse = false; // Keep track of any subtracts...
for (Value::use_iterator I = CI.use_begin(), E = CI.use_end();
- I != E; ++I) {
+ I != E; ++I)
if (BinaryOperator *BO = dyn_cast<BinaryOperator>(*I)) {
- if (BO->getOpcode() != Instruction::Add ||
+ if ((BO->getOpcode() != Instruction::Add &&
+ BO->getOpcode() != Instruction::Sub) ||
// Avoid add sbyte* %X, %X cases...
BO->getOperand(0) == BO->getOperand(1))
return false;
+ else
+ HasSubUse |= BO->getOpcode() == Instruction::Sub;
} else {
return false;
}
- }
std::vector<Value*> Indices;
Value *Src = CI.getOperand(0);
- const Type *Result = ConvertableToGEP(DestPTy, Src, Indices, TD, &BI);
- if (Result == 0) return false; // Not convertable...
+ const Type *Result = ConvertibleToGEP(DestPTy, Src, Indices, TD, &BI);
+ if (Result == 0) return false; // Not convertible...
+
+ // Cannot handle subtracts if there is more than one index required...
+ if (HasSubUse && Indices.size() != 1) return false;
PRINT_PEEPHOLE2("cast-add-to-gep:in", Src, CI);
// add instruction uses into getelementptr's.
while (!CI.use_empty()) {
BinaryOperator *I = cast<BinaryOperator>(*CI.use_begin());
- assert(I->getOpcode() == Instruction::Add && I->getNumOperands() == 2 &&
+ assert((I->getOpcode() == Instruction::Add ||
+ I->getOpcode() == Instruction::Sub) &&
"Use is not a valid add instruction!");
// Get the value added to the cast result pointer...
Instruction *GEP = new GetElementPtrInst(OtherPtr, Indices, I->getName());
PRINT_PEEPHOLE1("cast-add-to-gep:i", I);
+ // If the instruction is actually a subtract, we are guaranteed to only have
+ // one index (from code above), so we just need to negate the pointer index
+ // long value.
+ if (I->getOpcode() == Instruction::Sub) {
+ Instruction *Neg = BinaryOperator::createNeg(GEP->getOperand(1),
+ GEP->getOperand(1)->getName()+".neg", I);
+ GEP->setOperand(1, Neg);
+ }
+
if (GEP->getType() == I->getType()) {
// Replace the old add instruction with the shiny new GEP inst
ReplaceInstWithInst(I, GEP);
return false;
std::vector<Value*> Indices;
- if (!ConvertableToGEP(SrcPtr->getType(), OffsetVal, Indices, TD, &BI))
- return false; // Not convertable... perhaps next time
+ if (!ConvertibleToGEP(SrcPtr->getType(), OffsetVal, Indices, TD, &BI))
+ return false; // Not convertible... perhaps next time
if (getPointedToComposite(AddOp1->getType())) { // case 1
PRINT_PEEPHOLE2("add-to-gep1:in", AddOp2, *BI);
// destination type of the cast...
//
ConvertedTypes[CI] = CI->getType(); // Make sure the cast doesn't change
- if (ExpressionConvertableToType(Src, DestTy, ConvertedTypes, TD)) {
+ if (ExpressionConvertibleToType(Src, DestTy, ConvertedTypes, TD)) {
PRINT_PEEPHOLE3("CAST-SRC-EXPR-CONV:in ", Src, CI, BB->getParent());
- DEBUG(cerr << "\nCONVERTING SRC EXPR TYPE:\n");
+ DEBUG(std::cerr << "\nCONVERTING SRC EXPR TYPE:\n");
{ // ValueMap must be destroyed before function verified!
ValueMapCache ValueMap;
Value *E = ConvertExpressionToType(Src, DestTy, ValueMap, TD);
CI->replaceAllUsesWith(CPV);
PRINT_PEEPHOLE1("CAST-SRC-EXPR-CONV:out", E);
- DEBUG(cerr << "DONE CONVERTING SRC EXPR TYPE: \n" << BB->getParent());
+ DEBUG(std::cerr << "DONE CONVERTING SRC EXPR TYPE: \n"
+ << BB->getParent());
}
DEBUG(assert(verifyFunction(*BB->getParent()) == false &&
ConvertedTypes.clear();
// Make sure the source doesn't change type
ConvertedTypes[Src] = Src->getType();
- if (ValueConvertableToType(CI, Src->getType(), ConvertedTypes, TD)) {
+ if (ValueConvertibleToType(CI, Src->getType(), ConvertedTypes, TD)) {
PRINT_PEEPHOLE3("CAST-DEST-EXPR-CONV:in ", Src, CI, BB->getParent());
- DEBUG(cerr << "\nCONVERTING EXPR TYPE:\n");
+ DEBUG(std::cerr << "\nCONVERTING EXPR TYPE:\n");
{ // ValueMap must be destroyed before function verified!
ValueMapCache ValueMap;
ConvertValueToNewType(CI, Src, ValueMap, TD); // This will delete CI!
}
PRINT_PEEPHOLE1("CAST-DEST-EXPR-CONV:out", Src);
- DEBUG(cerr << "DONE CONVERTING EXPR TYPE: \n\n" << BB->getParent());
+ DEBUG(std::cerr << "DONE CONVERTING EXPR TYPE: \n\n" << BB->getParent());
DEBUG(assert(verifyFunction(*BB->getParent()) == false &&
"Function broken!"));
}
// If it doesn't have an add use, check to see if the dest type is
- // losslessly convertable to one of the types in the start of the struct
+ // losslessly convertible to one of the types in the start of the struct
// type.
//
if (!HasAddUse) {
Indices.push_back(Constant::getNullValue(CurCTy->getIndexType()));
// Did we find what we're looking for?
- if (ElTy->isLosslesslyConvertableTo(DestPointedTy)) break;
+ if (ElTy->isLosslesslyConvertibleTo(DestPointedTy)) break;
// Nope, go a level deeper.
++Depth;
Value *Pointer = SI->getPointerOperand();
// Peephole optimize the following instructions:
- // %t = cast <T1>* %P to <T2> * ;; If T1 is losslessly convertable to T2
+ // %t = cast <T1>* %P to <T2> * ;; If T1 is losslessly convertible to T2
// store <T2> %V, <T2>* %t
//
// Into:
if (CastInst *CI = dyn_cast<CastInst>(Pointer))
if (Value *CastSrc = CI->getOperand(0)) // CSPT = CastSrcPointerType
if (const PointerType *CSPT = dyn_cast<PointerType>(CastSrc->getType()))
- // convertable types?
- if (Val->getType()->isLosslesslyConvertableTo(CSPT->getElementType())) {
+ // convertible types?
+ if (Val->getType()->isLosslesslyConvertibleTo(CSPT->getElementType())) {
PRINT_PEEPHOLE3("st-src-cast:in ", Pointer, Val, SI);
// Insert the new T cast instruction... stealing old T's name
cast<PointerType>(Pointer->getType())->getElementType();
// Peephole optimize the following instructions:
- // %Val = cast <T1>* to <T2>* ;; If T1 is losslessly convertable to T2
+ // %Val = cast <T1>* to <T2>* ;; If T1 is losslessly convertible to T2
// %t = load <T2>* %P
//
// Into:
if (CastInst *CI = dyn_cast<CastInst>(Pointer))
if (Value *CastSrc = CI->getOperand(0)) // CSPT = CastSrcPointerType
if (const PointerType *CSPT = dyn_cast<PointerType>(CastSrc->getType()))
- // convertable types?
- if (PtrElType->isLosslesslyConvertableTo(CSPT->getElementType())) {
+ // convertible types?
+ if (PtrElType->isLosslesslyConvertibleTo(CSPT->getElementType())) {
PRINT_PEEPHOLE2("load-src-cast:in ", Pointer, LI);
// Create the new load instruction... loading the pre-casted value
bool Changed = false;
for (Function::iterator BB = F.begin(), BBE = F.end(); BB != BBE; ++BB)
for (BasicBlock::iterator BI = BB->begin(); BI != BB->end();) {
- DEBUG(cerr << "Processing: " << *BI);
- if (dceInstruction(BI) || doConstantPropogation(BI)) {
+ DEBUG(std::cerr << "Processing: " << *BI);
+ if (dceInstruction(BI) || doConstantPropagation(BI)) {
Changed = true;
++NumDCEorCP;
- DEBUG(cerr << "***\t\t^^-- Dead code eliminated!\n");
+ DEBUG(std::cerr << "***\t\t^^-- Dead code eliminated!\n");
} else if (PeepholeOptimize(BB, BI)) {
Changed = true;
} else {
// 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");
+ DEBUG(std::cerr << "\n\n\nStarting to work on Function '" << F.getName()
+ << "'\n");
// Insert casts for all incoming pointer pointer values that are treated as
// arrays...
}
do {
- DEBUG(cerr << "Looping: \n" << F);
+ DEBUG(std::cerr << "Looping: \n" << F);
// Iterate over the function, refining it, until it converges on a stable
// state
return Changed;
}
+
+} // End llvm namespace
projects / oota-llvm.git / blobdiff