From: Chris Lattner Date: Wed, 24 Jul 2002 21:21:33 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cb6289a73d8caaad87da1b26f03b9b63b7b712cc;p=oota-llvm.git *** empty log message *** git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3058 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/Target/TargetSchedInfo.h b/include/llvm/Target/TargetSchedInfo.h index ba065cba094..a08bd998150 100644 --- a/include/llvm/Target/TargetSchedInfo.h +++ b/include/llvm/Target/TargetSchedInfo.h @@ -245,14 +245,14 @@ public: inline int getMinIssueGap (MachineOpCode fromOp, MachineOpCode toOp) const { - std::hash_map::const_iterator + hash_map::const_iterator I = issueGaps.find(OpCodePair(fromOp, toOp)); return (I == issueGaps.end())? 0 : (*I).second; } inline const std::vector* getConflictList(MachineOpCode opCode) const { - std::hash_map >::const_iterator + hash_map >::const_iterator I = conflictLists.find(opCode); return (I == conflictLists.end())? NULL : & (*I).second; } @@ -286,8 +286,8 @@ protected: unsigned numIssueDeltas; std::vector instrRUsages; // indexed by opcode - std::hash_map issueGaps; // indexed by opcode pair - std::hash_map > + hash_map issueGaps; // indexed by opcode pair + hash_map > conflictLists; // indexed by opcode }; diff --git a/lib/CodeGen/InstrSched/SchedPriorities.h b/lib/CodeGen/InstrSched/SchedPriorities.h index b01c1a43d68..4d763d21c5f 100644 --- a/lib/CodeGen/InstrSched/SchedPriorities.h +++ b/lib/CodeGen/InstrSched/SchedPriorities.h @@ -157,13 +157,13 @@ private: cycles_t curTime; const SchedGraph* graph; FunctionLiveVarInfo &methodLiveVarInfo; - std::hash_map lastUseMap; + hash_map lastUseMap; std::vector nodeDelayVec; std::vector nodeEarliestUseVec; std::vector earliestReadyTimeForNode; cycles_t earliestReadyTime; NodeHeap candsAsHeap; // candidate nodes, ready to go - std::hash_set candsAsSet;//same entries as candsAsHeap, + hash_set candsAsSet; //same entries as candsAsHeap, // but as set for fast lookup std::vector mcands; // holds pointers into cands candIndex nextToTry; // next cand after the last diff --git a/lib/Target/SparcV9/InstrSched/SchedPriorities.h b/lib/Target/SparcV9/InstrSched/SchedPriorities.h index b01c1a43d68..4d763d21c5f 100644 --- a/lib/Target/SparcV9/InstrSched/SchedPriorities.h +++ b/lib/Target/SparcV9/InstrSched/SchedPriorities.h @@ -157,13 +157,13 @@ private: cycles_t curTime; const SchedGraph* graph; FunctionLiveVarInfo &methodLiveVarInfo; - std::hash_map lastUseMap; + hash_map lastUseMap; std::vector nodeDelayVec; std::vector nodeEarliestUseVec; std::vector earliestReadyTimeForNode; cycles_t earliestReadyTime; NodeHeap candsAsHeap; // candidate nodes, ready to go - std::hash_set candsAsSet;//same entries as candsAsHeap, + hash_set candsAsSet; //same entries as candsAsHeap, // but as set for fast lookup std::vector mcands; // holds pointers into cands candIndex nextToTry; // next cand after the last