missed adding files

Signed-off-by: Kareem Farid <[email protected]>
efabless · Jan 13, 2025 · be8e0d4 · be8e0d4
1 parent fbc2191
commit be8e0d4
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 71 deletions.
diff --git a/.github/test_sets/test_sets.yml b/.github/test_sets/test_sets.yml
@@ -2,51 +2,51 @@
   name: fastest_test_set
   designs:
     - inverter
-    - wbqspiflash
-    - APU
-    - s44
-    - zipdiv
-    - blink
-    - usb
-    - usb_cdc_core
-    - cell_inverter
-    - spm
-    - gcd
-    - caravel_upw
-    - io_placer
-    - test_sram_macro
-    - manual_macro_placement_test
-    - name: aes_user_project_wrapper
-      test_name: aes_upw_new
-      config_file: config.json
-    - name: aes_user_project_wrapper
-      test_name: aes_upw_old
-      config_file: config_old.json
-    - user_proj_timer
-    - name: xtea
-      config_file: config.tcl
-    - name: latch
-      test_name: latch_good
-      config_file: config_good.json
-    - name: latch
-      test_name: latch_bad
-      config_file: config_bad.json
-    - name: EF_PSRAM_CTRL_V2
-      ipm: v1.0.3
-    - name: EF_UART
-      ipm: v1.0.0
-    - name: MS_SPI_XIP_CACHE
-      ipm: v1.0.0
-    - name: MS_DMAC_AHBL
-      ipm: v1.0.2
-    - name: MS_CLK_RST
-      ipm: v1.0.1
-    - name: EF_TCC32
-      ipm: v1.0.1
-    - name: EF_GPIO
-      ipm: v1.0.0
-    - name: dual_spm
-      script: integrate.py
+    #    - wbqspiflash
+    #    - APU
+    #    - s44
+    #    - zipdiv
+    #    - blink
+    #    - usb
+    #    - usb_cdc_core
+    #    - cell_inverter
+    #    - spm
+    #    - gcd
+    #    - caravel_upw
+    #    - io_placer
+    #    - test_sram_macro
+    #    - manual_macro_placement_test
+    #    - name: aes_user_project_wrapper
+    #      test_name: aes_upw_new
+    #      config_file: config.json
+    #    - name: aes_user_project_wrapper
+    #      test_name: aes_upw_old
+    #      config_file: config_old.json
+    #    - user_proj_timer
+    #    - name: xtea
+    #      config_file: config.tcl
+    #    - name: latch
+    #      test_name: latch_good
+    #      config_file: config_good.json
+    #    - name: latch
+    #      test_name: latch_bad
+    #      config_file: config_bad.json
+    #    - name: EF_PSRAM_CTRL_V2
+    #      ipm: v1.0.3
+    #    - name: EF_UART
+    #      ipm: v1.0.0
+    #    - name: MS_SPI_XIP_CACHE
+    #      ipm: v1.0.0
+    #    - name: MS_DMAC_AHBL
+    #      ipm: v1.0.2
+    #    - name: MS_CLK_RST
+    #      ipm: v1.0.1
+    #    - name: EF_TCC32
+    #      ipm: v1.0.1
+    #    - name: EF_GPIO
+    #      ipm: v1.0.0
+    #    - name: dual_spm
+    #      script: integrate.py
 - scl: sky130A/sky130_fd_sc_hd
   name: extended_test_set
   designs:
@@ -66,18 +66,18 @@
     - spm
     - APU
     - usb
-    - usb_cdc_core
-    - zipdiv
-    - blink
-    - wbqspiflash
-    - inverter
-    - cell_inverter
-    - name: latch
-      test_name: latch_good
-      config_file: config_good.json
-    - name: latch
-      test_name: latch_bad
-      config_file: config_bad.json
+    #    - usb_cdc_core
+    #    - zipdiv
+    #    - blink
+    #    - wbqspiflash
+    #    - inverter
+    #    - cell_inverter
+    #    - name: latch
+    #      test_name: latch_good
+    #      config_file: config_good.json
+    #    - name: latch
+    #      test_name: latch_bad
+    #      config_file: config_bad.json
 - scl: gf180mcuD/gf180mcu_fd_sc_mcu7t5v0
   name: extended_test_set
   designs:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -102,7 +102,6 @@ jobs:
       - name: Run Unit Tests
         run: |
           make venv
