luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add monitor bits to tilegrid. 

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2019-01-24 13:44:00 -08:00
parent 48b39c8c4e
commit 8cbac3ee7a
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fuzzers/005-tilegrid/Makefile
View File

@ -1,6 +1,6 @@
FUZDIR=$(shell pwd) FUZDIR=$(shell pwd)
BUILD_DIR=$(FUZDIR)/build BUILD_DIR=$(FUZDIR)/build
TILEGRID_TDB_DEPENDENCIES=iob/build/segbits_tilegrid.tdb mmcm/build/segbits_tilegrid.tdb pll/build/segbits_tilegrid.tdb TILEGRID_TDB_DEPENDENCIES=iob/build/segbits_tilegrid.tdb mmcm/build/segbits_tilegrid.tdb pll/build/segbits_tilegrid.tdb monitor/build/segbits_tilegrid.tdb
GENERATE_FULL_ARGS= GENERATE_FULL_ARGS=
ifeq (${XRAY_DATABASE}, zynq7) ifeq (${XRAY_DATABASE}, zynq7)
@ -10,7 +10,7 @@ endif
database: build/tilegrid.json database: build/tilegrid.json
pushdb: pushdb: build/tilegrid.json
cp build/tilegrid.json ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/tilegrid.json cp build/tilegrid.json ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/tilegrid.json
build/tiles/tiles.txt: build/tiles/tiles.txt:
@ -44,7 +44,6 @@ pll/build/segbits_tilegrid.tdb: build/basicdb/tilegrid.json
ps7_int/build/segbits_tilegrid.tdb: build/basicdb/tilegrid.json ps7_int/build/segbits_tilegrid.tdb: build/basicdb/tilegrid.json
cd ps7_int && $(MAKE) cd ps7_int && $(MAKE)
# FIXME: add monitor to ROI
monitor/build/segbits_tilegrid.tdb: build/basicdb/tilegrid.json monitor/build/segbits_tilegrid.tdb: build/basicdb/tilegrid.json
cd monitor && $(MAKE) cd monitor && $(MAKE)

6
fuzzers/005-tilegrid/add_tdb.py
View File

@ -57,13 +57,9 @@ def run(fn_in, fn_out, verbose=False):
("mmcm/build/segbits_tilegrid.tdb", 30, 101), ("mmcm/build/segbits_tilegrid.tdb", 30, 101),
# FIXME: height # FIXME: height
("pll/build/segbits_tilegrid.tdb", 30, 101), ("pll/build/segbits_tilegrid.tdb", 30, 101),
("monitor/build/segbits_tilegrid.tdb", 30, 101),
] ]
# FIXME: support XADC in ROI
if os.path.exists("monitor/build/segbits_tilegrid.tdb"):
# FIXME: height
tdb_fns.append(("monitor/build/segbits_tilegrid.tdb", 30, 101))
for (tdb_fn, frames, words) in tdb_fns: for (tdb_fn, frames, words) in tdb_fns:
for (tile, frame, wordidx) in load_db(tdb_fn): for (tile, frame, wordidx) in load_db(tdb_fn):
tilej = database[tile] tilej = database[tile]

14
fuzzers/005-tilegrid/monitor/top.py
View File

@ -2,13 +2,19 @@ import os
import random import random
random.seed(int(os.getenv("SEED"), 16)) random.seed(int(os.getenv("SEED"), 16))
from prjxray import util from prjxray import util
from prjxray import verilog from prjxray.db import Database
def gen_sites(): def gen_sites():
# yield ("MONITOR_BOT_X46Y79", "XADC_X0Y0") db = Database(util.get_db_root())
for tile_name, site_name, _site_type in util.get_roi().gen_sites(['XADC']): grid = db.grid()
yield tile_name, site_name for tile_name in grid.tiles():
loc = grid.loc_of_tilename(tile_name)
gridinfo = grid.gridinfo_at_loc(loc)
for site_name, site_type in gridinfo.sites.items():
if site_type in ['XADC']:
yield tile_name, site_name
def write_params(params): def write_params(params):