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

--db_root => --db-root 

Signed-off-by: John McMaster <johndmcmaster@gmail.com>
This commit is contained in:
John McMaster 2018-11-12 14:37:01 -08:00
parent a09946b7bc
commit 4516a00665
19 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ build/segbits_bramx.rdb: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -o build/segbits_bramx.rdb $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
build/segbits_bramx.db: build/segbits_bramx.rdb
${XRAY_DBFIXUP} --db_root build --zero-db bits.dbf --seg-fn-in $^ --seg-fn-out $@
${XRAY_DBFIXUP} --db-root build --zero-db bits.dbf --seg-fn-in $^ --seg-fn-out $@
pushdb:
${XRAY_MERGEDB} bram_l build/segbits_bramx.db

2
fuzzers/050-intpips/Makefile
View File

@ -12,7 +12,7 @@ database: $(SPECIMENS_OK)
${XRAY_MASKMERGE} mask_clblm_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db_root . --clb-int
${XRAY_DBFIXUP} --db-root . --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

2
fuzzers/051-imuxlout/Makefile
View File

@ -8,7 +8,7 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db_root . --clb-int
${XRAY_DBFIXUP} --db-root . --clb-int
${XRAY_MERGEDB} int_l seg_int_l.segbits
${XRAY_MERGEDB} int_r seg_int_r.segbits

2
fuzzers/052-clkin/Makefile
View File

@ -8,7 +8,7 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db_root . --clb-int
${XRAY_DBFIXUP} --db-root . --clb-int
${XRAY_MERGEDB} int_l seg_int_l.segbits
${XRAY_MERGEDB} int_r seg_int_r.segbits

2
fuzzers/053-ctrlin/Makefile
View File

@ -8,7 +8,7 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db_root . --clb-int
${XRAY_DBFIXUP} --db-root . --clb-int
${XRAY_MERGEDB} int_l seg_int_l.segbits
${XRAY_MERGEDB} int_r seg_int_r.segbits

2
fuzzers/054-gfan/Makefile
View File

@ -8,7 +8,7 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db_root . --clb-int
${XRAY_DBFIXUP} --db-root . --clb-int
${XRAY_MERGEDB} int_l seg_int_l.segbits
${XRAY_MERGEDB} int_r seg_int_r.segbits

2
fuzzers/055-gnd/Makefile
View File

@ -8,7 +8,7 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db_root . --clb-int
${XRAY_DBFIXUP} --db-root . --clb-int
${XRAY_MERGEDB} int_l seg_int_l.segbits
${XRAY_MERGEDB} int_r seg_int_r.segbits

2
fuzzers/056-rempips/Makefile
View File

@ -8,7 +8,7 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db_root . --clb-int
${XRAY_DBFIXUP} --db-root . --clb-int
${XRAY_MERGEDB} int_l seg_int_l.segbits
${XRAY_MERGEDB} int_r seg_int_r.segbits

2
fuzzers/057-bipips/Makefile
View File

@ -8,7 +8,7 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db_root . --clb-int
${XRAY_DBFIXUP} --db-root . --clb-int
${XRAY_MERGEDB} int_l seg_int_l.segbits
${XRAY_MERGEDB} int_r seg_int_r.segbits

2
fuzzers/058-hclkpips/Makefile
View File

@ -12,7 +12,7 @@ database: $(SPECIMENS_OK)
grep CK_INOUT seg_hclk_r.segbits | sed 's, .*, always,' > ppips_hclk_r.txt
pushdb:
${XRAY_DBFIXUP} --db_root . --clb-int
${XRAY_DBFIXUP} --db-root . --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

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

@ -8,7 +8,7 @@ database: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -o seg_dsp_r.segbits $(addsuffix /segdata_dsp_r_*.txt,$(SPECIMENS))
pushdb:
${XRAY_DBFIXUP} --db_root . --clb-int
${XRAY_DBFIXUP} --db-root . --clb-int
${XRAY_MERGEDB} dsp_l seg_dsp_l.segbits
${XRAY_MERGEDB} dsp_r seg_dsp_r.segbits

2
fuzzers/clb.mk
View File

@ -10,7 +10,7 @@ build/segbits_clbx.rdb: $(SPECIMENS_OK)
build/segbits_clbx.db: build/segbits_clbx.rdb
ifeq ($(CLB_DBFIXUP),Y)
${XRAY_DBFIXUP} --db_root build --zero-db bits.dbf --seg-fn-in $^ --seg-fn-out $@
${XRAY_DBFIXUP} --db-root build --zero-db bits.dbf --seg-fn-in $^ --seg-fn-out $@
else
cp $^ $@
endif

2
prjxray/util.py
View File

@ -70,4 +70,4 @@ def db_root_arg(parser):
else:
db_root_kwargs['required'] = False
db_root_kwargs['default'] = os.path.join(database_dir, database)
parser.add_argument('--db_root', help="Database root.", **db_root_kwargs)
parser.add_argument('--db-root', help="Database root.", **db_root_kwargs)

2
utils/bits2fasm.py
View File

@ -37,7 +37,7 @@ def main():
db_root_kwargs['required'] = False
db_root_kwargs['default'] = os.path.join(database_dir, database)
parser.add_argument('--db_root', help="Database root.", **db_root_kwargs)
parser.add_argument('--db-root', help="Database root.", **db_root_kwargs)
parser.add_argument('bits_file', help='')
parser.add_argument(
'--verbose',

2
utils/fasm2frames.py
View File

@ -71,7 +71,7 @@ def main():
db_root_kwargs['required'] = False
db_root_kwargs['default'] = os.path.join(database_dir, database)
parser.add_argument('--db_root', help="Database root.", **db_root_kwargs)
parser.add_argument('--db-root', help="Database root.", **db_root_kwargs)
parser.add_argument(
'--sparse', action='store_true', help="Don't zero fill all frames")
parser.add_argument(

2
utils/fasm2pips.py
View File

@ -26,7 +26,7 @@ def main():
db_root_kwargs['required'] = False
db_root_kwargs['default'] = os.path.join(database_dir, database)
parser.add_argument('--db_root', help="Database root.", **db_root_kwargs)
parser.add_argument('--db-root', help="Database root.", **db_root_kwargs)
parser.add_argument('fn_in', help='Input FPGA assembly (.fasm) file')
args = parser.parse_args()

2
utils/fasm_pprint.py
View File

@ -76,7 +76,7 @@ def main():
db_root_kwargs['required'] = False
db_root_kwargs['default'] = os.path.join(database_dir, database)
parser.add_argument('--db_root', help="Database root.", **db_root_kwargs)
parser.add_argument('--db-root', help="Database root.", **db_root_kwargs)
parser.add_argument('fasm_file', help='Input FASM file')
parser.add_argument(
'--canonical', help='Output canonical bitstream.', action='store_true')

2
utils/quick_test.py
View File

@ -56,7 +56,7 @@ def quick_test(db_root):
def main():
parser = argparse.ArgumentParser(
description="Runs a sanity check on a prjxray database.")
parser.add_argument('--db_root', required=True)
parser.add_argument('--db-root', required=True)
args = parser.parse_args()

2
utils/verify_tile_connections.py
View File

@ -60,7 +60,7 @@ def read_json5(fname):
def main():
parser = argparse.ArgumentParser(
description="Tests database against raw node list.")
parser.add_argument('--db_root', required=True)
parser.add_argument('--db-root', required=True)
parser.add_argument('--raw_node_root', required=True)
parser.add_argument('--error_nodes', default="error_nodes.json")
parser.add_argument('--ignored_wires')