From 7500f55840c5f9be64ce57d9edb04d185bea5ec6 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Fri, 22 Mar 2024 19:14:47 -0700 Subject: [PATCH 1/7] Make RadianceConfig use cluster fragment --- .../chipyard/src/main/scala/config/RadianceConfigs.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/generators/chipyard/src/main/scala/config/RadianceConfigs.scala b/generators/chipyard/src/main/scala/config/RadianceConfigs.scala index e75d8af7..21a61bfe 100644 --- a/generators/chipyard/src/main/scala/config/RadianceConfigs.scala +++ b/generators/chipyard/src/main/scala/config/RadianceConfigs.scala @@ -47,15 +47,16 @@ 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( 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) From 1f84c8863b5efe6df4a922f7821904ba608f878a Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Fri, 22 Mar 2024 19:16:16 -0700 Subject: [PATCH 2/7] Bump radiance --- generators/radiance | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/radiance b/generators/radiance index 6d5418fd..c28f0510 160000 --- a/generators/radiance +++ b/generators/radiance @@ -1 +1 @@ -Subproject commit 6d5418fd87effdd8b7702d83dc8058e346edc9b2 +Subproject commit c28f0510d8a7beeed323cd60d449eb6b1e23c0a2 From 9dcb7f7fbeac5ec4f2d47c0c4d7ad9149115752c Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Fri, 22 Mar 2024 19:16:38 -0700 Subject: [PATCH 3/7] Bump rocket-gpu --- generators/rocket-gpu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From fbfa8671e3b3bf643821bb8383de9e25b8105381 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Fri, 22 Mar 2024 19:48:08 -0700 Subject: [PATCH 4/7] Bump radiance --- generators/radiance | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/radiance b/generators/radiance index c28f0510..54b64aba 160000 --- a/generators/radiance +++ b/generators/radiance @@ -1 +1 @@ -Subproject commit c28f0510d8a7beeed323cd60d449eb6b1e23c0a2 +Subproject commit 54b64aba07f106816241c8409183d2f7f9a1bcb7 From 157a17da0b63bb2bc09bb273cdcff25b7920f072 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Fri, 22 Mar 2024 20:29:34 -0700 Subject: [PATCH 5/7] Use existing ssh-agent instead of spinning up new Since we're working with multiple private repos, and each of them need new private deploy keys, just use the existing ssh-agent running on the server (that should have the keys readily added manually) instead of dealing with keys using secrets ourselves. --- .github/workflows/chipyard-run-tests-gpu.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/chipyard-run-tests-gpu.yml b/.github/workflows/chipyard-run-tests-gpu.yml index 04aedef8..9f3ea904 100644 --- a/.github/workflows/chipyard-run-tests-gpu.yml +++ b/.github/workflows/chipyard-run-tests-gpu.yml @@ -74,12 +74,11 @@ 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 - + pgrep -u $USER ssh-agent || exit 1 + # eval `ssh-agent -a $SSH_AUTH_SOCK -s` + # echo "${{ secrets.PRIVATE_SSH_KEY }}" | ssh-add - - name: Checkout uses: actions/checkout@v3 - name: Git workaround From bc43d91da652cf14c6fa3583a7ad4bc3f58e1f12 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Fri, 22 Mar 2024 20:40:44 -0700 Subject: [PATCH 6/7] Fix wrongly parsed ssh command --- .github/workflows/chipyard-run-tests-gpu.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/chipyard-run-tests-gpu.yml b/.github/workflows/chipyard-run-tests-gpu.yml index 9f3ea904..533aa86a 100644 --- a/.github/workflows/chipyard-run-tests-gpu.yml +++ b/.github/workflows/chipyard-run-tests-gpu.yml @@ -76,9 +76,7 @@ jobs: ls -alh . - name: Run ssh-agent run: | - pgrep -u $USER ssh-agent || exit 1 - # eval `ssh-agent -a $SSH_AUTH_SOCK -s` - # echo "${{ secrets.PRIVATE_SSH_KEY }}" | ssh-add - + pgrep -u $USER ssh-agent || false - name: Checkout uses: actions/checkout@v3 - name: Git workaround From 239264937a04cbef780bfaa0813def50b17f0c27 Mon Sep 17 00:00:00 2001 From: Hansung Kim Date: Fri, 22 Mar 2024 20:54:22 -0700 Subject: [PATCH 7/7] Don't set SSH_AUTH_SOCK --- .github/workflows/chipyard-run-tests-gpu.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/chipyard-run-tests-gpu.yml b/.github/workflows/chipyard-run-tests-gpu.yml index 533aa86a..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: @@ -76,7 +76,7 @@ jobs: ls -alh . - name: Run ssh-agent run: | - pgrep -u $USER ssh-agent || false + ssh-add -l >/dev/null - name: Checkout uses: actions/checkout@v3 - name: Git workaround