From b741467366ece78f342ce16260fa0d8f496974c5 Mon Sep 17 00:00:00 2001
From: Keith Rothman <537074+litghost@users.noreply.github.com>
Date: Thu, 8 Oct 2020 11:18:27 -0700
Subject: [PATCH] Increase 044 filters and reverse order of mergedb for better
 errors.

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
---
 fuzzers/044-clk-bufg-pips/Makefile | 3 +--
 utils/mergedb.sh                   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/fuzzers/044-clk-bufg-pips/Makefile b/fuzzers/044-clk-bufg-pips/Makefile
index 0a62756a..ce02a361 100644
--- a/fuzzers/044-clk-bufg-pips/Makefile
+++ b/fuzzers/044-clk-bufg-pips/Makefile
@@ -13,8 +13,7 @@ TODO_RE=".*"
 MAKETODO_FLAGS=--sides "bot_r,top_r" --pip-type ${PIP_TYPE} --seg-type clk_bufg --re $(TODO_RE) --exclude-re ".*\.CLK_BUFG_(BOT|TOP)_R_CK_MUXED[0-9]+"
 N = 50
 
-# These PIPs all appear to be either a 1 bit solutions.
-SEGMATCH_FLAGS=-c 2
+SEGMATCH_FLAGS=-c 2 -m 6 -M 45
 SPECIMENS_DEPS=build/cmt_regions.csv
 A_PIPLIST=clk_bufg_bot_r.txt
 
diff --git a/utils/mergedb.sh b/utils/mergedb.sh
index 2237e3e0..36032d97 100755
--- a/utils/mergedb.sh
+++ b/utils/mergedb.sh
@@ -167,7 +167,6 @@ if $ismask ; then
     sort -u "$tmp1" "$db" | grep -v '<.*>' > "$tmp2" || true
 else
     # tmp1 must be placed second to take precedence over old bad entries
-    python3 ${XRAY_DIR}/utils/mergedb.py --out "$tmp2" "$db" "$tmp1"
     if ! $ismask ; then
 	db_origin=$XRAY_DATABASE_DIR/$XRAY_DATABASE/segbits_$1.origin_info.db
         if [ ! -f $db_origin ] ; then
@@ -175,6 +174,7 @@ else
         fi
         python3 ${XRAY_DIR}/utils/mergedb.py --out "$db_origin" "$db_origin" "$tmp1" --track_origin
     fi
+    python3 ${XRAY_DIR}/utils/mergedb.py --out "$tmp2" "$db" "$tmp1"
 fi
 # Check aggregate db for consistency and make canonical
 ${XRAY_PARSEDB} --strict "$tmp2" "$db"