Skip to content

Commit 14d73e3

Browse files
nika-nordiccarlescufi
nika-nordic
authored and
carlescufi
committed
benchmarks: system_off: align to new RAM retention in system_off sample
Zephyr system_off sample changed how RAM retention is handled. Signed-off-by: Nikodem Kastelik <[email protected]>
1 parent 433b850 commit 14d73e3

File tree

6 files changed

+111
-26
lines changed

6 files changed

+111
-26
lines changed

‎tests/benchmarks/current_consumption/system_off/boards/nrf52840dk_nrf52840.overlay‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/ {
2+
sram0@2003f000 {
3+
compatible = "zephyr,memory-region", "mmio-sram";
4+
reg = <0x2003f000 DT_SIZE_K(4)>;
5+
zephyr,memory-region = "RetainedMem";
6+
status = "okay";
7+
8+
retainedmem0: retainedmem {
9+
compatible = "zephyr,retained-ram";
10+
status = "okay";
11+
};
12+
};
13+
14+
aliases {
15+
retainedmemdevice = &retainedmem0;
16+
};
17+
};
18+
19+
&sram0 {
20+
/* Shrink SRAM size to avoid overlap with retained memory region */
21+
reg = <0x20000000 DT_SIZE_K(252)>;
22+
};

‎tests/benchmarks/current_consumption/system_off/boards/nrf52dk_nrf52832.overlay‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/ {
2+
sram0@20007000 {
3+
compatible = "zephyr,memory-region", "mmio-sram";
4+
reg = <0x20007000 DT_SIZE_K(4)>;
5+
zephyr,memory-region = "RetainedMem";
6+
status = "okay";
7+
8+
retainedmem0: retainedmem {
9+
compatible = "zephyr,retained-ram";
10+
status = "okay";
11+
};
12+
};
13+
14+
aliases {
15+
retainedmemdevice = &retainedmem0;
16+
};
17+
};
18+
19+
&sram0 {
20+
/* Shrink SRAM size to avoid overlap with retained memory region */
21+
reg = <0x20000000 DT_SIZE_K(28)>;
22+
};

‎tests/benchmarks/current_consumption/system_off/boards/nrf54l15dk_nrf54l05_cpuapp.overlay‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/ {
2+
cpuapp_sram@20017000 {
3+
compatible = "zephyr,memory-region", "mmio-sram";
4+
reg = <0x20017000 DT_SIZE_K(4)>;
5+
zephyr,memory-region = "RetainedMem";
6+
status = "okay";
7+
8+
retainedmem0: retainedmem {
9+
compatible = "zephyr,retained-ram";
10+
status = "okay";
11+
};
12+
};
13+
14+
aliases {
15+
retainedmemdevice = &retainedmem0;
16+
};
17+
};
18+
19+
&cpuapp_sram {
20+
/* Shrink SRAM size to avoid overlap with retained memory region:
21+
* 96 - 4 = 92KB = 0x17000
22+
*/
23+
reg = <0x20000000 0x17000>;
24+
ranges = <0x0 0x20000000 0x17000>;
25+
};

‎tests/benchmarks/current_consumption/system_off/boards/nrf54l15dk_nrf54l10_cpuapp.overlay‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/ {
2+
cpuapp_sram@2002f000 {
3+
compatible = "zephyr,memory-region", "mmio-sram";
4+
reg = <0x2002f000 DT_SIZE_K(4)>;
5+
zephyr,memory-region = "RetainedMem";
6+
status = "okay";
7+
8+
retainedmem0: retainedmem {
9+
compatible = "zephyr,retained-ram";
10+
status = "okay";
11+
};
12+
};
13+
14+
aliases {
15+
retainedmemdevice = &retainedmem0;
16+
};
17+
};
18+
19+
&cpuapp_sram {
20+
/* Shrink SRAM size to avoid overlap with retained memory region:
21+
* 192 - 4 = 188KB = 0x2f000
22+
*/
23+
reg = <0x20000000 0x2f000>;
24+
ranges = <0x0 0x20000000 0x2f000>;
25+
};

‎tests/benchmarks/current_consumption/system_off/boards/nrf54l15dk_nrf54l15_cpuapp_ret_mem.overlay‎ renamed to ‎tests/benchmarks/current_consumption/system_off/boards/nrf54l15dk_nrf54l15_cpuapp.overlay‎

File renamed without changes.

