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

zynq: fuzzers: Remove Zynq specific workarounds 

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
This commit is contained in:
Alessandro Comodi 2019-12-13 13:42:57 +01:00
parent 65090d18f6
commit b211908e26
5 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuzzers/000-init-db/Makefile
View File

@ -43,9 +43,7 @@ DB_SIMPLE=\
segbits_riob33 \
segbits_hclk_ioi3 \
ifneq (${XRAY_DATABASE}, zynq7)
DB_SIMPLE += segbits_lioi3 segbits_liob33
endif
BLOCK_RAM_EXTRA_FOR=\
mask_bram \

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

@ -4,8 +4,6 @@ import json
import util as localutil
import os.path
ZERO_CANDIDATES = '<0 candidates>'
def check_frames(tagstr, addrlist):
frames = set()
@ -36,11 +34,6 @@ def load_db(fn):
l = l.strip()
# FIXME: add offset to name
# IOB_X0Y101.DFRAME:27.DWORD:3.DBIT:3 00020027_003_03
# Skip <0 candidates> frames. This happens with unbounded IOBs
if ZERO_CANDIDATES in l:
continue
parts = l.split(' ')
tagstr = parts[0]
addrlist = parts[1:]

4
fuzzers/005-tilegrid/ps7_int/top.py
View File

@ -39,9 +39,9 @@ module top(input clk, stb, di, output do);
params = {}
# NOTE: The INT_L tile has been hardcoded and it works only for the part specified in the assertion
assert os.getenv('XRAY_PART') == "xc7z010clg400-1"
assert os.getenv('XRAY_PART') == "xc7z020clg484-1"
for isone in util.gen_fuzz_states(1):
params['INT_L_X0Y50'] = isone
params['INT_L_X18Y100'] = isone
print(
'''
(* KEEP, DONT_TOUCH *)

2
fuzzers/030-iob/Makefile
View File

@ -23,10 +23,8 @@ build/segbits_hclk_ioi3.db: build/segbits_hclk_ioi3.rdb
${XRAY_DBFIXUP} --db-root build --zero-db hclk_bits.dbf --seg-fn-in build/segbits_hclk_ioi3.rdb --seg-fn-out $@
pushdb:
ifneq (${XRAY_DATABASE}, zynq7)
${XRAY_MERGEDB} liob33 build/segbits_xiob33.db
${XRAY_MERGEDB} mask_liob33 build/mask_xiob33.db
endif
${XRAY_MERGEDB} riob33 build/segbits_xiob33.db
${XRAY_MERGEDB} mask_riob33 build/mask_xiob33.db

11
fuzzers/045-hclk-cmt-pips/Makefile
View File

@ -19,7 +19,6 @@ A_PIPLIST=hclk_cmt.txt
include ../pip_loop.mk
ifneq (${XRAY_DATABASE}, zynq7)
build/segbits_hclk_cmt.rdb: $(SPECIMENS_OK)
${XRAY_SEGMATCH} ${SEGMATCH_FLAGS} -o build/segbits_hclk_cmt.rdb \
$(shell find build -name segdata_hclk_cmt.txt)
@ -34,7 +33,6 @@ build/segbits_hclk_cmt.db: build/segbits_hclk_cmt.rdb
${XRAY_MASKMERGE} build/mask_hclk_cmt.db \
$(shell find build -name segdata_hclk_cmt.txt)
endif
build/segbits_hclk_cmt_l.rdb: $(SPECIMENS_OK)
${XRAY_SEGMATCH} ${SEGMATCH_FLAGS} -o build/segbits_hclk_cmt_l.rdb \
@ -53,28 +51,19 @@ build/segbits_hclk_cmt_l.db: build/segbits_hclk_cmt_l.rdb
$(shell find build -name segdata_hclk_cmt_l.txt)
ifneq (${XRAY_DATABASE}, zynq7)
database: build/segbits_hclk_cmt.db build/segbits_hclk_cmt_l.db
# Clobber existing .db to eliminate potential conflicts
cp ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits*.db build/database/${XRAY_DATABASE}
XRAY_DATABASE_DIR=${FUZDIR}/build/database ${XRAY_MERGEDB} hclk_cmt build/segbits_hclk_cmt.db
XRAY_DATABASE_DIR=${FUZDIR}/build/database ${XRAY_MERGEDB} hclk_cmt_l build/segbits_hclk_cmt_l.db
else
database: build/segbits_hclk_cmt_l.db
# Clobber existing .db to eliminate potential conflicts
cp ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits*.db build/database/${XRAY_DATABASE}
XRAY_DATABASE_DIR=${FUZDIR}/build/database ${XRAY_MERGEDB} hclk_cmt_l build/segbits_hclk_cmt_l.db
endif
build/cmt_regions.csv: output_cmt.tcl
mkdir -p build
cd build/ && ${XRAY_VIVADO} -mode batch -source ${FUZDIR}/output_cmt.tcl
pushdb: database
ifneq (${XRAY_DATABASE}, zynq7)
${XRAY_MERGEDB} hclk_cmt build/segbits_hclk_cmt.db
${XRAY_MERGEDB} mask_hclk_cmt build/mask_hclk_cmt.db
endif
${XRAY_MERGEDB} hclk_cmt_l build/segbits_hclk_cmt_l.db
${XRAY_MERGEDB} mask_hclk_cmt_l build/mask_hclk_cmt_l.db