wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1864 from ucb-bar/fsim-detach

Browse Source 
Bump firesim to version with detached build.sbt
This commit is contained in:
Jerry Zhao
2024-04-29 14:40:05 -07:00
committed by GitHub
parent f28017b41a 52d43c1e0e
commit 75f3d46b57
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/scripts/defaults.sh vendored
View File

@@ -76,8 +76,8 @@ mapping["chipyard-clusters"]=" CONFIG=ClusteredRocketConfig verilog"
mapping["chipyard-aes256ecb"]=" CONFIG=AES256ECBRocketConfig" mapping["chipyard-aes256ecb"]=" CONFIG=AES256ECBRocketConfig"
mapping["constellation"]=" SUB_PROJECT=constellation" mapping["constellation"]=" SUB_PROJECT=constellation"
mapping["firesim"]="SCALA_TEST=firesim.firesim.RocketNICF1Tests" mapping["firesim"]="TARGET_CONFIG=WithNIC_DDR3FRFCFSLLC4MB_FireSimRocketConfig"
mapping["fireboom"]="SCALA_TEST=firesim.firesim.BoomF1Tests" mapping["fireboom"]="TARGET_CONFIG=DDR3FRFCFSLLC4MB_FireSimLargeBoomConfig"
mapping["icenet"]="SUB_PROJECT=icenet" mapping["icenet"]="SUB_PROJECT=icenet"
mapping["testchipip"]="SUB_PROJECT=testchipip" mapping["testchipip"]="SUB_PROJECT=testchipip"
mapping["rocketchip-amba"]="SUB_PROJECT=rocketchip CONFIG=AMBAUnitTestConfig" mapping["rocketchip-amba"]="SUB_PROJECT=rocketchip CONFIG=AMBAUnitTestConfig"

10
.github/scripts/remote-run-firesim-scala-tests.sh vendored
View File

@@ -13,10 +13,8 @@ source $SCRIPT_DIR/defaults.sh
cd $REMOTE_CHIPYARD_DIR cd $REMOTE_CHIPYARD_DIR
./scripts/init-submodules-no-riscv-tools.sh ./scripts/init-submodules-no-riscv-tools.sh
# Run Firesim Scala Tests # Test firesim compile and metasim
export FIRESIM_ENV_SOURCED=1 export FIRESIM_ENV_SOURCED=1
export COURSIER_CACHE=$REMOTE_COURSIER_CACHE cd $REMOTE_FIRESIM_DIR
export JVM_MEMORY=10G make TARGET_PROJECT=firesim EMUL=verilator ${mapping[$1]} run-verilator SIM_BINARY=$RISCV/riscv64-unknown-elf/share/riscv-tests/isa/rv64ui-p-simple
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]}

3
scripts/build-setup.sh
View File

@@ -271,7 +271,8 @@ if run_step "6"; then
echo $CYDIR echo $CYDIR
source sourceme-manager.sh --skip-ssh-setup source sourceme-manager.sh --skip-ssh-setup
pushd sim pushd sim
make sbt SBT_COMMAND="project {file:$CYDIR}firechip; compile" TARGET_PROJECT=firesim make target-classpath
make firesim-main-classpath
popd popd
) )
exit_if_last_command_failed exit_if_last_command_failed

2
sims/firesim

Submodule sims/firesim updated: ac8bcd8b34...c011746410