diff --git a/fuzzers/025-bram-config/Makefile b/fuzzers/025-bram-config/Makefile index 21355f79..bfbe7b23 100644 --- a/fuzzers/025-bram-config/Makefile +++ b/fuzzers/025-bram-config/Makefile @@ -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 diff --git a/fuzzers/050-intpips/Makefile b/fuzzers/050-intpips/Makefile index 75ea7774..a28db924 100644 --- a/fuzzers/050-intpips/Makefile +++ b/fuzzers/050-intpips/Makefile @@ -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 diff --git a/fuzzers/051-imuxlout/Makefile b/fuzzers/051-imuxlout/Makefile index 909c1698..cdd97ac4 100644 --- a/fuzzers/051-imuxlout/Makefile +++ b/fuzzers/051-imuxlout/Makefile @@ -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 diff --git a/fuzzers/052-clkin/Makefile b/fuzzers/052-clkin/Makefile index 81aa681b..982d0cb3 100644 --- a/fuzzers/052-clkin/Makefile +++ b/fuzzers/052-clkin/Makefile @@ -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 diff --git a/fuzzers/053-ctrlin/Makefile b/fuzzers/053-ctrlin/Makefile index 81aa681b..982d0cb3 100644 --- a/fuzzers/053-ctrlin/Makefile +++ b/fuzzers/053-ctrlin/Makefile @@ -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 diff --git a/fuzzers/054-gfan/Makefile b/fuzzers/054-gfan/Makefile index 81aa681b..982d0cb3 100644 --- a/fuzzers/054-gfan/Makefile +++ b/fuzzers/054-gfan/Makefile @@ -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 diff --git a/fuzzers/055-gnd/Makefile b/fuzzers/055-gnd/Makefile index 433aaa57..109d158f 100644 --- a/fuzzers/055-gnd/Makefile +++ b/fuzzers/055-gnd/Makefile @@ -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 diff --git a/fuzzers/056-rempips/Makefile b/fuzzers/056-rempips/Makefile index da89b0f6..7b6b222a 100644 --- a/fuzzers/056-rempips/Makefile +++ b/fuzzers/056-rempips/Makefile @@ -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 diff --git a/fuzzers/057-bipips/Makefile b/fuzzers/057-bipips/Makefile index 27621a26..c3cd4cda 100644 --- a/fuzzers/057-bipips/Makefile +++ b/fuzzers/057-bipips/Makefile @@ -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 diff --git a/fuzzers/058-hclkpips/Makefile b/fuzzers/058-hclkpips/Makefile index b3f16759..8602ac0d 100644 --- a/fuzzers/058-hclkpips/Makefile +++ b/fuzzers/058-hclkpips/Makefile @@ -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 diff --git a/fuzzers/100-dsp-mskpat/Makefile b/fuzzers/100-dsp-mskpat/Makefile index 22deaf41..ff72df48 100644 --- a/fuzzers/100-dsp-mskpat/Makefile +++ b/fuzzers/100-dsp-mskpat/Makefile @@ -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 diff --git a/fuzzers/clb.mk b/fuzzers/clb.mk index 2bc14568..97f9a140 100644 --- a/fuzzers/clb.mk +++ b/fuzzers/clb.mk @@ -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 diff --git a/prjxray/util.py b/prjxray/util.py index 5a5a8c3f..390e0c81 100644 --- a/prjxray/util.py +++ b/prjxray/util.py @@ -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) diff --git a/utils/bits2fasm.py b/utils/bits2fasm.py index 92795306..97c4f324 100755 --- a/utils/bits2fasm.py +++ b/utils/bits2fasm.py @@ -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', diff --git a/utils/fasm2frames.py b/utils/fasm2frames.py index dcd1fb23..fd22b692 100755 --- a/utils/fasm2frames.py +++ b/utils/fasm2frames.py @@ -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( diff --git a/utils/fasm2pips.py b/utils/fasm2pips.py index 3e7a60d8..62e4302a 100755 --- a/utils/fasm2pips.py +++ b/utils/fasm2pips.py @@ -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() diff --git a/utils/fasm_pprint.py b/utils/fasm_pprint.py index 31a06b0e..8c42cd9f 100755 --- a/utils/fasm_pprint.py +++ b/utils/fasm_pprint.py @@ -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') diff --git a/utils/quick_test.py b/utils/quick_test.py index ec81d947..80f0ff5e 100755 --- a/utils/quick_test.py +++ b/utils/quick_test.py @@ -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() diff --git a/utils/verify_tile_connections.py b/utils/verify_tile_connections.py index 56a14681..2ee7bbdd 100755 --- a/utils/verify_tile_connections.py +++ b/utils/verify_tile_connections.py @@ -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')