tests: benchmarks: multicore: Test idle benchmarks with MCUBoot

tests/benchmarks/multicore/idle/Kconfig.sysbuild

@@ -8,3 +8,21 @@
 
 config REMOTE_BOARD
 	string "The board used for remote target"
+
+if SOC_NRF54H20
+choice NETCORE
+  default NETCORE_CUSTOM
+
+config NETCORE_CUSTOM
+  bool "Custom netcore FW"
+endchoice
+
+config NETCORE_IMAGE_NAME
+  string
+  default "remote" if NETCORE_CUSTOM
+
+config NETCORE_IMAGE_PATH
+  string
+  default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle/remote" if NETCORE_CUSTOM
+
+endif # SOC_NRF54H20

tests/benchmarks/multicore/idle/sysbuild.cmake

@@ -8,17 +8,19 @@ if("${SB_CONFIG_REMOTE_BOARD}" STREQUAL "")
   message(FATAL_ERROR "REMOTE_BOARD must be set to a valid board name")
 endif()
 
-# Add remote project
-ExternalZephyrProject_Add(
-    APPLICATION remote
-    SOURCE_DIR ${APP_DIR}/remote
-    BOARD ${SB_CONFIG_REMOTE_BOARD}
-    BOARD_REVISION ${BOARD_REVISION}
-  )
-set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET)
-set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote)
-set_property(GLOBAL PROPERTY DOMAIN_APP_CPUNET remote)
-set(CPUNET_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "")
+if(NOT SB_CONFIG_SOC_NRF54H20)
+  # Add remote project
+  ExternalZephyrProject_Add(
+      APPLICATION remote
+      SOURCE_DIR ${APP_DIR}/remote
+      BOARD ${SB_CONFIG_REMOTE_BOARD}
+      BOARD_REVISION ${BOARD_REVISION}
+    )
+  set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET)
+  set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote)
+  set_property(GLOBAL PROPERTY DOMAIN_APP_CPUNET remote)
+  set(CPUNET_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "")
+endif()
 
 # Add a dependency so that the remote image will be built and flashed first
 add_dependencies(${DEFAULT_IMAGE} remote)

tests/benchmarks/multicore/idle/sysbuild/mcuboot.conf

@@ -0,0 +1,4 @@
+CONFIG_LOG=n
+CONFIG_SERIAL=n
+
+CONFIG_PM_S2RAM_RESUME_INTERMEDIARY=y

tests/benchmarks/multicore/idle/testcase.yaml

@@ -124,6 +124,39 @@ tests:
         - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption"
     tags: ppk_power_measure
 
+  benchmarks.multicore.idle.nrf54h20dk_cpuapp_cpurad.s2ram.mcuboot:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    extra_args:
+      - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
+      - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
+      - CONFIG_FIRST_SLEEP_OFFSET=y
+      - CONFIG_PM=y
+      - CONFIG_PM_S2RAM=y
+      - CONFIG_POWEROFF=y
+      - CONFIG_PM_S2RAM_CUSTOM_MARKING=y
+      - CONFIG_CONSOLE=n
+      - CONFIG_UART_CONSOLE=n
+      - CONFIG_SERIAL=n
+      - CONFIG_GPIO=n
+      - CONFIG_BOOT_BANNER=n
+      - remote_CONFIG_PM=y
+      - remote_CONFIG_POWEROFF=y
+      - remote_CONFIG_CONSOLE=n
+      - remote_CONFIG_UART_CONSOLE=n
+      - remote_CONFIG_SERIAL=n
+      - remote_CONFIG_GPIO=n
+      - remote_CONFIG_BOOT_BANNER=n
+      - SB_CONFIG_BOOTLOADER_MCUBOOT=y
+    harness: pytest
+    harness_config:
+      fixture: lfclk_at_lfxo
+      pytest_root:
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption"
+    tags: ppk_power_measure
+
   benchmarks.multicore.idle.nrf54h20dk_cpuapp_cpurad.s2ram.fpu:
     platform_allow:
       - nrf54h20dk/nrf54h20/cpuapp

tests/benchmarks/multicore/idle_adc/Kconfig.sysbuild

@@ -6,6 +6,17 @@
 
 source "share/sysbuild/Kconfig"
 
-config REMOTE_BOARD
-	string
-	default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP
+choice NETCORE
+  default NETCORE_CUSTOM
+
+config NETCORE_CUSTOM
+  bool "Custom netcore FW"
+endchoice
+
+config NETCORE_IMAGE_NAME
+  string
+  default "remote" if NETCORE_CUSTOM
+
+config NETCORE_IMAGE_PATH
+  string
+  default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever"

tests/benchmarks/multicore/idle_adc/boards/nrf54h20dk_mcuboot.overlay

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	aliases {
+		/delete-property/ led1;
+	};
+};
+
+/delete-node/ &led1;

tests/benchmarks/multicore/idle_adc/sysbuild/mcuboot.conf

@@ -0,0 +1,4 @@
+CONFIG_LOG=n
+CONFIG_SERIAL=n
+
+CONFIG_PM_S2RAM_RESUME_INTERMEDIARY=y

tests/benchmarks/multicore/idle_adc/testcase.yaml

@@ -6,6 +6,22 @@ common:
 
 tests:
   benchmarks.multicore.idle_adc.nrf54h20dk_cpuapp_cpurad.s2ram:
+    tags:
+      - ci_build
+      - ci_tests_benchmarks_multicore
+      - ppk_power_measure
+    filter: not CONFIG_COVERAGE
+    harness: pytest
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    harness_config:
+      fixture: gpio_loopback
+      pytest_root:
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_adc"
+
+  benchmarks.multicore.idle_adc.nrf54h20dk_cpuapp_cpurad.s2ram.mcuboot:
     tags:
       - ci_build
       - ci_tests_benchmarks_multicore
@@ -17,7 +33,8 @@ tests:
     integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
-      - FILE_SUFFIX=s2ram
+      - SB_CONFIG_BOOTLOADER_MCUBOOT=y
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_adc/boards/nrf54h20dk_mcuboot.overlay"
     harness_config:
       fixture: gpio_loopback
       pytest_root:

tests/benchmarks/multicore/idle_comp/Kconfig.sysbuild

@@ -6,6 +6,17 @@
 
 source "share/sysbuild/Kconfig"
 
-config REMOTE_BOARD
-	string
-	default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP
+choice NETCORE
+  default NETCORE_CUSTOM
+
+config NETCORE_CUSTOM
+  bool "Custom netcore FW"
+endchoice
+
+config NETCORE_IMAGE_NAME
+  string
+  default "remote" if NETCORE_CUSTOM
+
+config NETCORE_IMAGE_PATH
+  string
+  default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever"

tests/benchmarks/multicore/idle_comp/sysbuild/mcuboot.conf

@@ -0,0 +1,4 @@
+CONFIG_LOG=n
+CONFIG_SERIAL=n
+
+CONFIG_PM_S2RAM_RESUME_INTERMEDIARY=y

tests/benchmarks/multicore/idle_comp/testcase.yaml

@@ -16,7 +16,26 @@ tests:
     integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
-      - FILE_SUFFIX=s2ram
+      - EXTRA_DTC_OVERLAY_FILE="boards/comp.overlay"
+    harness_config:
+      fixture: gpio_loopback
+      pytest_root:
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_comp"
+
+  benchmarks.multicore.idle_comp.nrf54h20dk_cpuapp_cpurad.s2ram.mcuboot:
+    tags:
+      - ci_build
+      - ci_tests_benchmarks_multicore
+      - ppk_power_measure
+    filter: not CONFIG_COVERAGE
+    harness: pytest
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    extra_args:
+      - SB_CONFIG_BOOTLOADER_MCUBOOT=y
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay"
       - EXTRA_DTC_OVERLAY_FILE="boards/comp.overlay"
     harness_config:
       fixture: gpio_loopback
@@ -35,7 +54,6 @@ tests:
     integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
-      - FILE_SUFFIX=s2ram
       - EXTRA_DTC_OVERLAY_FILE="boards/lpcomp.overlay"
     harness_config:
       fixture: gpio_loopback

tests/benchmarks/multicore/idle_counter/Kconfig.sysbuild

@@ -0,0 +1,22 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+source "share/sysbuild/Kconfig"
+
+choice NETCORE
+  default NETCORE_CUSTOM
+
+config NETCORE_CUSTOM
+  bool "Custom netcore FW"
+endchoice
+
+config NETCORE_IMAGE_NAME
+  string
+  default "remote" if NETCORE_CUSTOM
+
+config NETCORE_IMAGE_PATH
+  string
+  default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_counter/remote"

tests/benchmarks/multicore/idle_counter/remote/prj.conf

@@ -7,8 +7,6 @@ CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_RUNTIME=y
 
 CONFIG_PM=y
-CONFIG_PM_S2RAM=y
-CONFIG_PM_S2RAM_CUSTOM_MARKING=y
 CONFIG_POWEROFF=y
 CONFIG_CONSOLE=n
 CONFIG_UART_CONSOLE=n

tests/benchmarks/multicore/idle_counter/sysbuild/mcuboot.conf

@@ -0,0 +1,4 @@
+CONFIG_LOG=n
+CONFIG_SERIAL=n
+
+CONFIG_PM_S2RAM_RESUME_INTERMEDIARY=y

tests/benchmarks/multicore/idle_counter/testcase.yaml

@@ -25,3 +25,14 @@
       fixture: ppk_power_measure
       pytest_root:
         - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_fast_counter_and_s2ram_with_clock_control"
+
+  benchmarks.power_consumption.counter.mcuboot:
+    extra_args:
+      - SB_CONFIG_BOOTLOADER_MCUBOOT=y
+      - mcuboot_EXTRA_DTC_OVERLAY_FILE="${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_counter/boards/nrf54h20dk_nrf54h20_cpuapp.overlay"
+    harness: pytest
+    harness_config:
+      fixture: ppk_power_measure
+      pytest_root:
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_fast_counter_and_s2ram_with_clock_control"
+

tests/benchmarks/multicore/idle_exmif/Kconfig.sysbuild

@@ -6,6 +6,17 @@
 
 source "share/sysbuild/Kconfig"
 
-config REMOTE_BOARD
-	string
-	default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP
+choice NETCORE
+  default NETCORE_CUSTOM
+
+config NETCORE_CUSTOM
+  bool "Custom netcore FW"
+endchoice
+
+config NETCORE_IMAGE_NAME
+  string
+  default "remote" if NETCORE_CUSTOM
+
+config NETCORE_IMAGE_PATH
+  string
+  default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever"

tests/benchmarks/multicore/idle_exmif/boards/nrf54h20dk_mcuboot.overlay

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	aliases {
+		/delete-property/ led1;
+	};
+};
+
+/delete-node/ &led1;