Major refactoring of database organisation

Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>

fuzzers/013-intpips/.gitignore

@@ -1,3 +0,0 @@
-/specimen_[0-9][0-9][0-9]/
-/seg_clbl[lm]_int_[lr].segbits
-/seg_clbl[lm]_mask_[lr].segbits

fuzzers/013-intpips/Makefile

@@ -1,34 +0,0 @@
-
-N := 200
-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_clbll_int_l.segbits $(addsuffix /segdata_clbll_l.txt,$(SPECIMENS))
-	${XRAY_SEGMATCH} -m 5 -M 15 -o seg_clbll_int_r.segbits $(addsuffix /segdata_clbll_r.txt,$(SPECIMENS))
-	${XRAY_SEGMATCH} -m 5 -M 15 -o seg_clblm_int_l.segbits $(addsuffix /segdata_clblm_l.txt,$(SPECIMENS))
-	${XRAY_SEGMATCH} -m 5 -M 15 -o seg_clblm_int_r.segbits $(addsuffix /segdata_clblm_r.txt,$(SPECIMENS))
-	grep -h ^bit $(addsuffix /segdata_clbll_l.txt,$(SPECIMENS)) | sort -u > seg_clbll_mask_l.segbits
-	grep -h ^bit $(addsuffix /segdata_clbll_r.txt,$(SPECIMENS)) | sort -u > seg_clbll_mask_r.segbits
-	grep -h ^bit $(addsuffix /segdata_clblm_l.txt,$(SPECIMENS)) | sort -u > seg_clblm_mask_l.segbits
-	grep -h ^bit $(addsuffix /segdata_clblm_r.txt,$(SPECIMENS)) | sort -u > seg_clblm_mask_r.segbits
-
-pushdb:
-	${XRAY_MERGEDB} clbll_int_l seg_clbll_int_l.segbits
-	${XRAY_MERGEDB} clbll_int_r seg_clbll_int_r.segbits
-	${XRAY_MERGEDB} clblm_int_l seg_clblm_int_l.segbits
-	${XRAY_MERGEDB} clblm_int_r seg_clblm_int_r.segbits
-	${XRAY_MERGEDB} clbll_mask_l seg_clbll_mask_l.segbits
-	${XRAY_MERGEDB} clbll_mask_r seg_clbll_mask_r.segbits
-	${XRAY_MERGEDB} clblm_mask_l seg_clblm_mask_l.segbits
-	${XRAY_MERGEDB} clblm_mask_r seg_clblm_mask_r.segbits
-
-$(SPECIMENS_OK):
-	bash generate.sh $(subst /OK,,$@)
-	touch $@
-
-clean:
-	rm -rf specimen_[0-9][0-9][0-9]/ seg_clbl[lm]_int_[lr].segbits seg_clbl[lm]_mask_[lr].segbits
-
-.PHONY: database pushdb clean
-

fuzzers/015-ffclkinv/.gitignore

@@ -5,3 +5,5 @@
 /design.dcp
 /usage_statistics_webtalk.*
 /vivado*
+/specimen_*
+/*.segbits

fuzzers/050-intpips/.gitignore

@@ -0,0 +1,3 @@
+/specimen_[0-9][0-9][0-9]/
+/seg_int_[lr].segbits
+/mask_clbl[lm]_[lr].segbits

fuzzers/050-intpips/Makefile

@@ -0,0 +1,30 @@
+
+N := 1
+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_clbl[lm]_l.txt,$(SPECIMENS))
+	${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_clbl[lm]_r.txt,$(SPECIMENS))
+	grep -h ^bit $(addsuffix /segdata_clbll_l.txt,$(SPECIMENS)) | sort -u > mask_clbll_l.segbits
+	grep -h ^bit $(addsuffix /segdata_clbll_r.txt,$(SPECIMENS)) | sort -u > mask_clbll_r.segbits
+	grep -h ^bit $(addsuffix /segdata_clblm_l.txt,$(SPECIMENS)) | sort -u > mask_clblm_l.segbits
+	grep -h ^bit $(addsuffix /segdata_clblm_r.txt,$(SPECIMENS)) | sort -u > mask_clblm_r.segbits
+
+pushdb:
+	${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
+	${XRAY_MERGEDB} mask_clbll_r mask_clbll_r.segbits
+	${XRAY_MERGEDB} mask_clblm_l mask_clblm_l.segbits
+	${XRAY_MERGEDB} mask_clblm_r mask_clblm_r.segbits
+
+$(SPECIMENS_OK):
+	bash generate.sh $(subst /OK,,$@)
+	touch $@
+
+clean:
+	rm -rf specimen_[0-9][0-9][0-9]/ seg_clbl[lm]_int_[lr].segbits seg_clbl[lm]_mask_[lr].segbits
+
+.PHONY: database pushdb clean
+

utils/mergedb.sh

@@ -7,6 +7,8 @@ test -e "$2"
 tmp1=`mktemp -p .`
 tmp2=`mktemp -p .`
 
+db=$XRAY_DATABASE_DIR/$XRAY_DATABASE/segbits_$1.db
+
 case "$1" in
 	clbll_l)
 		sed < "$2" > "$tmp1" \
@@ -24,29 +26,22 @@ case "$1" in
 		sed < "$2" > "$tmp1" \
 			-e 's/^CLB\.SLICE_X0\./CLBLM_R.SLICEM_X0./' \
 			-e 's/^CLB\.SLICE_X1\./CLBLM_R.SLICEL_X1./' ;;
-	clbll_int_l)
-		sed < "$2" > "$tmp1" -e 's/^INT\./CLBLL_INT_L./' ;;
-	clbll_int_r)
-		sed < "$2" > "$tmp1" -e 's/^INT\./CLBLL_INT_R./' ;;
-	clblm_int_l)
-		sed < "$2" > "$tmp1" -e 's/^INT\./CLBLM_INT_L./' ;;
-	clblm_int_r)
-		sed < "$2" > "$tmp1" -e 's/^INT\./CLBLM_INT_R./' ;;
-	clbll_mask_l)
-		sed < "$2" > "$tmp1" -e 's/^bit/CLBLL_MASK_L/' ;;
-	clbll_mask_r)
-		sed < "$2" > "$tmp1" -e 's/^bit/CLBLL_MASK_R/' ;;
-	clblm_mask_l)
-		sed < "$2" > "$tmp1" -e 's/^bit/CLBLM_MASK_L/' ;;
-	clblm_mask_r)
-		sed < "$2" > "$tmp1" -e 's/^bit/CLBLM_MASK_R/' ;;
+
+	int_l)
+		sed < "$2" > "$tmp1" -e 's/^INT\./INT_L./' ;;
+	int_r)
+		sed < "$2" > "$tmp1" -e 's/^INT\./INT_R./' ;;
+
+	mask_*)
+		db=$XRAY_DATABASE_DIR/$XRAY_DATABASE/$1.db
+		cp "$2" "$tmp1" ;;
+
 	*)
 		echo "Invalid mode: $1"
 		rm -f "$tmp1" "$tmp2"
 		exit 1
 esac
 
-db=$XRAY_DATABASE_DIR/$XRAY_DATABASE/seg_$1.segbits
 touch "$db"
 sort -u "$tmp1" "$db" | grep -v '<.*>' > "$tmp2"
 mv "$tmp2" "$db"