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

Merge pull request #281 from mcmasterg/tilegrid_iob_fix 

tilegrid misc IOB fixes
This commit is contained in:
John McMaster 2018-12-04 21:08:50 -08:00 committed by GitHub
parent 78fa4bd56e 15c62ba3a0
commit 6b8bfabf86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database/artix7/settings.sh
View File

@ -9,7 +9,7 @@ export XRAY_ROI_TILEGRID="SLICE_X0Y0:SLICE_X65Y99 SLICE_X0Y100:SLICE_X57Y149 RAM
# These settings must remain in sync
export XRAY_ROI="SLICE_X0Y100:SLICE_X35Y149 RAMB18_X0Y40:RAMB18_X0Y59 RAMB36_X0Y20:RAMB36_X0Y29 DSP48_X0Y40:DSP48_X0Y59 IOB_X0Y100:IOB_X0Y149"
# Most of CMT X0Y2.
export XRAY_ROI_GRID_X1="9"
export XRAY_ROI_GRID_X1="0"
export XRAY_ROI_GRID_X2="58"
# Include VBRK / VTERM
export XRAY_ROI_GRID_Y1="0"

6
fuzzers/005-tilegrid/Makefile
View File

@ -11,7 +11,6 @@ pushdb:
build/tiles/tiles.txt:
bash generate.sh build/tiles tiles
# TODO: only generate tiles
build/tilegrid_basic.json: generate.py build/tiles/tiles.txt
cd build && python3 ${FUZDIR}/generate.py --tiles $(FUZDIR)/build/tiles/tiles.txt --out ${BUILD_DIR}/tilegrid_basic.json
@ -24,9 +23,10 @@ build/bram/deltas:
build/iob/deltas:
bash generate.sh build/iob iob
# TODO: only generate addresses
build/tilegrid.json: generate_full.py build/tilegrid_basic.json build/clb/deltas build/bram/deltas build/iob/deltas
cd build && python3 ${FUZDIR}/generate_full.py --json-in tilegrid_basic.json --json-out ${BUILD_DIR}/tilegrid.json --tiles $(FUZDIR)/build/tiles/tiles.txt */design_*.delta
cd build && python3 ${FUZDIR}/generate_full.py \
--json-in tilegrid_basic.json --json-out ${BUILD_DIR}/tilegrid.json \
--tiles $(FUZDIR)/build/tiles/tiles.txt */design_*.delta
run:
$(MAKE) clean

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

@ -273,6 +273,13 @@ def get_inttile(database, segment):
if database[tile]["type"] in ["INT_L", "INT_R"])
def get_iobtile(database, segment):
'''Return IOB tile for given segment'''
return (
tile for tile in segment["tiles"]
if database[tile]["type"] in ["LIOB33_SING", "LIOB33"])
def get_bramtile(database, segment):
inttiles = [
tile for tile in segment["tiles"]
@ -410,7 +417,8 @@ def seg_base_addr_up_INT(database, segments, tiles_by_grid, verbose=False):
Use it to locate in the grid, and find other segments related by tile offset
'''
for inttile in get_inttile(database, src_segment):
for inttile in list(get_inttile(database, src_segment)) + list(
get_iobtile(database, src_segment)):
verbose and print(
' up_INT CLK_IO_CLK: %s => inttile %s' %
(src_segment_name, inttile),

2
fuzzers/005-tilegrid/top.v
View File

@ -18,7 +18,7 @@ module top(input clk, stb, [DIN_N-1:0] di, output do);
wire [DIN_N-1:0] di_buf;
genvar i;
generate
for (i = 0; i < `N_LUT; i = i+1) begin:di_bufs
for (i = 0; i < `N_DI; i = i+1) begin:di_bufs
IBUF ibuf(.I(di[i]), .O(di_buf[i]));
end
endgenerate