Skip to content

Commit 8236e85

Browse files
jhkim-piijhkim-pii
committed
Rebased failed regressions
Signed-off-by: Jaehyun Kim <jhkim@precisioninno.com>
1 parent 6a1610f commit 8236e85

9 files changed

Lines changed: 75 additions & 150 deletions

‎src/odb/test/replace_hier_mod1.ok‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ Corner: slow
109109
-0.409 slack (VIOLATED)
110110

111111

112+
Equivalence check - pre
113+
Repair timing output passed/skipped equivalence test
112114
### swap bc1 to inv_chain ###
113115
[INFO GPL-0006] Execute incremental mode global placement.
114116
[INFO GPL-0002] DBU: 2000
@@ -260,6 +262,8 @@ Corner: slow
260262
-0.336 slack (VIOLATED)
261263

262264

265+
Equivalence check - swap (buffer_chain -> inv_chain)
266+
Repair timing output passed/skipped equivalence test
263267
### swap bc1 back to buffer_chain ###
264268
[INFO GPL-0006] Execute incremental mode global placement.
265269
[INFO GPL-0002] DBU: 2000
@@ -388,6 +392,8 @@ Corner: slow
388392
-0.401 slack (VIOLATED)
389393

390394

395+
Equivalence check - swap for rollback (inv_chain -> buffer_chain)
396+
Repair timing output passed/skipped equivalence test
391397
### swap bc1 back to inv_chain ###
392398
[INFO GPL-0006] Execute incremental mode global placement.
393399
[INFO GPL-0002] DBU: 2000
@@ -516,4 +522,5 @@ Corner: slow
516522
-0.330 slack (VIOLATED)
517523

518524

525+
Equivalence check - redo swap (buffer_chain -> inv_chain)
519526
Repair timing output passed/skipped equivalence test

‎src/odb/test/replace_hier_mod1.tcl‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ detailed_placement
2323
source Nangate45/Nangate45.rc
2424
set_wire_rc -layer metal3
2525

26+
# For eqy, write a verilog before replace_hier_module
27+
write_verilog_for_eqy replace_hier_mod1 before "None"
28+
2629
puts "### Initial bc1 is buffer_chain ###"
2730
report_cell_usage bc1
2831
report_net u1z -digits 3
@@ -32,6 +35,8 @@ report_checks -through r2/D -digits 3
3235
# Using "-through u1z" causes crash.
3336
# - it looks like "-through" creates a cache internally.
3437
#report_checks -through u1z -through r2/D -digits 3
38+
puts "Equivalence check - pre"
39+
run_equivalence_test replace_hier_mod1 ./Nangate45/work_around_yosys/ "None"
3540

3641
puts "### swap bc1 to inv_chain ###"
3742
#set_debug_level ODB replace_design 1
@@ -44,6 +49,8 @@ report_net u3z -digits 3
4449
estimate_parasitics -placement
4550
report_checks -through r2/D -digits 3
4651
#report_checks -through u1z -through r2/D -digits 3
52+
puts "Equivalence check - swap (buffer_chain -> inv_chain)"
53+
run_equivalence_test replace_hier_mod1 ./Nangate45/work_around_yosys/ "None"
4754

4855
puts "### swap bc1 back to buffer_chain ###"
4956
replace_hier_module bc1 buffer_chain
@@ -55,6 +62,8 @@ report_net u3z -digits 3
5562
estimate_parasitics -placement
5663
report_checks -through r2/D -digits 3
5764
#report_checks -through u1z -through r2/D -digits 3
65+
puts "Equivalence check - swap for rollback (inv_chain -> buffer_chain)"
66+
run_equivalence_test replace_hier_mod1 ./Nangate45/work_around_yosys/ "None"
5867

5968
puts "### swap bc1 back to inv_chain ###"
6069
replace_hier_module bc1 inv_chain
@@ -66,5 +75,5 @@ report_net u3z -digits 3
6675
estimate_parasitics -placement
6776
report_checks -through r2/D -digits 3
6877
#report_checks -through u1z -through r2/D -digits 3
69-
78+
puts "Equivalence check - redo swap (buffer_chain -> inv_chain)"
7079
run_equivalence_test replace_hier_mod1 ./Nangate45/work_around_yosys/ "None"

