From f13a2a4856a07383fbf482f8791f0b40f3f6baf1 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 31 Oct 2018 17:52:06 -0700 Subject: [PATCH] fuzzers: don't use EXCLUDE_PLACEMENT on ROI Signed-off-by: John McMaster --- fuzzers/007-timing/minitest/test_unique/generate.tcl | 1 - fuzzers/007-timing/projects/oneblinkw/generate.tcl | 1 - fuzzers/007-timing/projects/picorv32/generate.tcl | 1 - fuzzers/007-timing/projects/placelut/generate.tcl | 1 - fuzzers/007-timing/projects/placelut_fb/generate.tcl | 1 - fuzzers/007-timing/projects/placelut_ff_fb/generate.tcl | 1 - fuzzers/011-ffconfig/generate.tcl | 2 +- fuzzers/012-clbn5ffmux/generate.tcl | 2 +- fuzzers/013-clbncy0/generate.tcl | 2 +- fuzzers/014-ffsrcemux/generate.tcl | 2 +- fuzzers/015-clbnffmux/generate.tcl | 2 +- fuzzers/016-clbnoutmux/generate.tcl | 2 +- fuzzers/017-clbprecyinit/generate.tcl | 2 +- fuzzers/018-clbram/generate.tcl | 2 +- fuzzers/019-ndi1mux/generate.tcl | 2 +- fuzzers/101-bram-config/generate.tcl | 2 +- fuzzers/101-bram-config/minitest/runme.tcl | 2 +- fuzzers/102-bram-data/generate.tcl | 1 - minitests/clbconfigs/runme.tcl | 1 - minitests/picorv32-v/runme.tcl | 1 - minitests/picorv32-y/runme.tcl | 1 - minitests/util/runme.tcl | 1 - 22 files changed, 11 insertions(+), 22 deletions(-) diff --git a/fuzzers/007-timing/minitest/test_unique/generate.tcl b/fuzzers/007-timing/minitest/test_unique/generate.tcl index 99fd39d0..4c983a2a 100644 --- a/fuzzers/007-timing/minitest/test_unique/generate.tcl +++ b/fuzzers/007-timing/minitest/test_unique/generate.tcl @@ -19,7 +19,6 @@ proc build_design {} { puts "pblocking" create_pblock roi set roipb [get_pblocks roi] - set_property EXCLUDE_PLACEMENT 1 $roipb add_cells_to_pblock $roipb [get_cells roi] resize_pblock $roipb -add "$::env(XRAY_ROI)" diff --git a/fuzzers/007-timing/projects/oneblinkw/generate.tcl b/fuzzers/007-timing/projects/oneblinkw/generate.tcl index 19a3b799..19360c8f 100644 --- a/fuzzers/007-timing/projects/oneblinkw/generate.tcl +++ b/fuzzers/007-timing/projects/oneblinkw/generate.tcl @@ -19,7 +19,6 @@ proc build_design {} { puts "pblocking" create_pblock roi set roipb [get_pblocks roi] - set_property EXCLUDE_PLACEMENT 1 $roipb add_cells_to_pblock $roipb [get_cells roi] resize_pblock $roipb -add "$::env(XRAY_ROI)" diff --git a/fuzzers/007-timing/projects/picorv32/generate.tcl b/fuzzers/007-timing/projects/picorv32/generate.tcl index 56a2ebea..8c09ac0d 100644 --- a/fuzzers/007-timing/projects/picorv32/generate.tcl +++ b/fuzzers/007-timing/projects/picorv32/generate.tcl @@ -20,7 +20,6 @@ proc build_design {} { puts "pblocking" create_pblock roi set roipb [get_pblocks roi] - set_property EXCLUDE_PLACEMENT 1 $roipb add_cells_to_pblock $roipb [get_cells roi] resize_pblock $roipb -add "$::env(XRAY_ROI)" diff --git a/fuzzers/007-timing/projects/placelut/generate.tcl b/fuzzers/007-timing/projects/placelut/generate.tcl index 11152586..ad0d871c 100644 --- a/fuzzers/007-timing/projects/placelut/generate.tcl +++ b/fuzzers/007-timing/projects/placelut/generate.tcl @@ -19,7 +19,6 @@ proc build_design {} { puts "pblocking" create_pblock roi set roipb [get_pblocks roi] - set_property EXCLUDE_PLACEMENT 1 $roipb add_cells_to_pblock $roipb [get_cells roi] resize_pblock $roipb -add "$::env(XRAY_ROI)" diff --git a/fuzzers/007-timing/projects/placelut_fb/generate.tcl b/fuzzers/007-timing/projects/placelut_fb/generate.tcl index 11152586..ad0d871c 100644 --- a/fuzzers/007-timing/projects/placelut_fb/generate.tcl +++ b/fuzzers/007-timing/projects/placelut_fb/generate.tcl @@ -19,7 +19,6 @@ proc build_design {} { puts "pblocking" create_pblock roi set roipb [get_pblocks roi] - set_property EXCLUDE_PLACEMENT 1 $roipb add_cells_to_pblock $roipb [get_cells roi] resize_pblock $roipb -add "$::env(XRAY_ROI)" diff --git a/fuzzers/007-timing/projects/placelut_ff_fb/generate.tcl b/fuzzers/007-timing/projects/placelut_ff_fb/generate.tcl index 11152586..ad0d871c 100644 --- a/fuzzers/007-timing/projects/placelut_ff_fb/generate.tcl +++ b/fuzzers/007-timing/projects/placelut_ff_fb/generate.tcl @@ -19,7 +19,6 @@ proc build_design {} { puts "pblocking" create_pblock roi set roipb [get_pblocks roi] - set_property EXCLUDE_PLACEMENT 1 $roipb add_cells_to_pblock $roipb [get_cells roi] resize_pblock $roipb -add "$::env(XRAY_ROI)" diff --git a/fuzzers/011-ffconfig/generate.tcl b/fuzzers/011-ffconfig/generate.tcl index 833b860f..2b953e29 100644 --- a/fuzzers/011-ffconfig/generate.tcl +++ b/fuzzers/011-ffconfig/generate.tcl @@ -8,7 +8,7 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] + add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/fuzzers/012-clbn5ffmux/generate.tcl b/fuzzers/012-clbn5ffmux/generate.tcl index 9e981032..d5464fdb 100644 --- a/fuzzers/012-clbn5ffmux/generate.tcl +++ b/fuzzers/012-clbn5ffmux/generate.tcl @@ -8,7 +8,7 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] + add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/fuzzers/013-clbncy0/generate.tcl b/fuzzers/013-clbncy0/generate.tcl index 9e981032..d5464fdb 100644 --- a/fuzzers/013-clbncy0/generate.tcl +++ b/fuzzers/013-clbncy0/generate.tcl @@ -8,7 +8,7 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] + add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/fuzzers/014-ffsrcemux/generate.tcl b/fuzzers/014-ffsrcemux/generate.tcl index 329580ee..8f5eb3ea 100644 --- a/fuzzers/014-ffsrcemux/generate.tcl +++ b/fuzzers/014-ffsrcemux/generate.tcl @@ -8,7 +8,7 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] + add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/fuzzers/015-clbnffmux/generate.tcl b/fuzzers/015-clbnffmux/generate.tcl index 9e981032..d5464fdb 100644 --- a/fuzzers/015-clbnffmux/generate.tcl +++ b/fuzzers/015-clbnffmux/generate.tcl @@ -8,7 +8,7 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] + add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/fuzzers/016-clbnoutmux/generate.tcl b/fuzzers/016-clbnoutmux/generate.tcl index 9e981032..d5464fdb 100644 --- a/fuzzers/016-clbnoutmux/generate.tcl +++ b/fuzzers/016-clbnoutmux/generate.tcl @@ -8,7 +8,7 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] + add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/fuzzers/017-clbprecyinit/generate.tcl b/fuzzers/017-clbprecyinit/generate.tcl index 9e981032..d5464fdb 100644 --- a/fuzzers/017-clbprecyinit/generate.tcl +++ b/fuzzers/017-clbprecyinit/generate.tcl @@ -8,7 +8,7 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] + add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/fuzzers/018-clbram/generate.tcl b/fuzzers/018-clbram/generate.tcl index 9e981032..d5464fdb 100644 --- a/fuzzers/018-clbram/generate.tcl +++ b/fuzzers/018-clbram/generate.tcl @@ -8,7 +8,7 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] + add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/fuzzers/019-ndi1mux/generate.tcl b/fuzzers/019-ndi1mux/generate.tcl index 9e981032..d5464fdb 100644 --- a/fuzzers/019-ndi1mux/generate.tcl +++ b/fuzzers/019-ndi1mux/generate.tcl @@ -8,7 +8,7 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] + add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/fuzzers/101-bram-config/generate.tcl b/fuzzers/101-bram-config/generate.tcl index 86162f92..91a4313e 100644 --- a/fuzzers/101-bram-config/generate.tcl +++ b/fuzzers/101-bram-config/generate.tcl @@ -8,7 +8,7 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] + add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/fuzzers/101-bram-config/minitest/runme.tcl b/fuzzers/101-bram-config/minitest/runme.tcl index 6aa1f9eb..83db6f9b 100644 --- a/fuzzers/101-bram-config/minitest/runme.tcl +++ b/fuzzers/101-bram-config/minitest/runme.tcl @@ -9,7 +9,7 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] + add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/fuzzers/102-bram-data/generate.tcl b/fuzzers/102-bram-data/generate.tcl index 86162f92..b5af66ef 100644 --- a/fuzzers/102-bram-data/generate.tcl +++ b/fuzzers/102-bram-data/generate.tcl @@ -8,7 +8,6 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/minitests/clbconfigs/runme.tcl b/minitests/clbconfigs/runme.tcl index bd9b9f98..56203f86 100644 --- a/minitests/clbconfigs/runme.tcl +++ b/minitests/clbconfigs/runme.tcl @@ -9,7 +9,6 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/minitests/picorv32-v/runme.tcl b/minitests/picorv32-v/runme.tcl index 2ccd4ef7..e758cbf2 100644 --- a/minitests/picorv32-v/runme.tcl +++ b/minitests/picorv32-v/runme.tcl @@ -9,7 +9,6 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/minitests/picorv32-y/runme.tcl b/minitests/picorv32-y/runme.tcl index 9e178ba1..fa8a3ee9 100644 --- a/minitests/picorv32-y/runme.tcl +++ b/minitests/picorv32-y/runme.tcl @@ -15,7 +15,6 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)" diff --git a/minitests/util/runme.tcl b/minitests/util/runme.tcl index 8f7bd546..edb5fac2 100644 --- a/minitests/util/runme.tcl +++ b/minitests/util/runme.tcl @@ -8,7 +8,6 @@ set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_02) IOSTANDARD LVCMOS33" [get_po set_property -dict "PACKAGE_PIN $::env(XRAY_PIN_03) IOSTANDARD LVCMOS33" [get_ports do] create_pblock roi -set_property EXCLUDE_PLACEMENT 1 [get_pblocks roi] add_cells_to_pblock [get_pblocks roi] [get_cells roi] resize_pblock [get_pblocks roi] -add "$::env(XRAY_ROI)"