Commit Graph

851 Commits

Author SHA1 Message Date
Tim 'mithro' Ansell d8d30fa630 icebox_hlc2asc: Remove the bidirectional support.
See ca6b2d9ebd.
2018-06-12 19:18:45 -07:00
Joel Holdsworth 6c21817732 icebox_hlc2asc: Accept device types such as HX1K 2018-06-11 16:04:57 -07:00
Tim 'mithro' Ansell dc5a4d9934 icetime: Lowercase the device type information.
Makes `-d HX1K` work as well as `-d hx1k`.
2018-06-11 15:59:19 -07:00
Joel Holdsworth ee84ee4d1b icebox_hlc2asc: Allow truth tables to be specified as init string.
Examples;
```hlc
lutff_5 {
    # - Parameters -------
    # LUT_INIT = 0111111110000000

    local_g3_4 -> lutff_5/in_0
    local_g0_6 -> lutff_5/in_1
    local_g2_7 -> lutff_5/in_2
    lutff_5/out -> span4_x3_g12_11
    lutff_5/out -> local_g3_5 -> lutff_5/in_3
    out = 16'b0111111110000000
    enable_dff
}
```

```hlc
lutff_4 {
    local_g3_5 -> lutff_4/in_2
    lutff_4/out -> span12_y12_g6_0
    out = 16'b0000000000010000
    enable_dff
}
```

```hlc
lutff_2 {
    # - Parameters -------
    # LUT_INIT = 01

    lutff_2/out -> span12_y12_g8_0
    lutff_2/out -> span12_x2_g14_0
    lutff_2/out -> local_g0_2 -> lutff_2/in_0
    out = 2'b01
    enable_dff
}
```
2018-06-11 15:54:51 -07:00
Tim 'mithro' Ansell f2b90319f2 icebox: Fix driver detection for LUT cascade.
The lutff_X/lout is a driver signal.
2018-06-11 15:45:15 -07:00
Tim 'mithro' Ansell f9c1f2e5b2 icebox: Fix LUT output code.
sig values where "1'b0" and "1'b1" not "0" or "1".
2018-06-11 13:46:52 -07:00
Clifford Wolf 92751d505a Fix icebox_html -8 mode
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-06-10 17:57:52 +02:00
Clifford Wolf d0c7fe5bfb Fix routing description in icebox_html output
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-06-10 17:54:03 +02:00
Clifford Wolf ca6b2d9ebd Fix "routing" vs "buffer" documentation
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-06-10 17:14:04 +02:00
Clifford Wolf 7bb3a5c565
Merge pull request #150 from mithro/better-error
Improve error message.
2018-06-05 17:10:00 +02:00
Tim 'mithro' Ansell eb9947d3da Improve error message.
Now;
-----------------
Parse error in line 364:
    span4_y9_g7_10 <-> span4_x3_g13_5

conflicting bits ['!B12[8]', '!B12[9]', 'B12[10]']
 setting:{(12, 10)}                     - current clear:{(12, 10), (12, 8)}
clearing:{(12, 9), (12, 8)}             - current set  :{(12, 9)}
-----------------

Previously;
-----------------
  File "icebox_hlc2asc.py", line 742, in apply_directive
    self.set_bits(bits)
  File "icebox_hlc2asc.py", line 762, in set_bits
    raise ParseError("conflicting bits")
TypeError: __init__() takes 1 positional argument but 2 were given
-----------------
2018-06-04 23:57:36 -07:00
Tom Verbeure 4943748512 Remove rogue space 2018-06-02 19:10:51 -07:00
Tom Verbeure 8b32b75d56 Fix indentation 2018-06-02 19:07:16 -07:00
Tom Verbeure e234ee0110 Add option to specify seed for repeatable outcomes. 2018-06-02 19:01:08 -07:00
Clifford Wolf 3021d8c1fb
Merge pull request #147 from mithro/hlc-fixes
Allow routing (bidir) entries to be looked up in either direction.
2018-06-01 17:02:25 +02:00
Tim 'mithro' Ansell 5965f4d1ab Allow routing (bidir) entries to be looked up in either direction. 2018-06-01 07:56:29 -07:00
Clifford Wolf d00a8578f0
Merge pull request #146 from mithro/hlc-fixes
Support both `abc/123` and `123` forms of specifying tracks.
2018-05-31 15:56:34 +02:00
Tim 'mithro' Ansell dd55658266 Better error message when bit pattern is missing.
Previously;
```
    self.apply_directive('buffer', src, dst)
  File "/usr/local/google/home/tansell/work/catx/vtr/env/conda/bin/icebox_hlc2asc", line 698, in apply_directive
    bits, = [entry[0] for entry in self.db if entry[1:] == fields]
ValueError: not enough values to unpack (expected 1, got 0)
```

