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

zynq: 034-cmt-pll-pips: Remove Zynq specific workarounds 

Signed-off-by: Tomasz Michalak <tmichalak@antmicro.com>
This commit is contained in:
Tomasz Michalak 2019-12-24 11:01:50 +01:00 committed by Alessandro Comodi
parent 4e7185e348
commit ecab15cd39
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fuzzers/034-cmt-pll-pips/Makefile
View File

@ -3,13 +3,9 @@ PIP_TYPE?=cmt_top
PIPLIST_TCL=$(FUZDIR)/cmt_top_upper_t.tcl
TODO_RE=".*CMT_TOP_[LR]_UPPER_T_PLLE2_CLK(IN1|IN2|FBIN)\.CMT_TOP_[LR]"
ifneq (${XRAY_DATABASE}, zynq7)
MAKETODO_FLAGS=--sides "r_upper_t,l_upper_t" --pip-type ${PIP_TYPE} --seg-type cmt_top --re $(TODO_RE)
else
MAKETODO_FLAGS=--sides "l_upper_t" --pip-type ${PIP_TYPE} --seg-type cmt_top --re $(TODO_RE)
endif
N = 100
N = 200
SEGMATCH_FLAGS=-m 10 -M 20 -c 170
A_PIPLIST=cmt_top_l_upper_t.txt
@ -22,53 +18,41 @@ build/segbits_cmt_top_l_upper_t.rdb: $(SPECIMENS_OK)
RDBS = build/segbits_cmt_top_l_upper_t.rdb
ifneq (${XRAY_DATABASE}, zynq7)
# Target Zynq7 part has no CMT_TOP_R_UPPER_T
build/segbits_cmt_top_r_upper_t.rdb: $(SPECIMENS_OK)
${XRAY_SEGMATCH} ${SEGMATCH_FLAGS} -o build/segbits_cmt_top_r_upper_t.rdb \
$(shell find build -name segdata_cmt_top_r_upper_t.txt)
RDBS += build/segbits_cmt_top_r_upper_t.rdb
endif
database: ${RDBS}
python3 ${FUZDIR}/fixup_and_group.py -g tag_groups.txt \
-i build/segbits_cmt_top_l_upper_t.rdb \
-o build/segbits_cmt_top_l_upper_t.db
ifneq (${XRAY_DATABASE}, zynq7)
python3 ${FUZDIR}/fixup_and_group.py -g tag_groups.txt \
-i build/segbits_cmt_top_r_upper_t.rdb \
-o build/segbits_cmt_top_r_upper_t.db
endif
# Keep a copy to track iter progress
cp build/segbits_cmt_top_l_upper_t.rdb build/$(ITER)/segbits_cmt_top_l_upper_t.rdb
cp build/segbits_cmt_top_l_upper_t.db build/$(ITER)/segbits_cmt_top_l_upper_t.db
ifneq (${XRAY_DATABASE}, zynq7)
cp build/segbits_cmt_top_r_upper_t.rdb build/$(ITER)/segbits_cmt_top_r_upper_t.rdb
cp build/segbits_cmt_top_r_upper_t.db build/$(ITER)/segbits_cmt_top_r_upper_t.db
endif
${XRAY_MASKMERGE} build/mask_cmt_top_l_upper_t.db \
$(shell find build -name segdata_cmt_top_l_upper_t.txt)
ifneq (${XRAY_DATABASE}, zynq7)
${XRAY_MASKMERGE} build/mask_cmt_top_r_upper_t.db \
$(shell find build -name segdata_cmt_top_r_upper_t.txt)
endif
# 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} cmt_top_l_upper_t build/segbits_cmt_top_l_upper_t.db
ifneq (${XRAY_DATABASE}, zynq7)
XRAY_DATABASE_DIR=${FUZDIR}/build/database ${XRAY_MERGEDB} cmt_top_r_upper_t build/segbits_cmt_top_r_upper_t.db
endif
pushdb: database
${XRAY_MERGEDB} cmt_top_l_upper_t build/segbits_cmt_top_l_upper_t.db
ifneq (${XRAY_DATABASE}, zynq7)
${XRAY_MERGEDB} cmt_top_r_upper_t build/segbits_cmt_top_r_upper_t.db
endif
.PHONY: database pushdb

11
fuzzers/034-cmt-pll-pips/generate.py
View File

@ -22,15 +22,8 @@ def main():
ppipdata = {}
ignpip = set()
# Zynq7 do not have R CMTs
if os.getenv("XRAY_DATABASE") == "zynq7":
piplists = ['cmt_top_l_upper_t.txt']
ppiplists = ['ppips_cmt_top_l_upper_t.db']
else:
piplists = ['cmt_top_l_upper_t.txt', 'cmt_top_r_upper_t.txt']
ppiplists = [
'ppips_cmt_top_l_upper_t.db', 'ppips_cmt_top_r_upper_t.db'
]
piplists = ['cmt_top_l_upper_t.txt', 'cmt_top_r_upper_t.txt']
ppiplists = ['ppips_cmt_top_l_upper_t.db', 'ppips_cmt_top_r_upper_t.db']
# Load PIP lists
print("Loading PIP lists...")