diff options
| author | David Shah <davey1576@gmail.com> | 2017-11-16 14:03:11 +0000 |
|---|---|---|
| committer | David Shah <davey1576@gmail.com> | 2017-11-17 15:09:51 +0000 |
| commit | cdf688363968ee8895d8e6fe08178cff8fc9ee75 (patch) | |
| tree | dfb5dfcf669fcc46ea0d8bb7351e2488d4f6cfb2 /icebox | |
| parent | 8f9eba3fe3f91bd503015ac0b8e0801d6e0694c0 (diff) | |
| download | icestorm-cdf688363968ee8895d8e6fe08178cff8fc9ee75.tar.gz icestorm-cdf688363968ee8895d8e6fe08178cff8fc9ee75.tar.bz2 icestorm-cdf688363968ee8895d8e6fe08178cff8fc9ee75.zip | |
UltraPlus DSPs working
Diffstat (limited to 'icebox')
| -rw-r--r-- | icebox/icebox.py | 7 | ||||
| -rwxr-xr-x | icebox/icebox_explain.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/icebox/icebox.py b/icebox/icebox.py index 60c73d1..12e1fca 100644 --- a/icebox/icebox.py +++ b/icebox/icebox.py @@ -4462,6 +4462,13 @@ dsp1_5k_db.append([["B4[7]"], "IpConfig", "CBIT_5"]) dsp2_5k_db = parse_db(iceboxdb.database_dsp2_5k_txt, "5k") dsp3_5k_db = parse_db(iceboxdb.database_dsp3_5k_txt, "5k") +#Add missing LC_ bits to DSP and IPCon databases +for db_to_fix in [ipcon_5k_db, dsp0_5k_db, dsp1_5k_db, dsp2_5k_db, dsp3_5k_db]: + for entry in db_to_fix: + if len(entry) >= 2 and entry[1].startswith("LC_"): + for lentry in logictile_5k_db: + if len(lentry) >= 2 and lentry[1] == entry[1]: + entry[0] = lentry[0] iotile_l_db = list() iotile_r_db = list() diff --git a/icebox/icebox_explain.py b/icebox/icebox_explain.py index 3b9875f..4e678ff 100755 --- a/icebox/icebox_explain.py +++ b/icebox/icebox_explain.py @@ -117,7 +117,7 @@ def print_tile(stmt, ic, x, y, tile, db): bitinfo.append("") extra_text = "" for i in range(len(line)): - if 36 <= i <= 45 and re.search(r"logic_tile", stmt): + if 36 <= i <= 45 and re.search(r"(logic_tile|dsp\d_tile|ipcon_tile)", stmt): lutff_idx = k // 2 lutff_bitnum = (i-36) + 10*(k%2) if line[i] == "1": |