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

Netlist compare: a little less freedom when picking derived net pairs ...

This commit is contained in:
Matthias Koefferlein 2019-04-08 21:32:41 +02:00
parent 7cdd40dabb
commit 2e9422a753
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -926,7 +926,7 @@ public:
} else { } else {
std::vector<const NetGraphNode *>::const_iterator in_this = std::lower_bound (nodes_with_same_path.begin (), nodes_with_same_path.end (), n, CompareNodePtr ()); std::vector<const NetGraphNode *>::const_iterator in_this = std::lower_bound (nodes_with_same_path.begin (), nodes_with_same_path.end (), n, CompareNodePtr ());
if (in_this != nodes_with_same_path.end () && *n == **in_this) { if (in_this != nodes_with_same_path.end () && *n == **in_this && (in_this + 1 == nodes_with_same_path.end () || ! (*n == **(in_this + 1)))) {
other_node_index = i->second.first; other_node_index = i->second.first;
node_index = node_index_for_net ((*in_this)->net ()); node_index = node_index_for_net ((*in_this)->net ());
++count_other; ++count_other;

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

@ -658,8 +658,8 @@ TEST(5_BufferTwoPathsDifferentParameters)
EXPECT_EQ (logger.text (), EXPECT_EQ (logger.text (),
"begin_circuit BUF BUF\n" "begin_circuit BUF BUF\n"
"match_nets OUT OUT\n" "match_nets OUT OUT\n"
"match_nets INT $10\n"
"match_nets IN IN\n" "match_nets IN IN\n"
"match_ambiguous_nets INT $10\n"
"match_nets INT2 $11\n" "match_nets INT2 $11\n"
"match_pins $0 $1\n" "match_pins $0 $1\n"
"match_pins $1 $3\n" "match_pins $1 $3\n"
@ -710,8 +710,8 @@ TEST(5_BufferTwoPathsDifferentParameters)
EXPECT_EQ (logger.text (), EXPECT_EQ (logger.text (),
"begin_circuit BUF BUF\n" "begin_circuit BUF BUF\n"
"match_nets OUT OUT\n" "match_nets OUT OUT\n"
"match_nets INT $10\n"
"match_nets IN IN\n" "match_nets IN IN\n"
"match_ambiguous_nets INT $10\n"
"match_nets INT2 $11\n" "match_nets INT2 $11\n"
"match_pins $0 $1\n" "match_pins $0 $1\n"
"match_pins $1 $3\n" "match_pins $1 $3\n"
@ -736,8 +736,8 @@ TEST(5_BufferTwoPathsDifferentParameters)
EXPECT_EQ (logger.text (), EXPECT_EQ (logger.text (),
"begin_circuit BUF BUF\n" "begin_circuit BUF BUF\n"
"match_nets OUT OUT\n" "match_nets OUT OUT\n"
"match_nets INT $10\n"
"match_nets IN IN\n" "match_nets IN IN\n"
"match_ambiguous_nets INT $10\n"
"match_nets INT2 $11\n" "match_nets INT2 $11\n"
"match_pins $0 $1\n" "match_pins $0 $1\n"
"match_pins $1 $3\n" "match_pins $1 $3\n"
@ -816,8 +816,8 @@ TEST(5_BufferTwoPathsDifferentParameters)
EXPECT_EQ (logger.text (), EXPECT_EQ (logger.text (),
"begin_circuit BUF BUF\n" "begin_circuit BUF BUF\n"
"match_nets OUT OUT\n" "match_nets OUT OUT\n"
"match_nets INT $10\n"
"match_nets IN IN\n" "match_nets IN IN\n"
"match_ambiguous_nets INT $10\n"
"match_nets INT2 $11\n" "match_nets INT2 $11\n"
"match_pins $0 $1\n" "match_pins $0 $1\n"
"match_pins $1 $3\n" "match_pins $1 $3\n"

2
testdata/ruby/dbNetlistCompare.rb vendored
View File

@ -460,8 +460,8 @@ END
assert_equal(logger.text, <<"END") assert_equal(logger.text, <<"END")
begin_circuit BUF BUF begin_circuit BUF BUF
match_nets OUT OUT match_nets OUT OUT
match_nets INT $10
match_nets IN IN match_nets IN IN
match_ambiguous_nets INT $10
match_nets INT2 $11 match_nets INT2 $11
match_pins $0 $1 match_pins $0 $1
match_pins $1 $3 match_pins $1 $3