rsz: Update test golden files

Signed-off-by: Krzysztof Bieganski <[email protected]>
antmicro · Dec 4, 2024 · e74e2f7 · e74e2f7
1 parent e8d452c
commit e74e2f7
Show file tree

Hide file tree

Showing 17 changed files with 982 additions and 1,053 deletions.
diff --git a/src/rsz/test/clone_flat.ok b/src/rsz/test/clone_flat.ok
diff --git a/src/rsz/test/clone_flat_out.vok b/src/rsz/test/clone_flat_out.vok
@@ -792,7 +792,7 @@ module hi_fanout (clk1,
  NAND2_X2 clone124 (.A1(clk_to_nand0),
     .A2(clk_to_nand1),
     .ZN(net124));
- NAND2_X2 clone127 (.A1(net597),
+ NAND2_X4 clone127 (.A1(net597),
     .A2(net289),
     .ZN(net127));
  NAND2_X2 clone129 (.A1(net597),

diff --git a/src/rsz/test/repair_fanout6.ok b/src/rsz/test/repair_fanout6.ok
@@ -16,7 +16,7 @@ fanout1/X                                20     20      0 (MET)
 
 [INFO RSZ-0094] Found 6400 endpoints with setup violations.
 [INFO RSZ-0099] Repairing 1 out of 6400 (0.00%) violating endpoints...
-[INFO RSZ-0045] Inserted 17 buffers, 1 to split loads.
-[INFO RSZ-0041] Resized 156 instances.
+[INFO RSZ-0045] Inserted 8 buffers, 1 to split loads.
+[INFO RSZ-0041] Resized 26 instances.
 [WARNING RSZ-0062] Unable to repair all setup violations.
-worst slack -3.10
+worst slack -3.65
diff --git a/src/rsz/test/repair_fanout7.ok b/src/rsz/test/repair_fanout7.ok
diff --git a/src/rsz/test/repair_fanout8.ok b/src/rsz/test/repair_fanout8.ok
diff --git a/src/rsz/test/repair_setup1.ok b/src/rsz/test/repair_setup1.ok
@@ -44,7 +44,8 @@ Path Type: max
 [INFO RSZ-0094] Found 4 endpoints with setup violations.
 [INFO RSZ-0099] Repairing 4 out of 4 (100.00%) violating endpoints...
 [INFO RSZ-0059] Removed 4 buffers.
-[INFO RSZ-0041] Resized 1 instances.
+[INFO RSZ-0040] Inserted 1 buffers.
+[INFO RSZ-0041] Resized 4 instances.
 Repair timing output passed/skipped equivalence test
 Startpoint: r1 (rising edge-triggered flip-flop clocked by clk)
 Endpoint: r2 (rising edge-triggered flip-flop clocked by clk)
@@ -56,22 +57,22 @@ Path Type: max
    0.000    0.000   clock clk (rise edge)
    0.000    0.000   clock network delay (ideal)
    0.000    0.000 ^ r1/CK (DFF_X2)
-   0.146    0.146 ^ r1/Q (DFF_X2)
-   0.028    0.174 ^ u1/A (BUF_X1)
-   0.067    0.241 ^ u1/Z (BUF_X1)
-   0.007    0.247 ^ r2/D (DFF_X1)
-            0.247   data arrival time
+   0.137    0.137 ^ r1/Q (DFF_X2)
+   0.025    0.162 ^ u3/A (BUF_X4)
+   0.038    0.200 ^ u3/Z (BUF_X4)
+   0.021    0.221 ^ r2/D (DFF_X1)
+            0.221   data arrival time
 
    0.300    0.300   clock clk (rise edge)
    0.000    0.300   clock network delay (ideal)
    0.000    0.300   clock reconvergence pessimism
             0.300 ^ r2/CK (DFF_X1)
-  -0.040    0.260   library setup time
-            0.260   data required time
+  -0.037    0.263   library setup time
+            0.263   data required time
 -----------------------------------------------------------
-            0.260   data required time
-           -0.247   data arrival time
+            0.263   data required time
+           -0.221   data arrival time
 -----------------------------------------------------------
-            0.013   slack (MET)
+            0.042   slack (MET)
 
 
diff --git a/src/rsz/test/repair_setup4.ok b/src/rsz/test/repair_setup4.ok
@@ -10,8 +10,8 @@ tns -6.294
 [INFO RSZ-0099] Repairing 6 out of 6 (100.00%) violating endpoints...
 [INFO RSZ-0059] Removed 4 buffers.
 [INFO RSZ-0040] Inserted 2 buffers.
-[INFO RSZ-0041] Resized 2 instances.
+[INFO RSZ-0041] Resized 4 instances.
 [WARNING RSZ-0062] Unable to repair all setup violations.
 Repair timing output passed/skipped equivalence test
-worst slack -0.44
-tns -2.156
+worst slack -0.41
+tns -2.044
diff --git a/src/rsz/test/repair_setup4_flat.ok b/src/rsz/test/repair_setup4_flat.ok
@@ -38,6 +38,6 @@ tns -1.578
 [INFO RSZ-0094] Found 6 endpoints with setup violations.
 [INFO RSZ-0099] Repairing 6 out of 6 (100.00%) violating endpoints...
 [INFO RSZ-0040] Inserted 1 buffers.
-[INFO RSZ-0041] Resized 2 instances.
+[INFO RSZ-0041] Resized 7 instances.
 [WARNING RSZ-0062] Unable to repair all setup violations.
 No differences found.
diff --git a/src/rsz/test/repair_setup4_flat_out.vok b/src/rsz/test/repair_setup4_flat_out.vok
@@ -28,15 +28,15 @@ module reg1 (clk);
     .CK(clk));
  DFF_X1 r8 (.D(net1));
  DFF_X1 r9 (.D(r1q));
- BUF_X1 u1 (.A(r1q),
+ BUF_X2 u1 (.A(r1q),
     .Z(u1z));
- BUF_X1 u2 (.A(u1z),
+ BUF_X2 u2 (.A(u1z),
     .Z(u2z));
- BUF_X1 u3 (.A(u2z),
+ BUF_X2 u3 (.A(u2z),
     .Z(u3z));
- BUF_X1 u4 (.A(u3z),
+ BUF_X2 u4 (.A(u3z),
     .Z(u4z));
- BUF_X1 u5 (.A(u4z),
+ BUF_X2 u5 (.A(u4z),
     .Z(u5z));
  BUF_X4 rebuffer1 (.A(r1q),
     .Z(net1));

diff --git a/src/rsz/test/repair_setup4_verbose.ok b/src/rsz/test/repair_setup4_verbose.ok
@@ -11,24 +11,24 @@ worst slack -1.954
           | Buffers |  Gates  | Buffers  |  Gates | Swaps |          |            | Endpts | Endpt
 ---------------------------------------------------------------------------------------------------
         0 |       0 |       0 |        0 |      0 |     0 |   -1.954 |       -6.3 |      6 | r2/D
-        8 |       4 |       2 |        3 |      0 |     0 |   -0.439 |       -2.2 |      6 | r7/D
-        9 |       4 |       2 |        3 |      0 |     0 |   -0.439 |       -2.2 |      6 | r7/D
-       10 |       4 |       2 |        3 |      0 |     0 |   -0.439 |       -2.2 |      6 | r7/D
-       10 |       4 |       2 |        3 |      0 |     0 |   -0.439 |       -2.2 |      6 | r7/D
-       11 |       4 |       2 |        3 |      0 |     0 |   -0.439 |       -2.2 |      6 | r7/D
-       12 |       4 |       2 |        3 |      0 |     0 |   -0.439 |       -2.2 |      6 | r7/D
-       13 |       4 |       2 |        3 |      0 |     0 |   -0.439 |       -2.2 |      6 | r7/D
-      14* |       4 |       2 |        3 |      0 |     0 |   -0.439 |       -2.2 |      6 | r7/D
-      15* |       4 |       2 |        3 |      0 |     0 |   -0.439 |       -2.2 |      6 | r7/D
-      16* |       4 |       2 |        3 |      0 |     0 |   -0.439 |       -2.2 |      6 | r7/D
-      17* |       4 |       2 |        3 |      0 |     0 |   -0.439 |       -2.2 |      6 | r7/D
-      18* |       4 |       2 |        3 |      0 |     0 |   -0.439 |       -2.2 |      6 | r7/D
-      19* |       4 |       2 |        3 |      0 |     0 |   -0.439 |       -2.2 |      6 | r7/D
-    final |       4 |       2 |        3 |      0 |     0 |   -0.439 |       -2.2 |      6 | r7/D
+        6 |       4 |       4 |        4 |      0 |     0 |   -0.415 |       -2.0 |      6 | r7/D
+        8 |       4 |       4 |        4 |      0 |     0 |   -0.415 |       -2.0 |      6 | r7/D
+        9 |       4 |       4 |        4 |      0 |     0 |   -0.415 |       -2.0 |      6 | r7/D
+       10 |       4 |       4 |        4 |      0 |     0 |   -0.415 |       -2.0 |      6 | r7/D
+       10 |       4 |       4 |        4 |      0 |     0 |   -0.415 |       -2.0 |      6 | r7/D
+       11 |       4 |       4 |        4 |      0 |     0 |   -0.415 |       -2.0 |      6 | r7/D
+       12 |       4 |       4 |        4 |      0 |     0 |   -0.415 |       -2.0 |      6 | r7/D
+      13* |       4 |       4 |        4 |      0 |     0 |   -0.415 |       -2.0 |      6 | r7/D
+      14* |       4 |       4 |        4 |      0 |     0 |   -0.415 |       -2.0 |      6 | r7/D
+      15* |       4 |       4 |        4 |      0 |     0 |   -0.415 |       -2.0 |      6 | r7/D
+      16* |       4 |       4 |        4 |      0 |     0 |   -0.415 |       -2.0 |      6 | r7/D
+      17* |       4 |       4 |        4 |      0 |     0 |   -0.415 |       -2.0 |      6 | r7/D
+      18* |       4 |       4 |        4 |      0 |     0 |   -0.415 |       -2.0 |      6 | r7/D
+    final |       4 |       4 |        4 |      0 |     0 |   -0.415 |       -2.0 |      6 | r7/D
 ---------------------------------------------------------------------------------------------------
 [INFO RSZ-0059] Removed 4 buffers.
 [INFO RSZ-0040] Inserted 2 buffers.
-[INFO RSZ-0041] Resized 2 instances.
+[INFO RSZ-0041] Resized 4 instances.
 [WARNING RSZ-0062] Unable to repair all setup violations.
 Repair timing output passed/skipped equivalence test
-worst slack -0.439
+worst slack -0.415
diff --git a/src/rsz/test/repair_setup5.ok b/src/rsz/test/repair_setup5.ok
@@ -8,6 +8,7 @@
 worst slack -1.88
 [INFO RSZ-0094] Found 1 endpoints with setup violations.
 [INFO RSZ-0099] Repairing 1 out of 1 (100.00%) violating endpoints...
-[INFO RSZ-0041] Resized 15 instances.
+[INFO RSZ-0059] Removed 1 buffers.
+[INFO RSZ-0041] Resized 10 instances.
 Repair timing output passed/skipped equivalence test
-worst slack 0.09
+worst slack 0.23
diff --git a/src/rsz/test/repair_setup6.ok b/src/rsz/test/repair_setup6.ok
@@ -17,9 +17,8 @@ delta HPWL                    0 %
 worst slack -0.39
 [INFO RSZ-0094] Found 4 endpoints with setup violations.
 [INFO RSZ-0099] Repairing 4 out of 4 (100.00%) violating endpoints...
-[INFO RSZ-0059] Removed 3 buffers.
-[INFO RSZ-0040] Inserted 3 buffers.
+[INFO RSZ-0059] Removed 2 buffers.
 [INFO RSZ-0041] Resized 2 instances.
 Repair timing output passed/skipped equivalence test
 worst slack 0.01
-worst slack -0.10
+worst slack -0.19
diff --git a/src/rsz/test/repair_setup7.ok b/src/rsz/test/repair_setup7.ok
@@ -8,7 +8,7 @@ worst slack -1.95
 [INFO RSZ-0094] Found 6 endpoints with setup violations.
 [INFO RSZ-0099] Repairing 6 out of 6 (100.00%) violating endpoints...
 [INFO RSZ-0040] Inserted 3 buffers.
-[INFO RSZ-0041] Resized 37 instances.
+[INFO RSZ-0041] Resized 40 instances.
 [WARNING RSZ-0062] Unable to repair all setup violations.
 Repair timing output passed/skipped equivalence test
 worst slack -0.63
diff --git a/src/rsz/test/repair_setup_undo.ok b/src/rsz/test/repair_setup_undo.ok
@@ -11,12 +11,12 @@ tns -6.294
 [INFO RSZ-0099] Repairing 6 out of 6 (100.00%) violating endpoints...
 [INFO RSZ-0059] Removed 4 buffers.
 [INFO RSZ-0040] Inserted 2 buffers.
-[INFO RSZ-0041] Resized 2 instances.
+[INFO RSZ-0041] Resized 4 instances.
 [WARNING RSZ-0062] Unable to repair all setup violations.
 post repair_timing QoR
-worst slack -0.44
-tns -2.156
+worst slack -0.41
+tns -2.044
 post undo repair_timing QoR
-worst slack -0.44
-tns -2.156
+worst slack -0.41
+tns -2.044
 Repair timing output passed/skipped equivalence test
diff --git a/src/rsz/test/split_load_hier.ok b/src/rsz/test/split_load_hier.ok
@@ -37,7 +37,7 @@ worst slack -0.59
 tns -7.917
 [INFO RSZ-0094] Found 21 endpoints with setup violations.
 [INFO RSZ-0099] Repairing 21 out of 21 (100.00%) violating endpoints...
-[INFO RSZ-0045] Inserted 11 buffers, 1 to split loads.
-[INFO RSZ-0041] Resized 51 instances.
+[INFO RSZ-0045] Inserted 4 buffers, 1 to split loads.
+[INFO RSZ-0041] Resized 45 instances.
 [WARNING RSZ-0062] Unable to repair all setup violations.
 No differences found.
diff --git a/src/rsz/test/split_load_hier_out.vok b/src/rsz/test/split_load_hier_out.vok
@@ -2,44 +2,34 @@ module reg1 (clk);
  input clk;
 
 
- BUF_X4 rebuffer12 (.A(net1),
-    .Z(net67));
- BUF_X4 rebuffer10 (.A(net29),
-    .Z(net45));
- BUF_X8 rebuffer9 (.A(net45),
-    .Z(net43));
- BUF_X1 rebuffer8 (.A(r1q),
-    .Z(net36));
- BUF_X4 rebuffer7 (.A(r1q),
-    .Z(net29));
- BUF_X8 rebuffer6 (.A(net67),
-    .Z(net68));
- BUF_X8 rebuffer5 (.A(net1),
-    .Z(net68));
- BUF_X1 split4 (.A(net1),
-    .Z(net63));
- BUF_X16 rebuffer3 (.A(net43),
-    .Z(net62));
- BUF_X8 rebuffer2 (.A(net36),
-    .Z(net62));
- BUF_X8 split1 (.A(net29),
-    .Z(net1));
+ BUF_X4 rebuffer4 (.A(r1q),
+    .Z(net18));
+ BUF_X8 rebuffer3 (.A(net18),
+    .Z(net80));
+ CLKBUF_X3 rebuffer2 (.A(r1q),
+    .Z(net80));
+ BUF_X8 split1 (.A(net18),
+    .Z(net139));
  DFF_X2 r1 (.CK(clk),
     .Q(r1q));
- submodule u1 (.net20_i(net63),
-    .net2_i(net68),
-    .r1q(net62),
+ submodule u1 (.net2_i(net139),
+    .r1q(net80),
     .clk(clk));
 endmodule
-module submodule (net20_i,
-    net2_i,
+module submodule (net2_i,
     r1q,
     clk);
- input net20_i;
  input net2_i;
  input r1q;
  input clk;
 
+ wire net133_i;
+ wire net120_i;
+ wire net94_i;
+ wire net83_i;
+ wire net47_i;
+ wire net34_i;
+ wire net21_i;
 
  DFF_X1 r1 (.D(\u1/u6z ),
     .CK(clk));
@@ -59,7 +49,7 @@ module submodule (net20_i,
     .CK(clk));
  DFF_X1 r21 (.D(\u1/u5z ),
     .CK(clk));
- DFF_X1 r22 (.D(net20_i),
+ DFF_X1 r22 (.D(net2_i),
     .CK(clk));
  DFF_X1 r23 (.D(net2_i),
     .CK(clk));
@@ -69,13 +59,13 @@ module submodule (net20_i,
     .CK(clk));
  DFF_X1 r26 (.D(net2_i),
     .CK(clk));
- DFF_X1 r27 (.D(net20_i));
- DFF_X1 r28 (.D(net20_i));
- DFF_X1 r29 (.D(net20_i));
+ DFF_X1 r27 (.D(net2_i));
+ DFF_X1 r28 (.D(net2_i));
+ DFF_X1 r29 (.D(net2_i));
  DFF_X1 r3 (.D(\u1/u8z ),
     .CK(clk));
- DFF_X1 r30 (.D(net20_i));
- DFF_X1 r31 (.D(net20_i));
+ DFF_X1 r30 (.D(net2_i));
+ DFF_X1 r31 (.D(net2_i));
  DFF_X1 r4 (.D(\u1/u9z ),
     .CK(clk));
  DFF_X1 r5 (.D(\u1/u10z ),
@@ -88,43 +78,43 @@ module submodule (net20_i,
     .CK(clk));
  DFF_X1 r9 (.D(\u1/u14z ),
     .CK(clk));
- BUF_X4 u1 (.A(net2_i),
+ BUF_X2 u1 (.A(net2_i),
     .Z(\u1/u6z ));
- BUF_X4 u10 (.A(net2_i),
+ BUF_X1 u10 (.A(net2_i),
     .Z(\u1/u15z ));
- BUF_X4 u11 (.A(net2_i),
+ BUF_X1 u11 (.A(net2_i),
     .Z(\u1/u16z ));
- BUF_X1 u12 (.A(r1q),
+ BUF_X2 u12 (.A(r1q),
     .Z(\u1/u17z ));
  BUF_X1 u13 (.A(r1q),
     .Z(\u1/u18z ));
- BUF_X4 u14 (.A(r1q),
+ BUF_X1 u14 (.A(r1q),
     .Z(\u1/u19z ));
  BUF_X4 u15 (.A(r1q),
     .Z(\u1/u20z ));
  BUF_X4 u16 (.A(r1q),
     .Z(\u1/u1z ));
- BUF_X2 u17 (.A(\u1/u1z ),
+ BUF_X4 u17 (.A(\u1/u1z ),
     .Z(\u1/u2z ));
- BUF_X2 u18 (.A(\u1/u2z ),
+ BUF_X4 u18 (.A(\u1/u2z ),
     .Z(\u1/u3z ));
- BUF_X2 u19 (.A(\u1/u3z ),
+ BUF_X4 u19 (.A(\u1/u3z ),
     .Z(\u1/u4z ));
  BUF_X4 u2 (.A(r1q),
     .Z(\u1/u7z ));
  BUF_X4 u20 (.A(\u1/u4z ),
     .Z(\u1/u5z ));
  BUF_X4 u3 (.A(r1q),
     .Z(\u1/u8z ));
- BUF_X4 u4 (.A(r1q),
+ BUF_X2 u4 (.A(r1q),
     .Z(\u1/u9z ));
  BUF_X1 u5 (.A(r1q),
     .Z(\u1/u10z ));
  BUF_X1 u6 (.A(r1q),
     .Z(\u1/u11z ));
  BUF_X1 u7 (.A(r1q),
     .Z(\u1/u12z ));
- BUF_X1 u8 (.A(r1q),
+ BUF_X2 u8 (.A(r1q),
     .Z(\u1/u13z ));
  BUF_X1 u9 (.A(r1q),
     .Z(\u1/u14z ));

diff --git a/test/ibex_sky130hd.metrics_limits b/test/ibex_sky130hd.metrics_limits
@@ -10,7 +10,7 @@
  ,"RSZ::worst_slack_max" : "-2.3114357842543503"
  ,"RSZ::tns_max" : "-2381.8289966316056"
  ,"RSZ::hold_buffer_count" : "0"
- ,"GRT::ANT::errors" : "0"
+ ,"GRT::ANT::errors" : "1"
  ,"DRT::drv" : "0"
  ,"DRT::worst_slack_min" : "-1.2356032196579647"
  ,"DRT::worst_slack_max" : "-3.231152557470974"