tests: benchmarks: multicore: Disable S2RAM in coverage

nordic-segl · nordicjm · commit d73f9a57b2dc · 2025-11-05T12:42:24.000Z
When coverage is calculated counter variables are added to the build.
These counters fail when MCU enters/leaves S2RAM low power state.

Fix disabling S2RAM in coverage test configurations.
CONFIG_PM_S2RAM is no longer user selectable.
PM_S2RAM is enabled when any s2ram power state with status "okay"
is present in the devicetree.
Therefore, use DTS overlay to set status "disabled" to s2ram node.

Signed-off-by: Sebastian Głąb &lt;sebastian.glab@nordicsemi.no&gt;
diff --git a/tests/benchmarks/multicore/idle_adc/coverage.conf b/tests/benchmarks/multicore/idle_adc/coverage.conf
@@ -2,7 +2,6 @@ CONFIG_ADC=y
 CONFIG_GPIO=y
 
 CONFIG_PM=y
-CONFIG_PM_S2RAM=n
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
diff --git a/tests/benchmarks/multicore/idle_adc/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_adc/disable_s2ram.overlay
@@ -0,0 +1,3 @@
+&s2ram {
+	status = "disabled";
+};
diff --git a/tests/benchmarks/multicore/idle_adc/testcase.yaml b/tests/benchmarks/multicore/idle_adc/testcase.yaml
@@ -52,6 +52,7 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
       - CONF_FILE=coverage.conf
+      - EXTRA_DTC_OVERLAY_FILE="disable_s2ram.overlay"
       - SHIELD=coverage_support
     harness: console
     harness_config:
diff --git a/tests/benchmarks/multicore/idle_clock_control/coverage.conf b/tests/benchmarks/multicore/idle_clock_control/coverage.conf
@@ -1,5 +1,4 @@
 CONFIG_PM=n
-CONFIG_PM_S2RAM=n
 CONFIG_PM_DEVICE=n
 CONFIG_PM_DEVICE_RUNTIME=n
 CONFIG_POWEROFF=n
diff --git a/tests/benchmarks/multicore/idle_comp/coverage.conf b/tests/benchmarks/multicore/idle_comp/coverage.conf
@@ -2,7 +2,6 @@ CONFIG_COMPARATOR=y
 CONFIG_GPIO=y
 
 CONFIG_PM=y
-CONFIG_PM_S2RAM=n
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
diff --git a/tests/benchmarks/multicore/idle_comp/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_comp/disable_s2ram.overlay
@@ -0,0 +1,3 @@
+&s2ram {
+	status = "disabled";
+};
diff --git a/tests/benchmarks/multicore/idle_comp/testcase.yaml b/tests/benchmarks/multicore/idle_comp/testcase.yaml
@@ -70,7 +70,7 @@ tests:
     integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
-      - EXTRA_DTC_OVERLAY_FILE="boards/lpcomp.overlay"
+      - EXTRA_DTC_OVERLAY_FILE="boards/lpcomp.overlay;disable_s2ram.overlay"
       - CONF_FILE=coverage.conf
       - SHIELD=coverage_support
     harness: console
diff --git a/tests/benchmarks/multicore/idle_exmif/coverage.conf b/tests/benchmarks/multicore/idle_exmif/coverage.conf
@@ -1,7 +1,6 @@
 CONFIG_MSPI=y
 
 CONFIG_PM=y
-CONFIG_PM_S2RAM=n
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
diff --git a/tests/benchmarks/multicore/idle_exmif/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_exmif/disable_s2ram.overlay
@@ -0,0 +1,3 @@
+&s2ram {
+	status = "disabled";
+};
diff --git a/tests/benchmarks/multicore/idle_exmif/testcase.yaml b/tests/benchmarks/multicore/idle_exmif/testcase.yaml
@@ -56,6 +56,7 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
       - CONF_FILE=coverage.conf
+      - EXTRA_DTC_OVERLAY_FILE="disable_s2ram.overlay"
       - SHIELD=coverage_support
     harness: console
     harness_config:
diff --git a/tests/benchmarks/multicore/idle_ipc/coverage.conf b/tests/benchmarks/multicore/idle_ipc/coverage.conf
@@ -3,7 +3,6 @@ CONFIG_MBOX=y
 CONFIG_IPC_SERVICE=y
 
 CONFIG_PM=y
-CONFIG_PM_S2RAM=n
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
diff --git a/tests/benchmarks/multicore/idle_ipc/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_ipc/disable_s2ram.overlay
@@ -0,0 +1,3 @@
+&s2ram {
+	status = "disabled";
+};
diff --git a/tests/benchmarks/multicore/idle_ipc/testcase.yaml b/tests/benchmarks/multicore/idle_ipc/testcase.yaml
@@ -72,6 +72,7 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
       - CONF_FILE=coverage.conf
+      - EXTRA_DTC_OVERLAY_FILE="disable_s2ram.overlay"
       - SHIELD=coverage_support
     harness: console
     harness_config:
diff --git a/tests/benchmarks/multicore/idle_pwm_led/coverage.conf b/tests/benchmarks/multicore/idle_pwm_led/coverage.conf
@@ -2,7 +2,6 @@ CONFIG_PWM=y
 CONFIG_GPIO=y
 
 CONFIG_PM=y
-CONFIG_PM_S2RAM=n
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
diff --git a/tests/benchmarks/multicore/idle_pwm_led/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_pwm_led/disable_s2ram.overlay
@@ -0,0 +1,3 @@
+&s2ram {
+	status = "disabled";
+};
diff --git a/tests/benchmarks/multicore/idle_pwm_led/testcase.yaml b/tests/benchmarks/multicore/idle_pwm_led/testcase.yaml
@@ -127,6 +127,7 @@ tests:
     filter: CONFIG_COVERAGE
     extra_args:
       - idle_pwm_led_CONF_FILE=coverage.conf
+      - EXTRA_DTC_OVERLAY_FILE="disable_s2ram.overlay"
       - SHIELD=coverage_support
     harness: console
     harness_config:
diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/coverage.conf b/tests/benchmarks/multicore/idle_pwm_loopback/coverage.conf
@@ -2,7 +2,6 @@ CONFIG_PWM=y
 CONFIG_GPIO=y
 
 CONFIG_PM=y
-CONFIG_PM_S2RAM=n
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_pwm_loopback/disable_s2ram.overlay
@@ -0,0 +1,3 @@
+&s2ram {
+	status = "disabled";
+};
diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/testcase.yaml b/tests/benchmarks/multicore/idle_pwm_loopback/testcase.yaml
@@ -141,6 +141,7 @@ tests:
     filter: CONFIG_COVERAGE
     extra_args:
       - idle_pwm_loopback_CONF_FILE=coverage.conf
+      - EXTRA_DTC_OVERLAY_FILE="disable_s2ram.overlay"
       - SHIELD=coverage_support
     harness: console
     harness_config:
diff --git a/tests/benchmarks/multicore/idle_spim/coverage.conf b/tests/benchmarks/multicore/idle_spim/coverage.conf
@@ -2,7 +2,6 @@ CONFIG_SPI=y
 CONFIG_GPIO=y
 
 CONFIG_PM=y
-CONFIG_PM_S2RAM=n
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
diff --git a/tests/benchmarks/multicore/idle_spim/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_spim/disable_s2ram.overlay
@@ -0,0 +1,3 @@
+&s2ram {
+	status = "disabled";
+};
diff --git a/tests/benchmarks/multicore/idle_spim/testcase.yaml b/tests/benchmarks/multicore/idle_spim/testcase.yaml
@@ -84,6 +84,7 @@ tests:
     extra_args:
       - SHIELD=pca63566;coverage_support
       - CONF_FILE=coverage.conf
+      - EXTRA_DTC_OVERLAY_FILE="disable_s2ram.overlay"
     harness: console
     harness_config:
       fixture: pca63566
diff --git a/tests/benchmarks/multicore/idle_spim_loopback/coverage.conf b/tests/benchmarks/multicore/idle_spim_loopback/coverage.conf
@@ -2,7 +2,6 @@ CONFIG_SPI=y
 CONFIG_GPIO=y
 
 CONFIG_PM=y
-CONFIG_PM_S2RAM=n
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
diff --git a/tests/benchmarks/multicore/idle_spim_loopback/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_spim_loopback/disable_s2ram.overlay
@@ -0,0 +1,3 @@
+&s2ram {
+	status = "disabled";
+};
diff --git a/tests/benchmarks/multicore/idle_spim_loopback/testcase.yaml b/tests/benchmarks/multicore/idle_spim_loopback/testcase.yaml
@@ -499,6 +499,7 @@ tests:
     extra_args:
       - SHIELD=coverage_support
       - CONF_FILE=coverage.conf
+      - EXTRA_DTC_OVERLAY_FILE="disable_s2ram.overlay"
     harness: console
     harness_config:
       fixture: spi_loopback
diff --git a/tests/benchmarks/multicore/idle_twim/coverage.conf b/tests/benchmarks/multicore/idle_twim/coverage.conf
@@ -2,7 +2,6 @@ CONFIG_I2C=y
 CONFIG_GPIO=y
 
 CONFIG_PM=y
-CONFIG_PM_S2RAM=n
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
diff --git a/tests/benchmarks/multicore/idle_twim/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_twim/disable_s2ram.overlay
@@ -0,0 +1,3 @@
+&s2ram {
+	status = "disabled";
+};
diff --git a/tests/benchmarks/multicore/idle_twim/testcase.yaml b/tests/benchmarks/multicore/idle_twim/testcase.yaml
@@ -61,6 +61,7 @@ tests:
     extra_args:
       - SHIELD=pca63566;coverage_support
       - CONF_FILE=coverage.conf
+      - EXTRA_DTC_OVERLAY_FILE="disable_s2ram.overlay"
     harness: console
     harness_config:
       fixture: pca63566
diff --git a/tests/benchmarks/multicore/idle_uarte/coverage.conf b/tests/benchmarks/multicore/idle_uarte/coverage.conf
@@ -4,7 +4,6 @@ CONFIG_UART_ASYNC_API=y
 CONFIG_UART_USE_RUNTIME_CONFIGURE=y
 
 CONFIG_PM=y
-CONFIG_PM_S2RAM=n
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 CONFIG_POWEROFF=y
diff --git a/tests/benchmarks/multicore/idle_uarte/disable_s2ram.overlay b/tests/benchmarks/multicore/idle_uarte/disable_s2ram.overlay
@@ -0,0 +1,3 @@
+&s2ram {
+	status = "disabled";
+};
diff --git a/tests/benchmarks/multicore/idle_uarte/testcase.yaml b/tests/benchmarks/multicore/idle_uarte/testcase.yaml
@@ -116,7 +116,7 @@ tests:
     integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
-      - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_normal.overlay"
+      - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_normal.overlay;disable_s2ram.overlay"
       - CONF_FILE=coverage.conf
       - SHIELD=coverage_support
     harness: console

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+&s2ram {`
	`2`	`+ status = "disabled";`
	`3`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`CONFIG_PM=n`
`2`		`-CONFIG_PM_S2RAM=n`
`3`	`2`	`CONFIG_PM_DEVICE=n`
`4`	`3`	`CONFIG_PM_DEVICE_RUNTIME=n`
`5`	`4`	`CONFIG_POWEROFF=n`