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

Remove gen-collateral when rebuilding #1342

Merged
merged 4 commits into from
Feb 16, 2023
Merged

Conversation

joonho3020
Copy link
Contributor

Related PRs / Issues:

This PR addresses #1341.
Removes $(OUT_DIR) which is gen-collateral when re-compiling.

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.

Why not just change the FIRTOOL recipe to rm -rf $(OUT_DIR) and list it as a target? That seems less invasive.

@jerryz123
Copy link
Contributor

In the process, can we also rename OUT_DIR to something more descriptive? GEN_COLLATERAL_DIR?

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.

Implementation looks clean. I'll test this once this gets merged.

@abejgonzalez
Copy link
Contributor

The prior approach didn't enforce that the collateral directory would be rebuilt. This new approach basically forces sim_files to be generated after the FIRTOOL target (this was already done with the sim_common_files target) and removes the collateral directory in the FIRTOOL target.

vlsi/Makefile Outdated Show resolved Hide resolved
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.

The renaming LGTM. Pending reviews from others on the rm -rf

@abejgonzalez abejgonzalez merged commit df903f0 into main Feb 16, 2023
@jerryz123 jerryz123 deleted the remove-gen-collateral branch February 16, 2023 00:42
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.

4 participants