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

045-hclk-cmt-pips: account for hclk_cmt tiles missing from zynq7 and re-enable fuzzer 

Signed-off-by: Tomasz Michalak <tmichalak@antmicro.com>
This commit is contained in:
Tomasz Michalak 2019-04-25 09:00:29 +02:00
parent 27bba88fc8
commit 845a8914b3
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,46 +19,63 @@ 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)
build/segbits_hclk_cmt.db: build/segbits_hclk_cmt.rdb
${XRAY_DBFIXUP} --db-root build --zero-db bits.dbf \
--seg-fn-in build/segbits_hclk_cmt.rdb \
--seg-fn-out build/segbits_hclk_cmt.db
# Keep a copy to track iter progress
cp build/segbits_hclk_cmt.rdb build/$(ITER)/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 \
$(shell find build -name segdata_hclk_cmt_l.txt)
database: build/segbits_hclk_cmt.rdb build/segbits_hclk_cmt_l.rdb
${XRAY_DBFIXUP} --db-root build --zero-db bits.dbf \
--seg-fn-in build/segbits_hclk_cmt.rdb \
--seg-fn-out build/segbits_hclk_cmt.db
build/segbits_hclk_cmt_l.db: build/segbits_hclk_cmt_l.rdb
${XRAY_DBFIXUP} --db-root build --zero-db bits.dbf \
--seg-fn-in build/segbits_hclk_cmt_l.rdb \
--seg-fn-out build/segbits_hclk_cmt_l.db
# Keep a copy to track iter progress
cp build/segbits_hclk_cmt.rdb build/$(ITER)/segbits_hclk_cmt.rdb
cp build/segbits_hclk_cmt_l.rdb build/$(ITER)/segbits_hclk_cmt_l.rdb
${XRAY_MASKMERGE} build/mask_hclk_cmt.db \
$(shell find build -name segdata_hclk_cmt.txt)
${XRAY_MASKMERGE} build/mask_hclk_cmt_l.db \
$(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} hclk_cmt_l build/segbits_hclk_cmt_l.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
.PHONY: database pushdb

3
fuzzers/Makefile
View File

@ -88,8 +88,7 @@ $(eval $(call fuzzer,040-clk-hrow-config,005-tilegrid))
$(eval $(call fuzzer,042-clk-bufg-config,005-tilegrid))
$(eval $(call fuzzer,043-clk-rebuf-pips,005-tilegrid))
$(eval $(call fuzzer,044-clk-bufg-pips,005-tilegrid))
#Disable fuzzer failing for zynq (issue #790)
#$(eval $(call fuzzer,045-hclk-cmt-pips,005-tilegrid))
$(eval $(call fuzzer,045-hclk-cmt-pips,005-tilegrid))
$(eval $(call fuzzer,048-int-piplist,005-tilegrid))
$(eval $(call fuzzer,049-int-imux-gfan,048-int-piplist))
$(eval $(call fuzzer,050-pip-seed,048-int-piplist))