‎tests/benchmarks/current_consumption/system_off/testcase.yaml‎

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ tests:
66
benchmarks.current_consumption.systemoff.gpio_wakeup:
77
platform_allow:
88
- nrf54l15dk/nrf54l15/cpuapp
9+
- nrf54l15dk/nrf54l10/cpuapp
10+
- nrf54l15dk/nrf54l05/cpuapp
911
integration_platforms:
1012
- nrf54l15dk/nrf54l15/cpuapp
1113
extra_args: DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_gpio_wakeup.overlay"
@@ -15,18 +17,16 @@ tests:
1517
pytest_root:
1618
- "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_with_wakeups"
1719
timeout: 80
18-
benchmarks.current_consumption.systemoff.gpio_wakeup_retained_mem:
20+
benchmarks.current_consumption.systemoff.gpio_wakeup.retained_mem:
1921
platform_allow:
2022
- nrf54l15dk/nrf54l15/cpuapp
23+
- nrf54l15dk/nrf54l10/cpuapp
24+
- nrf54l15dk/nrf54l05/cpuapp
2125
integration_platforms:
2226
- nrf54l15dk/nrf54l15/cpuapp
23-
extra_args:
24-
- "DTC_OVERLAY_FILE=
25-
boards/nrf54l15dk_nrf54l15_cpuapp_gpio_wakeup.overlay;
26-
boards/nrf54l15dk_nrf54l15_cpuapp_ret_mem.overlay"
27+
extra_args: EXTRA_DTC_OVERLAY_FILE="boards/nrf54l15dk_nrf54l15_cpuapp_gpio_wakeup.overlay"
2728
extra_configs:
2829
- CONFIG_APP_USE_RETAINED_MEM=y
29-
- CONFIG_RETAINED_MEM=y
3030
harness: pytest
3131
harness_config:
3232
fixture: ppk_power_measure
@@ -36,6 +36,8 @@ tests:
3636
benchmarks.current_consumption.systemoff.grtc_wakeup:
3737
platform_allow:
3838
- nrf54l15dk/nrf54l15/cpuapp
39+
- nrf54l15dk/nrf54l10/cpuapp
40+
- nrf54l15dk/nrf54l05/cpuapp
3941
integration_platforms:
4042
- nrf54l15dk/nrf54l15/cpuapp
4143
extra_configs:
@@ -48,50 +50,39 @@ tests:
4850
timeout: 80
4951
benchmarks.current_consumption.sample.boards.nrf.system_off:
5052
platform_allow:
51-
- nrf54l15dk/nrf54l15/cpuapp
5253
- nrf52840dk/nrf52840
5354
- nrf52dk/nrf52832
5455
- nrf5340dk/nrf5340/cpuapp
55-
integration_platforms:
5656
- nrf54l15dk/nrf54l15/cpuapp
57+
- nrf54l15dk/nrf54l10/cpuapp
58+
- nrf54l15dk/nrf54l05/cpuapp
59+
integration_platforms:
5760
- nrf52840dk/nrf52840
5861
- nrf52dk/nrf52832
5962
- nrf5340dk/nrf5340/cpuapp
63+
- nrf54l15dk/nrf54l15/cpuapp
6064
tags: ppk_power_measure
6165
harness: pytest
6266
harness_config:
6367
fixture: ppk_power_measure
6468
pytest_root:
6569
- "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_systemoff"
6670
timeout: 90
67-
benchmarks.current_consumption.sample.boards.nrf.system_off.nrf_retained:
71+
benchmarks.current_consumption.sample.boards.nrf.system_off.retained_mem:
6872
platform_allow:
6973
- nrf52840dk/nrf52840
7074
- nrf52dk/nrf52832
71-
- nrf5340dk/nrf5340/cpuapp
75+
- nrf54l15dk/nrf54l15/cpuapp
76+
- nrf54l15dk/nrf54l10/cpuapp
77+
- nrf54l15dk/nrf54l05/cpuapp
7278
integration_platforms:
7379
- nrf52840dk/nrf52840
7480
- nrf52dk/nrf52832
75-
- nrf5340dk/nrf5340/cpuapp
76-
extra_configs:
77-
- CONFIG_APP_USE_NRF_RETENTION=y
78-
tags: ppk_power_measure
79-
harness: pytest
80-
harness_config:
81-
fixture: ppk_power_measure
82-
pytest_root:
83-
- "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_systemoff"
84-
timeout: 90
85-
benchmarks.current_consumption.sample.boards.nrf.system_off.retained_mem:
86-
platform_allow:
87-
- nrf54l15dk/nrf54l15/cpuapp
88-
integration_platforms:
8981
- nrf54l15dk/nrf54l15/cpuapp
9082
extra_args:
91-
- "DTC_OVERLAY_FILE=boards/nrf54l15dk_nrf54l15_cpuapp_ret_mem.overlay"
83+
- "-DBOARD_ROOT=${ZEPHYR_BASE}/samples/boards/nordic/system_off"
9284
extra_configs:
9385
- CONFIG_APP_USE_RETAINED_MEM=y
94-
- CONFIG_RETAINED_MEM=y
9586
tags: ppk_power_measure
9687
harness: pytest
9788
harness_config:

0 commit comments

Comments
 (0)