for (auto &B : MF) {
auto BA = newBlock(Func, &B);
+ BlockNodes.insert(std::make_pair(&B, BA));
for (auto &I : B) {
if (I.isDebugValue())
continue;
// Clear all information in the graph.
void DataFlowGraph::reset() {
Memory.clear();
+ BlockNodes.clear();
Func = NodeAddr<FuncNode*>();
}
assert(N);
for (auto I : *N) {
MachineBasicBlock *SB = I->getBlock();
- auto SBA = Func.Addr->findBlock(SB, *this);
+ auto SBA = findBlock(SB);
buildBlockRefs(SBA, RefM);
const auto &SRs = RefM[SBA.Id];
Refs.insert(SRs.begin(), SRs.end());
// Get the register references that are reachable from this block.
RegisterSet &Refs = RefM[BA.Id];
for (auto DB : IDF) {
- auto DBA = Func.Addr->findBlock(DB, *this);
+ auto DBA = findBlock(DB);
const auto &Rs = RefM[DBA.Id];
Refs.insert(Rs.begin(), Rs.end());
}
for (auto DB : IDF) {
- auto DBA = Func.Addr->findBlock(DB, *this);
+ auto DBA = findBlock(DB);
PhiM[DBA.Id].insert(Defs.begin(), Defs.end());
}
}
std::vector<NodeId> PredList;
const MachineBasicBlock *MBB = BA.Addr->getCode();
for (auto PB : MBB->predecessors()) {
- auto B = Func.Addr->findBlock(PB, *this);
+ auto B = findBlock(PB);
PredList.push_back(B.Id);
}
MachineDomTreeNode *N = MDT.getNode(BA.Addr->getCode());
for (auto I : *N) {
MachineBasicBlock *SB = I->getBlock();
- auto SBA = Func.Addr->findBlock(SB, *this);
+ auto SBA = findBlock(SB);
linkBlockRefs(DefM, SBA);
}
};
MachineBasicBlock *MBB = BA.Addr->getCode();
for (auto SB : MBB->successors()) {
- auto SBA = Func.Addr->findBlock(SB, *this);
+ auto SBA = findBlock(SB);
for (NodeAddr<InstrNode*> IA : SBA.Addr->members_if(IsPhi, *this)) {
// Go over each phi use associated with MBB, and link it.
for (auto U : IA.Addr->members_if(IsUseForBA, *this)) {
#include <functional>
#include <map>
#include <set>
+#include <unordered_map>
#include <vector>
namespace llvm {
StorageType Stack;
};
- typedef std::map<RegisterRef,DefStack> DefStackMap;
+ struct RegisterRefHasher {
+ unsigned operator() (RegisterRef RR) const {
+ return RR.Reg | (RR.Sub << 24);
+ }
+ };
+ // Make this std::unordered_map for speed of accessing elements.
+ typedef std::unordered_map<RegisterRef,DefStack,RegisterRefHasher>
+ DefStackMap;
void build(unsigned Options = BuildOptions::None);
void pushDefs(NodeAddr<InstrNode*> IA, DefStackMap &DM);
IA.Addr->removeMember(RA, *this);
}
+ NodeAddr<BlockNode*> findBlock(MachineBasicBlock *BB) {
+ return BlockNodes[BB];
+ }
+
TimerGroup TimeG;
NodeAddr<FuncNode*> Func;
NodeAllocator Memory;
+ // Local map: MachineBasicBlock -> NodeAddr<BlockNode*>
+ std::map<MachineBasicBlock*,NodeAddr<BlockNode*>> BlockNodes;
MachineFunction &MF;
const TargetInstrInfo &TII;