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

WIP: new backtracking algorithm for net matching.

This commit is contained in:
Matthias Koefferlein 2019-04-09 23:13:40 +02:00
parent a3edd95f94
commit f34d161e2f
3 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -973,14 +973,14 @@ public:
other.identify (other_ni, ni);
#if defined(PRINT_DEBUG_NETCOMPARE)
tl::info << "deduced match: " << nodes_with_same_path.front ()->net ()->expanded_name () << " vs. " << other_nodes_with_same_path.front ()->net ()->expanded_name ();
tl::info << "deduced match (singular): " << nodes_with_same_path.front ()->net ()->expanded_name () << " vs. " << other_nodes_with_same_path.front ()->net ()->expanded_name ();
#endif
if (logger) {
logger->match_nets (nodes_with_same_path.front ()->net (), other_nodes_with_same_path.front ()->net ());
}
// unconditionally continue here.
// @@@ derive_node_identities (ni, other, depth + 1, n_branch, logger, false);
derive_node_identities (ni, other, depth + 1, n_branch, logger, false);
}
@ -1064,6 +1064,12 @@ public:
for (std::vector<std::pair<const NetGraphNode *, const NetGraphNode *> >::const_iterator p = pairs.begin (); p != pairs.end (); ++p) {
if (p->first->has_other () || p->second->has_other ()) {
// this may happen if "derive_node_identities" creates new pairs
// TODO: actually *both* should be paired, not just one.
continue;
}
size_t ni = node_index_for_net (p->first->net ());
size_t other_ni = other.node_index_for_net (p->second->net ());
@ -1419,11 +1425,9 @@ NetlistComparer::compare_circuits (const db::Circuit *c1, const db::Circuit *c2,
tl::info << "deducing from present nodes ...";
#endif
size_t new_identities = 0;
for (db::NetDeviceGraph::node_iterator i1 = g1.begin (); i1 != g1.end (); ++i1) {
if (i1->has_other () && i1->net ()) {
size_t ni = g1.derive_node_identities (i1 - g1.begin (), g2, mp_logger);
new_identities += ni;
if (ni > 0 && ni != std::numeric_limits<size_t>::max ()) {
#if defined(PRINT_DEBUG_NETCOMPARE)
tl::info << ni << " new identities.";
@ -1441,7 +1445,7 @@ NetlistComparer::compare_circuits (const db::Circuit *c1, const db::Circuit *c2,
break;
}
new_identities = 0;
size_t new_identities = 0;
#if defined(PRINT_DEBUG_NETCOMPARE)
tl::info << "checking topological identity ...";

36
src/db/unit_tests/dbNetlistCompareTests.cc
View File

@ -595,8 +595,8 @@ TEST(4_BufferTwoPaths)
"match_nets VDD VDD\n"
"match_nets IN IN\n"
"match_nets VSS VSS\n"
"match_ambiguous_nets INT $10\n"
"match_ambiguous_nets INT2 $11\n"
"match_nets INT $10\n"
"match_nets INT2 $11\n"
"match_pins $0 $1\n"
"match_pins $1 $3\n"
"match_pins $2 $0\n"
@ -658,9 +658,9 @@ TEST(5_BufferTwoPathsDifferentParameters)
EXPECT_EQ (logger.text (),
"begin_circuit BUF BUF\n"
"match_nets OUT OUT\n"
"match_nets IN IN\n"
"match_ambiguous_nets INT $10\n"
"match_nets INT2 $11\n"
"match_nets IN IN\n"
"match_pins $0 $1\n"
"match_pins $1 $3\n"
"match_pins $2 $0\n"
@ -685,8 +685,8 @@ TEST(5_BufferTwoPathsDifferentParameters)
"begin_circuit BUF BUF\n"
"match_nets OUT OUT\n"
"match_nets IN IN\n"
"match_ambiguous_nets INT $10\n"
"match_ambiguous_nets INT2 $11\n"
"match_nets INT2 $11\n"
"match_nets INT $10\n"
"match_pins $0 $1\n"
"match_pins $1 $3\n"
"match_pins $2 $0\n"
@ -710,9 +710,9 @@ TEST(5_BufferTwoPathsDifferentParameters)
EXPECT_EQ (logger.text (),
"begin_circuit BUF BUF\n"
"match_nets OUT OUT\n"
"match_nets IN IN\n"
"match_ambiguous_nets INT $10\n"
"match_nets INT2 $11\n"
"match_nets IN IN\n"
"match_pins $0 $1\n"
"match_pins $1 $3\n"
"match_pins $2 $0\n"
@ -736,9 +736,9 @@ TEST(5_BufferTwoPathsDifferentParameters)
EXPECT_EQ (logger.text (),
"begin_circuit BUF BUF\n"
"match_nets OUT OUT\n"
"match_nets IN IN\n"
"match_ambiguous_nets INT $10\n"
"match_nets INT2 $11\n"
"match_nets IN IN\n"
"match_pins $0 $1\n"
"match_pins $1 $3\n"
"match_pins $2 $0\n"
@ -763,8 +763,8 @@ TEST(5_BufferTwoPathsDifferentParameters)
"begin_circuit BUF BUF\n"
"match_nets OUT OUT\n"
"match_nets IN IN\n"
"match_ambiguous_nets INT $10\n"
"match_ambiguous_nets INT2 $11\n"
"match_nets INT2 $11\n"
"match_nets INT $10\n"
"match_pins $0 $1\n"
"match_pins $1 $3\n"
"match_pins $2 $0\n"
@ -790,8 +790,8 @@ TEST(5_BufferTwoPathsDifferentParameters)
"begin_circuit BUF BUF\n"
"match_nets OUT OUT\n"
"match_nets IN IN\n"
"match_ambiguous_nets INT $10\n"
"match_ambiguous_nets INT2 $11\n"
"match_nets INT2 $11\n"
"match_nets INT $10\n"
"match_pins $0 $1\n"
"match_pins $1 $3\n"
"match_pins $2 $0\n"
@ -816,9 +816,9 @@ TEST(5_BufferTwoPathsDifferentParameters)
EXPECT_EQ (logger.text (),
"begin_circuit BUF BUF\n"
"match_nets OUT OUT\n"
"match_nets IN IN\n"
"match_ambiguous_nets INT $10\n"
"match_nets INT2 $11\n"
"match_nets IN IN\n"
"match_pins $0 $1\n"
"match_pins $1 $3\n"
"match_pins $2 $0\n"
@ -879,10 +879,10 @@ TEST(5_BufferTwoPathsDifferentDeviceClasses)
EXPECT_EQ (logger.text (),
"begin_circuit BUF BUF\n"
"match_nets IN IN\n"
"match_nets INT $10\n"
"match_nets OUT OUT\n"
"match_nets IN IN\n"
"match_nets INT2 $11\n"
"match_nets OUT OUT\n"
"match_pins $0 $1\n"
"match_pins $1 $3\n"
"match_pins $2 $0\n"
@ -945,9 +945,9 @@ TEST(6_BufferTwoPathsAdditionalResistor)
EXPECT_EQ (logger.text (),
"begin_circuit BUF BUF\n"
"match_nets INT $10\n"
"match_nets OUT OUT\n"
"match_nets INT2 $11\n"
"match_nets IN IN\n"
"match_nets INT2 $11\n"
"match_nets OUT OUT\n"
"match_pins $0 $1\n"
"match_pins $1 $3\n"
"match_pins $2 $0\n"
@ -2025,12 +2025,12 @@ TEST(16_UniqueSubCircuitMatching)
"match_nets BULK,VSS BULK,VSS\n"
"match_nets $I22 $I22\n"
"match_nets $I13 $I13\n"
"match_nets $I7 $I7\n"
"match_nets $I23 $I23\n"
"match_nets $I5 $I5\n"
"match_nets $I25 $I25\n"
"match_nets $I24 $I24\n"
"match_nets $I6 $I6\n"
"match_nets $I25 $I25\n"
"match_nets $I7 $I7\n"
"match_subcircuits $1 $1\n"
"match_subcircuits $4 $2\n"
"match_subcircuits $3 $3\n"

28
testdata/ruby/dbNetlistCompare.rb vendored
View File

@ -392,8 +392,8 @@ match_nets OUT OUT
match_nets VDD VDD
match_nets IN IN
match_nets VSS VSS
match_ambiguous_nets INT $10
match_ambiguous_nets INT2 $11
match_nets INT $10
match_nets INT2 $11
match_pins $0 $1
match_pins $1 $3
match_pins $2 $0
@ -460,9 +460,9 @@ END
assert_equal(logger.text, <<"END")
begin_circuit BUF BUF
match_nets OUT OUT
match_nets IN IN
match_ambiguous_nets INT $10
match_nets INT2 $11
match_nets IN IN
match_pins $0 $1
match_pins $1 $3
match_pins $2 $0
@ -489,8 +489,8 @@ END
begin_circuit BUF BUF
match_nets OUT OUT
match_nets IN IN
match_ambiguous_nets INT $10
match_ambiguous_nets INT2 $11
match_nets INT2 $11
match_nets INT $10
match_pins $0 $1
match_pins $1 $3
match_pins $2 $0
@ -518,8 +518,8 @@ END
begin_circuit BUF BUF
match_nets OUT OUT
match_nets IN IN
match_ambiguous_nets INT $10
match_ambiguous_nets INT2 $11
match_nets INT2 $11
match_nets INT $10
match_pins $0 $1
match_pins $1 $3
match_pins $2 $0
@ -547,8 +547,8 @@ END
begin_circuit BUF BUF
match_nets OUT OUT
match_nets IN IN
match_ambiguous_nets INT $10
match_ambiguous_nets INT2 $11
match_nets INT2 $11
match_nets INT $10
match_pins $0 $1
match_pins $1 $3
match_pins $2 $0
@ -614,10 +614,10 @@ END
assert_equal(logger.text, <<"END")
begin_circuit BUF BUF
match_nets IN IN
match_nets INT $10
match_nets OUT OUT
match_nets IN IN
match_nets INT2 $11
match_nets OUT OUT
match_pins $0 $1
match_pins $1 $3
match_pins $2 $0
@ -685,9 +685,9 @@ END
assert_equal(logger.text, <<"END")
begin_circuit BUF BUF
match_nets INT $10
match_nets OUT OUT
match_nets INT2 $11
match_nets IN IN
match_nets INT2 $11
match_nets OUT OUT
match_pins $0 $1
match_pins $1 $3
match_pins $2 $0
@ -887,8 +887,8 @@ match_nets OUT OUT
match_nets IN2 IN2
match_nets VSS VSS
match_nets VDD VDD
match_nets INT INT
match_nets IN1 IN1
match_nets INT INT
match_pins $0 $0
match_pins $1 $1
match_pins $2 $2