tests: benchmarks: multicore: idle_gpio: add cpuppr

Add cpuapp+cpuppr configuration for idle_gpio benchmark test.

Signed-off-by: Piotr Krzyzanowski <[email protected]>

Author: nordic-pikr

tests/benchmarks/multicore/idle_gpio/Kconfig.sysbuild

@@ -6,16 +6,39 @@
 
 source "share/sysbuild/Kconfig"
 
+config RUN_PPRCORE
+	bool "Run test on Peripheral Processor Core (PPR)"
+
+choice PPRCORE
+	default PPRCORE_REMOTE if RUN_PPRCORE
+
+config PPRCORE_REMOTE
+	bool "Remote image"
+
+endchoice
+
+config PPRCORE_IMAGE_NAME
+	default "remote" if PPRCORE_REMOTE
+
+config PPRCORE_IMAGE_PATH
+	default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_gpio/remote" if PPRCORE_REMOTE
+
 choice NETCORE
-	default NETCORE_REMOTE
+	default NETCORE_REMOTE if PPRCORE_NONE
+	default NETCORE_REMOTE_SLEEP_FOREVER if !PPRCORE_NONE
 
 config NETCORE_REMOTE
 	bool "Remote image"
 
+config NETCORE_REMOTE_SLEEP_FOREVER
+	bool "Remote sleep forever image"
+
 endchoice
 
 config NETCORE_IMAGE_NAME
 	default "remote" if NETCORE_REMOTE
+	default "remote_sleep_forever" if NETCORE_REMOTE_SLEEP_FOREVER
 
 config NETCORE_IMAGE_PATH
 	default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_gpio/remote" if NETCORE_REMOTE
+	default "${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever" if NETCORE_REMOTE_SLEEP_FOREVER

tests/benchmarks/multicore/idle_gpio/enable_ppr.overlay

@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+&cpuppr_vpr {
+	status = "okay";
+};

tests/benchmarks/multicore/idle_gpio/remote/CMakeLists.txt

@@ -10,3 +10,8 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(remote)
 
 target_sources(app PRIVATE ../src/main.c)
+
+if(CONFIG_SOC_NRF54H20_CPUPPR)
+  message(DEBUG "Power Mode handler for RISC V is included.")
+  target_sources(app PRIVATE ../../common/power_off.c)
+endif()

tests/benchmarks/multicore/idle_gpio/remote/Kconfig

@@ -0,0 +1,13 @@
+#
+# Copyright (c) 2025 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+config APP_PROVIDE_PM_HOOKS
+	bool "Application provides PM hooks"
+	default y if SOC_NRF54H20_CPUPPR
+	select HAS_PM
+	select HAS_POWEROFF
+
+source "Kconfig.zephyr"

tests/benchmarks/multicore/idle_gpio/remote/boards/nrf54h20dk_nrf54h20_cpuppr_s2ram.overlay

@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	aliases {
+		led3 = &led3;
+		sw1 = &button1;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led3: led_3 {
+			gpios = <&gpio9 3 GPIO_ACTIVE_HIGH>;
+			label = "Green LED 3";
+		};
+	};
+
+	buttons {
+		compatible = "gpio-keys";
+
+		button1: button_1 {
+			gpios = <&gpio0 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
+			label = "Push button 1";
+			zephyr,code = <INPUT_KEY_1>;
+		};
+	};
+
+	cpus {
+		power-states {
+			wait: wait {
+				compatible = "zephyr,power-state";
+				power-state-name = "standby";
+				substate-id = <0>;
+				min-residency-us = <20000>;
+			};
+
+			hibernate: hibernate {
+				compatible = "zephyr,power-state";
+				power-state-name = "suspend-to-ram";
+				substate-id = <0>;
+				min-residency-us = <400000>;
+			};
+		};
+	};
+};
+
+&cpu {
+	cpu-power-states = <&wait &hibernate>;
+};
+
+&gpio0 {
+	status = "okay";
+};
+
+&gpio9 {
+	status = "okay";
+};
+
+&gpiote130 {
+	status = "okay";
+	owned-channels = <0>;
+};

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

@@ -18,6 +18,10 @@ static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led0), gpios);
 #elif IS_ENABLED(CONFIG_SOC_NRF54H20_CPURAD)
 static const struct gpio_dt_spec sw = GPIO_DT_SPEC_GET(DT_ALIAS(sw1), gpios);
 static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led1), gpios);
+#elif IS_ENABLED(CONFIG_SOC_NRF54H20_CPUPPR)
+static const struct gpio_dt_spec sw = GPIO_DT_SPEC_GET(DT_ALIAS(sw1), gpios);
+static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led3), gpios);
+
 #else
 #error "Invalid core selected. "
 #endif
@@ -31,7 +35,7 @@ static K_SEM_DEFINE(my_gpio_sem, 0, 1);
 void my_gpio_callback(const struct device *dev, struct gpio_callback *cb, uint32_t pins)
 {
 	gpio_pin_set_dt(&led, 1);
-	LOG_INF("User callback for %s\n", CONFIG_BOARD_TARGET);
+	LOG_INF("User callback for %s", CONFIG_BOARD_TARGET);
 	k_sem_give(&my_gpio_sem);
 }
 