‎src/odb/test/replace_hier_mod2.ok‎

Lines changed: 45 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -50,79 +50,41 @@ Cell type report: Count Area
5050
Multi-Input combinational cell 37 192.68
5151
Total 62 346.58
5252
[WARNING EST-0018] wire capacitance for corner default is zero. Use the set_wire_rc command to set wire resistance and capacitance.
53-
Startpoint: dpath.b_reg.out[3]$_DFFE_PP_
53+
Startpoint: dpath.b_reg.out[4]$_DFFE_PP_
5454
(rising edge-triggered flip-flop clocked by CLK)
5555
Endpoint: carry_out (output port)
5656
Path Group: path delay
5757
Path Type: max
5858

5959
Delay Time Description
6060
---------------------------------------------------------
61-
0.00 0.00 ^ dpath.b_reg.out[3]$_DFFE_PP_/CLK (sky130_fd_sc_hd__dfxtp_1)
62-
0.32 0.32 v dpath.b_reg.out[3]$_DFFE_PP_/Q (sky130_fd_sc_hd__dfxtp_1)
63-
0.00 0.32 v _329_/A (sky130_fd_sc_hd__xnor2_1)
64-
0.58 0.89 ^ _329_/Y (sky130_fd_sc_hd__xnor2_1)
65-
0.00 0.89 ^ _551_/_103_/B (sky130_fd_sc_hd__nand4_1)
66-
0.19 1.08 v _551_/_103_/Y (sky130_fd_sc_hd__nand4_1)
67-
0.00 1.08 v _551_/_104_/A2 (sky130_fd_sc_hd__o221ai_1)
68-
0.25 1.34 ^ _551_/_104_/Y (sky130_fd_sc_hd__o221ai_1)
69-
0.00 1.34 ^ _551_/_147_/A (sky130_fd_sc_hd__nand3_1)
70-
0.09 1.43 v _551_/_147_/Y (sky130_fd_sc_hd__nand3_1)
71-
0.00 1.43 v _551_/_148_/A (sky130_fd_sc_hd__nand2_1)
72-
0.06 1.49 ^ _551_/_148_/Y (sky130_fd_sc_hd__nand2_1)
73-
0.00 1.49 ^ _551_/_171_/A (sky130_fd_sc_hd__buf_4)
74-
0.09 1.58 ^ _551_/_171_/X (sky130_fd_sc_hd__buf_4)
75-
0.00 1.58 ^ _551_/_156_/B1 (sky130_fd_sc_hd__o41ai_1)
76-
0.04 1.62 v _551_/_156_/Y (sky130_fd_sc_hd__o41ai_1)
77-
0.00 1.62 v _551_/_168_/A (sky130_fd_sc_hd__buf_4)
78-
0.13 1.75 v _551_/_168_/X (sky130_fd_sc_hd__buf_4)
79-
0.00 1.75 v _551_/_087_/B1 (sky130_fd_sc_hd__a21oi_1)
80-
0.12 1.87 ^ _551_/_087_/Y (sky130_fd_sc_hd__a21oi_1)
81-
0.00 1.87 ^ _551_/_088_/A (sky130_fd_sc_hd__inv_1)
82-
0.05 1.92 v _551_/_088_/Y (sky130_fd_sc_hd__inv_1)
83-
0.00 1.92 v _551_/_166_/A (sky130_fd_sc_hd__buf_4)
84-
0.11 2.03 v _551_/_166_/X (sky130_fd_sc_hd__buf_4)
85-
0.00 2.03 v _551_/_139_/A (sky130_fd_sc_hd__nor2_1)
86-
0.13 2.15 ^ _551_/_139_/Y (sky130_fd_sc_hd__nor2_1)
87-
0.00 2.15 ^ _551_/_140_/B (sky130_fd_sc_hd__nand2_1)
88-
0.06 2.21 v _551_/_140_/Y (sky130_fd_sc_hd__nand2_1)
89-
0.00 2.21 v _551_/_141_/A1 (sky130_fd_sc_hd__o21ai_0)
90-
0.14 2.36 ^ _551_/_141_/Y (sky130_fd_sc_hd__o21ai_0)
91-
0.00 2.36 ^ _551_/_172_/A (sky130_fd_sc_hd__buf_4)
92-
0.11 2.47 ^ _551_/_172_/X (sky130_fd_sc_hd__buf_4)
93-
0.00 2.47 ^ _551_/_158_/B1 (sky130_fd_sc_hd__o41ai_1)
94-
0.06 2.53 v _551_/_158_/Y (sky130_fd_sc_hd__o41ai_1)
95-
0.00 2.53 v _551_/_167_/A (sky130_fd_sc_hd__buf_4)
96-
0.12 2.64 v _551_/_167_/X (sky130_fd_sc_hd__buf_4)
97-
0.00 2.64 v _551_/_097_/B1 (sky130_fd_sc_hd__o21ai_0)
98-
0.11 2.75 ^ _551_/_097_/Y (sky130_fd_sc_hd__o21ai_0)
99-
0.00 2.75 ^ _551_/_100_/B (sky130_fd_sc_hd__nor2_1)
100-
0.07 2.82 v _551_/_100_/Y (sky130_fd_sc_hd__nor2_1)
101-
0.00 2.82 v _551_/_101_/A (sky130_fd_sc_hd__inv_1)
102-
0.05 2.87 ^ _551_/_101_/Y (sky130_fd_sc_hd__inv_1)
103-
0.00 2.87 ^ _551_/_164_/A (sky130_fd_sc_hd__buf_4)
104-
0.08 2.95 ^ _551_/_164_/X (sky130_fd_sc_hd__buf_4)
105-
0.00 2.95 ^ _551_/_080_/B (sky130_fd_sc_hd__nand2_1)
106-
0.07 3.02 v _551_/_080_/Y (sky130_fd_sc_hd__nand2_1)
107-
0.00 3.02 v _551_/_095_/A1 (sky130_fd_sc_hd__a21oi_1)
108-
0.14 3.16 ^ _551_/_095_/Y (sky130_fd_sc_hd__a21oi_1)
109-
0.00 3.16 ^ _551_/_134_/A2 (sky130_fd_sc_hd__o21ai_0)
110-
0.09 3.25 v _551_/_134_/Y (sky130_fd_sc_hd__o21ai_0)
111-
0.00 3.25 v _551_/_173_/A (sky130_fd_sc_hd__buf_4)
112-
0.13 3.37 v _551_/_173_/X (sky130_fd_sc_hd__buf_4)
113-
0.00 3.37 v _carry_out_and_/C (sky130_fd_sc_hd__and4_1)
114-
0.15 3.52 v _carry_out_and_/X (sky130_fd_sc_hd__and4_1)
115-
0.00 3.52 v carry_out (out)
116-
3.52 data arrival time
61+
0.00 0.00 ^ dpath.b_reg.out[4]$_DFFE_PP_/CLK (sky130_fd_sc_hd__dfxtp_1)
62+
0.32 0.32 v dpath.b_reg.out[4]$_DFFE_PP_/Q (sky130_fd_sc_hd__dfxtp_1)
63+
0.00 0.32 v _330_/A (sky130_fd_sc_hd__xnor2_1)
64+
0.58 0.89 ^ _330_/Y (sky130_fd_sc_hd__xnor2_1)
65+
0.00 0.89 ^ _551_/_091_/A1 (sky130_fd_sc_hd__a21oi_1)
66+
0.17 1.06 v _551_/_091_/Y (sky130_fd_sc_hd__a21oi_1)
67+
0.00 1.06 v _551_/_092_/A2 (sky130_fd_sc_hd__o21ai_0)
68+
0.23 1.29 ^ _551_/_092_/Y (sky130_fd_sc_hd__o21ai_0)
69+
0.00 1.29 ^ _551_/_095_/B1 (sky130_fd_sc_hd__a21oi_1)
70+
0.07 1.36 v _551_/_095_/Y (sky130_fd_sc_hd__a21oi_1)
71+
0.00 1.36 v _551_/_134_/A2 (sky130_fd_sc_hd__o21ai_0)
72+
0.14 1.50 ^ _551_/_134_/Y (sky130_fd_sc_hd__o21ai_0)
73+
0.00 1.50 ^ _551_/_173_/A (sky130_fd_sc_hd__buf_4)
74+
0.12 1.62 ^ _551_/_173_/X (sky130_fd_sc_hd__buf_4)
75+
0.00 1.62 ^ _carry_out_and_/C (sky130_fd_sc_hd__and4_1)
76+
0.14 1.76 ^ _carry_out_and_/X (sky130_fd_sc_hd__and4_1)
77+
0.00 1.76 ^ carry_out (out)
78+
1.76 data arrival time
11779

