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

Use Published Chisel, FIRRTL, Treadle, FIRRTLInterpreter packages instead of building from source. #1054

Merged
merged 14 commits into from
Dec 8, 2021

Conversation

davidbiancolin
Copy link
Contributor

@davidbiancolin davidbiancolin commented Dec 1, 2021

There's still lots of cleanup that can be done, but this is most of the work.

Two warts:

  • FIreSim needs classes from firrtl test. I don't really want to build FIRRTL from source just for this so i might just copy those sources directly in to FireSIm.
    • Copied into tree.
  • We're still building chisel-testers from source. I suspect we can pull this in too once we've bumped to 3.5 and friends though.

TODO:

  • Remove unused SBT code
  • Probably bump FireSim and rebase, before considering a merge
  • Fix FIRRTL test handling in FireSim.
  • Remove sriracha + java command line options

Related issue:

Type of change: other enhancement

Impact: build system

Release Notes

Comment on lines +75 to +81
lazy val chipyardMandatedVersions = Map(
"chisel-iotesters" -> "1.5.4",
"firrtl-interpreter" -> "1.4.4",
"treadle" -> "1.3.4",
"chisel3" -> chiselVersion,
"firrtl" -> firrtlVersion
)
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are you using .4 for other things but 3.4.1 and 1.4.1 for chisel3 and firrtl? I'll note that using chisel-iotesters 1.5.4 might override the chisel3 to 3.4.4 anyway, you should check this in sbt with fullClasspath to see what actual jars you're using.

Copy link
Contributor

Choose a reason for hiding this comment

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

It is also possible that because you're giving chisel3 directly though it might pick your version.

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 just picked the versions we had submoduled in. Looking at the class path FIRRTL 1.4.4 is showing up in some projects likely because of the first three dependencies. I can bump to chisel 3.4.4 and FIRRTL 1.4.4 but i was scared of changing too much, especially given this is going to be quickly followed by a 3.5 bump.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Bumped to X.4.4.

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.

I would confirm what Jack said. But overall LGTM

build.sbt Outdated Show resolved Hide resolved
build.sbt Show resolved Hide resolved
variables.mk 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.

LGTM

@davidbiancolin davidbiancolin reopened this Dec 8, 2021
@davidbiancolin davidbiancolin merged commit ec1b075 into dev Dec 8, 2021
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