benchmarks: multicore: idle_spim_loopback: 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]>

Author: bjarki-andreasen

tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay

@@ -63,7 +63,3 @@
 		spi-max-frequency = <DT_FREQ_M(4)>;
 	};
 };
-
-&hsfll120 {
-	status = "okay";
-};

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

@@ -72,7 +72,3 @@
 &dma_fast_region {
 	status = "okay";
 };
-
-&hsfll120 {
-	status = "okay";
-};

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

@@ -80,7 +80,3 @@
 &dma_fast_region {
 	status = "okay";
 };
-
-&hsfll120 {
-	status = "okay";
-};

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

@@ -12,8 +12,6 @@ LOG_MODULE_REGISTER(idle_spim_loopback, LOG_LEVEL_INF);
 #include <zephyr/drivers/spi.h>
 #include <zephyr/linker/devicetree_regions.h>
 #include <zephyr/pm/device_runtime.h>
-#include <zephyr/devicetree/clocks.h>
-#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 
 static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios);
 
@@ -73,33 +71,6 @@ static volatile uint32_t high, low;
 static struct k_timer my_timer;
 static volatile bool timer_expired;
 
-#if defined(CONFIG_CLOCK_CONTROL)
-const uint32_t freq[] = {320, 256, 128, 64};
-
-/*
- * Set Global Domain frequency (HSFLL120)
- */
-void set_global_domain_frequency(uint32_t freq)
-{
-	int err;
-	int res;
-	struct onoff_client cli;
-	const struct device *hsfll_dev = DEVICE_DT_GET(DT_NODELABEL(hsfll120));
-	const struct nrf_clock_spec clk_spec_global_hsfll = {.frequency = MHZ(freq)};
-
-	printk("Requested frequency [Hz]: %d\n", clk_spec_global_hsfll.frequency);
-	sys_notify_init_spinwait(&cli.notify);
-	err = nrf_clock_control_request(hsfll_dev, &clk_spec_global_hsfll, &cli);
-	__ASSERT((err >= 0 && err < 3), "Wrong nrf_clock_control_request return code");
-	do {
-		err = sys_notify_fetch_result(&cli.notify, &res);
-		k_yield();
-	} while (err == -EAGAIN);
-	__ASSERT(err == 0, "Wrong clock control request return code");
-	__ASSERT(res == 0, "Wrong clock control request response");
-}
-#endif /* CONFIG_CLOCK_CONTROL */
-
 void my_timer_handler(struct k_timer *dummy)
 {
 	timer_expired = true;
@@ -145,10 +116,6 @@ int main(void)
 	ret = gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE);
 	__ASSERT(ret == 0, "Could not configure led GPIO");
 
-#if defined(CONFIG_CLOCK_CONTROL)
-	set_global_domain_frequency(CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_MHZ);
-#endif
-
 	LOG_INF("Multicore idle_spi_loopback test on %s", CONFIG_BOARD_TARGET);
 	LOG_INF("Core will sleep for %u ms", CONFIG_TEST_SLEEP_DURATION_MS);
 	LOG_INF("Testing SPIM device %s", spim_spec.bus->name);
@@ -240,12 +207,7 @@ int main(void)
 			} else {
 				LOG_ERR("spi_transceive_dt, err: %d", ret);
 			}
-#if defined(CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_SWITCHING)
-			if (switch_flag) {
-				set_global_domain_frequency(freq[loop_counter % ARRAY_SIZE(freq)]);
-				switch_flag = 0;
-			}
-#endif
+
 			__ASSERT(ret == 0, "Error: spi_transceive_dt, err: %d\n", ret);
 
 			/* Check if the received data is consistent with the data sent. */

tests/benchmarks/multicore/idle_spim_loopback/testcase.yaml

@@ -136,76 +136,6 @@ tests:
       pytest_root:
         - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram"
 
