3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-23 09:05:32 +00:00

Improved TopoSort determinism

This commit is contained in:
Clifford Wolf 2014-11-07 15:21:03 +01:00
parent 461594bb83
commit 546e8b5fe7
5 changed files with 16 additions and 14 deletions

View file

@ -198,7 +198,7 @@ void replace_const_cells(RTLIL::Design *design, RTLIL::Module *module, bool cons
SigMap assign_map(module);
std::map<RTLIL::SigSpec, RTLIL::SigSpec> invert_map;
TopoSort<RTLIL::Cell*> cells;
TopoSort<RTLIL::Cell*, RTLIL::IdString::compare_ptr_by_name<RTLIL::Cell>> cells;
std::map<RTLIL::Cell*, std::set<RTLIL::SigBit>> cell_to_inbit;
std::map<RTLIL::SigBit, std::set<RTLIL::Cell*>> outbit_to_cell;

View file

@ -27,6 +27,8 @@
USING_YOSYS_NAMESPACE
PRIVATE_NAMESPACE_BEGIN
typedef RTLIL::IdString::compare_ptr_by_name<RTLIL::Cell> cell_ptr_cmp;
struct ShareWorkerConfig
{
int limit;
@ -52,8 +54,8 @@ struct ShareWorker
std::set<RTLIL::Cell*> recursion_state;
SigMap topo_sigmap;
std::map<RTLIL::Cell*, std::set<RTLIL::Cell*>> topo_cell_drivers;
std::map<RTLIL::SigBit, std::set<RTLIL::Cell*>> topo_bit_drivers;
std::map<RTLIL::Cell*, std::set<RTLIL::Cell*, cell_ptr_cmp>, cell_ptr_cmp> topo_cell_drivers;
std::map<RTLIL::SigBit, std::set<RTLIL::Cell*, cell_ptr_cmp>> topo_bit_drivers;
std::vector<std::pair<RTLIL::SigBit, RTLIL::SigBit>> exclusive_ctrls;
@ -937,7 +939,7 @@ struct ShareWorker
ct.setup_internals();
ct.setup_stdcells();
TopoSort<RTLIL::Cell*> toposort;
TopoSort<RTLIL::Cell*, cell_ptr_cmp> toposort;
toposort.analyze_loops = false;
topo_sigmap.set(module);

View file

@ -281,7 +281,7 @@ struct TechmapWorker
SigMap sigmap(module);
TopoSort<RTLIL::Cell*> cells;
TopoSort<RTLIL::Cell*, RTLIL::IdString::compare_ptr_by_name<RTLIL::Cell>> cells;
std::map<RTLIL::Cell*, std::set<RTLIL::SigBit>> cell_to_inbit;
std::map<RTLIL::SigBit, std::set<RTLIL::Cell*>> outbit_to_cell;