From b211908e26ade93cfe5b71848bd321740fcee25e Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Fri, 13 Dec 2019 13:42:57 +0100 Subject: [PATCH] zynq: fuzzers: Remove Zynq specific workarounds Signed-off-by: Alessandro Comodi --- fuzzers/000-init-db/Makefile | 2 -- fuzzers/005-tilegrid/add_tdb.py | 7 ------- fuzzers/005-tilegrid/ps7_int/top.py | 4 ++-- fuzzers/030-iob/Makefile | 2 -- fuzzers/045-hclk-cmt-pips/Makefile | 11 ----------- 5 files changed, 2 insertions(+), 24 deletions(-) diff --git a/fuzzers/000-init-db/Makefile b/fuzzers/000-init-db/Makefile index 60975cb2..169e8368 100644 --- a/fuzzers/000-init-db/Makefile +++ b/fuzzers/000-init-db/Makefile @@ -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 \ diff --git a/fuzzers/005-tilegrid/add_tdb.py b/fuzzers/005-tilegrid/add_tdb.py index 2a9cc340..61403894 100644 --- a/fuzzers/005-tilegrid/add_tdb.py +++ b/fuzzers/005-tilegrid/add_tdb.py @@ -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:] diff --git a/fuzzers/005-tilegrid/ps7_int/top.py b/fuzzers/005-tilegrid/ps7_int/top.py index faca8cb9..4d69683c 100644 --- a/fuzzers/005-tilegrid/ps7_int/top.py +++ b/fuzzers/005-tilegrid/ps7_int/top.py @@ -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 *) diff --git a/fuzzers/030-iob/Makefile b/fuzzers/030-iob/Makefile index 2b558806..bb17e295 100644 --- a/fuzzers/030-iob/Makefile +++ b/fuzzers/030-iob/Makefile @@ -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 diff --git a/fuzzers/045-hclk-cmt-pips/Makefile b/fuzzers/045-hclk-cmt-pips/Makefile index ed81a4ba..949d0a55 100644 --- a/fuzzers/045-hclk-cmt-pips/Makefile +++ b/fuzzers/045-hclk-cmt-pips/Makefile @@ -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