tests: benchmarks: try adc, gpio and spim with DVFS

Testing Signed-off-by: Piotr Kosycarz <[email protected]>
nrfconnect · Jan 17, 2025 · a689ba8 · a689ba8
1 parent 4389cc3
commit a689ba8
Show file tree

Hide file tree

Showing 8 changed files with 312 additions and 66 deletions.
diff --git a/tests/benchmarks/multicore/idle_spim_loopback/Kconfig b/tests/benchmarks/multicore/idle_spim_loopback/Kconfig
@@ -70,4 +70,25 @@ config GLOBAL_DOMAIN_CLOCK_FREQUENCY_MHZ
 	default 128 if GLOBAL_DOMAIN_CLOCK_FREQUENCY_OPTION_128MHZ
 	default 64 if GLOBAL_DOMAIN_CLOCK_FREQUENCY_OPTION_64MHZ
 
+choice LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION
+	prompt "Local domain clock frequency"
+	default LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_320MHZ
+
+config LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_320MHZ
+	bool "320MHz"
+
+config LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_128MHZ
+	bool "128MHz"
+
+config LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_64MHZ
+	bool "64MHz"
+
+endchoice
+
+config LOCAL_DOMAIN_CLOCK_FREQUENCY_MHZ
+	int
+	default 320 if LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_320MHZ
+	default 128 if LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_128MHZ
+	default 64 if LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_64MHZ
+
 source "Kconfig.zephyr"
diff --git a/tests/benchmarks/multicore/idle_spim_loopback/src/main.c b/tests/benchmarks/multicore/idle_spim_loopback/src/main.c
@@ -54,24 +54,55 @@ static struct k_timer my_timer;
 static bool timer_expired;
 
 #if defined(CONFIG_CLOCK_CONTROL)
