diff --git a/.github/scripts/defaults.sh b/.github/scripts/defaults.sh index 4f4fbaad..88dca6c1 100755 --- a/.github/scripts/defaults.sh +++ b/.github/scripts/defaults.sh @@ -32,6 +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" grouping["group-accels"]="chipyard-mempress chipyard-sha3 chipyard-hwacha chipyard-gemmini chipyard-manymmioaccels chipyard-nvdla" grouping["group-constellation"]="chipyard-constellation" +grouping["group-gpu"]="chipyard-vortex chipyard-coalescer coalescer" grouping["group-tracegen"]="tracegen tracegen-boom" grouping["group-other"]="icenet testchipip constellation rocketchip-amba rocketchip-tlsimple rocketchip-tlwidth rocketchip-tlxbar" grouping["group-fpga"]="arty vcu118 vc707 arty100t" @@ -67,8 +68,11 @@ mapping["chipyard-shuttle"]=" CONFIG=ShuttleConfig" mapping["chipyard-multiclock-rocket"]=" CONFIG=MulticlockRocketConfig" mapping["chipyard-nomem-scratchpad"]=" CONFIG=MMIOScratchpadOnlyRocketConfig" mapping["chipyard-constellation"]=" CONFIG=SharedNoCConfig" +mapping["chipyard-vortex"]=" CONFIG=RadianceROMConfig" +mapping["chipyard-coalescer"]=" CONFIG=MemtraceCoreConfig" mapping["constellation"]=" SUB_PROJECT=constellation" +mapping["coalescer"]=" SUB_PROJECT=coalescer" mapping["firesim"]="SCALA_TEST=firesim.firesim.RocketNICF1Tests" mapping["fireboom"]="SCALA_TEST=firesim.firesim.BoomF1Tests" mapping["icenet"]="SUB_PROJECT=icenet" diff --git a/.github/scripts/run-tests.sh b/.github/scripts/run-tests.sh index ce272737..582b5535 100755 --- a/.github/scripts/run-tests.sh +++ b/.github/scripts/run-tests.sh @@ -137,6 +137,13 @@ case $1 in chipyard-constellation) run_binary LOADMEM=1 BINARY=$RISCV/riscv64-unknown-elf/share/riscv-tests/benchmarks/dhrystone.riscv ;; + chipyard-vortex) + # FIXME fix args.bin + run_binary BINARY=$LOCAL_CHIPYARD_DIR/generators/rocket-gpu/stimuli/vecadd.elf + ;; + chipyard-coalescer) + run_binary BINARY=none + ;; icenet) run_binary BINARY=none ;; @@ -146,6 +153,9 @@ case $1 in constellation) run_binary BINARY=none ;; + coalescer) + run_binary BINARY=none + ;; rocketchip-amba) run_binary BINARY=none ;; diff --git a/.github/workflows/chipyard-run-tests-gpu.yml b/.github/workflows/chipyard-run-tests-gpu.yml index d0983855..2555b0fd 100644 --- a/.github/workflows/chipyard-run-tests-gpu.yml +++ b/.github/workflows/chipyard-run-tests-gpu.yml @@ -236,52 +236,6 @@ jobs: group-key: "group-cores" project-key: "chipyard-rocket" - chipyard-prefetchers-run-tests: - name: chipyard-prefetchers-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-prefetchers" - - chipyard-hetero-run-tests: - name: chipyard-hetero-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-hetero" - chipyard-boom-run-tests: name: chipyard-boom-run-tests needs: prepare-chipyard-cores @@ -305,8 +259,8 @@ jobs: group-key: "group-cores" project-key: "chipyard-boom" - chipyard-shuttle-run-tests: - name: chipyard-shuttle-run-tests + chipyard-vortex-run-tests: + name: chipyard-rocket-run-tests needs: prepare-chipyard-cores runs-on: self-hosted steps: @@ -325,11 +279,11 @@ jobs: - name: Run tests uses: ./.github/actions/run-tests with: - group-key: "group-cores" - project-key: "chipyard-shuttle" + group-key: "group-gpu" + project-key: "chipyard-vortex" - chipyard-cva6-run-tests: - name: chipyard-cva6-run-tests + coalescer-run-tests: + name: coalescer-run-tests needs: prepare-chipyard-cores runs-on: self-hosted steps: @@ -348,54 +302,8 @@ jobs: - name: Run tests uses: ./.github/actions/run-tests with: - group-key: "group-cores" - project-key: "chipyard-cva6" - - chipyard-ibex-run-tests: - name: chipyard-ibex-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-ibex" - - chipyard-sodor-run-tests: - name: chipyard-sodor-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-sodor" + group-key: "group-gpu" + project-key: "coalescer" chipyard-spike-run-tests: name: chipyard-spike-run-tests @@ -420,74 +328,28 @@ jobs: group-key: "group-cores" project-key: "chipyard-spike" - chipyard-sha3-run-tests: - name: chipyard-sha3-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-sha3" - - 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-manymmioaccels-run-tests: - name: chipyard-manymmioaccels-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-manymmioaccels" + # 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 @@ -512,99 +374,6 @@ jobs: # group-key: "group-accels" # project-key: "chipyard-nvdla" - chipyard-mempress-run-tests: - name: chipyard-mempress-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-mempress" - - - tracegen-boom-run-tests: - name: tracegen-boom-run-tests - needs: prepare-chipyard-tracegen - 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-tracegen" - project-key: "tracegen-boom" - - tracegen-run-tests: - name: tracegen-run-tests - needs: prepare-chipyard-tracegen - 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-tracegen" - project-key: "tracegen" - - icenet-run-tests: - name: icenet-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: "icenet" - testchipip-run-tests: name: testchipip-run-tests needs: prepare-chipyard-other @@ -674,20 +443,10 @@ jobs: all_tests_passed: name: "all tests passed" needs: [chipyard-rocket-run-tests, - chipyard-hetero-run-tests, chipyard-boom-run-tests, - chipyard-shuttle-run-tests, - chipyard-cva6-run-tests, - chipyard-ibex-run-tests, - chipyard-sodor-run-tests, - chipyard-sha3-run-tests, - chipyard-gemmini-run-tests, - chipyard-manymmioaccels-run-tests, # chipyard-nvdla-run-tests, - chipyard-prefetchers-run-tests, - chipyard-mempress-run-tests, - tracegen-boom-run-tests, - tracegen-run-tests, - icenet-run-tests, + chipyard-vortex-run-tests, + coalescer-run-tests, + # chipyard-gemmini-run-tests, testchipip-run-tests, rocketchip-run-tests, ]