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

Rebuild jars when sv/v files are changed + Add documentation on blackboxes #1639

Merged
merged 7 commits into from
Nov 6, 2023

Conversation

abejgonzalez
Copy link
Contributor

@abejgonzalez abejgonzalez commented Nov 1, 2023

  • Moves Verilog make dependencies up to jar generation so that Verilog files are properly updated in the jar. This was bugged before since you would have to recompile Scala sources to see the Verilog sources change.
  • Adds documentation on some of the corner cases of adding blackboxes
  • Updates insert includes script to be recursive (if an include has include within it, rerun the replacement)
  • Bump firtool to 1.58.0
  • Updates the generate-conda-lockfiles script to delete the lockfile before regenerating (fixes issue where conda-lock would get stuck regenerating the lockfile if the lockfile pre-existed)
  • Moves GCD to avoid 0x1000 (same address as bootrom)

It also exposes a bug mentioned here: #1624 (comment). This is an issue in MFC that needs to get solved.

The error being that duplicate addPath calls cannot exist (not sure if having a different module name will fix the issue). Error message is the following:

Cannot find file /scratch/abejgonza/cy/generators/chipyard/src/main/resources/vsrc/GCDMMIOBlackBox.v

Related PRs / Issues:

Type of change:

  • Bug fix
  • New feature
  • Other enhancement

Impact:

  • RTL change
  • Software change (RISC-V software)
  • Build system change
  • Other

Contributor Checklist:

  • Did you set main as the base branch?
  • Is this PR's title suitable for inclusion in the changelog and have you added a changelog:<topic> label?
  • Did you state the type-of-change/impact?
  • Did you delete any extraneous prints/debugging code?
  • Did you mark the PR with a changelog: label?
  • (If applicable) Did you update the conda .conda-lock.yml file if you updated the conda requirements file?
  • (If applicable) Did you add documentation for the feature?
  • (If applicable) Did you add a test demonstrating the PR?
  • (If applicable) Did you mark the PR as Please Backport?

@abejgonzalez
Copy link
Contributor Author

Testing with firtool-1.58 seems to fix the bug. I'll update the conda-forge feedstock.

@abejgonzalez abejgonzalez changed the title Bb fixes Rebuild jars when sv/v files are changed + Add documentation on blackboxes Nov 2, 2023
common.mk Show resolved Hide resolved
Copy link
Contributor

@jerryz123 jerryz123 left a comment

Choose a reason for hiding this comment

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

LGTM.

@abejgonzalez abejgonzalez merged commit 8655d3c into main Nov 6, 2023
52 of 53 checks passed
@jerryz123 jerryz123 deleted the bb-fixes branch January 21, 2024 00:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants