From 1fe4d34b0853f4f152250a7e81371867ed446ee4 Mon Sep 17 00:00:00 2001
From: Hans Baier <hansfbaier@gmail.com>
Date: Fri, 13 Jan 2023 03:39:58 +0000
Subject: [PATCH] fixes and debug prints

---
 fuzzers/005-tilegrid/Makefile         | 2 +-
 fuzzers/005-tilegrid/add_tdb.py       | 3 ++-
 fuzzers/005-tilegrid/iob18_int/top.py | 4 ++--
 utils/update_resources.py             | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fuzzers/005-tilegrid/Makefile b/fuzzers/005-tilegrid/Makefile
index f9323fad..70915773 100644
--- a/fuzzers/005-tilegrid/Makefile
+++ b/fuzzers/005-tilegrid/Makefile
@@ -73,7 +73,7 @@ TILEGRID_TDB_DEPENDENCIES += ioi18/$(BUILD_FOLDER)/segbits_tilegrid.tdb
 endif
 
 # These kintex parts give an empty design
-ifneq (${XRAY_FABRIC}, $(filter ${XRAY_FABRIC}, xc7k160t xc7k325t xc7k480t))
+ifneq (${XRAY_FABRIC}, $(filter ${XRAY_FABRIC}, xc7k160t xc7k325t xc7k480t xc7vx415t))
 TILEGRID_TDB_DEPENDENCIES += orphan_int_column/$(BUILD_FOLDER)/segbits_tilegrid.tdb
 endif
 
diff --git a/fuzzers/005-tilegrid/add_tdb.py b/fuzzers/005-tilegrid/add_tdb.py
index e483f770..47e64c34 100644
--- a/fuzzers/005-tilegrid/add_tdb.py
+++ b/fuzzers/005-tilegrid/add_tdb.py
@@ -40,6 +40,7 @@ def parse_addr(line, only_frame=False, get_base_frame=False):
 
 
 def load_db(fn):
+    print("===> opening file " + fn)
     for l in open(fn, "r"):
         l = l.strip()
         # FIXME: add offset to name
@@ -79,7 +80,7 @@ def load_db(fn):
         if not bitidx_up:
             bitidx = 0
         assert bitidx == 0, l
-        assert frame % 0x80 == 0, "Unaligned frame at 0x%08X" % frame
+        assert frame % 0x80 == 0, "Unaligned frame at 0x%08X in tile %s" % (frame, tile)
         yield (tile, frame, wordidx)
 
 
diff --git a/fuzzers/005-tilegrid/iob18_int/top.py b/fuzzers/005-tilegrid/iob18_int/top.py
index 5cb360ba..e0b3c644 100644
--- a/fuzzers/005-tilegrid/iob18_int/top.py
+++ b/fuzzers/005-tilegrid/iob18_int/top.py
@@ -50,11 +50,11 @@ def gen_sites():
         sites, _ = zip(*sorted(zip(sites, sites_y), key=lambda x: x[1]))
 
         if gridinfo.tile_type[0] == 'L':
-            int_grid_x = loc.grid_x + 3
+            int_grid_x = loc.grid_x + 2
             pad_grid_x = loc.grid_x - 1
             int_tile_type = 'INT_L'
         else:
-            int_grid_x = loc.grid_x - 3
+            int_grid_x = loc.grid_x - 2
             pad_grid_x = loc.grid_x + 1
             int_tile_type = 'INT_R'
 
diff --git a/utils/update_resources.py b/utils/update_resources.py
index c813eaa7..99e02b0f 100755
--- a/utils/update_resources.py
+++ b/utils/update_resources.py
@@ -71,6 +71,7 @@ def main():
 
         clk_pins = pins_json["clk_pins"].split()
         data_pins = pins_json["data_pins"].split()
+        print("pins json: ", str(pins_json))
         pins = {
             0: clk_pins[0],
             1: data_pins[0],