diff options
Diffstat (limited to 'contrib/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp')
| -rw-r--r-- | contrib/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp | 119 |
1 files changed, 60 insertions, 59 deletions
diff --git a/contrib/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp b/contrib/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp index 08b8ed3..ff43a39 100644 --- a/contrib/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp +++ b/contrib/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp @@ -7,7 +7,6 @@ // //===----------------------------------------------------------------------===// // -// // This pass is used to make Pc relative loads of constants. // For now, only Mips16 will use this. // @@ -19,30 +18,43 @@ // This can be particularly helpful in static relocation mode for embedded // non-linux targets. // -// +//===----------------------------------------------------------------------===// #include "Mips.h" -#include "MCTargetDesc/MipsBaseInfo.h" #include "Mips16InstrInfo.h" #include "MipsMachineFunction.h" -#include "MipsTargetMachine.h" +#include "MipsSubtarget.h" +#include "llvm/ADT/STLExtras.h" +#include "llvm/ADT/SmallSet.h" +#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/Statistic.h" +#include "llvm/ADT/StringRef.h" #include "llvm/CodeGen/MachineBasicBlock.h" #include "llvm/CodeGen/MachineConstantPool.h" +#include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineFunctionPass.h" +#include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/MachineInstrBuilder.h" +#include "llvm/CodeGen/MachineOperand.h" #include "llvm/CodeGen/MachineRegisterInfo.h" +#include "llvm/IR/Constants.h" +#include "llvm/IR/DataLayout.h" +#include "llvm/IR/DebugLoc.h" #include "llvm/IR/Function.h" -#include "llvm/IR/InstIterator.h" +#include "llvm/IR/Type.h" #include "llvm/Support/CommandLine.h" +#include "llvm/Support/Compiler.h" #include "llvm/Support/Debug.h" +#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/Format.h" #include "llvm/Support/MathExtras.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/Target/TargetInstrInfo.h" -#include "llvm/Target/TargetMachine.h" -#include "llvm/Target/TargetRegisterInfo.h" #include <algorithm> +#include <cassert> +#include <cstdint> +#include <iterator> +#include <new> +#include <vector> using namespace llvm; @@ -58,7 +70,6 @@ static cl::opt<bool> AlignConstantIslands("mips-align-constant-islands", cl::Hidden, cl::init(true), cl::desc("Align constant islands in code")); - // Rather than do make check tests with huge amounts of code, we force // the test to use this amount. // @@ -178,7 +189,6 @@ static unsigned int branchMaxOffsets(unsigned int Opcode) { namespace { - typedef MachineBasicBlock::iterator Iter; typedef MachineBasicBlock::reverse_iterator ReverseIter; @@ -195,7 +205,6 @@ namespace { /// tracks a list of users. class MipsConstantIslands : public MachineFunctionPass { - /// BasicBlockInfo - Information about the offset and size of a single /// basic block. struct BasicBlockInfo { @@ -208,14 +217,16 @@ namespace { /// /// Because worst case padding is used, the computed offset of an aligned /// block may not actually be aligned. - unsigned Offset; + unsigned Offset = 0; /// Size - Size of the basic block in bytes. If the block contains /// inline assembly, this is a worst case estimate. /// /// The size does not include any alignment padding whether from the /// beginning of the block, or from an aligned jump table at the end. - unsigned Size; + unsigned Size = 0; + + BasicBlockInfo() = default; // FIXME: ignore LogAlign for this patch // @@ -223,9 +234,6 @@ namespace { unsigned PO = Offset + Size; return PO; } - - BasicBlockInfo() : Offset(0), Size(0) {} - }; std::vector<BasicBlockInfo> BBInfo; @@ -257,13 +265,16 @@ namespace { MachineInstr *MI; MachineInstr *CPEMI; MachineBasicBlock *HighWaterMark; + private: unsigned MaxDisp; unsigned LongFormMaxDisp; // mips16 has 16/32 bit instructions // with different displacements unsigned LongFormOpcode; + public: bool NegOk; + CPUser(MachineInstr *mi, MachineInstr *cpemi, unsigned maxdisp, bool neg, unsigned longformmaxdisp, unsigned longformopcode) @@ -272,18 +283,22 @@ namespace { NegOk(neg){ HighWaterMark = CPEMI->getParent(); } + /// getMaxDisp - Returns the maximum displacement supported by MI. unsigned getMaxDisp() const { unsigned xMaxDisp = ConstantIslandsSmallOffset? ConstantIslandsSmallOffset: MaxDisp; return xMaxDisp; } + void setMaxDisp(unsigned val) { MaxDisp = val; } + unsigned getLongFormMaxDisp() const { return LongFormMaxDisp; } + unsigned getLongFormOpcode() const { return LongFormOpcode; } @@ -300,6 +315,7 @@ namespace { MachineInstr *CPEMI; unsigned CPI; unsigned RefCount; + CPEntry(MachineInstr *cpemi, unsigned cpi, unsigned rc = 0) : CPEMI(cpemi), CPI(cpi), RefCount(rc) {} }; @@ -309,7 +325,7 @@ namespace { /// existed upon entry to this pass), it keeps a vector of entries. /// Original elements are cloned as we go along; the clones are /// put in the vector of the original element, but have distinct CPIs. - std::vector<std::vector<CPEntry> > CPEntries; + std::vector<std::vector<CPEntry>> CPEntries; /// ImmBranch - One per immediate branch, keeping the machine instruction /// pointer, conditional or unconditional, the max displacement, @@ -320,6 +336,7 @@ namespace { unsigned MaxDisp : 31; bool isCond : 1; int UncondBr; + ImmBranch(MachineInstr *mi, unsigned maxdisp, bool cond, int ubr) : MI(mi), MaxDisp(maxdisp), isCond(cond), UncondBr(ubr) {} }; @@ -332,29 +349,27 @@ namespace { /// the branch fix up pass. bool HasFarJump; - const MipsSubtarget *STI; + const MipsSubtarget *STI = nullptr; const Mips16InstrInfo *TII; MipsFunctionInfo *MFI; - MachineFunction *MF; - MachineConstantPool *MCP; + MachineFunction *MF = nullptr; + MachineConstantPool *MCP = nullptr; unsigned PICLabelUId; - bool PrescannedForConstants; + bool PrescannedForConstants = false; void initPICLabelUId(unsigned UId) { PICLabelUId = UId; } - unsigned createPICLabelUId() { return PICLabelUId++; } public: static char ID; - MipsConstantIslands() - : MachineFunctionPass(ID), STI(nullptr), MF(nullptr), MCP(nullptr), - PrescannedForConstants(false) {} + + MipsConstantIslands() : MachineFunctionPass(ID) {} StringRef getPassName() const override { return "Mips Constant Islands"; } @@ -403,13 +418,11 @@ namespace { bool fixupUnconditionalBr(ImmBranch &Br); void prescanForConstants(); - - private: - }; char MipsConstantIslands::ID = 0; -} // end of anonymous namespace + +} // end anonymous namespace bool MipsConstantIslands::isOffsetInRange (unsigned UserOffset, unsigned TrialOffset, @@ -417,20 +430,17 @@ bool MipsConstantIslands::isOffsetInRange return isOffsetInRange(UserOffset, TrialOffset, U.getMaxDisp(), U.NegOk); } + +#if !defined(NDEBUG) || defined(LLVM_ENABLE_DUMP) /// print block size and offset information - debugging -void MipsConstantIslands::dumpBBs() { - DEBUG({ - for (unsigned J = 0, E = BBInfo.size(); J !=E; ++J) { - const BasicBlockInfo &BBI = BBInfo[J]; - dbgs() << format("%08x BB#%u\t", BBI.Offset, J) - << format(" size=%#x\n", BBInfo[J].Size); - } - }); -} -/// Returns a pass that converts branches to long branches. -FunctionPass *llvm::createMipsConstantIslandPass() { - return new MipsConstantIslands(); +LLVM_DUMP_METHOD void MipsConstantIslands::dumpBBs() { + for (unsigned J = 0, E = BBInfo.size(); J !=E; ++J) { + const BasicBlockInfo &BBI = BBInfo[J]; + dbgs() << format("%08x BB#%u\t", BBI.Offset, J) + << format(" size=%#x\n", BBInfo[J].Size); + } } +#endif bool MipsConstantIslands::runOnMachineFunction(MachineFunction &mf) { // The intention is for this to be a mips16 only pass for now @@ -527,7 +537,6 @@ MipsConstantIslands::doInitialPlacement(std::vector<MachineInstr*> &CPEMIs) { MachineBasicBlock *BB = MF->CreateMachineBasicBlock(); MF->push_back(BB); - // MachineConstantPool measures alignment in bytes. We measure in log2(bytes). unsigned MaxAlign = Log2_32(MCP->getConstantPoolAlignment()); @@ -647,7 +656,6 @@ initializeFunctionInfo(const std::vector<MachineInstr*> &CPEMIs) { for (MachineFunction::iterator I = MF->begin(), E = MF->end(); I != E; ++I) computeBlockSize(&*I); - // Compute block offsets. adjustBBOffsetsAfter(&MF->front()); @@ -737,7 +745,6 @@ initializeFunctionInfo(const std::vector<MachineInstr*> &CPEMIs) { if (Opc == Mips::CONSTPOOL_ENTRY) continue; - // Scan the instructions for constant pool operands. for (unsigned op = 0, e = MI.getNumOperands(); op != e; ++op) if (MI.getOperand(op).isCPI()) { @@ -784,12 +791,9 @@ initializeFunctionInfo(const std::vector<MachineInstr*> &CPEMIs) { // Instructions can only use one CP entry, don't bother scanning the // rest of the operands. break; - } - } } - } /// computeBlockSize - Compute the size and some alignment information for MBB. @@ -921,8 +925,6 @@ MipsConstantIslands::splitBlockBeforeInstr(MachineInstr &MI) { return NewBB; } - - /// isOffsetInRange - Checks whether UserOffset (the location of a constant pool /// reference) is within MaxDisp of TrialOffset (a proposed location of a /// constant pool entry). @@ -1337,7 +1339,6 @@ bool MipsConstantIslands::handleConstantPoolUser(unsigned CPUserIndex) { if (result==1) return false; else if (result==2) return true; - // Look for water where we can place this CPE. MachineBasicBlock *NewIsland = MF->CreateMachineBasicBlock(); MachineBasicBlock *NewMBB; @@ -1371,7 +1372,7 @@ bool MipsConstantIslands::handleConstantPoolUser(unsigned CPUserIndex) { // it. Check for this so it will be removed from the WaterList. // Also remove any entry from NewWaterList. MachineBasicBlock *WaterBB = &*--NewMBB->getIterator(); - IP = find(WaterList, WaterBB); + IP = llvm::find(WaterList, WaterBB); if (IP != WaterList.end()) NewWaterList.erase(WaterBB); @@ -1473,9 +1474,7 @@ bool MipsConstantIslands::removeUnusedCPEntries() { /// specific BB can fit in MI's displacement field. bool MipsConstantIslands::isBBInRange (MachineInstr *MI,MachineBasicBlock *DestBB, unsigned MaxDisp) { - -unsigned PCAdj = 4; - + unsigned PCAdj = 4; unsigned BrOffset = getOffsetOf(MI) + PCAdj; unsigned DestOffset = BBInfo[DestBB->getNumber()].Offset; @@ -1553,7 +1552,6 @@ MipsConstantIslands::fixupUnconditionalBr(ImmBranch &Br) { return true; } - /// fixupConditionalBr - Fix up a conditional branch whose destination is too /// far away to fit in its displacement field. It is converted to an inverse /// conditional branch + an unconditional branch to the destination. @@ -1614,7 +1612,6 @@ MipsConstantIslands::fixupConditionalBr(ImmBranch &Br) { } } - if (NeedSplit) { splitBlockBeforeInstr(*MI); // No need for the branch to the next block. We're adding an unconditional @@ -1654,7 +1651,6 @@ MipsConstantIslands::fixupConditionalBr(ImmBranch &Br) { return true; } - void MipsConstantIslands::prescanForConstants() { unsigned J = 0; (void)J; @@ -1667,11 +1663,11 @@ void MipsConstantIslands::prescanForConstants() { PrescannedForConstants = true; DEBUG(dbgs() << "constant island constant " << *I << "\n"); J = I->getNumOperands(); - DEBUG(dbgs() << "num operands " << J << "\n"); + DEBUG(dbgs() << "num operands " << J << "\n"); MachineOperand& Literal = I->getOperand(1); if (Literal.isImm()) { int64_t V = Literal.getImm(); - DEBUG(dbgs() << "literal " << V << "\n"); + DEBUG(dbgs() << "literal " << V << "\n"); Type *Int32Ty = Type::getInt32Ty(MF->getFunction()->getContext()); const Constant *C = ConstantInt::get(Int32Ty, V); @@ -1692,3 +1688,8 @@ void MipsConstantIslands::prescanForConstants() { } } } + +/// Returns a pass that converts branches to long branches. +FunctionPass *llvm::createMipsConstantIslandPass() { + return new MipsConstantIslands(); +} |
