Remove Dromajo

.github/workflows/chipyard-run-tests.yml

@@ -62,14 +62,66 @@ jobs:
               - '**/.gitignore'
               - '.github/ISSUE_TEMPLATE/**'
 
+  create-conda-env-jktgz:
+    name: create-conda-env-jktgz
+    needs: [change-filters, cancel-prior-workflows]
+    if: needs.change-filters.outputs.needs-rtl == 'true'
+    runs-on: jktgz
+    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: Cleanup conda
+        uses: ./.github/actions/cleanup-conda
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
+
+  create-conda-env-jktqos:
+    name: create-conda-env-jktqos
+    needs: [change-filters, cancel-prior-workflows]
+    if: needs.change-filters.outputs.needs-rtl == 'true'
+    runs-on: jktqos
+    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: Cleanup conda
+        uses: ./.github/actions/cleanup-conda
+      - name: Create conda env
+        uses: ./.github/actions/create-conda-env
+
+  # 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: [create-conda-env-jktgz, create-conda-env-jktqos]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up complete
+        run: echo Set up is complete!
+
+  ##########################################################################
+
   commit-on-master-check:
     name: commit-on-master-check
-    needs: change-filters
+    needs: [setup-complete]
     if: needs.change-filters.outputs.needs-rtl == 'true'
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:3f9150
-      options: --entrypoint /bin/bash
+    runs-on: self-hosted
     steps:
       - name: Delete old checkout
         run: |
@@ -90,12 +142,9 @@ jobs:
 
   tutorial-setup-check:
     name: tutorial-setup-check
-    needs: change-filters
+    needs: [setup-complete]
     if: needs.change-filters.outputs.needs-rtl == 'true'
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:3f9150
-      options: --entrypoint /bin/bash
+    runs-on: self-hosted
     steps:
       - name: Delete old checkout
         run: |
@@ -116,11 +165,8 @@ jobs:
 
   documentation-check:
     name: documentation-check
-    needs: change-filters
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:3f9150
-      options: --entrypoint /bin/bash
+    needs: [setup-complete]
+    runs-on: self-hosted
     steps:
       - name: Delete old checkout
         run: |
@@ -144,12 +190,9 @@ jobs:
 
   build-extra-tests:
     name: build-extra-tests
-    needs: [change-filters]
+    needs: [setup-complete]
     if: needs.change-filters.outputs.needs-rtl == 'true'
-    runs-on: ubuntu-latest
-    container:
-      image: ucbbar/chipyard-ci-image:3f9150
-      options: --entrypoint /bin/bash
+    runs-on: self-hosted
     steps:
       - name: Delete old checkout
         run: |
@@ -178,61 +221,6 @@ jobs:
             conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
             .github/scripts/build-extra-tests.sh
 
-  create-conda-env-jktgz:
-    name: create-conda-env-jktgz
-    needs: [change-filters, cancel-prior-workflows]
-    if: needs.change-filters.outputs.needs-rtl == 'true'
-    runs-on: jktgz
-    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: Cleanup conda
-        uses: ./.github/actions/cleanup-conda
-      - name: Create conda env
-        uses: ./.github/actions/create-conda-env
-
-  create-conda-env-jktqos:
-    name: create-conda-env-jktqos
-    needs: [change-filters, cancel-prior-workflows]
-    if: needs.change-filters.outputs.needs-rtl == 'true'
-    runs-on: jktqos
-    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: Cleanup conda
-        uses: ./.github/actions/cleanup-conda
-      - name: Create conda env
-        uses: ./.github/actions/create-conda-env
-
-  # 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: [create-conda-env-jktgz, create-conda-env-jktqos, build-extra-tests]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up complete
-        run: echo Set up is complete!
-
-  ##########################################################################
-
   prepare-chipyard-cores:
     name: prepare-chipyard-cores
     needs: setup-complete

.gitmodules

@@ -64,9 +64,6 @@
 [submodule "software/nvdla-workload"]
 	path = software/nvdla-workload
 	url = https://github.com/ucb-bar/nvdla-workload.git
-[submodule "tools/dromajo/dromajo-src"]
-	path = tools/dromajo/dromajo-src
-	url = https://github.com/riscv-boom/dromajo.git
 [submodule "generators/riscv-sodor"]
 	path = generators/riscv-sodor
 	url = https://github.com/ucb-bar/riscv-sodor.git

common.mk

@@ -68,7 +68,6 @@ include $(base_dir)/generators/cva6/cva6.mk
 include $(base_dir)/generators/ibex/ibex.mk
 include $(base_dir)/generators/tracegen/tracegen.mk
 include $(base_dir)/generators/nvdla/nvdla.mk
-include $(base_dir)/tools/dromajo/dromajo.mk
 include $(base_dir)/tools/torture.mk
 
 #########################################################################################

conda-reqs/chipyard.yaml

@@ -29,7 +29,6 @@ dependencies:
     - conda-gcc-specs
     - binutils
 
-    - dromajo # from ucb-bar channel - https://github.com/riscv-boom/dromajo
     - firtool==1.30.0 # from ucb-bar channel - https://github.com/ucb-bar/firtool-feedstock
 
     # misc