riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up pseudo-private member usage and ensure range iteration uses references where possible to avoid unnecessary copies.

This commit is contained in:
Alberto Gonzalez 2020-04-20 00:01:14 +00:00
parent a4755c50c3
commit dfcb936cd5
No known key found for this signature in database
GPG Key ID: 8395A8BA109708B2
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
passes/techmap/techmap.cc
View File

@ -103,7 +103,7 @@ struct TechmapWorker
std::string constmap_info; std::string constmap_info;
dict<RTLIL::SigBit, std::pair<IdString, int>> connbits_map; dict<RTLIL::SigBit, std::pair<IdString, int>> connbits_map;
for (auto conn : cell->connections()) for (auto &conn : cell->connections())
for (int i = 0; i < GetSize(conn.second); i++) { for (int i = 0; i < GetSize(conn.second); i++) {
RTLIL::SigBit bit = sigmap(conn.second[i]); RTLIL::SigBit bit = sigmap(conn.second[i]);
if (bit.wire == nullptr) { if (bit.wire == nullptr) {
@ -269,12 +269,12 @@ struct TechmapWorker
pool<SigBit> tpl_written_bits; pool<SigBit> tpl_written_bits;
for (auto tpl_cell : tpl->cells()) for (auto tpl_cell : tpl->cells())
for (auto &it2 : tpl_cell->connections_) for (auto &conn : tpl_cell->connections())
if (tpl_cell->output(it2.first)) if (tpl_cell->output(conn.first))
for (auto bit : tpl_sigmap(it2.second)) for (auto bit : tpl_sigmap(conn.second))
tpl_written_bits.insert(bit); tpl_written_bits.insert(bit);
for (auto &it1 : tpl->connections_) for (auto &conn : tpl->connections())
for (auto bit : tpl_sigmap(it1.first)) for (auto bit : tpl_sigmap(conn.first))
tpl_written_bits.insert(bit); tpl_written_bits.insert(bit);
SigMap port_signal_map; SigMap port_signal_map;
@ -397,12 +397,12 @@ struct TechmapWorker
vector<IdString> autopurge_ports; vector<IdString> autopurge_ports;
for (auto &it2 : c->connections_) for (auto &conn : c->connections_)
{ {
bool autopurge = false; bool autopurge = false;
if (!autopurge_tpl_bits.empty()) { if (!autopurge_tpl_bits.empty()) {
autopurge = GetSize(it2.second) != 0; autopurge = GetSize(conn.second) != 0;
for (auto &bit : sigmaps.at(tpl)(it2.second)) for (auto &bit : sigmaps.at(tpl)(conn.second))
if (!autopurge_tpl_bits.count(bit)) { if (!autopurge_tpl_bits.count(bit)) {
autopurge = false; autopurge = false;
break; break;
@ -410,10 +410,10 @@ struct TechmapWorker
} }
if (autopurge) { if (autopurge) {
autopurge_ports.push_back(it2.first); autopurge_ports.push_back(conn.first);
} else { } else {
apply_prefix(cell->name, it2.second, module); apply_prefix(cell->name, conn.second, module);
port_signal_map.apply(it2.second); port_signal_map.apply(conn.second);
} }
} }
@ -694,7 +694,7 @@ struct TechmapWorker
break; break;
} }
for (auto conn : cell->connections()) { for (auto &conn : cell->connections()) {
if (conn.first.begins_with("$")) if (conn.first.begins_with("$"))
continue; continue;
if (tpl->wire(conn.first) != nullptr && tpl->wire(conn.first)->port_id > 0) if (tpl->wire(conn.first) != nullptr && tpl->wire(conn.first)->port_id > 0)
@ -712,7 +712,7 @@ struct TechmapWorker
if (tpl->avail_parameters.count(ID::_TECHMAP_CELLTYPE_) != 0) if (tpl->avail_parameters.count(ID::_TECHMAP_CELLTYPE_) != 0)
parameters[ID::_TECHMAP_CELLTYPE_] = RTLIL::unescape_id(cell->type); parameters[ID::_TECHMAP_CELLTYPE_] = RTLIL::unescape_id(cell->type);
for (auto conn : cell->connections()) { for (auto &conn : cell->connections()) {
if (tpl->avail_parameters.count(stringf("\\_TECHMAP_CONSTMSK_%s_", log_id(conn.first))) != 0) { if (tpl->avail_parameters.count(stringf("\\_TECHMAP_CONSTMSK_%s_", log_id(conn.first))) != 0) {
std::vector<RTLIL::SigBit> v = sigmap(conn.second).to_sigbit_vector(); std::vector<RTLIL::SigBit> v = sigmap(conn.second).to_sigbit_vector();
for (auto &bit : v) for (auto &bit : v)
@ -746,7 +746,7 @@ struct TechmapWorker
unique_bit_id[RTLIL::State::Sx] = unique_bit_id_counter++; unique_bit_id[RTLIL::State::Sx] = unique_bit_id_counter++;
unique_bit_id[RTLIL::State::Sz] = unique_bit_id_counter++; unique_bit_id[RTLIL::State::Sz] = unique_bit_id_counter++;
for (auto conn : cell->connections()) for (auto &conn : cell->connections())
if (tpl->avail_parameters.count(stringf("\\_TECHMAP_CONNMAP_%s_", log_id(conn.first))) != 0) { if (tpl->avail_parameters.count(stringf("\\_TECHMAP_CONNMAP_%s_", log_id(conn.first))) != 0) {
for (auto &bit : sigmap(conn.second)) for (auto &bit : sigmap(conn.second))
if (unique_bit_id.count(bit) == 0) if (unique_bit_id.count(bit) == 0)
@ -763,7 +763,7 @@ struct TechmapWorker
if (tpl->avail_parameters.count(ID::_TECHMAP_BITS_CONNMAP_)) if (tpl->avail_parameters.count(ID::_TECHMAP_BITS_CONNMAP_))
parameters[ID::_TECHMAP_BITS_CONNMAP_] = bits; parameters[ID::_TECHMAP_BITS_CONNMAP_] = bits;
for (auto conn : cell->connections()) for (auto &conn : cell->connections())
if (tpl->avail_parameters.count(stringf("\\_TECHMAP_CONNMAP_%s_", log_id(conn.first))) != 0) { if (tpl->avail_parameters.count(stringf("\\_TECHMAP_CONNMAP_%s_", log_id(conn.first))) != 0) {
RTLIL::Const value; RTLIL::Const value;
for (auto &bit : sigmap(conn.second)) { for (auto &bit : sigmap(conn.second)) {
@ -884,7 +884,7 @@ struct TechmapWorker
} }
} }
for (auto conn : cell->connections()) for (auto &conn : cell->connections())
for (int i = 0; i < GetSize(conn.second); i++) for (int i = 0; i < GetSize(conn.second); i++)
{ {
RTLIL::SigBit bit = sigmap(conn.second[i]); RTLIL::SigBit bit = sigmap(conn.second[i]);