Fix Double Elaboration Backportably #1426
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
LGTM. This cleanly subsumes my PR. |
davidbiancolin
approved these changes
May 6, 2020
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
Remove the requirement that FirrtlStage runs elaboration (this should be implicit) and remove the unneeded invalidation of elaboration by the Emitter. Due to Convert currently NOT invalidating Elaborate (when it should), add an optionalPrerequisiteOf to ensure that the Emitter runs before the Convert phase. Co-authored-by: David Biancolin <david.biancolin@gmail.com> Co-authored-by: Schuyler Eldridge <schuyler.eldridge@ibm.com> Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
mergify bot
added a commit
that referenced
this pull request
May 6, 2020
* Test that Elaborate only runs once Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com> (cherry picked from commit bfb5b35) * Expose ChiselStage's PhaseManager, rm extra wraps Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com> (cherry picked from commit 23db44a) * Fix double elaboration Remove the requirement that FirrtlStage runs elaboration (this should be implicit) and remove the unneeded invalidation of elaboration by the Emitter. Due to Convert currently NOT invalidating Elaborate (when it should), add an optionalPrerequisiteOf to ensure that the Emitter runs before the Convert phase. Co-authored-by: David Biancolin <david.biancolin@gmail.com> Co-authored-by: Schuyler Eldridge <schuyler.eldridge@ibm.com> Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com> (cherry picked from commit 5e2ca44) Co-authored-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a replacement for #1412 that also fixes the double elaboration problem in a backwards compatible way. This PR does the following things:
Elaboraterun inChiselStage(you don't care that elaboration ran and wasn't invalidated)Elaborateby theEmitter(the emitter doesn't touch any annotations)optionalPrerequisiteOffromEmitter->Convertto get the correct ordering (this is @davidbiancolin's Have phases.Emitter name phases.Convert as a dependent #1412)To test this, this adds:
ChiselStageexposes it's phase managerWhen running
ChiselStage, you now get the following phase order:This cannot fix the bug where
Convertshould invalidateElaboratedue to the use ofPreservesAll. Mixing inPreservesAllor removing it from being mixed in is backwards incompatible and should probably be killed 1.4. 😬Closes #1412
Related issue: #1412, #1418
Type of change: bug fix
Impact: API addition (no impact on existing code)
Development Phase: implementation
Release Notes