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

A Pair of Phase-Ordering Fixes #2424

Merged
merged 2 commits into from
Apr 20, 2020
Merged

A Pair of Phase-Ordering Fixes #2424

merged 2 commits into from
Apr 20, 2020

Conversation

davidbiancolin
Copy link
Contributor

While bumping Rocket Chip in Chipyard i ran into a couple of order issues with the initial Stage / Phase implementation. There many ways they can be fixed, but this is what i did:

  1. The dependency manager can schedule TransformAnnotations behind chisel's AddImplicitOutputFile phase, which leads the down stream phases to use the instance of the annotation provided by AddImplicitOutputFile and not TransformAnnotations. I added a dependency between the two phases to resolve this.

  2. The dependency manager can schedule AddDefaultTestSuites ahead of GenerateFirrtlAnnos, which leads to RocketTestSuiteAnnotations being serialized when they cannot be. While there are myriad ways to fix this i've simply marked them as unserializable.

Type of change: bug report

Impact: no functional change

Development Phase: implementation

Release Notes

  • [stage] Fix a bug where unserializable RocketTestSuiteAnnotations were being serialized
  • [stage] Fix a bug where the desired output file name was being superseded by another phase

Copy link
Contributor

@debs-sifive debs-sifive left a comment

Choose a reason for hiding this comment

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

Looks good. Thanks for catching/fixing!

@davidbiancolin davidbiancolin merged commit 3f7074f into master Apr 20, 2020
@davidbiancolin
Copy link
Contributor Author

No problem. :)

@davidbiancolin davidbiancolin deleted the stage-ordering-fixes branch April 20, 2020 19:56
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.

2 participants