From 9eea270e31f532ee1743d0fb9100e4142df08d42 Mon Sep 17 00:00:00 2001
From: John McMaster <johndmcmaster@gmail.com>
Date: Wed, 7 Nov 2018 18:52:28 -0800
Subject: [PATCH] bram-config: READ/WRITE_WIDTH_A_1

Signed-off-by: John McMaster <johndmcmaster@gmail.com>
---
 fuzzers/025-bram-config/Makefile | 10 +++++++---
 fuzzers/025-bram-config/bits.dbf | 24 ++++++++----------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/fuzzers/025-bram-config/Makefile b/fuzzers/025-bram-config/Makefile
index dd1cf109..21355f79 100644
--- a/fuzzers/025-bram-config/Makefile
+++ b/fuzzers/025-bram-config/Makefile
@@ -3,9 +3,13 @@
 N := 8
 include ../fuzzer.mk
 
-database: $(SPECIMENS_OK)
-	${XRAY_SEGMATCH} -o build/segbits_bramx.db $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
-	${XRAY_DBFIXUP} --db_root build --zero-db bits.dbf --zero-tile-types bramx
+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 $@
 
 pushdb:
 	${XRAY_MERGEDB} bram_l build/segbits_bramx.db
diff --git a/fuzzers/025-bram-config/bits.dbf b/fuzzers/025-bram-config/bits.dbf
index 415b7b4b..ac18652f 100644
--- a/fuzzers/025-bram-config/bits.dbf
+++ b/fuzzers/025-bram-config/bits.dbf
@@ -1,20 +1,12 @@
 # Y0
-# Y0.READ_WIDTH_A
-27_35 27_36 27_37
-# Y0.READ_WIDTH_B
-27_43 27_44 27_45
-# Y0.WRITE_WIDTH_A
-27_51 27_52 27_53
-# Y0.WRITE_WIDTH_B
-27_59 27_60 27_61
+27_35 27_36 27_37,BRAM.RAMB18_Y0.READ_WIDTH_A_1
+27_43 27_44 27_45,BRAM.RAMB18_Y0.READ_WIDTH_B_1
+27_51 27_52 27_53,BRAM.RAMB18_Y0.WRITE_WIDTH_A_1
+27_59 27_60 27_61,BRAM.RAMB18_Y0.WRITE_WIDTH_B_1
 
 # Y1
-# Y1.READ_WIDTH_A
-27_285 27_284 27_283
-# Y1.READ_WIDTH_B
-27_277 27_276 27_275
-# Y1.WRITE_WIDTH_A
-27_269 27_268 27_267
-# Y1.WRITE_WIDTH_B
-27_261 27_260 27_259
+27_285 27_284 27_283,BRAM.RAMB18_Y1.READ_WIDTH_A_1
+27_277 27_276 27_275,BRAM.RAMB18_Y1.READ_WIDTH_B_1
+27_269 27_268 27_267,BRAM.RAMB18_Y1.WRITE_WIDTH_A_1
+27_261 27_260 27_259,BRAM.RAMB18_Y1.WRITE_WIDTH_B_1