diff options
| author | Chris Lattner <sabre@nondot.org> | 2002-07-24 21:21:33 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2002-07-24 21:21:33 +0000 |
| commit | 6c21f2454b585c3dd423cf00b59ba1bcbbad5d47 (patch) | |
| tree | 93976f0469df71de6a647f81d7103ce5d954db40 /llvm | |
| parent | e583333ec901fefca61e159782a69cfa5fdb0bfb (diff) | |
| download | bcm5719-llvm-6c21f2454b585c3dd423cf00b59ba1bcbbad5d47.tar.gz bcm5719-llvm-6c21f2454b585c3dd423cf00b59ba1bcbbad5d47.zip | |
*** empty log message ***
llvm-svn: 3058
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/include/llvm/Target/TargetSchedInfo.h | 8 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/InstrSched/SchedPriorities.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/llvm/include/llvm/Target/TargetSchedInfo.h b/llvm/include/llvm/Target/TargetSchedInfo.h index ba065cba094..a08bd998150 100644 --- a/llvm/include/llvm/Target/TargetSchedInfo.h +++ b/llvm/include/llvm/Target/TargetSchedInfo.h @@ -245,14 +245,14 @@ public: inline int getMinIssueGap (MachineOpCode fromOp, MachineOpCode toOp) const { - std::hash_map<OpCodePair,int>::const_iterator + hash_map<OpCodePair,int>::const_iterator I = issueGaps.find(OpCodePair(fromOp, toOp)); return (I == issueGaps.end())? 0 : (*I).second; } inline const std::vector<MachineOpCode>* getConflictList(MachineOpCode opCode) const { - std::hash_map<MachineOpCode, std::vector<MachineOpCode> >::const_iterator + hash_map<MachineOpCode, std::vector<MachineOpCode> >::const_iterator I = conflictLists.find(opCode); return (I == conflictLists.end())? NULL : & (*I).second; } @@ -286,8 +286,8 @@ protected: unsigned numIssueDeltas; std::vector<InstrRUsage> instrRUsages; // indexed by opcode - std::hash_map<OpCodePair,int> issueGaps; // indexed by opcode pair - std::hash_map<MachineOpCode, std::vector<MachineOpCode> > + hash_map<OpCodePair,int> issueGaps; // indexed by opcode pair + hash_map<MachineOpCode, std::vector<MachineOpCode> > conflictLists; // indexed by opcode }; diff --git a/llvm/lib/CodeGen/InstrSched/SchedPriorities.h b/llvm/lib/CodeGen/InstrSched/SchedPriorities.h index b01c1a43d68..4d763d21c5f 100644 --- a/llvm/lib/CodeGen/InstrSched/SchedPriorities.h +++ b/llvm/lib/CodeGen/InstrSched/SchedPriorities.h @@ -157,13 +157,13 @@ private: cycles_t curTime; const SchedGraph* graph; FunctionLiveVarInfo &methodLiveVarInfo; - std::hash_map<const MachineInstr*, bool> lastUseMap; + hash_map<const MachineInstr*, bool> lastUseMap; std::vector<cycles_t> nodeDelayVec; std::vector<cycles_t> nodeEarliestUseVec; std::vector<cycles_t> earliestReadyTimeForNode; cycles_t earliestReadyTime; NodeHeap candsAsHeap; // candidate nodes, ready to go - std::hash_set<const SchedGraphNode*> candsAsSet;//same entries as candsAsHeap, + hash_set<const SchedGraphNode*> candsAsSet; //same entries as candsAsHeap, // but as set for fast lookup std::vector<candIndex> mcands; // holds pointers into cands candIndex nextToTry; // next cand after the last |