11880
1.00 1.00 max_delay
11981
0.00 1.00 output external delay
12082
1.00 data required time
12183
---------------------------------------------------------
12284
1.00 data required time
123-
-3.52 data arrival time
85+
-1.76 data arrival time
12486
---------------------------------------------------------
125-
-2.52 slack (VIOLATED)
87+
-0.76 slack (VIOLATED)
12688

12789

12890
Cell type report for _551_ (LCU_16_KOGGE_STONE__551_)
@@ -179,80 +141,44 @@ Cell type report: Count Area
179141
Inverter 9 33.78
180142
Multi-Input combinational cell 37 192.68
181143
Total 62 346.58
144+
Checking equivalence after swap #2 (Rollback)...
145+
Repair timing output passed/skipped equivalence test
182146
[WARNING EST-0018] wire capacitance for corner default is zero. Use the set_wire_rc command to set wire resistance and capacitance.
183-
Startpoint: dpath.b_reg.out[3]$_DFFE_PP_
147+
Startpoint: dpath.b_reg.out[4]$_DFFE_PP_
184148
(rising edge-triggered flip-flop clocked by CLK)
185149
Endpoint: carry_out (output port)
186150
Path Group: path delay
187151
Path Type: max
188152

189153
Delay Time Description
190154
---------------------------------------------------------
191-
0.00 0.00 ^ dpath.b_reg.out[3]$_DFFE_PP_/CLK (sky130_fd_sc_hd__dfxtp_1)
192-
0.32 0.32 v dpath.b_reg.out[3]$_DFFE_PP_/Q (sky130_fd_sc_hd__dfxtp_1)
193-
0.00 0.32 v _329_/A (sky130_fd_sc_hd__xnor2_1)
194-
0.58 0.89 ^ _329_/Y (sky130_fd_sc_hd__xnor2_1)
195-
0.00 0.89 ^ _551_/_103_/B (sky130_fd_sc_hd__nand4_1)
196-
0.19 1.08 v _551_/_103_/Y (sky130_fd_sc_hd__nand4_1)
197-
0.00 1.08 v _551_/_104_/A2 (sky130_fd_sc_hd__o221ai_1)
198-
0.25 1.34 ^ _551_/_104_/Y (sky130_fd_sc_hd__o221ai_1)
199-
0.00 1.34 ^ _551_/_147_/A (sky130_fd_sc_hd__nand3_1)
200-
0.09 1.43 v _551_/_147_/Y (sky130_fd_sc_hd__nand3_1)
201-
0.00 1.43 v _551_/_148_/A (sky130_fd_sc_hd__nand2_1)
202-
0.06 1.49 ^ _551_/_148_/Y (sky130_fd_sc_hd__nand2_1)
203-
0.00 1.49 ^ _551_/_171_/A (sky130_fd_sc_hd__buf_4)
204-
0.09 1.58 ^ _551_/_171_/X (sky130_fd_sc_hd__buf_4)
205-
0.00 1.58 ^ _551_/_156_/B1 (sky130_fd_sc_hd__o41ai_1)
206-
0.04 1.62 v _551_/_156_/Y (sky130_fd_sc_hd__o41ai_1)
207-
0.00 1.62 v _551_/_168_/A (sky130_fd_sc_hd__buf_4)
208-
0.13 1.75 v _551_/_168_/X (sky130_fd_sc_hd__buf_4)
209-
0.00 1.75 v _551_/_087_/B1 (sky130_fd_sc_hd__a21oi_1)
210-
0.12 1.87 ^ _551_/_087_/Y (sky130_fd_sc_hd__a21oi_1)
211-
0.00 1.87 ^ _551_/_088_/A (sky130_fd_sc_hd__inv_1)
212-
0.05 1.92 v _551_/_088_/Y (sky130_fd_sc_hd__inv_1)
213-
0.00 1.92 v _551_/_166_/A (sky130_fd_sc_hd__buf_4)
214-
0.11 2.03 v _551_/_166_/X (sky130_fd_sc_hd__buf_4)
215-
0.00 2.03 v _551_/_139_/A (sky130_fd_sc_hd__nor2_1)
216-
0.13 2.15 ^ _551_/_139_/Y (sky130_fd_sc_hd__nor2_1)
217-
0.00 2.15 ^ _551_/_140_/B (sky130_fd_sc_hd__nand2_1)
218-
0.06 2.21 v _551_/_140_/Y (sky130_fd_sc_hd__nand2_1)
219-
0.00 2.21 v _551_/_141_/A1 (sky130_fd_sc_hd__o21ai_0)
220-
0.14 2.36 ^ _551_/_141_/Y (sky130_fd_sc_hd__o21ai_0)
221-
0.00 2.36 ^ _551_/_172_/A (sky130_fd_sc_hd__buf_4)
222-
0.11 2.47 ^ _551_/_172_/X (sky130_fd_sc_hd__buf_4)
223-
0.00 2.47 ^ _551_/_158_/B1 (sky130_fd_sc_hd__o41ai_1)
224-
0.06 2.53 v _551_/_158_/Y (sky130_fd_sc_hd__o41ai_1)
225-
0.00 2.53 v _551_/_167_/A (sky130_fd_sc_hd__buf_4)
226-
0.12 2.64 v _551_/_167_/X (sky130_fd_sc_hd__buf_4)
227-
0.00 2.64 v _551_/_097_/B1 (sky130_fd_sc_hd__o21ai_0)
228-
0.11 2.75 ^ _551_/_097_/Y (sky130_fd_sc_hd__o21ai_0)
229-
0.00 2.75 ^ _551_/_100_/B (sky130_fd_sc_hd__nor2_1)
230-
0.07 2.82 v _551_/_100_/Y (sky130_fd_sc_hd__nor2_1)
231-
0.00 2.82 v _551_/_101_/A (sky130_fd_sc_hd__inv_1)
232-
0.05 2.87 ^ _551_/_101_/Y (sky130_fd_sc_hd__inv_1)
233-
0.00 2.87 ^ _551_/_164_/A (sky130_fd_sc_hd__buf_4)
234-
0.08 2.95 ^ _551_/_164_/X (sky130_fd_sc_hd__buf_4)
235-
0.00 2.95 ^ _551_/_080_/B (sky130_fd_sc_hd__nand2_1)
236-
0.07 3.02 v _551_/_080_/Y (sky130_fd_sc_hd__nand2_1)
237-
0.00 3.02 v _551_/_095_/A1 (sky130_fd_sc_hd__a21oi_1)
238-
0.14 3.16 ^ _551_/_095_/Y (sky130_fd_sc_hd__a21oi_1)
239-
0.00 3.16 ^ _551_/_134_/A2 (sky130_fd_sc_hd__o21ai_0)
240-
0.09 3.25 v _551_/_134_/Y (sky130_fd_sc_hd__o21ai_0)
241-
0.00 3.25 v _551_/_173_/A (sky130_fd_sc_hd__buf_4)
242-
0.13 3.37 v _551_/_173_/X (sky130_fd_sc_hd__buf_4)
243-
0.00 3.37 v _carry_out_and_/C (sky130_fd_sc_hd__and4_1)
244-
0.15 3.52 v _carry_out_and_/X (sky130_fd_sc_hd__and4_1)
245-
0.00 3.52 v carry_out (out)
246-
3.52 data arrival time
155+
0.00 0.00 ^ dpath.b_reg.out[4]$_DFFE_PP_/CLK (sky130_fd_sc_hd__dfxtp_1)
156+
0.32 0.32 v dpath.b_reg.out[4]$_DFFE_PP_/Q (sky130_fd_sc_hd__dfxtp_1)
157+
0.00 0.32 v _330_/A (sky130_fd_sc_hd__xnor2_1)
158+
0.58 0.89 ^ _330_/Y (sky130_fd_sc_hd__xnor2_1)
159+
0.00 0.89 ^ _551_/_091_/A1 (sky130_fd_sc_hd__a21oi_1)
160+
0.17 1.06 v _551_/_091_/Y (sky130_fd_sc_hd__a21oi_1)
161+
0.00 1.06 v _551_/_092_/A2 (sky130_fd_sc_hd__o21ai_0)
162+
0.23 1.29 ^ _551_/_092_/Y (sky130_fd_sc_hd__o21ai_0)
163+
0.00 1.29 ^ _551_/_095_/B1 (sky130_fd_sc_hd__a21oi_1)
164+
0.07 1.36 v _551_/_095_/Y (sky130_fd_sc_hd__a21oi_1)
165+
0.00 1.36 v _551_/_134_/A2 (sky130_fd_sc_hd__o21ai_0)
166+
0.14 1.50 ^ _551_/_134_/Y (sky130_fd_sc_hd__o21ai_0)
167+
0.00 1.50 ^ _551_/_173_/A (sky130_fd_sc_hd__buf_4)
168+
0.12 1.62 ^ _551_/_173_/X (sky130_fd_sc_hd__buf_4)
169+
0.00 1.62 ^ _carry_out_and_/C (sky130_fd_sc_hd__and4_1)
170+
0.14 1.76 ^ _carry_out_and_/X (sky130_fd_sc_hd__and4_1)
171+
0.00 1.76 ^ carry_out (out)
172+
1.76 data arrival time
247173

