002-tilegrid: clb: Add base address calculation for clb tiles

Signed-off-by: Tomasz Michalak <tmichalak@antmicro.com>

fuzzers/002-tilegrid/clb/Makefile

diff --git a/fuzzers/002-tilegrid/clb/Makefile b/fuzzers/002-tilegrid/clb/Makefile
index 5731045..1c7dc87 100644
--- a/fuzzers/002-tilegrid/clb/Makefile
+++ b/fuzzers/002-tilegrid/clb/Makefile
@@ -1,4 +1,4 @@
-N ?= 10
-GENERATE_ARGS?=--oneval 1 --design params.csv --dword 0 --dframe 0
+N ?= 50
+GENERATE_ARGS?=--oneval 1 --design params.csv --dword 0 --dframe 0C
 include ../fuzzaddr/common.mk
 

fuzzers/002-tilegrid/clb/top.py

diff --git a/fuzzers/002-tilegrid/clb/top.py b/fuzzers/002-tilegrid/clb/top.py
index faf7e3e..a7f0b9a 100644
--- a/fuzzers/002-tilegrid/clb/top.py
+++ b/fuzzers/002-tilegrid/clb/top.py
@@ -48,6 +48,7 @@
     assign do = dout_shr[DOUT_N-1];
     ''')
 
+    carry_params = ("SINGLE_CY8", "DUAL_CY4")
     params = {}
 
     sites = list(gen_sites())
@@ -58,9 +59,9 @@
         print(
             '''
             (* KEEP, DONT_TOUCH, LOC = "%s" *)
-            CARRY8 carry8_%s (
-                    .CI(%u));
-''' % (site_name, site_name, isone))
+            CARRY8 #(.CARRY_TYPE("%s") ) carry8_%s (
+                    .CI(0));
+''' % (site_name, carry_params[isone], site_name))
 
     print("endmodule")
     write_params(params)

fuzzers/002-tilegrid/util.py

diff --git a/fuzzers/002-tilegrid/util.py b/fuzzers/002-tilegrid/util.py
index 303b290..6aaa4fd 100644
--- a/fuzzers/002-tilegrid/util.py
+++ b/fuzzers/002-tilegrid/util.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from prjxray import util
+from utils import util
 '''
 Local utils script to hold shared code of the 005-tilegrid fuzzer scripts
 '''