-
Notifications
You must be signed in to change notification settings - Fork 651
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
Chisel 3.4, FIRRTL 1.4 and Rocket Chip November Bump #719
Conversation
Note: firesim and barstools point to commits in the sifive forks of those repos I didn't update the URL in .gitmodules because I'm not sure how that works in a PR (because you wouldn't really want to merge sync'ing to the sifive repo). Requires: ucb-bar/barstools#92 and firesim/firesim#658 The version of rocket-chip, chisel3 and firrtl is chosen here because it is the latest known to pass my tests. You will likely want to bump further.
I'm not exactly sure how FIRRTL is built *yet since the JAR isn't built 1st... However, these changes seem to make it decently far into the build until |
1dc982d
to
9d9813f
Compare
Looks like you've started figuring this out because I see sbt-sriracha added to the Let me know if you'd like some help getting the sbt-sriracha stuff ironed out. I'd be happy to submit another PR to merge into your local-chisel34 branch. I talked to @davidbiancolin about this yesterday afternoon. Wasn't sure if you guys would want to switch over to using it and didn't include it in what I had in #717 |
Thanks for the look. I was just quickly trying to hack stuff up so this may not be the cleanest bump at the moment. Funny enough, I wasn't able to duplicate the sbt-sriracha stuff that Rocket does in CY. I would get errors stating that In any case, even though CY is not using sbt-sriracha, it needs to be added in CY's plugins since it is used in FIRRTL/Chisel/RC (I believe that SBT doesn't inherit sub-project plugins... though my SBT knowledge is lacking). For now this most recent PR seems to build Chisel/FIRRTL properly from source so maybe the issue is using |
How do you invoke SBT? SBT only picks up
This is correct
Make sure to check your classpaths to see if you're getting the Chisel you think you're getting. eg.
|
You can see the SBT invocation in the
I will look into this to double-check... but I'm pretty sure it's building the right FIRRTL/Chisel since it is giving the compile warnings for the |
…es between projects | Bump CY collateral
.gitmodules
Outdated
@@ -76,7 +76,7 @@ | |||
url = https://github.com/ucb-bar/dsptools.git | |||
[submodule "tools/chisel-testers"] | |||
path = tools/chisel-testers | |||
url = https://github.com/freechipsproject/chisel-testers.git | |||
url = https://github.com/abejgonzalez/chisel-testers.git |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Switched to my own fork until chisel-testers
is updated.
@abejgonzalez can you share the commands you're using in Chipyard so that I can reproduce the error you're running into? Are you using 'make' commands or just doing things at the SBT prompt right now? |
Things are a bit in flux right now. Looks like some things were getting cached so building from a fresh Chipyard repo would get different errors. Im trying to track down some things as we speak. However, in the meantime, the basic steps are:
|
f6aa329
to
9545abb
Compare
…ll bump for barstools
Co-authored-by: Abraham Gonzalez <abe.j.gonza@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't really understand the rationale for some of the SBT changes -- some comments should be added to explain intent, particularly regarding the ANTLR change, and the key-lookup for library dependencies.
Other than that, this LGTM. |
Brief Explanations / Reasoning on
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM let's ship this
Related PR: #717 , ucb-bar/barstools#87, firesim/firesim#658 ucb-bar/cva6-wrapper#10 ucb-bar/gemmini#37 ucb-bar/hwacha#23 ucb-bar/riscv-sodor#59 ucb-bar/sha3#27 ucb-bar/dsptools#217 ucb-bar/testchipip#107 ucb-bar/barstools#87
Type of change: other enhancement
Impact: all RTL generation
Release Notes
Thanks @timsnyder-siv for helping out with this and the FireSim side of this.
This is a local version of #717 that bumps multiple repos to use Chisel 3.4 / FIRRTL 1.4 / RC Nov.
Changes
JAVA_ARGS
toJAVA_OPTS
(done so that people could use thesbt
bash script instead of just the launcher and it still works with Chipyard)SBT_OPTS
fromJAVA_OPTS
(clearer distinction between the two and also supports thesbt
bash script)*_OPTS
env. varsbloop
supportexport ENABLE_SBT_THIN_CLIENT=1
build.sbt
refactoring including RC changesmake
targets to launch console (sbt
) and shutdown/start thin server (<start/shutdown>-sbt-server
); X; Y; Z;
syntax to run multiple SBT commands