248174
1.00 1.00 max_delay
249175
0.00 1.00 output external delay
250176
1.00 data required time
251177
---------------------------------------------------------
252178
1.00 data required time
253-
-3.52 data arrival time
179+
-1.76 data arrival time
254180
---------------------------------------------------------
255-
-2.52 slack (VIOLATED)
181+
-0.76 slack (VIOLATED)
256182

257183

258184
Cell type report for _551_ (LCU_16_KOGGE_STONE__551__1)
@@ -309,4 +235,5 @@ Cell type report: Count Area
309235
Inverter 9 33.78
310236
Multi-Input combinational cell 37 192.68
311237
Total 62 346.58
238+
Checking equivalence after swap #4 (Rollback again)...
312239
Repair timing output passed/skipped equivalence test

‎src/odb/test/replace_hier_mod2.tcl‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ estimate_parasitics -placement
2323
report_checks -through _carry_out_and_/C -field input
2424
report_cell_usage _551_
2525

26+
# For eqy, write a verilog before replace_hier_module
27+
write_verilog_for_eqy replace_hier_mod2 before "None"
28+
2629
#set_debug_level ODB replace_design 1
2730

2831
# Swap #1. BRENT_KUNG -> KOGGE_STONE
@@ -31,13 +34,16 @@ sta::network_changed
3134
estimate_parasitics -placement
3235
report_checks -through _carry_out_and_/C -field input
3336
report_cell_usage _551_
37+
# Skip EQY because BRENT_KUNG and KOGGE_STONE are not equivalent.
3438

