[WIP] Add QuickLogic EOS-S3 support #1758

rw1nkler · 2020-11-06T13:25:09Z

This PR adds support for QuickLogic devices. The codebase comes from the main QuickLogic repository, with additional changes that are required for proper integration with the SymbiFlow mainline.

At this point, these issues need to be addressed to provide the QuickLogic support:

Copy the repository included in this PR as submodules to SymbiFlow
Set up CI for QuickLogic devices
Create Yosys plugin that will contain the changes introduced in Add support for QuickLogic devices SymbiFlow/yosys#89
Add all the remaining changes to SymbiFlow v2x
- Allow specification of multiple pack patterns chipsalliance/f4pga-v2x#75
- Fasm annotation support chipsalliance/f4pga-v2x#32
Fix the QuickLogic conda package dependencies

I believe that the integration can be speeded up by replacing the Yosys and v2x conda packages in the CI. Then when all the changes are available in the main repository, we can remove the package substitution. In this PR, I proposed the necessary changes for this solution.

rw1nkler · 2020-11-06T13:37:19Z

@litghost, can you provide any information on what should be added to integrate the QuickLogic support with SymbiFlow?
Probably, your help is also required to set up proper CI.

Do you think that the solution with overwriting certain packages temporarily in the CI is a good approach?
9a90d28#diff-d9eb2e25be835d9549f2c62e1b9717dba5bce9f76572de38ca4e595ff9c4c60dR17

I'm also aware of these DCO errors, I will do my best to resolve the problem.

litghost · 2020-11-06T15:24:41Z

quicklogic/common/cmake/quicklogic_fasm.cmake

