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

Merge pull request #770 from KLayout/lvs-enhancement 

Lvs enhancement
This commit is contained in:
Matthias Köfferlein 2021-04-14 23:24:30 +02:00 committed by GitHub
parent ae133f278e 44e495a77a
commit f8e7e3b6e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2382,6 +2382,25 @@ NetGraph::derive_node_identities_from_ambiguity_group (const NodeRange &nr, Devi
std::vector<std::pair<const NetGraphNode *, NetGraphNode::edge_iterator> >::const_iterator i1 = *ii1;
// in tentative mode, reject this choice if nets are named and all other nets in the ambiguity group differ -> this favors net matching by name
if (! data->dont_consider_net_names && tentative) {
bool any_matching = false;
for (std::vector<std::vector<std::pair<const NetGraphNode *, NetGraphNode::edge_iterator> >::const_iterator>::iterator ii2 = iters2.begin (); ii2 != iters2.end () && ! any_matching; ++ii2) {
std::vector<std::pair<const NetGraphNode *, NetGraphNode::edge_iterator> >::const_iterator i2 = *ii2;
any_matching = !net_names_are_different (i1->first->net (), i2->first->net ());
}
if (! any_matching) {
if (options ()->debug_netcompare) {
tl::info << indent_s << "ambiguity group rejected - all ambiguous other net names are mismatching for: " << i1->first->net ()->expanded_name ();
}
// a mismatch - stop here.
return failed_match;
}
}
bool any = false;
std::vector<std::vector<std::pair<const NetGraphNode *, NetGraphNode::edge_iterator> >::const_iterator>::iterator to_remove = iters2.end ();

6
src/lvs/unit_tests/lvsTests.cc
View File

@ -167,3 +167,9 @@ TEST(19_private)
run_test (_this, "test_19.lvs", "test_19.cir.gz", "test_19.gds.gz", true);
}
TEST(20_private)
{
// test_is_long_runner ();
run_test (_this, "test_20.lylvs", "test_20.cir.gz", "test_20.gds.gz", true, "test_20.lvsdb");
}