From 2ad3af5343834d3fe8269269928b825c6e09a56c Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 14 Nov 2018 11:42:23 -0800 Subject: [PATCH] fuzzers: standardize segment file to .db (not .segbits) Signed-off-by: John McMaster --- .../007-timing/minitest/test_unique/Makefile | 2 +- fuzzers/010-lutinit/Makefile | 14 +++++----- fuzzers/019-ndi1mux/Makefile | 6 ++--- fuzzers/025-bram-config/Makefile | 12 ++++----- fuzzers/026-bram-data/Makefile | 6 ++--- fuzzers/050-intpips/Makefile | 26 +++++++++---------- fuzzers/051-imuxlout/Makefile | 12 ++++----- fuzzers/052-clkin/Makefile | 12 ++++----- fuzzers/053-ctrlin/Makefile | 12 ++++----- fuzzers/054-gfan/Makefile | 12 ++++----- fuzzers/055-gnd/Makefile | 12 ++++----- fuzzers/056-rempips/Makefile | 12 ++++----- fuzzers/057-bipips/Makefile | 10 +++---- fuzzers/058-hclkpips/Makefile | 22 ++++++++-------- fuzzers/100-dsp-mskpat/Makefile | 10 +++---- 15 files changed, 90 insertions(+), 90 deletions(-) diff --git a/fuzzers/007-timing/minitest/test_unique/Makefile b/fuzzers/007-timing/minitest/test_unique/Makefile index f7dca553..0a3491ca 100644 --- a/fuzzers/007-timing/minitest/test_unique/Makefile +++ b/fuzzers/007-timing/minitest/test_unique/Makefile @@ -14,7 +14,7 @@ run: touch run.ok clean: - rm -rf specimen_[0-9][0-9][0-9]/ seg_clblx.segbits __pycache__ run.ok + rm -rf specimen_[0-9][0-9][0-9]/ seg_clblx.db __pycache__ run.ok rm -rf vivado*.log vivado_*.str vivado*.jou design *.bits *.dcp *.bit rm -rf build diff --git a/fuzzers/010-lutinit/Makefile b/fuzzers/010-lutinit/Makefile index 7be45338..50a31ddf 100644 --- a/fuzzers/010-lutinit/Makefile +++ b/fuzzers/010-lutinit/Makefile @@ -6,14 +6,14 @@ SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -o seg_clbll.segbits $(addsuffix /segdata_clbll_[lr]_[012].txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -o seg_clblm.segbits $(addsuffix /segdata_clblm_[lr]_[012].txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -o seg_clbll.db $(addsuffix /segdata_clbll_[lr]_[012].txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -o seg_clblm.db $(addsuffix /segdata_clblm_[lr]_[012].txt,$(SPECIMENS)) pushdb: - ${XRAY_MERGEDB} clbll_l seg_clbll.segbits - ${XRAY_MERGEDB} clbll_r seg_clbll.segbits - ${XRAY_MERGEDB} clblm_l seg_clblm.segbits - ${XRAY_MERGEDB} clblm_r seg_clblm.segbits + ${XRAY_MERGEDB} clbll_l seg_clbll.db + ${XRAY_MERGEDB} clbll_r seg_clbll.db + ${XRAY_MERGEDB} clblm_l seg_clblm.db + ${XRAY_MERGEDB} clblm_r seg_clblm.db $(SPECIMENS_OK): bash generate.sh $(subst /OK,,$@) @@ -26,7 +26,7 @@ run: touch run.ok clean: - rm -rf specimen_[0-9][0-9][0-9]/ seg_clbll.segbits seg_clblm.segbits run.ok + rm -rf specimen_[0-9][0-9][0-9]/ seg_clbll.db seg_clblm.segbits run.ok .PHONY: database pushdb run clean diff --git a/fuzzers/019-ndi1mux/Makefile b/fuzzers/019-ndi1mux/Makefile index 3bb3b58b..ef0cf4cc 100644 --- a/fuzzers/019-ndi1mux/Makefile +++ b/fuzzers/019-ndi1mux/Makefile @@ -5,11 +5,11 @@ 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_clblm_[lr].txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -o build/seg_clblx.db $(addsuffix /segdata_clblm_[lr].txt,$(SPECIMENS)) pushdb: - ${XRAY_MERGEDB} clblm_l build/seg_clblx.segbits - ${XRAY_MERGEDB} clblm_r build/seg_clblx.segbits + ${XRAY_MERGEDB} clblm_l build/seg_clblx.db + ${XRAY_MERGEDB} clblm_r build/seg_clblx.db build: mkdir build diff --git a/fuzzers/025-bram-config/Makefile b/fuzzers/025-bram-config/Makefile index bfbe7b23..03f32bdf 100644 --- a/fuzzers/025-bram-config/Makefile +++ b/fuzzers/025-bram-config/Makefile @@ -3,17 +3,17 @@ N := 8 include ../fuzzer.mk -database: build/segbits_bramx.db +database: build.db_bramx.db -build/segbits_bramx.rdb: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -o build/segbits_bramx.rdb $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS)) +build.db_bramx.rdb: $(SPECIMENS_OK) + ${XRAY_SEGMATCH} -o build.db_bramx.rdb $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS)) -build/segbits_bramx.db: build/segbits_bramx.rdb +build.db_bramx.db: build/segbits_bramx.rdb ${XRAY_DBFIXUP} --db-root build --zero-db bits.dbf --seg-fn-in $^ --seg-fn-out $@ pushdb: - ${XRAY_MERGEDB} bram_l build/segbits_bramx.db - ${XRAY_MERGEDB} bram_r build/segbits_bramx.db + ${XRAY_MERGEDB} bram_l build.db_bramx.db + ${XRAY_MERGEDB} bram_r build.db_bramx.db .PHONY: database pushdb diff --git a/fuzzers/026-bram-data/Makefile b/fuzzers/026-bram-data/Makefile index 1b3386da..3ee2add0 100644 --- a/fuzzers/026-bram-data/Makefile +++ b/fuzzers/026-bram-data/Makefile @@ -3,11 +3,11 @@ SPECIMENS := $(addprefix build/specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -o build/seg_bramx.block_ram.segbits $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -o build/seg_bramx.block_ram.db $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS)) pushdb: - ${XRAY_MERGEDB} bram_l.block_ram build/seg_bramx.block_ram.segbits - ${XRAY_MERGEDB} bram_r.block_ram build/seg_bramx.block_ram.segbits + ${XRAY_MERGEDB} bram_l.block_ram build/seg_bramx.block_ram.db + ${XRAY_MERGEDB} bram_r.block_ram build/seg_bramx.block_ram.db build: mkdir build diff --git a/fuzzers/050-intpips/Makefile b/fuzzers/050-intpips/Makefile index b1d98018..8d51caa6 100644 --- a/fuzzers/050-intpips/Makefile +++ b/fuzzers/050-intpips/Makefile @@ -4,21 +4,21 @@ SPECIMENS := $(addprefix build/specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o build/seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o build/seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) - ${XRAY_MASKMERGE} build/mask_clbll_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) - ${XRAY_MASKMERGE} build/mask_clbll_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) - ${XRAY_MASKMERGE} build/mask_clblm_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) - ${XRAY_MASKMERGE} build/mask_clblm_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o build/seg_int_l.db $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o build/seg_int_r.db $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) + ${XRAY_MASKMERGE} build/mask_clbll_l.db $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_MASKMERGE} build/mask_clbll_r.db $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) + ${XRAY_MASKMERGE} build/mask_clblm_l.db $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_MASKMERGE} build/mask_clblm_r.db $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) + ${XRAY_DBFIXUP} --db-root build --clb-int pushdb: - ${XRAY_DBFIXUP} --db-root build --clb-int - ${XRAY_MERGEDB} int_l build/seg_int_l.segbits - ${XRAY_MERGEDB} int_r build/seg_int_r.segbits - ${XRAY_MERGEDB} mask_clbll_l build/mask_clbll_l.segbits - ${XRAY_MERGEDB} mask_clbll_r build/mask_clbll_r.segbits - ${XRAY_MERGEDB} mask_clblm_l build/mask_clblm_l.segbits - ${XRAY_MERGEDB} mask_clblm_r build/mask_clblm_r.segbits + ${XRAY_MERGEDB} int_l build/seg_int_l.db + ${XRAY_MERGEDB} int_r build/seg_int_r.db + ${XRAY_MERGEDB} mask_clbll_l build/mask_clbll_l.db + ${XRAY_MERGEDB} mask_clbll_r build/mask_clbll_r.db + ${XRAY_MERGEDB} mask_clblm_l build/mask_clblm_l.db + ${XRAY_MERGEDB} mask_clblm_r build/mask_clblm_r.db $(SPECIMENS_OK): mkdir -p build diff --git a/fuzzers/051-imuxlout/Makefile b/fuzzers/051-imuxlout/Makefile index cdd97ac4..ee548806 100644 --- a/fuzzers/051-imuxlout/Makefile +++ b/fuzzers/051-imuxlout/Makefile @@ -4,13 +4,13 @@ SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.db $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.db $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) pushdb: ${XRAY_DBFIXUP} --db-root . --clb-int - ${XRAY_MERGEDB} int_l seg_int_l.segbits - ${XRAY_MERGEDB} int_r seg_int_r.segbits + ${XRAY_MERGEDB} int_l seg_int_l.db + ${XRAY_MERGEDB} int_r seg_int_r.db $(SPECIMENS_OK): todo.txt bash generate.sh $(subst /OK,,$@) @@ -25,9 +25,9 @@ run: touch run.ok clean: - rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits run.ok + rm -rf .Xil/ .cache/ filtered_seg_int_[lr].db run.ok rm -rf todo.txt vivado* piplist/ piplist.dcp pattern_[lr].txt pips_int_[lr].txt - rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits mask_clbl[lm]_[lr].segbits + rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].db mask_clbl[lm]_[lr].segbits .PHONY: database pushdb run clean diff --git a/fuzzers/052-clkin/Makefile b/fuzzers/052-clkin/Makefile index 982d0cb3..19ef4671 100644 --- a/fuzzers/052-clkin/Makefile +++ b/fuzzers/052-clkin/Makefile @@ -4,13 +4,13 @@ SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.db $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.db $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) pushdb: ${XRAY_DBFIXUP} --db-root . --clb-int - ${XRAY_MERGEDB} int_l seg_int_l.segbits - ${XRAY_MERGEDB} int_r seg_int_r.segbits + ${XRAY_MERGEDB} int_l seg_int_l.db + ${XRAY_MERGEDB} int_r seg_int_r.db $(SPECIMENS_OK): todo.txt bash generate.sh $(subst /OK,,$@) @@ -25,9 +25,9 @@ run: touch run.ok clean: - rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits run.ok + rm -rf .Xil/ .cache/ filtered_seg_int_[lr].db run.ok rm -rf todo.txt vivado* piplist/ piplist.dcp pattern_[lr].txt pips_int_[lr].txt - rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits mask_clbl[lm]_[lr].segbits + rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].db mask_clbl[lm]_[lr].segbits .PHONY: database pushdb run clean diff --git a/fuzzers/053-ctrlin/Makefile b/fuzzers/053-ctrlin/Makefile index 982d0cb3..19ef4671 100644 --- a/fuzzers/053-ctrlin/Makefile +++ b/fuzzers/053-ctrlin/Makefile @@ -4,13 +4,13 @@ SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.db $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.db $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) pushdb: ${XRAY_DBFIXUP} --db-root . --clb-int - ${XRAY_MERGEDB} int_l seg_int_l.segbits - ${XRAY_MERGEDB} int_r seg_int_r.segbits + ${XRAY_MERGEDB} int_l seg_int_l.db + ${XRAY_MERGEDB} int_r seg_int_r.db $(SPECIMENS_OK): todo.txt bash generate.sh $(subst /OK,,$@) @@ -25,9 +25,9 @@ run: touch run.ok clean: - rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits run.ok + rm -rf .Xil/ .cache/ filtered_seg_int_[lr].db run.ok rm -rf todo.txt vivado* piplist/ piplist.dcp pattern_[lr].txt pips_int_[lr].txt - rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits mask_clbl[lm]_[lr].segbits + rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].db mask_clbl[lm]_[lr].segbits .PHONY: database pushdb run clean diff --git a/fuzzers/054-gfan/Makefile b/fuzzers/054-gfan/Makefile index 982d0cb3..19ef4671 100644 --- a/fuzzers/054-gfan/Makefile +++ b/fuzzers/054-gfan/Makefile @@ -4,13 +4,13 @@ SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.db $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.db $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) pushdb: ${XRAY_DBFIXUP} --db-root . --clb-int - ${XRAY_MERGEDB} int_l seg_int_l.segbits - ${XRAY_MERGEDB} int_r seg_int_r.segbits + ${XRAY_MERGEDB} int_l seg_int_l.db + ${XRAY_MERGEDB} int_r seg_int_r.db $(SPECIMENS_OK): todo.txt bash generate.sh $(subst /OK,,$@) @@ -25,9 +25,9 @@ run: touch run.ok clean: - rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits run.ok + rm -rf .Xil/ .cache/ filtered_seg_int_[lr].db run.ok rm -rf todo.txt vivado* piplist/ piplist.dcp pattern_[lr].txt pips_int_[lr].txt - rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits mask_clbl[lm]_[lr].segbits + rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].db mask_clbl[lm]_[lr].segbits .PHONY: database pushdb run clean diff --git a/fuzzers/055-gnd/Makefile b/fuzzers/055-gnd/Makefile index 109d158f..9d29343f 100644 --- a/fuzzers/055-gnd/Makefile +++ b/fuzzers/055-gnd/Makefile @@ -4,13 +4,13 @@ SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.db $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.db $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) pushdb: ${XRAY_DBFIXUP} --db-root . --clb-int - ${XRAY_MERGEDB} int_l seg_int_l.segbits - ${XRAY_MERGEDB} int_r seg_int_r.segbits + ${XRAY_MERGEDB} int_l seg_int_l.db + ${XRAY_MERGEDB} int_r seg_int_r.db $(SPECIMENS_OK): todo.txt bash generate.sh $(subst /OK,,$@) @@ -29,9 +29,9 @@ run: touch run.ok clean: - rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits run.ok + rm -rf .Xil/ .cache/ filtered_seg_int_[lr].db run.ok rm -rf todo.txt vivado* piplist/ piplist.dcp pattern_[lr].txt pips_int_[lr].txt - rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits mask_clbl[lm]_[lr].segbits + rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].db mask_clbl[lm]_[lr].segbits .PHONY: database pushdb run clean diff --git a/fuzzers/056-rempips/Makefile b/fuzzers/056-rempips/Makefile index 7b6b222a..7795944a 100644 --- a/fuzzers/056-rempips/Makefile +++ b/fuzzers/056-rempips/Makefile @@ -4,13 +4,13 @@ SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.db $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.db $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) pushdb: ${XRAY_DBFIXUP} --db-root . --clb-int - ${XRAY_MERGEDB} int_l seg_int_l.segbits - ${XRAY_MERGEDB} int_r seg_int_r.segbits + ${XRAY_MERGEDB} int_l seg_int_l.db + ${XRAY_MERGEDB} int_r seg_int_r.db $(SPECIMENS_OK): todo.txt bash generate.sh $(subst /OK,,$@) @@ -25,9 +25,9 @@ run: touch run.ok clean: - rm -rf .Xil/ .cache/ filtered_seg_int_[lr].segbits run.ok + rm -rf .Xil/ .cache/ filtered_seg_int_[lr].db run.ok rm -rf todo.txt vivado* piplist/ piplist.dcp pattern_[lr].txt pips_int_[lr].txt - rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits + rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].db .PHONY: database pushdb run clean diff --git a/fuzzers/057-bipips/Makefile b/fuzzers/057-bipips/Makefile index c3cd4cda..d78da794 100644 --- a/fuzzers/057-bipips/Makefile +++ b/fuzzers/057-bipips/Makefile @@ -4,13 +4,13 @@ SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.db $(addsuffix /segdata_int_l.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.db $(addsuffix /segdata_int_r.txt,$(SPECIMENS)) pushdb: ${XRAY_DBFIXUP} --db-root . --clb-int - ${XRAY_MERGEDB} int_l seg_int_l.segbits - ${XRAY_MERGEDB} int_r seg_int_r.segbits + ${XRAY_MERGEDB} int_l seg_int_l.db + ${XRAY_MERGEDB} int_r seg_int_r.db $(SPECIMENS_OK): todo.txt bash generate.sh $(subst /OK,,$@) @@ -27,7 +27,7 @@ run: clean: rm -rf .Xil/ .cache/ vivado* todo.txt run.ok rm -rf bipiplist/ bipiplist.dcp bipips_int_[lr].txt - rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].segbits + rm -rf specimen_[0-9][0-9][0-9]/ seg_int_[lr].db .PHONY: database pushdb run clean diff --git a/fuzzers/058-hclkpips/Makefile b/fuzzers/058-hclkpips/Makefile index 8602ac0d..aab5f4c8 100644 --- a/fuzzers/058-hclkpips/Makefile +++ b/fuzzers/058-hclkpips/Makefile @@ -4,19 +4,19 @@ SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -o seg_hclk_l.segbits $(addsuffix /segdata_hclk_l_design_*.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -o seg_hclk_r.segbits $(addsuffix /segdata_hclk_r_design_*.txt,$(SPECIMENS)) - ${XRAY_MASKMERGE} mask_hclk_l.segbits $(addsuffix /segdata_hclk_l_design_*.txt,$(SPECIMENS)) - ${XRAY_MASKMERGE} mask_hclk_r.segbits $(addsuffix /segdata_hclk_r_design_*.txt,$(SPECIMENS)) - grep CK_INOUT seg_hclk_l.segbits | sed 's, .*, always,' > ppips_hclk_l.txt - grep CK_INOUT seg_hclk_r.segbits | sed 's, .*, always,' > ppips_hclk_r.txt + ${XRAY_SEGMATCH} -o seg_hclk_l.db $(addsuffix /segdata_hclk_l_design_*.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -o seg_hclk_r.db $(addsuffix /segdata_hclk_r_design_*.txt,$(SPECIMENS)) + ${XRAY_MASKMERGE} mask_hclk_l.db $(addsuffix /segdata_hclk_l_design_*.txt,$(SPECIMENS)) + ${XRAY_MASKMERGE} mask_hclk_r.db $(addsuffix /segdata_hclk_r_design_*.txt,$(SPECIMENS)) + grep CK_INOUT seg_hclk_l.db | sed 's, .*, always,' > ppips_hclk_l.txt + grep CK_INOUT seg_hclk_r.db | sed 's, .*, always,' > ppips_hclk_r.txt pushdb: ${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 - ${XRAY_MERGEDB} mask_hclk_r mask_hclk_r.segbits + ${XRAY_MERGEDB} hclk_l seg_hclk_l.db + ${XRAY_MERGEDB} hclk_r seg_hclk_r.db + ${XRAY_MERGEDB} mask_hclk_l mask_hclk_l.db + ${XRAY_MERGEDB} mask_hclk_r mask_hclk_r.db 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 @@ -30,7 +30,7 @@ run: $(MAKE) pushdb clean: - rm -rf specimen_[0-9][0-9][0-9]/ seg_hclk_[lr].segbits mask_hclk_[lr].segbits ppips_hclk_[lr].txt run.ok + rm -rf specimen_[0-9][0-9][0-9]/ seg_hclk_[lr].db mask_hclk_[lr].segbits ppips_hclk_[lr].txt run.ok .PHONY: database pushdb run clean diff --git a/fuzzers/100-dsp-mskpat/Makefile b/fuzzers/100-dsp-mskpat/Makefile index ff72df48..616c14db 100644 --- a/fuzzers/100-dsp-mskpat/Makefile +++ b/fuzzers/100-dsp-mskpat/Makefile @@ -4,13 +4,13 @@ SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N))) SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS)) database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -o seg_dsp_l.segbits $(addsuffix /segdata_dsp_l_*.txt,$(SPECIMENS)) - ${XRAY_SEGMATCH} -o seg_dsp_r.segbits $(addsuffix /segdata_dsp_r_*.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -o seg_dsp_l.db $(addsuffix /segdata_dsp_l_*.txt,$(SPECIMENS)) + ${XRAY_SEGMATCH} -o seg_dsp_r.db $(addsuffix /segdata_dsp_r_*.txt,$(SPECIMENS)) pushdb: ${XRAY_DBFIXUP} --db-root . --clb-int - ${XRAY_MERGEDB} dsp_l seg_dsp_l.segbits - ${XRAY_MERGEDB} dsp_r seg_dsp_r.segbits + ${XRAY_MERGEDB} dsp_l seg_dsp_l.db + ${XRAY_MERGEDB} dsp_r seg_dsp_r.db $(SPECIMENS_OK): bash generate.sh $(subst /OK,,$@) @@ -23,7 +23,7 @@ run: touch run.ok clean: - rm -rf specimen_[0-9][0-9][0-9]/ seg_dsp_l.segbits seg_dsp_r.segbits run.ok + rm -rf specimen_[0-9][0-9][0-9]/ seg_dsp_l.db seg_dsp_r.segbits run.ok .PHONY: database pushdb run clean