From bcd299fd35602d382743c8cca95e4eee72740a4b Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 24 Oct 2018 17:57:06 -0700 Subject: [PATCH] 102-bram-data: move products to build dir Signed-off-by: John McMaster --- fuzzers/102-bram-data/.gitignore | 3 +-- fuzzers/102-bram-data/Makefile | 15 +++++++++------ fuzzers/102-bram-data/generate.sh | 7 ++++--- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/fuzzers/102-bram-data/.gitignore b/fuzzers/102-bram-data/.gitignore index 932efba0..378eac25 100644 --- a/fuzzers/102-bram-data/.gitignore +++ b/fuzzers/102-bram-data/.gitignore @@ -1,2 +1 @@ -/specimen_[0-9][0-9][0-9]/ -/seg_clbl[lm].segbits +build diff --git a/fuzzers/102-bram-data/Makefile b/fuzzers/102-bram-data/Makefile index fd6c01c9..a44cb6de 100644 --- a/fuzzers/102-bram-data/Makefile +++ b/fuzzers/102-bram-data/Makefile @@ -1,20 +1,23 @@ N := 8 -SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) +SPECIMENS := $(addprefix build/specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -o seg_bramx.block_ram.segbits $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -o build/seg_bramx.block_ram.segbits $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS)) pushdb: - ${XRAY_MERGEDB} bram_l.block_ram seg_bramx.block_ram.segbits - ${XRAY_MERGEDB} bram_r.block_ram seg_bramx.block_ram.segbits + ${XRAY_MERGEDB} bram_l.block_ram build/seg_bramx.block_ram.segbits + ${XRAY_MERGEDB} bram_r.block_ram build/seg_bramx.block_ram.segbits -$(SPECIMENS_OK): +build: + mkdir build + +$(SPECIMENS_OK): build bash generate.sh $(subst /OK,,$@) touch $@ clean: - rm -rf specimen_[0-9][0-9][0-9]/ seg_*.segbits vivado*.log vivado_*.str vivado*.jou design *.bits *.dcp *.bit top.v + rm -rf build .PHONY: database pushdb clean diff --git a/fuzzers/102-bram-data/generate.sh b/fuzzers/102-bram-data/generate.sh index 955c41b6..0ca0c994 100644 --- a/fuzzers/102-bram-data/generate.sh +++ b/fuzzers/102-bram-data/generate.sh @@ -2,15 +2,16 @@ set -ex +FUZDIR=$PWD source ${XRAY_GENHEADER} -python3 ../top.py >top.v -vivado -mode batch -source ../generate.tcl +python3 $FUZDIR/top.py >top.v +vivado -mode batch -source $FUZDIR/generate.tcl test -z "$(fgrep CRITICAL vivado.log)" for x in design*.bit; do ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x done -python3 ../generate.py +python3 $FUZDIR/generate.py