Minor refactoring and reverting to the original net names.

- New net names do not look better.

Signed-off-by: Jaehyun Kim <[email protected]>

Author: jhkim-pii

src/rsz/src/Resizer.cc

@@ -3413,29 +3413,19 @@ void Resizer::createNewTieCellForLoadPin(const Pin* load_pin,
   odb::dbModITerm* load_mod_iterm = nullptr;
   db_network_->staToDb(load_pin, load_iterm, load_bterm, load_mod_iterm);
 
+  std::string connection_name = "net";
+
   // load_pin is a flat pin
   if (load_iterm) {
     // Connect the tie instance output pin to the load pin.
-    // - It automatically disconnects the existing connection of load pin
-    std::string connection_name
-        = fmt::format("{}_{}",
-                      db_network_->name(new_tie_inst),
-                      new_tie_iterm->getMTerm()->getName());
-    load_iterm->disconnect();
+    load_iterm->disconnect();  // This is required
     db_network_->hierarchicalConnect(
         new_tie_iterm, load_iterm, connection_name.c_str());
     return;
   }
 
   // load_pin is a hier pin
   if (load_mod_iterm) {
-    // Connect the tie instance output pin to the load pin.
-    // - It automatically disconnects the existing connection of load pin
-    std::string connection_name
-        = fmt::format("{}_{}",
-                      db_network_->name(new_tie_inst),
-                      new_tie_iterm->getMTerm()->getName());
-
     // Should not disconnect load_mod_iterm first. hierarchicalConnect() will
     // handle it. If load_mod_iterm is disconnected first,
     // hierarchicalConnect() cannot find the matching flat net with the
@@ -3449,10 +3439,6 @@ void Resizer::createNewTieCellForLoadPin(const Pin* load_pin,
   if (load_bterm) {
     // Create a new net and connect both the tie cell output and the top-level
     // port to it.
-    std::string connection_name
-        = fmt::format("{}_{}",
-                      db_network_->name(new_tie_inst),
-                      new_tie_iterm->getMTerm()->getName());
     Net* new_net = db_network_->makeNet(
         connection_name.c_str(), parent, odb::dbNameUniquifyType::IF_NEEDED);
     new_tie_iterm->connect(db_network_->staToDb(new_net));

src/rsz/test/repair_tie10_hier.ok

@@ -60,7 +60,7 @@ Net gcd/ALU_16_0_16_0_16_unused_CO[14:0]_X_HAN_CARLSON/BI
  Number of pins: 2
 
 Driver pins
- _396__1/H output (TIEHIx1_ASAP7_75t_R) (0, 0)
+ _395__1/H output (TIEHIx1_ASAP7_75t_R) (0, 0)
 
 Load pins
  _395_/_087_/A input (BUFx2_ASAP7_75t_R) 0.44-0.58
@@ -77,7 +77,7 @@ Net gcd/ALU_16_0_16_0_16_unused_CO[14:0]_X_HAN_CARLSON/CI
  Number of pins: 2
 
 Driver pins
- _396__2/H output (TIEHIx1_ASAP7_75t_R) (0, 0)
+ _395__2/H output (TIEHIx1_ASAP7_75t_R) (0, 0)
 
 Load pins
  _395_/_153_/B input (FAx1_ASAP7_75t_R) 1.80-2.18

src/rsz/test/repair_tie11_hier.defok

@@ -6,20 +6,20 @@ UNITS DISTANCE MICRONS 1000 ;
 COMPONENTS 8 ;
     - alu0/hier2/load1 BUFx2_ASAP7_75t_R ;
     - alu0/load2 BUFx2_ASAP7_75t_R ;
+    - alu0_1 TIEHIx1_ASAP7_75t_R + SOURCE TIMING + PLACED ( 0 0 ) N ;
     - alu1/hier2/load1 BUFx2_ASAP7_75t_R ;
     - alu1/load2 BUFx2_ASAP7_75t_R ;
+    - alu1_2 TIEHIx1_ASAP7_75t_R + SOURCE TIMING + PLACED ( 0 0 ) N ;
     - load0 BUFx2_ASAP7_75t_R ;
-    - tie0 TIEHIx1_ASAP7_75t_R + SOURCE TIMING + PLACED ( 0 0 ) N ;
-    - tie0_1 TIEHIx1_ASAP7_75t_R + SOURCE TIMING + PLACED ( 0 0 ) N ;
-    - tie0_2 TIEHIx1_ASAP7_75t_R + SOURCE TIMING + PLACED ( 36 135 ) N ;
+    - load0_3 TIEHIx1_ASAP7_75t_R + SOURCE TIMING + PLACED ( 36 135 ) N ;
 END COMPONENTS
 PINS 1 ;
     - top_in + NET top_in + DIRECTION INPUT + USE SIGNAL ;
 END PINS
 NETS 4 ;
-    - tie0_1_H ( alu1/hier2/load1 A ) ( tie0_1 H ) ( alu1/load2 A ) + USE SIGNAL ;
-    - tie0_2_H ( load0 A ) ( tie0_2 H ) + USE SIGNAL ;
-    - tie0_H ( alu0/hier2/load1 A ) ( tie0 H ) ( alu0/load2 A ) + USE SIGNAL ;
+    - net ( alu0/hier2/load1 A ) ( alu0_1 H ) ( alu0/load2 A ) + USE SIGNAL ;
+    - net1 ( alu1/hier2/load1 A ) ( alu1_2 H ) ( alu1/load2 A ) + USE SIGNAL ;
+    - net2 ( load0 A ) ( load0_3 H ) + USE SIGNAL ;
     - top_in ( PIN top_in ) + USE SIGNAL ;
 END NETS
 END DESIGN

src/rsz/test/repair_tie11_hier.vok

@@ -1,17 +1,17 @@
 module top (top_in);
  input top_in;
 
- wire tie0_1_H;
- wire tie0_H;
+ wire net;
+ wire net;
  wire main_net;
- wire tie0_2_H;
-
- TIEHIx1_ASAP7_75t_R tie0_2 (.H(tie0_2_H));
- TIEHIx1_ASAP7_75t_R tie0_1 (.H(tie0_1_H));
- TIEHIx1_ASAP7_75t_R tie0 (.H(tie0_H));
- BUFx2_ASAP7_75t_R load0 (.A(tie0_2_H));
- ALU_module alu0 (.MI1(tie0_H));
- ALU_module_alu1 alu1 (.MI1(tie0_1_H));
+ wire net2;
+
+ TIEHIx1_ASAP7_75t_R load0_3 (.H(net2));
+ TIEHIx1_ASAP7_75t_R alu1_2 (.H(net));
+ TIEHIx1_ASAP7_75t_R alu0_1 (.H(net));
+ BUFx2_ASAP7_75t_R load0 (.A(net2));
+ ALU_module alu0 (.MI1(net));
+ ALU_module_alu1 alu1 (.MI1(net));
  HIER1 hier1 (.in(top_in),
     .MI0(main_net));
 endmodule

src/rsz/test/repair_tie12_hier.defok

@@ -6,20 +6,20 @@ UNITS DISTANCE MICRONS 1000 ;
 COMPONENTS 8 ;
     - alu0/hier2/load1 BUFx2_ASAP7_75t_R ;
     - alu0/load2 BUFx2_ASAP7_75t_R ;
+    - alu0_1 TIEHIx1_ASAP7_75t_R + SOURCE TIMING + PLACED ( 0 0 ) N ;
     - hier3/alu1/hier2/load1 BUFx2_ASAP7_75t_R ;
     - hier3/alu1/load2 BUFx2_ASAP7_75t_R ;
-    - hier3/tie0 TIEHIx1_ASAP7_75t_R + SOURCE TIMING + PLACED ( 0 0 ) N ;
+    - hier3/alu1_2 TIEHIx1_ASAP7_75t_R + SOURCE TIMING + PLACED ( 0 0 ) N ;
     - load0 BUFx2_ASAP7_75t_R ;
-    - tie0 TIEHIx1_ASAP7_75t_R + SOURCE TIMING + PLACED ( 0 0 ) N ;
-    - tie0_1 TIEHIx1_ASAP7_75t_R + SOURCE TIMING + PLACED ( 36 135 ) N ;
+    - load0_3 TIEHIx1_ASAP7_75t_R + SOURCE TIMING + PLACED ( 36 135 ) N ;
 END COMPONENTS
 PINS 1 ;
     - top_in + NET top_in + DIRECTION INPUT + USE SIGNAL ;
 END PINS
 NETS 4 ;
-    - tie0_1_H ( load0 A ) ( tie0_1 H ) + USE SIGNAL ;
-    - tie0_H ( alu0/hier2/load1 A ) ( tie0 H ) ( alu0/load2 A ) + USE SIGNAL ;
-    - tie0_H1 ( hier3/alu1/hier2/load1 A ) ( hier3/tie0 H ) ( hier3/alu1/load2 A ) + USE SIGNAL ;
+    - net ( alu0/hier2/load1 A ) ( alu0_1 H ) ( alu0/load2 A ) + USE SIGNAL ;
+    - net1 ( hier3/alu1/hier2/load1 A ) ( hier3/alu1_2 H ) ( hier3/alu1/load2 A ) + USE SIGNAL ;
+    - net2 ( load0 A ) ( load0_3 H ) + USE SIGNAL ;
     - top_in ( PIN top_in ) + USE SIGNAL ;
 END NETS
 END DESIGN

src/rsz/test/repair_tie12_hier.vok

@@ -1,14 +1,14 @@
 module top (top_in);
  input top_in;
 
- wire tie0_H;
+ wire net;
  wire main_net;
- wire tie0_1_H;
+ wire net2;
 
- TIEHIx1_ASAP7_75t_R tie0_1 (.H(tie0_1_H));
- TIEHIx1_ASAP7_75t_R tie0 (.H(tie0_H));
- BUFx2_ASAP7_75t_R load0 (.A(tie0_1_H));
- ALU_module alu0 (.MI1(tie0_H));
+ TIEHIx1_ASAP7_75t_R load0_3 (.H(net2));
+ TIEHIx1_ASAP7_75t_R alu0_1 (.H(net));
+ BUFx2_ASAP7_75t_R load0 (.A(net2));
+ ALU_module alu0 (.MI1(net));
  HIER1 hier1 (.in(top_in),
     .MI0(main_net));
  HIER3 hier3 ();
@@ -35,10 +35,10 @@ module HIER1 (in,
 endmodule
 module HIER3 ();
 
- wire tie0_H;
+ wire net;
 
- TIEHIx1_ASAP7_75t_R tie0 (.H(tie0_H));
- ALU_module_alu1 alu1 (.MI1(tie0_H));
+ TIEHIx1_ASAP7_75t_R alu1_2 (.H(net));
+ ALU_module_alu1 alu1 (.MI1(net));
 endmodule
 module ALU_module_alu1 (MI1);
  input MI1;

src/rsz/test/repair_tie9.defok

@@ -6,12 +6,12 @@ UNITS DISTANCE MICRONS 1000 ;
 DIEAREA ( 0 0 ) ( 40000 40000 ) ;
 COMPONENTS 4 ;
     - t1 sky130_fd_sc_hd__conb_1 ;
-    - t1_1 sky130_fd_sc_hd__conb_1 + SOURCE TIMING + PLACED ( 280 1195 ) N ;
     - u0 sky130_fd_sc_hd__buf_4 ;
+    - u0_1 sky130_fd_sc_hd__conb_1 + SOURCE TIMING + PLACED ( 280 1195 ) N ;
     - u1 sky130_fd_sc_hd__buf_4 ;
 END COMPONENTS
 NETS 2 ;
     - n1 ( t1 HI ) ( u1 A ) + USE SIGNAL ;
-    - t1_1_HI ( u0 A ) ( t1_1 HI ) + USE SIGNAL ;
+    - net ( u0 A ) ( u0_1 HI ) + USE SIGNAL ;
 END NETS
 END DESIGN