-
           ./venv/bin/coverage run -m pytest -n auto --pdk-root="./.volare-sky130"
           ./venv/bin/coverage report
           ./venv/bin/coverage html
@@ -269,7 +268,7 @@ jobs:
             --pdk-root ./.volare-sky130\
             --smoke-test
       - name: Upload Docker Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docker-image-${{ matrix.arch }}
           path: ${{ env.IMAGE_PATH }}
@@ -328,15 +327,13 @@ jobs:
           volare enable --pdk ${{ matrix.design.pdk_family }} \
             --pdk-root ./.volare-${{ matrix.design.pdk_family }} \
             ${{ needs.prepare-test-matrices.outputs.opdks_rev }}
-
       - name: Download IPM designs
         id: download-ipm-design
         if: matrix.design.ipm_version != 'None'
         run: |
           export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
           python3 -m pip install git+https://github.com/efabless/IPM
           ipm install --ip-root $(realpath $IP_ROOT) --ipm-root ~/.ipm --version ${{ matrix.design.ipm_version }} ${{ matrix.design.name }}
-
       - name: Run Test
         run: |
           if test ${{matrix.design.script}} = "None"
@@ -362,7 +359,7 @@ jobs:
           fi
       - name: Upload Run Folder
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.design.test_name }}-${{ matrix.design.pdk }}-${{ matrix.design.scl }}
           path: ${{ matrix.design.run_dir }}
@@ -375,14 +372,24 @@ jobs:
               --extract-metrics-to ${{ matrix.design.pdk }}-${{ matrix.design.scl }}-${{ matrix.design.test_name }}.metrics.json
       - name: Upload Metrics
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: metrics
+          name: ${{ matrix.design.pdk }}-${{ matrix.design.scl }}-${{ matrix.design.test_name }}.metrics.json
           path: ${{ matrix.design.pdk }}-${{ matrix.design.scl }}-${{ matrix.design.test_name }}.metrics.json
+  merge_metrics:
+    name: Merge Metrics
+    runs-on: ubuntu-22.04
+    needs: test
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: metrics
+          pattern: "*.metrics.json"
   upload_metrics:
     name: Upload Metrics
     runs-on: ubuntu-22.04
-    needs: [test]
+    needs: [test, merge_metrics]
     if: ${{ always() }}
     steps:
       - name: Check out repo
@@ -395,7 +402,7 @@ jobs:
           python3 -m pip install -e .
           echo "BRANCH_NAME=${GITHUB_REF##*/}" >> $GITHUB_ENV
       - name: Download Metrics
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: metrics
           path: current
@@ -447,12 +454,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GH_TOKEN }}
       - name: Download Image (Docker/amd64)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: docker-image-amd64
           path: /tmp/docker
       - name: Download Image (Docker/aarch64)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: docker-image-aarch64
           path: /tmp/docker
@@ -466,15 +473,12 @@ jobs:
         run: |
           docker tag openlane:tmp-x86_64-linux ghcr.io/${{ github.repository }}:$NEW_TAG-amd64
           docker push ghcr.io/${{ github.repository }}:$NEW_TAG-amd64
-
           docker tag openlane:tmp-aarch64-linux ghcr.io/${{ github.repository }}:$NEW_TAG-aarch64
           docker push ghcr.io/${{ github.repository }}:$NEW_TAG-aarch64
-
           docker manifest create\
             ghcr.io/${{ github.repository }}:$NEW_TAG\
             ghcr.io/${{ github.repository }}:$NEW_TAG-amd64\
             ghcr.io/${{ github.repository }}:$NEW_TAG-aarch64
-
           docker manifest push ghcr.io/${{ github.repository }}:$NEW_TAG
       - name: Set Up Python
         if: ${{ env.PUBLISH == '1' }}