From 43d9ebb43a01bd055f520a09b4488bc990230198 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Thu, 25 Jan 2024 17:54:07 -0800
Subject: [PATCH 01/18] Run ci on graphics-ci

---
 .github/workflows/chipyard-run-tests-gpu.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/chipyard-run-tests-gpu.yml b/.github/workflows/chipyard-run-tests-gpu.yml
index a5c3ea03..0e5b6606 100644
--- a/.github/workflows/chipyard-run-tests-gpu.yml
+++ b/.github/workflows/chipyard-run-tests-gpu.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - graphics
+      - graphics-ci
 
 defaults:
   run:

From 468d73ae3e1fd79480ff1fd9b373ef4155df8881 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Thu, 25 Jan 2024 18:09:10 -0800
Subject: [PATCH 02/18] Roll back riscv-pk to upstream/main

---
 toolchains/riscv-tools/riscv-pk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchains/riscv-tools/riscv-pk b/toolchains/riscv-tools/riscv-pk
index 30e5daf6..e8e6b3aa 160000
--- a/toolchains/riscv-tools/riscv-pk
+++ b/toolchains/riscv-tools/riscv-pk
@@ -1 +1 @@
-Subproject commit 30e5daf6f7dbec58447b525b01c5d3012400549f
+Subproject commit e8e6b3aaee44d43b48164fbd377864c3a682dbd3

From 75b428423e0b7e8c5dd2a6db0f86824180669784 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Thu, 25 Jan 2024 22:01:51 -0800
Subject: [PATCH 03/18] Remove setup-repo, don't set custom REMOTE_WORK_DIR

---
 .github/workflows/chipyard-run-tests-gpu.yml | 290 ++-----------------
 1 file changed, 17 insertions(+), 273 deletions(-)

diff --git a/.github/workflows/chipyard-run-tests-gpu.yml b/.github/workflows/chipyard-run-tests-gpu.yml
index 0e5b6606..97ab0089 100644
--- a/.github/workflows/chipyard-run-tests-gpu.yml
+++ b/.github/workflows/chipyard-run-tests-gpu.yml
@@ -13,7 +13,6 @@ defaults:
 env:
   tools-cache-version: v17
   CI_DIR: ${{ secrets.BUILDDIR }}
-  REMOTE_WORK_DIR: ${{ secrets.BUILDDIR }}/cy-ci-shared/cy-${{ github.sha }}
   JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
   conda-env-name-no-time: cy-${{ github.run_id }}
   workflow-timestamp: ${{ github.event.pull_request.updated_at }}
@@ -90,29 +89,29 @@ jobs:
       - name: Create conda env
         uses: ./.github/actions/create-conda-env
 
-  setup-repo:
-    name: setup-repo
-    needs: create-conda-env
-    if: needs.change-filters.outputs.needs-rtl == 'true'
-    runs-on: self-hosted
-    steps:
-      - name: Delete old checkout
-        run: |
-            ls -alh .
-            rm -rf ${{ github.workspace }}/* || true
-            rm -rf ${{ github.workspace }}/.* || true
-            ls -alh .
-      - uses: actions/checkout@v3
-      - name: Setup repo copy
-        run: |
-          git clone $GITHUB_WORKSPACE ${{ env.REMOTE_WORK_DIR }}
+  # setup-repo:
+  #   name: setup-repo
+  #   needs: create-conda-env
+  #   if: needs.change-filters.outputs.needs-rtl == 'true'
+  #   runs-on: self-hosted
+  #   steps:
+  #     - name: Delete old checkout
+  #       run: |
+  #           ls -alh .
+  #           rm -rf ${{ github.workspace }}/* || true
+  #           rm -rf ${{ github.workspace }}/.* || true
+  #           ls -alh .
+  #     - uses: actions/checkout@v3
+  #     - name: Setup repo copy
+  #       run: |
+  #         git clone $GITHUB_WORKSPACE ${{ env.REMOTE_WORK_DIR }}
 
   # Sentinel job to simplify how we specify which that basic setup is complete
   #
   # When adding new prep jobs, please add them to `needs` below
   setup-complete:
     name: setup-complete
-    needs: setup-repo
+    needs: [create-conda-env]
     runs-on: self-hosted
     steps:
       - name: Set up complete
@@ -166,127 +165,8 @@ jobs:
         with:
           group-key: "group-gpu"
 
-  # prepare-chipyard-accels:
-  #   name: prepare-chipyard-accels
-  #   needs: setup-complete
-  #   runs-on: self-hosted
-  #   steps:
-  #     - name: Delete old checkout
-  #       run: |
-  #           ls -alh .
-  #           rm -rf ${{ github.workspace }}/* || true
-  #           rm -rf ${{ github.workspace }}/.* || true
-  #           ls -alh .
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Git workaround
-  #       uses: ./.github/actions/git-workaround
-  #     - name: Create conda env
-  #       uses: ./.github/actions/create-conda-env
-  #     - name: Build RTL on self-hosted
-  #       uses: ./.github/actions/prepare-rtl
-  #       with:
-  #         group-key: "group-accels"
-
-  # prepare-chipyard-other:
-  #   name: prepare-chipyard-other
-  #   needs: setup-complete
-  #   runs-on: self-hosted
-  #   steps:
-  #     - name: Delete old checkout
-  #       run: |
-  #           ls -alh .
-  #           rm -rf ${{ github.workspace }}/* || true
-  #           rm -rf ${{ github.workspace }}/.* || true
-  #           ls -alh .
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Git workaround
-  #       uses: ./.github/actions/git-workaround
-  #     - name: Create conda env
-  #       uses: ./.github/actions/create-conda-env
-  #     - name: Build RTL on self-hosted
-  #       uses: ./.github/actions/prepare-rtl
-  #       with:
-  #         group-key: "group-other"
-
   ##########################################################################
 
-  # chipyard-spike-gemmini-run-tests:
-  #   name: chipyard-spike-gemmini-run-tests
-  #   needs: prepare-chipyard-accels # technically doesn't depend on RTL but should be after the build.sh for Gemmini
-  #   runs-on: self-hosted
-  #   steps:
-  #     - name: Delete old checkout
-  #       run: |
-  #           ls -alh .
-  #           rm -rf ${{ github.workspace }}/* || true
-  #           rm -rf ${{ github.workspace }}/.* || true
-  #           ls -alh .
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Git workaround
-  #       uses: ./.github/actions/git-workaround
-  #     - name: Create conda env
-  #       uses: ./.github/actions/create-conda-env
-  #     - name: Build Gemmini FireMarshal
-  #       run: |
-  #         conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
-  #         cd ${{ github.workspace }} && ./scripts/init-submodules-no-riscv-tools.sh --force
-  #         cd ${{ github.workspace }} && source ./scripts/fix-open-files.sh
-  #         git submodule update --init software/firemarshal && cd software/firemarshal && ./init-submodules.sh
-  #         cd ${{ github.workspace }}/generators/gemmini/software && ${{ github.workspace }}/software/firemarshal/marshal -v -d build gemmini-smoke.json
-  #     - name: Running Gemmini FireMarshal smoke test
-  #       run: |
-  #         conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
-  #         cd ${{ github.workspace }}/generators/gemmini/software && ${{ github.workspace }}/software/firemarshal/marshal -v -d launch -s gemmini-smoke.json
-
-  # chipyard-rocket-run-tests:
-  #   name: chipyard-rocket-run-tests
-  #   needs: prepare-chipyard-cores
-  #   runs-on: self-hosted
-  #   steps:
-  #     - name: Delete old checkout
-  #       run: |
-  #           ls -alh .
-  #           rm -rf ${{ github.workspace }}/* || true
-  #           rm -rf ${{ github.workspace }}/.* || true
-  #           ls -alh .
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Git workaround
-  #       uses: ./.github/actions/git-workaround
-  #     - name: Create conda env
-  #       uses: ./.github/actions/create-conda-env
-  #     - name: Run tests
-  #       uses: ./.github/actions/run-tests
-  #       with:
-  #         group-key: "group-cores"
-  #         project-key: "chipyard-rocket"
-
-  # chipyard-boom-run-tests:
-  #   name: chipyard-boom-run-tests
-  #   needs: prepare-chipyard-cores
-  #   runs-on: self-hosted
-  #   steps:
-  #     - name: Delete old checkout
-  #       run: |
-  #           ls -alh .
-  #           rm -rf ${{ github.workspace }}/* || true
-  #           rm -rf ${{ github.workspace }}/.* || true
-  #           ls -alh .
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Git workaround
-  #       uses: ./.github/actions/git-workaround
-  #     - name: Create conda env
-  #       uses: ./.github/actions/create-conda-env
-  #     - name: Run tests
-  #       uses: ./.github/actions/run-tests
-  #       with:
-  #         group-key: "group-cores"
-  #         project-key: "chipyard-boom"
-
   chipyard-vortex-run-tests:
     name: chipyard-vortex-run-tests
     needs: prepare-chipyard-gpu
@@ -356,137 +236,6 @@ jobs:
           group-key: "group-gpu"
           project-key: "coalescer"
 
-  # chipyard-spike-run-tests:
-  #   name: chipyard-spike-run-tests
-  #   needs: prepare-chipyard-cores
-  #   runs-on: self-hosted
-  #   steps:
-  #     - name: Delete old checkout
-  #       run: |
-  #           ls -alh .
-  #           rm -rf ${{ github.workspace }}/* || true
-  #           rm -rf ${{ github.workspace }}/.* || true
-  #           ls -alh .
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Git workaround
-  #       uses: ./.github/actions/git-workaround
-  #     - name: Create conda env
-  #       uses: ./.github/actions/create-conda-env
-  #     - name: Run tests
-  #       uses: ./.github/actions/run-tests
-  #       with:
-  #         group-key: "group-cores"
-  #         project-key: "chipyard-spike"
-
-  # chipyard-gemmini-run-tests:
-  #   name: chipyard-gemmini-run-tests
-  #   needs: prepare-chipyard-accels
-  #   runs-on: self-hosted
-  #   steps:
-  #     - name: Delete old checkout
-  #       run: |
-  #           ls -alh .
-  #           rm -rf ${{ github.workspace }}/* || true
-  #           rm -rf ${{ github.workspace }}/.* || true
-  #           ls -alh .
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Git workaround
-  #       uses: ./.github/actions/git-workaround
-  #     - name: Create conda env
-  #       uses: ./.github/actions/create-conda-env
-  #     - name: Run tests
-  #       uses: ./.github/actions/run-tests
-  #       with:
-  #         group-key: "group-accels"
-  #         project-key: "chipyard-gemmini"
-
-  # chipyard-nvdla-run-tests:
-  #   name: chipyard-nvdla-run-tests
-  #   needs: prepare-chipyard-accels
-  #   runs-on: self-hosted
-  #   steps:
-  #     - name: Delete old checkout
-  #       run: |
-  #           ls -alh .
-  #           rm -rf ${{ github.workspace }}/* || true
-  #           rm -rf ${{ github.workspace }}/.* || true
-  #           ls -alh .
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Git workaround
-  #       uses: ./.github/actions/git-workaround
-  #     - name: Create conda env
-  #       uses: ./.github/actions/create-conda-env
-  #     - name: Run tests
-  #       uses: ./.github/actions/run-tests
-  #       with:
-  #         group-key: "group-accels"
-  #         project-key: "chipyard-nvdla"
-
-  # testchipip-run-tests:
-  #   name: testchipip-run-tests
-  #   needs: prepare-chipyard-other
-  #   runs-on: self-hosted
-  #   steps:
-  #     - name: Delete old checkout
-  #       run: |
-  #           ls -alh .
-  #           rm -rf ${{ github.workspace }}/* || true
-  #           rm -rf ${{ github.workspace }}/.* || true
-  #           ls -alh .
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Git workaround
-  #       uses: ./.github/actions/git-workaround
-  #     - name: Create conda env
-  #       uses: ./.github/actions/create-conda-env
-  #     - name: Run tests
-  #       uses: ./.github/actions/run-tests
-  #       with:
-  #         group-key: "group-other"
-  #         project-key: "testchipip"
-
-  # rocketchip-run-tests:
-  #   name: rocketchip-run-tests
-  #   needs: prepare-chipyard-other
-  #   runs-on: self-hosted
-  #   steps:
-  #     - name: Delete old checkout
-  #       run: |
-  #           ls -alh .
-  #           rm -rf ${{ github.workspace }}/* || true
-  #           rm -rf ${{ github.workspace }}/.* || true
-  #           ls -alh .
-  #     - name: Checkout
-  #       uses: actions/checkout@v3
-  #     - name: Git workaround
-  #       uses: ./.github/actions/git-workaround
-  #     - name: Create conda env
-  #       uses: ./.github/actions/create-conda-env
-  #     - name: Run amba tests
-  #       uses: ./.github/actions/run-tests
-  #       with:
-  #         group-key: "group-other"
-  #         project-key: "rocketchip-amba"
-  #     # Below tests segfault with verilator, work fine in VCS
-  #     # - name: Run tlsimple tests
-  #     #   uses: ./.github/actions/run-tests
-  #     #   with:
-  #     #     group-key: "group-other"
-  #     #     project-key: "rocketchip-tlsimple"
-  #     # - name: Run tlwidth tests
-  #     #   uses: ./.github/actions/run-tests
-  #     #   with:
-  #     #     group-key: "group-other"
-  #     #     project-key: "rocketchip-tlwidth"
-  #     # - name: Run tlxbar tests
-  #     #   uses: ./.github/actions/run-tests
-  #     #   with:
-  #     #     group-key: "group-other"
-  #     #     project-key: "rocketchip-tlxbar"
-
   # Sentinel job to simplify how we specify which checks need to pass in branch
   # protection and in Mergify
   #
@@ -494,14 +243,9 @@ jobs:
   all_tests_passed:
     name: "all tests passed"
     needs: [
-            # chipyard-rocket-run-tests,
-            # chipyard-boom-run-tests,
             chipyard-vortex-run-tests,
             chipyard-coalescer-run-tests,
             coalescer-run-tests,
-            # chipyard-gemmini-run-tests,
-            # testchipip-run-tests,
-            # rocketchip-run-tests,
             ]
     runs-on: self-hosted
     steps:

From bd97d959bdf5bc59339d75e9640aa8984f7905bf Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Thu, 25 Jan 2024 22:11:11 -0800
Subject: [PATCH 04/18] Remove use of REMOTE_WORK_DIR

---
 .github/actions/prepare-gpu/action.yml | 3 +--
 .github/scripts/copy-gpu-binaries.sh   | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/prepare-gpu/action.yml b/.github/actions/prepare-gpu/action.yml
index a7d4ff38..ef0608d1 100644
--- a/.github/actions/prepare-gpu/action.yml
+++ b/.github/actions/prepare-gpu/action.yml
@@ -20,8 +20,7 @@ runs:
     - name: Init submodules to ensure stimuli is located
       run: |
         conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-${{ inputs.toolchain }}
-        cd ${{ env.REMOTE_WORK_DIR }}
-        echo $PWD
+        echo "Running init-submodules...sh in $PWD"
         ./scripts/init-submodules-no-riscv-tools.sh --force
       shell: bash -leo pipefail {0}
 
diff --git a/.github/scripts/copy-gpu-binaries.sh b/.github/scripts/copy-gpu-binaries.sh
index a2932bd1..5b6d249c 100755
--- a/.github/scripts/copy-gpu-binaries.sh
+++ b/.github/scripts/copy-gpu-binaries.sh
@@ -11,6 +11,7 @@ set -ex
 SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 source $SCRIPT_DIR/defaults.sh
 
+echo "$0: REMOTE_CHIPYARD_DIR=$REMOTE_CHIPYARD_DIR"
 cd $REMOTE_CHIPYARD_DIR
 
 cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.bin.elf \

From 69b4564ae05760408319f8aa5d3463ad962993da Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Thu, 25 Jan 2024 22:20:55 -0800
Subject: [PATCH 05/18] Fix old path to romAddr.bin

---
 .github/scripts/copy-gpu-binaries.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/copy-gpu-binaries.sh b/.github/scripts/copy-gpu-binaries.sh
index 5b6d249c..f87f413d 100755
--- a/.github/scripts/copy-gpu-binaries.sh
+++ b/.github/scripts/copy-gpu-binaries.sh
@@ -16,7 +16,7 @@ cd $REMOTE_CHIPYARD_DIR
 
 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 \
+cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.args.size64.romAddr.core1.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

From 24dec35badcc0984c885ea73c9439885fa6d9d41 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Thu, 25 Jan 2024 22:42:15 -0800
Subject: [PATCH 06/18] Bump rocket-chip to new gemmini-ext-spad fork

---
 generators/rocket-chip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/rocket-chip b/generators/rocket-chip
index 749a3eae..67933363 160000
--- a/generators/rocket-chip
+++ b/generators/rocket-chip
@@ -1 +1 @@
-Subproject commit 749a3eae9678bc70b029c5b9091fae33fad539c4
+Subproject commit 679333633b78263c94a980a2a28e1aeca4cebd92

From 0f28aebcee69bbcb5f564f04eb852b0b165daf7e Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Thu, 25 Jan 2024 22:43:56 -0800
Subject: [PATCH 07/18] Update rocket-chip url to gemmini-ext-spad fork

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index b0a37cc9..e155d953 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "rocket-chip"]
 	path = generators/rocket-chip
-	url = https://github.com/chipsalliance/rocket-chip.git
+	url = https://github.com/hansungk/rocket-chip.git
 [submodule "testchipip"]
 	path = generators/testchipip
 	url = https://github.com/richardyrh/testchipip.git

From 363b1feb1007c8cb41fc0ab222f0d3ed2fd8828f Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Thu, 25 Jan 2024 22:58:25 -0800
Subject: [PATCH 08/18] Fix outdated radiance config name

---
 .github/scripts/defaults.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/defaults.sh b/.github/scripts/defaults.sh
index 22532887..d2722da7 100755
--- a/.github/scripts/defaults.sh
+++ b/.github/scripts/defaults.sh
@@ -71,7 +71,7 @@ mapping["chipyard-nomem-scratchpad"]=" CONFIG=MMIOScratchpadOnlyRocketConfig"
 mapping["chipyard-constellation"]=" CONFIG=SharedNoCConfig"
 mapping["chipyard-clusters"]=" CONFIG=ClusteredRocketConfig verilog"
 mapping["chipyard-aes256ecb"]=" CONFIG=AES256ECBRocketConfig"
-mapping["chipyard-vortex"]=" CONFIG=RadianceROMConfig"
+mapping["chipyard-vortex"]=" CONFIG=RadianceConfig"
 mapping["chipyard-coalescer"]=" CONFIG=MemtraceCoreConfig"
 
 mapping["constellation"]=" SUB_PROJECT=constellation"

From 1c251bcba0c0c8e2aa7f7062cb4a3a95df93d4a8 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Thu, 25 Jan 2024 23:07:56 -0800
Subject: [PATCH 09/18] Rename vortex->radiance; disable MemtraceCoreConfig

---
 .github/scripts/defaults.sh                  |  4 ++--
 .github/scripts/run-tests.sh                 |  2 +-
 .github/workflows/chipyard-run-tests-gpu.yml | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/scripts/defaults.sh b/.github/scripts/defaults.sh
index d2722da7..707b835a 100755
--- a/.github/scripts/defaults.sh
+++ b/.github/scripts/defaults.sh
@@ -32,7 +32,7 @@ grouping["group-cores"]="chipyard-cva6 chipyard-ibex chipyard-rocket chipyard-he
 grouping["group-peripherals"]="chipyard-dmirocket chipyard-dmiboom chipyard-spiflashwrite chipyard-mmios chipyard-nocores chipyard-manyperipherals chipyard-chiplike chipyard-tethered chipyard-symmetric"
 grouping["group-accels"]="chipyard-mempress chipyard-sha3 chipyard-hwacha chipyard-gemmini chipyard-manymmioaccels chipyard-nvdla chipyard-aes256ecb"
 grouping["group-constellation"]="chipyard-constellation"
-grouping["group-gpu"]="chipyard-vortex chipyard-coalescer coalescer"
+grouping["group-gpu"]="chipyard-radiance chipyard-coalescer coalescer"
 grouping["group-tracegen"]="tracegen tracegen-boom"
 grouping["group-other"]="icenet testchipip constellation rocketchip-amba rocketchip-tlsimple rocketchip-tlwidth rocketchip-tlxbar chipyard-clusters"
 grouping["group-fpga"]="arty35t arty100t nexysvideo vc707 vcu118"
@@ -71,7 +71,7 @@ mapping["chipyard-nomem-scratchpad"]=" CONFIG=MMIOScratchpadOnlyRocketConfig"
 mapping["chipyard-constellation"]=" CONFIG=SharedNoCConfig"
 mapping["chipyard-clusters"]=" CONFIG=ClusteredRocketConfig verilog"
 mapping["chipyard-aes256ecb"]=" CONFIG=AES256ECBRocketConfig"
-mapping["chipyard-vortex"]=" CONFIG=RadianceConfig"
+mapping["chipyard-radiance"]=" CONFIG=RadianceConfig"
 mapping["chipyard-coalescer"]=" CONFIG=MemtraceCoreConfig"
 
 mapping["constellation"]=" SUB_PROJECT=constellation"
diff --git a/.github/scripts/run-tests.sh b/.github/scripts/run-tests.sh
index 7c60f74a..f1db0b35 100755
--- a/.github/scripts/run-tests.sh
+++ b/.github/scripts/run-tests.sh
@@ -141,7 +141,7 @@ case $1 in
     chipyard-constellation)
         run_binary LOADMEM=1 BINARY=$RISCV/riscv64-unknown-elf/share/riscv-tests/benchmarks/dhrystone.riscv
         ;;
-    chipyard-vortex)
+    chipyard-radiance)
         run_binary BINARY=$LOCAL_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.bin.elf
         ;;
     chipyard-coalescer)
diff --git a/.github/workflows/chipyard-run-tests-gpu.yml b/.github/workflows/chipyard-run-tests-gpu.yml
index 97ab0089..bf131b1f 100644
--- a/.github/workflows/chipyard-run-tests-gpu.yml
+++ b/.github/workflows/chipyard-run-tests-gpu.yml
@@ -167,8 +167,8 @@ jobs:
 
   ##########################################################################
 
-  chipyard-vortex-run-tests:
-    name: chipyard-vortex-run-tests
+  chipyard-radiance-run-tests:
+    name: chipyard-radiance-run-tests
     needs: prepare-chipyard-gpu
     runs-on: self-hosted
     steps:
@@ -188,7 +188,7 @@ jobs:
         uses: ./.github/actions/run-tests
         with:
           group-key: "group-gpu"
-          project-key: "chipyard-vortex"
+          project-key: "chipyard-radiance"
 
   chipyard-coalescer-run-tests:
     name: chipyard-coalescer-run-tests
@@ -243,8 +243,8 @@ jobs:
   all_tests_passed:
     name: "all tests passed"
     needs: [
-            chipyard-vortex-run-tests,
-            chipyard-coalescer-run-tests,
+            chipyard-radiance-run-tests,
+            # chipyard-coalescer-run-tests,
             coalescer-run-tests,
             ]
     runs-on: self-hosted

From 87a0ce3c07229ed439a20f5cbbcbe3aae10fd60c Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Thu, 25 Jan 2024 23:21:27 -0800
Subject: [PATCH 10/18] 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 25293e94..989b33a3 160000
--- a/generators/rocket-gpu
+++ b/generators/rocket-gpu
@@ -1 +1 @@
-Subproject commit 25293e94e60fa6c436ba4b94b02fdf22cb150781
+Subproject commit 989b33a3d3ee1108e41328f5ec429df06a50c51a

From 6768d6939e2d60a62f6eb3cdb91ef042528ca2b6 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Thu, 25 Jan 2024 23:24:23 -0800
Subject: [PATCH 11/18] Bump radiance

---
 generators/radiance | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/radiance b/generators/radiance
index df26764f..78075e51 160000
--- a/generators/radiance
+++ b/generators/radiance
@@ -1 +1 @@
-Subproject commit df26764fc07ca46bf7d44e20311a926dbd041402
+Subproject commit 78075e51484ee6960cc06a8e9039a9ae791ee0da

From 127ba43fc09c8bb163bf3bd2cf39255d1f99d993 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Thu, 25 Jan 2024 23:26:49 -0800
Subject: [PATCH 12/18] Update gpu binaries to vecaddloop

---
 .github/scripts/copy-gpu-binaries.sh | 8 ++++----
 .github/scripts/run-tests.sh         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/scripts/copy-gpu-binaries.sh b/.github/scripts/copy-gpu-binaries.sh
index f87f413d..acbc7f33 100755
--- a/.github/scripts/copy-gpu-binaries.sh
+++ b/.github/scripts/copy-gpu-binaries.sh
@@ -14,11 +14,11 @@ source $SCRIPT_DIR/defaults.sh
 echo "$0: REMOTE_CHIPYARD_DIR=$REMOTE_CHIPYARD_DIR"
 cd $REMOTE_CHIPYARD_DIR
 
-cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.bin.elf \
+cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecaddloop.bin.elf \
        $REMOTE_CHIPYARD_DIR/sims/
-cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.args.size64.romAddr.core1.bin \
+cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecaddloop.args.n256.cores1.romAddr.bin \
        $REMOTE_CHIPYARD_DIR/sims/args.bin
-cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.input.a.size64.bin \
+cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecaddloop.input.a.size256.bin \
        $REMOTE_CHIPYARD_DIR/sims/op_a.bin
-cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.input.b.size64.bin \
+cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecaddloop.input.b.size256.bin \
        $REMOTE_CHIPYARD_DIR/sims/op_b.bin
diff --git a/.github/scripts/run-tests.sh b/.github/scripts/run-tests.sh
index f1db0b35..bf9d6543 100755
--- a/.github/scripts/run-tests.sh
+++ b/.github/scripts/run-tests.sh
@@ -142,7 +142,7 @@ case $1 in
         run_binary LOADMEM=1 BINARY=$RISCV/riscv64-unknown-elf/share/riscv-tests/benchmarks/dhrystone.riscv
         ;;
     chipyard-radiance)
-        run_binary BINARY=$LOCAL_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.bin.elf
+        run_binary BINARY=$LOCAL_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecaddloop.bin.elf
         ;;
     chipyard-coalescer)
         run_binary BINARY=none EXTRA_SIM_FLAGS="+memtracefile=$LOCAL_CHIPYARD_DIR/generators/rocket-gpu/tracefiles/vecadd.core1.thread4.trace"

From 97581727b6709bb06738923b7500d891419961a1 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Thu, 25 Jan 2024 23:39:04 -0800
Subject: [PATCH 13/18] Print rocket-gpu dirs

---
 .github/scripts/copy-gpu-binaries.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/scripts/copy-gpu-binaries.sh b/.github/scripts/copy-gpu-binaries.sh
index acbc7f33..25fc23ad 100755
--- a/.github/scripts/copy-gpu-binaries.sh
+++ b/.github/scripts/copy-gpu-binaries.sh
@@ -14,6 +14,9 @@ source $SCRIPT_DIR/defaults.sh
 echo "$0: REMOTE_CHIPYARD_DIR=$REMOTE_CHIPYARD_DIR"
 cd $REMOTE_CHIPYARD_DIR
 
+ls -la $REMOTE_CHIPYARD_DIR/generators/rocket-gpu
+ls -la $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli
+
 cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecaddloop.bin.elf \
        $REMOTE_CHIPYARD_DIR/sims/
 cp -av $REMOTE_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecaddloop.args.n256.cores1.romAddr.bin \

From 3ba386d22b52fa59ca287cf8f153ead6fe6fce29 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Thu, 25 Jan 2024 23:53:47 -0800
Subject: [PATCH 14/18] Remove chipyard-coalescer key

---
 .github/scripts/defaults.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/scripts/defaults.sh b/.github/scripts/defaults.sh
index 707b835a..d26382df 100755
--- a/.github/scripts/defaults.sh
+++ b/.github/scripts/defaults.sh
@@ -72,7 +72,7 @@ mapping["chipyard-constellation"]=" CONFIG=SharedNoCConfig"
 mapping["chipyard-clusters"]=" CONFIG=ClusteredRocketConfig verilog"
 mapping["chipyard-aes256ecb"]=" CONFIG=AES256ECBRocketConfig"
 mapping["chipyard-radiance"]=" CONFIG=RadianceConfig"
-mapping["chipyard-coalescer"]=" CONFIG=MemtraceCoreConfig"
+# mapping["chipyard-coalescer"]=" CONFIG=MemtraceCoreConfig"
 
 mapping["constellation"]=" SUB_PROJECT=constellation"
 mapping["coalescer"]=" SUB_PROJECT=coalescer"

From eed69597ad1598e20492c6718b1bdf657851f700 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Fri, 26 Jan 2024 00:06:04 -0800
Subject: [PATCH 15/18] Include date in conda env grep to prevent miss on
 date-change

Currently the grep expression used to filter existing conda envs only
use ${{ env.conda-env-name-no-time }}, whereas the full env name
includes the date.  This results in false hits when jobs in a single
workflow runs across multiple dates.
---
 .github/actions/create-conda-env/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/create-conda-env/action.yml b/.github/actions/create-conda-env/action.yml
index b9fd6066..7532f9da 100644
--- a/.github/actions/create-conda-env/action.yml
+++ b/.github/actions/create-conda-env/action.yml
@@ -5,8 +5,8 @@ runs:
   steps:
     - name: Create conda environments
       run: |
-        if conda env list | grep -q "envs/${{ env.conda-env-name-no-time }}"; then
-          echo "Using pre-existing conda environments with prefix ${{ env.conda-env-name-no-time }}"
+        if conda env list | grep -q "envs/${{ env.conda-env-name-no-time }}-$(date --date \"${{ env.workflow-timestamp }}\" +%Y%m%d)"; then
+          echo "Using pre-existing conda environments with prefix ${{ env.conda-env-name-no-time }}-$(date --date \"${{ env.workflow-timestamp }}\" +%Y%m%d)"
         else
           echo "Creating a conda environment for each toolchain with the toolchain installed"
           conda activate base

From 458240795e09b0935154bf3b84d89a774c1bc58d Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Fri, 26 Jan 2024 00:11:41 -0800
Subject: [PATCH 16/18] Re-enable chipyard-coalescer

---
 .github/scripts/defaults.sh                  | 2 +-
 .github/workflows/chipyard-run-tests-gpu.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/defaults.sh b/.github/scripts/defaults.sh
index d26382df..707b835a 100755
--- a/.github/scripts/defaults.sh
+++ b/.github/scripts/defaults.sh
@@ -72,7 +72,7 @@ mapping["chipyard-constellation"]=" CONFIG=SharedNoCConfig"
 mapping["chipyard-clusters"]=" CONFIG=ClusteredRocketConfig verilog"
 mapping["chipyard-aes256ecb"]=" CONFIG=AES256ECBRocketConfig"
 mapping["chipyard-radiance"]=" CONFIG=RadianceConfig"
-# mapping["chipyard-coalescer"]=" CONFIG=MemtraceCoreConfig"
+mapping["chipyard-coalescer"]=" CONFIG=MemtraceCoreConfig"
 
 mapping["constellation"]=" SUB_PROJECT=constellation"
 mapping["coalescer"]=" SUB_PROJECT=coalescer"
diff --git a/.github/workflows/chipyard-run-tests-gpu.yml b/.github/workflows/chipyard-run-tests-gpu.yml
index bf131b1f..15506e95 100644
--- a/.github/workflows/chipyard-run-tests-gpu.yml
+++ b/.github/workflows/chipyard-run-tests-gpu.yml
@@ -244,7 +244,7 @@ jobs:
     name: "all tests passed"
     needs: [
             chipyard-radiance-run-tests,
-            # chipyard-coalescer-run-tests,
+            chipyard-coalescer-run-tests,
             coalescer-run-tests,
             ]
     runs-on: self-hosted

From a1ff85acaa64cce59e237604a55da0db773f4575 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Fri, 26 Jan 2024 00:14:03 -0800
Subject: [PATCH 17/18] Bump radiance

---
 generators/radiance | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/radiance b/generators/radiance
index 78075e51..cfce029b 160000
--- a/generators/radiance
+++ b/generators/radiance
@@ -1 +1 @@
-Subproject commit 78075e51484ee6960cc06a8e9039a9ae791ee0da
+Subproject commit cfce029b70fdb857bb1fd59fe4a445bff466c9cf

From a27b509322bad1f88fd83256bd8479db1a63f278 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Fri, 26 Jan 2024 00:14:21 -0800
Subject: [PATCH 18/18] Remove whitespaces

---
 generators/chipyard/src/main/scala/DigitalTop.scala | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/generators/chipyard/src/main/scala/DigitalTop.scala b/generators/chipyard/src/main/scala/DigitalTop.scala
index d00a26ce..5d7695cd 100644
--- a/generators/chipyard/src/main/scala/DigitalTop.scala
+++ b/generators/chipyard/src/main/scala/DigitalTop.scala
@@ -27,12 +27,8 @@ class DigitalTop(implicit p: Parameters) extends ChipyardSystem
   with sifive.blocks.devices.gpio.HasPeripheryGPIO // Enables optionally adding the sifive GPIOs
   with sifive.blocks.devices.spi.HasPeripherySPIFlash // Enables optionally adding the sifive SPI flash controller
   with sifive.blocks.devices.spi.HasPeripherySPI // Enables optionally adding the sifive SPI port
-
-
-  with radiance.memory.CanHaveMemtraceCore // Enable memtrace core
-  with radiance.memory.CanHaveRadianceROMs // Enable argument ROMs
-
-
+  with radiance.memory.CanHaveMemtraceCore // Enables memtrace core
+  with radiance.memory.CanHaveRadianceROMs // Enables radiance argument ROMs
   with icenet.CanHavePeripheryIceNIC // Enables optionally adding the IceNIC for FireSim
   with chipyard.example.CanHavePeripheryInitZero // Enables optionally adding the initzero example widget
   with chipyard.example.CanHavePeripheryGCD // Enables optionally adding the GCD example widget