Extend CI matrix

chipsalliance · Sep 21, 2023 · 7847c40 · 7847c40
1 parent b3a2d35
commit 7847c40
Show file tree

Hide file tree

Showing 3 changed files with 138 additions and 31 deletions.
diff --git a/.github/workflows/build-spike.yml b/.github/workflows/build-spike.yml
@@ -8,10 +8,10 @@ on:
 jobs:
   verilator:
     name: Build Spike
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, Linux, X64, gcp-custom-runners]
+    container: centos:8
     env:
       TOOL_NAME: spike
-      TOOL_VERSION: d70ea67d
       DEBIAN_FRONTEND: "noninteractive"
 
     steps:
@@ -39,8 +39,12 @@ jobs:
       - name: Install prerequisities
         if: ${{ steps.cache.outputs.cache-hit != 'true' }}
         run: |
-          sudo apt -qqy update && sudo apt -qqy --no-install-recommends install \
-            git build-essential cmake ccache device-tree-compiler
+          sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+          sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+          sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/CentOS-Linux-PowerTools.repo
+          yum update -y
+          yum install -y epel-release
+          yum install -y git dtc ccache gcc gcc-c++ make
 
       - name: Build Spike
         if: ${{ steps.cache.outputs.cache-hit != 'true' }}
@@ -51,7 +55,7 @@ jobs:
           export CC="ccache gcc"
           export CXX="ccache g++"
           pushd spike
-            git checkout ${{ env.TOOL_VERSION }}
+            git checkout ${TOOL_VERSION:-d70ea67d}
             mkdir build
             cd build
             ../configure --prefix=/opt/spike

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -4,31 +4,115 @@ on:
   push:
   pull_request:
 
+env:
+  TOOL_VERSION: d70ea67d
+
 jobs:
-  build-spike:
-    uses: ./.github/workflows/build-spike.yml
-  test-pyflow:
+  # build-spike:
+  #   uses: ./.github/workflows/build-spike.yml
+
+  # test-pyflow:
+  #   runs-on: ubuntu-latest
+  #   env:
+  #     TEST: riscv_arithmetic_basic_test
+  #   steps:
+  #     - uses: actions/checkout@v4
+
+  #     - name: Install dependencies
+  #       run: sudo apt-get -qqy update && sudo apt-get -qqy install gcc-riscv64-linux-gnu git build-essential device-tree-compiler
+
+  #     - name: Setup python
+  #       # python dependencies cannot be properly downloaded with new versions of python
+  #       uses: actions/setup-python@v4
+  #       with:
+  #         python-version: '3.9'
+
+  #     - name: Install python dependencies
+  #       run: python3 -m pip install -r requirements.txt
+
+  #     - name: Build spike
+  #       run: |
+  #         git clone https://github.com/riscv-software-src/riscv-isa-sim spike
+  #         mkdir -p spike/build
+  #         cd spike/build
+  #         git checkout $TOOL_VERSION
+  #         ../configure --prefix=/opt/spike
+  #         make -j`nproc`
+  #         make install
+  #         cd -
+
+  #     - name: Set variables
+  #       run: |
+  #         echo "RISCV_GCC=riscv64-linux-gnu-gcc" >> $GITHUB_ENV
+  #         echo "RISCV_OBJCOPY=riscv64-linux-gnu-objcopy" >> $GITHUB_ENV
+  #         echo "SPIKE_PATH=/opt/spike/bin" >> $GITHUB_ENV
+  #         echo "PYTHONPATH=pygen" >> $GITHUB_ENV
+
+  #     - name: Generate Tests
+  #       run: |
+  #         set -eo pipefail
+  #         python3 run.py --simulator pyflow \
+  #           --test $TEST --iss spike \
+  #           --start_seed 999 --iterations 1 --batch_size 1 \
+  #           --isa rv32imc --mabi ilp32 --steps gen -v -o test 2>&1 | tee test/generate.log
+
+  #     - name: Patch Tests
+  #       run: find test/asm_test -name "*.S" -exec python3 .github/scripts/code_fixup.py -i {} -o {} \;
+
+  #     - name: Run tests
+  #       run: |
+  #         set -eo pipefail
+  #         python3 run.py --simulator pyflow \
+  #           --test $TEST --iss spike --iss_timeout 60 \
+  #           --start_seed 999 --iterations 1 --batch_size 1 \
+  #           --isa rv32imc --mabi ilp32 --steps gcc_compile,iss_sim -v -o test 2>&1 | tee -a test/generate.log
+
+  #     - name: Upload logs
+  #       uses: actions/upload-artifact@v3
+  #       if: always()
+  #       with:
+  #         path: |
+  #           test/asm_test/*.log
+  #           test/*.log
+
+  test-riscv:
+    name: Test riscv
+    runs-on: [ self-hosted, Linux, X64, gcp-custom-runners ]
+    # needs: [build-spike]
+    container: centos:8
     strategy:
       fail-fast: false
       matrix:
         test:
           - riscv_arithmetic_basic_test
