Skip to content

Bump firesim to version with detached build.sbt #1864

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

Merged
jerryz123 merged 2 commits into from
Apr 29, 2024
Merged

Bump firesim to version with detached build.sbt #1864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2a2654
Bump firesim to version with detached build.sbt
jerryz123 Apr 25, 2024
52d43c1
Update firesim build-setup pre-compile classpath commands
jerryz123 Apr 25, 2024
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
4 changes: 2 additions & 2 deletions .github/scripts/defaults.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ mapping["chipyard-clusters"]=" CONFIG=ClusteredRocketConfig verilog"
mapping["chipyard-aes256ecb"]=" CONFIG=AES256ECBRocketConfig"

mapping["constellation"]=" SUB_PROJECT=constellation"
mapping["firesim"]="SCALA_TEST=firesim.firesim.RocketNICF1Tests"
mapping["fireboom"]="SCALA_TEST=firesim.firesim.BoomF1Tests"
mapping["firesim"]="TARGET_CONFIG=WithNIC_DDR3FRFCFSLLC4MB_FireSimRocketConfig"
mapping["fireboom"]="TARGET_CONFIG=DDR3FRFCFSLLC4MB_FireSimLargeBoomConfig"
mapping["icenet"]="SUB_PROJECT=icenet"
mapping["testchipip"]="SUB_PROJECT=testchipip"
mapping["rocketchip-amba"]="SUB_PROJECT=rocketchip CONFIG=AMBAUnitTestConfig"
Expand Down
10 changes: 4 additions & 6 deletions .github/scripts/remote-run-firesim-scala-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ source $SCRIPT_DIR/defaults.sh
cd $REMOTE_CHIPYARD_DIR
./scripts/init-submodules-no-riscv-tools.sh

# Run Firesim Scala Tests
# Test firesim compile and metasim
export FIRESIM_ENV_SOURCED=1
export COURSIER_CACHE=$REMOTE_COURSIER_CACHE
export JVM_MEMORY=10G
export JAVA_TMP_DIR=$REMOTE_JAVA_TMP_DIR
export TEST_DISABLE_VIVADO=1
make -C $REMOTE_FIRESIM_DIR TARGET_SBT_PROJECT="{file:$REMOTE_CHIPYARD_DIR}firechip" testOnly ${mapping[$1]}
cd $REMOTE_FIRESIM_DIR
make TARGET_PROJECT=firesim EMUL=verilator ${mapping[$1]} run-verilator SIM_BINARY=$RISCV/riscv64-unknown-elf/share/riscv-tests/isa/rv64ui-p-simple

3 changes: 2 additions & 1 deletion scripts/build-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,8 @@ if run_step "6"; then
echo $CYDIR
source sourceme-manager.sh --skip-ssh-setup
pushd sim
make sbt SBT_COMMAND="project {file:$CYDIR}firechip; compile" TARGET_PROJECT=firesim
make target-classpath
make firesim-main-classpath
popd
)
exit_if_last_command_failed
Expand Down
2 changes: 1 addition & 1 deletion sims/firesim
Open in desktop
Submodule firesim updated 10 files
+71 −15 sim/build.sbt
+1 −0 sim/chipyard-symlink
+1 −50 sim/make/chipyard.mk
+2 −2 sim/make/goldengate.mk
+34 −10 sim/make/scala-build.mk
+1 −1 sim/src/main/makefrag/bridges/build.mk
+1 −1 sim/src/main/makefrag/fasedtests/build.mk
+1 −1 sim/src/main/makefrag/firesim/build.mk
+1 −1 sim/src/main/makefrag/firesim/config.mk
+1 −1 sim/src/main/makefrag/midasexamples/build.mk