Skip to content

Commit 9e75865

Browse files
bjarki-andreasencarlescufi
authored andcommitted
benchmarks: multicore: idle_uarte: Remove GD freq changes
Global domain frequency (hsfll120) is no longer managed by drivers. Test shall not request global domain frequency lower than default. Signed-off-by: Bjarki Arge Andreasen <[email protected]>
1 parent bef08fc commit 9e75865

File tree

5 files changed

+0
-187
lines changed

5 files changed

+0
-187
lines changed

tests/benchmarks/multicore/idle_uarte/Kconfig

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

tests/benchmarks/multicore/idle_uarte/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,3 @@ dut: &uart120 {
4545
pinctrl-names = "default", "sleep";
4646
current-speed = <4000000>;
4747
};
48-
49-
&hsfll120 {
50-
status = "okay";
51-
};

tests/benchmarks/multicore/idle_uarte/boards/nrf54h20dk_nrf54h20_cpuapp_fast_slow_pins.overlay

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,3 @@ dut: &uart120 {
7272
current-speed = <4000000>;
7373
/delete-property/ hw-flow-control;
7474
};
75-
76-
&hsfll120 {
77-
status = "okay";
78-
};

tests/benchmarks/multicore/idle_uarte/src/main.c

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
#include <zephyr/pm/device_runtime.h>
1010
#include <zephyr/kernel.h>
1111
#include <zephyr/logging/log.h>
12-
#include <zephyr/devicetree/clocks.h>
13-
#include <zephyr/drivers/clock_control/nrf_clock_control.h>
1412
#include <zephyr/drivers/gpio.h>
1513

1614
/* Note: logging is normally disabled for this test
@@ -37,33 +35,6 @@ uint8_t test_pattern[TEST_BUFFER_LEN];
3735
static uint8_t test_buffer[TEST_BUFFER_LEN];
3836
static volatile uint8_t uart_error_counter;
3937

40-
#if defined(CONFIG_CLOCK_CONTROL)
41-
const uint32_t freq[] = {320, 256, 128, 64};
42-
43-
/*
44-
* Set Global Domain frequency (HSFLL120)
45-
*/
46-
void set_global_domain_frequency(uint32_t freq)
47-
{
48-
int err;
49-
int res;
50-
struct onoff_client cli;
51-
const struct device *hsfll_dev = DEVICE_DT_GET(DT_NODELABEL(hsfll120));
52-
const struct nrf_clock_spec clk_spec_global_hsfll = {.frequency = MHZ(freq)};
53-
54-
printk("Requested frequency [Hz]: %d\n", clk_spec_global_hsfll.frequency);
55-
sys_notify_init_spinwait(&cli.notify);
56-
err = nrf_clock_control_request(hsfll_dev, &clk_spec_global_hsfll, &cli);
57-
__ASSERT((err >= 0 && err < 3), "Wrong nrf_clock_control_request return code");
58-
do {
59-
err = sys_notify_fetch_result(&cli.notify, &res);
60-
k_yield();
61-
} while (err == -EAGAIN);
62-
__ASSERT(err == 0, "Wrong clock control request return code");
63-
__ASSERT(res == 0, "Wrong clock control request response");
64-
}
65-
#endif /* CONFIG_CLOCK_CONTROL */
66-
6738
void timer_handler(struct k_timer *dummy)
6839
{
6940
k_sem_give(&uart_tx_done_sem);
@@ -134,10 +105,6 @@ int main(void)
134105
err = gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE);
135106
__ASSERT(err == 0, "Could not configure led GPIO");
136107

