Merge branch 'master' into netgen-1.5

Updated version to go along with the merge of pull request #36 from
Mitch Bailey.
2026-08-25 15:37:39 +02:00 · 2021-10-29 03:00:32 -04:00 · 2021-10-28 14:24:47 -04:00 · 2021-10-28 01:29:32 -07:00 · 2021-10-24 03:00:12 -04:00 · 2021-10-23 14:47:30 -04:00
4 changed files with 7 additions and 5 deletions
@@ -1 +1 @@
-1.5.203
+1.5.207
@@ -1582,7 +1582,8 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 			}
 		    }
 		    else {
-		       match = 0;
+		       // cell exists in one circuit but not the other, so flatten it.
+		       // match = 0;
 		       break;
 		    }
 		}
@@ -609,16 +609,16 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
      } else {
 	 # Flatten the non-matching subcircuit (but not the top-level cells)
         if {[netgen::print queue] != {}} {
-	    if {([lsearch $noflat [lindex $endval 1]] == -1) &&
+	    if {([lsearch $noflat [lindex $endval 0]] == -1) &&
 		    ([lsearch $noflat [lindex $endval 1]] == -1)} {
 	       netgen::log put "  Flattening non-matched subcircuits $endval\n"
 	       netgen::flatten class "[lindex $endval 0] $fnum1"
 	       netgen::flatten class "[lindex $endval 1] $fnum2"
 	    } else {
 	       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 0]
+	       lappend matcherr [lindex $endval 0]"(2)"
 	       # Match pins
               netgen::log echo off
 	       if {$dolist == 1} {
@@ -2194,6 +2194,7 @@ _netcmp_compare(ClientData clientData,
   CreateTwoLists(name1, fnum1, name2, fnum2, dolist);
   while (PrematchLists(name1, fnum1, name2, fnum2) > 0) {
      Fprintf(stdout, "Making another compare attempt.\n");
+      Printf("Flattened mismatched instances and attempting compare again.\n");
      CreateTwoLists(name1, fnum1, name2, fnum2, dolist);
   }
Author	SHA1	Message	Date
Tim Edwards	6b8c6d1718	Merge branch 'master' into netgen-1.5	2021-10-29 03:00:32 -04:00
Tim Edwards	c7dfff4bb9	Updated version to go along with the merge of pull request #36 from Mitch Bailey.	2021-10-28 14:24:47 -04:00
D. Mitch Bailey	12fa080212	When comparing instance counts to determine is flattening makes a better match, flatten cells that have no instances in common. Display a screen message to indicate a re-compare afterr flattening.	2021-10-28 01:29:32 -07:00
Tim Edwards	610eebb758	Merge branch 'master' into netgen-1.5	2021-10-24 03:00:12 -04:00
Tim Edwards	4c4bad08f2	After reverting back to before pull request #33 , updated the version and re-applied the fixes from issue #34.	2021-10-23 14:47:30 -04:00
Tim Edwards	23ff2f00a3	Revert "Remove disconnected ports after flattening." This reverts commit `6d6da9cf5c`. Reverting back to before pull request #33.	2021-10-23 14:42:37 -04:00
Tim Edwards	d09f0dd53b	Revert "Flatten unmatched cells that don't contain instances from the other file." This reverts commit `42b1acc564`. Reverting back to before pull request #33.	2021-10-23 14:42:32 -04:00
Tim Edwards	56d4d581e7	Revert "Minor syntactical editing of pull request #33 , and updated version" This reverts commit `6ceeddf096`. Reverting back to before pull request #33.	2021-10-23 14:42:28 -04:00
Tim Edwards	1bb4866226	Revert "Made a correction to the flattening code, removed a duplicate" This reverts commit `625e043eff`. Reverting back to before pull request #33.	2021-10-23 14:41:58 -04:00
Tim Edwards	97058c5017	Merge branch 'master' into netgen-1.5	2021-10-16 03:00:13 -04:00
Tim Edwards	625e043eff	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).	2021-10-15 09:13:02 -04:00
Tim Edwards	aa120460d0	Merge branch 'master' into netgen-1.5	2021-10-15 03:00:03 -04:00
Tim Edwards	6ceeddf096	Minor syntactical editing of pull request #33 , and updated version to go along with the merge of the pull request (from Mitch Bailey).	2021-10-14 11:22:20 -04:00
D. Mitch Bailey	42b1acc564	Flatten unmatched cells that don't contain instances from the other file.	2021-10-13 21:00:49 -07:00
D. Mitch Bailey	6d6da9cf5c	Remove disconnected ports after flattening.	2021-10-13 01:15:15 -07:00
@@ -1 +1 @@
 .5.203
 .5.207