tests: benchmarks: Switch PM benchmarks to I/O gated meas (part 2)

nordic-bami · nordic-piks · commit 318bc03357b7 · 2025-02-03T09:54:16.000+01:00
Switch remaining benchmarks to use GPIO gated current measurements

Signed-off-by: Bartosz Miller &lt;bartosz.miller@nordicsemi.no&gt;
diff --git a/tests/benchmarks/multicore/idle_clock_control/coverage.conf b/tests/benchmarks/multicore/idle_clock_control/coverage.conf
@@ -5,7 +5,7 @@ CONFIG_PM_DEVICE=n
 CONFIG_PM_DEVICE_RUNTIME=n
 CONFIG_POWEROFF=n
 
-CONFIG_GPIO=n
+CONFIG_GPIO=y
 
 CONFIG_NRFS=y
 CONFIG_CLOCK_CONTROL=y
diff --git a/tests/benchmarks/multicore/idle_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -7,13 +7,17 @@
 / {
 	aliases {
 		test-comp = &comp;
+		led = &led0;
+		/delete-property/ led1;
 	};
 
 	zephyr,user {
 		test-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
 	};
 };
 
+/delete-node/ &led1;
+
 &gpio1 {
 	status = "okay";
 };
diff --git a/tests/benchmarks/multicore/idle_comp/remote/CMakeLists.txt b/tests/benchmarks/multicore/idle_comp/remote/CMakeLists.txt
diff --git a/tests/benchmarks/multicore/idle_comp/remote/prj.conf b/tests/benchmarks/multicore/idle_comp/remote/prj.conf
diff --git a/tests/benchmarks/multicore/idle_comp/remote/src/main.c b/tests/benchmarks/multicore/idle_comp/remote/src/main.c
diff --git a/tests/benchmarks/multicore/idle_comp/src/main.c b/tests/benchmarks/multicore/idle_comp/src/main.c
@@ -11,6 +11,7 @@
 
 static const struct device *test_dev = DEVICE_DT_GET(DT_ALIAS(test_comp));
 static const struct gpio_dt_spec test_pin = GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), test_gpios);
+static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led0), gpios);
 
 volatile int counter;
 static void test_callback(const struct device *dev, void *user_data)
@@ -26,6 +27,12 @@ int main(void)
 
 	gpio_pin_configure_dt(&test_pin, GPIO_OUTPUT_INACTIVE);
 
+	rc = gpio_is_ready_dt(&led);
+	__ASSERT(rc, "Error: GPIO Device not ready");
+
+	rc = gpio_pin_configure_dt(&led, GPIO_OUTPUT_INACTIVE);
+	__ASSERT(rc == 0, "Could not configure led GPIO");
+
 	pm_device_runtime_enable(test_dev);
 	pm_device_runtime_get(test_dev);
 
@@ -43,16 +50,17 @@ int main(void)
 #endif
 	{
 		counter = 0;
-		k_msleep(200);
+		k_busy_wait(200000);
 		gpio_pin_set_dt(&test_pin, 1);
-		k_msleep(400);
+		k_busy_wait(400000);
 		__ASSERT_NO_MSG(counter == 1);
 		gpio_pin_set_dt(&test_pin, 0);
-		k_msleep(400);
+		k_busy_wait(400000);
 		__ASSERT_NO_MSG(counter == 2);
 		pm_device_runtime_put(test_dev);
+		gpio_pin_set_dt(&led, 0);
 		k_msleep(1000);
-
+		gpio_pin_set_dt(&led, 1);
 		pm_device_runtime_get(test_dev);
 		k_msleep(1);
 	}
diff --git a/tests/benchmarks/multicore/idle_comp/sysbuild.cmake b/tests/benchmarks/multicore/idle_comp/sysbuild.cmake
@@ -11,7 +11,7 @@ endif()
 # Add remote project
 ExternalZephyrProject_Add(
     APPLICATION remote
-    SOURCE_DIR ${APP_DIR}/remote
+    SOURCE_DIR ${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever
     BOARD ${SB_CONFIG_REMOTE_BOARD}
     BOARD_REVISION ${BOARD_REVISION}
   )
diff --git a/tests/benchmarks/multicore/idle_comp/testcase.yaml b/tests/benchmarks/multicore/idle_comp/testcase.yaml
@@ -38,7 +38,7 @@ tests:
     harness_config:
       fixture: gpio_loopback
       pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_lpcomp"
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_comp"
 
   benchmarks.multicore.idle_lpcomp.nrf54h20dk_cpuapp_cpurad.coverage:
     tags:
diff --git a/tests/benchmarks/multicore/idle_ppr/src/main.c b/tests/benchmarks/multicore/idle_ppr/src/main.c
@@ -46,11 +46,12 @@ int main(void)
 	while (1) {
 		timer_expired = false;
 
+		/* Turn ON LED */
+		ret = gpio_pin_set_dt(&led, 1);
+
 		/* start a one-shot timer that expires after 1 second */
 		k_timer_start(&my_timer, K_MSEC(1000), K_NO_WAIT);
 
-		/* Turn ON LED */
-		ret = gpio_pin_set_dt(&led, 1);
 		if (ret < 0) {
 			LOG_ERR("Unable to turn on LED");
 		}
@@ -62,16 +63,16 @@ int main(void)
 			k_yield();
 		}
 
+		LOG_INF("Run %d", counter);
+		counter++;
+
 		/* Turn OFF LED */
 		ret = gpio_pin_set_dt(&led, 0);
 		if (ret < 0) {
 			LOG_ERR("Unable to turn off LED");
 		}
 		__ASSERT(ret == 0, "Unable to turn off LED\n");
 
-		LOG_INF("Run %d", counter);
-		counter++;
-
 		/* Sleep / enter low power state */
 		k_msleep(CONFIG_TEST_SLEEP_DURATION_MS);
 	}
