From 43756559d8b2e0c19deaa95b45832c1acb837907 Mon Sep 17 00:00:00 2001 From: Rick Altherr Date: Fri, 29 Jan 2016 22:40:45 -0800 Subject: [PATCH] rtlil: rewrite remove2() to avoid copying --- kernel/rtlil.cc | 63 ++++++++++++++----------------------------------- 1 file changed, 18 insertions(+), 45 deletions(-) diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc index dfccc78f8..7878eaae7 100644 --- a/kernel/rtlil.cc +++ b/kernel/rtlil.cc @@ -2688,31 +2688,15 @@ void RTLIL::SigSpec::remove2(const pool &pattern, RTLIL::SigSpec other->unpack(); } - std::vector new_bits, new_other_bits; - - new_bits.resize(GetSize(bits_)); - if (other != NULL) - new_other_bits.resize(GetSize(bits_)); - - int k = 0; - for (int i = 0; i < GetSize(bits_); i++) { - if (bits_[i].wire != NULL && pattern.count(bits_[i])) - continue; - if (other != NULL) - new_other_bits[k] = other->bits_[i]; - new_bits[k++] = bits_[i]; - } - - new_bits.resize(k); - if (other != NULL) - new_other_bits.resize(k); - - bits_.swap(new_bits); - width_ = GetSize(bits_); - - if (other != NULL) { - other->bits_.swap(new_other_bits); - other->width_ = GetSize(other->bits_); + for (int i = GetSize(bits_) - 1; i >= 0; i--) { + if (bits_[i].wire != NULL && pattern.count(bits_[i])) { + bits_.erase(bits_.begin() + i); + width_--; + if (other != NULL) { + other->bits_.erase(other->bits_.begin() + i); + other->width_--; + } + } } check(); @@ -2732,26 +2716,15 @@ void RTLIL::SigSpec::remove2(const std::set &pattern, RTLIL::SigS other->unpack(); } - std::vector new_bits, new_other_bits; - - new_bits.reserve(GetSize(bits_)); - if (other != NULL) - new_other_bits.reserve(GetSize(bits_)); - - for (int i = 0; i < GetSize(bits_); i++) { - if (bits_[i].wire != NULL && pattern.count(bits_[i])) - continue; - if (other != NULL) - new_other_bits.push_back(other->bits_[i]); - new_bits.push_back(bits_[i]); - } - - bits_.swap(new_bits); - width_ = GetSize(bits_); - - if (other != NULL) { - other->bits_.swap(new_other_bits); - other->width_ = GetSize(other->bits_); + for (int i = GetSize(bits_) - 1; i >= 0; i--) { + if (bits_[i].wire != NULL && pattern.count(bits_[i])) { + bits_.erase(bits_.begin() + i); + width_--; + if (other != NULL) { + other->bits_.erase(other->bits_.begin() + i); + other->width_--; + } + } } check(); -- 2.30.2