Adjust GitHub actions CI for microarchitectural tests

Signed-off-by: Maciej Kurc <[email protected]>
chipsalliance · Sep 19, 2023 · 6a694de · 6a694de
1 parent 41d3612
commit 6a694de
Showing 1 changed file with 43 additions and 42 deletions.
diff --git a/.github/workflows/test-verification.yml b/.github/workflows/test-verification.yml
@@ -12,8 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        test: ["test_pyuvm"]
-        coverage: ["branch", "toggle"] #TODO: add functional coverage
+        test: ["block/pic", "block/pic_gw"]
     env:
       CCACHE_DIR: "/opt/verification/.cache/"
       VERILATOR_VERSION: v5.010
@@ -41,7 +40,6 @@ jobs:
           echo "cache_test_restore_key=$cache_test_restore_key" | tee -a "$GITHUB_ENV"
           echo "cache_test_key=$cache_test_key" | tee -a "$GITHUB_ENV"
 
-
       - name: Restore verilator cache
         id: cache-verilator-restore
         uses: actions/cache/restore@v3
@@ -85,52 +83,55 @@ jobs:
           echo "RV_ROOT=$RV_ROOT" >> $GITHUB_ENV
           PYTHONUNBUFFERED=1
           echo "PYTHONUNBUFFERED=$PYTHONUNBUFFERED" >> $GITHUB_ENV
-          TEST_PATH=$RV_ROOT/verification/top/${{ matrix.test }}
+
+          TEST_TYPE=`echo ${{ matrix.test }} | cut -d'/' -f1`
+          TEST_NAME=`echo ${{ matrix.test }} | cut -d'/' -f2`
+          TEST_PATH=$RV_ROOT/verification/${TEST_TYPE}
+
+          echo "TEST_TYPE=$TEST_TYPE" >> $GITHUB_ENV
+          echo "TEST_NAME=$TEST_NAME" >> $GITHUB_ENV
           echo "TEST_PATH=$TEST_PATH" >> $GITHUB_ENV
 
+          pip3 install meson nox
+          pip3 install -r ${RV_ROOT}/verification/${TEST_TYPE}/requirements.txt
+
       - name: Run ${{ matrix.test }}
         run: |
-          pip3 install meson
-          pip3 install -r $RV_ROOT/verification/top/requirements.txt
-          PYTEST_STYLE_SRC_DIR=${{ github.workspace }}/.github/scripts/pytest/
-          PYTEST_CSS=${PYTEST_STYLE_SRC_DIR}/css/styles.css
-          HTML_FILE=${{ matrix.test }}_${{ matrix.COVERAGE }}.html
           pushd ${TEST_PATH}
-            python -m pytest ${{ matrix.test }}.py -sv --coverage=${{ matrix.COVERAGE }} --html=$HTML_FILE --md=$GITHUB_STEP_SUMMARY --css=$PYTEST_CSS
-            bash ${PYTEST_STYLE_SRC_DIR}/style_pytest_report.sh ${PYTEST_STYLE_SRC_DIR} ${TEST_PATH} ${HTML_FILE}
+            nox -s ${TEST_NAME}
           popd
 
-      - name: Prepare pytest-html data
-        run: |
-          pushd ${{ github.workspace }}
-            WEBPAGE_DIR=webpage_${{ matrix.test }}_${{ matrix.COVERAGE }}
-            mkdir -p $WEBPAGE_DIR
-            mv ${TEST_PATH}/${{ matrix.test }}_${{ matrix.COVERAGE }}.html $WEBPAGE_DIR
-            mv ${TEST_PATH}/assets $WEBPAGE_DIR
-            JS_SCRIPT_DIR=${{ github.workspace }}/.github/scripts/pytest/script
-            mv $JS_SCRIPT_DIR $WEBPAGE_DIR
-          popd
+#      - name: Prepare pytest-html data
+#        run: |
+#          pushd ${{ github.workspace }}
+#            WEBPAGE_DIR=webpage_${{ matrix.test }}_${{ matrix.COVERAGE }}
+#            mkdir -p $WEBPAGE_DIR
+#            mv ${TEST_PATH}/${{ matrix.test }}_${{ matrix.COVERAGE }}.html $WEBPAGE_DIR
+#            mv ${TEST_PATH}/assets $WEBPAGE_DIR
+#            JS_SCRIPT_DIR=${{ github.workspace }}/.github/scripts/pytest/script
+#            mv $JS_SCRIPT_DIR $WEBPAGE_DIR
+#          popd
 
-      - name: Prepare coverage data
-        run: |
-          pushd ${{ github.workspace }}
-            mkdir -p coverage_${{ matrix.test }}
-            mv ${TEST_PATH}/coverage.dat coverage_${{ matrix.test }}/
-            .github/scripts/convert_coverage_data.sh ${{ matrix.COVERAGE }} ${{ github.workspace }}/coverage_${{ matrix.test }} ${{ github.workspace }}/results coverage_${{ matrix.test }}
-            echo "convert_coverage_data.sh exited with RET_CODE = "$?
-          popd
+#      - name: Prepare coverage data
+#        run: |
+#          pushd ${{ github.workspace }}
+#            mkdir -p coverage_${{ matrix.test }}
+#            mv ${TEST_PATH}/${TEST_NAME}/coverage_test_${TEST_NAME}_coverage.dat coverage_${{ matrix.test }}/
+#            .github/scripts/convert_coverage_data.sh ${{ matrix.COVERAGE }} ${{ github.workspace }}/coverage_${{ matrix.test }} ${{ github.workspace }}/results coverage_${{ matrix.test }}
+#            echo "convert_coverage_data.sh exited with RET_CODE = "$?
+#          popd
 
-      - name: Upload pytest-html artifacts
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: verification_dashboard
-          path: |
-            webpage_*
+#      - name: Upload pytest-html artifacts
+#        if: always()
+#        uses: actions/upload-artifact@v3
+#        with:
+#          name: verification_dashboard
+#          path: |
+#            webpage_*
 
-      - name: Upload coverage artifacts
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: verification_tests_coverage_data
-          path: ./results/*.info
+#      - name: Upload coverage artifacts
+#        if: always()
+#        uses: actions/upload-artifact@v3
+#        with:
+#          name: verification_tests_coverage_data
+#          path: ./results/*.info