From 0cca27fed1004c21df0e6ffecae018495e897de6 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Tue, 13 Nov 2018 13:26:45 -0800 Subject: [PATCH] tilegrid: use dedicated ROI var Signed-off-by: John McMaster --- database/artix7/settings.sh | 4 +++- database/kintex7/settings.sh | 5 ++++- fuzzers/005-tilegrid/generate.tcl | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/database/artix7/settings.sh b/database/artix7/settings.sh index 98984ea3..adf9b0be 100644 --- a/database/artix7/settings.sh +++ b/database/artix7/settings.sh @@ -3,8 +3,10 @@ export XRAY_PART="xc7a50tfgg484-1" export XRAY_ROI_FRAMES="0x00000000:0xffffffff" # All CLB's in part, all BRAM's in part, all DSP's in part. -export XRAY_ROI="SLICE_X0Y0:SLICE_X65Y99 SLICE_X0Y100:SLICE_X57Y149 RAMB18_X0Y0:RAMB18_X1Y59 RAMB36_X0Y0:RAMB36_X1Y29 RAMB18_X2Y0:RAMB18_X2Y39 RAMB36_X2Y0:RAMB36_X2Y19 DSP48_X0Y0:DSP48_X1Y59" +export XRAY_ROI_TILEGRID="SLICE_X0Y0:SLICE_X65Y99 SLICE_X0Y100:SLICE_X57Y149 RAMB18_X0Y0:RAMB18_X1Y59 RAMB36_X0Y0:RAMB36_X1Y29 RAMB18_X2Y0:RAMB18_X2Y39 RAMB36_X2Y0:RAMB36_X2Y19 DSP48_X0Y0:DSP48_X1Y59" +# These settings must remain in sync +export XRAY_ROI="SLICE_X0Y100:SLICE_X35Y149 RAMB18_X0Y40:RAMB18_X0Y59 RAMB36_X0Y20:RAMB36_X0Y29 DSP48_X0Y40:DSP48_X0Y59" # Most of CMT X0Y2. export XRAY_ROI_GRID_X1="9" export XRAY_ROI_GRID_X2="58" diff --git a/database/kintex7/settings.sh b/database/kintex7/settings.sh index 05952dbb..41af5f5e 100644 --- a/database/kintex7/settings.sh +++ b/database/kintex7/settings.sh @@ -2,8 +2,11 @@ export XRAY_DATABASE="kintex7" export XRAY_PART="xc7k70tfbg676-2" export XRAY_ROI_FRAMES="0x00000000:0xffffffff" -export XRAY_ROI="SLICE_X0Y50:SLICE_X19Y99 DSP48_X0Y20:DSP48_X0Y39 RAMB18_X0Y20:RAMB18_X0Y39 RAMB36_X0Y10:RAMB36_X0Y19" +# FIXME: make entire part +export XRAY_ROI_TILEGRID="SLICE_X0Y50:SLICE_X19Y99 DSP48_X0Y20:DSP48_X0Y39 RAMB18_X0Y20:RAMB18_X0Y39 RAMB36_X0Y10:RAMB36_X0Y19" +# These settings must remain in sync +export XRAY_ROI="SLICE_X0Y50:SLICE_X19Y99 DSP48_X0Y20:DSP48_X0Y39 RAMB18_X0Y20:RAMB18_X0Y39 RAMB36_X0Y10:RAMB36_X0Y19" # Part of CMT X0Y1 export XRAY_ROI_GRID_X1="9" export XRAY_ROI_GRID_X2="38" diff --git a/fuzzers/005-tilegrid/generate.tcl b/fuzzers/005-tilegrid/generate.tcl index 67eab8b9..7677b14a 100644 --- a/fuzzers/005-tilegrid/generate.tcl +++ b/fuzzers/005-tilegrid/generate.tcl @@ -11,7 +11,7 @@ proc make_project {} { create_pblock roi add_cells_to_pblock [get_pblocks roi] [get_cells roi] - foreach roi "$::env(XRAY_ROI)" { + foreach roi "$::env(XRAY_ROI_TILEGRID)" { puts "ROI: $roi" resize_pblock [get_pblocks roi] -add "$roi" }