@@ -44,55 +48,55 @@ int main(void)
 
 	rc = gpio_is_ready_dt(&led);
 	if (rc < 0) {
-		LOG_ERR("GPIO Device not ready (%d)\n", rc);
+		LOG_ERR("GPIO Device not ready (%d)", rc);
 		return 0;
 	}
 
 	rc = gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE);
 	if (rc < 0) {
-		LOG_ERR("Could not configure led GPIO (%d)\n", rc);
+		LOG_ERR("Could not configure led GPIO (%d)", rc);
 		return 0;
 	}
 
 #if DT_NODE_EXISTS(DT_PATH(zephyr_user))
 	rc = gpio_is_ready_dt(&fake_rts);
 	if (rc < 0) {
-		LOG_ERR("GPIO Device not ready (%d)\n", rc);
+		LOG_ERR("GPIO Device not ready (%d)", rc);
 		return 0;
 	}
 
 	rc = gpio_pin_configure_dt(&fake_rts, GPIO_OUTPUT_ACTIVE);
 	if (rc < 0) {
-		LOG_ERR("Could not configure fake_rst GPIO (%d)\n", rc);
+		LOG_ERR("Could not configure fake_rst GPIO (%d)", rc);
 		return 0;
 	}
 #endif
 
 	rc = gpio_is_ready_dt(&sw);
 	if (rc < 0) {
-		LOG_ERR("GPIO Device not ready (%d)\n", rc);
+		LOG_ERR("GPIO Device not ready (%d)", rc);
 		return 0;
 	}
 
 	rc = gpio_pin_configure_dt(&sw, GPIO_INPUT);
 	if (rc < 0) {
-		LOG_ERR("Could not configure sw GPIO (%d)\n", rc);
+		LOG_ERR("Could not configure sw GPIO (%d)", rc);
 		return 0;
 	}
 
 	rc = gpio_pin_interrupt_configure(sw.port, sw.pin, GPIO_INT_LEVEL_ACTIVE);
 	if (rc < 0) {
-		LOG_ERR("Could not configure sw GPIO interrupt (%d)\n", rc);
+		LOG_ERR("Could not configure sw GPIO interrupt (%d)", rc);
 		return 0;
 	}
 	gpio_init_callback(&gpio_cb, my_gpio_callback, 0xFFFF);
 	gpio_add_callback(sw.port, &gpio_cb);
-	LOG_INF("Multicore idle_gpio test on %s\n", CONFIG_BOARD_TARGET);
+	LOG_INF("Multicore idle_gpio test on %s", CONFIG_BOARD_TARGET);
 	while (1) {
-		LOG_INF("Multicore idle_gpio test iteration %u\n", cnt++);
+		LOG_INF("Multicore idle_gpio test iteration %u", cnt++);
 		gpio_pin_set_dt(&led, 0);
 		if (k_sem_take(&my_gpio_sem, K_FOREVER) != 0) {
-			LOG_ERR("Failed to take a semaphore\n");
+			LOG_ERR("Failed to take a semaphore");
 			return 0;
 		}
 		k_busy_wait(1000000);

tests/benchmarks/multicore/idle_gpio/testcase.yaml

@@ -20,8 +20,22 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
       - FILE_SUFFIX=s2ram
-      - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay"
-      - remote_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpurad_s2ram.overlay"
+    harness: pytest
+    harness_config:
+      fixture: ppk_power_measure
+      pytest_root:
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_simple"
+    tags: ppk_power_measure
+
+  benchmarks.multicore.idle_gpio.nrf54h20dk_cpuapp_cpuppr.s2ram:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    extra_args:
+      - FILE_SUFFIX=s2ram
+      - SB_CONFIG_RUN_PPRCORE=y
+      - EXTRA_DTC_OVERLAY_FILE="enable_ppr.overlay"
     harness: pytest
     harness_config:
       fixture: ppk_power_measure
@@ -37,8 +51,6 @@ tests:
     extra_args:
       - SB_CONFIG_BOOTLOADER_MCUBOOT=y
       - FILE_SUFFIX=s2ram
-      - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay"
-      - remote_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpurad_s2ram.overlay"
       - mcuboot_EXTRA_DTC_OVERLAY_FILE="${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/multicore/idle_gpio/boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay"
     harness: pytest
     harness_config:
@@ -54,8 +66,26 @@ tests:
       - nrf54h20dk/nrf54h20/cpuapp
     extra_args:
       - FILE_SUFFIX=s2ram
-      - DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay;boards/wakeup_from_uart_pins.overlay"
-      - remote_DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpurad_s2ram.overlay;boards/wakeup_from_uart_pins.overlay"
+      - EXTRA_DTC_OVERLAY_FILE="boards/wakeup_from_uart_pins.overlay"
+      - remote_EXTRA_DTC_OVERLAY_FILE="boards/wakeup_from_uart_pins.overlay"
+    harness: pytest
+    harness_config:
+      fixture: gpio_loopback
+      pytest_root:
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_power_consumption_with_wakeups_two_cores"
+    timeout: 120
+    tags: ppk_power_measure
+
+  benchmarks.multicore.idle_gpio.nrf54h20dk_cpuapp_cpuppr.s2ram.wakeup_from_uart_pins:
+    platform_allow:
+      - nrf54h20dk/nrf54h20/cpuapp
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
+    extra_args:
+      - FILE_SUFFIX=s2ram
+      - SB_CONFIG_RUN_PPRCORE=y
+      - EXTRA_DTC_OVERLAY_FILE="enable_ppr.overlay;boards/wakeup_from_uart_pins.overlay"
+      - remote_EXTRA_DTC_OVERLAY_FILE="boards/wakeup_from_uart_pins.overlay"
     harness: pytest
     harness_config:
       fixture: gpio_loopback