Commit Graph

49 Commits

Author SHA1 Message Date
Miodrag Milanovic
be47fc3e9a clangformat run 2019-06-25 18:19:25 +02:00
Miodrag Milanovic
ec47ce2320 Merge master 2019-06-25 18:14:51 +02:00
David Shah
76ff791913
Merge pull request #294 from YosysHQ/eddie/whiteboxes
Changes to cope with YosysHQ/yosys#943
2019-06-24 22:03:51 +01:00
Miodrag Milanovic
560e3899d8 Fix formatting 2019-06-24 10:09:25 +02:00
Miodrag Milanovic
bc1450a5cd Reversed logic 2019-06-22 09:30:35 +02:00
Miodrag Milanovic
5cb9735735 Add support for upto and offset in JSON files 2019-06-21 20:12:24 +02:00
Miodrag Milanovic
0c3093fe49 fix regression 2019-06-21 17:45:53 +02:00
Miodrag Milanovic
87ecd49295 Fix loading json 2019-06-21 11:31:59 +02:00
Miodrag Milanovic
92da4a91de Preserve ports 2019-06-21 09:43:47 +02:00
Miodrag Milanovic
0d8c80ad5d gui for json write and proper statuses 2019-06-14 11:14:18 +02:00
Miodrag Milanovic
36ccc22fc9 Use flags for each step 2019-06-14 09:59:04 +02:00
Miodrag Milanovic
03dff10cbd Load properties from json and propagate to context create 2019-06-13 20:42:11 +02:00
Miodrag Milanovic
4de147d9e4 Save settings that we saved in project 2019-06-13 18:39:16 +02:00
Miodrag Milanovic
856760599e Use properties for settings and save in json 2019-06-12 18:34:34 +02:00
Miodrag Milanovic
d9b0bac248 Save top level attrs and store current step 2019-06-07 16:11:11 +02:00
Miodrag Milanovic
a8871ea8aa Cleanup and fixes, flow works now 2019-06-07 13:19:11 +02:00
Miodrag Milanovic
1093d7e122 WIP saving/loading attributes 2019-06-07 11:48:15 +02:00
Miodrag Milanovic
3ae50f85b1 Use index as unique identifier for nets 2019-06-04 20:08:43 +02:00
Miodrag Milanovic
d5f804832f hacky way to support ECP5 for now 2019-06-03 21:13:47 +02:00
Miodrag Milanovic
44d6f16b66 Support ecp5 read write additional cell info 2019-06-03 21:01:05 +02:00
Miodrag Milanovic
82ed1803c7 use NEXTPNR_BEL, since BEL is initial placement 2019-06-02 18:38:20 +02:00
Miodrag Milanovic
1894cb549c preserve constraints 2019-06-02 16:46:07 +02:00
Miodrag Milanovic
d5d8213871 Added support for attributes/properties types 2019-06-01 15:52:32 +02:00
Miodrag Milanovic
ccbe2dd18d Add reading attributes to nets from json 2019-06-01 11:41:50 +02:00
Miodrag Milanovic
aa0568628f Add writing routing data to json 2019-06-01 11:41:34 +02:00
Miodrag Milanovic
1657479c81 Solve some of connection issues 2019-05-31 11:50:49 +02:00
Miodrag Milanovic
545068dec4 Initial work on jsonwrite 2019-05-31 11:09:13 +02:00
whitequark
a0c9a70a5e When choosing between labels for one net, always prefer ports.
1. Ports are already used in PCF and LPF files, so it is natural
that the developer would use them for constraints as well.

2. Unpredictable (the set of netlabels nextpnr looks at depends on
the optimizations during synthesis) net naming makes it impossible
for code generators like nMigen to reliably apply clock constraints.
2019-05-29 18:05:48 +00:00
Eddie Hung
d49eb2ba40 Changes to cope with YosysHQ/yosys#943 2019-04-19 09:27:34 -07:00
David Shah
997a66791e json: Fix inputs directly driving inouts
Signed-off-by: David Shah <dave@ds0.me>
2019-03-20 16:07:47 +00:00
David Shah
8623bbc107 json: Prefer higher level net names when a net has multiple names
Signed-off-by: David Shah <davey1576@gmail.com>
2018-12-16 16:44:19 +00:00
David Shah
9d852f02b6 json: Print error instead of assert for driver/input conflicts
Signed-off-by: David Shah <dave@ds0.me>
2018-12-12 17:31:24 +00:00
David Shah
dbc14ea76d json: Improve reporting of multiple drivers
Signed-off-by: David Shah <dave@ds0.me>
2018-11-29 19:20:51 +00:00
David Shah
eda77a5244 json: Remove superfluous floating node message
Signed-off-by: David Shah <dave@ds0.me>
2018-11-26 09:36:43 +00:00
Darrell Harmon
cdd0f0fea0 better error message on failure to open JSON file 2018-11-11 12:50:14 -07:00
Clifford Wolf
26be6f9761
Merge pull request #47 from YosysHQ/settings_propagate
Use settings for placer1 and router1
2018-08-18 19:25:19 +02:00
ZipCPU
b945de8b1f JSON-PARSER: Fixed bug in properly reading neg #s 2018-08-15 08:09:55 -04:00
ZipCPU
e93c990f42 Fixed JSON parser: negative values and line numbers
1. jsonparse.cc now access negative numbers, properly parsing the sign
2. On any failure to properly parse, a line number is now provided with the
   unexpected character error
2018-08-14 18:00:16 -04:00
Miodrag Milanovic
e5006d4f2f Save settings and give nicer names to some 2018-08-10 19:11:30 +02:00
Miodrag Milanovic
61bce47f3c Use settings for json and pcf 2018-08-08 20:14:18 +02:00
David Shah
1d6ec0fb8c json: Fix message for 1'bx values
Signed-off-by: David Shah <davey1576@gmail.com>
2018-08-01 20:11:36 +02:00
Sergiusz Bazanski
85fc356fc1 clangformat 2018-08-01 03:59:27 +01:00
David Shah
95ac838654 json: Fixing ports set to 'x'
Signed-off-by: David Shah <davey1576@gmail.com>
2018-07-27 19:51:55 +02:00
David Shah
e0a851976f refactor: Replace assert with NPNR_ASSERT
Signed-off-by: David Shah <davey1576@gmail.com>
2018-07-04 12:15:23 +02:00
Miodrag Milanovic
1cf8293019 Fixed macros and includes for MSVC 2018-07-03 08:53:44 +02:00
David Shah
103dde79de Fixing Python bindings after adding unique_ptr
Signed-off-by: David Shah <davey1576@gmail.com>
2018-06-26 14:13:52 +02:00
Miodrag Milanovic
db890d3a81 nets and cells are unique_ptr's 2018-06-25 21:33:48 +02:00
Miodrag Milanovic
069d78ab80 add cells to a cells collection 2018-06-25 16:16:02 +02:00
Clifford Wolf
fe26ce4471 Move json parser from frontend/json/ to json/
Signed-off-by: Clifford Wolf <clifford@clifford.at>
2018-06-23 16:20:31 +02:00