mirror of https://github.com/openXC7/prjxray.git
segmaker: add assertions, comments, split into functions
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
This commit is contained in:
John McMaster
parent
9ac71a0442
commit
ac8891d865
|
|
@ -1,108 +1,239 @@
|
|||
'''
|
||||
|
||||
Sample segdata.txt output (from 015-clbnffmux/specimen_001/segdata_clbll_r.txt):
|
||||
seg 00020880_048
|
||||
bit 30_00
|
||||
bit 31_49
|
||||
tag CLB.SLICE_X0.AFF.DMUX.CY 1
|
||||
tag CLB.SLICE_X0.BFF.DMUX.BX 0
|
||||
|
||||
tilegrid.json provides tile addresses
|
||||
'''
|
||||
|
||||
import os, json, re
|
||||
|
||||
XRAY_DATABASE = os.getenv("XRAY_DATABASE")
|
||||
XRAY_DIR = os.getenv("XRAY_DIR")
|
||||
|
||||
|
||||
def recurse_sum(x):
|
||||
'''Count number of nested iterable occurances'''
|
||||
if type(x) in (str, bytearray):
|
||||
return 1
|
||||
if type(x) in (dict, ):
|
||||
return sum([recurse_sum(y) for y in x.values()])
|
||||
else:
|
||||
try:
|
||||
return sum([recurse_sum(y) for y in x])
|
||||
except TypeError:
|
||||
return 1
|
||||
|
||||
|
||||
def json_hex2i(s):
|
||||
'''Convert a JSON hex literal into an integer (it can't store hex natively)'''
|
||||
# TODO: maybe just do int(x, 0)
|
||||
return int(s[2:], 16)
|
||||
|
||||
|
||||
class segmaker:
|
||||
def __init__(self, bitsfile):
|
||||
print("Loading %s grid." % os.getenv("XRAY_DATABASE"))
|
||||
with open("../../../database/%s/tilegrid.json" %
|
||||
os.getenv("XRAY_DATABASE"), "r") as f:
|
||||
self.grid = json.load(f)
|
||||
|
||||
self.bits = dict()
|
||||
def __init__(self, bitsfile, verbose=False):
|
||||
self.verbose = verbose
|
||||
self.load_grid()
|
||||
self.load_bits(bitsfile)
|
||||
'''
|
||||
self.tags[site][name] = value
|
||||
Where:
|
||||
-site: ex 'SLICE_X13Y101'
|
||||
-name: ex 'CLB.SLICE_X0.AFF.DMUX.CY'
|
||||
'''
|
||||
self.tags = dict()
|
||||
|
||||
# output after compiling
|
||||
self.segments_by_type = None
|
||||
|
||||
def load_grid(self):
|
||||
'''Load self.grid holding tile addresses'''
|
||||
print("Loading %s grid." % XRAY_DATABASE)
|
||||
with open("%s/database/%s/tilegrid.json" % (XRAY_DIR, XRAY_DATABASE),
|
||||
"r") as f:
|
||||
self.grid = json.load(f)
|
||||
assert "segments" not in self.grid, "Old format tilegrid.json"
|
||||
|
||||
def load_bits(self, bitsfile):
|
||||
'''Load self.bits holding the bits that occured in the bitstream'''
|
||||
'''
|
||||
Format:
|
||||
self.bits[base_frame][bit_wordidx] = set()
|
||||
Where elements are (bit_frame, bit_wordidx, bit_bitidx))
|
||||
bit_frame is a relatively large number forming the FDRI address
|
||||
base_frame is a truncated bit_frame address of related FDRI addresses
|
||||
0 <= bit_wordidx <= 100
|
||||
0 <= bit_bitidx < 31
|
||||
|
||||
Sample bits input
|
||||
bit_00020500_000_08
|
||||
bit_00020500_000_14
|
||||
bit_00020500_000_17
|
||||
'''
|
||||
self.bits = dict()
|
||||
print("Loading bits from %s." % bitsfile)
|
||||
with open(bitsfile, "r") as f:
|
||||
for line in f:
|
||||
# ex: bit_00020500_000_17
|
||||
line = line.split("_")
|
||||
bit_frame = int(line[1], 16)
|
||||
bit_wordidx = int(line[2], 10)
|
||||
bit_bitidx = int(line[3], 10)
|
||||
base_frame = bit_frame & ~0x7f
|
||||
|
||||
if base_frame not in self.bits:
|
||||
self.bits[base_frame] = dict()
|
||||
self.bits.setdefault(base_frame, dict()).setdefault(
|
||||
bit_wordidx, set()).add(
|
||||
(bit_frame, bit_wordidx, bit_bitidx))
|
||||
if self.verbose:
|
||||
print(
|
||||
'Loaded bits: %u bits in %u base frames' %
|
||||
(recurse_sum(self.bits), len(self.bits)))
|
||||
|
||||
if bit_wordidx not in self.bits[base_frame]:
|
||||
self.bits[base_frame][bit_wordidx] = set()
|
||||
def addtag(self, site_tile, name, value):
|
||||
'''
|
||||
XXX: can add tags in two ways:
|
||||
-By site name
|
||||
-By tile name (used for pips?)
|
||||
Consider splitting into two separate data structures
|
||||
|
||||
self.bits[base_frame][bit_wordidx].add(
|
||||
(bit_frame, bit_wordidx, bit_bitidx))
|
||||
Record, according to value, if (site, name) exists
|
||||
|
||||
def addtag(self, site, name, value):
|
||||
if site not in self.tags:
|
||||
self.tags[site] = dict()
|
||||
self.tags[site][name] = value
|
||||
Ex:
|
||||
self.addtag('SLICE_X13Y101', 'CLB.SLICE_X0.AFF.DMUX.CY', 1)
|
||||
Indicates that the SLICE_X13Y101 site has an element called 'CLB.SLICE_X0.AFF.DMUX.CY'
|
||||
'''
|
||||
self.tags.setdefault(site_tile, dict())[name] = value
|
||||
|
||||
def compile(self, bitfilter=None):
|
||||
print("Compiling segment data.")
|
||||
tags_used = set()
|
||||
tile_types_found = set()
|
||||
|
||||
self.segments_by_type = dict()
|
||||
|
||||
def add_segbits(segments, segname, tiledata, bitfilter=None):
|
||||
'''
|
||||
Add and populate segments[segname]["bits"]
|
||||
Gives all of the bits that could exist for the space we are exploring
|
||||
Also add segments[segname]["tags"], but don't fill
|
||||
|
||||
segments is a group related to a specific tile type (ex: CLBLM_L)
|
||||
It is composed of bits (possible bits) and tags (observed instances)
|
||||
segments[segname]["bits"].add(bitname)
|
||||
segments[segname]["tags"][tag] = value
|
||||
|
||||
segname: FDRI address + word offset string
|
||||
tiledata: tilegrid info for this tile
|
||||
'''
|
||||
assert segname not in segments
|
||||
segments[segname] = {"bits": set(), "tags": dict()}
|
||||
|
||||
base_frame = json_hex2i(tiledata["baseaddr"])
|
||||
for wordidx in range(tiledata["offset"],
|
||||
tiledata["offset"] + tiledata["height"]):
|
||||
if base_frame not in self.bits:
|
||||
continue
|
||||
if wordidx not in self.bits[base_frame]:
|
||||
continue
|
||||
for bit_frame, bit_wordidx, bit_bitidx in self.bits[
|
||||
base_frame][wordidx]:
|
||||
bitname_frame = bit_frame - base_frame
|
||||
bitname_bit = 32 * (
|
||||
bit_wordidx - tiledata["offset"]) + bit_bitidx
|
||||
# some bits are hard to de-correlate
|
||||
# allow force dropping some bits from search space for practicality
|
||||
if bitfilter is None or bitfilter(bitname_frame,
|
||||
bitname_bit):
|
||||
bitname = "%02d_%02d" % (bitname_frame, bitname_bit)
|
||||
segments[segname]["bits"].add(bitname)
|
||||
|
||||
'''
|
||||
XXX: wouldn't it be better to iterate over tags? Easy to drop tags
|
||||
For now, add a check that all tags are used
|
||||
'''
|
||||
for tilename, tiledata in self.grid.items():
|
||||
if "baseaddr" not in tiledata:
|
||||
continue
|
||||
|
||||
if tiledata["type"] not in self.segments_by_type:
|
||||
self.segments_by_type[tiledata["type"]] = dict()
|
||||
segments = self.segments_by_type[tiledata["type"]]
|
||||
|
||||
tile_type = tiledata["type"]
|
||||
segname = "%s_%03d" % (
|
||||
tiledata["baseaddr"][2:], tiledata["offset"])
|
||||
|
||||
def add_segbits():
|
||||
def add_tilename_tags():
|
||||
if not segname in segments:
|
||||
segments[segname] = {"bits": set(), "tags": dict()}
|
||||
|
||||
base_frame = int(tiledata["baseaddr"][2:], 16)
|
||||
for wordidx in range(
|
||||
tiledata["offset"],
|
||||
tiledata["offset"] + tiledata["height"]):
|
||||
if base_frame not in self.bits:
|
||||
continue
|
||||
if wordidx not in self.bits[base_frame]:
|
||||
continue
|
||||
for bit_frame, bit_wordidx, bit_bitidx in self.bits[
|
||||
base_frame][wordidx]:
|
||||
bitname_frame = bit_frame - base_frame
|
||||
bitname_bit = 32 * (
|
||||
bit_wordidx - tiledata["offset"]) + bit_bitidx
|
||||
if bitfilter is None or bitfilter(bitname_frame,
|
||||
bitname_bit):
|
||||
bitname = "%02d_%02d" % (
|
||||
bitname_frame, bitname_bit)
|
||||
segments[segname]["bits"].add(bitname)
|
||||
|
||||
if tilename in self.tags:
|
||||
add_segbits()
|
||||
add_segbits(
|
||||
segments, segname, tiledata, bitfilter=bitfilter)
|
||||
|
||||
for name, value in self.tags[tilename].items():
|
||||
tag = "%s.%s" % (
|
||||
re.sub("(LL|LM)?_[LR]$", "", tile_type), name)
|
||||
tags_used.add((tilename, name))
|
||||
tag = "%s.%s" % (tile_type_norm, name)
|
||||
segments[segname]["tags"][tag] = value
|
||||
|
||||
for site in tiledata["sites"]:
|
||||
if site not in self.tags:
|
||||
continue
|
||||
def add_site_tags():
|
||||
if not segname in segments:
|
||||
add_segbits(
|
||||
segments, segname, tiledata, bitfilter=bitfilter)
|
||||
|
||||
add_segbits()
|
||||
|
||||
if re.match(r"SLICE_X[0-9]*[02468]Y", site):
|
||||
sitekey = "SLICE_X0"
|
||||
elif re.match(r"SLICE_X[0-9]*[13579]Y", site):
|
||||
sitekey = "SLICE_X1"
|
||||
if 'SLICE_' in site:
|
||||
'''
|
||||
Simplify SLICE names like:
|
||||
-SLICE_X12Y102 => SLICE_X0
|
||||
-SLICE_X13Y102 => SLICE_X1
|
||||
'''
|
||||
if re.match(r"SLICE_X[0-9]*[02468]Y", site):
|
||||
sitekey = "SLICE_X0"
|
||||
elif re.match(r"SLICE_X[0-9]*[13579]Y", site):
|
||||
sitekey = "SLICE_X1"
|
||||
else:
|
||||
assert 0
|
||||
else:
|
||||
assert 0
|
||||
assert 0, 'Unhandled site type'
|
||||
|
||||
for name, value in self.tags[site].items():
|
||||
tag = "%s.%s.%s" % (
|
||||
re.sub("(LL|LM)?_[LR]$", "", tile_type), sitekey, name)
|
||||
tags_used.add((site, name))
|
||||
tag = "%s.%s.%s" % (tile_type_norm, sitekey, name)
|
||||
# XXX: does this come from name?
|
||||
tag = tag.replace(".SLICEM.", ".")
|
||||
tag = tag.replace(".SLICEL.", ".")
|
||||
segments[segname]["tags"][tag] = value
|
||||
|
||||
# ignore dummy tiles (ex: VBRK)
|
||||
if "baseaddr" not in tiledata:
|
||||
continue
|
||||
|
||||
tile_type = tiledata["type"]
|
||||
tile_types_found.add(tile_type)
|
||||
segments = self.segments_by_type.setdefault(tile_type, dict())
|
||||
'''
|
||||
Simplify names by simplifying like:
|
||||
-CLBLM_L => CLB
|
||||
-CENTER_INTER_R => CENTER_INTER
|
||||
'''
|
||||
tile_type_norm = re.sub("(LL|LM)?_[LR]$", "", tile_type)
|
||||
|
||||
segname = "%s_%03d" % (
|
||||
# truncate 0x to leave hex string
|
||||
tiledata["baseaddr"][2:],
|
||||
tiledata["offset"])
|
||||
|
||||
# process tile name tags
|
||||
if tilename in self.tags:
|
||||
add_tilename_tags()
|
||||
|
||||
# process site name tags
|
||||
for site in tiledata["sites"]:
|
||||
if site not in self.tags:
|
||||
continue
|
||||
add_site_tags()
|
||||
|
||||
if self.verbose:
|
||||
ntags = recurse_sum(self.tags)
|
||||
print("Used %u / %u tags" % (len(tags_used), ntags))
|
||||
print("Grid DB had %u tile types" % len(tile_types_found))
|
||||
assert ntags and ntags == len(tags_used)
|
||||
|
||||
def write(self, suffix=None, roi=False):
|
||||
assert self.segments_by_type, 'No data to write'
|
||||
|
||||
for segtype in self.segments_by_type.keys():
|
||||
if suffix is not None:
|
||||
filename = "segdata_%s_%s.txt" % (segtype.lower(), suffix)
|
||||
|
|
|
|||
Loading…
Reference in New Issue