Update makefile, change actions into matrix

Author: abarajithan11

.github/workflows/verify.yml

@@ -140,47 +140,64 @@ jobs:
             -w /work \
             "${GHCR_IMAGE}:${IMAGE_TAG}" \
             bash -c '
-              mkdir -p run/work
-              make TEST=param_test smoke_test
+              make smoke_test TEST=param_test 
             '
 
-  verify-ibex-soc:
-    runs-on: ubuntu-22.04
-    needs: [build-and-push-image, smoke-test]
-    env:
-      IMAGE_TAG: ${{ needs.build-and-push-image.outputs.image_tag }}
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Free disk space on runner
-        run: |
-          echo "Before cleanup:"; df -h
-          sudo rm -rf /usr/share/dotnet /opt/ghc /usr/local/lib/android /opt/hostedtoolcache/CodeQL || true
-          sudo apt-get clean || true
-          sudo rm -rf /var/lib/apt/lists/* || true
-          docker system prune -af || true
-          echo "After cleanup:"; df -h
-
-      - name: Log in to GHCR
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Pull CI image
-        run: docker pull "${GHCR_IMAGE}:${IMAGE_TAG}"
-
-      - name: Ibex SoC + output check
-        run: |
-          docker run --rm \
-            -v "$PWD":/work \
-            -w /work \
-            "${GHCR_IMAGE}:${IMAGE_TAG}" \
-            bash -c '
-              fusesoc library add sa_ip "$(pwd -P)" || true
-              mkdir -p run/work
-              make smoke_ibex
-            '
+unit-tests:
+  runs-on: ubuntu-22.04
+  needs: [build-and-push-image, smoke-test]
+  env:
+    IMAGE_TAG: ${{ needs.build-and-push-image.outputs.image_tag }}
+
+  strategy:
+    fail-fast: false
+    matrix:
+      include:
+        - name: example
+          cmd: |
+            mkdir -p run/work
+            cd run/work
+            python ../example.py
+        - name: pointnet
+          cmd: make clean smoke_test TEST=pointnet
+        # - name: resnet50
+        #   cmd: make clean smoke_test TEST=resnet50
+        # - name: resnet18
+        #   cmd: make clean smoke_test TEST=resnet18
+        # - name: jettagger
+        #   cmd: make clean smoke_test TEST=jettagger
+        - name: verify-ibex-soc
+          cmd: |
+            fusesoc library add sa_ip "$(pwd -P)" || true
+            make smoke_ibex
+
+  steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Free disk space on runner
+      run: |
+        echo "Before cleanup:"; df -h
+        sudo rm -rf /usr/share/dotnet /opt/ghc /usr/local/lib/android /opt/hostedtoolcache/CodeQL || true
+        sudo apt-get clean || true
+        sudo rm -rf /var/lib/apt/lists/* || true
+        docker system prune -af || true
+        echo "After cleanup:"; df -h
+
+    - name: Log in to GHCR
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Pull CI image
+      run: docker pull "${GHCR_IMAGE}:${IMAGE_TAG}"
+
+    - name: Run ${{ matrix.name }}
+      run: |
+        docker run --rm \
+          -v "$PWD":/work \
+          -w /work \
+          "${GHCR_IMAGE}:${IMAGE_TAG}" \
+          bash -c '${{ matrix.cmd }}'

Makefile

@@ -3,14 +3,21 @@
 # Testing
 
 TEST := param_test
+WORKDIR := run/work
 
-smoke_test:
-	cd run/work && python -m pytest -s ../$(TEST).py
+clean:
+	rm -rf $(WORKDIR)
 
-verify_ibex:
+$(WORKDIR):
+	mkdir -p $(WORKDIR)
+
+smoke_test: $(WORKDIR)
+	cd $(WORKDIR) && python -m pytest -s ../$(TEST).py
+
+verify_ibex: $(WORKDIR)
 	cd ibex-soc && python check_output.py
 
-smoke_ibex:
+smoke_ibex: $(WORKDIR)
 	make TEST=ibex_test smoke_test iclean ibuild irun verify_ibex
 
 # Docker