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.

Sign up for GitHub

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

Jump to bottom

Chisel 3.4, FIRRTL 1.4 and Rocket Chip November Bump #719

Merged
merged 49 commits into from
Dec 13, 2020
Merged

Chisel 3.4, FIRRTL 1.4 and Rocket Chip November Bump #719

Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
1110dd7
Bump RC, firesim and barstools for chisel3.4 updates
timsnyder-siv Nov 11, 2020
9ea23d4
Merge remote-tracking branch 'origin/dev' into local-chisel34
abejgonzalez Nov 16, 2020
ba59d03
Bump barstools
abejgonzalez Nov 16, 2020
70d4321
[temp] Unable to build/get past chisel-testers
abejgonzalez Nov 16, 2020
9d9813f
[temp] Following RC's way to build Chisel from source or Maven [ci skip]
abejgonzalez Nov 17, 2020
a0d479f
Working FIRRTL/RC/Chisel3 build | chisel-testers still broken
abejgonzalez Nov 17, 2020
5b1b4b3
Bump Gemmini/Hwacha/Sha3
abejgonzalez Nov 19, 2020
222580a
Bump dsptools
abejgonzalez Nov 20, 2020
571e751
Bump barstools, chisel-testers, dsptools | Split build.sbt dependenci…
abejgonzalez Nov 20, 2020
11ab0d7
Put libdeps back into commonSettings in build.sbt
abejgonzalez Nov 20, 2020
2b4fb55
Use ProjectRef for FIRRTL and use it for firrtl-interpreter
abejgonzalez Nov 20, 2020
51b254f
Small build.sbt cleanup
abejgonzalez Nov 20, 2020
c6e49e0
Follow RC's SBT sriracha use | Bump FIRRTL plugin
abejgonzalez Nov 20, 2020
6f82745
Helper make target to launch SBT | Move SBT_OPTS to SBT variable
abejgonzalez Nov 21, 2020
3dfc03c
Add more plugins and libdeps
abejgonzalez Nov 21, 2020
9545abb
Working elaboration (breaks during barstools FIRRTL)
abejgonzalez Nov 21, 2020
c223f18
Bump barstools
abejgonzalez Nov 26, 2020
8a46d4a
Bump BOOM and Barstools
abejgonzalez Nov 28, 2020
60e834c
Bump FireSim
abejgonzalez Nov 29, 2020
b7ed614
Attempt at "fixing" build.sbt | Bump sub-projects
abejgonzalez Dec 1, 2020
5bc7e6c
Support SBT thin client | Rename JAVA_ARGS -> OPTS | Support env. SBT…
abejgonzalez Dec 2, 2020
4e53dc1
Cleanly reload proj. defs. with thin client support
abejgonzalez Dec 2, 2020
a0e2dcf
Remove support for bloop
abejgonzalez Dec 2, 2020
08f3dbc
Bump FireSim
abejgonzalez Dec 2, 2020
1458853
Bump Hwacha
abejgonzalez Dec 2, 2020
3bc1bdb
Bump BOOM | Split JAVA/SBT options in CI
abejgonzalez Dec 2, 2020
eee0d58
Cleanup comment
abejgonzalez Dec 2, 2020
41c710b
Bump FireSim
abejgonzalez Dec 3, 2020
d19bcaa
Bump FireSim
abejgonzalez Dec 3, 2020
7f9cd0f
Bump FireSim | CI Fix Attempt: Increase heap
abejgonzalez Dec 3, 2020
f1df2ec
Bump FireSim/Hwacha | Cleanup linting
abejgonzalez Dec 3, 2020
d0079a9
Cleanup helper sbt targets | Use project/target/active.json for SBT t…
abejgonzalez Dec 3, 2020
70fa0a0
Print full stack traces (default traceLevel = 0) | Bump FireSim
abejgonzalez Dec 3, 2020
714687c
Add to help target | Cleanup build.sbt a bit more
abejgonzalez Dec 4, 2020
76ba68b
Bump hwacha
davidbiancolin Dec 10, 2020
1787fda
Bump icenet
davidbiancolin Dec 10, 2020
ee436c9
[firechip] Fix a uart multiclock bug
davidbiancolin Dec 10, 2020
f1f4799
Bump FireSim
davidbiancolin Dec 11, 2020
db15419
Bump barstools
davidbiancolin Dec 11, 2020
d4d483c
Bump BOOM | Use ucb-bar fork chisel-testers
abejgonzalez Dec 11, 2020
5c7c129
Bump Gemmini+Dsptools | Fix SBT_OPTs in CI
abejgonzalez Dec 11, 2020
939e3a9
Bump paradise plugin | Remove extra rm for SBT-server timestamp | Sma…
abejgonzalez Dec 11, 2020
fe4aa6c
Bump BOOM/Gemmini
abejgonzalez Dec 11, 2020
f1e3117
Bump barstools for test fixes | Small bump FireSim
abejgonzalez Dec 11, 2020
98a3e44
Merge remote-tracking branch 'origin/dev' into local-chisel34
abejgonzalez Dec 11, 2020
8f1e209
Update FireSim CI. Push threading into test context
davidbiancolin Dec 12, 2020
1bd5144
[ci skip] Fix Typo in firechip/src/test/scala/ScalaTestSuite.scala
davidbiancolin Dec 13, 2020
a8d6dae
Small build.sbt comments
abejgonzalez Dec 13, 2020
02f22e0
Bump build.sbt.patch [ci skip]
abejgonzalez Dec 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .circleci/defaults.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ REMOTE_ESP_DIR=$REMOTE_WORK_DIR/esp-tools-install
REMOTE_CHIPYARD_DIR=$REMOTE_WORK_DIR/chipyard
REMOTE_SIM_DIR=$REMOTE_CHIPYARD_DIR/sims/verilator
REMOTE_FIRESIM_DIR=$REMOTE_CHIPYARD_DIR/sims/firesim/sim
REMOTE_JAVA_OPTS="-Xmx10G -Xss8M"
# Disable the supershell to greatly improve the readability of SBT output when captured by Circle CI
REMOTE_JAVA_ARGS="-Xmx9G -Xss8M -Dsbt.ivy.home=$REMOTE_WORK_DIR/.ivy2 -Dsbt.supershell=false -Dsbt.global.base=$REMOTE_WORK_DIR/.sbt -Dsbt.boot.directory=$REMOTE_WORK_DIR/.sbt/boot"
REMOTE_SBT_OPTS="-Dsbt.ivy.home=$REMOTE_WORK_DIR/.ivy2 -Dsbt.supershell=false -Dsbt.global.base=$REMOTE_WORK_DIR/.sbt -Dsbt.boot.directory=$REMOTE_WORK_DIR/.sbt/boot"
REMOTE_VERILATOR_DIR=$REMOTE_PREFIX-$CIRCLE_SHA1-verilator-install