Now:
```
Parse error in line 2108:
    span12_y4_g14_0 -> span4_y4_g11_7 <-> span4_x7_g4_0

No bit pattern for ['buffer', 'sp12_h_r_11', 'sp4_h_r_7'] in LogicTile(1k, 7, 4)
```
2018-05-30 13:21:48 -07:00
Tim 'mithro' Ansell f7e9fec63a Allow prefixes in multiple chained statements.
IE
```
    lutff_1 {
        lutff_1/out -> local_g2_1 -> lutff_1/in_0
        local_g2_2 -> lutff_1/in_3
        local_g2_7 -> lutff_1/in_2
    }
```
2018-05-30 13:05:20 -07:00
Tim 'mithro' Ansell 353a338505 Support both `abc/123` and `123` forms of specifying tracks.
Kind of fixes #145.
2018-05-30 12:42:57 -07:00
Clifford Wolf ea9553a215
Merge pull request #144 from daveshah1/unbrick
Add write protection disable to iceprog
2018-05-30 13:01:21 +02:00
Clifford Wolf 662117bcea
Merge pull request #143 from daveshah1/vlogpkg
Allow selecting package in icebox_vlog
2018-05-30 12:55:13 +02:00
David Shah eee9aac2e1 icebox: Allow selecting package in icebox_vlog
Signed-off-by: David Shah <davey1576@gmail.com>
2018-05-30 11:24:40 +02:00
Clifford Wolf 816c47ce83 Update timeline on website
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-05-14 20:01:29 +02:00
Clifford Wolf 51ae9e64f0
Merge pull request #139 from awygle/lm_icebox
Icebox support for ice40 LM
2018-05-13 20:55:43 +02:00
Clifford Wolf 1b22af089e Extact reproducable chipdb-5k.txt
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-05-13 20:52:09 +02:00
Andrew Wygle f967b53fe9 Add chipdb-lm4k.txt to .gitignore 2018-05-13 11:06:00 -07:00
Andrew Wygle 704348f563 Correct internal global buffers for lm4k 2018-05-13 11:00:40 -07:00
Andrew Wygle a34ef88b8e Added missing ieren entries for lm4k.
Config SPI pins weren't present in ioctrl_lm4k.sh
2018-05-13 11:00:26 -07:00
Andrew Wygle 6791402b08 Add lm4k chipdb to icebox Makefile. 2018-05-13 11:00:26 -07:00
Andrew Wygle 2d571cb728 Support lm4k in icebox_chipdb.py. 2018-05-13 10:58:22 -07:00
Andrew Wygle 9c11606f1d Completed first pass at icebox support for lm4k.
Needs testing.
2018-05-12 21:47:09 -07:00
Andrew Wygle f35701f89a [WIP] Added colbuf and gbufin data for LM series 2018-05-12 21:47:09 -07:00
Andrew Wygle da18da271b [WIP] Add partial icebox support for lm4k. 2018-05-12 21:47:09 -07:00
Andrew Wygle e4d502e76c Add LM4K to icefuzz Makefile and fuzzconfig.py. 2018-05-12 21:47:09 -07:00
Clifford Wolf 3c6a4dc517
Merge pull request #138 from awygle/lm4k_icepack
LM4K support in icepack and icecube.sh
2018-05-12 21:15:22 +02:00
Andrew Wygle 56a0d3f8ea Add lm4k detection support to icepack. 2018-05-06 11:10:36 -07:00
Andrew Wygle a39b35ac2f Add LM family support to icecube.sh 2018-05-06 10:39:40 -07:00
Clifford Wolf 237280ce44
Merge pull request #132 from daveshah1/bg121_docs
Add BG121 package variant and update docs
2018-04-24 19:11:30 +02:00
Clifford Wolf 2d254d98ee
Merge pull request #133 from mcmasterg/doc
docs: spelling/grammer
2018-04-24 19:01:06 +02:00
John McMaster 1dc402804a docs: spelling/grammer
Signed-off-by: John McMaster <johndmcmaster@gmail.com>
2018-04-09 16:27:03 -07:00
Clifford Wolf 495f571411 Add link to "IceStorm Learners Documentation"
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-04-08 13:34:44 +02:00
David Shah 4f4409ad86 Add BG121 package variant and update docs 2018-04-02 15:01:45 +01:00
Clifford Wolf 2180992460
Merge pull request #108 from rqou/master
Better emscripten support
2018-04-01 15:19:27 +02:00
Robert Ou 3bee3cfead Mount NODEFS if using emscripten and nodejs
Mounts root directory on `/hostfs` and the current working directory on
`/hostcwd`
2018-03-31 14:10:36 -07:00
Clifford Wolf 9b0603c4bc
Merge pull request #131 from esden/iceprog_less_magic
Add MPSSE and Flash command definitions
2018-03-27 14:43:31 +02:00
Piotr Esden-Tempski a7ab72dd4c Added some flash command definitions to decrease magic number usage. 2018-03-11 19:42:06 -07:00
Piotr Esden-Tempski 43333aa0a9 Added some MPSSE command definitions to decrease magic number usage. 2018-03-11 19:41:55 -07:00
Clifford Wolf 4476d83f76
Merge pull request #130 from tomverbeure/icepll_options
Add -n <module_name> option
2018-03-10 13:35:57 +01:00
Tom Verbeure 07b9ea6d58 Add -n <module_name> option 2018-03-10 06:22:06 +00:00