-    runs-on: ubuntu-latest
-    needs: [build-spike]
+          # - riscv_rand_instr_test
+          # - riscv_jump_stress_test
+          # - riscv_loop_test
+          # - riscv_rand_jump_test
+          # - riscv_mmu_stress_test
+          # - riscv_no_fence_test
+          # - riscv_illegal_instr_test
+          # - riscv_ebreak_test
+          # - riscv_ebreak_debug_mode_test
+          # - riscv_full_interrupt_test
+          # - riscv_unaligned_load_store_test
+          # - riscv_non_compressed_instr_test
+          # - riscv_hint_instr_test
+          # - riscv_pmp_test
+    env:
+      GHA_EXTERNAL_DISK: additional-tools
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Install dependencies
-        run: sudo apt-get -qqy update && sudo apt-get -qqy install gcc-riscv64-linux-gnu device-tree-compiler
+      - uses: actions/checkout@v3
 
-      - name: Setup python
-        # python dependencies cannot be properly downloaded with new versions of python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
+      - name: Prepare Environment
+        run: _secret_environment
 
-      - name: Install python dependencies
-        run: python3 -m pip install -r requirements.txt
+      - name: Setup Python 3.9
+        run: |
+          yum update -y
+          yum install -y epel-release
+          yum install -y python39 gcc-riscv64-linux-gnu
+          python3.9 -m pip install -r requirements.txt
 
       - name: Setup Cache Metadata
         id: cache_metadata
@@ -37,9 +121,12 @@ jobs:
           time=$(date +"%Y%m%d_%H%M%S_%N")
           cache_spike_restore_key=cache_spike_
           cache_spike_key=${cache_spike_restore_key}d70ea67d_${date}
+          cache_code=cache_${{ matrix.test }}
+          files_hash=$(sha256sum **/*.sv **/*.py **/*.d | cut -d\  -f1 | sha256sum | cut -d\  -f1)
 
           echo "cache_spike_restore_key=$cache_spike_restore_key" | tee -a "$GITHUB_ENV"
           echo "cache_spike_key=$cache_spike_key" | tee -a "$GITHUB_ENV"
+          echo "cache_code=${cache_code}_${files_hash}" | tee -a "$GITHUB_ENV"
 
       - name: Restore Spike cache
         id: cache-spike-restore
@@ -51,23 +138,37 @@ jobs:
           key: ${{ env.cache_spike_key }}
           restore-keys: ${{ env.cache_spike_restore_key }}
 
-      - name: Set variables
+      - name: Set Variables
         run: |
+          echo "SPIKE_PATH=/opt/spike/bin" >> $GITHUB_ENV
           echo "RISCV_GCC=riscv64-linux-gnu-gcc" >> $GITHUB_ENV
           echo "RISCV_OBJCOPY=riscv64-linux-gnu-objcopy" >> $GITHUB_ENV
-          echo "SPIKE_PATH=/opt/spike/bin" >> $GITHUB_ENV
-          echo "PYTHONPATH=pygen" >> $GITHUB_ENV
+          echo "RISCV_DV_ROOT=$PWD" >> $GITHUB_ENV
+
+      - name: Cache Code Restore
+        uses: actions/cache/restore@v3
+        id: cache-code-restore
+        timeout-minutes: 60
+        with:
+          path: test/asm_test
+          key: ${{ env.cache_code }}
 
       - name: Generate Tests
-        run: |
-          set -eo pipefail
-          python3 run.py --simulator pyflow \
-            --test ${{ matrix.test }} --iss spike \
-            --start_seed 999 --iterations 1 --batch_size 1 \
-            --isa rv32imc --mabi ilp32 --steps gen -v -o test 2>&1 | tee test/generate.log
+        if: steps.cache-code-restore.outputs.cache-hits != 'true'
+        run: _secret_riscv
+        env:
+          RISCV_TEST: ${{ matrix.test }}
+
+      - name: Cache Code Save
+        uses: actions/cache/save@v3
+        if: steps.cache-code-restore.outputs.cache-hits != 'true'
+        id: cache-code-save
+        with:
+          path: test/asm_test
+          key: ${{ env.cache_code }}
 
       - name: Patch Tests
-        run: find test/asm_test -name "*.S" -exec python3 .github/scripts/code_fixup.py -i {} -o {} \;
+        run: find test/asm_test -name "*.S" -exec python3.9 .github/scripts/code_fixup.py -i {} -o {} \;
 
       - name: Run tests
         run: |
@@ -84,3 +185,4 @@ jobs:
           path: |
             test/asm_test/*.log
             test/*.log
+
diff --git a/yaml/simulator.yaml b/yaml/simulator.yaml
@@ -22,6 +22,7 @@
       - "vcs -file <cwd>/vcs.compile.option.f
               +incdir+<setting>
               +incdir+<user_extension>
+             -licwait 10
              -f <cwd>/files.f -full64
              -l <out>/compile.log
              -LDFLAGS '-Wl,--no-as-needed'