OPEN: Snitch Cluster Tiling Support

.github/workflows/BuildDocker.yml

@@ -38,4 +38,4 @@ jobs:
           file: Container/Dockerfile
           push: true
           # JUNGVI: If you operate from a fork and want to build a new docker make sure to replace 'pulp-platform' by your uname. 
-          tags: ghcr.io/pulp-platform/deeploy:main 
+          tags: ghcr.io/tahaelbayad/deeploy:main 

.github/workflows/CI.yml

@@ -13,7 +13,7 @@ jobs:
   build-deeploy:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -94,7 +94,42 @@ jobs:
     uses: ./.github/workflows/TestRunnerSnitch.yml
     with:
       test-names: |
+        Adder
+        iSoftmax
+        TestiNoNorm
+        TestAdderLarge
+        TestiSoftmaxLarge
         testMatMul
+        testRQGEMM
+        TestRQAdd
+        testRQGEMMTransB
+
+  snitch-kernels-tiled-singlebuffer-L2:
+    uses: ./.github/workflows/TestRunnerTiledSnitch.yml
+    with:
+      tests-config: |
+        [
+          {
+            "name": "TestiNoNorm",
+            "L1": [5000, 10000]
+          },
+          {
+            "name": "TestAdderLarge",
+            "L1": [5000, 10000]
+          },
+          {
+            "name": "TestiSoftmaxLarge",
+            "L1": [5000, 10000]
+          },
+          {
+            "name": "testRQGEMM",
+            "L1": [2000, 5000]
+          },
+          {
+            "name": "TestRQAdd",
+            "L1": [5000, 10000]
+          }
+        ]
 
   ### Mempool Tests ###
   mempool-kernels:
@@ -507,7 +542,7 @@ jobs:
   deeploy-state-serialization:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -527,7 +562,7 @@ jobs:
   deeploy-memory-level-extension:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -547,7 +582,7 @@ jobs:
   deeploy-tiler-extension:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -571,7 +606,7 @@ jobs:
   deeploy-memory-allocation-extension:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -593,7 +628,7 @@ jobs:
   deeploy-typing:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -610,7 +645,7 @@ jobs:
   deeploy-regex-matching:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -627,7 +662,7 @@ jobs:
   linting:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/TestRunnerCortexM.yml

@@ -11,7 +11,7 @@ jobs:
   test-runner-cortexm:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/TestRunnerGeneric.yml

@@ -11,7 +11,7 @@ jobs:
   test-runner-generic:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/TestRunnerMempool.yml

@@ -11,7 +11,7 @@ jobs:
   test-runner-mempool:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/TestRunnerSiracusa.yml

@@ -14,7 +14,7 @@ jobs:
   test-runner-siracusa:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/TestRunnerSnitch.yml

@@ -11,7 +11,7 @@ jobs:
   test-runner-snitch:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -26,7 +26,7 @@ jobs:
           echo "$testNames" | while IFS= read -r testName; do
             if [[ -n "$testName" ]]; then
               echo "Running test: $testName"
-              python testRunner_snitch.py -t Tests/$testName --toolchain_install_dir /app/install/riscv-llvm/
+              python testRunner_snitch.py -t Tests/$testName --simulator=banshee --cores=9 --toolchain_install_dir /app/install/riscv-llvm/
             fi
           done
         shell: bash

.github/workflows/TestRunnerTiledSiracusa.yml

@@ -32,7 +32,7 @@ jobs:
         L1: ${{ fromJSON(inputs.L1) }}
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/TestRunnerTiledSiracusaSequential.yml

@@ -24,7 +24,7 @@ jobs:
   test-runner-siracusa-tiled:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/TestRunnerTiledSiracusaWithNeureka.yml

@@ -36,7 +36,7 @@ jobs:
         L1: ${{ fromJSON(inputs.L1) }}
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/TestRunnerTiledSiracusaWithNeurekaSequential.yml

@@ -28,7 +28,7 @@ jobs:
   test-runner-siracusa-neureka-tiled:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/pulp-platform/deeploy:main
+      image: ghcr.io/tahaelbayad/deeploy:main
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4

.github/workflows/TestRunnerTiledSnitch.yml

@@ -0,0 +1,47 @@
+name: TestRunnerTiledSnitch
+
+on:
+  workflow_call:
+    inputs:
+      tests-config:
+        required: true
+        type: string
+
+jobs:
+
+  test-runner-snitch-tiled:
+    runs-on: ubuntu-22.04
+    container:
+      image: ghcr.io/tahaelbayad/deeploy:main
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      - name: Build Deeploy
+        run: pip install -e .
+      - name: Install jq
+        run: apt-get install -y jq
+      - name: Cache ccache
+        id: ccache-cache
+        uses: actions/cache@v4
+        with:
+          path: /app/.ccache
+          key: ${{ runner.os }}-ccache
+      - name: Run Tests
+        run: |
+          cd DeeployTest
+          echo '${{ inputs.tests-config }}' > tests.json
+          mkdir -p /app/.ccache
+          export CCACHE_DIR=/app/.ccache
+
+          jq -c '.[]' tests.json | while read test; do
+            testName=$(echo "$test" | jq -r '.name')
+            L1_values=$(echo "$test" | jq -r '.L1[]')
+            for L1_value in $L1_values; do
+              echo "Running test: $testName with L1: $L1_value"
+              python testRunner_tiled_snitch.py -t Tests/$testName --cores=9 --simulator=banshee --l1 $L1_value --defaultMemLevel=L2 --toolchain_install_dir /app/install/riscv-llvm/
+            done
+          done
+        shell: bash
+

.gitmodules

@@ -6,4 +6,8 @@
 	url = https://github.com/pulp-platform/pulp-nnx.git
 [submodule "CMSIS-NN"]
 	path = TargetLibraries/CMSIS/third_party/CMSIS-NN
-	url = https://github.com/ARM-software/CMSIS-NN.git
+	url = https://github.com/ARM-software/CMSIS-NN.git
+[submodule "TargetLibraries/Snitch/third_party/pulp-nn-mixed"]
+	path = TargetLibraries/Snitch/third_party/pulp-nn-mixed
+	url = https://github.com/Victor-Jung/pulp-nn-mixed.git
+	branch = deeploySnitchTarget

Deeploy/Targets/Generic/Layers.py

@@ -29,7 +29,7 @@
 
 import numpy as np
 
-from Deeploy.DeeployTypes import NodeMapper, ONNXLayer, Shape
+from Deeploy.DeeployTypes import NodeMapper, ONNXLayer, OperatorRepresentation, Shape
 
 
 class ConcatLayer(ONNXLayer):
@@ -85,6 +85,23 @@ def __init__(self, maps: List[NodeMapper]):
         super().__init__(maps)
 
 
+class iNoNormLayer(ONNXLayer):
+
+    def __init__(self, maps: List[NodeMapper]):
+        super().__init__(maps)
+
+    def computeOps(self):
+        return self.mapper.parser.operatorRepresentation['size'] * 4  # 2 mul, 1 add, 1 right shift
+
+    def computeShapes(self, inputShapes: Shape, outputShapes: Shape, operatorRepresentation: OperatorRepresentation,
+                      channels_first: bool) -> Tuple[Shape]:
+
+        # JUNGVI: Broadcast the weights and bias to have as many dimensions as the inputs
+        inputShapes[1] = [1] * (len(inputShapes[0]) - len(inputShapes[1])) + list(inputShapes[1])
+        inputShapes[2] = inputShapes[1]
+        return (inputShapes, outputShapes)
+
+
 class RQSiGELULayer(iGELULayer):
 
     def __init__(self, maps: List[NodeMapper]):