diff --git a/.github/scripts/copy-gpu-binaries.sh b/.github/scripts/copy-gpu-binaries.sh index 23ea1366..a2932bd1 100755 --- a/.github/scripts/copy-gpu-binaries.sh +++ b/.github/scripts/copy-gpu-binaries.sh @@ -13,11 +13,11 @@ source $SCRIPT_DIR/defaults.sh cd $REMOTE_CHIPYARD_DIR -cp -a $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.bin.elf \ - $REMOTE_SIM_DIR/ -cp -a $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.args.size64.romAddr.bin \ - $REMOTE_SIM_DIR/args.bin -cp -a $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.input.a.size64.bin \ - $REMOTE_SIM_DIR/op_a.bin -cp -a $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.input.b.size64.bin \ - $REMOTE_SIM_DIR/op_b.bin +cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.bin.elf \ + $REMOTE_CHIPYARD_DIR/sims/ +cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.args.size64.romAddr.bin \ + $REMOTE_CHIPYARD_DIR/sims/args.bin +cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.input.a.size64.bin \ + $REMOTE_CHIPYARD_DIR/sims/op_a.bin +cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.input.b.size64.bin \ + $REMOTE_CHIPYARD_DIR/sims/op_b.bin diff --git a/.github/workflows/chipyard-run-tests-gpu.yml b/.github/workflows/chipyard-run-tests-gpu.yml index 856d7d18..34710598 100644 --- a/.github/workflows/chipyard-run-tests-gpu.yml +++ b/.github/workflows/chipyard-run-tests-gpu.yml @@ -121,6 +121,7 @@ jobs: needs: setup-complete runs-on: self-hosted steps: + # see https://gist.github.com/pataruco/91b6cda6b02b61b3bcd2bbbfaa963fd9 - uses: webfactory/ssh-agent@v0.8.0 with: ssh-private-key: ${{ secrets.PRIVATE_SSH_KEY }} diff --git a/generators/chipyard/src/main/scala/config/RocketConfigs.scala b/generators/chipyard/src/main/scala/config/RocketConfigs.scala index 1947c2be..58672483 100644 --- a/generators/chipyard/src/main/scala/config/RocketConfigs.scala +++ b/generators/chipyard/src/main/scala/config/RocketConfigs.scala @@ -40,9 +40,9 @@ class RadianceROMConfig extends Config( new freechips.rocketchip.subsystem.WithCoherentBusTopology ++ new WithExtMemSize(BigInt("80000000", 16)) ++ new WithRadBootROM() ++ - new WithRadROMs(0x7FFF0000L, 0x10000, "sims/vcs/args.bin") ++ - new WithRadROMs(0x20000L, 0x8000, "sims/vcs/op_a.bin") ++ - new WithRadROMs(0x28000L, 0x8000, "sims/vcs/op_b.bin") ++ + new WithRadROMs(0x7FFF0000L, 0x10000, "sims/args.bin") ++ + new WithRadROMs(0x20000L, 0x8000, "sims/op_a.bin") ++ + new WithRadROMs(0x28000L, 0x8000, "sims/op_b.bin") ++ new AbstractConfig) class RadianceConfig extends Config( @@ -61,9 +61,9 @@ class RadianceConfigVortexCache extends Config( // new testchipip.WithMbusScratchpad(banks=2) ++ new WithExtMemSize(BigInt("80000000", 16)) ++ new WithRadBootROM() ++ - new WithRadROMs(0x7FFF0000L, 0x10000, "sims/vcs/args.bin") ++ - new WithRadROMs(0x20000L, 0x8000, "sims/vcs/op_a.bin") ++ - new WithRadROMs(0x28000L, 0x8000, "sims/vcs/op_b.bin") ++ + new WithRadROMs(0x7FFF0000L, 0x10000, "sims/args.bin") ++ + new WithRadROMs(0x20000L, 0x8000, "sims/op_a.bin") ++ + new WithRadROMs(0x28000L, 0x8000, "sims/op_b.bin") ++ new AbstractConfig )