# local variables (aka within the docker container)
Expand Down
2 changes: 1 addition & 1 deletion .circleci/do-rtl-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ do
export PATH=\"$REMOTE_VERILATOR_DIR/bin:\$PATH\"; \
export VERILATOR_ROOT=\"$REMOTE_VERILATOR_DIR\"; \
export COURSIER_CACHE=\"$REMOTE_WORK_DIR/.coursier-cache\"; \
make -j$REMOTE_MAKE_NPROC -C $REMOTE_SIM_DIR FIRRTL_LOGLEVEL=info JAVA_ARGS=\"$REMOTE_JAVA_ARGS\" ${mapping[$key]}"
make -j$REMOTE_MAKE_NPROC -C $REMOTE_SIM_DIR FIRRTL_LOGLEVEL=info JAVA_OPTS=\"$REMOTE_JAVA_OPTS\" SBT_OPTS=\"$REMOTE_SBT_OPTS\" ${mapping[$key]}"
done

run "rm -rf $REMOTE_CHIPYARD_DIR/project"
Expand Down
2 changes: 1 addition & 1 deletion .circleci/run-firesim-scala-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ run "export RISCV=\"$TOOLS_DIR\"; \
export PATH=\"$REMOTE_VERILATOR_DIR/bin:\$PATH\"; \
export VERILATOR_ROOT=\"$REMOTE_VERILATOR_DIR\"; \
export COURSIER_CACHE=\"$REMOTE_WORK_DIR/.coursier-cache\"; \
make -C $REMOTE_FIRESIM_DIR JAVA_ARGS=\"$REMOTE_JAVA_ARGS\" testOnly ${mapping[$1]}"
make -C $REMOTE_FIRESIM_DIR JAVA_OPTS=\"$REMOTE_JAVA_OPTS\" SBT_OPTS=\"$REMOTE_SBT_OPTS\" testOnly ${mapping[$1]}"
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ tags
*~
env-riscv-tools.sh
env-esp-tools.sh
.bloop/
.bsp/
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/ucb-bar/chisel-testers.git
[submodule "tools/treadle"]
path = tools/treadle
url = https://github.com/freechipsproject/treadle.git
Expand Down
Loading