From e090af32d4fc96af5c84f84b7e945f578e7b27e8 Mon Sep 17 00:00:00 2001 From: Piotr Kosycarz Date: Tue, 12 Nov 2024 22:04:32 +0100 Subject: [PATCH 1/8] tests: benchmarks: power_consumption: adc: multicore app for nrf54h20 Add code for radio core so that it can be put into sleep and release resources. Signed-off-by: Piotr Kosycarz (cherry picked from commit fb1e81935edec837cdc56c27ad2b2c45d8da9aca) --- .../power_consumption/adc/Kconfig.sysbuild | 10 ++++++++++ .../power_consumption/adc/sysbuild.cmake | 17 +++++++++++++++++ .../sysbuild/nrf54h20dk_nrf54h20_cpurad.conf | 1 + .../power_consumption/adc/testcase.yaml | 3 +++ 4 files changed, 31 insertions(+) create mode 100644 tests/benchmarks/power_consumption/adc/Kconfig.sysbuild create mode 100644 tests/benchmarks/power_consumption/adc/sysbuild.cmake create mode 100644 tests/benchmarks/power_consumption/adc/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf diff --git a/tests/benchmarks/power_consumption/adc/Kconfig.sysbuild b/tests/benchmarks/power_consumption/adc/Kconfig.sysbuild new file mode 100644 index 00000000000..0898eb29293 --- /dev/null +++ b/tests/benchmarks/power_consumption/adc/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config REMOTE_BOARD + string "The board used for remote target" diff --git a/tests/benchmarks/power_consumption/adc/sysbuild.cmake b/tests/benchmarks/power_consumption/adc/sysbuild.cmake new file mode 100644 index 00000000000..504b2ac23b9 --- /dev/null +++ b/tests/benchmarks/power_consumption/adc/sysbuild.cmake @@ -0,0 +1,17 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +if(NOT "${SB_CONFIG_REMOTE_BOARD}" STREQUAL "") + ExternalZephyrProject_Add( + APPLICATION remote_sleep_forever + SOURCE_DIR ${APP_DIR}/../common/remote_sleep_forever + BOARD ${SB_CONFIG_REMOTE_BOARD} + BOARD_REVISION ${BOARD_REVISION} + ) + + add_dependencies(adc remote_sleep_forever) + sysbuild_add_dependencies(FLASH adc remote_sleep_forever) +endif() diff --git a/tests/benchmarks/power_consumption/adc/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf b/tests/benchmarks/power_consumption/adc/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf new file mode 100644 index 00000000000..dd863e78d99 --- /dev/null +++ b/tests/benchmarks/power_consumption/adc/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf @@ -0,0 +1 @@ +SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad" diff --git a/tests/benchmarks/power_consumption/adc/testcase.yaml b/tests/benchmarks/power_consumption/adc/testcase.yaml index 5343c12749d..77dd970c7ec 100644 --- a/tests/benchmarks/power_consumption/adc/testcase.yaml +++ b/tests/benchmarks/power_consumption/adc/testcase.yaml @@ -13,10 +13,13 @@ tests: pytest_root: - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_thread_suspend_resume_adc_54L" benchmarks.power_consumption.adc_nrf54h: + sysbuild: true integration_platforms: - nrf54h20dk/nrf54h20/cpuapp platform_allow: - nrf54h20dk/nrf54h20/cpuapp + extra_args: + SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf harness: pytest harness_config: fixture: ppk_power_measure From 948ee52f1c63b533302fd89cd0b1a9ec60f4ad22 Mon Sep 17 00:00:00 2001 From: Piotr Kosycarz Date: Tue, 12 Nov 2024 22:26:00 +0100 Subject: [PATCH 2/8] tests: benchmarks: power_consumption: adc_async: multicore app for nrf54h20 Add code for radio core so that it can be put into sleep and release resources. Signed-off-by: Piotr Kosycarz (cherry picked from commit 0f8f9c01080259daa530854fab81b4a68d16742b) --- .../adc_async/Kconfig.sysbuild | 10 ++++++++++ .../power_consumption/adc_async/sysbuild.cmake | 17 +++++++++++++++++ .../sysbuild/nrf54h20dk_nrf54h20_cpurad.conf | 1 + .../power_consumption/adc_async/testcase.yaml | 3 +++ 4 files changed, 31 insertions(+) create mode 100644 tests/benchmarks/power_consumption/adc_async/Kconfig.sysbuild create mode 100644 tests/benchmarks/power_consumption/adc_async/sysbuild.cmake create mode 100644 tests/benchmarks/power_consumption/adc_async/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf diff --git a/tests/benchmarks/power_consumption/adc_async/Kconfig.sysbuild b/tests/benchmarks/power_consumption/adc_async/Kconfig.sysbuild new file mode 100644 index 00000000000..0898eb29293 --- /dev/null +++ b/tests/benchmarks/power_consumption/adc_async/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config REMOTE_BOARD + string "The board used for remote target" diff --git a/tests/benchmarks/power_consumption/adc_async/sysbuild.cmake b/tests/benchmarks/power_consumption/adc_async/sysbuild.cmake new file mode 100644 index 00000000000..a80fd54fcca --- /dev/null +++ b/tests/benchmarks/power_consumption/adc_async/sysbuild.cmake @@ -0,0 +1,17 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +if(NOT "${SB_CONFIG_REMOTE_BOARD}" STREQUAL "") + ExternalZephyrProject_Add( + APPLICATION remote_sleep_forever + SOURCE_DIR ${APP_DIR}/../common/remote_sleep_forever + BOARD ${SB_CONFIG_REMOTE_BOARD} + BOARD_REVISION ${BOARD_REVISION} + ) + + add_dependencies(adc_async remote_sleep_forever) + sysbuild_add_dependencies(FLASH adc_async remote_sleep_forever) +endif() diff --git a/tests/benchmarks/power_consumption/adc_async/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf b/tests/benchmarks/power_consumption/adc_async/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf new file mode 100644 index 00000000000..dd863e78d99 --- /dev/null +++ b/tests/benchmarks/power_consumption/adc_async/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf @@ -0,0 +1 @@ +SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad" diff --git a/tests/benchmarks/power_consumption/adc_async/testcase.yaml b/tests/benchmarks/power_consumption/adc_async/testcase.yaml index 998539bae13..5c39233a5f2 100644 --- a/tests/benchmarks/power_consumption/adc_async/testcase.yaml +++ b/tests/benchmarks/power_consumption/adc_async/testcase.yaml @@ -13,10 +13,13 @@ tests: pytest_root: - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_thread_suspend_resume_adc_async_54L" benchmarks.power_consumption.adc_async_nrf54h: + sysbuild: true integration_platforms: - nrf54h20dk/nrf54h20/cpuapp platform_allow: - nrf54h20dk/nrf54h20/cpuapp + extra_args: + SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf harness: pytest harness_config: fixture: ppk_power_measure From c00cf8d742ce70ea8663a1b7a17b6b4cbfe89c2c Mon Sep 17 00:00:00 2001 From: Piotr Kosycarz Date: Tue, 12 Nov 2024 22:30:39 +0100 Subject: [PATCH 3/8] tests: benchmarks: power_consumption: flash: multicore app for nrf54h20 Add code for radio core so that it can be put into sleep and release resources. Signed-off-by: Piotr Kosycarz (cherry picked from commit 162c3378235d0a2c9d26d654d86eb5b45259b316) --- .../power_consumption/flash/Kconfig.sysbuild | 10 ++++++++++ .../power_consumption/flash/sysbuild.cmake | 17 +++++++++++++++++ .../sysbuild/nrf54h20dk_nrf54h20_cpurad.conf | 1 + .../power_consumption/flash/testcase.yaml | 5 ++++- 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 tests/benchmarks/power_consumption/flash/Kconfig.sysbuild create mode 100644 tests/benchmarks/power_consumption/flash/sysbuild.cmake create mode 100644 tests/benchmarks/power_consumption/flash/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf diff --git a/tests/benchmarks/power_consumption/flash/Kconfig.sysbuild b/tests/benchmarks/power_consumption/flash/Kconfig.sysbuild new file mode 100644 index 00000000000..0898eb29293 --- /dev/null +++ b/tests/benchmarks/power_consumption/flash/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config REMOTE_BOARD + string "The board used for remote target" diff --git a/tests/benchmarks/power_consumption/flash/sysbuild.cmake b/tests/benchmarks/power_consumption/flash/sysbuild.cmake new file mode 100644 index 00000000000..645411781e9 --- /dev/null +++ b/tests/benchmarks/power_consumption/flash/sysbuild.cmake @@ -0,0 +1,17 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +if(NOT "${SB_CONFIG_REMOTE_BOARD}" STREQUAL "") + ExternalZephyrProject_Add( + APPLICATION remote_sleep_forever + SOURCE_DIR ${APP_DIR}/../common/remote_sleep_forever + BOARD ${SB_CONFIG_REMOTE_BOARD} + BOARD_REVISION ${BOARD_REVISION} + ) + + add_dependencies(flash remote_sleep_forever) + sysbuild_add_dependencies(FLASH flash remote_sleep_forever) +endif() diff --git a/tests/benchmarks/power_consumption/flash/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf b/tests/benchmarks/power_consumption/flash/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf new file mode 100644 index 00000000000..dd863e78d99 --- /dev/null +++ b/tests/benchmarks/power_consumption/flash/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf @@ -0,0 +1 @@ +SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad" diff --git a/tests/benchmarks/power_consumption/flash/testcase.yaml b/tests/benchmarks/power_consumption/flash/testcase.yaml index 3daeaf2a7d4..7241225c9b9 100644 --- a/tests/benchmarks/power_consumption/flash/testcase.yaml +++ b/tests/benchmarks/power_consumption/flash/testcase.yaml @@ -13,11 +13,14 @@ tests: pytest_root: - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_thread_suspend_resume_flash_54L" benchmarks.power_consumption.flash_nrf54h: - harness: pytest + sysbuild: true integration_platforms: - nrf54h20dk/nrf54h20/cpuapp platform_allow: - nrf54h20dk/nrf54h20/cpuapp + extra_args: + SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf + harness: pytest harness_config: fixture: ppk_power_measure pytest_root: From 73270ea29bdeb303d0c699062ea2601c8e0459ba Mon Sep 17 00:00:00 2001 From: Piotr Kosycarz Date: Tue, 12 Nov 2024 22:43:06 +0100 Subject: [PATCH 4/8] tests: benchmarks: power_consumption: i2c: multicore app for nrf54h20 Add code for radio core so that it can be put into sleep and release resources. Signed-off-by: Piotr Kosycarz (cherry picked from commit 579171436054a7ec4c4ea012a09e586f7be7ca1a) --- .../power_consumption/i2c/Kconfig.sysbuild | 10 ++++++++++ .../power_consumption/i2c/sysbuild.cmake | 17 +++++++++++++++++ .../sysbuild/nrf54h20dk_nrf54h20_cpurad.conf | 1 + .../power_consumption/i2c/testcase.yaml | 2 ++ 4 files changed, 30 insertions(+) create mode 100644 tests/benchmarks/power_consumption/i2c/Kconfig.sysbuild create mode 100644 tests/benchmarks/power_consumption/i2c/sysbuild.cmake create mode 100644 tests/benchmarks/power_consumption/i2c/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf diff --git a/tests/benchmarks/power_consumption/i2c/Kconfig.sysbuild b/tests/benchmarks/power_consumption/i2c/Kconfig.sysbuild new file mode 100644 index 00000000000..0898eb29293 --- /dev/null +++ b/tests/benchmarks/power_consumption/i2c/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config REMOTE_BOARD + string "The board used for remote target" diff --git a/tests/benchmarks/power_consumption/i2c/sysbuild.cmake b/tests/benchmarks/power_consumption/i2c/sysbuild.cmake new file mode 100644 index 00000000000..c885a4dd8f2 --- /dev/null +++ b/tests/benchmarks/power_consumption/i2c/sysbuild.cmake @@ -0,0 +1,17 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +if(NOT "${SB_CONFIG_REMOTE_BOARD}" STREQUAL "") + ExternalZephyrProject_Add( + APPLICATION remote_sleep_forever + SOURCE_DIR ${APP_DIR}/../common/remote_sleep_forever + BOARD ${SB_CONFIG_REMOTE_BOARD} + BOARD_REVISION ${BOARD_REVISION} + ) + + add_dependencies(i2c remote_sleep_forever) + sysbuild_add_dependencies(FLASH i2c remote_sleep_forever) +endif() diff --git a/tests/benchmarks/power_consumption/i2c/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf b/tests/benchmarks/power_consumption/i2c/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf new file mode 100644 index 00000000000..dd863e78d99 --- /dev/null +++ b/tests/benchmarks/power_consumption/i2c/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf @@ -0,0 +1 @@ +SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad" diff --git a/tests/benchmarks/power_consumption/i2c/testcase.yaml b/tests/benchmarks/power_consumption/i2c/testcase.yaml index cf44c7cfc9b..d7b065d032a 100644 --- a/tests/benchmarks/power_consumption/i2c/testcase.yaml +++ b/tests/benchmarks/power_consumption/i2c/testcase.yaml @@ -16,12 +16,14 @@ tests: - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_thread_suspend_resume_i2c_54L" benchmarks.power_consumption.i2c_nrf54h: harness: pytest + sysbuild: true integration_platforms: - nrf54h20dk/nrf54h20/cpuapp platform_allow: - nrf54h20dk/nrf54h20/cpuapp extra_args: - SHIELD=pca63566 + - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf harness_config: fixture: pca63566 pytest_root: From 2b942cfc463121d6f339a2b21c9b4532430ae539 Mon Sep 17 00:00:00 2001 From: Piotr Kosycarz Date: Tue, 12 Nov 2024 22:50:24 +0100 Subject: [PATCH 5/8] tests: benchmarks: power_consumption: spi: multicore app for nrf54h20 Add code for radio core so that it can be put into sleep and release resources. Signed-off-by: Piotr Kosycarz (cherry picked from commit 02356e28b3e15509f4293b6b908a209a00bff5b8) --- .../power_consumption/spi/Kconfig.sysbuild | 10 ++++++++++ .../power_consumption/spi/sysbuild.cmake | 17 +++++++++++++++++ .../sysbuild/nrf54h20dk_nrf54h20_cpurad.conf | 1 + .../power_consumption/spi/testcase.yaml | 2 ++ 4 files changed, 30 insertions(+) create mode 100644 tests/benchmarks/power_consumption/spi/Kconfig.sysbuild create mode 100644 tests/benchmarks/power_consumption/spi/sysbuild.cmake create mode 100644 tests/benchmarks/power_consumption/spi/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf diff --git a/tests/benchmarks/power_consumption/spi/Kconfig.sysbuild b/tests/benchmarks/power_consumption/spi/Kconfig.sysbuild new file mode 100644 index 00000000000..0898eb29293 --- /dev/null +++ b/tests/benchmarks/power_consumption/spi/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config REMOTE_BOARD + string "The board used for remote target" diff --git a/tests/benchmarks/power_consumption/spi/sysbuild.cmake b/tests/benchmarks/power_consumption/spi/sysbuild.cmake new file mode 100644 index 00000000000..995edd58462 --- /dev/null +++ b/tests/benchmarks/power_consumption/spi/sysbuild.cmake @@ -0,0 +1,17 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +if(NOT "${SB_CONFIG_REMOTE_BOARD}" STREQUAL "") + ExternalZephyrProject_Add( + APPLICATION remote_sleep_forever + SOURCE_DIR ${APP_DIR}/../common/remote_sleep_forever + BOARD ${SB_CONFIG_REMOTE_BOARD} + BOARD_REVISION ${BOARD_REVISION} + ) + + add_dependencies(spi remote_sleep_forever) + sysbuild_add_dependencies(FLASH spi remote_sleep_forever) +endif() diff --git a/tests/benchmarks/power_consumption/spi/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf b/tests/benchmarks/power_consumption/spi/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf new file mode 100644 index 00000000000..dd863e78d99 --- /dev/null +++ b/tests/benchmarks/power_consumption/spi/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf @@ -0,0 +1 @@ +SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad" diff --git a/tests/benchmarks/power_consumption/spi/testcase.yaml b/tests/benchmarks/power_consumption/spi/testcase.yaml index 54c302ec8c4..9c1f2b22c10 100644 --- a/tests/benchmarks/power_consumption/spi/testcase.yaml +++ b/tests/benchmarks/power_consumption/spi/testcase.yaml @@ -16,12 +16,14 @@ tests: - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_thread_suspend_resume_spi_54L" benchmarks.power_consumption.spi_nrf54h: harness: pytest + sysbuild: true integration_platforms: - nrf54h20dk/nrf54h20/cpuapp platform_allow: - nrf54h20dk/nrf54h20/cpuapp extra_args: - SHIELD=pca63566 + - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf harness_config: fixture: pca63566 pytest_root: From 083415e0690181105212a256f049867f158b8d8d Mon Sep 17 00:00:00 2001 From: Piotr Kosycarz Date: Tue, 12 Nov 2024 22:53:26 +0100 Subject: [PATCH 6/8] tests: benchmarks: power_consumption: timer: multicore app for nrf54h20 Add code for radio core so that it can be put into sleep and release resources. Signed-off-by: Piotr Kosycarz (cherry picked from commit 3ceff52093bcfd4da3f60161745779a18016f7fd) --- .../timer_waiting/Kconfig.sysbuild | 10 ++++++++++ .../timer_waiting/sysbuild.cmake | 17 +++++++++++++++++ .../sysbuild/nrf54h20dk_nrf54h20_cpurad.conf | 1 + .../timer_waiting/testcase.yaml | 4 ++++ 4 files changed, 32 insertions(+) create mode 100644 tests/benchmarks/power_consumption/timer_waiting/Kconfig.sysbuild create mode 100644 tests/benchmarks/power_consumption/timer_waiting/sysbuild.cmake create mode 100644 tests/benchmarks/power_consumption/timer_waiting/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf diff --git a/tests/benchmarks/power_consumption/timer_waiting/Kconfig.sysbuild b/tests/benchmarks/power_consumption/timer_waiting/Kconfig.sysbuild new file mode 100644 index 00000000000..0898eb29293 --- /dev/null +++ b/tests/benchmarks/power_consumption/timer_waiting/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config REMOTE_BOARD + string "The board used for remote target" diff --git a/tests/benchmarks/power_consumption/timer_waiting/sysbuild.cmake b/tests/benchmarks/power_consumption/timer_waiting/sysbuild.cmake new file mode 100644 index 00000000000..4e22826bbeb --- /dev/null +++ b/tests/benchmarks/power_consumption/timer_waiting/sysbuild.cmake @@ -0,0 +1,17 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +if(NOT "${SB_CONFIG_REMOTE_BOARD}" STREQUAL "") + ExternalZephyrProject_Add( + APPLICATION remote_sleep_forever + SOURCE_DIR ${APP_DIR}/../common/remote_sleep_forever + BOARD ${SB_CONFIG_REMOTE_BOARD} + BOARD_REVISION ${BOARD_REVISION} + ) + + add_dependencies(timer_waiting remote_sleep_forever) + sysbuild_add_dependencies(FLASH timer_waiting remote_sleep_forever) +endif() diff --git a/tests/benchmarks/power_consumption/timer_waiting/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf b/tests/benchmarks/power_consumption/timer_waiting/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf new file mode 100644 index 00000000000..dd863e78d99 --- /dev/null +++ b/tests/benchmarks/power_consumption/timer_waiting/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf @@ -0,0 +1 @@ +SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad" diff --git a/tests/benchmarks/power_consumption/timer_waiting/testcase.yaml b/tests/benchmarks/power_consumption/timer_waiting/testcase.yaml index d5ff0cf15dc..7eedb4b0c5d 100644 --- a/tests/benchmarks/power_consumption/timer_waiting/testcase.yaml +++ b/tests/benchmarks/power_consumption/timer_waiting/testcase.yaml @@ -39,24 +39,28 @@ tests: pytest_root: - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_for_timer_waiting_54L_16M" benchmarks.power_consumption.timer_waiting_16M_nrf54h: + sysbuild: true integration_platforms: - nrf54h20dk/nrf54h20/cpuapp platform_allow: - nrf54h20dk/nrf54h20/cpuapp extra_args: - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_16M.overlay" + - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf harness: pytest harness_config: fixture: ppk_power_measure pytest_root: - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_for_timer_waiting_54H_16M" benchmarks.power_consumption.timer_waiting_320M_nrf54h: + sysbuild: true integration_platforms: - nrf54h20dk/nrf54h20/cpuapp platform_allow: - nrf54h20dk/nrf54h20/cpuapp extra_args: - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_320M.overlay" + - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf harness: pytest harness_config: fixture: ppk_power_measure From 7b559907f05bf7fa3ab94340a03e47e493e2581f Mon Sep 17 00:00:00 2001 From: Piotr Kosycarz Date: Tue, 12 Nov 2024 22:55:53 +0100 Subject: [PATCH 7/8] tests: benchmarks: power_consumption: uart: multicore app for nrf54h20 Add code for radio core so that it can be put into sleep and release resources. Signed-off-by: Piotr Kosycarz (cherry picked from commit d0ba3f6f3f9a74e35142c475b757ddb12799e852) --- .../uart_async/Kconfig.sysbuild | 10 ++++++++++ .../power_consumption/uart_async/sysbuild.cmake | 17 +++++++++++++++++ .../sysbuild/nrf54h20dk_nrf54h20_cpurad.conf | 1 + .../power_consumption/uart_async/testcase.yaml | 3 +++ .../uart_polling/Kconfig.sysbuild | 10 ++++++++++ .../uart_polling/sysbuild.cmake | 17 +++++++++++++++++ .../sysbuild/nrf54h20dk_nrf54h20_cpurad.conf | 1 + .../uart_polling/testcase.yaml | 3 +++ 8 files changed, 62 insertions(+) create mode 100644 tests/benchmarks/power_consumption/uart_async/Kconfig.sysbuild create mode 100644 tests/benchmarks/power_consumption/uart_async/sysbuild.cmake create mode 100644 tests/benchmarks/power_consumption/uart_async/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf create mode 100644 tests/benchmarks/power_consumption/uart_polling/Kconfig.sysbuild create mode 100644 tests/benchmarks/power_consumption/uart_polling/sysbuild.cmake create mode 100644 tests/benchmarks/power_consumption/uart_polling/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf diff --git a/tests/benchmarks/power_consumption/uart_async/Kconfig.sysbuild b/tests/benchmarks/power_consumption/uart_async/Kconfig.sysbuild new file mode 100644 index 00000000000..0898eb29293 --- /dev/null +++ b/tests/benchmarks/power_consumption/uart_async/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config REMOTE_BOARD + string "The board used for remote target" diff --git a/tests/benchmarks/power_consumption/uart_async/sysbuild.cmake b/tests/benchmarks/power_consumption/uart_async/sysbuild.cmake new file mode 100644 index 00000000000..1abf4487a4f --- /dev/null +++ b/tests/benchmarks/power_consumption/uart_async/sysbuild.cmake @@ -0,0 +1,17 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +if(NOT "${SB_CONFIG_REMOTE_BOARD}" STREQUAL "") + ExternalZephyrProject_Add( + APPLICATION remote_sleep_forever + SOURCE_DIR ${APP_DIR}/../common/remote_sleep_forever + BOARD ${SB_CONFIG_REMOTE_BOARD} + BOARD_REVISION ${BOARD_REVISION} + ) + + add_dependencies(uart_async remote_sleep_forever) + sysbuild_add_dependencies(FLASH uart_async remote_sleep_forever) +endif() diff --git a/tests/benchmarks/power_consumption/uart_async/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf b/tests/benchmarks/power_consumption/uart_async/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf new file mode 100644 index 00000000000..dd863e78d99 --- /dev/null +++ b/tests/benchmarks/power_consumption/uart_async/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf @@ -0,0 +1 @@ +SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad" diff --git a/tests/benchmarks/power_consumption/uart_async/testcase.yaml b/tests/benchmarks/power_consumption/uart_async/testcase.yaml index 31a3b8f30d5..b971156d621 100644 --- a/tests/benchmarks/power_consumption/uart_async/testcase.yaml +++ b/tests/benchmarks/power_consumption/uart_async/testcase.yaml @@ -13,10 +13,13 @@ tests: pytest_root: - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_thread_suspend_resume_uart_async_54L" benchmarks.power_consumption.uart_async_nrf54h: + sysbuild: true integration_platforms: - nrf54h20dk/nrf54h20/cpuapp platform_allow: - nrf54h20dk/nrf54h20/cpuapp + extra_args: + SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf harness: pytest harness_config: fixture: ppk_power_measure diff --git a/tests/benchmarks/power_consumption/uart_polling/Kconfig.sysbuild b/tests/benchmarks/power_consumption/uart_polling/Kconfig.sysbuild new file mode 100644 index 00000000000..0898eb29293 --- /dev/null +++ b/tests/benchmarks/power_consumption/uart_polling/Kconfig.sysbuild @@ -0,0 +1,10 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" + +config REMOTE_BOARD + string "The board used for remote target" diff --git a/tests/benchmarks/power_consumption/uart_polling/sysbuild.cmake b/tests/benchmarks/power_consumption/uart_polling/sysbuild.cmake new file mode 100644 index 00000000000..76a155b23f9 --- /dev/null +++ b/tests/benchmarks/power_consumption/uart_polling/sysbuild.cmake @@ -0,0 +1,17 @@ +# +# Copyright (c) 2024 Nordic Semiconductor ASA +# +# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause +# + +if(NOT "${SB_CONFIG_REMOTE_BOARD}" STREQUAL "") + ExternalZephyrProject_Add( + APPLICATION remote_sleep_forever + SOURCE_DIR ${APP_DIR}/../common/remote_sleep_forever + BOARD ${SB_CONFIG_REMOTE_BOARD} + BOARD_REVISION ${BOARD_REVISION} + ) + + add_dependencies(uart_polling remote_sleep_forever) + sysbuild_add_dependencies(FLASH uart_polling remote_sleep_forever) +endif() diff --git a/tests/benchmarks/power_consumption/uart_polling/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf b/tests/benchmarks/power_consumption/uart_polling/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf new file mode 100644 index 00000000000..dd863e78d99 --- /dev/null +++ b/tests/benchmarks/power_consumption/uart_polling/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf @@ -0,0 +1 @@ +SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad" diff --git a/tests/benchmarks/power_consumption/uart_polling/testcase.yaml b/tests/benchmarks/power_consumption/uart_polling/testcase.yaml index 6ed23ce49fd..3b390235c46 100644 --- a/tests/benchmarks/power_consumption/uart_polling/testcase.yaml +++ b/tests/benchmarks/power_consumption/uart_polling/testcase.yaml @@ -13,10 +13,13 @@ tests: pytest_root: - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_thread_suspend_resume_uart_polling_54L" benchmarks.power_consumption.uart_poll_nrf54h: + sysbuild: true integration_platforms: - nrf54h20dk/nrf54h20/cpuapp platform_allow: - nrf54h20dk/nrf54h20/cpuapp + extra_args: + SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf harness: pytest harness_config: fixture: ppk_power_measure From 1b47e49a8c332321b88f4f0ddf8dea05175919d3 Mon Sep 17 00:00:00 2001 From: Piotr Kosycarz Date: Wed, 13 Nov 2024 07:47:45 +0100 Subject: [PATCH 8/8] ci: tags: extend ci_tests_benchmarks_current_consumption Add dependency for power_consumption folder. Signed-off-by: Piotr Kosycarz (cherry picked from commit 3b99e7182fba5390c9d151027f32b2c8741e243b) --- scripts/ci/tags.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/ci/tags.yaml b/scripts/ci/tags.yaml index a71a9854986..f13f50f0755 100644 --- a/scripts/ci/tags.yaml +++ b/scripts/ci/tags.yaml @@ -1271,6 +1271,7 @@ ci_tests_benchmarks_current_consumption: - nrf/include/nfc/ - nrf/subsys/nfc/ - nrf/tests/benchmarks/current_consumption/ + - nrf/tests/benchmarks/power_consumption/ - nrfxlib/nfc/ - zephyr/boards/nordic/ - zephyr/drivers/gpio/ @@ -1283,6 +1284,7 @@ ci_tests_benchmarks_current_consumption: - zephyr/drivers/spi/ - zephyr/drivers/counter/ - zephyr/soc/nordic/ + - zephyr/drivers/sensor/nordic/temp/ ci_tests_drivers_egpio: files: