Merge pull request #10035 from AcKoucher/rcx-fix-short-marking

rcx: ensure that short junctions are always identified and marked

Author: maliberty

src/rcx/src/netRC.cpp

@@ -833,7 +833,7 @@ uint32_t extMain::makeNetRCsegs(dbNet* net, bool skipStartWarning)
   uint32_t srcJid;
   dbWire* wire = net->getWire();
   dbWirePathItr pitr;
-  if (_mergeResBound != 0.0 || _mergeViaRes) {
+  {
     dbWirePath path;
     for (pitr.begin(wire); pitr.getNextPath(path);) {
       if (!path.bterm && !path.iterm && path.is_branch && path.junction_id) {

src/rcx/test/BUILD

@@ -19,6 +19,7 @@ COMPULSORY_TESTS = [
     "names",
     "net_name_consistency",
     "coordinates",
+    "no_merging",
 ]
 
 # From CMakeLists.txt or_integration_tests(PASSFAIL_TESTS
@@ -104,6 +105,10 @@ filegroup(
         ) + {
             "ext_pattern": ["generate_pattern.defok"],
             "gcd": ["ext_pattern.rules"],
+            "no_merging": [
+                "ext_pattern.rules",
+                "gcd.def",
+            ],
         }.get(test_name, []),
     )
     for test_name in ALL_TESTS

src/rcx/test/CMakeLists.txt

@@ -8,6 +8,7 @@ or_integration_tests(
     names
     net_name_consistency
     coordinates
+    no_merging
   PASSFAIL_TESTS
     rcx_unit_test
 )

src/rcx/test/no_merging.ok

@@ -0,0 +1,19 @@
+[INFO ODB-0227] LEF file: sky130hs/sky130hs.tlef, created 13 layers, 25 vias
+[INFO ODB-0227] LEF file: sky130hs/sky130hs_std_cell.lef, created 390 library cells
+[INFO ODB-0128] Design: gcd
+[INFO ODB-0130]     Created 54 pins.
+[INFO ODB-0131]     Created 8171 components and 33894 component-terminals.
+[INFO ODB-0132]     Created 2 special nets and 0 connections.
+[INFO ODB-0133]     Created 411 nets and 1210 connections.
+[INFO RCX-0431] Defined process_corner X with ext_model_index 0
+[INFO RCX-0029] Defined extraction corner X
+[INFO RCX-0435] Reading extraction model file ext_pattern.rules ...
+[INFO RCX-0436] RC segment generation gcd (max_merge_res 0.0) ...
+[INFO RCX-0040] Final 4791 rc segments
+[INFO RCX-0439] Coupling Cap extraction gcd ...
+[INFO RCX-0440] Coupling threshhold is 0.1000 fF, coupling capacitance less than 0.1000 fF will be grounded.
+[INFO RCX-0442] 50% of 2368 wires extracted
+[INFO RCX-0442] 100% of 2368 wires extracted
+[INFO RCX-0045] Extract 411 nets, 5202 rsegs, 5202 caps, 2237 ccs
+[INFO RCX-0443] 411 nets finished
+No differences found.