luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #831 from antmicro/prjxray_stabilization_057_pip_bi 

057-pip-bi: Increase number of tries to find a suitable PIP INT tile
This commit is contained in:
litghost 2019-05-30 12:17:02 -07:00 committed by GitHub
parent d876d6b9e5 efb0b14b3a
commit 84e168c9dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fuzzers/057-pip-bi/generate.tcl
View File

@ -27,9 +27,9 @@ for {gets $fp line} {$line != ""} {gets $fp line} {
lappend todo_lines [split $line .] lappend todo_lines [split $line .]
} }
close $fp close $fp
set tries_limit 10
# each run can fail up to three times so we need to prepare 3*todo_lines tiles to work on # each run can fail up to three times so we need to prepare 3*todo_lines tiles to work on
set tiles [expr 3 * [llength $todo_lines]] set tiles [expr $tries_limit * [llength $todo_lines]]
set int_l_tiles [randsample_list $tiles [filter [pblock_tiles roi] {TYPE == INT_L}]] set int_l_tiles [randsample_list $tiles [filter [pblock_tiles roi] {TYPE == INT_L}]]
set int_r_tiles [randsample_list $tiles [filter [pblock_tiles roi] {TYPE == INT_R}]] set int_r_tiles [randsample_list $tiles [filter [pblock_tiles roi] {TYPE == INT_R}]]
@ -51,7 +51,7 @@ for {set idx 0} {$idx < [llength $todo_lines]} {incr idx} {
set tries 0 set tries 0
while {1} { while {1} {
set tile_idx [expr $tries + [expr $idx * 3]] set tile_idx [expr $tries + [expr $idx * $tries_limit]]
incr tries incr tries
if {$tile_type == "INT_L"} {set tile [lindex $int_l_tiles $tile_idx]; set other_tile [lindex $int_r_tiles $idx]} if {$tile_type == "INT_L"} {set tile [lindex $int_l_tiles $tile_idx]; set other_tile [lindex $int_r_tiles $idx]}
@ -83,7 +83,7 @@ for {set idx 0} {$idx < [llength $todo_lines]} {incr idx} {
route_design -unroute -nets $mynet route_design -unroute -nets $mynet
# sometimes it gets stuck in specific src -> dst locations # sometimes it gets stuck in specific src -> dst locations
if {$tries >= 3} { if {$tries >= $tries_limit} {
error "WARNING: failed to route net after $tries tries" error "WARNING: failed to route net after $tries tries"
} }
} }

6
fuzzers/Makefile
View File

@ -101,13 +101,11 @@ $(eval $(call fuzzer,053-pip-ctrlin,048-int-piplist))
$(eval $(call fuzzer,054-pip-fan-alt,048-int-piplist)) $(eval $(call fuzzer,054-pip-fan-alt,048-int-piplist))
$(eval $(call fuzzer,055-pip-gnd,048-int-piplist)) $(eval $(call fuzzer,055-pip-gnd,048-int-piplist))
$(eval $(call fuzzer,056-pip-rem,049-int-imux-gfan 050-pip-seed 051-pip-imuxlout-bypalts 052-pip-clkin 053-pip-ctrlin 054-pip-fan-alt 055-pip-gnd)) $(eval $(call fuzzer,056-pip-rem,049-int-imux-gfan 050-pip-seed 051-pip-imuxlout-bypalts 052-pip-clkin 053-pip-ctrlin 054-pip-fan-alt 055-pip-gnd))
#Disable the longest running fuzzer to speed up test iterations $(eval $(call fuzzer,057-pip-bi,056-pip-rem))
#$(eval $(call fuzzer,057-pip-bi,056-pip-rem))
ifneq ($(QUICK),Y) ifneq ($(QUICK),Y)
$(eval $(call fuzzer,058-pip-hclk,005-tilegrid)) $(eval $(call fuzzer,058-pip-hclk,005-tilegrid))
$(eval $(call fuzzer,060-bram-cascades,005-tilegrid)) $(eval $(call fuzzer,060-bram-cascades,005-tilegrid))
#$(eval $(call fuzzer,071-ppips,057-pip-bi 058-pip-hclk 060-bram-cascades)) $(eval $(call fuzzer,071-ppips,057-pip-bi 058-pip-hclk 060-bram-cascades))
$(eval $(call fuzzer,071-ppips,058-pip-hclk 060-bram-cascades))
ifneq ($(BITONLY),Y) ifneq ($(BITONLY),Y)
$(eval $(call fuzzer,072-ordered_wires,)) $(eval $(call fuzzer,072-ordered_wires,))
$(eval $(call fuzzer,073-get_counts,)) $(eval $(call fuzzer,073-get_counts,))