Skip to content

Commit 92ba949

Browse files
committed
equivalent: fixed initial regression test
Signed-off-by: Alessandro Comodi <[email protected]>
1 parent 1be2032 commit 92ba949

File tree

2 files changed

+26
-33
lines changed

2 files changed

+26
-33
lines changed

vtr_flow/arch/equivalent_sites/equivalent.xml

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@
4444
<direct from="io_tile.out" to="io_block.out"/>
4545
</site>
4646
</equivalent_sites>
47-
<pinlocations pattern="spread"/>
47+
<pinlocations pattern="custom">
48+
<loc side="top" xoffset="0" yoffset="0">io_tile.in io_tile.out</loc>
49+
<loc side="left" xoffset="0" yoffset="0">io_tile.in io_tile.out</loc>
50+
<loc side="bottom" xoffset="0" yoffset="0">io_tile.in io_tile.out</loc>
51+
<loc side="right" xoffset="0" yoffset="0">io_tile.in io_tile.out</loc>
52+
</pinlocations>
4853
<fc in_type="frac" in_val="1.0" out_type="frac" out_val="1.0"/>
4954
</tile>
5055
<tile name="pass_through_tile">
@@ -68,7 +73,12 @@
6873
<direct from="pass_through_tile.out" to="io_site_3.out"/>
6974
</site>
7075
</equivalent_sites>
71-
<pinlocations pattern="spread"/>
76+
<pinlocations pattern="custom">
77+
<loc side="top" xoffset="0" yoffset="0">pass_through_tile.in pass_through_tile.out</loc>
78+
<loc side="left" xoffset="0" yoffset="0">pass_through_tile.in pass_through_tile.out</loc>
79+
<loc side="bottom" xoffset="0" yoffset="0">pass_through_tile.in pass_through_tile.out</loc>
80+
<loc side="right" xoffset="0" yoffset="0">pass_through_tile.in pass_through_tile.out</loc>
81+
</pinlocations>
7282
<fc in_type="frac" in_val="1.0" out_type="frac" out_val="1.0"/>
7383
</tile>
7484
</tiles>
@@ -155,49 +165,31 @@
155165
</pb_type>
156166
</complexblocklist>
157167
<layout>
158-
<fixed_layout name="TEST" width="5" height="5">
159-
<single priority="1" type="io_tile" x="0" y="0"/>
160-
<single priority="1" type="io_tile" x="0" y="1"/>
161-
<single priority="1" type="io_tile" x="0" y="2"/>
162-
<single priority="1" type="io_tile" x="0" y="3"/>
163-
<single priority="1" type="pass_through_tile" x="1" y="0"/>
164-
<single priority="1" type="pass_through_tile" x="1" y="1"/>
165-
<single priority="1" type="pass_through_tile" x="1" y="2"/>
166-
<single priority="1" type="pass_through_tile" x="1" y="3"/>
167-
<single priority="1" type="pass_through_tile" x="2" y="0"/>
168-
<single priority="1" type="pass_through_tile" x="2" y="1"/>
169-
<single priority="1" type="pass_through_tile" x="2" y="2"/>
170-
<single priority="1" type="pass_through_tile" x="2" y="3"/>
171-
<single priority="1" type="io_tile" x="3" y="0"/>
172-
<single priority="1" type="io_tile" x="3" y="1"/>
173-
<single priority="1" type="io_tile" x="3" y="2"/>
174-
<single priority="1" type="io_tile" x="3" y="3"/>
175-
</fixed_layout>
168+
<auto_layout>
169+
<fill type="pass_through_tile" priority="1"/>
170+
<perimeter type="io_tile" priority="2"/>
171+
<corners type="EMPTY" priority="3"/>
172+
</auto_layout>
176173
</layout>
177174
<device>
178175
<sizing R_minW_nmos="6065.520020" R_minW_pmos="18138.500000"/>
179176
<area grid_logic_tile_area="14813.392"/>
180-
<connection_block input_switch_name="buffer"/>
181-
<switch_block fs="3" type="wilton"/>
177+
<connection_block input_switch_name="sw"/>
178+
<switch_block fs="3" type="universal"/>
182179
<chan_width_distr>
183180
<x distr="uniform" peak="1.0"/>
184181
<y distr="uniform" peak="1.0"/>
185182
</chan_width_distr>
186183
</device>
187184
<switchlist>
188-
<switch Cin=".77e-15" Cout="4e-15" R="551" Tdel="6.8e-12" buf_size="27.645901" mux_trans_size="2.630740" name="routing" type="mux"/>
189-
<switch Cin=".77e-15" Cout="4e-15" R="551" Tdel="6.8e-12" buf_size="27.645901" mux_trans_size="2.630740" name="buffer" type="mux"/>
185+
<switch Cin=".77e-15" Cout="4e-15" R="1" Tdel="58e-12" buf_size="27.645901" mux_trans_size="2.630740" name="sw" type="mux"/>
190186
</switchlist>
191187
<segmentlist>
192-
<segment Cmetal="22.5e-15" Rmetal="101" freq="1.0" length="12" name="dummy" type="bidir">
193-
<wire_switch name="routing"/>
194-
<opin_switch name="routing"/>
195-
<sb type="pattern">1 1 1 1 1 1 1 1 1 1 1 1 1</sb>
196-
<cb type="pattern">1 1 1 1 1 1 1 1 1 1 1 1</cb>
188+
<segment Cmetal="22.5e-15" Rmetal="101" freq="1.0" name="wire" type="bidir" length="1">
189+
<wire_switch name="sw"/>
190+
<opin_switch name="sw"/>
191+
<sb type="pattern">1 1</sb>
192+
<cb type="pattern">1</cb>
197193
</segment>
198194
</segmentlist>
199-
<directlist>
200-
<direct from_pin="pass_through_tile.out" name="gno" to_pin="io_tile.in" x_offset="-1" y_offset="0" z_offset="0"/>
201-
<direct from_pin="io_tile.out" name="gna" to_pin="pass_through_tile.in" x_offset="-1" y_offset="0" z_offset="0"/>
202-
</directlist>
203195
</architecture>

vtr_flow/tasks/regression_tests/vtr_reg_strong/task_list.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@ regression_tests/vtr_reg_strong/strong_global_nonuniform
5252
regression_tests/vtr_reg_strong/strong_sdc
5353
regression_tests/vtr_reg_strong/strong_timing_report_detail
5454
regression_tests/vtr_reg_strong/strong_route_reconverge
55+
regression_tests/vtr_reg_strong/strong_equivalent_sites

0 commit comments

Comments
 (0)