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

Bump Rocketchip to June 2020 for Tile changes #605

Merged
merged 7 commits into from
Jun 24, 2020
Merged

Bump Rocketchip to June 2020 for Tile changes #605

merged 7 commits into from
Jun 24, 2020

Conversation

jerryz123
Copy link
Contributor

@jerryz123 jerryz123 commented Jun 18, 2020

Rocketchip bump to grab generic Tile instantiation changes.

Related issue:
chipsalliance/rocket-chip#2504

Type of change: new feature

Impact: rtl change

Release Notes

  • Legacy references to XTilesKey are removed everywhere
  • TraceGen, BOOM, and Ariane tiles now use TilesLocated key
  • Chipyard System/Subsystem renamed to ChipyardSystem/ChipyardSubsystem to avoid name conflict with RC
  • WithControlCore removed (this was duplicate of WithNSmallCores).
  • ChipyardSubsystem now uses generic HasTiles to instantiate tiles

Submodule bumps:

@jerryz123 jerryz123 force-pushed the rc-retile branch 2 times, most recently from 06dd012 to b061e67 Compare June 18, 2020 18:58
Copy link
Contributor

@colinschmidt colinschmidt left a comment

Choose a reason for hiding this comment

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

My biggest complaint is with removing the PMU config.

generators/chipyard/src/main/scala/ConfigFragments.scala Outdated Show resolved Hide resolved

import testchipip.{DromajoHelper}
Copy link
Contributor

Choose a reason for hiding this comment

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

🎉

if (cfg.fLen >= 64)
addSuites(env.map(rv64ud))
p(TilesLocated(InSubsystem)).find(_.tileParams.hartId == 0).map {
case tp: RocketTileAttachParams => {
Copy link
Contributor

Choose a reason for hiding this comment

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

These seem quite redundant to me but that refactor is definitely for another PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I agree with both statements

generators/tracegen/src/main/scala/Configs.scala Outdated Show resolved Hide resolved
Copy link
Contributor

@colinschmidt colinschmidt left a comment

Choose a reason for hiding this comment

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

LGTM now that I understand what happened to the PMU config.
Love to see iso-feature negative LoC PRs!

@davidbiancolin
Copy link
Contributor

Are you planning to test this in FireSim?

@jerryz123
Copy link
Contributor Author

Are you planning to test this in FireSim?

I can push a rocket config through, but I wasn't planning on regenerating AGFIs, since no FireSim changes were necessary.

@davidbiancolin
Copy link
Contributor

Considering there are 234 new commits i want to see an AGFI regeneration + linux boots.

@davidbiancolin
Copy link
Contributor

I've been placated. I too am always down for the net negative code change.

@jerryz123 jerryz123 merged commit 84e672c into dev Jun 24, 2020
@jerryz123 jerryz123 deleted the rc-retile branch August 24, 2020 17:55
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.

3 participants