mirror of https://github.com/openXC7/prjxray.git
Run make format.
Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>
This commit is contained in:
parent
530bb1f243
commit
1f6054ae0d
|
|
@ -15,7 +15,7 @@ import os
|
||||||
import parsedb
|
import parsedb
|
||||||
#from prjxray import db as prjxraydb
|
#from prjxray import db as prjxraydb
|
||||||
import glob
|
import glob
|
||||||
import json
|
|
||||||
|
|
||||||
def make_tile_mask(db_file, tile_name, tilej, strict=False, verbose=False):
|
def make_tile_mask(db_file, tile_name, tilej, strict=False, verbose=False):
|
||||||
'''
|
'''
|
||||||
|
|
@ -108,22 +108,28 @@ def check_tile_overlap(db, db_root, strict=False, verbose=False):
|
||||||
mall[tile_type] = {}
|
mall[tile_type] = {}
|
||||||
|
|
||||||
mtile = make_tile_mask(
|
mtile = make_tile_mask(
|
||||||
db_files[tile_type], tile_name, tilej, strict=strict, verbose=verbose)
|
db_files[tile_type],
|
||||||
|
tile_name,
|
||||||
|
tilej,
|
||||||
|
strict=strict,
|
||||||
|
verbose=verbose)
|
||||||
verbose and print(
|
verbose and print(
|
||||||
"Checking %s, type %s, bits: %s" %
|
"Checking %s, type %s, bits: %s" %
|
||||||
(tile_name, tilej["type"], len(mtile)))
|
(tile_name, tilej["type"], len(mtile)))
|
||||||
if len(mtile) == 0:
|
if len(mtile) == 0:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
collisions = set(mall[tile_type].keys()).intersection(set(mtile.keys()))
|
collisions = set(mall[tile_type].keys()).intersection(
|
||||||
|
set(mtile.keys()))
|
||||||
if collisions:
|
if collisions:
|
||||||
print("ERROR: %s collisions" % len(collisions))
|
print("ERROR: %s collisions" % len(collisions))
|
||||||
for ck in sorted(collisions):
|
for ck in sorted(collisions):
|
||||||
addr, bitaddr = ck
|
addr, bitaddr = ck
|
||||||
word, bit = util.addr_bit2word(bitaddr)
|
word, bit = util.addr_bit2word(bitaddr)
|
||||||
print(
|
print(
|
||||||
" %s: had %s, got %s" %
|
" %s: had %s, got %s" % (
|
||||||
(util.addr2str(addr, word, bit), mall[tile_type][ck], mtile[ck]))
|
util.addr2str(addr, word, bit), mall[tile_type][ck],
|
||||||
|
mtile[ck]))
|
||||||
raise ValueError("%s collisions" % len(collisions))
|
raise ValueError("%s collisions" % len(collisions))
|
||||||
mall[tile_type].update(mtile)
|
mall[tile_type].update(mtile)
|
||||||
tiles_checked += 1
|
tiles_checked += 1
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue