From ab23cd1d3ca75a64751e012c48740c37e75bdb9f Mon Sep 17 00:00:00 2001
From: Keith Rothman <537074+litghost@users.noreply.github.com>
Date: Mon, 29 Oct 2018 11:01:27 -0700
Subject: [PATCH] Larger ROI.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
---
 database/artix7/settings.sh      | 6 +++---
 fuzzers/005-tilegrid/generate.py | 3 ++-
 minitests/roi_harness/runme.sh   | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/database/artix7/settings.sh b/database/artix7/settings.sh
index f7c335e0..3c7d196e 100644
--- a/database/artix7/settings.sh
+++ b/database/artix7/settings.sh
@@ -3,9 +3,9 @@ export XRAY_PART="xc7a50tfgg484-1"
 export XRAY_ROI_FRAMES="0x00000000:0xffffffff"
 
 # Leave some CLBs to the left to allow easy ROI entering
-export XRAY_ROI="SLICE_X8Y100:SLICE_X27Y149 RAMB18_X0Y40:RAMB18_X0Y59 RAMB36_X0Y20:RAMB36_X0Y29 DSP48_X0Y40:DSP48_X0Y59"
-export XRAY_ROI_GRID_X1="18"
-export XRAY_ROI_GRID_X2="47"
+export XRAY_ROI="SLICE_X5Y100:SLICE_X33Y149 RAMB18_X0Y40:RAMB18_X0Y59 RAMB36_X0Y20:RAMB36_X0Y29 DSP48_X0Y40:DSP48_X0Y59"
+export XRAY_ROI_GRID_X1="14"
+export XRAY_ROI_GRID_X2="55"
 export XRAY_ROI_GRID_Y1="0"
 export XRAY_ROI_GRID_Y2="52"
 
diff --git a/fuzzers/005-tilegrid/generate.py b/fuzzers/005-tilegrid/generate.py
index 77ab5a50..cec476c4 100644
--- a/fuzzers/005-tilegrid/generate.py
+++ b/fuzzers/005-tilegrid/generate.py
@@ -312,7 +312,8 @@ def seg_base_addr_lr_INT(database, segments, tiles_by_grid, verbose=False):
             else:
                 assert 0
 
-            assert "segment" in database[tile]
+            if 'segment' not in database[tile]:
+                continue
 
             seg = database[tile]["segment"]
 
diff --git a/minitests/roi_harness/runme.sh b/minitests/roi_harness/runme.sh
index 8ec24515..1d5795f5 100755
--- a/minitests/roi_harness/runme.sh
+++ b/minitests/roi_harness/runme.sh
@@ -36,7 +36,8 @@ else
     export PITCH=3
     export DIN_N=8
     export DOUT_N=8
-    export XRAY_ROI=SLICE_X12Y100:SLICE_X27Y149
+    export XRAY_ROI=SLICE_X5Y100:SLICE_X33Y149
+    #export XRAY_ROI=SLICE_X12Y100:SLICE_X27Y149
     #export XRAY_ROI=SLICE_X12Y100:SLICE_X5Y149
 fi