Fixup tilegrid

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>

fuzzers/002-tilegrid/clem_int/Makefile

diff --git a/fuzzers/002-tilegrid/clem_int/Makefile b/fuzzers/002-tilegrid/clem_int/Makefile
index ff60046..56ffadb 100644
--- a/fuzzers/002-tilegrid/clem_int/Makefile
+++ b/fuzzers/002-tilegrid/clem_int/Makefile
@@ -1,4 +1,4 @@
-N ?= 10
-GENERATE_ARGS?=--oneval 0 --design params.csv --dword 1 --dframe 03 --filter_word 46,46
+N ?= 15
+GENERATE_ARGS?=--oneval 0 --design params.csv --dword 1 --dframe 03 --filter_word 45,46
 include ../fuzzaddr/common.mk
 

fuzzers/002-tilegrid/clem_int/generate.tcl

diff --git a/fuzzers/002-tilegrid/clem_int/generate.tcl b/fuzzers/002-tilegrid/clem_int/generate.tcl
index ce5f59f..57188f7 100644
--- a/fuzzers/002-tilegrid/clem_int/generate.tcl
+++ b/fuzzers/002-tilegrid/clem_int/generate.tcl
@@ -7,8 +7,11 @@
 
     set_property BITSTREAM.GENERAL.PERFRAMECRC YES [current_design]
 
-    set_property BEL A6LUT [get_cells -filter "REF_NAME == LUT6"]
-    set_property IS_BEL_FIXED 1 [get_cells -filter "REF_NAME == LUT6"]
+    set_property BEL C6LUT [get_cells lutc_* -filter "REF_NAME == LUT6"]
+    set_property IS_BEL_FIXED 1 [get_cells lutc_* -filter "REF_NAME == LUT6"]
+
+    set_property BEL D6LUT [get_cells lutd_* -filter "REF_NAME == LUT6"]
+    set_property IS_BEL_FIXED 1 [get_cells lutd_* -filter "REF_NAME == LUT6"]
 
     place_design -directive Quick
     route_design -directive Quick

fuzzers/002-tilegrid/clem_int/top.py

diff --git a/fuzzers/002-tilegrid/clem_int/top.py b/fuzzers/002-tilegrid/clem_int/top.py
index 7887a7b..17e93de 100644
--- a/fuzzers/002-tilegrid/clem_int/top.py
+++ b/fuzzers/002-tilegrid/clem_int/top.py
@@ -29,6 +29,11 @@
             if not int_tile_name.startswith('INT_'):
                 continue
 
+            if int_tile_name.endswith('Y31') or \
+                int_tile_name.endswith('Y91') or \
+                int_tile_name.endswith('Y151'):
+                continue
+
             yield int_tile_name, site_name
 
 
@@ -53,17 +58,27 @@
 
         print(
             '''
-            (* KEEP, DONT_TOUCH, LOC = "{loc}", LOCK_PINS="I0:A1 I1:A2 I2:A3 I3:A4 I4:A5 I5:A6" *)
+            (* KEEP, DONT_TOUCH, LOC = "{loc}", LOCK_PINS="I0:A1, I1:A2, I2:A3, I3:A4, I4:A5, I5:A6" *)
             wire loop_{loc};
-            LUT6 #(.INIT(64'hFFFFFFFFFFFFFFFF) ) luta_{loc} (
+            LUT6 #(.INIT(64'hFFFFFFFFFFFFFFFF) ) lutc_{loc} (
                 .I0(1),
                 .I1(1),
-                .I2(loop_{loc}),
+                .I2(1),
                 .I3({loop}),
-                .I4(1),
+                .I4(loop_{loc}),
                 .I5(1),
                 .O(loop_{loc})
                 );
+
+            (* KEEP, DONT_TOUCH, LOC = "{loc}", LOCK_PINS="I0:A1, I1:A2, I2:A3, I3:A4, I4:A5, I5:A6" *)
+            LUT6 #(.INIT(64'hFFFFFFFFFFFFFFFF) ) lutd_{loc} (
+                .I0(1),
+                .I1(1),
+                .I2(1),
+                .I3(loop_{loc}),
+                .I4(loop_{loc}),
+                .I5(1)
+                );
 '''.format(loc=site_name, loop=1 if isone else ('loop_' + site_name)))
 
     print("endmodule")

fuzzers/002-tilegrid/fuzzaddr/generate.py

diff --git a/fuzzers/002-tilegrid/fuzzaddr/generate.py b/fuzzers/002-tilegrid/fuzzaddr/generate.py
index 4837cf1..a9e0edd 100644
--- a/fuzzers/002-tilegrid/fuzzaddr/generate.py
+++ b/fuzzers/002-tilegrid/fuzzaddr/generate.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 from utils import bitsmaker
-import sys
 
 
 def run(
@@ -85,7 +84,6 @@
     filter_words = None
     if args.filter_words is not None:
         filter_words = list(map(int, args.filter_words.split(',')))
-        print(filter_words, args.filter_words, file=sys.stderr)
 
     run(
         args.bits_file,