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

fuzzers: consolidate build scripts, move products to build dir 

Signed-off-by: John McMaster <johndmcmaster@gmail.com>
This commit is contained in:
John McMaster 2018-11-07 10:10:01 -08:00
parent b6ba7e96a6
commit 912460e4b6
18 changed files with 31 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuzzers/010-lutinit/Makefile
View File

@ -1,3 +1,5 @@
# NOt using clb.mk: 0-2 segmatch
# Could probably change segmatch to re though
N := 1 N := 1
SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N)))

13
fuzzers/011-ffconfig/.gitignore vendored
View File

@ -1,11 +1,2 @@
/.Xil build
/design/
/design.bit
/design.bits
/design.dcp
/usage_statistics_webtalk.*
/vivado*
/specimen_*
/__pycache__/
/*.segbits
/run.ok

28
fuzzers/011-ffconfig/Makefile
View File

@ -1,29 +1,3 @@
N := 1 N := 1
SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) include ../clb.mk
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

14
fuzzers/011-ffconfig/generate.sh
View File

@ -1,17 +1,5 @@
#!/bin/bash #!/bin/bash
set -ex set -ex
source ${XRAY_DIR}/utils/top_generate.sh
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

7
fuzzers/012-clbn5ffmux/.gitignore vendored
View File

@ -1,5 +1,2 @@
/specimen_*/ build
/*.segbits
/vivado.log
/vivado.jou
/run.ok

27
fuzzers/012-clbn5ffmux/Makefile
View File

@ -1,28 +1,3 @@
N := 1 N := 1
SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) include ../clb.mk
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

4
fuzzers/013-clbncy0/.gitignore vendored
View File

@ -1,3 +1 @@
/specimen_*/ build
/*.segbits
/run.ok

27
fuzzers/013-clbncy0/Makefile
View File

@ -1,28 +1,3 @@
N := 1 N := 1
SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) include ../clb.mk
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

15
fuzzers/013-clbncy0/generate.sh
View File

@ -1,18 +1,5 @@
#!/bin/bash #!/bin/bash
set -ex set -ex
source ${XRAY_DIR}/utils/top_generate.sh
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

11
fuzzers/014-ffsrcemux/.gitignore vendored
View File

@ -1,10 +1 @@
/.Xil build
/design/
/design.bit
/design.bits
/design.dcp
/usage_statistics_webtalk.*
/vivado*
/specimen_*
/*.segbits
/run.ok

27
fuzzers/014-ffsrcemux/Makefile
View File

@ -1,28 +1,3 @@
N := 1 N := 1
SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) include ../clb.mk
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

14
fuzzers/014-ffsrcemux/generate.sh
View File

@ -1,17 +1,5 @@
#!/bin/bash #!/bin/bash
set -ex set -ex
source ${XRAY_DIR}/utils/top_generate.sh
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

5
fuzzers/018-clbram/.gitignore vendored
View File

@ -1,4 +1 @@
/specimen_*/ build
/*.segbits
/vivado.log
/vivado.jou

27
fuzzers/018-clbram/Makefile
View File

@ -1,28 +1,3 @@
N := 1 N := 1
SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) include ../clb.mk
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

15
fuzzers/018-clbram/generate.sh
View File

@ -1,18 +1,5 @@
#!/bin/bash #!/bin/bash
set -ex set -ex
source ${XRAY_DIR}/utils/top_generate.sh
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

5
fuzzers/019-ndi1mux/.gitignore vendored
View File

@ -1,4 +1 @@
/specimen_*/ build
/*.segbits
/vivado.log
/vivado.jou

17
fuzzers/019-ndi1mux/Makefile
View File

@ -1,15 +1,20 @@
# clb.mk clblm only
N := 1 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)) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
database: $(SPECIMENS_OK) 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: pushdb:
${XRAY_MERGEDB} clblm_l seg_clblx.segbits ${XRAY_MERGEDB} clblm_l build/seg_clblx.segbits
${XRAY_MERGEDB} clblm_r seg_clblx.segbits ${XRAY_MERGEDB} clblm_r build/seg_clblx.segbits
$(SPECIMENS_OK): build:
mkdir build
$(SPECIMENS_OK): build
bash generate.sh $(subst /OK,,$@) bash generate.sh $(subst /OK,,$@)
touch $@ touch $@
@ -20,7 +25,7 @@ run:
touch run.ok touch run.ok
clean: 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 .PHONY: database pushdb run clean

15
fuzzers/019-ndi1mux/generate.sh
View File

@ -1,18 +1,5 @@
#!/bin/bash #!/bin/bash
set -ex set -ex
source ${XRAY_DIR}/utils/top_generate.sh
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