From 5e8a50fe37a17f706f34f957bc8c18b91d61ed5a Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 5 Dec 2018 17:51:41 -0800 Subject: [PATCH] dbfixup: more verbose bit index message Signed-off-by: John McMaster --- utils/dbfixup.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/utils/dbfixup.py b/utils/dbfixup.py index 266a2fd1..2c8f70e2 100755 --- a/utils/dbfixup.py +++ b/utils/dbfixup.py @@ -17,7 +17,7 @@ clb_int_zero_db = [ ] -def zero_range(bits, wordmin, wordmax): +def zero_range(tag, bits, wordmin, wordmax): """ If any bits occur wordmin <= word <= wordmax, default bits in wordmin <= word <= wordmax to 0 @@ -30,7 +30,10 @@ def zero_range(bits, wordmin, wordmax): continue fidx, bidx = [int(s) for s in bit.split("_")] if wordmin <= fidx <= wordmax: - assert bitidx is None or bidx == bitidx + if bitidx is not None and bidx != bitidx: + print("Old bit index: %u, new: %u" % (bitidx, bidx)) + print("%s bits: %s" % (tag, str(bits))) + raise ValueError("%s: inconsistent bit index" % tag) bitidx = bidx if bitidx is None: @@ -141,7 +144,7 @@ def add_zero_bits(fn_in, fn_out, zero_db, clb_int=False, verbose=False): They are immediately before the first CLB real bits """ if clb_int: - zero_range(bits, 22, 25) + zero_range(tag, bits, 22, 25) zero_groups( tag, bits, zero_db, strict=not clb_int, verbose=verbose)