luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix rendering of BRAM/DSP segment masks in htmlgen.py 

Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2017-12-22 19:42:12 +01:00
parent 20be6f7e69
commit 305a56b9a2
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htmlgen/htmlgen.py
View File

@ -164,6 +164,8 @@ for segname, segdata in grid["segments"].items():
segtype = segdata["type"].lower() segtype = segdata["type"].lower()
if segtype not in segbits: if segtype not in segbits:
print("Loading data for %s segments:" % segtype)
segbits[segtype] = dict() segbits[segtype] = dict()
segbits_r[segtype] = dict() segbits_r[segtype] = dict()
routebits[segtype] = dict() routebits[segtype] = dict()
@ -194,7 +196,7 @@ for segname, segdata in grid["segments"].items():
segbits_r[segtype][bit_pos] = bit_name segbits_r[segtype][bit_pos] = bit_name
if segtype not in ["hclk_l", "hclk_r"]: if segtype not in ["hclk_l", "hclk_r"]:
print("Loading %s segbits." % segtype) print(" loading %s segbits." % segtype)
with db_open("segbits_%s.db" % segtype) as f: with db_open("segbits_%s.db" % segtype) as f:
for line in f: for line in f:
if re.search(r"(\.[ABCD]MUX\.)|(\.PRECYINIT\.)", line): if re.search(r"(\.[ABCD]MUX\.)|(\.PRECYINIT\.)", line):
@ -202,15 +204,17 @@ for segname, segdata in grid["segments"].items():
else: else:
add_single_bit(line) add_single_bit(line)
print("Loading %s segbits." % re.sub("clbl[lm]", "int", segtype)) int_tile_type = re.sub("clbl[lm]|bram[0-4]|dsp[0-4]", "int", segtype)
with db_open("segbits_%s.db" % re.sub("clbl[lm]", "int", segtype)) as f:
print(" loading %s segbits." % int_tile_type)
with db_open("segbits_%s.db" % int_tile_type) as f:
for line in f: for line in f:
if segtype in ["hclk_l", "hclk_r"] and ".ENABLE_BUFFER." in line: if segtype in ["hclk_l", "hclk_r"] and ".ENABLE_BUFFER." in line:
add_single_bit(line) add_single_bit(line)
else: else:
add_pip_bits(line) add_pip_bits(line)
print("Loading %s maskbits." % segtype) print(" loading %s maskbits." % segtype)
with db_open("mask_%s.db" % segtype) as f: with db_open("mask_%s.db" % segtype) as f:
for line in f: for line in f:
_, bit = line.split() _, bit = line.split()
@ -310,7 +314,7 @@ for segtype in sorted(segbits.keys()):
print("<h3>X-Ray %s Database: %s Segment</h3>" % (get_setting("XRAY_DATABASE").upper(), segtype.upper()), file=f) print("<h3>X-Ray %s Database: %s Segment</h3>" % (get_setting("XRAY_DATABASE").upper(), segtype.upper()), file=f)
else: else:
print("<h3>X-Ray %s Database: %s Segment (%s Tile + %s Tile)</h3>" % (get_setting("XRAY_DATABASE").upper(), segtype.upper(), print("<h3>X-Ray %s Database: %s Segment (%s Tile + %s Tile)</h3>" % (get_setting("XRAY_DATABASE").upper(), segtype.upper(),
segtype.upper(), re.sub("clbl[lm]", "int", segtype).upper()), file=f) segtype.upper(), re.sub("clbl[lm]|bram[0-4]|dsp[0-4]", "int", segtype).upper()), file=f)
print(""" print("""
<script><!-- <script><!--