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

Make -e option work with ChiselStage methods #1630

Merged
merged 3 commits into from
Oct 21, 2020
Merged

Make -e option work with ChiselStage methods #1630

merged 3 commits into from
Oct 21, 2020

Conversation

seldridge
Copy link
Member

Prevent a None.get where a user passes a -e (one-file-per-module) option to one of the ChiselStage methods. This was previously checking for the only a circuit, but throwing in -e would cause modules to be emitted. Append all the modules together and return this string.

Fixes #1629

Contributor Checklist

  • [n/a] Did you add Scaladoc to every public function/method?
  • Did you add at least one test demonstrating the PR?
  • Did you delete any extraneous printlns/debugging code?
  • Did you specify the type of improvement?
  • [n/a] Did you add appropriate documentation in docs/src?
  • Did you state the API impact?
  • Did you specify the code generation impact?
  • Did you request a desired merge strategy?
  • Did you add text to be included in the Release Notes for this change?

Type of Improvement

  • bug fix

API Impact

None.

Backend Code Generation Impact

None.

Desired Merge Strategy

  • Squash: The PR will be squashed and merged (choose this if you have no preference.

Release Notes

None.

Reviewer Checklist (only modified by reviewer)

  • Did you add the appropriate labels?
  • Did you mark the proper milestone (3.2.x, 3.3.x, 3.4.0, 3.5.0) ?
  • Did you review?
  • Did you check whether all relevant Contributor checkboxes have been checked?
  • Did you mark as Please Merge?

@seldridge seldridge requested a review from a team as a code owner October 21, 2020 20:52
@seldridge seldridge requested review from albert-magyar and removed request for a team October 21, 2020 20:52
@seldridge seldridge added the Bugfix Fixes a bug, will be included in release notes label Oct 21, 2020
@seldridge seldridge added this to the 3.4.x milestone Oct 21, 2020
@seldridge seldridge added the Please Merge Accepted PRs that are ready to be merged. Useful when waiting on CI. label Oct 21, 2020
@mergify mergify bot merged commit 26deb77 into master Oct 21, 2020
mergify bot pushed a commit that referenced this pull request Oct 21, 2020
* Fix `-e` option causing ChiselStage.emit* to error

Signed-off-by: Schuyler Eldridge <[email protected]>

* Add test of `-e` ChiselStage behavior

Signed-off-by: Schuyler Eldridge <[email protected]>

* fixup! Add test of `-e` ChiselStage behavior

(cherry picked from commit 26deb77)
@mergify mergify bot added the Backported This PR has been backported label Oct 21, 2020
mergify bot added a commit that referenced this pull request Oct 22, 2020
* Fix `-e` option causing ChiselStage.emit* to error

Signed-off-by: Schuyler Eldridge <[email protected]>

* Add test of `-e` ChiselStage behavior

Signed-off-by: Schuyler Eldridge <[email protected]>

* fixup! Add test of `-e` ChiselStage behavior

(cherry picked from commit 26deb77)

Co-authored-by: Schuyler Eldridge <[email protected]>
@jackkoenig jackkoenig deleted the issue-1629 branch July 7, 2021 03:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backported This PR has been backported Bugfix Fixes a bug, will be included in release notes Please Merge Accepted PRs that are ready to be merged. Useful when waiting on CI.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

One-file-per-module is incompatible with ChiselStage.emit*
2 participants