Merge pull request The-OpenROAD-Project#9761 from The-OpenROAD-Project-staging/secure-fix-net-name-collision

odb: consolidate unique net name APIs into unified makeNewNetName

Author: maliberty

src/cts/test/gated_clock4.vok

@@ -1,7 +1,7 @@
 module multi_sink (clk);
  input clk;
 
- wire clknet_1_1__leaf_clk_1;
+ wire clknet_1_1__leaf_clk_2;
  wire clknet_1_0__leaf_clk_1;
  wire gclk1;
  wire gclk3;
@@ -64,7 +64,7 @@ module multi_sink (clk);
  CLKBUF_X3 clkbuf_1_0__f_gclk4 (.A(clknet_0_gclk4),
     .Z(clknet_1_0__leaf_gclk4));
  CLKBUF_X3 clkbuf_1_1__f_clk (.A(delaynet_6_core),
-    .Z(clknet_1_1__leaf_clk_1));
+    .Z(clknet_1_1__leaf_clk_2));
  CLKBUF_X3 clkbuf_2_0__f_gclk1 (.A(clknet_0_gclk1),
     .Z(clknet_2_0__leaf_gclk1));
  CLKBUF_X3 clkbuf_2_0__f_gclk3 (.A(clknet_0_gclk3),
@@ -235,13 +235,13 @@ module multi_sink (clk);
  DFF_X1 ff285 (.CK(clknet_2_0__leaf_gclk3));
  DFF_X1 ff286 (.CK(clknet_2_2__leaf_gclk3));
  DFF_X1 ff287 (.CK(clknet_2_1__leaf_gclk3));
- CLKGATE_X1 gclk1 (.CK(clknet_1_1__leaf_clk_1),
+ CLKGATE_X1 gclk1 (.CK(clknet_1_1__leaf_clk_2),
     .GCK(gclk1));
  CLKGATE_X1 gclk3 (.CK(clknet_1_0__leaf_gclk4),
     .GCK(gclk3));
  CLKGATE_X1 gclk4 (.CK(clknet_1_0__leaf_clk_1),
     .GCK(gclk4));
- hier_block h1 (.clknet_1_1__leaf_clk_i(clknet_1_1__leaf_clk_1),
+ hier_block h1 (.clknet_1_1__leaf_clk_i(clknet_1_1__leaf_clk_2),
     .clknet_1_0__leaf_clk_i(clknet_1_0__leaf_clk_1));
 endmodule
 module hier_block (clknet_1_1__leaf_clk_i,

src/cts/test/hier_insertion_delay.vok

@@ -1,9 +1,9 @@
 module multi_sink (clk);
  input clk;
 
- wire clknet_leaf_15_clk_regs_1;
- wire clknet_leaf_13_clk_regs_1;
- wire clknet_leaf_12_clk_regs_1;
+ wire clknet_leaf_15_clk_regs_4;
+ wire clknet_leaf_13_clk_regs_3;
+ wire clknet_leaf_12_clk_regs_2;
  wire clknet_leaf_11_clk_regs_1;
  wire clk_regs;
  wire clknet_0_clk;
@@ -55,13 +55,13 @@ module multi_sink (clk);
  CLKBUF_X3 clkbuf_leaf_11_clk_regs (.A(clknet_1_1__leaf_clk_regs),
     .Z(clknet_leaf_11_clk_regs_1));
  CLKBUF_X3 clkbuf_leaf_12_clk_regs (.A(clknet_1_1__leaf_clk_regs),
-    .Z(clknet_leaf_12_clk_regs_1));
+    .Z(clknet_leaf_12_clk_regs_2));
  CLKBUF_X3 clkbuf_leaf_13_clk_regs (.A(clknet_1_1__leaf_clk_regs),
-    .Z(clknet_leaf_13_clk_regs_1));
+    .Z(clknet_leaf_13_clk_regs_3));
  CLKBUF_X3 clkbuf_leaf_14_clk_regs (.A(clknet_1_0__leaf_clk_regs),
     .Z(clknet_leaf_14_clk_regs));
  CLKBUF_X3 clkbuf_leaf_15_clk_regs (.A(clknet_1_0__leaf_clk_regs),
-    .Z(clknet_leaf_15_clk_regs_1));
+    .Z(clknet_leaf_15_clk_regs_4));
  CLKBUF_X3 clkbuf_leaf_16_clk_regs (.A(clknet_1_0__leaf_clk_regs),
     .Z(clknet_leaf_16_clk_regs));
  CLKBUF_X3 clkbuf_leaf_17_clk_regs (.A(clknet_1_0__leaf_clk_regs),
@@ -298,7 +298,7 @@ module multi_sink (clk);
  DFF_X1 ff271 (.CK(clknet_leaf_21_clk_regs));
  DFF_X1 ff272 (.CK(clknet_leaf_5_clk_regs));
  DFF_X1 ff273 (.CK(clknet_leaf_7_clk_regs));
- DFF_X1 ff274 (.CK(clknet_leaf_15_clk_regs_1));
+ DFF_X1 ff274 (.CK(clknet_leaf_15_clk_regs_4));
  DFF_X1 ff275 (.CK(clknet_leaf_22_clk_regs));
  DFF_X1 ff276 (.CK(clknet_leaf_6_clk_regs));
  DFF_X1 ff277 (.CK(clknet_leaf_10_clk_regs));
@@ -322,73 +322,73 @@ module multi_sink (clk);
  DFF_X1 ff35 (.CK(clknet_leaf_14_clk_regs));
  DFF_X1 ff36 (.CK(clknet_leaf_5_clk_regs));
  DFF_X1 ff37 (.CK(clknet_leaf_9_clk_regs));
- DFF_X1 ff38 (.CK(clknet_leaf_15_clk_regs_1));
- DFF_X1 ff39 (.CK(clknet_leaf_13_clk_regs_1));
+ DFF_X1 ff38 (.CK(clknet_leaf_15_clk_regs_4));
+ DFF_X1 ff39 (.CK(clknet_leaf_13_clk_regs_3));
  DFF_X1 ff4 (.CK(clknet_leaf_6_clk_regs));
  DFF_X1 ff40 (.CK(clknet_leaf_10_clk_regs));
  DFF_X1 ff41 (.CK(clknet_leaf_16_clk_regs));
- DFF_X1 ff42 (.CK(clknet_leaf_13_clk_regs_1));
+ DFF_X1 ff42 (.CK(clknet_leaf_13_clk_regs_3));
  DFF_X1 ff43 (.CK(clknet_leaf_5_clk_regs));
  DFF_X1 ff44 (.CK(clknet_leaf_10_clk_regs));
  DFF_X1 ff45 (.CK(clknet_leaf_16_clk_regs));
  DFF_X1 ff46 (.CK(clknet_leaf_14_clk_regs));
  DFF_X1 ff47 (.CK(clknet_leaf_5_clk_regs));
  DFF_X1 ff48 (.CK(clknet_leaf_9_clk_regs));
- DFF_X1 ff49 (.CK(clknet_leaf_15_clk_regs_1));
- DFF_X1 ff5 (.CK(clknet_leaf_13_clk_regs_1));
+ DFF_X1 ff49 (.CK(clknet_leaf_15_clk_regs_4));
+ DFF_X1 ff5 (.CK(clknet_leaf_13_clk_regs_3));
  DFF_X1 ff50 (.CK(clknet_leaf_6_clk_regs));
  DFF_X1 ff51 (.CK(clknet_leaf_10_clk_regs));
  DFF_X1 ff52 (.CK(clknet_leaf_16_clk_regs));
- DFF_X1 ff53 (.CK(clknet_leaf_13_clk_regs_1));
+ DFF_X1 ff53 (.CK(clknet_leaf_13_clk_regs_3));
  DFF_X1 ff54 (.CK(clknet_leaf_6_clk_regs));
  DFF_X1 ff55 (.CK(clknet_leaf_9_clk_regs));
  DFF_X1 ff56 (.CK(clknet_leaf_16_clk_regs));
  DFF_X1 ff57 (.CK(clknet_leaf_14_clk_regs));
- DFF_X1 ff58 (.CK(clknet_leaf_12_clk_regs_1));
+ DFF_X1 ff58 (.CK(clknet_leaf_12_clk_regs_2));
  DFF_X1 ff59 (.CK(clknet_leaf_9_clk_regs));
- DFF_X1 ff6 (.CK(clknet_leaf_15_clk_regs_1));
- DFF_X1 ff60 (.CK(clknet_leaf_13_clk_regs_1));
+ DFF_X1 ff6 (.CK(clknet_leaf_15_clk_regs_4));
+ DFF_X1 ff60 (.CK(clknet_leaf_13_clk_regs_3));
  DFF_X1 ff61 (.CK(clknet_leaf_6_clk_regs));
  DFF_X1 ff62 (.CK(clknet_leaf_10_clk_regs));
- DFF_X1 ff63 (.CK(clknet_leaf_15_clk_regs_1));
- DFF_X1 ff64 (.CK(clknet_leaf_13_clk_regs_1));
- DFF_X1 ff65 (.CK(clknet_leaf_12_clk_regs_1));
+ DFF_X1 ff63 (.CK(clknet_leaf_15_clk_regs_4));
+ DFF_X1 ff64 (.CK(clknet_leaf_13_clk_regs_3));
+ DFF_X1 ff65 (.CK(clknet_leaf_12_clk_regs_2));
  DFF_X1 ff66 (.CK(clknet_leaf_10_clk_regs));
  DFF_X1 ff67 (.CK(clknet_leaf_16_clk_regs));
  DFF_X1 ff68 (.CK(clknet_leaf_14_clk_regs));
- DFF_X1 ff69 (.CK(clknet_leaf_12_clk_regs_1));
+ DFF_X1 ff69 (.CK(clknet_leaf_12_clk_regs_2));
  DFF_X1 ff7 (.CK(clknet_leaf_9_clk_regs));
  DFF_X1 ff70 (.CK(clknet_leaf_14_clk_regs));
- DFF_X1 ff71 (.CK(clknet_leaf_13_clk_regs_1));
+ DFF_X1 ff71 (.CK(clknet_leaf_13_clk_regs_3));
  DFF_X1 ff74 (.CK(clknet_leaf_11_clk_regs_1));
  DFF_X1 ff75 (.CK(clknet_leaf_11_clk_regs_1));
- DFF_X1 ff76 (.CK(clknet_leaf_15_clk_regs_1));
- DFF_X1 ff77 (.CK(clknet_leaf_13_clk_regs_1));
- DFF_X1 ff78 (.CK(clknet_leaf_12_clk_regs_1));
+ DFF_X1 ff76 (.CK(clknet_leaf_15_clk_regs_4));
+ DFF_X1 ff77 (.CK(clknet_leaf_13_clk_regs_3));
+ DFF_X1 ff78 (.CK(clknet_leaf_12_clk_regs_2));
  DFF_X1 ff79 (.CK(clknet_leaf_10_clk_regs));
  DFF_X1 ff8 (.CK(clknet_leaf_16_clk_regs));
  DFF_X1 ff80 (.CK(clknet_leaf_14_clk_regs));
- DFF_X1 ff81 (.CK(clknet_leaf_12_clk_regs_1));
+ DFF_X1 ff81 (.CK(clknet_leaf_12_clk_regs_2));
  DFF_X1 ff82 (.CK(clknet_leaf_11_clk_regs_1));
  DFF_X1 ff83 (.CK(clknet_leaf_14_clk_regs));
- DFF_X1 ff84 (.CK(clknet_leaf_12_clk_regs_1));
+ DFF_X1 ff84 (.CK(clknet_leaf_12_clk_regs_2));
  DFF_X1 ff85 (.CK(clknet_leaf_11_clk_regs_1));
  DFF_X1 ff86 (.CK(clknet_leaf_11_clk_regs_1));
- DFF_X1 ff87 (.CK(clknet_leaf_15_clk_regs_1));
- DFF_X1 ff88 (.CK(clknet_leaf_13_clk_regs_1));
- DFF_X1 ff89 (.CK(clknet_leaf_12_clk_regs_1));
+ DFF_X1 ff87 (.CK(clknet_leaf_15_clk_regs_4));
+ DFF_X1 ff88 (.CK(clknet_leaf_13_clk_regs_3));
+ DFF_X1 ff89 (.CK(clknet_leaf_12_clk_regs_2));
  DFF_X1 ff9 (.CK(clknet_leaf_11_clk_regs_1));
- DFF_X1 ff92 (.CK(clknet_leaf_15_clk_regs_1));
+ DFF_X1 ff92 (.CK(clknet_leaf_15_clk_regs_4));
  DFF_X1 ff93 (.CK(clknet_leaf_14_clk_regs));
- DFF_X1 ff94 (.CK(clknet_leaf_12_clk_regs_1));
+ DFF_X1 ff94 (.CK(clknet_leaf_12_clk_regs_2));
  DFF_X1 ff95 (.CK(clknet_leaf_11_clk_regs_1));
- DFF_X1 ff96 (.CK(clknet_leaf_15_clk_regs_1));
- DFF_X1 ff97 (.CK(clknet_leaf_12_clk_regs_1));
+ DFF_X1 ff96 (.CK(clknet_leaf_15_clk_regs_4));
+ DFF_X1 ff97 (.CK(clknet_leaf_12_clk_regs_2));
  DFF_X1 ff98 (.CK(clknet_leaf_11_clk_regs_1));
  DFF_X1 ff99 (.CK(clknet_leaf_11_clk_regs_1));
- hier_block h1 (.clknet_leaf_15_clk_regs_i(clknet_leaf_15_clk_regs_1),
-    .clknet_leaf_13_clk_regs_i(clknet_leaf_13_clk_regs_1),
-    .clknet_leaf_12_clk_regs_i(clknet_leaf_12_clk_regs_1),
+ hier_block h1 (.clknet_leaf_15_clk_regs_i(clknet_leaf_15_clk_regs_4),
+    .clknet_leaf_13_clk_regs_i(clknet_leaf_13_clk_regs_3),
+    .clknet_leaf_12_clk_regs_i(clknet_leaf_12_clk_regs_2),
     .clknet_leaf_11_clk_regs_i(clknet_leaf_11_clk_regs_1));
  array_tile inst_0 (.clk(clknet_1_0__leaf_clk));
 endmodule

src/cts/test/simple_test_hier_out.vok

@@ -1,93 +1,93 @@
 module test_16_sinks (clk);
  input clk;
 
- wire clknet_1_1__leaf_clk_1;
+ wire clknet_1_1__leaf_clk_2;
  wire clknet_1_0__leaf_clk_1;
  wire clknet_0_clk;
 
- flop_pair U1 (.clknet_1_1__leaf_clk_1_i(clknet_1_1__leaf_clk_1),
+ flop_pair U1 (.clknet_1_1__leaf_clk_2_i(clknet_1_1__leaf_clk_2),
     .clknet_1_0__leaf_clk_1_i(clknet_1_0__leaf_clk_1));
- flop_pair_U2 U2 (.clknet_1_1__leaf_clk_1_i(clknet_1_1__leaf_clk_1),
+ flop_pair_U2 U2 (.clknet_1_1__leaf_clk_2_i(clknet_1_1__leaf_clk_2),
     .clknet_1_0__leaf_clk_1_i(clknet_1_0__leaf_clk_1));
- flop_pair_U3 U3 (.clknet_1_1__leaf_clk_1_i(clknet_1_1__leaf_clk_1));
- flop_pair_U4 U4 (.clknet_1_1__leaf_clk_1_i(clknet_1_1__leaf_clk_1),
+ flop_pair_U3 U3 (.clknet_1_1__leaf_clk_2_i(clknet_1_1__leaf_clk_2));
+ flop_pair_U4 U4 (.clknet_1_1__leaf_clk_2_i(clknet_1_1__leaf_clk_2),
     .clknet_1_0__leaf_clk_1_i(clknet_1_0__leaf_clk_1));
- flop_pair_U5 U5 (.clknet_1_1__leaf_clk_1_i(clknet_1_1__leaf_clk_1),
+ flop_pair_U5 U5 (.clknet_1_1__leaf_clk_2_i(clknet_1_1__leaf_clk_2),
     .clknet_1_0__leaf_clk_1_i(clknet_1_0__leaf_clk_1));
- flop_pair_U6 U6 (.clknet_1_1__leaf_clk_1_i(clknet_1_1__leaf_clk_1),
+ flop_pair_U6 U6 (.clknet_1_1__leaf_clk_2_i(clknet_1_1__leaf_clk_2),
     .clknet_1_0__leaf_clk_1_i(clknet_1_0__leaf_clk_1));
- flop_pair_U7 U7 (.clknet_1_1__leaf_clk_1_i(clknet_1_1__leaf_clk_1),
+ flop_pair_U7 U7 (.clknet_1_1__leaf_clk_2_i(clknet_1_1__leaf_clk_2),
     .clknet_1_0__leaf_clk_1_i(clknet_1_0__leaf_clk_1));
- flop_pair_U8 U8 (.clknet_1_1__leaf_clk_i(clknet_1_1__leaf_clk_1),
+ flop_pair_U8 U8 (.clknet_1_1__leaf_clk_i(clknet_1_1__leaf_clk_2),
     .clknet_1_0__leaf_clk_i(clknet_1_0__leaf_clk_1));
  CLKBUF_X3 clkbuf_0_clk (.A(clk),
     .Z(clknet_0_clk));
  CLKBUF_X3 clkbuf_1_0__f_clk (.A(clknet_0_clk),
     .Z(clknet_1_0__leaf_clk_1));
  CLKBUF_X3 clkbuf_1_1__f_clk (.A(clknet_0_clk),
-    .Z(clknet_1_1__leaf_clk_1));
+    .Z(clknet_1_1__leaf_clk_2));
  INV_X1 clkload0 (.A(clknet_1_0__leaf_clk_1));
 endmodule
-module flop_pair (clknet_1_1__leaf_clk_1_i,
+module flop_pair (clknet_1_1__leaf_clk_2_i,
     clknet_1_0__leaf_clk_1_i);
- input clknet_1_1__leaf_clk_1_i;
+ input clknet_1_1__leaf_clk_2_i;
  input clknet_1_0__leaf_clk_1_i;
 
 
  DFF_X1 ff1 (.CK(clknet_1_0__leaf_clk_1_i));
- DFF_X1 ff2 (.CK(clknet_1_1__leaf_clk_1_i));
+ DFF_X1 ff2 (.CK(clknet_1_1__leaf_clk_2_i));
 endmodule
-module flop_pair_U2 (clknet_1_1__leaf_clk_1_i,
+module flop_pair_U2 (clknet_1_1__leaf_clk_2_i,
     clknet_1_0__leaf_clk_1_i);
- input clknet_1_1__leaf_clk_1_i;
+ input clknet_1_1__leaf_clk_2_i;
  input clknet_1_0__leaf_clk_1_i;
 
 
- DFF_X1 ff1 (.CK(clknet_1_1__leaf_clk_1_i));
+ DFF_X1 ff1 (.CK(clknet_1_1__leaf_clk_2_i));
  DFF_X1 ff2 (.CK(clknet_1_0__leaf_clk_1_i));
 endmodule
-module flop_pair_U3 (clknet_1_1__leaf_clk_1_i);
- input clknet_1_1__leaf_clk_1_i;
+module flop_pair_U3 (clknet_1_1__leaf_clk_2_i);
+ input clknet_1_1__leaf_clk_2_i;
 
 
- DFF_X1 ff1 (.CK(clknet_1_1__leaf_clk_1_i));
- DFF_X1 ff2 (.CK(clknet_1_1__leaf_clk_1_i));
+ DFF_X1 ff1 (.CK(clknet_1_1__leaf_clk_2_i));
+ DFF_X1 ff2 (.CK(clknet_1_1__leaf_clk_2_i));
 endmodule
-module flop_pair_U4 (clknet_1_1__leaf_clk_1_i,
+module flop_pair_U4 (clknet_1_1__leaf_clk_2_i,
     clknet_1_0__leaf_clk_1_i);
- input clknet_1_1__leaf_clk_1_i;
+ input clknet_1_1__leaf_clk_2_i;
  input clknet_1_0__leaf_clk_1_i;
 
 
  DFF_X1 ff1 (.CK(clknet_1_0__leaf_clk_1_i));
- DFF_X1 ff2 (.CK(clknet_1_1__leaf_clk_1_i));
+ DFF_X1 ff2 (.CK(clknet_1_1__leaf_clk_2_i));
 endmodule
-module flop_pair_U5 (clknet_1_1__leaf_clk_1_i,
+module flop_pair_U5 (clknet_1_1__leaf_clk_2_i,
     clknet_1_0__leaf_clk_1_i);
- input clknet_1_1__leaf_clk_1_i;
+ input clknet_1_1__leaf_clk_2_i;
  input clknet_1_0__leaf_clk_1_i;
 
 
  DFF_X1 ff1 (.CK(clknet_1_0__leaf_clk_1_i));
- DFF_X1 ff2 (.CK(clknet_1_1__leaf_clk_1_i));
+ DFF_X1 ff2 (.CK(clknet_1_1__leaf_clk_2_i));
 endmodule
-module flop_pair_U6 (clknet_1_1__leaf_clk_1_i,
+module flop_pair_U6 (clknet_1_1__leaf_clk_2_i,
     clknet_1_0__leaf_clk_1_i);
- input clknet_1_1__leaf_clk_1_i;
+ input clknet_1_1__leaf_clk_2_i;
  input clknet_1_0__leaf_clk_1_i;
 
 
  DFF_X1 ff1 (.CK(clknet_1_0__leaf_clk_1_i));
- DFF_X1 ff2 (.CK(clknet_1_1__leaf_clk_1_i));
+ DFF_X1 ff2 (.CK(clknet_1_1__leaf_clk_2_i));
 endmodule
-module flop_pair_U7 (clknet_1_1__leaf_clk_1_i,
+module flop_pair_U7 (clknet_1_1__leaf_clk_2_i,
     clknet_1_0__leaf_clk_1_i);
- input clknet_1_1__leaf_clk_1_i;
+ input clknet_1_1__leaf_clk_2_i;
  input clknet_1_0__leaf_clk_1_i;
 
 
  DFF_X1 ff1 (.CK(clknet_1_0__leaf_clk_1_i));
- DFF_X1 ff2 (.CK(clknet_1_1__leaf_clk_1_i));
+ DFF_X1 ff2 (.CK(clknet_1_1__leaf_clk_2_i));
 endmodule
 module flop_pair_U8 (clknet_1_1__leaf_clk_i,
     clknet_1_0__leaf_clk_i);

src/dbSta/src/dbEditHierarchy.cc

@@ -619,21 +619,12 @@ std::string dbEditHierarchy::makeUniqueName(odb::dbModule* module,
     base_name = name;
   }
 
-  std::string unique_name = base_name;
-  int id = 0;
-
-  Instance* inst = db_network_->dbToSta(module->getModInst());
-  if (inst == nullptr) {
-    inst = db_network_->topInstance();
-  }
-
-  // Check collision with both hierarchical ports and flat & hier nets
-  while (module->findModBTerm(unique_name.c_str())
-         || db_network_->findNet(inst, unique_name.c_str())) {
-    id++;
-    unique_name = fmt::format("{}_{}", base_name, id);
-  }
-  return unique_name;
+  odb::dbBlock* block = db_network_->block();
+  std::string full = block->makeNewNetName(
+      module,
+      base_name.c_str(),
+      odb::dbNameUniquifyType::IF_NEEDED_WITH_UNDERSCORE);
+  return std::string(block->getBaseName(full.c_str()));
 }
 
 const char* dbEditHierarchy::getBaseName(const char* connection_name) const

src/dbSta/src/dbNetwork.cc

@@ -2903,8 +2903,10 @@ Net* dbNetwork::makeNet(const char* base_name,
                         const odb::dbNameUniquifyType& uniquify)
 {
   // Create a unique full name for a new net
+  odb::dbModInst* mod_inst = getModInst(parent);
+  odb::dbModule* parent_module = mod_inst ? mod_inst->getMaster() : nullptr;
   std::string full_name
-      = block_->makeNewNetName(getModInst(parent), base_name, uniquify);
+      = block_->makeNewNetName(parent_module, base_name, uniquify);
 
   // Create a new net
   dbNet* dnet = dbNet::create(block_, full_name.c_str(), false);

src/dbSta/test/escape_slash_hier.spefok

@@ -243,34 +243,34 @@ clk I
 19 clknet_1_0__leaf_clk_1:3 clknet_1_0__leaf_clk_1:1 0.00201118
 *END
 
-*D_NET clknet_1_1__leaf_clk_1 0.451199
+*D_NET clknet_1_1__leaf_clk_2 0.451199
 *CONN
 *I gclk1:CK I *D CLKGATE_X1
 *I h1/gclk2:CK I *D CLKGATE_X1
 *I clkbuf_1_1__f_clk:Z O *D CLKBUF_X3
 *CAP
-1 clknet_1_1__leaf_clk_1:0 0.130543
-2 clknet_1_1__leaf_clk_1:1 0.0950564
-3 clknet_1_1__leaf_clk_1:2 0.225599
+1 clknet_1_1__leaf_clk_2:0 0.130543
+2 clknet_1_1__leaf_clk_2:1 0.0950564
+3 clknet_1_1__leaf_clk_2:2 0.225599
 *RES
-1 clknet_1_1__leaf_clk_1:0 clknet_1_1__leaf_clk_1:0 1e-06
-2 clkbuf_1_1__f_clk:Z clknet_1_1__leaf_clk_1:3 1e-06
-3 clknet_1_1__leaf_clk_1:3 clknet_1_1__leaf_clk_1:4 1e-06
-4 clknet_1_1__leaf_clk_1:4 clknet_1_1__leaf_clk_1:5 1e-06
-5 clknet_1_1__leaf_clk_1:5 clknet_1_1__leaf_clk_1:6 1e-06
-6 clknet_1_1__leaf_clk_1:6 clknet_1_1__leaf_clk_1:0 1e-06
-7 clknet_1_1__leaf_clk_1:1 clknet_1_1__leaf_clk_1:2 0.00391271
-8 h1/gclk2:CK clknet_1_1__leaf_clk_1:8 1e-06
-9 clknet_1_1__leaf_clk_1:8 clknet_1_1__leaf_clk_1:9 1e-06
-10 clknet_1_1__leaf_clk_1:9 clknet_1_1__leaf_clk_1:10 1e-06
-11 clknet_1_1__leaf_clk_1:10 clknet_1_1__leaf_clk_1:11 1e-06
-12 clknet_1_1__leaf_clk_1:11 clknet_1_1__leaf_clk_1:1 1e-06
-13 gclk1:CK clknet_1_1__leaf_clk_1:13 1e-06
-14 clknet_1_1__leaf_clk_1:13 clknet_1_1__leaf_clk_1:14 1e-06
-15 clknet_1_1__leaf_clk_1:14 clknet_1_1__leaf_clk_1:15 1e-06
-16 clknet_1_1__leaf_clk_1:15 clknet_1_1__leaf_clk_1:16 1e-06
-17 clknet_1_1__leaf_clk_1:16 clknet_1_1__leaf_clk_1:2 1e-06
-18 clknet_1_1__leaf_clk_1:2 clknet_1_1__leaf_clk_1:0 0.0053734
+1 clknet_1_1__leaf_clk_2:0 clknet_1_1__leaf_clk_2:0 1e-06
+2 clkbuf_1_1__f_clk:Z clknet_1_1__leaf_clk_2:3 1e-06
+3 clknet_1_1__leaf_clk_2:3 clknet_1_1__leaf_clk_2:4 1e-06
+4 clknet_1_1__leaf_clk_2:4 clknet_1_1__leaf_clk_2:5 1e-06
+5 clknet_1_1__leaf_clk_2:5 clknet_1_1__leaf_clk_2:6 1e-06
+6 clknet_1_1__leaf_clk_2:6 clknet_1_1__leaf_clk_2:0 1e-06
+7 clknet_1_1__leaf_clk_2:1 clknet_1_1__leaf_clk_2:2 0.00391271
+8 h1/gclk2:CK clknet_1_1__leaf_clk_2:8 1e-06
+9 clknet_1_1__leaf_clk_2:8 clknet_1_1__leaf_clk_2:9 1e-06
+10 clknet_1_1__leaf_clk_2:9 clknet_1_1__leaf_clk_2:10 1e-06
+11 clknet_1_1__leaf_clk_2:10 clknet_1_1__leaf_clk_2:11 1e-06
+12 clknet_1_1__leaf_clk_2:11 clknet_1_1__leaf_clk_2:1 1e-06
+13 gclk1:CK clknet_1_1__leaf_clk_2:13 1e-06
+14 clknet_1_1__leaf_clk_2:13 clknet_1_1__leaf_clk_2:14 1e-06
+15 clknet_1_1__leaf_clk_2:14 clknet_1_1__leaf_clk_2:15 1e-06
+16 clknet_1_1__leaf_clk_2:15 clknet_1_1__leaf_clk_2:16 1e-06
+17 clknet_1_1__leaf_clk_2:16 clknet_1_1__leaf_clk_2:2 1e-06
+18 clknet_1_1__leaf_clk_2:2 clknet_1_1__leaf_clk_2:0 0.0053734
 *END
 
 *D_NET clknet_0_h1\/gclk5 7.11161