bram: fix data section db

Signed-off-by: John McMaster <JohnDMcMaster@gmail.com>
This commit is contained in:
John McMaster 2018-12-21 10:42:57 -08:00
parent 6b8e8c1d62
commit 149839ca69
3 changed files with 40 additions and 31 deletions

View File

@ -1,3 +1,22 @@
# read/write width is relatively slow to resolve
# Even slower with multi bit masks...
N ?= 8
DO_DBFIXUP?=Y
include ../bram.mk
include ../fuzzer.mk
database: build/segbits_bramx.db
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_MASKMERGE} build/mask_bramx.db $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
pushdb:
${XRAY_MERGEDB} bram_l build/segbits_bramx.db
${XRAY_MERGEDB} bram_r build/segbits_bramx.db
${XRAY_MERGEDB} mask_bram_l build/mask_bramx.db
${XRAY_MERGEDB} mask_bram_r build/mask_bramx.db
.PHONY: database pushdb

View File

@ -1,2 +1,20 @@
N ?= 8
include ../bram.mk
include ../fuzzer.mk
database: build/segbits_bramx.block_ram.db
build/segbits_bramx.block_ram.rdb: $(SPECIMENS_OK)
${XRAY_SEGMATCH} -o build/segbits_bramx.block_ram.rdb $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
build/segbits_bramx.block_ram.db: build/segbits_bramx.block_ram.rdb
cp $^ $@
${XRAY_MASKMERGE} build/mask_bramx.block_ram.db $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
pushdb:
${XRAY_MERGEDB} bram_l.block_ram build/segbits_bramx.block_ram.db
${XRAY_MERGEDB} bram_r.block_ram build/segbits_bramx.block_ram.db
${XRAY_MERGEDB} mask_bram_l.block_ram build/mask_bramx.block_ram.db
${XRAY_MERGEDB} mask_bram_r.block_ram build/mask_bramx.block_ram.db
.PHONY: database pushdb

View File

@ -1,28 +0,0 @@
# read/write width is relatively slow to resolve
# Even slower with multi bit masks...
N ?= 8
DO_DBFIXUP?=N
include ../fuzzer.mk
database: build/segbits_bramx.db
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
ifeq ($(DO_DBFIXUP),Y)
${XRAY_DBFIXUP} --db-root build --zero-db bits.dbf --seg-fn-in $^ --seg-fn-out $@
else
cp $^ $@
endif
${XRAY_MASKMERGE} build/mask_bramx.db $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
pushdb:
${XRAY_MERGEDB} bram_l build/segbits_bramx.db
${XRAY_MERGEDB} bram_r build/segbits_bramx.db
${XRAY_MERGEDB} mask_bram_l build/mask_bramx.db
${XRAY_MERGEDB} mask_bram_r build/mask_bramx.db
.PHONY: database pushdb