diff options
| author | David Shah <davey1576@gmail.com> | 2017-11-12 19:13:55 +0000 |
|---|---|---|
| committer | David Shah <davey1576@gmail.com> | 2017-11-17 15:08:47 +0000 |
| commit | 88eebff7db9d76e418ccbddd884c4e617596a428 (patch) | |
| tree | bd12fc0304834bb51f43b534c18020b1ecdc3053 /icebox | |
| parent | 94aa596cb144cc47dc054377e1510fbb4effbfd8 (diff) | |
| download | icestorm-88eebff7db9d76e418ccbddd884c4e617596a428.tar.gz icestorm-88eebff7db9d76e418ccbddd884c4e617596a428.tar.bz2 icestorm-88eebff7db9d76e418ccbddd884c4e617596a428.zip | |
Start UltraPlus DSP documentation
Diffstat (limited to 'icebox')
| -rw-r--r-- | icebox/icebox.py | 2 | ||||
| -rwxr-xr-x | icebox/icebox_vlog.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/icebox/icebox.py b/icebox/icebox.py index f27d749..a6d7155 100644 --- a/icebox/icebox.py +++ b/icebox/icebox.py @@ -956,7 +956,7 @@ def netname_normalize(netname, edge="", ramb=False, ramt=False, ramb_8k=False, r if ramb_8k: netname="ram/RADDR_%d" % ([7, 6, 5, 4, 3, 2, 1, 0, -1, -1, -1, -1, -1, 10, 9, 8][idx1*4 + idx2]) if ramt_8k: netname="ram/WADDR_%d" % ([7, 6, 5, 4, 3, 2, 1, 0, -1, -1, -1, -1, -1, 10, 9, 8][idx1*4 + idx2]) match = re.match(r"(...)_op_(.*)", netname) - if match: + if match and (match.group(1) != "slf"): netname = "neigh_op_%s_%s" % (match.group(1), match.group(2)) if re.match(r"lutff_7/(cen|clk|s_r)", netname): netname = netname.replace("lutff_7/", "lutff_global/") diff --git a/icebox/icebox_vlog.py b/icebox/icebox_vlog.py index 8f6bf7c..873e4b2 100755 --- a/icebox/icebox_vlog.py +++ b/icebox/icebox_vlog.py @@ -161,6 +161,7 @@ def is_interconn(netname): if netname.startswith("span12_"): return True if netname.startswith("logic_op_"): return True if netname.startswith("neigh_op_"): return True + if netname.startswith("slf_op_"): return True if netname.startswith("local_"): return True return False @@ -768,7 +769,7 @@ for i in range(4): #TEMP: for tracing only text_func.append("/* DSP%d %2d %2d */ assign dsp%d_%d_%d_clk = %s;" % (i, x, y, i, x, y, net_clk)) text_func.append("/* DSP%d %2d %2d */ assign dsp%d_%d_%d_sr = %s;" % (i, x, y, i, x, y, net_sr)) - for j in range(7): + for j in range(8): net_in0 = seg_to_net((x, y, "lutff_%d/in_0" % j), "1'b0") net_in1 = seg_to_net((x, y, "lutff_%d/in_1" % j), "1'b0") net_in2 = seg_to_net((x, y, "lutff_%d/in_2" % j), "1'b0") |