From ec4751e55c11d7287dacd39fb61ad936995fc963 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Fri, 26 Dec 2014 21:59:41 +0100 Subject: Replaced std::unordered_set (nodict) with Yosys::pool --- passes/cmds/delete.cc | 8 ++++---- passes/cmds/splitnets.cc | 2 +- passes/opt/opt_clean.cc | 2 +- passes/opt/wreduce.cc | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'passes') diff --git a/passes/cmds/delete.cc b/passes/cmds/delete.cc index d7edcfbfc..4c8f16f48 100644 --- a/passes/cmds/delete.cc +++ b/passes/cmds/delete.cc @@ -91,10 +91,10 @@ struct DeletePass : public Pass { continue; } - nodict delete_wires; - nodict delete_cells; - nodict delete_procs; - nodict delete_mems; + pool delete_wires; + pool delete_cells; + pool delete_procs; + pool delete_mems; for (auto &it : module->wires_) if (design->selected(module, it.second)) diff --git a/passes/cmds/splitnets.cc b/passes/cmds/splitnets.cc index 6c24a8e5f..3b3fc208e 100644 --- a/passes/cmds/splitnets.cc +++ b/passes/cmds/splitnets.cc @@ -176,7 +176,7 @@ struct SplitnetsPass : public Pass { module->rewrite_sigspecs(worker); - nodict delete_wires; + pool delete_wires; for (auto &it : worker.splitmap) delete_wires.insert(it.first); module->remove(delete_wires); diff --git a/passes/opt/opt_clean.cc b/passes/opt/opt_clean.cc index 01acb5c04..cb12b3922 100644 --- a/passes/opt/opt_clean.cc +++ b/passes/opt/opt_clean.cc @@ -262,7 +262,7 @@ void rmunused_module_signals(RTLIL::Module *module, bool purge_mode, bool verbos } - nodict del_wires; + pool del_wires; int del_wires_count = 0; for (auto wire : maybe_del_wires) diff --git a/passes/opt/wreduce.cc b/passes/opt/wreduce.cc index e8a38d212..1609a8be7 100644 --- a/passes/opt/wreduce.cc +++ b/passes/opt/wreduce.cc @@ -28,11 +28,11 @@ PRIVATE_NAMESPACE_BEGIN struct WreduceConfig { - nodict supported_cell_types; + pool supported_cell_types; WreduceConfig() { - supported_cell_types = nodict({ + supported_cell_types = pool({ "$not", "$pos", "$neg", "$and", "$or", "$xor", "$xnor", "$shl", "$shr", "$sshl", "$sshr", "$shift", "$shiftx", -- cgit v1.2.3