From d0c79257638f7a4b4fe502160323e67898c7fb02 Mon Sep 17 00:00:00 2001
From: Maciej Kurc <mkurc@antmicro.com>
Date: Tue, 18 Feb 2020 11:17:58 +0100
Subject: [PATCH] Move feature grouping before zero bits add and ambiguous
 solution removal.

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>
---
 utils/dbfixup.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/utils/dbfixup.py b/utils/dbfixup.py
index d2270b32..58f936b6 100755
--- a/utils/dbfixup.py
+++ b/utils/dbfixup.py
@@ -484,14 +484,23 @@ def update_seg_fns(
             continue
 
         lines = read_segbits(fn_in)
+        changes = 0
 
-        changes, lines = add_zero_bits(
+        # Find common bits for tag groups
+        bit_groups = find_common_bits_for_tag_groups(lines, tag_groups)
+
+        # Group tags
+        new_changes, lines = group_tags(lines, tag_groups, bit_groups)
+        changes += new_changes
+
+        new_changes, lines = add_zero_bits(
             fn_in,
             lines,
             zero_db,
             clb_int=clb_int,
             strict=strict,
             verbose=verbose)
+        changes += new_changes
 
         new_changes, lines = remove_ambiguous_solutions(
             fn_in,
@@ -501,13 +510,6 @@ def update_seg_fns(
         )
         changes += new_changes
 
-        # Find common bits for tag groups
-        bit_groups = find_common_bits_for_tag_groups(lines, tag_groups)
-
-        # Group tags
-        new_changes, lines = group_tags(lines, tag_groups, bit_groups)
-        changes += new_changes
-
         with open(fn_out, "w") as f:
             for line in sorted(lines):
                 print(line, file=f)
@@ -610,8 +612,6 @@ def find_common_bits_for_tag_groups(lines, tag_groups):
                 ones = set([b[1] for b in bits if b[0]])
                 bit_group |= ones
 
-        print(tag_group)
-        print(bit_group)
         bit_groups.append(bit_group)
 
     return bit_groups