luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove reliance on pointer comparison in MT scheduling 

The critical path propagation used to rely on a pointer comparison to
break equal scoring critical path updates. Use the corresponding mtask
ids instead, which is deterministic across invocations.
This commit is contained in:
Geza Lore 2022-08-15 20:33:20 +01:00
parent f8a0389e73
commit f0040c7b9a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/V3Partition.cpp
View File

@ -161,7 +161,7 @@ static void partCheckCachedScoreVsActual(uint32_t cached, uint32_t actual) {
// * Client calls PartPropagateCp::go(). Internally, this iteratively // * Client calls PartPropagateCp::go(). Internally, this iteratively
// propagates the new CPs wayward through the graph. // propagates the new CPs wayward through the graph.
// //
template <class T_CostAccessor> template <class T_CostAccessor, class T_VtxCmp = std::less<V3GraphVertex*>>
class PartPropagateCp final : GraphAlg<> { class PartPropagateCp final : GraphAlg<> {
private: private:
// MEMBERS // MEMBERS
@ -171,7 +171,7 @@ private:
T_CostAccessor* const m_accessp; // Access cost and CPs on V3GraphVertex's. T_CostAccessor* const m_accessp; // Access cost and CPs on V3GraphVertex's.
// // confirm we only process each vertex once. // // confirm we only process each vertex once.
const bool m_slowAsserts; // Enable nontrivial asserts const bool m_slowAsserts; // Enable nontrivial asserts
SortByValueMap<V3GraphVertex*, uint32_t> m_pending; // Pending rescores SortByValueMap<V3GraphVertex*, uint32_t, T_VtxCmp> m_pending; // Pending rescores
public: public:
// CONSTRUCTORS // CONSTRUCTORS
@ -361,6 +361,10 @@ public:
bool operator()(const LogicMTask* ap, const LogicMTask* bp) const { bool operator()(const LogicMTask* ap, const LogicMTask* bp) const {
return ap->id() < bp->id(); return ap->id() < bp->id();
} }
bool operator()(const V3GraphVertex* ap, const V3GraphVertex* bp) const {
return operator()(static_cast<const LogicMTask*>(ap),
static_cast<const LogicMTask*>(bp));
}
}; };
// This adaptor class allows the PartPropagateCp class to be somewhat // This adaptor class allows the PartPropagateCp class to be somewhat
@ -1380,10 +1384,10 @@ private:
<< donorNewCpFwd.propagateCp << endl); << donorNewCpFwd.propagateCp << endl);
LogicMTask::CpCostAccessor cpAccess; LogicMTask::CpCostAccessor cpAccess;
PartPropagateCp<LogicMTask::CpCostAccessor> forwardPropagator(m_mtasksp, GraphWay::FORWARD, PartPropagateCp<LogicMTask::CpCostAccessor, LogicMTask::CmpLogicMTask> forwardPropagator(
&cpAccess, m_slowAsserts); m_mtasksp, GraphWay::FORWARD, &cpAccess, m_slowAsserts);
PartPropagateCp<LogicMTask::CpCostAccessor> reversePropagator(m_mtasksp, GraphWay::REVERSE, PartPropagateCp<LogicMTask::CpCostAccessor, LogicMTask::CmpLogicMTask> reversePropagator(
&cpAccess, m_slowAsserts); m_mtasksp, GraphWay::REVERSE, &cpAccess, m_slowAsserts);
recipientp->setCritPathCost(GraphWay::FORWARD, recipientNewCpFwd.cp); recipientp->setCritPathCost(GraphWay::FORWARD, recipientNewCpFwd.cp);
if (recipientNewCpFwd.propagate) { if (recipientNewCpFwd.propagate) {