Syncing 010-lutinit generate.py to 011-ffconfig

Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
This commit is contained in:
Clifford Wolf 2017-10-19 02:10:49 +02:00 committed by Tim 'mithro' Ansell
parent 3559181379
commit 35c6f97554
1 changed files with 6 additions and 6 deletions

View File

@ -8,7 +8,7 @@ import os, sys, json, re
grid = None grid = None
bits = dict() bits = dict()
luts = dict() data = dict()
print("Loading grid.") print("Loading grid.")
with open("../../../database/%s/tilegrid.json" % os.getenv("XRAY_DATABASE"), "r") as f: with open("../../../database/%s/tilegrid.json" % os.getenv("XRAY_DATABASE"), "r") as f:
@ -39,12 +39,12 @@ with open("design_%s.txt" % sys.argv[1], "r") as f:
bel = line[1] bel = line[1]
init = int(line[2][4:], 16) init = int(line[2][4:], 16)
if site not in luts: if site not in data:
luts[site] = dict() data[site] = dict()
for i in range(64): for i in range(64):
bitname = "%s.INIT[%02d]" % (bel, i) bitname = "%s.INIT[%02d]" % (bel, i)
luts[site][bitname] = ((init >> i) & 1) != 0 data[site][bitname] = ((init >> i) & 1) != 0
################################################# #################################################
@ -71,7 +71,7 @@ for tilename, tiledata in grid["tiles"].items():
segments[segname] = { "bits": list(), "tags": dict() } segments[segname] = { "bits": list(), "tags": dict() }
for site in tiledata["sites"]: for site in tiledata["sites"]:
if site not in luts: if site not in data:
continue continue
if re.match(r"SLICE_X[0-9]*[02468]Y", site): if re.match(r"SLICE_X[0-9]*[02468]Y", site):
@ -81,7 +81,7 @@ for tilename, tiledata in grid["tiles"].items():
else: else:
assert 0 assert 0
for name, value in luts[site].items(): for name, value in data[site].items():
tag = "%s.%s.%s" % (re.sub("_[LR]$", "", tile_type), sitekey, name) tag = "%s.%s.%s" % (re.sub("_[LR]$", "", tile_type), sitekey, name)
tag = tag.replace("SLICE_X0.SLICEM", "SLICEM_X0") tag = tag.replace("SLICE_X0.SLICEM", "SLICEM_X0")
tag = tag.replace("SLICE_X1.SLICEM", "SLICEM_X1") tag = tag.replace("SLICE_X1.SLICEM", "SLICEM_X1")