occamy: Refactor SW to align with new snRuntime and build system (#475)

* occamy: Adapt to new snRuntime and build system

* gen_trace.py: Correct bug

* occamy: Correct bug in heterogeneous binary build

* fpga: Update base Occamy config file

.github/workflows/ci.yml

@@ -123,3 +123,24 @@ jobs:
       - name: Run Unit Tests
         run: |-
           cd hw/system/snitch_cluster/ && ./run-tests sw/tests/passing-apps.list --simulator verilator
+
+  ######################################
+  # Build SW for Single-Cluster Occamy #
+  ######################################
+  # TODO: add simulation w/ Verilator
+  sw-single-cluster-occamy:
+    container:
+      image: ghcr.io/pulp-platform/snitch
+    name: Build SW for Single-Cluster Occamy
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build Software
+      env:
+        CC: clang
+        LD: lld
+        AR: llvm-ar
+        OBJCOPY: llvm-objcopy
+        OBJDUMP: llvm-objdump
+        DWARFDUMP: llvm-dwarfdump
+      run: make -C hw/system/occamy CFG_OVERRIDE=cfg/single-cluster.hjson sw

.github/workflows/lint.yml

@@ -250,5 +250,5 @@ jobs:
         env:
           CLANG_FORMAT: clang-format-12
         run: |-
-          make -C hw/system/occamy all
-          util/git-diff.py --error-msg "::error ::Found differences, run \`make -C hw/system/occamy all\` before committing."
+          make -C hw/system/occamy update-rtl
+          util/git-diff.py --error-msg "::error ::Found differences, run \`make -C hw/system/occamy update-rtl\` before committing."

.gitlab-ci.d/occamy_cfg_fpga.sh

@@ -5,7 +5,7 @@
 
 # Makes the occamy system smaller so that it fits on a VCU128 FPGA board
 
-occamy_cfg="hw/system/occamy/src/occamy_cfg.hjson"
+occamy_cfg="hw/system/occamy/cfg/full.hjson"
 
 # nr_s1_quadrant -> 1
 sed -i 's|nr_s1_quadrant.*|nr_s1_quadrant: 1,|' ${occamy_cfg}

hw/system/occamy/.gitignore

@@ -5,4 +5,4 @@ verdiLog
 novas.*
 *.fsdb*
 .vcs_checkpoint_shared_memory.*
-logs
+logs*