aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #176 from elmsfu/hlc2asc/lut_keyword_fixClifford Wolf2018-07-201-1/+1
|\ | | | | icebox_hlc2asc: fix _lut_ keyword parsing
| * icebox_hlc2asc: fix _lut_ keyword parsingElms2018-07-191-1/+1
| | | | | | | | 'self.lut_bits is None' was always false. The _lut_ keyword is used by asc2hlc, so when converting asc->hlc->asc the lut_bits were always all zeros.
* | Merge pull request #175 from daveshah1/fix_lutcascadeClifford Wolf2018-07-201-0/+5
|\ \ | |/ |/| icetime: Remove non-existent paths from ce/sr to ltout
| * icetime: Remove non-existent paths from ce/sr to ltoutDavid Shah2018-07-191-0/+5
|/ | | | Signed-off-by: David Shah <davey1576@gmail.com>
* Spelling fixes in messagesLarry Doolittle2018-07-192-8/+8
|
* Merge pull request #173 from osresearch/parallel-makeClifford Wolf2018-07-171-1/+5
|\ | | | | Allow parallel make all to build each subdir simultaneously
| * Allow parallel make all to build each subdir simultaneouslyTrammell Hudson2018-07-171-1/+5
|/
* Merge pull request #172 from mithro/hlc-glbClifford Wolf2018-07-171-14/+16
|\ | | | | hlc: Use glb_network for current device.
| * hlc: Use glb_network for current device.Tim 'mithro' Ansell2018-07-161-14/+16
|/ | | | | Previously the 1k global networks were hard coded. This now uses the values from the given part.
* Merge pull request #169 from mithro/patch-1Clifford Wolf2018-07-101-1/+2
|\ | | | | Update README to be clearer
| * Update README to be clearerTim Ansell2018-07-031-1/+2
| | | | | | The example doesn't work out of the box with the iCEblink40-lp1k board.
* | Merge pull request #168 from elmsfu/hlc2asc/verilog_literal_ram_dataClifford Wolf2018-07-101-8/+42
|\ \ | | | | | | icebox_hlc2asc: Allow data of ram to use verilog literal format
| * | icebox_hlc2asc: Allow data of ram to use verilog literal formatElms2018-07-031-8/+42
| |/
* | Merge pull request #167 from mithro/icebox_vlog_driversClifford Wolf2018-07-101-11/+13
|\ \ | | | | | | icebox_vlog: Better information about drivers for nets.
| * | icebox_vlog: Save error message to file and print it.Tim 'mithro' Ansell2018-07-081-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if you were doing; `icebox_vlog example.asc > example_bit.v` you would just get; ``` Traceback (most recent call last): File "icebox_vlog.py", line 947, in <module> assert False AssertionError ``` Now you get; ``` Traceback (most recent call last): File "icebox_vlog.py", line 948, in <module> assert False, "\n ".join(emsg) AssertionError: Single-driver-check failed for 2 nets: n10 has 0 drivers: [] n15 has 2 drivers: ['clk', 'clk2'] ```
| * | icebox_vlog: Better information about drivers for nets.Tim 'mithro' Ansell2018-07-031-9/+10
| |/
* | Merge pull request #164 from mithro/global-fixClifford Wolf2018-07-101-3/+5
|\ \ | | | | | | Fix spelling and io_X/GLOBAL_OUTPUT_NETWORK
| * | icebox_hlc2asc: Allow io_X/GLOBAL_OUTPUT_BUFFERTim 'mithro' Ansell2018-06-221-1/+3
| | |
| * | icebox_hlc2asc: Fix spelling in error message.Tim 'mithro' Ansell2018-06-221-2/+2
| |/
* | Merge pull request #170 from mithro/const-lut-outClifford Wolf2018-07-101-2/+2
|\ \ | |/ |/| icebox_vlog: Fix constant LUT output.
| * icebox_vlog: Fix constant LUT output.Tim 'mithro' Ansell2018-07-081-2/+2
|/
* Merge pull request #162 from elmsfu/hcl2asc/error_messages_and_device_classClifford Wolf2018-06-201-27/+30
|\ | | | | icebox_hcl2asc: select device class
| * icebox_hlc2asc: update to support device by familyElms2018-06-201-3/+3
| |
| * icebox_hlc2asc: Adding more descriptive errors messagesElms2018-06-201-24/+27
|/
* Merge pull request #161 from mithro/lut-bit-defaultsClifford Wolf2018-06-161-2/+2
|\ | | | | icebox_hlc2asc: Set LUT bits to zero by default.
| * icebox_hlc2asc: Set LUT bits to zero by default.Tim 'mithro' Ansell2018-06-151-2/+2
|/
* Merge pull request #160 from mithro/hlc-sortClifford Wolf2018-06-151-0/+41
|\ | | | | icebox_hlcsort: Adding a tool for canonicalizing HLC files.
| * icebox_hlcsort: Adding a tool for canonicalizing HLC files.Tim 'mithro' Ansell2018-06-141-0/+41
| | | | | | | | | | This is done by sorting all the commands inside a block. Doing so makes it much easier to diff two files.
* | Merge pull request #155 from mithro/icetime-errorClifford Wolf2018-06-151-1/+3
|\ \ | | | | | | icetime: Output where the chipdb should be found.
| * | icetime: Output where the chipdb should be found.Tim 'mithro' Ansell2018-06-141-1/+3
| |/ | | | | | | Makes it easier to know where it can't be.
* | Merge pull request #159 from mithro/fix-fixClifford Wolf2018-06-151-2/+2
|\ \ | |/ |/| icebox: Fix issue introduced by f7e9fec63a3f88bee8c27e858da319ea03d68d14
| * icebox: Fix issue introduced by f7e9fec63a3f88bee8c27e858da319ea03d68d14Tim 'mithro' Ansell2018-06-141-2/+2
|/ | | | | | | | Current code fails with the following; ``` Parse error in line 94: span4_y3_g15_6 -> local_g0_3 -> D_OUT_0 ```
* Fix icetime for .asc files that do not contain all tilesClifford Wolf2018-06-131-11/+28
| | | | Signed-off-by: Clifford Wolf <clifford@clifford.at>
* Merge pull request #149 from tomverbeure/seedClifford Wolf2018-06-131-7/+25
|\ | | | | icebram: add option to specify seed for repeatable outcomes.
| * Remove rogue spaceTom Verbeure2018-06-021-1/+1
| |
| * Fix indentationTom Verbeure2018-06-021-1/+1
| |
| * Add option to specify seed for repeatable outcomes.Tom Verbeure2018-06-021-7/+25
| |
* | Merge pull request #151 from mithro/hlc-lut-initClifford Wolf2018-06-131-2/+13
|\ \ | | | | | | icebox_hlc2asc: Allow truth tables to be specified as init string.
| * | icebox_hlc2asc: Allow truth tables to be specified as init string.Joel Holdsworth2018-06-111-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 } ```
* | | Merge pull request #158 from mithro/remove-bidir-hlcClifford Wolf2018-06-132-15/+7
|\ \ \ | | | | | | | | Remove bidir stuff in HLC
| * | | HLC: Use '~>' instead of '<->' for routing switches.Tim 'mithro' Ansell2018-06-122-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in ca6b2d9ebd521ecec58b9b5627c9380355adeab1, the 'routing' switches are not actually bidirectional. This makes the '<->' specifier very misleading. Instead use '~>' to differentiate it from the 'buffer' switches.
| * | | icebox_hlc2asc: Remove the bidirectional support.Tim 'mithro' Ansell2018-06-121-8/+0
| |/ / | | | | | | | | | See ca6b2d9ebd521ecec58b9b5627c9380355adeab1.
* | | Merge pull request #156 from mithro/hlc-devicesClifford Wolf2018-06-131-1/+3
|\ \ \ | | | | | | | | icebox_hlc2asc: Accept device types such as HX1K
| * | | icebox_hlc2asc: Accept device types such as HX1KJoel Holdsworth2018-06-111-1/+3
| |/ /
* | | Merge pull request #154 from mithro/icetime-argsClifford Wolf2018-06-131-3/+8
|\ \ \ | | | | | | | | icetime: Lowercase the device type information.
| * | | icetime: Lowercase the device type information.Tim 'mithro' Ansell2018-06-111-3/+8
| |/ / | | | | | | | | | Makes `-d HX1K` work as well as `-d hx1k`.
* | | Merge pull request #153 from mithro/lout-driverClifford Wolf2018-06-131-0/+1
|\ \ \ | | | | | | | | icebox: Fix driver detection for LUT cascade.
| * | | icebox: Fix driver detection for LUT cascade.Tim 'mithro' Ansell2018-06-111-0/+1
| |/ / | | | | | | | | | The lutff_X/lout is a driver signal.
* | | Merge pull request #152 from mithro/vlog-fixClifford Wolf2018-06-131-5/+5
|\ \ \ | |/ / |/| | icebox: Fix LUT output code.
| * | icebox: Fix LUT output code.Tim 'mithro' Ansell2018-06-111-5/+5
|/ / | | | | | | sig values where "1'b0" and "1'b1" not "0" or "1".