-const struct nrf_clock_spec clk_spec_global_hsfll = {
-	.frequency = MHZ(CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_MHZ)
+// const struct nrf_clock_spec clk_spec_global_hsfll = {
+// 	.frequency = MHZ(CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_MHZ)
+// };
+
+// /*
+//  * Set Global Domain frequency (HSFLL120)
+//  * based on: CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_MHZ
+//  */
+// void set_global_domain_frequency(void)
+// {
+// 	int err;
+// 	int res;
+// 	struct onoff_client cli;
+// 	const struct device *hsfll_dev = DEVICE_DT_GET(DT_NODELABEL(hsfll120));
+
+// 	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);
+// 	printk("Return code: %d\n", err);
+// 	__ASSERT_NO_MSG(err < 3);
+// 	__ASSERT_NO_MSG(err >= 0);
+// 	do {
+// 		err = sys_notify_fetch_result(&cli.notify, &res);
+// 		k_yield();
+// 	} while (err == -EAGAIN);
+// 	printk("Clock control request return value: %d\n", err);
+// 	printk("Clock control request response code: %d\n", res);
+// 	__ASSERT_NO_MSG(err == 0);
+// 	__ASSERT_NO_MSG(res == 0);
+// }
+
+const struct nrf_clock_spec clk_spec_local_hsfll = {
+	.frequency = MHZ(CONFIG_LOCAL_DOMAIN_CLOCK_FREQUENCY_MHZ)
 };
 
 /*
- * Set Global Domain frequency (HSFLL120)
- * based on: CONFIG_GLOBAL_DOMAIN_CLOCK_FREQUENCY_MHZ
+ * Set Local Domain frequency (HSFLL120)
+ * based on: CONFIG_LOCAL_DOMAIN_CLOCK_FREQUENCY_MHZ
  */
-void set_global_domain_frequency(void)
+void set_local_domain_frequency(void)
 {
 	int err;
 	int res;
 	struct onoff_client cli;
-	const struct device *hsfll_dev = DEVICE_DT_GET(DT_NODELABEL(hsfll120));
+	const struct device *hsfll_dev = DEVICE_DT_GET(DT_NODELABEL(cpuapp_hsfll));
 
-	printk("Requested frequency [Hz]: %d\n", clk_spec_global_hsfll.frequency);
+	printk("Requested frequency [Hz]: %d\n", clk_spec_local_hsfll.frequency);
 	sys_notify_init_spinwait(&cli.notify);
-	err = nrf_clock_control_request(hsfll_dev, &clk_spec_global_hsfll, &cli);
+	err = nrf_clock_control_request(hsfll_dev, &clk_spec_local_hsfll, &cli);
 	printk("Return code: %d\n", err);
 	__ASSERT_NO_MSG(err < 3);
 	__ASSERT_NO_MSG(err >= 0);
@@ -141,7 +172,7 @@ int main(void)
 	__ASSERT(ret == 0, "Could not configure led GPIO");
 	k_msleep(1000);
 	gpio_pin_set_dt(&led, 1);
-	set_global_domain_frequency();
+	set_local_domain_frequency();
 	k_msleep(100);
 #else
 	ret = gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE);

diff --git a/tests/benchmarks/multicore/idle_spim_loopback/testcase.yaml b/tests/benchmarks/multicore/idle_spim_loopback/testcase.yaml
@@ -84,44 +84,44 @@ 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:
-    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:
-    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.gd_freq_64MHz.s2ram_fast:
-    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_256MHz.s2ram_fast:
+  #   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:
+  #   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.gd_freq_64MHz.s2ram_fast:
+  #   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"
 
   #
   # 16 Bytes of data
@@ -203,47 +203,75 @@ 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.gd_freq_256MHz.s2ram_fast:
+  benchmarks.multicore.idle_spim_loopback.16_bytes.s2ram_fast.ld_64MHz:
     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
+      - idle_spim_loopback_CONFIG_CLOCK_CONTROL=y
+      - idle_spim_loopback_CONFIG_LOCAL_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_128MHz.s2ram_fast:
+  benchmarks.multicore.idle_spim_loopback.16_bytes.s2ram_fast.ld_128MHz:
     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
+      - idle_spim_loopback_CONFIG_CLOCK_CONTROL=y
+      - idle_spim_loopback_CONFIG_LOCAL_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:
-    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_256MHz.s2ram_fast:
+  #   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:
+  #   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:
+  #   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"
 
   #
   # 4 Bytes of data with SPI Chip Select Lock enabled

diff --git a/tests/benchmarks/power_consumption/adc/Kconfig b/tests/benchmarks/power_consumption/adc/Kconfig
@@ -0,0 +1,29 @@
+#
+# Copyright (c) 20245 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+
+choice LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION
+	prompt "Local domain clock frequency"
+	default LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_320MHZ
+
+config LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_320MHZ
+	bool "320MHz"
+
+config LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_128MHZ
+	bool "128MHz"
+
+config LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_64MHZ
+	bool "64MHz"
+
+endchoice
+
+config LOCAL_DOMAIN_CLOCK_FREQUENCY_MHZ
+	int
+	default 320 if LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_320MHZ
+	default 128 if LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_128MHZ
+	default 64 if LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_64MHZ
+
+source "Kconfig.zephyr"
diff --git a/tests/benchmarks/power_consumption/adc/testcase.yaml b/tests/benchmarks/power_consumption/adc/testcase.yaml
@@ -25,3 +25,33 @@ tests:
       fixture: ppk_power_measure
       pytest_root:
         - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_thread_suspend_resume_adc_54H"
+  benchmarks.power_consumption.adc_nrf54h.ld_64MHz:
+    sysbuild: true
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    extra_args:
+      - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
+      - adc_CONFIG_CLOCK_CONTROL=y
+      - adc_CONFIG_LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_64MHZ=y
+    harness: pytest
+    harness_config:
+      fixture: ppk_power_measure
+      pytest_root:
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_thread_suspend_resume_adc_54H"
+  benchmarks.power_consumption.adc_nrf54h.ld_128MHz:
+    sysbuild: true
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    extra_args:
+      - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
+      - adc_CONFIG_CLOCK_CONTROL=y
+      - adc_CONFIG_LOCAL_DOMAIN_CLOCK_FREQUENCY_OPTION_128MHZ=y
+    harness: pytest
+    harness_config:
+      fixture: ppk_power_measure
+      pytest_root:
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_thread_suspend_resume_adc_54H"