From aa4ea882df76d9af22426f87da0dbdba06240900 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Tue, 12 Feb 2019 22:05:11 +0100 Subject: [PATCH 1/2] checkdb.py: restored check on all previous tiles Signed-off-by: Alessandro Comodi --- utils/checkdb.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/utils/checkdb.py b/utils/checkdb.py index d788e3b3..81483974 100755 --- a/utils/checkdb.py +++ b/utils/checkdb.py @@ -110,8 +110,6 @@ def check_tile_overlap(db, verbose=False): else: tiles_type_done[tile_type] = False - mall[tile_type] = {} - if tiles_type_done[tile_type]: continue @@ -124,7 +122,7 @@ def check_tile_overlap(db, verbose=False): collisions = set() for bits in mtile.keys(): - if bits in mall[tile_type].keys(): + if bits in mall.keys(): collisions.add(bits) if collisions: @@ -134,10 +132,10 @@ def check_tile_overlap(db, verbose=False): word, bit = util.addr_bit2word(bitaddr) print( " %s: had %s, got %s" % ( - util.addr2str(addr, word, bit), mall[tile_type][ck], + util.addr2str(addr, word, bit), mall[ck], mtile[ck])) raise ValueError("%s collisions" % len(collisions)) - mall[tile_type].update(mtile) + mall.update(mtile) tiles_checked += 1 print("Checked %s tiles, %s bits" % (tiles_checked, len(mall))) From 1a7302418e95b1c8a8684725732e54b24d6e5984 Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Tue, 12 Feb 2019 22:08:43 +0100 Subject: [PATCH 2/2] Run make format. Signed-off-by: Alessandro Comodi --- utils/checkdb.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/utils/checkdb.py b/utils/checkdb.py index 81483974..1a4741c4 100755 --- a/utils/checkdb.py +++ b/utils/checkdb.py @@ -131,9 +131,8 @@ def check_tile_overlap(db, verbose=False): addr, bitaddr = ck word, bit = util.addr_bit2word(bitaddr) print( - " %s: had %s, got %s" % ( - util.addr2str(addr, word, bit), mall[ck], - mtile[ck])) + " %s: had %s, got %s" % + (util.addr2str(addr, word, bit), mall[ck], mtile[ck])) raise ValueError("%s collisions" % len(collisions)) mall.update(mtile) tiles_checked += 1