luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Performance enhancement of netlist compare (avoid O(2) loop)

This commit is contained in:
Matthias Koefferlein 2019-08-02 01:39:07 +02:00
parent 4cee051255
commit fda5d86b4b
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/db/db/dbNetlistCompare.cc
View File

@ -692,6 +692,12 @@ public:
typedef std::pair<std::vector<Transition>, std::pair<size_t, const db::Net *> > edge_type;
static void swap_edges (edge_type &e1, edge_type &e2)
{
e1.first.swap (e2.first);
std::swap (e1.second, e2.second);
}
struct EdgeToEdgeOnlyCompare
{
bool operator() (const edge_type &a, const std::vector<Transition> &b) const
@ -1149,17 +1155,22 @@ NetGraphNode::expand_subcircuit_nodes (NetGraph *graph)
std::list<edge_type> sc_edges;
for (size_t i = 0; i < m_edges.size (); ) {
if (m_edges [i].second.second == 0) {
size_t ii = 0;
for (size_t i = 0; i < m_edges.size (); ++i) {
if (ii != i) {
swap_edges (m_edges [ii], m_edges [i]);
}
if (m_edges [ii].second.second == 0) {
// subcircuit pin
sc_edges.push_back (m_edges [i]);
m_edges.erase (m_edges.begin () + i);
sc_edges.push_back (m_edges [ii]);
} else {
n2entry.insert (std::make_pair (m_edges [i].second.second, i));
++i;
n2entry.insert (std::make_pair (m_edges [ii].second.second, ii));
++ii;
}
}
m_edges.erase (m_edges.begin () + ii, m_edges.end ());
for (std::list<edge_type>::const_iterator e = sc_edges.begin (); e != sc_edges.end (); ++e) {
const db::SubCircuit *sc = 0;