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

Get ChiselSim working with CIRCT 1.66+ (backport #3890) #3892

Merged
merged 1 commit into from
Mar 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 1, 2024

This is an automatic backport of pull request #3890 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com


Original PR Body

Fix an incorrect assumption in ChiselSim that a 'filelist.f' will exist that includes all modules, including blackboxes, in the design. Change this to try to also copy files from the black box filelist. This makes ChiselSim work with CIRCT 1.66 and earlier (which put everything in 'filelist.f') and CIRCT 1.66+ (which does not include blackboxes in 'filelist.f').

Note that this is intended as a temporary solution until FIRRTL has a rock solid ABI that is implemented by CIRCT where all modules can be discovered under an arbitrary public module.

See CIRCT changes here: llvm/circt#6729

This fixes the nightly failure seen here: https://github.com/chipsalliance/chisel/actions/runs/8110395678

Release Notes

Change ChiselSim to also move blackboxes as indicated by the default black box filelist. This fixes issues with ChiselSim and CIRCT 1.67.0 introduced in (llvm/circt#6729). This is a backwards compatible change that has no effect on earlier versions of CIRCT.

Fix an incorrect assumption in ChiselSim that a 'filelist.f' will exist
that includes all modules, _including blackboxes_, in the design.  Change
this to try to also copy files from the black box filelist.  This makes
ChiselSim work with CIRCT 1.66 and earlier (which put everything in
'filelist.f') and CIRCT 1.66+ (which does not include blackboxes in
'filelist.f').

Note that this is intended as a temporary solution until FIRRTL has a rock
solid ABI that is implemented by CIRCT where all modules can be discovered
under an arbitrary public module.

See CIRCT changes here: llvm/circt#6729

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
(cherry picked from commit 9448d32)
@mergify mergify bot added the Backport Automated backport, please consider for minor release label Mar 1, 2024
@github-actions github-actions bot added the Bugfix Fixes a bug, will be included in release notes label Mar 1, 2024
@chiselbot chiselbot merged commit f17a8d2 into 6.x Mar 1, 2024
17 checks passed
@chiselbot chiselbot deleted the mergify/bp/6.x/pr-3890 branch March 1, 2024 17:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport Automated backport, please consider for minor release Bugfix Fixes a bug, will be included in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants