Bump PD to use regular instance runners (#2)

* ci: Use same PD_COMMIT as in Makefile

* Makefile: Bump PD_COMMIT

* gitlab-ci: Reduce VCS tests due to limited licenses

* ci: Reuse simulation check logic

Author: colluca

.gitlab-ci.yml

@@ -106,53 +106,40 @@ sim-vsim:
     - .init-env
     - .sw-tests
   variables:
-    LOG_FILE: target/sim/vsim/transcript
+    LOG_FILE: transcript
   needs:
     - chs-sw
     - sn-sw
     - vsim-compile
   script:
-    # Run the simulation
     - make vsim-run-batch-verify
-    # Check either success or failure for non-zero exit codes
-    - 'if [ -z "${NZ_EXIT_CODE}" ]; then grep "] SUCCESS" transcript || (exit 1); else grep "] FAILED: return code ${NZ_EXIT_CODE}" transcript || (exit 1); fi'
-    # Check for UART output
-    - 'if [ ! -z "${USTR}" ]; then (grep " \[UART\] ${USTR}" transcript); fi'
-    # Check for any fatal errors
-    - 'if grep "Fatal:" transcript; then exit 1; fi'
-    # Check for any non-fatal errors. One and only one error is expected with a non-zero exit code.
-    # Ignore all errors when using a separate verification script.
-    - 'if [ -z "${VERIFY_PY}" ]; then if [ ! -z "${NZ_EXIT_CODE}" ]; then count=$(grep -c "Error:" transcript); if [ "$count" -ne 1 ]; then exit 1; fi; else if grep -q "Error:" transcript; then exit 1; fi; fi; fi'
+    - !reference [.check-simulation, script]
   artifacts:
     paths:
-      - transcript
+      - ${LOG_FILE}
 
 sim-vcs:
   stage: run
   extends:
     - .cache-deps
     - .init-env
-    - .sw-tests
   variables:
-    LOG_FILE: target/sim/vcs/build/vcs.log
+    LOG_FILE: transcript
+    CHS_BINARY: sw/cheshire/tests/simple_offload.spm.elf
+    SN_BINARY: sw/snitch/apps/mha/build/mha.elf
+    VERIFY_PY: .deps/snitch_cluster/sw/kernels/dnn/mha/scripts/verify.py
+    PRELMODE: 3
   needs:
     - chs-sw
     - sn-sw
     - vcs-compile
   script:
-    # Run the simulation
-    - make vcs-run-batch-verify 2>&1 | tee target/sim/vcs/build/vcs.log
-    # Check either success or failure for non-zero exit codes
-    - 'if [ -z "${NZ_EXIT_CODE}" ]; then grep "] SUCCESS" target/sim/vcs/build/vcs.log || (exit 1); else grep "] FAILED: return code ${NZ_EXIT_CODE}" target/sim/vcs/build/vcs.log || (exit 1); fi'
-    # Check for UART output
-    - 'if [ ! -z "${USTR}" ]; then (grep "\[UART\] ${USTR}" target/sim/vcs/build/vcs.log); fi'
-    # Check for any fatal errors
-    - 'if grep "Fatal:" target/sim/vcs/build/vcs.log; then exit 1; fi'
-    # Check for any non-fatal errors
-    - 'if [ -z "${VERIFY_PY}" ]; then if [ ! -z "${NZ_EXIT_CODE}" ]; then count=$(grep -c "Error:" target/sim/vcs/build/vcs.log); if [ "$count" -ne 1 ]; then exit 1; fi; else if grep -q "Error:" target/sim/vcs/build/vcs.log; then exit 1; fi; fi; fi'
+    # Run the VCS simulation and capture the console output into a log file
+    - make vcs-run-batch-verify 2>&1 | tee ${LOG_FILE}
+    - !reference [.check-simulation, script]
   artifacts:
     paths:
-      - target/sim/vcs/build/vcs.log
+      - ${LOG_FILE}
 
 #####################
 # Run Experiments   #

.gitlab/common.yml

@@ -4,7 +4,6 @@
 
 variables:
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-  PD_COMMIT: "9dc9435b5f6be06ea7dd52bcc0760a2c49f8e649"
 
 # Check the cache for bender and python dependencies
 .cache-deps:
@@ -70,3 +69,15 @@ variables:
     paths:
       - sw/cheshire/tests/*.elf
     expire_in: 1 day
+
+.check-simulation:
+  script:
+    # Check either success or failure for non-zero exit codes
+    - 'if [ -z "${NZ_EXIT_CODE}" ]; then grep "] SUCCESS" "${LOG_FILE}" || (exit 1); else grep "] FAILED: return code ${NZ_EXIT_CODE}" "${LOG_FILE}" || (exit 1); fi'
+    # Check for UART output
+    - 'if [ ! -z "${USTR}" ]; then (grep " \[UART\] ${USTR}" "${LOG_FILE}"); fi'
+    # Check for any fatal errors
+    - 'if grep "Fatal:" "${LOG_FILE}"; then exit 1; fi'
+    # Check for any non-fatal errors. One and only one error is expected with a non-zero exit code.
+    # Ignore all errors when using a separate verification script.
+    - 'if [ -z "${VERIFY_PY}" ]; then if [ ! -z "${NZ_EXIT_CODE}" ]; then count=$(grep -c "Error:" "${LOG_FILE}"); if [ "$count" -ne 1 ]; then exit 1; fi; else if grep -q "Error:" "${LOG_FILE}"; then exit 1; fi; fi; fi'

Makefile

@@ -152,7 +152,7 @@ floo-clean: gw-addrmap-clean
 ###################
 
 PD_REMOTE ?= git@iis-git.ee.ethz.ch:gwaihir/gwaihir-pd.git
-PD_COMMIT ?= main
+PD_COMMIT ?= 524d18b0f119507e24af0be3bee7cd0475824ede
 PD_DIR = $(GW_ROOT)/pd
 .PHONY: init-pd clean-pd