From 38c4d3c9abdba2ecb5c4315b88df7a639a45de59 Mon Sep 17 00:00:00 2001
From: John McMaster <johndmcmaster@gmail.com>
Date: Tue, 23 Oct 2018 13:17:07 -0700
Subject: [PATCH] bram: write to database/*/segbits_bram_*.block_ram.db

Signed-off-by: John McMaster <johndmcmaster@gmail.com>
---
 fuzzers/102-bram-data/Makefile |  6 +++---
 utils/mergedb.sh               | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/fuzzers/102-bram-data/Makefile b/fuzzers/102-bram-data/Makefile
index 4b2d623a..fd6c01c9 100644
--- a/fuzzers/102-bram-data/Makefile
+++ b/fuzzers/102-bram-data/Makefile
@@ -3,11 +3,11 @@ SPECIMENS := $(addprefix specimen_,$(shell seq -f '%03.0f' $(N)))
 SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 
 database: $(SPECIMENS_OK)
-	${XRAY_SEGMATCH} -o seg_bramx.segbits.BLOCK_RAM $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
+	${XRAY_SEGMATCH} -o seg_bramx.block_ram.segbits $(addsuffix /segdata_bram_[lr].txt,$(SPECIMENS))
 
 pushdb:
-	${XRAY_MERGEDB} bram_l seg_bramx.segbits.BLOCK_RAM
-	${XRAY_MERGEDB} bram_r seg_bramx.segbits.BLOCK_RAM
+	${XRAY_MERGEDB} bram_l.block_ram seg_bramx.block_ram.segbits
+	${XRAY_MERGEDB} bram_r.block_ram seg_bramx.block_ram.segbits
 
 $(SPECIMENS_OK):
 	bash generate.sh $(subst /OK,,$@)
diff --git a/utils/mergedb.sh b/utils/mergedb.sh
index 94014ac8..391d3e40 100644
--- a/utils/mergedb.sh
+++ b/utils/mergedb.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# $1: DB type
+# $2: filename to merge in
+
 set -ex
 test $# = 2
 test -e "$2"
@@ -9,6 +12,10 @@ tmp2=`mktemp -p .`
 
 db=$XRAY_DATABASE_DIR/$XRAY_DATABASE/segbits_$1.db
 
+# Fuzzers verify L/R data is equivilent
+# However, expand back to L/R to make downstream tools not depend on this
+# in case we later find exceptions
+
 case "$1" in
 	clbll_l)
 		sed < "$2" > "$tmp1" \
@@ -37,6 +44,11 @@ case "$1" in
 	bram_r)
 		sed < "$2" > "$tmp1" -e 's/^BRAM\./BRAM_R./' ;;
 
+	bram_l.block_ram)
+		sed < "$2" > "$tmp1" -e 's/^BRAM\./BRAM_L./' ;;
+	bram_r.block_ram)
+		sed < "$2" > "$tmp1" -e 's/^BRAM\./BRAM_R./' ;;
+
 	int_l)
 		sed < "$2" > "$tmp1" -e 's/^INT\./INT_L./' ;;
 	int_r)