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

Update htmlgen for new db layout 

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-11-16 23:12:21 +01:00 committed by Tim 'mithro' Ansell
parent e5cda2672c
commit 988eaddb0b
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuzzers/050-intpips/generate.py
View File

@ -42,8 +42,8 @@ with open("design.txt", "r") as f:
tiledata[tile]["dsts"].add(src) tiledata[tile]["dsts"].add(src)
if pnum == 1 or pdir == 0 or \ if pnum == 1 or pdir == 0 or \
re.match(r"^L[HV]B?(_L)?[0-9]", src) or \ re.match(r"^(L[HV]B?|G?CLK)(_L)?(_B)?[0-9]", src) or \
re.match(r"^L[HV]B?(_L)?[0-9]", dst): re.match(r"^(L[HV]B?|G?CLK)(_L)?(_B)?[0-9]", dst):
ignpip.add(pip) ignpip.add(pip)
for tile, pips_srcs_dsts in tiledata.items(): for tile, pips_srcs_dsts in tiledata.items():

24
htmlgen/htmlgen.py
View File

@ -49,14 +49,14 @@ for segname, segdata in grid["segments"].items():
segframes[segtype] = segdata["frames"] segframes[segtype] = segdata["frames"]
print("Loading %s segbits." % segtype) print("Loading %s segbits." % segtype)
with open("../database/%s/seg_%s.segbits" % (os.getenv("XRAY_DATABASE"), segtype)) as f: with open("../database/%s/segbits_%s.db" % (os.getenv("XRAY_DATABASE"), segtype)) as f:
for line in f: for line in f:
bit_name, bit_pos = line.split() bit_name, bit_pos = line.split()
segbits[segtype][bit_name] = bit_pos segbits[segtype][bit_name] = bit_pos
segbits_r[segtype][bit_pos] = bit_name segbits_r[segtype][bit_pos] = bit_name
print("Loading %s segbits." % segtype.replace("_", "_int_")) print("Loading %s segbits." % re.sub("clbl[lm]", "int", segtype))
with open("../database/%s/seg_%s.segbits" % (os.getenv("XRAY_DATABASE"), segtype.replace("_", "_int_"))) as f: with open("../database/%s/segbits_%s.db" % (os.getenv("XRAY_DATABASE"), re.sub("clbl[lm]", "int", segtype))) as f:
for line in f: for line in f:
bit_name, *bit_pos = line.split() bit_name, *bit_pos = line.split()
for bit in bit_pos: for bit in bit_pos:
@ -64,8 +64,8 @@ for segname, segdata in grid["segments"].items():
routebits[segtype][bit] = set() routebits[segtype][bit] = set()
routebits[segtype][bit].add(bit_name) routebits[segtype][bit].add(bit_name)
print("Loading %s segbits." % segtype.replace("_", "_mask_")) print("Loading %s maskbits." % segtype)
with open("../database/%s/seg_%s.segbits" % (os.getenv("XRAY_DATABASE"), segtype.replace("_", "_mask_"))) as f: with open("../database/%s/mask_%s.db" % (os.getenv("XRAY_DATABASE"), segtype)) as f:
for line in f: for line in f:
_, bit = line.split() _, bit = line.split()
maskbits[segtype].add(bit) maskbits[segtype].add(bit)
@ -214,25 +214,25 @@ for segtype in segbits.keys():
bgcolor = "#6666cc" bgcolor = "#6666cc"
label = "R" label = "R"
for bn in sorted(routebits[segtype][bit_pos]): for bn in sorted(routebits[segtype][bit_pos]):
if re.match("^[A-Z_]+_INT_[LR].CTRL(_L)?[0-9]", bn): if re.match("^INT_[LR].CTRL(_L)?[0-9]", bn):
bgcolor = "#8844ff" bgcolor = "#8844ff"
label = "CTRL" label = "CTRL"
if re.match("^[A-Z_]+_INT_[LR].GFAN(_L)?[0-9]", bn): if re.match("^INT_[LR].GFAN(_L)?[0-9]", bn):
bgcolor = "#4488ff" bgcolor = "#4488ff"
label = "GFAN" label = "GFAN"
if re.match("^[A-Z_]+_INT_[LR].[SNWE][SNWE]", bn): if re.match("^INT_[LR].[SNWE][SNWE]", bn):
bgcolor = "#aa88ff" bgcolor = "#aa88ff"
label = "SNWE" label = "SNWE"
if re.match("^[A-Z_]+_INT_[LR].IMUX", bn): if re.match("^INT_[LR].IMUX", bn):
bgcolor = "#88aaff" bgcolor = "#88aaff"
label = "IMUX" label = "IMUX"
if re.match("^[A-Z_]+_INT_[LR].BYP_ALT", bn): if re.match("^INT_[LR].BYP_ALT", bn):
bgcolor = "#7755ff" bgcolor = "#7755ff"
label = "BALT" label = "BALT"
if re.match("^[A-Z_]+_INT_[LR].FAN_ALT", bn): if re.match("^INT_[LR].FAN_ALT", bn):
bgcolor = "#4466bb" bgcolor = "#4466bb"
label = "FALT" label = "FALT"
if re.match("^[A-Z_]+_INT_[LR].[SNWE][RL]", bn): if re.match("^INT_[LR].[SNWE][RL]", bn):
label = "RL" label = "RL"
title.append(bn) title.append(bn)