Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport v2.8-branch] tests: benchmarks: power_consumption: adc: multicore app for nrf54h20 #18837

Merged
merged 8 commits into from
Nov 13, 2024
2 changes: 2 additions & 0 deletions scripts/ci/tags.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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:
Expand Down
10 changes: 10 additions & 0 deletions tests/benchmarks/power_consumption/adc/Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -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"
17 changes: 17 additions & 0 deletions tests/benchmarks/power_consumption/adc/sysbuild.cmake
Original file line number Diff line number Diff line change
@@ -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()
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad"
3 changes: 3 additions & 0 deletions tests/benchmarks/power_consumption/adc/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions tests/benchmarks/power_consumption/adc_async/Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -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"
17 changes: 17 additions & 0 deletions tests/benchmarks/power_consumption/adc_async/sysbuild.cmake
Original file line number Diff line number Diff line change
@@ -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()
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad"
3 changes: 3 additions & 0 deletions tests/benchmarks/power_consumption/adc_async/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions tests/benchmarks/power_consumption/flash/Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -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"
17 changes: 17 additions & 0 deletions tests/benchmarks/power_consumption/flash/sysbuild.cmake
Original file line number Diff line number Diff line change
@@ -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()
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad"
5 changes: 4 additions & 1 deletion tests/benchmarks/power_consumption/flash/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 10 additions & 0 deletions tests/benchmarks/power_consumption/i2c/Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -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"
17 changes: 17 additions & 0 deletions tests/benchmarks/power_consumption/i2c/sysbuild.cmake
Original file line number Diff line number Diff line change
@@ -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()
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad"
2 changes: 2 additions & 0 deletions tests/benchmarks/power_consumption/i2c/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 10 additions & 0 deletions tests/benchmarks/power_consumption/spi/Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -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"
17 changes: 17 additions & 0 deletions tests/benchmarks/power_consumption/spi/sysbuild.cmake
Original file line number Diff line number Diff line change
@@ -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()
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad"
2 changes: 2 additions & 0 deletions tests/benchmarks/power_consumption/spi/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
17 changes: 17 additions & 0 deletions tests/benchmarks/power_consumption/timer_waiting/sysbuild.cmake
Original file line number Diff line number Diff line change
@@ -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()
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad"
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions tests/benchmarks/power_consumption/uart_async/Kconfig.sysbuild
Original file line number Diff line number Diff line change
@@ -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"
17 changes: 17 additions & 0 deletions tests/benchmarks/power_consumption/uart_async/sysbuild.cmake
Original file line number Diff line number Diff line change
@@ -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()
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad"
3 changes: 3 additions & 0 deletions tests/benchmarks/power_consumption/uart_async/testcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
17 changes: 17 additions & 0 deletions tests/benchmarks/power_consumption/uart_polling/sysbuild.cmake
Original file line number Diff line number Diff line change
@@ -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()
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad"
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading