Simplified dbModNet naming in hierarchicalConnect().

jhkim-pii · jhkim-pii · commit 2634a0a2601c · 2025-09-15T11:12:39.000+09:00
Signed-off-by: Jaehyun Kim &lt;jhkim@precisioninno.com&gt;
diff --git a/src/cts/test/hier_insertion_delay.vok b/src/cts/test/hier_insertion_delay.vok
@@ -1,10 +1,10 @@
 module multi_sink (clk);
  input clk;
 
- wire multi_sink_clkbuf_leaf_15_clk_regs_clknet_leaf_15_clk_regs;
- wire multi_sink_clkbuf_leaf_13_clk_regs_clknet_leaf_13_clk_regs;
- wire multi_sink_clkbuf_leaf_12_clk_regs_clknet_leaf_12_clk_regs;
- wire multi_sink_clkbuf_leaf_11_clk_regs_clknet_leaf_11_clk_regs;
+ wire clknet_leaf_15_clk_regs;
+ wire clknet_leaf_13_clk_regs;
+ wire clknet_leaf_12_clk_regs;
+ wire clknet_leaf_11_clk_regs;
  wire clk_regs;
  wire clknet_0_clk;
  wire clknet_1_0__leaf_clk;
@@ -78,15 +78,15 @@ module multi_sink (clk);
  CLKBUF_X3 clkbuf_leaf_16_clk_regs (.A(clknet_1_0__leaf_clk_regs),
     .Z(clknet_leaf_16_clk_regs));
  CLKBUF_X3 clkbuf_leaf_15_clk_regs (.A(clknet_1_0__leaf_clk_regs),
-    .Z(multi_sink_clkbuf_leaf_15_clk_regs_clknet_leaf_15_clk_regs));
+    .Z(clknet_leaf_15_clk_regs));
  CLKBUF_X3 clkbuf_leaf_14_clk_regs (.A(clknet_1_0__leaf_clk_regs),
     .Z(clknet_leaf_14_clk_regs));
  CLKBUF_X3 clkbuf_leaf_13_clk_regs (.A(clknet_1_1__leaf_clk_regs),
-    .Z(multi_sink_clkbuf_leaf_13_clk_regs_clknet_leaf_13_clk_regs));
+    .Z(clknet_leaf_13_clk_regs));
  CLKBUF_X3 clkbuf_leaf_12_clk_regs (.A(clknet_1_1__leaf_clk_regs),
-    .Z(multi_sink_clkbuf_leaf_12_clk_regs_clknet_leaf_12_clk_regs));
+    .Z(clknet_leaf_12_clk_regs));
  CLKBUF_X3 clkbuf_leaf_11_clk_regs (.A(clknet_1_1__leaf_clk_regs),
-    .Z(multi_sink_clkbuf_leaf_11_clk_regs_clknet_leaf_11_clk_regs));
+    .Z(clknet_leaf_11_clk_regs));
  CLKBUF_X3 clkbuf_leaf_10_clk_regs (.A(clknet_1_1__leaf_clk_regs),
     .Z(clknet_leaf_10_clk_regs));
  CLKBUF_X3 clkbuf_leaf_9_clk_regs (.A(clknet_1_1__leaf_clk_regs),
@@ -364,7 +364,7 @@ module multi_sink (clk);
  DFF_X1 ff70 (.CK(clknet_leaf_14_clk_regs));
  DFF_X1 ff71 (.CK(clknet_leaf_13_clk_regs));
  DFF_X1 ff74 (.CK(clknet_leaf_11_clk_regs));
- DFF_X1 ff75 (.CK(multi_sink_clkbuf_leaf_11_clk_regs_clknet_leaf_11_clk_regs));
+ DFF_X1 ff75 (.CK(clknet_leaf_11_clk_regs));
  DFF_X1 ff76 (.CK(clknet_leaf_15_clk_regs));
  DFF_X1 ff77 (.CK(clknet_leaf_13_clk_regs));
  DFF_X1 ff78 (.CK(clknet_leaf_12_clk_regs));
@@ -376,24 +376,24 @@ module multi_sink (clk);
  DFF_X1 ff83 (.CK(clknet_leaf_14_clk_regs));
  DFF_X1 ff84 (.CK(clknet_leaf_12_clk_regs));
  DFF_X1 ff85 (.CK(clknet_leaf_11_clk_regs));
- DFF_X1 ff86 (.CK(multi_sink_clkbuf_leaf_11_clk_regs_clknet_leaf_11_clk_regs));
+ DFF_X1 ff86 (.CK(clknet_leaf_11_clk_regs));
  DFF_X1 ff87 (.CK(clknet_leaf_15_clk_regs));
- DFF_X1 ff88 (.CK(multi_sink_clkbuf_leaf_13_clk_regs_clknet_leaf_13_clk_regs));
+ DFF_X1 ff88 (.CK(clknet_leaf_13_clk_regs));
  DFF_X1 ff89 (.CK(clknet_leaf_12_clk_regs));
  DFF_X1 ff9 (.CK(clknet_leaf_11_clk_regs));
  DFF_X1 ff92 (.CK(clknet_leaf_15_clk_regs));
  DFF_X1 ff93 (.CK(clknet_leaf_14_clk_regs));
  DFF_X1 ff94 (.CK(clknet_leaf_12_clk_regs));
  DFF_X1 ff95 (.CK(clknet_leaf_11_clk_regs));
- DFF_X1 ff96 (.CK(multi_sink_clkbuf_leaf_15_clk_regs_clknet_leaf_15_clk_regs));
+ DFF_X1 ff96 (.CK(clknet_leaf_15_clk_regs));
  DFF_X1 ff97 (.CK(clknet_leaf_12_clk_regs));
  DFF_X1 ff98 (.CK(clknet_leaf_11_clk_regs));
- DFF_X1 ff99 (.CK(multi_sink_clkbuf_leaf_11_clk_regs_clknet_leaf_11_clk_regs));
+ DFF_X1 ff99 (.CK(clknet_leaf_11_clk_regs));
  array_tile inst_0 (.clk(clknet_1_0__leaf_clk));
- hier_block h1 (.clknet_leaf_15_clk_regs_i(multi_sink_clkbuf_leaf_15_clk_regs_clknet_leaf_15_clk_regs),
-    .clknet_leaf_13_clk_regs_i(multi_sink_clkbuf_leaf_13_clk_regs_clknet_leaf_13_clk_regs),
-    .clknet_leaf_12_clk_regs_i(multi_sink_clkbuf_leaf_12_clk_regs_clknet_leaf_12_clk_regs),
-    .clknet_leaf_11_clk_regs_i(multi_sink_clkbuf_leaf_11_clk_regs_clknet_leaf_11_clk_regs));
+ hier_block h1 (.clknet_leaf_15_clk_regs_i(clknet_leaf_15_clk_regs),
+    .clknet_leaf_13_clk_regs_i(clknet_leaf_13_clk_regs),
+    .clknet_leaf_12_clk_regs_i(clknet_leaf_12_clk_regs),
+    .clknet_leaf_11_clk_regs_i(clknet_leaf_11_clk_regs));
 endmodule
 module hier_block (clknet_leaf_15_clk_regs_i,
     clknet_leaf_13_clk_regs_i,
diff --git a/src/cts/test/simple_test_hier_out.vok b/src/cts/test/simple_test_hier_out.vok
@@ -1,32 +1,32 @@
 module test_16_sinks (clk);
  input clk;
 
- wire test_16_sinks_clkbuf_1_1__f_clk_clknet_1_1__leaf_clk;
- wire test_16_sinks_clkbuf_1_0__f_clk_clknet_1_0__leaf_clk;
+ wire clknet_1_1__leaf_clk;
+ wire clknet_1_0__leaf_clk;
  wire clknet_0_clk;
 
  INV_X1 clkload0 (.A(clknet_1_1__leaf_clk));
  CLKBUF_X3 clkbuf_1_1__f_clk (.A(clknet_0_clk),
-    .Z(test_16_sinks_clkbuf_1_1__f_clk_clknet_1_1__leaf_clk));
+    .Z(clknet_1_1__leaf_clk));
  CLKBUF_X3 clkbuf_1_0__f_clk (.A(clknet_0_clk),
-    .Z(test_16_sinks_clkbuf_1_0__f_clk_clknet_1_0__leaf_clk));
+    .Z(clknet_1_0__leaf_clk));
  CLKBUF_X3 clkbuf_0_clk (.A(clk),
     .Z(clknet_0_clk));
- flop_pair U1 (.clknet_1_0__leaf_clk_i(test_16_sinks_clkbuf_1_0__f_clk_clknet_1_0__leaf_clk));
- flop_pair_U2 U2 (.clknet_1_1__leaf_clk_i(test_16_sinks_clkbuf_1_1__f_clk_clknet_1_1__leaf_clk),
-    .clknet_1_0__leaf_clk_i(test_16_sinks_clkbuf_1_0__f_clk_clknet_1_0__leaf_clk));
- flop_pair_U3 U3 (.clknet_1_1__leaf_clk_i(test_16_sinks_clkbuf_1_1__f_clk_clknet_1_1__leaf_clk),
-    .clknet_1_0__leaf_clk_i(test_16_sinks_clkbuf_1_0__f_clk_clknet_1_0__leaf_clk));
- flop_pair_U4 U4 (.clknet_1_1__leaf_clk_i(test_16_sinks_clkbuf_1_1__f_clk_clknet_1_1__leaf_clk),
-    .clknet_1_0__leaf_clk_i(test_16_sinks_clkbuf_1_0__f_clk_clknet_1_0__leaf_clk));
- flop_pair_U5 U5 (.clknet_1_1__leaf_clk_i(test_16_sinks_clkbuf_1_1__f_clk_clknet_1_1__leaf_clk),
-    .clknet_1_0__leaf_clk_i(test_16_sinks_clkbuf_1_0__f_clk_clknet_1_0__leaf_clk));
- flop_pair_U6 U6 (.clknet_1_1__leaf_clk_i(test_16_sinks_clkbuf_1_1__f_clk_clknet_1_1__leaf_clk),
-    .clknet_1_0__leaf_clk_i(test_16_sinks_clkbuf_1_0__f_clk_clknet_1_0__leaf_clk));
- flop_pair_U7 U7 (.clknet_1_1__leaf_clk_i(test_16_sinks_clkbuf_1_1__f_clk_clknet_1_1__leaf_clk),
-    .clknet_1_0__leaf_clk_i(test_16_sinks_clkbuf_1_0__f_clk_clknet_1_0__leaf_clk));
- flop_pair_U8 U8 (.clknet_1_1__leaf_clk_i(test_16_sinks_clkbuf_1_1__f_clk_clknet_1_1__leaf_clk),
-    .clknet_1_0__leaf_clk_i(test_16_sinks_clkbuf_1_0__f_clk_clknet_1_0__leaf_clk));
+ flop_pair U1 (.clknet_1_0__leaf_clk_i(clknet_1_0__leaf_clk));
+ flop_pair_U2 U2 (.clknet_1_1__leaf_clk_i(clknet_1_1__leaf_clk),
+    .clknet_1_0__leaf_clk_i(clknet_1_0__leaf_clk));
+ flop_pair_U3 U3 (.clknet_1_1__leaf_clk_i(clknet_1_1__leaf_clk),
+    .clknet_1_0__leaf_clk_i(clknet_1_0__leaf_clk));
+ flop_pair_U4 U4 (.clknet_1_1__leaf_clk_i(clknet_1_1__leaf_clk),
+    .clknet_1_0__leaf_clk_i(clknet_1_0__leaf_clk));
+ flop_pair_U5 U5 (.clknet_1_1__leaf_clk_i(clknet_1_1__leaf_clk),
+    .clknet_1_0__leaf_clk_i(clknet_1_0__leaf_clk));
+ flop_pair_U6 U6 (.clknet_1_1__leaf_clk_i(clknet_1_1__leaf_clk),
+    .clknet_1_0__leaf_clk_i(clknet_1_0__leaf_clk));
+ flop_pair_U7 U7 (.clknet_1_1__leaf_clk_i(clknet_1_1__leaf_clk),
+    .clknet_1_0__leaf_clk_i(clknet_1_0__leaf_clk));
+ flop_pair_U8 U8 (.clknet_1_1__leaf_clk_i(clknet_1_1__leaf_clk),
+    .clknet_1_0__leaf_clk_i(clknet_1_0__leaf_clk));
 endmodule
 module flop_pair (clknet_1_0__leaf_clk_i);
  input clknet_1_0__leaf_clk_i;
diff --git a/src/dbSta/src/dbEditHierarchy.cc b/src/dbSta/src/dbEditHierarchy.cc
@@ -385,27 +385,19 @@ void dbEditHierarchy::hierarchicalConnect(dbITerm* source_pin,
       if (!top_net) {
         dlogHierConnCreatingTopNet(connection_name, highest_common_module);
 
-        // Get full name of source_pin_flat_net
+        // Get base name of source_pin_flat_net
         Pin* sta_source_pin = db_network_->dbToSta(source_pin);
         dbNet* source_pin_flat_net = db_network_->flatNet(sta_source_pin);
-        Instance* sta_inst = db_network_->instance(sta_source_pin);
-        const char* inst_name = db_network_->name(sta_inst);
-        Instance* parent_inst = db_network_->parent(sta_inst);
-        const char* parent_name = db_network_->name(parent_inst);
-
-        std::string full_name = fmt::format(
-            "{}_{}_{}",
-            parent_name,
-            inst_name,
-            db_network_->name(db_network_->dbToSta(source_pin_flat_net)));
+        std::string base_name = fmt::format(
+            "{}", db_network_->name(db_network_->dbToSta(source_pin_flat_net)));
 
         // Decide a new unique net name to avoid collisions.
-        std::string unique_name = full_name;
+        std::string unique_name = base_name;
         int id = 0;
         while (highest_common_module->findModBTerm(unique_name.c_str())
                || highest_common_module->getModNet(unique_name.c_str())) {
           id++;
-          unique_name = fmt::format("{}_{}", full_name, id);
+          unique_name = fmt::format("{}_{}", base_name, id);
         }
 
         // Create and connect dbModNet
diff --git a/src/rsz/test/clone_hier_out.vok b/src/rsz/test/clone_hier_out.vok
@@ -303,14 +303,14 @@ module hi_fanout (clk1,
  output output98;
  output output99;
 
- wire hi_fanout_split576_net576;
- wire hi_fanout_split575_net575;
+ wire net576;
+ wire net575;
  wire net_o_11;
  wire net_o_10;
  wire net_o_9;
- wire hi_fanout_split174_net174;
+ wire net174;
  wire net_o_8;
- wire hi_fanout_split172_net172;
+ wire net172;
  wire net_o_7;
  wire net_o_6;
  wire net_o_5;
@@ -324,13 +324,13 @@ module hi_fanout (clk1,
  wire clk_to_nand0;
 
  BUF_X8 split576 (.A(clk_to_nand0),
-    .Z(hi_fanout_split576_net576));
+    .Z(net576));
  BUF_X4 split575 (.A(clk_to_nand1),
-    .Z(hi_fanout_split575_net575));
+    .Z(net575));
  BUF_X8 split174 (.A(clk_to_nand0),
-    .Z(hi_fanout_split174_net174));
+    .Z(net174));
  BUF_X8 split172 (.A(clk_to_nand1),
-    .Z(hi_fanout_split172_net172));
+    .Z(net172));
  DFF_X2 drvr_1 (.D(data),
     .CK(clk1),
     .Q(clk_to_nand0));
@@ -787,14 +787,14 @@ module hi_fanout (clk1,
  DFF_X1 load99 (.D(net0),
     .CK(clk1),
     .Q(output99));
- submodule cloneU1 (.net_i_3(hi_fanout_split576_net576),
-    .net_i_2(hi_fanout_split575_net575),
+ submodule cloneU1 (.net_i_3(net576),
+    .net_i_2(net575),
     .net_o_11(net_o_11),
     .net_o_10(net_o_10),
     .net_o_9(net_o_9),
-    .net_i_1(hi_fanout_split174_net174),
+    .net_i_1(net174),
     .net_o_8(net_o_8),
-    .net_i(hi_fanout_split172_net172),
+    .net_i(net172),
     .net_o_7(net_o_7),
     .net_o_6(net_o_6),
     .net_o_5(net_o_5),
diff --git a/src/rsz/test/repair_fanout2_hier_out.vok b/src/rsz/test/repair_fanout2_hier_out.vok
@@ -1,48 +1,48 @@
 module hi_fanout (clk1);
  input clk1;
 
- wire hi_fanout_fanout8_net8;
- wire hi_fanout_fanout7_net7;
- wire hi_fanout_fanout6_net6;
- wire hi_fanout_fanout5_net5;
- wire hi_fanout_fanout4_net4;
- wire hi_fanout_fanout3_net3;
- wire hi_fanout_fanout2_net2;
- wire hi_fanout_fanout1_net1;
+ wire net8;
+ wire net7;
+ wire net6;
+ wire net5;
+ wire net4;
+ wire net3;
+ wire net2;
+ wire net1;
  wire net0;
 
  BUF_X1 fanout8 (.A(net0),
-    .Z(hi_fanout_fanout8_net8));
+    .Z(net8));
  BUF_X1 fanout7 (.A(net8),
-    .Z(hi_fanout_fanout7_net7));
+    .Z(net7));
  BUF_X1 fanout6 (.A(net8),
-    .Z(hi_fanout_fanout6_net6));
+    .Z(net6));
  BUF_X1 fanout5 (.A(net8),
-    .Z(hi_fanout_fanout5_net5));
+    .Z(net5));
  BUF_X1 fanout4 (.A(net0),
-    .Z(hi_fanout_fanout4_net4));
- BUF_X1 fanout3 (.A(hi_fanout_fanout4_net4),
-    .Z(hi_fanout_fanout3_net3));
- BUF_X1 fanout2 (.A(hi_fanout_fanout3_net3),
-    .Z(hi_fanout_fanout2_net2));
- BUF_X1 fanout1 (.A(hi_fanout_fanout4_net4),
-    .Z(hi_fanout_fanout1_net1));
+    .Z(net4));
+ BUF_X1 fanout3 (.A(net4),
+    .Z(net3));
+ BUF_X1 fanout2 (.A(net3),
+    .Z(net2));
+ BUF_X1 fanout1 (.A(net4),
+    .Z(net1));
  DFF_X1 drvr (.CK(clk1),
     .Q(net0));
