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

Fix classpath_cache bug #1880

Merged
merged 4 commits into from
May 16, 2024
Merged

Fix classpath_cache bug #1880

merged 4 commits into from
May 16, 2024

Conversation

jerryz123
Copy link
Contributor

@jerryz123 jerryz123 commented May 16, 2024

Previously, the chipyard.jar cache was built with SBT_PROJECT (usually chipyard) as the top-level project. This causes a bug where after building the jar with SBT_PROJECT=chipyard, future fpga compilations (with SBT_PROJECT=fpga_platforms) would fail due to not rebuilding the cache.

This PR updates the build system to build a separate jar for the fpga flow that includes the fpga-specific sources.

This renames fpga_platforms to chipyard_fpga to make it clearer that that project is an extension of chipyard with fpga configs.

This renames CHIPYARD_CLASSPATH to GENERATOR_CLASSPATH to make it clearer that the this classpath must contain a Generator main to run, but it does not have to be the chipyard project in build.sbt

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?

Copy link
Contributor

@abejgonzalez abejgonzalez left a comment

Choose a reason for hiding this comment

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

LGTM

@jerryz123 jerryz123 merged commit 309cbe9 into main May 16, 2024
53 of 54 checks passed
@jerryz123 jerryz123 deleted the classpath_fixes branch May 16, 2024 22:12
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