Skip to content

Commit 38303ec

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 63a55da commit 38303ec

Some content is hidden

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

54 files changed

+507
-250
lines changed

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

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

77
source "share/sysbuild/Kconfig"
88

9-
config REMOTE_BOARD
9+
choice NETCORE
10+
default NETCORE_REMOTE_SLEEP_FOREVER
11+
12+
config NETCORE_REMOTE_SLEEP_FOREVER
13+
bool "Remote sleep forever image"
14+
15+
endchoice
16+
17+
config NETCORE_IMAGE_NAME
18+
string
19+
default "remote_sleep_forever" if NETCORE_REMOTE_SLEEP_FOREVER
20+
21+
config NETCORE_IMAGE_PATH
1022
string
11-
default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP
23+
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: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@
66

77
source "share/sysbuild/Kconfig"
88

9-
config REMOTE_BOARD
9+
choice NETCORE
10+
default NETCORE_REMOTE_SLEEP_FOREVER
11+
12+
config NETCORE_REMOTE_SLEEP_FOREVER
13+
bool "Remote sleep forever image"
14+
15+
endchoice
16+
17+
config NETCORE_IMAGE_NAME
18+
string
19+
default "remote_sleep_forever" if NETCORE_REMOTE_SLEEP_FOREVER
20+
21+
config NETCORE_IMAGE_PATH
1022
string
11-
default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP
23+
default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever"

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

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

‎tests/benchmarks/multicore/idle_comp/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_comp/testcase.yaml‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,26 @@ tests:
1616
integration_platforms:
1717
- nrf54h20dk/nrf54h20/cpuapp
1818
extra_args:
19-
- FILE_SUFFIX=s2ram
19+
- EXTRA_DTC_OVERLAY_FILE="boards/comp.overlay"
20+
harness_config:
21+
fixture: gpio_loopback
22+
pytest_root:
23+
- "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_comp"
24+
25+
benchmarks.multicore.idle_comp.nrf54h20dk_cpuapp_cpurad.s2ram.mcuboot:
26+
tags:
27+
- ci_build
28+
- ci_tests_benchmarks_multicore
29+
- ppk_power_measure
30+
filter: not CONFIG_COVERAGE
31+
harness: pytest
32+
platform_allow:
33+
- nrf54h20dk/nrf54h20/cpuapp
34+
integration_platforms:
35+
- nrf54h20dk/nrf54h20/cpuapp
36+
extra_args:
37+
- SB_CONFIG_BOOTLOADER_MCUBOOT=y
38+
- mcuboot_EXTRA_DTC_OVERLAY_FILE="${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay"
2039
- EXTRA_DTC_OVERLAY_FILE="boards/comp.overlay"
2140
harness_config:
2241
fixture: gpio_loopback
@@ -35,7 +54,6 @@ tests:
3554
integration_platforms:
3655
- nrf54h20dk/nrf54h20/cpuapp
3756
extra_args:
38-
- FILE_SUFFIX=s2ram
3957
- EXTRA_DTC_OVERLAY_FILE="boards/lpcomp.overlay"
4058
harness_config:
4159
fixture: gpio_loopback

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#
2+
# Copyright (c) 2024 Nordic Semiconductor ASA
3+
#
4+
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
#
6+
7+
source "share/sysbuild/Kconfig"
8+
9+
choice NETCORE
10+
default NETCORE_REMOTE
11+
12+
config NETCORE_REMOTE
13+
bool "Remote sleep forever image"
14+
15+
endchoice
16+
17+
config NETCORE_IMAGE_NAME
18+
string
19+
default "remote" if NETCORE_REMOTE
20+
21+
config NETCORE_IMAGE_PATH
22+
string
23+
default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_counter/remote"

0 commit comments

Comments
 (0)