Made a correction to the flattening code, removed a duplicate

print statement, and clarified the messages about non-matching
circuits at the end, all of them suggestions made by Mitch
Bailey (see issue #34 on github).
This commit is contained in:
Tim Edwards 2021-10-15 09:13:02 -04:00
parent 6ceeddf096
commit 625e043eff
2 changed files with 6 additions and 6 deletions

View File

@ -1 +1 @@
1.5.204 1.5.205

View File

@ -567,7 +567,8 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
netgen::flatten class "[lindex $endval 1] $fnum2" netgen::flatten class "[lindex $endval 1] $fnum2"
} else { } else {
netgen::log put " Continuing with black-boxed subcircuits $endval\n" netgen::log put " Continuing with black-boxed subcircuits $endval\n"
lappend matcherr [lindex $endval 0] lappend matcherr [lindex $endval 0]"(1)"
lappend matcherr [lindex $endval 1]"(2)"
# Match pins # Match pins
netgen::log echo off netgen::log echo off
if {$dolist == 1} { if {$dolist == 1} {
@ -609,16 +610,15 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
} else { } else {
# Flatten the non-matching subcircuit (but not the top-level cells) # Flatten the non-matching subcircuit (but not the top-level cells)
if {[netgen::print queue] != {}} { if {[netgen::print queue] != {}} {
if {([lsearch $noflat [lindex $endval 1]] == -1) && if {([lsearch $noflat [lindex $endval 0]] == -1) &&
([lsearch $noflat [lindex $endval 1]] == -1)} { ([lsearch $noflat [lindex $endval 1]] == -1)} {
netgen::log put " Flattening non-matched subcircuits $endval\n" netgen::log put " Flattening non-matched subcircuits $endval\n"
netgen::flatten class "[lindex $endval 0] $fnum1" netgen::flatten class "[lindex $endval 0] $fnum1"
netgen::flatten class "[lindex $endval 1] $fnum2" netgen::flatten class "[lindex $endval 1] $fnum2"
} else { } else {
netgen::log put " Continuing with black-boxed subcircuits $endval\n" netgen::log put " Continuing with black-boxed subcircuits $endval\n"
lappend matcherr [lindex $endval 0] lappend matcherr [lindex $endval 0]"(1)"
netgen::log put " Continuing with black-boxed subcircuits $endval\n" lappend matcherr [lindex $endval 1]"(2)"
lappend matcherr [lindex $endval 0]
# Match pins # Match pins
netgen::log echo off netgen::log echo off
if {$dolist == 1} { if {$dolist == 1} {