diff --git a/fuzzers/042-clk-bufg-config/top.py b/fuzzers/042-clk-bufg-config/top.py index 0100a156..f26b75f9 100644 --- a/fuzzers/042-clk-bufg-config/top.py +++ b/fuzzers/042-clk-bufg-config/top.py @@ -1,18 +1,13 @@ import json import os -import re import random random.seed(int(os.getenv("SEED"), 16)) from prjxray import util -from prjxray import verilog from prjxray.db import Database -XY_RE = re.compile('^BUFGCTRL_X([0-9]+)Y([0-9]+)$') - def gen_sites(): - db = Database(util.get_db_root()) - grid = db.grid() + xy_fun = util.create_xy_fun('BUFGCTRL_') db = Database(util.get_db_root()) grid = db.grid() for tile_name in sorted(grid.tiles()): @@ -24,10 +19,7 @@ def gen_sites(): ys = [] for site, site_type in gridinfo.sites.items(): if site_type == 'BUFGCTRL': - m = re.match(XY_RE, site) - assert m, site - x = int(m.group(1)) - y = int(m.group(2)) + x, y = xy_fun() xs.append(x) ys.append(y)