3539
# Swap #2. KOGGE_STONE -> BRENT_KUNG (Rollback)
3640
replace_hier_module _551_ LCU_16_BRENT_KUNG
3741
sta::network_changed
3842
estimate_parasitics -placement
3943
report_checks -through _carry_out_and_/C -field input
4044
report_cell_usage _551_
45+
puts "Checking equivalence after swap #2 (Rollback)..."
46+
run_equivalence_test replace_hier_mod2 sky130hd/work_around_yosys "None"
4147

4248
# Swap #3. BRENT_KUNG -> KOGGE_STONE (Redo)
4349
replace_hier_module _551_ LCU_16_KOGGE_STONE
@@ -52,5 +58,5 @@ sta::network_changed
5258
estimate_parasitics -placement
5359
report_checks -through _carry_out_and_/C -field input
5460
report_cell_usage _551_
55-
56-
run_equivalence_test replace_hier_mod2 ./Nangate45/work_around_yosys/ "None"
61+
puts "Checking equivalence after swap #4 (Rollback again)..."
62+
run_equivalence_test replace_hier_mod2 sky130hd/work_around_yosys "None"

‎src/odb/test/replace_hier_mod3.ok‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,3 @@ Cell type report: Count Area
9494
Inverter 9 33.78
9595
Multi-Input combinational cell 37 192.68
9696
Total 62 346.58
97-
Repair timing output passed/skipped equivalence test

