X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FCodeGen%2FMachineFunction.cpp;h=037e3e483f634b4e8d470ca31e9cac4beeaf46da;hb=4ee451de366474b9c228b4e5fa573795a715216d;hp=05e863be75068ac384b44eedaac956833867a149;hpb=f8c68f694c25b1ae8c0e5adb2a19432cb405d232;p=oota-llvm.git diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp index 05e863be750..037e3e483f6 100644 --- a/lib/CodeGen/MachineFunction.cpp +++ b/lib/CodeGen/MachineFunction.cpp @@ -2,8 +2,8 @@ // // 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 is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. // //===----------------------------------------------------------------------===// // @@ -13,6 +13,7 @@ // //===----------------------------------------------------------------------===// +#include "llvm/DerivedTypes.h" #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/SSARegMap.h" @@ -21,31 +22,35 @@ #include "llvm/CodeGen/MachineJumpTableInfo.h" #include "llvm/CodeGen/Passes.h" #include "llvm/Target/TargetData.h" +#include "llvm/Target/TargetLowering.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Function.h" #include "llvm/Instructions.h" -#include "llvm/Support/LeakDetector.h" +#include "llvm/Support/Compiler.h" #include "llvm/Support/GraphWriter.h" -#include "llvm/Support/Visibility.h" +#include "llvm/Support/LeakDetector.h" +#include "llvm/ADT/STLExtras.h" #include "llvm/Config/config.h" #include -#include #include - using namespace llvm; static AnnotationID MF_AID( AnnotationManager::getID("CodeGen::MachineCodeForFunction")); +// Out of line virtual function to home classes. +void MachineFunctionPass::virtfn() {} namespace { struct VISIBILITY_HIDDEN Printer : public MachineFunctionPass { + static char ID; + std::ostream *OS; const std::string Banner; - Printer (std::ostream *_OS, const std::string &_Banner) : - OS (_OS), Banner (_Banner) { } + Printer (std::ostream *_OS, const std::string &_Banner) + : MachineFunctionPass((intptr_t)&ID), OS (_OS), Banner (_Banner) { } const char *getPassName() const { return "MachineFunction Printer"; } @@ -59,6 +64,7 @@ namespace { return false; } }; + char Printer::ID = 0; } /// Returns a newly-created MachineFunction Printer pass. The default output @@ -71,6 +77,9 @@ FunctionPass *llvm::createMachineFunctionPrinterPass(std::ostream *OS, namespace { struct VISIBILITY_HIDDEN Deleter : public MachineFunctionPass { + static char ID; + Deleter() : MachineFunctionPass((intptr_t)&ID) {} + const char *getPassName() const { return "Machine Code Deleter"; } bool runOnMachineFunction(MachineFunction &MF) { @@ -79,6 +88,7 @@ namespace { return true; } }; + char Deleter::ID = 0; } /// MachineCodeDeletion Pass - This pass deletes all of the machine code for @@ -111,12 +121,21 @@ void ilist_traits::transferNodesFromList( MachineFunction::MachineFunction(const Function *F, const TargetMachine &TM) - : Annotation(MF_AID), Fn(F), Target(TM), UsedPhysRegs(0) { + : Annotation(MF_AID), Fn(F), Target(TM) { SSARegMapping = new SSARegMap(); MFInfo = 0; FrameInfo = new MachineFrameInfo(); ConstantPool = new MachineConstantPool(TM.getTargetData()); - JumpTableInfo = new MachineJumpTableInfo(TM.getTargetData()); + UsedPhysRegs.resize(TM.getRegisterInfo()->getNumRegs()); + + // Set up jump table. + const TargetData &TD = *TM.getTargetData(); + bool IsPic = TM.getRelocationModel() == Reloc::PIC_; + unsigned EntrySize = IsPic ? 4 : TD.getPointerSize(); + unsigned Alignment = IsPic ? TD.getABITypeAlignment(Type::Int32Ty) + : TD.getPointerABIAlignment(); + JumpTableInfo = new MachineJumpTableInfo(EntrySize, Alignment); + BasicBlocks.Parent = this; } @@ -127,10 +146,53 @@ MachineFunction::~MachineFunction() { delete FrameInfo; delete ConstantPool; delete JumpTableInfo; - delete[] UsedPhysRegs; } -void MachineFunction::dump() const { print(std::cerr); } + +/// RenumberBlocks - This discards all of the MachineBasicBlock numbers and +/// recomputes them. This guarantees that the MBB numbers are sequential, +/// dense, and match the ordering of the blocks within the function. If a +/// specific MachineBasicBlock is specified, only that block and those after +/// it are renumbered. +void MachineFunction::RenumberBlocks(MachineBasicBlock *MBB) { + if (empty()) { MBBNumbering.clear(); return; } + MachineFunction::iterator MBBI, E = end(); + if (MBB == 0) + MBBI = begin(); + else + MBBI = MBB; + + // Figure out the block number this should have. + unsigned BlockNo = 0; + if (MBBI != begin()) + BlockNo = prior(MBBI)->getNumber()+1; + + for (; MBBI != E; ++MBBI, ++BlockNo) { + if (MBBI->getNumber() != (int)BlockNo) { + // Remove use of the old number. + if (MBBI->getNumber() != -1) { + assert(MBBNumbering[MBBI->getNumber()] == &*MBBI && + "MBB number mismatch!"); + MBBNumbering[MBBI->getNumber()] = 0; + } + + // If BlockNo is already taken, set that block's number to -1. + if (MBBNumbering[BlockNo]) + MBBNumbering[BlockNo]->setNumber(-1); + + MBBNumbering[BlockNo] = MBBI; + MBBI->setNumber(BlockNo); + } + } + + // Okay, all the blocks are renumbered. If we have compactified the block + // numbering, shrink MBBNumbering now. + assert(BlockNo <= MBBNumbering.size() && "Mismatch!"); + MBBNumbering.resize(BlockNo); +} + + +void MachineFunction::dump() const { print(*cerr.stream()); } void MachineFunction::print(std::ostream &OS) const { OS << "# Machine code for " << Fn->getName () << "():\n"; @@ -146,7 +208,7 @@ void MachineFunction::print(std::ostream &OS) const { const MRegisterInfo *MRI = getTarget().getRegisterInfo(); - if (livein_begin() != livein_end()) { + if (!livein_empty()) { OS << "Live Ins:"; for (livein_iterator I = livein_begin(), E = livein_end(); I != E; ++I) { if (MRI) @@ -159,7 +221,7 @@ void MachineFunction::print(std::ostream &OS) const { } OS << "\n"; } - if (liveout_begin() != liveout_end()) { + if (!liveout_empty()) { OS << "Live Outs:"; for (liveout_iterator I = liveout_begin(), E = liveout_end(); I != E; ++I) if (MRI) @@ -221,8 +283,8 @@ void MachineFunction::viewCFG() const #ifndef NDEBUG ViewGraph(this, "mf" + getFunction()->getName()); #else - std::cerr << "SelectionDAG::viewGraph is only available in debug builds on " - << "systems with Graphviz or gv!\n"; + cerr << "SelectionDAG::viewGraph is only available in debug builds on " + << "systems with Graphviz or gv!\n"; #endif // NDEBUG } @@ -287,7 +349,7 @@ void MachineFrameInfo::print(const MachineFunction &MF, std::ostream &OS) const{ if (i < NumFixedObjects) OS << " fixed"; if (i < NumFixedObjects || SO.SPOffset != -1) { - int Off = SO.SPOffset - ValOffset; + int64_t Off = SO.SPOffset - ValOffset; OS << " at location [SP"; if (Off > 0) OS << "+" << Off; @@ -303,7 +365,7 @@ void MachineFrameInfo::print(const MachineFunction &MF, std::ostream &OS) const{ } void MachineFrameInfo::dump(const MachineFunction &MF) const { - print(MF, std::cerr); + print(MF, *cerr.stream()); } @@ -315,7 +377,8 @@ void MachineFrameInfo::dump(const MachineFunction &MF) const { /// or return an existing one. /// unsigned MachineJumpTableInfo::getJumpTableIndex( - std::vector &DestBBs) { + const std::vector &DestBBs) { + assert(!DestBBs.empty() && "Cannot create an empty jump table!"); for (unsigned i = 0, e = JumpTables.size(); i != e; ++i) if (JumpTables[i].MBBs == DestBBs) return i; @@ -334,21 +397,25 @@ void MachineJumpTableInfo::print(std::ostream &OS) const { } } -unsigned MachineJumpTableInfo::getEntrySize() const { - return TD->getPointerSize(); -} - -unsigned MachineJumpTableInfo::getAlignment() const { - return TD->getPointerAlignment(); -} - -void MachineJumpTableInfo::dump() const { print(std::cerr); } +void MachineJumpTableInfo::dump() const { print(*cerr.stream()); } //===----------------------------------------------------------------------===// // MachineConstantPool implementation //===----------------------------------------------------------------------===// +const Type *MachineConstantPoolEntry::getType() const { + if (isMachineConstantPoolEntry()) + return Val.MachineCPVal->getType(); + return Val.ConstVal->getType(); +} + +MachineConstantPool::~MachineConstantPool() { + for (unsigned i = 0, e = Constants.size(); i != e; ++i) + if (Constants[i].isMachineConstantPoolEntry()) + delete Constants[i].Val.MachineCPVal; +} + /// getConstantPoolIndex - Create a new entry in the constant pool or return /// an existing one. User must specify an alignment in bytes for the object. /// @@ -362,13 +429,13 @@ unsigned MachineConstantPool::getConstantPoolIndex(Constant *C, // FIXME, this could be made much more efficient for large constant pools. unsigned AlignMask = (1 << Alignment)-1; for (unsigned i = 0, e = Constants.size(); i != e; ++i) - if (Constants[i].Val == C && (Constants[i].Offset & AlignMask) == 0) + if (Constants[i].Val.ConstVal == C && (Constants[i].Offset & AlignMask)== 0) return i; unsigned Offset = 0; if (!Constants.empty()) { - Offset = Constants.back().Offset; - Offset += TD->getTypeSize(Constants.back().Val->getType()); + Offset = Constants.back().getOffset(); + Offset += TD->getABITypeSize(Constants.back().getType()); Offset = (Offset+AlignMask)&~AlignMask; } @@ -376,13 +443,41 @@ unsigned MachineConstantPool::getConstantPoolIndex(Constant *C, return Constants.size()-1; } +unsigned MachineConstantPool::getConstantPoolIndex(MachineConstantPoolValue *V, + unsigned Alignment) { + assert(Alignment && "Alignment must be specified!"); + if (Alignment > PoolAlignment) PoolAlignment = Alignment; + + // Check to see if we already have this constant. + // + // FIXME, this could be made much more efficient for large constant pools. + unsigned AlignMask = (1 << Alignment)-1; + int Idx = V->getExistingMachineCPValue(this, Alignment); + if (Idx != -1) + return (unsigned)Idx; + + unsigned Offset = 0; + if (!Constants.empty()) { + Offset = Constants.back().getOffset(); + Offset += TD->getABITypeSize(Constants.back().getType()); + Offset = (Offset+AlignMask)&~AlignMask; + } + + Constants.push_back(MachineConstantPoolEntry(V, Offset)); + return Constants.size()-1; +} + void MachineConstantPool::print(std::ostream &OS) const { for (unsigned i = 0, e = Constants.size(); i != e; ++i) { - OS << " is" << *(Value*)Constants[i].Val; - OS << " , offset=" << Constants[i].Offset; + OS << " is"; + if (Constants[i].isMachineConstantPoolEntry()) + Constants[i].Val.MachineCPVal->print(OS); + else + OS << *(Value*)Constants[i].Val.ConstVal; + OS << " , offset=" << Constants[i].getOffset(); OS << "\n"; } } -void MachineConstantPool::dump() const { print(std::cerr); } +void MachineConstantPool::dump() const { print(*cerr.stream()); }