Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support for Riviera-PRO #6

Merged
merged 4 commits into from
Apr 8, 2020

Conversation

dawidzim
Copy link
Contributor

@dawidzim dawidzim commented Apr 3, 2020

Hey!
This is pull request with support for Riviera-PRO. To fully work need to:

@@ -70,6 +70,10 @@ targets:
generate : [intercon, swerv_default_config, version]
parameters : [SIMPRINT=true, jtag_vpi_enable, ram_init_file=hello.vh, rom_init_file, signature, timeout, vcd]
tools:
rivierapro:
vlog_options :
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of having to specify compilation_mode on the command-line, it's better to just set compilation_mode : common in the rivierapro tool options

To build and run on Riviera-Pro simulator

fusesoc run --target=sim --tool=rivierapro swervolf --compilation_mode=common

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I mentioned in the other commit, set compilation mode directly in the core file instead of having to set it on the command-line

@olofk
Copy link
Collaborator

olofk commented Apr 8, 2020

Thanks for this. I have addressed the PRs for Edalize and axi_node now. For SweRV we can solve this with a FuseSoC patch until the fix is upstreamed. Will get back when I have fixed that

@olofk
Copy link
Collaborator

olofk commented Apr 8, 2020

ok, I pulled in the SweRV fix as a patch in the core file

If you can verify that it works and change this PR to set compilation_mode directly in the core file, I am happy to pull it in

cores/swerv.core Outdated
@@ -100,6 +100,8 @@ targets:
rivierapro:
vlog_options :
- config/common_defines.vh
compilation_mode:
- common
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

compilation mode is defined as string, not a list, so this should be compilation_mode : common

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, sorry my bad

@olofk olofk merged commit 91c953c into chipsalliance:master Apr 8, 2020
@olofk
Copy link
Collaborator

olofk commented Apr 8, 2020

Fantastic! Squashed and merged. Many thanks for your support

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants