Skip to content

Commit 559a293

Browse files
nordic-baminordic-bami
committed
tests: benchmarks: multicore: Test idle benchmarks with MCUBoot
Add testing configuration with MCUBoot enabled for the idle benchmarks. Signed-off-by: Bartosz Miller <[email protected]>
1 parent 4d64160 commit 559a293

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+569
-261
lines changed

‎tests/benchmarks/multicore/idle/Kconfig.sysbuild‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,21 @@ source "share/sysbuild/Kconfig"
88

99
config REMOTE_BOARD
1010
string "The board used for remote target"
11+
12+
if SOC_NRF54H20
13+
choice NETCORE
14+
default NETCORE_CUSTOM
15+
16+
config NETCORE_CUSTOM
17+
bool "Custom netcore FW"
18+
endchoice
19+
20+
config NETCORE_IMAGE_NAME
21+
string
22+
default "remote" if NETCORE_CUSTOM
23+
24+
config NETCORE_IMAGE_PATH
25+
string
26+
default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle/remote" if NETCORE_CUSTOM
27+
28+
endif # SOC_NRF54H20

‎tests/benchmarks/multicore/idle/sysbuild.cmake‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,19 @@ if("${SB_CONFIG_REMOTE_BOARD}" STREQUAL "")
88
message(FATAL_ERROR "REMOTE_BOARD must be set to a valid board name")
99
endif()
1010

11-
# Add remote project
12-
ExternalZephyrProject_Add(
13-
APPLICATION remote
14-
SOURCE_DIR ${APP_DIR}/remote
15-
BOARD ${SB_CONFIG_REMOTE_BOARD}
16-
BOARD_REVISION ${BOARD_REVISION}
17-
)
18-
set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET)
19-
set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote)
20-
set_property(GLOBAL PROPERTY DOMAIN_APP_CPUNET remote)
21-
set(CPUNET_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "")
11+
if(NOT SB_CONFIG_SOC_NRF54H20)
12+
# Add remote project
13+
ExternalZephyrProject_Add(
14+
APPLICATION remote
15+
SOURCE_DIR ${APP_DIR}/remote
16+
BOARD ${SB_CONFIG_REMOTE_BOARD}
17+
BOARD_REVISION ${BOARD_REVISION}
18+
)
19+
set_property(GLOBAL APPEND PROPERTY PM_DOMAINS CPUNET)
20+
set_property(GLOBAL APPEND PROPERTY PM_CPUNET_IMAGES remote)
21+
set_property(GLOBAL PROPERTY DOMAIN_APP_CPUNET remote)
22+
set(CPUNET_PM_DOMAIN_DYNAMIC_PARTITION remote CACHE INTERNAL "")
23+
endif()
2224

2325
# Add a dependency so that the remote image will be built and flashed first
2426
add_dependencies(${DEFAULT_IMAGE} remote)

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CONFIG_LOG=n
2+
CONFIG_SERIAL=n
3+
4+
CONFIG_SOC_EARLY_RESET_HOOK=y

‎tests/benchmarks/multicore/idle/testcase.yaml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,39 @@ tests:
141141
- "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption"
142142
tags: ppk_power_measure
143143

144+
benchmarks.multicore.idle.nrf54h20dk_cpuapp_cpurad.s2ram.mcuboot:
145+
platform_allow:
146+
- nrf54h20dk/nrf54h20/cpuapp
147+
integration_platforms:
148+
- nrf54h20dk/nrf54h20/cpuapp
149+
extra_args:
150+
- SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
151+
- CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
152+
- CONFIG_FIRST_SLEEP_OFFSET=y
153+
- CONFIG_PM=y
154+
- CONFIG_PM_S2RAM=y
155+
- CONFIG_POWEROFF=y
156+
- CONFIG_PM_S2RAM_CUSTOM_MARKING=y
157+
- CONFIG_CONSOLE=n
158+
- CONFIG_UART_CONSOLE=n
159+
- CONFIG_SERIAL=n
160+
- CONFIG_GPIO=n
161+
- CONFIG_BOOT_BANNER=n
162+
- remote_CONFIG_PM=y
163+
- remote_CONFIG_POWEROFF=y
164+
- remote_CONFIG_CONSOLE=n
165+
- remote_CONFIG_UART_CONSOLE=n
166+
- remote_CONFIG_SERIAL=n
167+
- remote_CONFIG_GPIO=n
168+
- remote_CONFIG_BOOT_BANNER=n
169+
- SB_CONFIG_BOOTLOADER_MCUBOOT=y
170+
harness: pytest
171+
harness_config:
172+
fixture: lfclk_at_lfxo
173+
pytest_root:
174+
- "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption"
175+
tags: ppk_power_measure
176+
144177
benchmarks.multicore.idle.nrf54h20dk_cpuapp_cpurad.s2ram.fpu:
145178
platform_allow:
146179
- nrf54h20dk/nrf54h20/cpuapp

‎tests/benchmarks/multicore/idle_adc/Kconfig.sysbuild‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@
66

77
source "share/sysbuild/Kconfig"
88

9-
config REMOTE_BOARD
9+
choice NETCORE
10+
default NETCORE_CUSTOM
11+
12+
config NETCORE_CUSTOM
13+
bool "Custom netcore FW"
14+
endchoice
15+
16+
config NETCORE_IMAGE_NAME
17+
string
18+
default "remote" if NETCORE_CUSTOM
19+
20+
config NETCORE_IMAGE_PATH
1021
string
11-
default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP
22+
default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever"

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/*
2+
* Copyright (c) 2025 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
*/
6+
7+
/ {
8+
aliases {
9+
/delete-property/ led1;
10+
};
11+
};
12+
13+
/delete-node/ &led1;

‎tests/benchmarks/multicore/idle_adc/sysbuild.cmake‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CONFIG_LOG=n
2+
CONFIG_SERIAL=n
3+
4+
CONFIG_SOC_EARLY_RESET_HOOK=y

‎tests/benchmarks/multicore/idle_adc/testcase.yaml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@ common:
66

77
tests:
88
benchmarks.multicore.idle_adc.nrf54h20dk_cpuapp_cpurad.s2ram:
9+
tags:
10+
- ci_build
11+
- ci_tests_benchmarks_multicore
12+
- ppk_power_measure
13+
filter: not CONFIG_COVERAGE
14+
harness: pytest
15+
platform_allow:
16+
- nrf54h20dk/nrf54h20/cpuapp
17+
integration_platforms:
18+
- nrf54h20dk/nrf54h20/cpuapp
19+
harness_config:
20+
fixture: gpio_loopback
21+
pytest_root:
22+
- "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_adc"
23+
24+
benchmarks.multicore.idle_adc.nrf54h20dk_cpuapp_cpurad.s2ram.mcuboot:
925
tags:
1026
- ci_build
1127
- ci_tests_benchmarks_multicore
@@ -17,7 +33,8 @@ tests:
1733
integration_platforms:
1834
- nrf54h20dk/nrf54h20/cpuapp
1935
extra_args:
20-
- FILE_SUFFIX=s2ram
36+
- SB_CONFIG_BOOTLOADER_MCUBOOT=y
37+
- mcuboot_EXTRA_DTC_OVERLAY_FILE="${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_adc/boards/nrf54h20dk_mcuboot.overlay"
2138
harness_config:
2239
fixture: gpio_loopback
2340
pytest_root:

‎tests/benchmarks/multicore/idle_comp/Kconfig.sysbuild‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@
66

77
source "share/sysbuild/Kconfig"
88

9-
config REMOTE_BOARD
9+
choice NETCORE
10+
default NETCORE_CUSTOM
11+
12+
config NETCORE_CUSTOM
13+
bool "Custom netcore FW"
14+
endchoice
15+
16+
config NETCORE_IMAGE_NAME
17+
string
18+
default "remote" if NETCORE_CUSTOM
19+
20+
config NETCORE_IMAGE_PATH
1021
string
11-
default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP
22+
default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever"

0 commit comments

Comments
 (0)