From 9f9c348bfdcce935ad8efbc2ea125cf8f6cbee7d Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Sun, 24 Dec 2017 19:39:23 +0100
Subject: [PATCH] Add roi_tiles TCL helper function, remove XRAY_HCLK_[LR]

Signed-off-by: Clifford Wolf <clifford@clifford.at>
---
 database/artix7/settings.sh       | 2 --
 database/kintex7/settings.sh      | 2 --
 fuzzers/058-hclkpips/generate.tcl | 4 ++--
 fuzzers/070-tileconn/generate.tcl | 8 +++-----
 utils/utils.tcl                   | 7 +++++++
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/database/artix7/settings.sh b/database/artix7/settings.sh
index 5979e1d0..faa263b9 100644
--- a/database/artix7/settings.sh
+++ b/database/artix7/settings.sh
@@ -13,7 +13,5 @@ export XRAY_PIN_03="D21"
 export XRAY_PIN_04="G21"
 export XRAY_PIN_05="G22"
 export XRAY_PIN_06="F21"
-export XRAY_HCLK_L="HCLK_L_X36Y130"
-export XRAY_HCLK_R="HCLK_R_X37Y130"
 
 source $(dirname ${BASH_SOURCE[0]})/../../utils/environment.sh
diff --git a/database/kintex7/settings.sh b/database/kintex7/settings.sh
index 7422040f..b4632b78 100644
--- a/database/kintex7/settings.sh
+++ b/database/kintex7/settings.sh
@@ -14,7 +14,5 @@ export XRAY_PIN_03="L25"
 export XRAY_PIN_04="M19"
 export XRAY_PIN_05="M20"
 export XRAY_PIN_06="M21"
-export XRAY_HCLK_L="HCLK_L_X25Y78"
-export XRAY_HCLK_R="HCLK_R_X26Y78"
 
 source $(dirname ${BASH_SOURCE[0]})/../../utils/environment.sh
diff --git a/fuzzers/058-hclkpips/generate.tcl b/fuzzers/058-hclkpips/generate.tcl
index 5ccc35af..52987fe6 100644
--- a/fuzzers/058-hclkpips/generate.tcl
+++ b/fuzzers/058-hclkpips/generate.tcl
@@ -21,8 +21,8 @@ write_checkpoint -force design.dcp
 
 source ../../../utils/utils.tcl
 
-if [regexp "_001$" [pwd]] {set tile [get_tiles $::env(XRAY_HCLK_L)]}
-if [regexp "_002$" [pwd]] {set tile [get_tiles $::env(XRAY_HCLK_R)]}
+if [regexp "_001$" [pwd]] {set tile [lindex [filter [roi_tiles] {TILE_TYPE == HCLK_L}] 0]}
+if [regexp "_002$" [pwd]] {set tile [lindex [filter [roi_tiles] {TILE_TYPE == HCLK_R}] 0]}
 
 set net [get_nets o_OBUF]
 set pips [get_pips -of_objects $tile]
diff --git a/fuzzers/070-tileconn/generate.tcl b/fuzzers/070-tileconn/generate.tcl
index 630da9a8..9075dfe4 100644
--- a/fuzzers/070-tileconn/generate.tcl
+++ b/fuzzers/070-tileconn/generate.tcl
@@ -20,6 +20,8 @@ route_design
 write_checkpoint -force design.dcp
 # write_bitstream -force design.bit
 
+source ../../../utils/utils.tcl
+
 proc print_tile_pair {fp t1 t2} {
 	set t1 [get_tiles $t1]
 	set t2 [get_tiles $t2]
@@ -47,11 +49,7 @@ proc print_tile_pair {fp t1 t2} {
 	}
 }
 
-set tiles [get_tiles -filter "GRID_POINT_X >= $::env(XRAY_ROI_GRID_X1) && \
-		GRID_POINT_X < $::env(XRAY_ROI_GRID_X2) && \
-		GRID_POINT_Y >= $::env(XRAY_ROI_GRID_Y1) && \
-		GRID_POINT_Y < $::env(XRAY_ROI_GRID_Y2)"]
-
+set tiles [roi_tiles]
 set horz_cache [dict create]
 set vert_cache [dict create]
 
diff --git a/utils/utils.tcl b/utils/utils.tcl
index d0714af2..85315063 100644
--- a/utils/utils.tcl
+++ b/utils/utils.tcl
@@ -55,6 +55,13 @@ proc randplace_pblock {num pblock} {
 	}
 }
 
+proc roi_tiles {} {
+	return [get_tiles -filter "GRID_POINT_X >= $::env(XRAY_ROI_GRID_X1) && \
+			GRID_POINT_X < $::env(XRAY_ROI_GRID_X2) && \
+			GRID_POINT_Y >= $::env(XRAY_ROI_GRID_Y1) && \
+			GRID_POINT_Y < $::env(XRAY_ROI_GRID_Y2)"]
+}
+
 proc pblock_tiles {pblock} {
 	set clb_tiles [get_tiles -of_objects [get_sites -of_objects [get_pblocks $pblock]]]
 	set int_tiles [get_tiles [regsub -all {CLBL[LM]} $clb_tiles INT]]