Merge branch 'graphics' of https://github.com/hansungk/chipyard into graphics

This commit is contained in:
Richard Yan
2024-03-26 17:27:59 -07:00
3 changed files with 7 additions and 9 deletions

View File

@@ -17,7 +17,7 @@ env:
conda-env-name-no-time: cy-${{ github.run_id }} conda-env-name-no-time: cy-${{ github.run_id }}
workflow-timestamp: ${{ github.event.pull_request.updated_at }} workflow-timestamp: ${{ github.event.pull_request.updated_at }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SSH_AUTH_SOCK: /tmp/ssh_agent_github.sock # SSH_AUTH_SOCK: /tmp/ssh_agent_github.sock
jobs: jobs:
cancel-prior-workflows: cancel-prior-workflows:
@@ -74,12 +74,9 @@ jobs:
rm -rf ${{ github.workspace }}/* || true rm -rf ${{ github.workspace }}/* || true
rm -rf ${{ github.workspace }}/.* || true rm -rf ${{ github.workspace }}/.* || true
ls -alh . ls -alh .
# note: the agent spun up here will be made available throughout the
# workflow via env.SSH_AUTH_SOCK.
- name: Run ssh-agent - name: Run ssh-agent
run: | run: |
eval `ssh-agent -a $SSH_AUTH_SOCK -s` ssh-add -l >/dev/null
echo "${{ secrets.PRIVATE_SSH_KEY }}" | ssh-add -
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Git workaround - name: Git workaround

View File

@@ -48,9 +48,10 @@ class RadianceBaseConfig extends Config(
new AbstractConfig) new AbstractConfig)
class RadianceConfig extends Config( 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.WithCoalescer(nNewSrcIds = 8) ++
new radiance.subsystem.WithVortexL1Banks(nBanks = 1)++ new radiance.subsystem.WithVortexL1Banks(nBanks = 4)++
new radiance.subsystem.WithRadianceCluster(0) ++
new RadianceBaseConfig) new RadianceBaseConfig)
class RadianceClusterConfig extends Config( 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 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.WithRadianceCores(2, location=InCluster(0), useVxCache = false) ++
new radiance.subsystem.WithCoalescer(nNewSrcIds = 8) ++ new radiance.subsystem.WithCoalescer(nNewSrcIds = 8) ++
new radiance.subsystem.WithVortexL1Banks(nBanks = 1)++ new radiance.subsystem.WithVortexL1Banks(nBanks = 4)++
new radiance.subsystem.WithRadianceCluster(0) ++ new radiance.subsystem.WithRadianceCluster(0) ++
new RadianceBaseConfig) new RadianceBaseConfig)