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

tilegrid: optional int propagation for artix/kintex 

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
This commit is contained in:
Alessandro Comodi 2019-01-15 11:16:01 +01:00
parent 73d77396c0
commit 458b6b3677
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuzzers/005-tilegrid/Makefile
View File

@ -1,9 +1,11 @@
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
GENERATE_FULL_ARGS=
ifeq (${XRAY_DATABASE}, zynq7) ifeq (${XRAY_DATABASE}, zynq7)
TILEGRID_TDB_DEPENDENCIES += ps7_int/build/segbits_tilegrid.tdb TILEGRID_TDB_DEPENDENCIES += ps7_int/build/segbits_tilegrid.tdb
GENERATE_FULL_ARGS += --int-tdb $(FUZDIR)/ps7_int/build/segbits_tilegrid.tdb
endif endif
database: build/tilegrid.json database: build/tilegrid.json
@ -49,9 +51,7 @@ monitor/build/segbits_tilegrid.tdb: build/basicdb/tilegrid.json
build/tilegrid.json: generate_full.py build/tilegrid_tdb.json build/clb/deltas build/bram/deltas build/tilegrid.json: generate_full.py build/tilegrid_tdb.json build/clb/deltas build/bram/deltas
cd build && python3 ${FUZDIR}/generate_full.py \ cd build && python3 ${FUZDIR}/generate_full.py \
--json-in tilegrid_tdb.json --json-out ${BUILD_DIR}/tilegrid.json \ --json-in tilegrid_tdb.json --json-out ${BUILD_DIR}/tilegrid.json \
--tiles $(FUZDIR)/build/tiles/tiles.txt clb/design_*.delta bram/design_*.delta \ --tiles $(FUZDIR)/build/tiles/tiles.txt clb/design_*.delta bram/design_*.delta ${GENERATE_FULL_ARGS}
--int-tdb $(FUZDIR)/ps7_int/build/segbits_tilegrid.tdb
run: run:
$(MAKE) clean $(MAKE) clean
$(MAKE) database $(MAKE) database

8
fuzzers/005-tilegrid/generate_full.py
View File

@ -551,7 +551,7 @@ def db_int_fixup(database, tiles, tiles_by_grid):
tile_name, tile, baseaddr, offset, frames, words, height) tile_name, tile, baseaddr, offset, frames, words, height)
def run(json_in_fn, json_out_fn, tiles_fn, deltas_fns, int_tdb, verbose=False): def run(json_in_fn, json_out_fn, tiles_fn, deltas_fns, int_tdb=None, verbose=False):
# Load input files # Load input files
tiles = load_tiles(tiles_fn) tiles = load_tiles(tiles_fn)
site_baseaddr = load_baseaddrs(deltas_fns) site_baseaddr = load_baseaddrs(deltas_fns)
@ -570,8 +570,9 @@ def run(json_in_fn, json_out_fn, tiles_fn, deltas_fns, int_tdb, verbose=False):
db_add_bits(database, segments) db_add_bits(database, segments)
db_add_segments(database, segments) db_add_segments(database, segments)
tile_baseaddrs_fixup = load_tdb_baseaddr(database, int_tdb) if int_tdb is not None:
db_int_fixup(database, tile_baseaddrs_fixup, tiles_by_grid) tile_baseaddrs_fixup = load_tdb_baseaddr(database, int_tdb)
db_int_fixup(database, tile_baseaddrs_fixup, tiles_by_grid)
# Save # Save
json.dump( json.dump(
@ -602,6 +603,7 @@ def main():
"deltas", nargs="*", help=".bit diffs to create base addresses from") "deltas", nargs="*", help=".bit diffs to create base addresses from")
parser.add_argument( parser.add_argument(
"--int-tdb", "--int-tdb",
default=None,
help=".tdb diffs to fill the interconnects without any adjacent CLB") help=".tdb diffs to fill the interconnects without any adjacent CLB")
args = parser.parse_args() args = parser.parse_args()