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

dbfixup: patch local files instead of central db 

Signed-off-by: John McMaster <johndmcmaster@gmail.com>
This commit is contained in:
John McMaster 2018-11-06 19:09:24 -08:00
parent 6814b4cf51
commit b6ba7e96a6
22 changed files with 56 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fuzzers/015-clbnffmux/.gitignore vendored
View File

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

28
fuzzers/015-clbnffmux/Makefile
View File

@ -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
${XRAY_DBFIXUP} --clb-int
$(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

15
fuzzers/015-clbnffmux/generate.sh
View File

@ -2,18 +2,5 @@
set -ex
if [ $(vivado -h |grep Vivado |cut -d\ -f 2) != "v2017.2" ] ; then echo "FIXME: requires Vivado 2017.2. See https://github.com/SymbiFlow/prjxray/issues/14"; exit 1; fi
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

7
fuzzers/016-clbnoutmux/.gitignore vendored
View File

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

28
fuzzers/016-clbnoutmux/Makefile
View File

@ -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
${XRAY_DBFIXUP} --clb-int
$(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]/ *.segbits vivado*.log vivado_*.str vivado*.jou design *.bits *.dcp *.bit top.v run.ok
.PHONY: database pushdb run clean
include ../clb.mk

15
fuzzers/016-clbnoutmux/generate.sh
View File

@ -2,18 +2,5 @@
set -ex
if [ $(vivado -h |grep Vivado |cut -d\ -f 2) != "v2017.2" ] ; then echo "FIXME: requires Vivado 2017.2. See https://github.com/SymbiFlow/prjxray/issues/14"; exit 1; fi
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

7
fuzzers/017-clbprecyinit/.gitignore vendored
View File

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

28
fuzzers/017-clbprecyinit/Makefile
View File

@ -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
${XRAY_DBFIXUP} --clb-int
$(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

15
fuzzers/017-clbprecyinit/generate.sh
View File

@ -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

2
fuzzers/025-bram-config/Makefile
View File

@ -14,7 +14,7 @@ build:
mkdir build
$(SPECIMENS_OK): build
bash generate.sh $(subst /OK,,$@)
bash ${XRAY_DIR}/utils/top_generate.sh $(subst /OK,,$@)
touch $@
run:

2
fuzzers/050-intpips/Makefile
View File

@ -12,13 +12,13 @@ database: $(SPECIMENS_OK)
${XRAY_MASKMERGE} mask_clblm_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db-dir . --clb-int
${XRAY_MERGEDB} int_l seg_int_l.segbits
${XRAY_MERGEDB} int_r seg_int_r.segbits
${XRAY_MERGEDB} mask_clbll_l mask_clbll_l.segbits
${XRAY_MERGEDB} mask_clbll_r mask_clbll_r.segbits
${XRAY_MERGEDB} mask_clblm_l mask_clblm_l.segbits
${XRAY_MERGEDB} mask_clblm_r mask_clblm_r.segbits
${XRAY_DBFIXUP} --clb-int
$(SPECIMENS_OK):
bash generate.sh $(subst /OK,,$@)

2
fuzzers/051-imuxlout/Makefile
View File

@ -8,9 +8,9 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db-dir . --clb-int
${XRAY_MERGEDB} int_l seg_int_l.segbits
${XRAY_MERGEDB} int_r seg_int_r.segbits
${XRAY_DBFIXUP} --clb-int
$(SPECIMENS_OK): todo.txt
bash generate.sh $(subst /OK,,$@)

2
fuzzers/052-clkin/Makefile
View File

@ -8,9 +8,9 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db-dir . --clb-int
${XRAY_MERGEDB} int_l seg_int_l.segbits
${XRAY_MERGEDB} int_r seg_int_r.segbits
${XRAY_DBFIXUP} --clb-int
$(SPECIMENS_OK): todo.txt
bash generate.sh $(subst /OK,,$@)

2
fuzzers/053-ctrlin/Makefile
View File

@ -8,9 +8,9 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db-dir . --clb-int
${XRAY_MERGEDB} int_l seg_int_l.segbits
${XRAY_MERGEDB} int_r seg_int_r.segbits
${XRAY_DBFIXUP} --clb-int
$(SPECIMENS_OK): todo.txt
bash generate.sh $(subst /OK,,$@)

2
fuzzers/054-gfan/Makefile
View File

@ -8,9 +8,9 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db-dir . --clb-int
${XRAY_MERGEDB} int_l seg_int_l.segbits
${XRAY_MERGEDB} int_r seg_int_r.segbits
${XRAY_DBFIXUP} --clb-int
$(SPECIMENS_OK): todo.txt
bash generate.sh $(subst /OK,,$@)

2
fuzzers/055-gnd/Makefile
View File

@ -8,9 +8,9 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db-dir . --clb-int
${XRAY_MERGEDB} int_l seg_int_l.segbits
${XRAY_MERGEDB} int_r seg_int_r.segbits
${XRAY_DBFIXUP} --clb-int
$(SPECIMENS_OK): todo.txt
bash generate.sh $(subst /OK,,$@)

2
fuzzers/056-rempips/Makefile
View File

@ -8,9 +8,9 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db-dir . --clb-int
${XRAY_MERGEDB} int_l seg_int_l.segbits
${XRAY_MERGEDB} int_r seg_int_r.segbits
${XRAY_DBFIXUP} --clb-int
$(SPECIMENS_OK): todo.txt
bash generate.sh $(subst /OK,,$@)

2
fuzzers/057-bipips/Makefile
View File

@ -8,9 +8,9 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db-dir . --clb-int
${XRAY_MERGEDB} int_l seg_int_l.segbits
${XRAY_MERGEDB} int_r seg_int_r.segbits
${XRAY_DBFIXUP} --clb-int
$(SPECIMENS_OK): todo.txt
bash generate.sh $(subst /OK,,$@)

2
fuzzers/058-hclkpips/Makefile
View File

@ -12,13 +12,13 @@ database: $(SPECIMENS_OK)
grep CK_INOUT seg_hclk_r.segbits | sed 's, .*, always,' > ppips_hclk_r.txt
pushdb:
${XRAY_DBFIXUP} --db-dir . --clb-int
${XRAY_MERGEDB} hclk_l seg_hclk_l.segbits
${XRAY_MERGEDB} hclk_r seg_hclk_r.segbits
${XRAY_MERGEDB} mask_hclk_l mask_hclk_l.segbits
${XRAY_MERGEDB} mask_hclk_r mask_hclk_r.segbits
cp ppips_hclk_l.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_hclk_l.db
cp ppips_hclk_r.txt ${XRAY_DATABASE_DIR}/$(XRAY_DATABASE)/ppips_hclk_r.db
${XRAY_DBFIXUP} --clb-int
$(SPECIMENS_OK):
bash generate.sh $(subst /OK,,$@)

2
fuzzers/100-dsp-mskpat/Makefile
View File

@ -8,9 +8,9 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -o seg_dsp_r.segbits $(addsuffix /segdata_dsp_r_*.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db-dir . --clb-int
${XRAY_MERGEDB} dsp_l seg_dsp_l.segbits
${XRAY_MERGEDB} dsp_r seg_dsp_r.segbits
${XRAY_DBFIXUP} --clb-int
$(SPECIMENS_OK):
bash generate.sh $(subst /OK,,$@)

32
fuzzers/clb.mk Normal file
View File

@ -0,0 +1,32 @@
N := 1
SPECIMENS := $(addprefix build/specimen_,$(shell seq -f '%03.0f' $(N)))
SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -o build/seg_clblx.segbits $(addsuffix /segdata_clbl[lm]_[lr].txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db-dir build --clb-int
${XRAY_MERGEDB} clbll_l build/seg_clblx.segbits
${XRAY_MERGEDB} clbll_r build/seg_clblx.segbits
${XRAY_MERGEDB} clblm_l build/seg_clblx.segbits
${XRAY_MERGEDB} clblm_r build/seg_clblx.segbits
build:
mkdir build
$(SPECIMENS_OK): build
bash generate.sh $(subst /OK,,$@)
touch $@
run:
$(MAKE) clean
$(MAKE) database
$(MAKE) pushdb
touch run.ok
clean:
rm -rf build
.PHONY: database pushdb run clean

3
fuzzers/025-bram-config/generate.sh → utils/top_generate.sh
View File

@ -1,11 +1,12 @@
#!/bin/bash
# Generic generate.sh for scripts that use top.py to generate top.v
# and then use generate.py for segment generation
set -ex
FUZDIR=$PWD
source ${XRAY_GENHEADER}
python3 $FUZDIR/top.py >top.v
vivado -mode batch -source $FUZDIR/generate.tcl
test -z "$(fgrep CRITICAL vivado.log)"