mirror of https://github.com/YosysHQ/yosys.git
Revert "SigSet<Cell*> to use stable compare class"
This reverts commit 4ea34aaacd
.
This commit is contained in:
parent
c487a8ff25
commit
95e80809a5
|
@ -33,7 +33,7 @@ struct ConstEval
|
||||||
SigMap assign_map;
|
SigMap assign_map;
|
||||||
SigMap values_map;
|
SigMap values_map;
|
||||||
SigPool stop_signals;
|
SigPool stop_signals;
|
||||||
SigSet<RTLIL::Cell*, RTLIL::sort_by_name_id<RTLIL::Cell>> sig2driver;
|
SigSet<RTLIL::Cell*> sig2driver;
|
||||||
std::set<RTLIL::Cell*> busy;
|
std::set<RTLIL::Cell*> busy;
|
||||||
std::vector<SigMap> stack;
|
std::vector<SigMap> stack;
|
||||||
RTLIL::State defaultval;
|
RTLIL::State defaultval;
|
||||||
|
|
|
@ -116,7 +116,7 @@ struct SccWorker
|
||||||
}
|
}
|
||||||
|
|
||||||
SigPool selectedSignals;
|
SigPool selectedSignals;
|
||||||
SigSet<RTLIL::Cell*, RTLIL::sort_by_name_id<RTLIL::Cell>> sigToNextCells;
|
SigSet<RTLIL::Cell*> sigToNextCells;
|
||||||
|
|
||||||
for (auto &it : module->wires_)
|
for (auto &it : module->wires_)
|
||||||
if (design->selected(module, it.second))
|
if (design->selected(module, it.second))
|
||||||
|
|
|
@ -37,7 +37,7 @@ struct OptReduceWorker
|
||||||
int total_count;
|
int total_count;
|
||||||
bool did_something;
|
bool did_something;
|
||||||
|
|
||||||
void opt_reduce(pool<RTLIL::Cell*> &cells, SigSet<RTLIL::Cell*, RTLIL::sort_by_name_id<RTLIL::Cell>> &drivers, RTLIL::Cell *cell)
|
void opt_reduce(pool<RTLIL::Cell*> &cells, SigSet<RTLIL::Cell*> &drivers, RTLIL::Cell *cell)
|
||||||
{
|
{
|
||||||
if (cells.count(cell) == 0)
|
if (cells.count(cell) == 0)
|
||||||
return;
|
return;
|
||||||
|
@ -289,7 +289,7 @@ struct OptReduceWorker
|
||||||
const IdString type_list[] = { ID($reduce_or), ID($reduce_and) };
|
const IdString type_list[] = { ID($reduce_or), ID($reduce_and) };
|
||||||
for (auto type : type_list)
|
for (auto type : type_list)
|
||||||
{
|
{
|
||||||
SigSet<RTLIL::Cell*, RTLIL::sort_by_name_id<RTLIL::Cell>> drivers;
|
SigSet<RTLIL::Cell*> drivers;
|
||||||
pool<RTLIL::Cell*> cells;
|
pool<RTLIL::Cell*> cells;
|
||||||
|
|
||||||
for (auto &cell_it : module->cells_) {
|
for (auto &cell_it : module->cells_) {
|
||||||
|
|
|
@ -29,7 +29,7 @@ USING_YOSYS_NAMESPACE
|
||||||
PRIVATE_NAMESPACE_BEGIN
|
PRIVATE_NAMESPACE_BEGIN
|
||||||
|
|
||||||
SigMap assign_map, dff_init_map;
|
SigMap assign_map, dff_init_map;
|
||||||
SigSet<RTLIL::Cell*, RTLIL::sort_by_name_id<RTLIL::Cell>> mux_drivers;
|
SigSet<RTLIL::Cell*> mux_drivers;
|
||||||
dict<SigBit, RTLIL::Cell*> bit2driver;
|
dict<SigBit, RTLIL::Cell*> bit2driver;
|
||||||
dict<SigBit, pool<SigBit>> init_attributes;
|
dict<SigBit, pool<SigBit>> init_attributes;
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,7 @@ struct SatHelper
|
||||||
// model variables
|
// model variables
|
||||||
std::vector<std::string> shows;
|
std::vector<std::string> shows;
|
||||||
SigPool show_signal_pool;
|
SigPool show_signal_pool;
|
||||||
SigSet<RTLIL::Cell*, RTLIL::sort_by_name_id<RTLIL::Cell>> show_drivers;
|
SigSet<RTLIL::Cell*> show_drivers;
|
||||||
int max_timestep, timeout;
|
int max_timestep, timeout;
|
||||||
bool gotTimeout;
|
bool gotTimeout;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue