From b567f03c266b0c44d81a24dde2ed538f1db05d4e Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Thu, 12 Mar 2020 15:55:54 -0700 Subject: [PATCH] kernel: optimise Module::remove(const pool() --- kernel/rtlil.cc | 15 +++++---------- kernel/rtlil.h | 4 ++++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc index 06181b763..4ba66f26b 100644 --- a/kernel/rtlil.cc +++ b/kernel/rtlil.cc @@ -1586,30 +1586,25 @@ void RTLIL::Module::remove(const pool &wires) const pool *wires_p; void operator()(RTLIL::SigSpec &sig) { - std::vector chunks = sig; - for (auto &c : chunks) + for (auto &c : sig.chunks_) if (c.wire != NULL && wires_p->count(c.wire)) { c.wire = module->addWire(NEW_ID, c.width); c.offset = 0; } - sig = chunks; } void operator()(RTLIL::SigSpec &lhs, RTLIL::SigSpec &rhs) { log_assert(GetSize(lhs) == GetSize(rhs)); - RTLIL::SigSpec new_lhs, new_rhs; + lhs.unpack(); + rhs.unpack(); for (int i = 0; i < GetSize(lhs); i++) { - RTLIL::SigBit lhs_bit = lhs[i]; + RTLIL::SigBit &lhs_bit = lhs.bits_[i]; if (lhs_bit.wire != nullptr && wires_p->count(lhs_bit.wire)) continue; - RTLIL::SigBit rhs_bit = rhs[i]; + RTLIL::SigBit &rhs_bit = rhs.bits_[i]; if (rhs_bit.wire != nullptr && wires_p->count(rhs_bit.wire)) continue; - new_lhs.append(lhs_bit); - new_rhs.append(rhs_bit); } - lhs = new_lhs; - rhs = new_rhs; } }; diff --git a/kernel/rtlil.h b/kernel/rtlil.h index 58c5d9674..451bdd7b6 100644 --- a/kernel/rtlil.h +++ b/kernel/rtlil.h @@ -758,6 +758,10 @@ private: unpack(); } + // Only used by Module::remove(const pool &wires) + // but cannot be more specific as it isn't yet declared + friend struct RTLIL::Module; + public: SigSpec(); SigSpec(const RTLIL::SigSpec &other); -- 2.30.2