-  benchmarks.multicore.idle_spim_loopback.4_bytes.gd_freq_256MHz.s2ram_fast:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_spim_loopback_CONF_FILE=prj_s2ram.conf
-      - idle_spim_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
-      - CONFIG_CLOCK_CONTROL=y
-      - CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_OPTION_256MHZ=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram"
-
-  benchmarks.multicore.idle_spim_loopback.4_bytes.gd_freq_128MHz.s2ram_fast:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_spim_loopback_CONF_FILE=prj_s2ram.conf
-      - idle_spim_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
-      - CONFIG_CLOCK_CONTROL=y
-      - CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_OPTION_128MHZ=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram"
-
-  benchmarks.multicore.idle_spim_loopback.4_bytes.s2ram_fast.remote_gd_freq_switching:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_spim_loopback_CONF_FILE=prj_s2ram.conf
-      - idle_spim_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
-      - idle_spim_loopback_CONFIG_DATA_FIELD=4
-      - SB_CONFIG_REMOTE_GLOBAL_DOMAIN_CLOCK_FREQUENCY_SWITCHING=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram"
-
-  benchmarks.multicore.idle_spim_loopback.4_bytes.gd_freq_64MHz.s2ram_fast:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_spim_loopback_CONF_FILE=prj_s2ram.conf
-      - idle_spim_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
-      - CONFIG_CLOCK_CONTROL=y
-      - CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_OPTION_64MHZ=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram"
-
-  benchmarks.multicore.idle_spim_loopback.4_bytes.gd_freq_switching.s2ram_fast:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_spim_loopback_CONF_FILE=prj_s2ram.conf
-      - idle_spim_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
-      - CONFIG_CLOCK_CONTROL=y
-      - CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_SWITCHING=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram_7s"
-
   #
   # 16 Bytes of data
   #
@@ -323,80 +253,6 @@ tests:
       pytest_root:
         - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram"
 
-  benchmarks.multicore.idle_spim_loopback.16_bytes.s2ram_fast.remote_gd_freq_switching:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_spim_loopback_CONF_FILE=prj_s2ram.conf
-      - idle_spim_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
-      - idle_spim_loopback_CONFIG_DATA_FIELD=16
-      - SB_CONFIG_REMOTE_GLOBAL_DOMAIN_CLOCK_FREQUENCY_SWITCHING=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram"
-
-  benchmarks.multicore.idle_spim_loopback.16_bytes.gd_freq_256MHz.s2ram_fast:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_spim_loopback_CONF_FILE=prj_s2ram.conf
-      - idle_spim_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
-      - idle_spim_loopback_CONFIG_DATA_FIELD=16
-      - CONFIG_CLOCK_CONTROL=y
-      - CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_OPTION_256MHZ=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram"
-
-  benchmarks.multicore.idle_spim_loopback.16_bytes.gd_freq_128MHz.s2ram_fast:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_spim_loopback_CONF_FILE=prj_s2ram.conf
-      - idle_spim_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
-      - idle_spim_loopback_CONFIG_DATA_FIELD=16
-      - CONFIG_CLOCK_CONTROL=y
-      - CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_OPTION_128MHZ=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram"
-
-  benchmarks.multicore.idle_spim_loopback.16_bytes.gd_freq_64MHz.s2ram_fast:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_spim_loopback_CONF_FILE=prj_s2ram.conf
-      - idle_spim_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
-      - idle_spim_loopback_CONFIG_DATA_FIELD=16
-      - CONFIG_CLOCK_CONTROL=y
-      - CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_OPTION_64MHZ=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram"
-
-  benchmarks.multicore.idle_spim_loopback.16_bytes.gd_freq_switching.s2ram_fast:
-    filter: not CONFIG_COVERAGE
-    tags: ppk_power_measure
-    extra_args:
-      - idle_spim_loopback_CONF_FILE=prj_s2ram.conf
-      - idle_spim_loopback_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay"
-      - idle_spim_loopback_CONFIG_DATA_FIELD=16
-      - CONFIG_CLOCK_CONTROL=y
-      - CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_SWITCHING=y
-    harness: pytest
-    harness_config:
-      fixture: spi_loopback
-      pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram_7s"
-
   #
   # 4 Bytes of data with SPI Chip Select Lock enabled
   #