From 912460e4b69055d64884a336eff6d005ca6326da Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 7 Nov 2018 10:10:01 -0800 Subject: [PATCH] fuzzers: consolidate build scripts, move products to build dir Signed-off-by: John McMaster --- fuzzers/010-lutinit/Makefile | 2 ++ fuzzers/011-ffconfig/.gitignore | 13 ++----------- fuzzers/011-ffconfig/Makefile | 28 +--------------------------- fuzzers/011-ffconfig/generate.sh | 14 +------------- fuzzers/012-clbn5ffmux/.gitignore | 7 ++----- fuzzers/012-clbn5ffmux/Makefile | 27 +-------------------------- fuzzers/013-clbncy0/.gitignore | 4 +--- fuzzers/013-clbncy0/Makefile | 27 +-------------------------- fuzzers/013-clbncy0/generate.sh | 15 +-------------- fuzzers/014-ffsrcemux/.gitignore | 11 +---------- fuzzers/014-ffsrcemux/Makefile | 27 +-------------------------- fuzzers/014-ffsrcemux/generate.sh | 14 +------------- fuzzers/018-clbram/.gitignore | 5 +---- fuzzers/018-clbram/Makefile | 27 +-------------------------- fuzzers/018-clbram/generate.sh | 15 +-------------- fuzzers/019-ndi1mux/.gitignore | 5 +---- fuzzers/019-ndi1mux/Makefile | 17 +++++++++++------ fuzzers/019-ndi1mux/generate.sh | 15 +-------------- 18 files changed, 31 insertions(+), 242 deletions(-) diff --git a/fuzzers/010-lutinit/Makefile b/fuzzers/010-lutinit/Makefile index 7ef252ff..7be45338 100644 --- a/fuzzers/010-lutinit/Makefile +++ b/fuzzers/010-lutinit/Makefile @@ -1,3 +1,5 @@ +# NOt using clb.mk: 0-2 segmatch +# Could probably change segmatch to re though N := 1 SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) diff --git a/fuzzers/011-ffconfig/.gitignore b/fuzzers/011-ffconfig/.gitignore index 5996573c..9ef96044 100644 --- a/fuzzers/011-ffconfig/.gitignore +++ b/fuzzers/011-ffconfig/.gitignore @@ -1,11 +1,2 @@ -/.Xil -/design/ -/design.bit -/design.bits -/design.dcp -/usage_statistics_webtalk.* -/vivado* -/specimen_* -/__pycache__/ -/*.segbits -/run.ok +build + diff --git a/fuzzers/011-ffconfig/Makefile b/fuzzers/011-ffconfig/Makefile index cf669fbf..f5f5a631 100644 --- a/fuzzers/011-ffconfig/Makefile +++ b/fuzzers/011-ffconfig/Makefile @@ -1,29 +1,3 @@ N := 1 -SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) -SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) - -database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -o seg_clblx.segbits $(addsuffix /segdata_clbl[lm]_[lr].txt,$(SPECIMENS)) - -pushdb: - ${XRAY_MERGEDB} clbll_l seg_clblx.segbits - ${XRAY_MERGEDB} clbll_r seg_clblx.segbits - ${XRAY_MERGEDB} clblm_l seg_clblx.segbits - ${XRAY_MERGEDB} clblm_r seg_clblx.segbits - -$(SPECIMENS_OK): - bash generate.sh $(subst /OK,,$@) - touch $@ - -run: - $(MAKE) clean - $(MAKE) database - $(MAKE) pushdb - touch run.ok - -clean: - rm -rf specimen_[0-9][0-9][0-9]/ seg_clblx.segbits __pycache__ run.ok - rm -rf vivado*.log vivado_*.str vivado*.jou design *.bits *.dcp *.bit top.v - -.PHONY: database pushdb run clean +include ../clb.mk diff --git a/fuzzers/011-ffconfig/generate.sh b/fuzzers/011-ffconfig/generate.sh index e6a8b5ba..f42f840c 100644 --- a/fuzzers/011-ffconfig/generate.sh +++ b/fuzzers/011-ffconfig/generate.sh @@ -1,17 +1,5 @@ #!/bin/bash set -ex - -source ${XRAY_GENHEADER} - -#echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh - -python3 ../top.py >top.v -vivado -mode batch -source ../generate.tcl - -for x in design*.bit; do - ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x -done - -python3 ../generate.py +source ${XRAY_DIR}/utils/top_generate.sh diff --git a/fuzzers/012-clbn5ffmux/.gitignore b/fuzzers/012-clbn5ffmux/.gitignore index 93a7f16a..9ef96044 100644 --- a/fuzzers/012-clbn5ffmux/.gitignore +++ b/fuzzers/012-clbn5ffmux/.gitignore @@ -1,5 +1,2 @@ -/specimen_*/ -/*.segbits -/vivado.log -/vivado.jou -/run.ok +build + diff --git a/fuzzers/012-clbn5ffmux/Makefile b/fuzzers/012-clbn5ffmux/Makefile index 1a7faa6e..f5f5a631 100644 --- a/fuzzers/012-clbn5ffmux/Makefile +++ b/fuzzers/012-clbn5ffmux/Makefile @@ -1,28 +1,3 @@ N := 1 -SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) -SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) - -database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -o seg_clblx.segbits $(addsuffix /segdata_clbl[lm]_[lr].txt,$(SPECIMENS)) - -pushdb: - ${XRAY_MERGEDB} clbll_l seg_clblx.segbits - ${XRAY_MERGEDB} clbll_r seg_clblx.segbits - ${XRAY_MERGEDB} clblm_l seg_clblx.segbits - ${XRAY_MERGEDB} clblm_r seg_clblx.segbits - -$(SPECIMENS_OK): - bash generate.sh $(subst /OK,,$@) - touch $@ - -run: - $(MAKE) clean - $(MAKE) database - $(MAKE) pushdb - touch run.ok - -clean: - rm -rf specimen_[0-9][0-9][0-9]/ seg_clblx.segbits vivado*.log vivado_*.str vivado*.jou design *.bits *.dcp *.bit top.v run.ok - -.PHONY: database pushdb run clean +include ../clb.mk diff --git a/fuzzers/013-clbncy0/.gitignore b/fuzzers/013-clbncy0/.gitignore index ba2275d5..378eac25 100644 --- a/fuzzers/013-clbncy0/.gitignore +++ b/fuzzers/013-clbncy0/.gitignore @@ -1,3 +1 @@ -/specimen_*/ -/*.segbits -/run.ok +build diff --git a/fuzzers/013-clbncy0/Makefile b/fuzzers/013-clbncy0/Makefile index 1a7faa6e..f5f5a631 100644 --- a/fuzzers/013-clbncy0/Makefile +++ b/fuzzers/013-clbncy0/Makefile @@ -1,28 +1,3 @@ N := 1 -SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) -SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) - -database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -o seg_clblx.segbits $(addsuffix /segdata_clbl[lm]_[lr].txt,$(SPECIMENS)) - -pushdb: - ${XRAY_MERGEDB} clbll_l seg_clblx.segbits - ${XRAY_MERGEDB} clbll_r seg_clblx.segbits - ${XRAY_MERGEDB} clblm_l seg_clblx.segbits - ${XRAY_MERGEDB} clblm_r seg_clblx.segbits - -$(SPECIMENS_OK): - bash generate.sh $(subst /OK,,$@) - touch $@ - -run: - $(MAKE) clean - $(MAKE) database - $(MAKE) pushdb - touch run.ok - -clean: - rm -rf specimen_[0-9][0-9][0-9]/ seg_clblx.segbits vivado*.log vivado_*.str vivado*.jou design *.bits *.dcp *.bit top.v run.ok - -.PHONY: database pushdb run clean +include ../clb.mk diff --git a/fuzzers/013-clbncy0/generate.sh b/fuzzers/013-clbncy0/generate.sh index 54774bf8..f42f840c 100644 --- a/fuzzers/013-clbncy0/generate.sh +++ b/fuzzers/013-clbncy0/generate.sh @@ -1,18 +1,5 @@ #!/bin/bash set -ex - -source ${XRAY_GENHEADER} - -#echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh - -python3 ../top.py >top.v -vivado -mode batch -source ../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 +source ${XRAY_DIR}/utils/top_generate.sh diff --git a/fuzzers/014-ffsrcemux/.gitignore b/fuzzers/014-ffsrcemux/.gitignore index 1f98dc9d..378eac25 100644 --- a/fuzzers/014-ffsrcemux/.gitignore +++ b/fuzzers/014-ffsrcemux/.gitignore @@ -1,10 +1 @@ -/.Xil -/design/ -/design.bit -/design.bits -/design.dcp -/usage_statistics_webtalk.* -/vivado* -/specimen_* -/*.segbits -/run.ok +build diff --git a/fuzzers/014-ffsrcemux/Makefile b/fuzzers/014-ffsrcemux/Makefile index 1a7faa6e..f5f5a631 100644 --- a/fuzzers/014-ffsrcemux/Makefile +++ b/fuzzers/014-ffsrcemux/Makefile @@ -1,28 +1,3 @@ N := 1 -SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) -SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) - -database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -o seg_clblx.segbits $(addsuffix /segdata_clbl[lm]_[lr].txt,$(SPECIMENS)) - -pushdb: - ${XRAY_MERGEDB} clbll_l seg_clblx.segbits - ${XRAY_MERGEDB} clbll_r seg_clblx.segbits - ${XRAY_MERGEDB} clblm_l seg_clblx.segbits - ${XRAY_MERGEDB} clblm_r seg_clblx.segbits - -$(SPECIMENS_OK): - bash generate.sh $(subst /OK,,$@) - touch $@ - -run: - $(MAKE) clean - $(MAKE) database - $(MAKE) pushdb - touch run.ok - -clean: - rm -rf specimen_[0-9][0-9][0-9]/ seg_clblx.segbits vivado*.log vivado_*.str vivado*.jou design *.bits *.dcp *.bit top.v run.ok - -.PHONY: database pushdb run clean +include ../clb.mk diff --git a/fuzzers/014-ffsrcemux/generate.sh b/fuzzers/014-ffsrcemux/generate.sh index e6a8b5ba..f42f840c 100644 --- a/fuzzers/014-ffsrcemux/generate.sh +++ b/fuzzers/014-ffsrcemux/generate.sh @@ -1,17 +1,5 @@ #!/bin/bash set -ex - -source ${XRAY_GENHEADER} - -#echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh - -python3 ../top.py >top.v -vivado -mode batch -source ../generate.tcl - -for x in design*.bit; do - ${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o ${x}s -z -y $x -done - -python3 ../generate.py +source ${XRAY_DIR}/utils/top_generate.sh diff --git a/fuzzers/018-clbram/.gitignore b/fuzzers/018-clbram/.gitignore index 93b5bef8..378eac25 100644 --- a/fuzzers/018-clbram/.gitignore +++ b/fuzzers/018-clbram/.gitignore @@ -1,4 +1 @@ -/specimen_*/ -/*.segbits -/vivado.log -/vivado.jou +build diff --git a/fuzzers/018-clbram/Makefile b/fuzzers/018-clbram/Makefile index 1a7faa6e..f5f5a631 100644 --- a/fuzzers/018-clbram/Makefile +++ b/fuzzers/018-clbram/Makefile @@ -1,28 +1,3 @@ N := 1 -SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) -SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) - -database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -o seg_clblx.segbits $(addsuffix /segdata_clbl[lm]_[lr].txt,$(SPECIMENS)) - -pushdb: - ${XRAY_MERGEDB} clbll_l seg_clblx.segbits - ${XRAY_MERGEDB} clbll_r seg_clblx.segbits - ${XRAY_MERGEDB} clblm_l seg_clblx.segbits - ${XRAY_MERGEDB} clblm_r seg_clblx.segbits - -$(SPECIMENS_OK): - bash generate.sh $(subst /OK,,$@) - touch $@ - -run: - $(MAKE) clean - $(MAKE) database - $(MAKE) pushdb - touch run.ok - -clean: - rm -rf specimen_[0-9][0-9][0-9]/ seg_clblx.segbits vivado*.log vivado_*.str vivado*.jou design *.bits *.dcp *.bit top.v run.ok - -.PHONY: database pushdb run clean +include ../clb.mk diff --git a/fuzzers/018-clbram/generate.sh b/fuzzers/018-clbram/generate.sh index 54774bf8..f42f840c 100644 --- a/fuzzers/018-clbram/generate.sh +++ b/fuzzers/018-clbram/generate.sh @@ -1,18 +1,5 @@ #!/bin/bash set -ex - -source ${XRAY_GENHEADER} - -#echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh - -python3 ../top.py >top.v -vivado -mode batch -source ../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 +source ${XRAY_DIR}/utils/top_generate.sh diff --git a/fuzzers/019-ndi1mux/.gitignore b/fuzzers/019-ndi1mux/.gitignore index 93b5bef8..378eac25 100644 --- a/fuzzers/019-ndi1mux/.gitignore +++ b/fuzzers/019-ndi1mux/.gitignore @@ -1,4 +1 @@ -/specimen_*/ -/*.segbits -/vivado.log -/vivado.jou +build diff --git a/fuzzers/019-ndi1mux/Makefile b/fuzzers/019-ndi1mux/Makefile index 5e13cafb..3bb3b58b 100644 --- a/fuzzers/019-ndi1mux/Makefile +++ b/fuzzers/019-ndi1mux/Makefile @@ -1,15 +1,20 @@ +# clb.mk clblm only + N := 1 -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_clblx.segbits $(addsuffix /segdata_clblm_[lr].txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -o build/seg_clblx.segbits $(addsuffix /segdata_clblm_[lr].txt,$(SPECIMENS)) pushdb: - ${XRAY_MERGEDB} clblm_l seg_clblx.segbits - ${XRAY_MERGEDB} clblm_r seg_clblx.segbits + ${XRAY_MERGEDB} clblm_l build/seg_clblx.segbits + ${XRAY_MERGEDB} clblm_r build/seg_clblx.segbits -$(SPECIMENS_OK): +build: + mkdir build + +$(SPECIMENS_OK): build bash generate.sh $(subst /OK,,$@) touch $@ @@ -20,7 +25,7 @@ run: touch run.ok clean: - rm -rf specimen_[0-9][0-9][0-9]/ seg_clblx.segbits vivado*.log vivado_*.str vivado*.jou design *.bits *.dcp *.bit top.v run.ok + rm -rf build .PHONY: database pushdb run clean diff --git a/fuzzers/019-ndi1mux/generate.sh b/fuzzers/019-ndi1mux/generate.sh index 54774bf8..f42f840c 100644 --- a/fuzzers/019-ndi1mux/generate.sh +++ b/fuzzers/019-ndi1mux/generate.sh @@ -1,18 +1,5 @@ #!/bin/bash set -ex - -source ${XRAY_GENHEADER} - -#echo '`define SEED 32'"'h$(echo $1 | md5sum | cut -c1-8)" > setseed.vh - -python3 ../top.py >top.v -vivado -mode batch -source ../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 +source ${XRAY_DIR}/utils/top_generate.sh