- hi_fanout_child hi_fanout_inst1 (.net_i_6(hi_fanout_fanout7_net7),
-    .net_i_5(hi_fanout_fanout6_net6),
-    .net_i_4(hi_fanout_fanout5_net5),
-    .net_i_3(hi_fanout_fanout4_net4),
-    .net_i_2(hi_fanout_fanout3_net3),
-    .net_i_1(hi_fanout_fanout2_net2),
-    .net_i(hi_fanout_fanout1_net1),
+ hi_fanout_child hi_fanout_inst1 (.net_i_6(net7),
+    .net_i_5(net6),
+    .net_i_4(net5),
+    .net_i_3(net4),
+    .net_i_2(net3),
+    .net_i_1(net2),
+    .net_i(net1),
     .clk1(clk1));
- hi_fanout_child_hi_fanout_inst2 hi_fanout_inst2 (.net_i_5(hi_fanout_fanout8_net8),
-    .net_i_4(hi_fanout_fanout7_net7),
-    .net_i_3(hi_fanout_fanout6_net6),
-    .net_i_2(hi_fanout_fanout4_net4),
-    .net_i_1(hi_fanout_fanout3_net3),
-    .net_i(hi_fanout_fanout1_net1),
+ hi_fanout_child_hi_fanout_inst2 hi_fanout_inst2 (.net_i_5(net8),
+    .net_i_4(net7),
+    .net_i_3(net6),
+    .net_i_2(net4),
+    .net_i_1(net3),
+    .net_i(net1),
     .net0(net0),
     .clk1(clk1));
 endmodule
diff --git a/src/rsz/test/repair_fanout3_hier_out.vok b/src/rsz/test/repair_fanout3_hier_out.vok
@@ -3,49 +3,49 @@ module hi_fanout (clk1,
  input clk1;
  output net0;
 
- wire hi_fanout_fanout8_net8;
- wire hi_fanout_fanout7_net7;
- wire hi_fanout_fanout6_net6;
- wire hi_fanout_drvr_net5;
- wire hi_fanout_fanout4_net4;
- wire hi_fanout_fanout3_net3;
- wire hi_fanout_fanout2_net2;
- wire hi_fanout_fanout1_net1;
+ wire net8;
+ wire net7;
+ wire net6;
+ wire net5;
+ wire net4;
+ wire net3;
+ wire net2;
+ wire net1;
 
- BUF_X1 fanout8 (.A(hi_fanout_drvr_net5),
-    .Z(hi_fanout_fanout8_net8));
- BUF_X1 fanout7 (.A(hi_fanout_fanout8_net8),
-    .Z(hi_fanout_fanout7_net7));
- BUF_X1 fanout6 (.A(hi_fanout_fanout8_net8),
-    .Z(hi_fanout_fanout6_net6));
- BUF_X1 fanout5 (.A(hi_fanout_fanout6_net6),
+ BUF_X1 fanout8 (.A(net5),
+    .Z(net8));
+ BUF_X1 fanout7 (.A(net8),
+    .Z(net7));
+ BUF_X1 fanout6 (.A(net8),
+    .Z(net6));
+ BUF_X1 fanout5 (.A(net6),
     .Z(net0));
- BUF_X1 fanout4 (.A(hi_fanout_drvr_net5),
-    .Z(hi_fanout_fanout4_net4));
- BUF_X1 fanout3 (.A(hi_fanout_fanout4_net4),
-    .Z(hi_fanout_fanout3_net3));
- BUF_X1 fanout2 (.A(hi_fanout_fanout3_net3),
-    .Z(hi_fanout_fanout2_net2));
- BUF_X1 fanout1 (.A(hi_fanout_fanout4_net4),
-    .Z(hi_fanout_fanout1_net1));
+ BUF_X1 fanout4 (.A(net5),
+    .Z(net4));
+ BUF_X1 fanout3 (.A(net4),
+    .Z(net3));
+ BUF_X1 fanout2 (.A(net3),
+    .Z(net2));
+ BUF_X1 fanout1 (.A(net4),
+    .Z(net1));
  DFF_X1 drvr (.CK(clk1),
-    .Q(hi_fanout_drvr_net5));
- hi_fanout_child hi_fanout_inst1 (.net_i_7(hi_fanout_fanout8_net8),
-    .net_i_6(hi_fanout_fanout7_net7),
-    .net_i_5(hi_fanout_fanout6_net6),
-    .net_i_3(hi_fanout_fanout4_net4),
-    .net_i_2(hi_fanout_fanout3_net3),
-    .net_i_1(hi_fanout_fanout2_net2),
-    .net_i(hi_fanout_fanout1_net1),
+    .Q(net5));
+ hi_fanout_child hi_fanout_inst1 (.net_i_7(net8),
+    .net_i_6(net7),
+    .net_i_5(net6),
+    .net_i_3(net4),
+    .net_i_2(net3),
+    .net_i_1(net2),
+    .net_i(net1),
     .net0(net0),
     .clk1(clk1));
- hi_fanout_child_hi_fanout_inst2 hi_fanout_inst2 (.net_i_6(hi_fanout_fanout8_net8),
-    .net_i_5(hi_fanout_fanout7_net7),
-    .net_i_4(hi_fanout_fanout6_net6),
-    .net_i_3(hi_fanout_drvr_net5),
-    .net_i_2(hi_fanout_fanout4_net4),
-    .net_i_1(hi_fanout_fanout3_net3),
-    .net_i(hi_fanout_fanout1_net1),
+ hi_fanout_child_hi_fanout_inst2 hi_fanout_inst2 (.net_i_6(net8),
+    .net_i_5(net7),
+    .net_i_4(net6),
+    .net_i_3(net5),
+    .net_i_2(net4),
+    .net_i_1(net3),
+    .net_i(net1),
     .clk1(clk1));
 endmodule
 module hi_fanout_child (net_i_7,
diff --git a/src/rsz/test/repair_setup4_hier_out.vok b/src/rsz/test/repair_setup4_hier_out.vok
diff --git a/src/rsz/test/split_load_hier_out.vok b/src/rsz/test/split_load_hier_out.vok