‎src/odb/test/replace_hier_mod3.tcl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,4 @@ replace_hier_module gcd_1/_552_ LCU_16_BRENT_KUNG
3535

3636
report_checks -through gcd_1/_carry_out_and_/B -fields input_pins
3737
report_cell_usage gcd_1/_552_
38-
39-
run_equivalence_test replace_hier_mod3 ./Nangate45/work_around_yosys/ "None"
38+
# Skip EQY because BRENT_KUNG and KOGGE_STONE are not equivalent.

‎src/odb/test/replace_hier_mod4.ok‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,3 @@ Cell type report: Count Area
9393
Inverter 9 33.78
9494
Multi-Input combinational cell 37 192.68
9595
Total 62 346.58
96-
Repair timing output passed/skipped equivalence test

‎src/odb/test/replace_hier_mod4.tcl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,4 @@ replace_hier_module gcd_1/_552_ LCU_16_BRENT_KUNG
4242

4343
report_checks -through gcd_1/_carry_out_and_/B -fields input_pins
4444
report_cell_usage gcd_1/_552_
45-
46-
run_equivalence_test replace_hier_mod4 ./Nangate45/work_around_yosys/ "None"
45+
# Skip EQY because BRENT_KUNG and KOGGE_STONE are not equivalent.

‎src/odb/test/replace_hier_mod5.tcl‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,8 @@
11
#
2-
# replace_hier_mod4
2+
# replace_hier_mod5
33
#
4-
# Test if uninstantiated module can be swapped without implements_operator attribute
5-
#
6-
# top instantiates gcd module two times: gcd_1, gcd_2
7-
# Each gcd instantiates two LCU_16_KOGGE_STONE modules
8-
# LCU_16_BRENT_KUNG is not instantiated
9-
#
10-
# top
11-
# gcd_1
12-
# _551_
13-
# _552_
14-
# gcd_2
15-
# _551_
16-
# _552_
17-
#
18-
# Instance gcd_1/_552_ is swapped from KS to BK LCU.
19-
# Input design has only KOGGE_STONE LCUs.
20-
# 1) LCU_16_BRENT_KUNG instance _551_ (62 cells)
21-
# 2) LCU_16_KOGGE_STONE instance _552_ (103 cells)
22-
#
23-
# Instance _551_ is swapped from KS to BK LCU.
4+
# Test if uninstantiated module cannot be swapped because uninstantiated
5+
# module is ignored.
246
#
257
source "helpers.tcl"
268

@@ -43,8 +25,6 @@ if { $result == 0 } {
4325
puts "Successfully replaced hier module"
4426
report_checks -through gcd_1/_carry_out_and_/B -fields input_pins
4527
report_cell_usage gcd_1/_552_
46-
47-
run_equivalence_test replace_hier_mod4 ./Nangate45/work_around_yosys/ "None"
4828
} else {
4929
puts "Failed to replaced hier module"
5030
}

0 commit comments

Comments
 (0)