Merge branch 'master' into netgen-1.5

Modified the JSON output so that missing pins which do not match
unconnected pins in the other netlist are marked as "(no pin)" rather than "(no matching pin)". This allows a script parsint the JSON file (e.g., count_lvs.py from qflow) to distinguish between a real pin error and one that can be ignored.
2026-08-22 22:17:22 +02:00 · 2021-06-10 03:00:09 -04:00 · 2021-06-09 09:34:02 -04:00 · 2021-06-09 09:20:45 -04:00 · 2021-06-09 03:00:10 -04:00 · 2021-06-08 17:25:17 -04:00
2 changed files with 29 additions and 15 deletions
@@ -1 +1 @@
-1.5.183
+1.5.185
@@ -5691,7 +5691,7 @@ PropertyMatch(struct objlist *ob1, int file1,
 #endif
   }

-   /* WIP---Check for no-connect pins in merged devices on both sides.	*/
+   /* Check for no-connect pins in merged devices on both sides.	*/
   /* Both sides should either have no-connects marked, or neither.	*/
   /* (Permutable pins may need to be handled correctly. . .		*/

@@ -5746,10 +5746,12 @@ PropertyMatch(struct objlist *ob1, int file1,
      if ((t1type != PROPERTY) && (checked_one == TRUE)) {
 	 // t2 has more property records than t1, and they did not get
 	 // merged equally by PropertySortAndCombine().
-	 Fprintf(stdout, "Circuit 1 parallel/series network does not match"
+	 if (do_print) {
+	    Fprintf(stdout, "Circuit 1 parallel/series network does not match"
 			" Circuit 2\n");
-	 DumpNetwork(ob1, 1);
-	 DumpNetwork(ob2, 2);
+	    DumpNetwork(ob1, 1);
+	    DumpNetwork(ob2, 2);
+	 }
 	 mismatches++;
      }
      else if (t1type != PROPERTY) {
@@ -7245,7 +7247,8 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
   /* so apply only to black-box (CELL_PLACEHOLDER) entries.	*/ 
   /* (Semi-hack: Allow "!" global flag) */

-   if ((tc1->flags & CELL_PLACEHOLDER) && (tc2->flags & CELL_PLACEHOLDER)) {
+   if (((tc1->flags & CELL_PLACEHOLDER) && (tc2->flags & CELL_PLACEHOLDER)) ||
+	    (NodeClasses == NULL)) {
      ob1 = tc1->cell;
      bangptr1 = strrchr(ob1->name, '!');
      if (bangptr1 && (*(bangptr1 + 1) == '\0'))
@@ -7341,15 +7344,6 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 	    Fprintf(stderr, "No netlist match for cell %s pin %s\n",
 				tc2->name, ob2->name);
 	 }
-#ifdef TCL_NETGEN
-         if (dolist) {
-	    Tcl_ListObjAppendElement(netgeninterp, plist1,
-			Tcl_NewStringObj("(no matching pin)", -1));
-	    Tcl_ListObjAppendElement(netgeninterp, plist2,
-			Tcl_NewStringObj(ob2->name, -1));
-         }
-#endif
-	 result = 0;

 	 /* Before making a proxy pin, check to see if	*/
 	 /* flattening instances has left a port with a	*/
@@ -7366,8 +7360,28 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 	 if ((obt == NULL) && (notempty == 1)) {
 	    ob2->node = -2;	// Will run this through cleanuppins
 	    needclean2 = 1;
+#ifdef TCL_NETGEN
+            if (dolist) {
+	       Tcl_ListObjAppendElement(netgeninterp, plist1,
+			Tcl_NewStringObj("(no pin)", -1));
+	       Tcl_ListObjAppendElement(netgeninterp, plist2,
+			Tcl_NewStringObj(ob2->name, -1));
+            }
+#endif
 	    continue;
 	 }
+	 else if (notempty == 1) {
+	    /* Flag this as an error */
+	    result = 0;
+#ifdef TCL_NETGEN
+            if (dolist) {
+	       Tcl_ListObjAppendElement(netgeninterp, plist1,
+			Tcl_NewStringObj("(no matching pin)", -1));
+	       Tcl_ListObjAppendElement(netgeninterp, plist2,
+			Tcl_NewStringObj(ob2->name, -1));
+            }
+#endif
+	 }
 	 ob2->model.port = numnodes++;	// Assign a port order

 	 /* Add a proxy pin to tc1 */
Author	SHA1	Message	Date
Tim Edwards	e7ae84bbc8	Merge branch 'master' into netgen-1.5	2021-06-10 03:00:09 -04:00
Tim Edwards	dfabdaa367	Modified the JSON output so that missing pins which do not match unconnected pins in the other netlist are marked as "(no pin)" rather than "(no matching pin)". This allows a script parsint the JSON file (e.g., count_lvs.py from qflow) to distinguish between a real pin error and one that can be ignored.	2021-06-09 09:34:02 -04:00
Tim Edwards	c5c1306f6a	Corrected a minor error where the property mismatch check outputs an error message while doing a non-final iteration, where all output is supposed to be suppressed.	2021-06-09 09:20:45 -04:00
Tim Edwards	43c018f3bc	Merge branch 'master' into netgen-1.5	2021-06-09 03:00:10 -04:00
Tim Edwards	0614461c84	Modified MatchPins so that pin mismatches on nets that are not connected to anything are once again ignored (the prior commit to prevent netgen from not reporting swapped pins as an error overcorrected).	2021-06-08 17:25:17 -04:00
Tim Edwards	6e94886b65	Messed up basic pin comparison between black-box vs. non-black-box subcircuit situations in the last commit. This commit fixes it.	2021-06-08 16:52:57 -04:00
@@ -1 +1 @@
 .5.183
 .5.185