diff --git a/.github/workflows/chipyard-run-tests-gpu.yml b/.github/workflows/chipyard-run-tests-gpu.yml index 04aedef8..100111d1 100644 --- a/.github/workflows/chipyard-run-tests-gpu.yml +++ b/.github/workflows/chipyard-run-tests-gpu.yml @@ -17,7 +17,7 @@ env: conda-env-name-no-time: cy-${{ github.run_id }} workflow-timestamp: ${{ github.event.pull_request.updated_at }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SSH_AUTH_SOCK: /tmp/ssh_agent_github.sock + # SSH_AUTH_SOCK: /tmp/ssh_agent_github.sock jobs: cancel-prior-workflows: @@ -74,12 +74,9 @@ jobs: rm -rf ${{ github.workspace }}/* || true rm -rf ${{ github.workspace }}/.* || true ls -alh . - # note: the agent spun up here will be made available throughout the - # workflow via env.SSH_AUTH_SOCK. - name: Run ssh-agent run: | - eval `ssh-agent -a $SSH_AUTH_SOCK -s` - echo "${{ secrets.PRIVATE_SSH_KEY }}" | ssh-add - + ssh-add -l >/dev/null - name: Checkout uses: actions/checkout@v3 - name: Git workaround diff --git a/generators/chipyard/src/main/scala/config/RadianceConfigs.scala b/generators/chipyard/src/main/scala/config/RadianceConfigs.scala index a91671a6..f0899828 100644 --- a/generators/chipyard/src/main/scala/config/RadianceConfigs.scala +++ b/generators/chipyard/src/main/scala/config/RadianceConfigs.scala @@ -48,9 +48,10 @@ class RadianceBaseConfig extends Config( new AbstractConfig) class RadianceConfig extends Config( - new radiance.subsystem.WithRadianceCores(1, useVxCache = false) ++ + new radiance.subsystem.WithRadianceCores(1, location=InCluster(0), useVxCache = false) ++ new radiance.subsystem.WithCoalescer(nNewSrcIds = 8) ++ - new radiance.subsystem.WithVortexL1Banks(nBanks = 1)++ + new radiance.subsystem.WithVortexL1Banks(nBanks = 4)++ + new radiance.subsystem.WithRadianceCluster(0) ++ new RadianceBaseConfig) class RadianceClusterConfig extends Config( @@ -58,7 +59,7 @@ class RadianceClusterConfig extends Config( new WithRadianceGemmini(location = InCluster(0), dim = 8, extMemBase = x"ff000000", spSizeInKB = 16, accSizeInKB = 8) ++ new radiance.subsystem.WithRadianceCores(2, location=InCluster(0), useVxCache = false) ++ new radiance.subsystem.WithCoalescer(nNewSrcIds = 8) ++ - new radiance.subsystem.WithVortexL1Banks(nBanks = 1)++ + new radiance.subsystem.WithVortexL1Banks(nBanks = 4)++ new radiance.subsystem.WithRadianceCluster(0) ++ new RadianceBaseConfig) diff --git a/generators/rocket-gpu b/generators/rocket-gpu index 80b77a42..91d01437 160000 --- a/generators/rocket-gpu +++ b/generators/rocket-gpu @@ -1 +1 @@ -Subproject commit 80b77a426b9ef1eb19cca1cd6dad61bc49a155a5 +Subproject commit 91d0143750fc7319f43afc0312a3d25bd9a3143c