137-
#if defined(CONFIG_CLOCK_CONTROL)
138-
set_global_domain_frequency(CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_MHZ);
139-
#endif
140-
141108
printk("Hello World! %s\n", CONFIG_BOARD_TARGET);
142109
printk("UART instance: %s\n", uart_dev->name);
143110
set_test_pattern();
@@ -172,12 +139,6 @@ int main(void)
172139
err = uart_tx(uart_dev, test_pattern, TEST_BUFFER_LEN, 1000000);
173140
} while (err == -EBUSY);
174141
__ASSERT(err == 0, "Unexpected error when sending UART TX data: %d", err);
175-
#if defined(CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_SWITCHING)
176-
if (switch_flag) {
177-
set_global_domain_frequency(freq[++counter % ARRAY_SIZE(freq)]);
178-
switch_flag = 0;
179-
}
180-
#endif
181142
while (k_sem_take(&uart_rx_ready_sem, K_NO_WAIT) != 0) {
182143
};
183144
for (int index = 0; index < TEST_BUFFER_LEN; index++) {

tests/benchmarks/multicore/idle_uarte/testcase.yaml

Lines changed: 0 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -81,111 +81,6 @@ tests:
8181
- DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast_slow_pins.overlay"
8282
build_only: true
8383

84-
benchmarks.multicore.idle_uarte.fast.nrf54h20dk_cpuapp_cpurad.s2ram.remote_gd_freq_switching:
85-
tags:
86-
- ci_build
87-
- ci_tests_benchmarks_multicore
88-
- uarte
89-
- ppk_power_measure
90-
filter: not CONFIG_COVERAGE
91-
harness: pytest
92-
platform_allow:
93-
- nrf54h20dk/nrf54h20/cpuapp
94-
integration_platforms:
95-
- nrf54h20dk/nrf54h20/cpuapp
96-
extra_args:
97-
- DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
98-
- SB_CONFIG_REMOTE_GLOBAL_DOMAIN_CLOCK_FREQUENCY_SWITCHING=y
99-
harness_config:
100-
fixture: gpio_loopback
101-
pytest_root:
102-
- "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_gated_uarte"
103-
timeout: 90
104-
105-
benchmarks.multicore.idle_uarte.fast.gd_freq_256MHz.nrf54h20dk_cpuapp_cpurad.s2ram:
106-
tags:
107-
- ci_build
108-
- ci_tests_benchmarks_multicore
109-
- uarte
110-
- ppk_power_measure
111-
filter: not CONFIG_COVERAGE
112-
harness: pytest
113-
platform_allow:
114-
- nrf54h20dk/nrf54h20/cpuapp
115-
integration_platforms:
116-
- nrf54h20dk/nrf54h20/cpuapp
117-
extra_args:
118-
- DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
119-
- CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_OPTION_256MHZ=y
120-
harness_config:
121-
fixture: gpio_loopback
122-
pytest_root:
123-
- "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_gated_uarte"
124-
timeout: 90
125-
126-
benchmarks.multicore.idle_uarte.fast.gd_freq_128MHz.nrf54h20dk_cpuapp_cpurad.s2ram:
127-
tags:
128-
- ci_build
129-
- ci_tests_benchmarks_multicore
130-
- uarte
131-
- ppk_power_measure
132-
filter: not CONFIG_COVERAGE
133-
harness: pytest
134-
platform_allow:
135-
- nrf54h20dk/nrf54h20/cpuapp
136-
integration_platforms:
137-
- nrf54h20dk/nrf54h20/cpuapp
138-
extra_args:
139-
- DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
140-
- CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_OPTION_128MHZ=y
141-
harness_config:
142-
fixture: gpio_loopback
143-
pytest_root:
144-
- "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_gated_uarte"
145-
timeout: 90
146-
147-
benchmarks.multicore.idle_uarte.fast.gd_freq_64MHz.nrf54h20dk_cpuapp_cpurad.s2ram:
148-
tags:
149-
- ci_build
150-
- ci_tests_benchmarks_multicore
151-
- uarte
152-
- ppk_power_measure
153-
filter: not CONFIG_COVERAGE
154-
harness: pytest
155-
platform_allow:
156-
- nrf54h20dk/nrf54h20/cpuapp
157-
integration_platforms:
158-
- nrf54h20dk/nrf54h20/cpuapp
159-
extra_args:
160-
- DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
161-
- CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_OPTION_64MHZ=y
162-
harness_config:
163-
fixture: gpio_loopback
164-
pytest_root:
165-
- "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_gated_uarte"
166-
timeout: 90
167-
168-
benchmarks.multicore.idle_uarte.fast.gd_freq_switching.nrf54h20dk_cpuapp_cpurad.s2ram:
169-
tags:
170-
- ci_build
171-
- ci_tests_benchmarks_multicore
172-
- uarte
173-
- ppk_power_measure
174-
filter: not CONFIG_COVERAGE
175-
harness: pytest
176-
platform_allow:
177-
- nrf54h20dk/nrf54h20/cpuapp
178-
integration_platforms:
179-
- nrf54h20dk/nrf54h20/cpuapp
180-
extra_args:
181-
- DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
182-
- CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_SWITCHING=y
183-
harness_config:
184-
fixture: gpio_loopback
185-
pytest_root:
186-
- "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_gated_uarte"
187-
timeout: 90
188-
18984
benchmarks.multicore.idle_uarte.automatic_pm.nrf54h20dk_cpuapp_cpurad.s2ram:
19085
tags:
19186
- ci_build

0 commit comments

Comments
 (0)