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

Merge branch 'master' into netgen-1.5

This commit is contained in:
Tim Edwards 2020-08-09 03:01:40 -04:00
parent ed5276d67b 50b0e9cb65
commit 31ad072d1d
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.154 1.5.155

3
base/netcmp.c
View File

@ -7132,6 +7132,8 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
obn->instance.name = NULL; obn->instance.name = NULL;
obn->node = -1; obn->node = -1;
#if 0
/* Note: This pin has already been accounted for */
if (Debug == 0) { if (Debug == 0) {
if (strcmp(ob1->name, "(no pins)")) { if (strcmp(ob1->name, "(no pins)")) {
for (m = 0; m < left_col_end; m++) *(ostr + m) = ' '; for (m = 0; m < left_col_end; m++) *(ostr + m) = ' ';
@ -7147,6 +7149,7 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
Fprintf(stderr, "No netlist match for cell %s pin %s\n", Fprintf(stderr, "No netlist match for cell %s pin %s\n",
tc1->name, ob1->name); tc1->name, ob1->name);
} }
#endif
if (ob2 == tc2->cell) { if (ob2 == tc2->cell) {
obn->next = ob2; obn->next = ob2;

6
tcltk/netgen.tcl.in
View File

@ -501,6 +501,7 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
return return
} }
set properr {} set properr {}
set pinsgood 0
while {$endval != {}} { while {$endval != {}} {
if {$dolist == 1} { if {$dolist == 1} {
netgen::run -list converge netgen::run -list converge
@ -546,6 +547,7 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
equate classes "$fnum1 [lindex $endval 0]" \ equate classes "$fnum1 [lindex $endval 0]" \
"$fnum2 [lindex $endval 1]" "$fnum2 [lindex $endval 1]"
} }
set pinsgood $result
netgen::log echo on netgen::log echo on
} }
if {$uresult == 2} {lappend properr [lindex $endval 0]} if {$uresult == 2} {lappend properr [lindex $endval 0]}
@ -569,7 +571,11 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
netgen::log echo off netgen::log echo off
puts stdout "Result: " nonewline puts stdout "Result: " nonewline
netgen::log echo on netgen::log echo on
if {$pinsgood == 0} {
netgen::log put "The top level cell failed pin matching.\n"
} else {
verify only verify only
}
if {$properr != {}} { if {$properr != {}} {
netgen::log put "The following cells had property errors: $properr\n" netgen::log put "The following cells had property errors: $properr\n"
} }