diff --git a/tests/benchmarks/multicore/idle_twim/coverage.conf b/tests/benchmarks/multicore/idle_twim/coverage.conf
@@ -1,5 +1,5 @@
 CONFIG_I2C=y
-CONFIG_GPIO=n
+CONFIG_GPIO=y
 
 CONFIG_PM=y
 CONFIG_PM_S2RAM=n
diff --git a/tests/benchmarks/multicore/idle_uarte/src/main.c b/tests/benchmarks/multicore/idle_uarte/src/main.c
@@ -18,8 +18,6 @@
  */
 LOG_MODULE_REGISTER(idle_uarte);
 
-static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios);
-
 #if DT_NODE_EXISTS(DT_NODELABEL(dut))
 #define UART_NODE DT_NODELABEL(dut)
 #else
@@ -31,6 +29,7 @@ static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios);
 
 static const struct device *const uart_dev = DEVICE_DT_GET(UART_NODE);
 static const struct device *const console_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
+static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios);
 
 uint8_t test_pattern[TEST_BUFFER_LEN];
 static uint8_t test_buffer[TEST_BUFFER_LEN];
diff --git a/tests/benchmarks/multicore/idle_usb/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_usb/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -4,6 +4,15 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+/ {
+	aliases {
+		led = &led0;
+		/delete-property/ led1;
+	};
+};
+
+/delete-node/ &led1;
+
 &zephyr_udc0 {
 	cdc_acm_uart0 {
 		compatible = "zephyr,cdc-acm-uart";
diff --git a/tests/benchmarks/multicore/idle_usb/src/main.c b/tests/benchmarks/multicore/idle_usb/src/main.c
@@ -16,6 +16,7 @@
 #include <zephyr/usb/usb_device.h>
 #include <zephyr/usb/usbd.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/drivers/gpio.h>
 
 #include <nrfs_usb.h>
 
@@ -24,6 +25,7 @@
 LOG_MODULE_REGISTER(idle_usb, LOG_LEVEL_INF);
 
 const struct device *const uart_dev = DEVICE_DT_GET_ONE(zephyr_cdc_acm_uart);
+static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios);
 
 #define RING_BUF_SIZE		  1024
 #define TEST_TRANSMISSION_TIME_MS 4000
@@ -169,19 +171,26 @@ int main(void)
 
 	LOG_INF("Hello World! %s", CONFIG_BOARD_TARGET);
 
+	ret = gpio_is_ready_dt(&led);
+	__ASSERT(ret, "Error: GPIO Device not ready");
+
+	ret = gpio_pin_configure_dt(&led, GPIO_OUTPUT_INACTIVE);
+	__ASSERT(err == 0, "Could not configure led GPIO");
+
 	if (!device_is_ready(uart_dev)) {
 		LOG_ERR("CDC ACM device not ready");
-		return 0;
+		__ASSERT(ret, "CDC ACM device not ready");
 	}
 	LOG_INF("Get UART PM runtime request response: %d", pm_device_runtime_get(uart_dev));
 
 	ret = enable_usb_device_next();
 	if (ret != 0) {
 		LOG_ERR("Failed to enable USB");
-		return 0;
+		__ASSERT(ret == 0, "Failed to enable USB");
 	}
 
 	ring_buf_init(&ringbuf, sizeof(ring_buffer), ring_buffer);
+	gpio_pin_set_dt(&led, 1);
 
 	LOG_INF("Wait for DTR");
 	k_sem_take(&dtr_sem, K_FOREVER);
@@ -231,5 +240,6 @@ int main(void)
 	k_msleep(100);
 
 	LOG_INF("Good night");
+	gpio_pin_set_dt(&led, 0);
 	k_sleep(K_FOREVER);
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ endif()`
`11`	`11`	`# Add remote project`
`12`	`12`	`ExternalZephyrProject_Add(`
`13`	`13`	`APPLICATION remote`
`14`		`- SOURCE_DIR ${APP_DIR}/remote`
	`14`	`+ SOURCE_DIR ${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever`
`15`	`15`	`BOARD ${SB_CONFIG_REMOTE_BOARD}`
`16`	`16`	`BOARD_REVISION ${BOARD_REVISION}`
`17`	`17`	`)`