+  get_rel_target(REL_QUICKLOGIC_FASM_NAME quicklogic_fasm ${QUICKLOGIC_FASM_NAME})
+  add_custom_target(
+    ${REL_QUICKLOGIC_FASM_NAME}
+    DEPENDS ${QUICKLOGIC_FASM_OUTPUT}


This should use add_file_dependency, not directly depend on the output filename.

litghost

Anytime an add_custom_command depends on something that has add_file_target, it needs to use add_file_dependency, not just depending on the filename.

litghost · 2020-11-06T15:26:27Z

common/cmake/devices.cmake

+    get_target_property(YOSYS_DEVICE_CELLS_MAP ${DEVICE_TYPE} CELLS_MAP)
+
+    if (NOT "${YOSYS_DEVICE_CELLS_SIM}" MATCHES ".*NOTFOUND")
+        get_file_target(YOSYS_DEVICE_CELLS_SIM_TARGET ${YOSYS_DEVICE_CELLS_SIM})


Just use "add_file_dependency" which does the same thing as these 3 lines?

litghost · 2020-11-06T15:26:56Z

environment.yml

@@ -13,6 +13,7 @@ dependencies:
  - symbiflow::icestorm
  - symbiflow::capnproto-java
  - litex-hub::gcc-riscv64-elf-newlib
+  - python=3.7


Why the drop to python 3.7?

litghost

Most of the new CMake functions need better documentation. At a minimum, what do they do and how to call them. A why would be good too

litghost

Please remove all * imports, e.g.:

quicklogic/common/utils/rr_utils.py:

from data_structs import *

litghost

This PR should probably be broken up, it is very large, and hard to review.

Suggestions for places to split the PR:

A PR to setup the basic directory structure and run v2x on Verilog. I believe this PR would be relatively straight forward, and the generated output would be all the pb_types, etc.
A PR adding the python support libraries
A PR adding the new CMake scripts

litghost · 2020-11-06T18:00:05Z

Do you think that the solution with overwriting certain packages temporarily in the CI is a good approach?
9a90d28#diff-d9eb2e25be835d9549f2c62e1b9717dba5bce9f76572de38ca4e595ff9c4c60dR17

I think that is a terrible idea.

litghost · 2020-11-06T18:05:18Z

@litghost, can you provide any information on what should be added to integrate the QuickLogic support with SymbiFlow?
Probably, your help is also required to set up proper CI.

I think the first step here is to make a small PR that adds the QuickLogic configuration and a dummy QL CI script that is an empty shell script. We can then add that config to kokoro. I then recommend we incrementally stage PR's, per my earlier suggestion.

I know this isn't a surprise, but it is practically impossible to review and merge a PR with 120k lines and ~500 files. We need to break this into small PRs with more modest goals. For example, having a PR that generates all the pb_types by invoking v2x is probably a good PR once we have the initial CI stuff setup.

litghost · 2020-11-06T18:08:11Z

I think the first step here is to make a small PR that adds the QuickLogic configuration and a dummy QL CI script that is an empty shell script. We can then add that config to kokoro. I then recommend we incrementally stage PR's, per my earlier suggestion.

Specifically this PR would have the following files:

.github/kokoro/continuous-ql.cfg
.github/kokoro/presubmit-ql.cfg
.github/kokoro/ql.sh
.github/kokoro/kokoro-cfg.py

I notice that in this PR you didn't modify kokoro-cfg.py, which seems wrong? presubmit-ql.cfg / continuous-ql.cfg should be generated from kokoro-cfg.py

rw1nkler · 2020-11-09T10:17:28Z

This PR should probably be broken up, it is very large, and hard to review.

Ok, I will split the PR then into smaller chunks.

I think the first step here is to make a small PR that adds the QuickLogic configuration and a dummy QL CI script that is an empty shell script. We can then add that config to kokoro. I then recommend we incrementally stage PR's, per my earlier suggestion.

Here is the first PR with the initial CI setup: #1760

Suggestions for places to split the PR:

A PR to setup the basic directory structure and run v2x on Verilog. I believe this PR would be relatively straight forward, and the generated output would be all the pb_types, etc.

This PR will require all of the v2x PRs to be merged:
- chipsalliance/f4pga-v2x#75
- chipsalliance/f4pga-v2x#32

From the discussions in the v2x PRs, I see that still some of the issues are unresolved. What's more, the solutions proposed there will require a lot of changes in the existing QuickLogic support.

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

…e IP input is unconnected (no CLOCK pad) Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Removing wpiflash, due to licensing terms Signed-off-by: Kishor Kumar <61860672+kkumar23@users.noreply.github.com>

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Signed-off-by: Kamil Rakoczy <krakoczy@antmicro.com>

Syntax update symbiflo_write_fasm to symbiflow_write_fasm Signed-off-by: Kishor Kumar <61860672+kkumar23@users.noreply.github.com>

Signed-off-by: Jan Kowalewski <jkowalewski@antmicro.com>

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

Signed-off-by: Jan Kowalewski <jkowalewski@antmicro.com>

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

Signed-off-by: Kishor Kumar <kkumar@quicklogic.com>

correcting command Signed-off-by: Kishor Kumar <61860672+kkumar23@users.noreply.github.com>

Signed-off-by: Kishor Kumar <61860672+kkumar23@users.noreply.github.com>

adding openocd Signed-off-by: Kishor Kumar <61860672+kkumar23@users.noreply.github.com>

Signed-off-by: Jan Kowalewski <jkowalewski@antmicro.com>

Signed-off-by: Robert Winkler <rwinkler@antmicro.com>

This changes enables the option of using custom v2x package. Signed-off-by: Robert Winkler <rwinkler@antmicro.com>

This change is required by the quicklogic-yosys conda package, used in the quicklogic kokoro CI. Signed-off-by: Robert Winkler <rwinkler@antmicro.com>

litghost · 2020-11-09T20:51:39Z

This PR will require all of the v2x PRs to be merged:

SymbiFlow/python-symbiflow-v2x#75

SymbiFlow/python-symbiflow-v2x#32

From the discussions in the v2x PRs, I see that still some of the issues are unresolved. What's more, the solutions proposed there will require a lot of changes in the existing QuickLogic support.

Given your statement, that needs to be fixed first then? So order for now should be:

Get relevant v2x PR's merged
Start creating PR's for the relevant python scripts
Work on updating verilog per v2x PR changes
etc

litghost · 2020-11-09T21:03:25Z

@rw1nkler New QuickLogic job is up and running. I tested the presubmit job in #1762 and hopefully the master job will be green too.

rw1nkler changed the title ~~Add QuickLogic support~~ [WIP] Add QuickLogic support Nov 6, 2020

litghost reviewed Nov 6, 2020

View reviewed changes

litghost suggested changes Nov 6, 2020

View reviewed changes

litghost reviewed Nov 6, 2020

View reviewed changes

litghost suggested changes Nov 6, 2020

View reviewed changes

rw1nkler mentioned this pull request Nov 9, 2020

Add QuickLogic CI configuration #1760

Merged

mkurc-ant added 16 commits November 9, 2020 15:15

Updated create_ioplace.py so that IOB placement may depend on its type

010e519

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Fixed a bug with QMUX fanout routes

c3afd87

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Added a techmap for ckpad

e863f2f

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Added dumy timings for delayless routes to satisfy VPR

8754373

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Refactored routing_import.py

0877f15

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Changed IS0, IS1 and HSCKIN connections to QMUX to be of type CLOCK

66e625e

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Separate model for switchbox at QMUX locations

66d02b2

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Changed the VPR model for GMUX to allow using of the IC input when th…

cf03348

…e IP input is unconnected (no CLOCK pad) Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Symlinking instead of copying cells_map.v

b75b4d2

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Added import of QMUX and CAND cell timings to the rr graph

1135aea

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Removed -noflatten from synth.tcl, added hint attributes to primitives.

57af393

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Added relocation of CAND cells so they occupy only even rows.

ac239dd

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Fixed QMUX fasm features, added CAND fasm features

4f0ac17

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Added correct SDF timing scale for route-though cells.

fc7d22c

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Added fasm features to GMUX cells

0b69ea4

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

Removed debugging prints

3deb0f5

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

kkumar23 and others added 26 commits November 9, 2020 15:15

Update CMakeLists.txt

0536c13

Removing wpiflash, due to licensing terms Signed-off-by: Kishor Kumar <61860672+kkumar23@users.noreply.github.com>

Updated gclk_counter test to use SDC constraints

3c49c82

Signed-off-by: Maciej Kurc <mkurc@antmicro.com>

toolchain_wrappers: add symbiflow prefix to toolchain wrappers

0691646

Signed-off-by: Kamil Rakoczy <krakoczy@antmicro.com>

Update ql_symbiflow

f1b09da

Syntax update symbiflo_write_fasm to symbiflow_write_fasm Signed-off-by: Kishor Kumar <61860672+kkumar23@users.noreply.github.com>

Add openocd format config generation for IOMUX

747b20d

Signed-off-by: Jan Kowalewski <jkowalewski@antmicro.com>

Set output-format to jlink for jlink stage

e1b8e1f

Signed-off-by: Jan Kowalewski <jkowalewski@antmicro.com>

Add openocd to toolchain_wrappers

6d661af

Signed-off-by: Jan Kowalewski <jkowalewski@antmicro.com>

jimbob: fix pads when no alias is present

fdc73bc

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

Add openocd stage to cmake

9633bef

Signed-off-by: Jan Kowalewski <jkowalewski@antmicro.com>

Add description of openocd stage to README

2f59b4a

Signed-off-by: Jan Kowalewski <jkowalewski@antmicro.com>

Add openocd option to quicklogic tests

62f9d76

Signed-off-by: Jan Kowalewski <jkowalewski@antmicro.com>

rr_graph: remove penalty cost from switches

c2b0dbb

Signed-off-by: Alessandro Comodi <acomodi@antmicro.com>

add designs

ee28a82

Signed-off-by: Kishor Kumar <kkumar@quicklogic.com>

add designs

6a5f120

Signed-off-by: Kishor Kumar <kkumar@quicklogic.com>

Update ql_symbiflow

e3a1733

correcting command Signed-off-by: Kishor Kumar <61860672+kkumar23@users.noreply.github.com>

Update symbiflow_place

ab94f73

Signed-off-by: Kishor Kumar <61860672+kkumar23@users.noreply.github.com>

Update symbiflow_write_fasm2bels

4732a32

Signed-off-by: Kishor Kumar <61860672+kkumar23@users.noreply.github.com>

Update ql_symbiflow

23ab7ae

adding openocd Signed-off-by: Kishor Kumar <61860672+kkumar23@users.noreply.github.com>

Update submodules

ef51ba0

Signed-off-by: Jan Kowalewski <jkowalewski@antmicro.com>

Add quicklogic python packages

0db7964

Signed-off-by: Robert Winkler <rwinkler@antmicro.com>

Adjust quicklogic directory for make-env usage

4784fa1

Signed-off-by: Robert Winkler <rwinkler@antmicro.com>

Add write_sdc command to fix tests building

32c6554

Signed-off-by: Robert Winkler <rwinkler@antmicro.com>

Add OUT_SDC to quicklogic toolchain_wrappers

68f7b06

Signed-off-by: Robert Winkler <rwinkler@antmicro.com>

Add kokoro setup for quicklogic

6dc704f

Signed-off-by: Robert Winkler <rwinkler@antmicro.com>

Remove unnecessary v2x dependencies

4bb71ec

This changes enables the option of using custom v2x package. Signed-off-by: Robert Winkler <rwinkler@antmicro.com>

[FIXME] Set python version to 3.7

beeb347

This change is required by the quicklogic-yosys conda package, used in the quicklogic kokoro CI. Signed-off-by: Robert Winkler <rwinkler@antmicro.com>

rw1nkler force-pushed the ql_clean branch from b645a94 to beeb347 Compare November 9, 2020 14:22

mkurc-ant changed the title ~~[WIP] Add QuickLogic support~~ [WIP] Add QuickLogic EOS-S3 support Jun 14, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Add QuickLogic EOS-S3 support #1758

[WIP] Add QuickLogic EOS-S3 support #1758

rw1nkler commented Nov 6, 2020 •

edited

Loading

rw1nkler commented Nov 6, 2020 •

edited

Loading

litghost Nov 6, 2020

litghost left a comment

litghost Nov 6, 2020

litghost Nov 6, 2020

litghost left a comment

litghost left a comment

litghost left a comment

litghost commented Nov 6, 2020

litghost commented Nov 6, 2020

litghost commented Nov 6, 2020

rw1nkler commented Nov 9, 2020

litghost commented Nov 9, 2020

litghost commented Nov 9, 2020

[WIP] Add QuickLogic EOS-S3 support #1758

Are you sure you want to change the base?

[WIP] Add QuickLogic EOS-S3 support #1758

Conversation

rw1nkler commented Nov 6, 2020 • edited Loading

rw1nkler commented Nov 6, 2020 • edited Loading

litghost Nov 6, 2020

Choose a reason for hiding this comment

litghost left a comment

Choose a reason for hiding this comment

litghost Nov 6, 2020

Choose a reason for hiding this comment

litghost Nov 6, 2020

Choose a reason for hiding this comment

litghost left a comment

Choose a reason for hiding this comment

litghost left a comment

Choose a reason for hiding this comment

litghost left a comment

Choose a reason for hiding this comment

litghost commented Nov 6, 2020

litghost commented Nov 6, 2020

litghost commented Nov 6, 2020

rw1nkler commented Nov 9, 2020

litghost commented Nov 9, 2020

litghost commented Nov 9, 2020

rw1nkler commented Nov 6, 2020 •

edited

Loading

rw1nkler commented Nov 6, 2020 •

edited

Loading