Add benchmark and test capability to test-app

Author: twcook86

config/examples/lpc55s69.config

@@ -34,7 +34,16 @@ WOLFBOOT_SECTOR_SIZE?=0x400
 
 # Default configuration
 # 40KB boot, 44KB partitions, 1024 swap
-WOLFBOOT_PARTITION_SIZE?=0xB000
-WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xA000
-WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x15000
-WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x20000
+#WOLFBOOT_PARTITION_SIZE?=0xB000
+#WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xD000
+#WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x18000
+#WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x23000
+
+# use these for test/benchmark
+WOLFBOOT_PARTITION_SIZE?=0x26000
+WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x10000
+WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x36000
+WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x5C000
+
+WOLFCRYPT_TEST?=1
+WOLFCRYPT_BENCHMARK?=1

include/user_settings.h

@@ -493,14 +493,19 @@ extern int tolower(int c);
     #define NO_AES_CBC
 #else
     #if defined(WOLFCRYPT_TEST) || defined(WOLFCRYPT_BENCHMARK)
-        /* Use custom RNG for tests/benchmarks (saves ~7KB vs HASHDRBG).
-         * WARNING: my_rng_seed_gen is NOT cryptographically secure.
-         * Only used in test-app builds, not in production wolfBoot. */
-        #define WC_NO_HASHDRBG
-        #define CUSTOM_RAND_GENERATE_SEED my_rng_seed_gen
-        #define CUSTOM_RAND_GENERATE_BLOCK my_rng_seed_gen
-        extern int my_rng_seed_gen(unsigned char* output, unsigned int sz);
-        
+        #ifdef WOLFSSL_NXP_LPC55S69
+            /* use actual rng hardware for seed, HASHDRBG for generation */
+            #define HAVE_HASHDRBG
+        #else
+            /* Use custom RNG for tests/benchmarks (saves ~7KB vs HASHDRBG).
+            * WARNING: my_rng_seed_gen is NOT cryptographically secure.
+            * Only used in test-app builds, not in production wolfBoot. */
+            #define WC_NO_HASHDRBG
+            #define CUSTOM_RAND_GENERATE_SEED my_rng_seed_gen
+            #define CUSTOM_RAND_GENERATE_BLOCK my_rng_seed_gen
+            extern int my_rng_seed_gen(unsigned char* output, unsigned int sz);
+        #endif
+            
         #define HAVE_AESGCM
         #define GCM_TABLE
     #else
@@ -575,6 +580,10 @@ extern int tolower(int c);
 
 /* wolfCrypt Test/Benchmark Configuration */
 #ifdef WOLFCRYPT_TEST
+    #ifdef WOLFSSL_NXP_LPC55S69
+        /* lpc55s69 hashcrypt hw does not support interleaving */
+        #define NO_WOLFSSL_SHA256_INTERLEAVE
+    #endif
     /* Skip extended tests to save memory */
     #define NO_CRYPT_TEST_EXTENDED
     /* Use smaller certificate buffers */

test-app/ARM-lpc55s69.ld

@@ -1,7 +1,10 @@
+_Min_Heap_Size  = 0x00008000; /* minimal heap (not using malloc) */
+_Min_Stack_Size = 0x00008000; /* required amount of stack */
+
 MEMORY
 {
     FLASH (rx) : ORIGIN = @WOLFBOOT_TEST_APP_ADDRESS@, LENGTH = @WOLFBOOT_TEST_APP_SIZE@
-    RAM (rwx) : ORIGIN = 0x20020000, LENGTH = 32K
+    RAM (rwx) : ORIGIN = 0x20020000, LENGTH = 96K
 }
 
 SECTIONS
@@ -44,15 +47,23 @@ SECTIONS
         *(COMMON)
         . = ALIGN(4);
         _end_bss = .;
-        _end = .;
     } > RAM
+
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    PROVIDE ( _start_heap = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+    PROVIDE ( END_STACK = . );
+    PROVIDE ( _end_stack = . );
+  } > RAM
 }
 
 _wolfboot_partition_boot_address = @WOLFBOOT_PARTITION_BOOT_ADDRESS@;
 _wolfboot_partition_size = @WOLFBOOT_PARTITION_SIZE@;
 _wolfboot_partition_update_address = @WOLFBOOT_PARTITION_UPDATE_ADDRESS@;
 _wolfboot_partition_swap_address = @WOLFBOOT_PARTITION_SWAP_ADDRESS@;
-
-PROVIDE(_start_heap = _end);
-PROVIDE(end = _end);
-PROVIDE(_end_stack  = ORIGIN(RAM) + LENGTH(RAM));

test-app/Makefile

@@ -710,6 +710,7 @@ ifeq ($(TARGET),mcxn)
 endif
 
 ifeq ($(TARGET),lpc55s69)
+    CFLAGS+=-ffunction-sections -fdata-sections
     ifeq ($(TZEN),1)
       LSCRIPT_TEMPLATE=ARM-lpc55s69-ns.ld
       CFLAGS:=$(filter-out -mcmse, $(CFLAGS))
@@ -737,10 +738,16 @@ ifeq ($(TARGET),lpc55s69)
     else
       CFLAGS+=-DWOLFSSL_NXP_LPC55S69_NO_HWACCEL
     endif
-    ifeq (,$(findstring nosys.specs,$(LDFLAGS)))
+    LIBS+=--specs=nano.specs
+    ifneq ($(WOLFCRYPT_SUPPORT),1)
+      # Only use nosys stubs when not providing our own syscalls
       LDFLAGS+=--specs=nosys.specs
     endif
-    LDFLAGS+=-Wl,--no-warn-rwx-segments
+    ifeq ($(WOLFCRYPT_BENCHMARK),1)
+      # Benchmark needs float printf for results
+      LDFLAGS+=-Wl,-u_printf_float
+    endif
+    LDFLAGS+=-Wl,--no-warn-rwx-segments -Wl,--allow-multiple-definition
 endif
 
 ifeq ($(TARGET),nxp_lpc54s0xx)

test-app/app_lpc55s69.c

@@ -28,12 +28,39 @@
 #include "wolfboot/wolfboot.h"
 #include "printf.h"
 
+/* wolfCrypt test/benchmark support */
+#ifdef WOLFCRYPT_TEST
+#include <wolfssl/wolfcrypt/settings.h>
+#include <wolfcrypt/test/test.h>
+int wolfcrypt_test(void *args);
+#endif
+
+#ifdef WOLFCRYPT_BENCHMARK
+#include <wolfssl/wolfcrypt/settings.h>
+#include <wolfcrypt/benchmark/benchmark.h>
+int benchmark_test(void *args);
+#endif
+
 #define RED_LED     6
 #define GREEN_LED   7
 #define BLUE_LED    4
 
 extern void hal_init(void);
 
+
+volatile uint64_t SysTick_time_ms;
+
+void SysTick_Handler(void)
+{
+    SysTick_time_ms++;
+}
+
+static void systick_init(void)
+{
+    SysTick_Config(CLOCK_GetCoreSysClkFreq() / 1000U); /* 1 ms period */
+}
+
+
 #define IOCON_PIO_FUNC0 0x00u         /*!<@brief Selects pin function 0 */
 #define IOCON_PIO_MODE_PULLUP 0x20u   /*!<@brief Selects pull-up function */
 #define IOCON_PIO_SLEW_STANDARD 0x00u /*!<@brief Standard mode, output slew rate control is enabled */
@@ -106,7 +133,14 @@ void main(void)
     uint8_t boot_state, update_state;
 
     hal_init();
+    systick_init();
     leds_init();
+    __enable_irq();
+
+    wolfBoot_printf("\n==================================\n");
+    wolfBoot_printf("LPC55S69 wolfBoot demo Application\n");
+    wolfBoot_printf("Copyright 2026 wolfSSL Inc\n");
+    wolfBoot_printf("==================================\n");
 
     check_parts(&boot_ver, &update_ver, &boot_state, &update_state);
 
@@ -147,69 +181,87 @@ void main(void)
         GPIO_PinWrite(GPIO, 1, GREEN_LED, 0);
     }
 
+#if defined(WOLFCRYPT_TEST) || defined(WOLFCRYPT_BENCHMARK)
+    wolfCrypt_Init();
+
+# ifdef WOLFCRYPT_TEST
+    wolfBoot_printf("\nRunning wolfCrypt tests...\n");
+    wolfcrypt_test(NULL);
+    wolfBoot_printf("Tests complete.\n\n");
+# endif
+
+# ifdef WOLFCRYPT_BENCHMARK
+    wolfBoot_printf("\nRunning wolfCrypt benchmarks...\n");
+    benchmark_test(NULL);
+    wolfBoot_printf("Benchmarks complete.\n\n");
+# endif
+
+    wolfCrypt_Cleanup();
+#endif
+
     while (1) {
         __asm__ volatile ("wfi");
     }
 }
 
 
-#include "sys/stat.h"
-int _getpid(void)
-{
-    return 1;
-}
+// #include "sys/stat.h"
+// int _getpid(void)
+// {
+//     return 1;
+// }
 
-int _kill(int pid, int sig)
-{
-    (void)pid;
-    (void)sig;
-    return -1;
-}
+// int _kill(int pid, int sig)
+// {
+//     (void)pid;
+//     (void)sig;
+//     return -1;
+// }
 
-void _exit(int status)
-{
-    _kill(status, -1);
-    while (1) {}
-}
+// void _exit(int status)
+// {
+//     _kill(status, -1);
+//     while (1) {}
+// }
 
-int _read(int file, char *ptr, int len)
-{
-    (void)file;
-    (void)ptr;
-    (void)len;
-    return -1;
-}
+// int _read(int file, char *ptr, int len)
+// {
+//     (void)file;
+//     (void)ptr;
+//     (void)len;
+//     return -1;
+// }
 
-int _write(int file, char *ptr, int len)
-{
-    (void)file;
-    (void)ptr;
-    return len;
-}
+// int _write(int file, char *ptr, int len)
+// {
+//     (void)file;
+//     (void)ptr;
+//     return len;
+// }
 
-int _close(int file)
-{
-    (void)file;
-    return -1;
-}
+// int _close(int file)
+// {
+//     (void)file;
+//     return -1;
+// }
 
-int _isatty(int file)
-{
-    (void)file;
-    return 1;
-}
+// int _isatty(int file)
+// {
+//     (void)file;
+//     return 1;
+// }
 
-int _lseek(int file, int ptr, int dir)
-{
-    (void)file;
-    (void)ptr;
-    (void)dir;
-    return 0;
-}
+// int _lseek(int file, int ptr, int dir)
+// {
+//     (void)file;
+//     (void)ptr;
+//     (void)dir;
+//     return 0;
+// }
 
-int _fstat(int file, struct stat *st)
-{
-    (void)file;
-    st->st_mode = S_IFCHR;
-    return 0;
-}
+// int _fstat(int file, struct stat *st)
+// {
+//     (void)file;
+//     st->st_mode = S_IFCHR;
+//     return 0;
+// }

test-app/startup_arm.c

@@ -43,7 +43,7 @@ extern void isr_usart3(void);
 extern void isr_lpuart1(void);
 #endif
 
-#ifdef TARGET_va416x0
+#if defined(TARGET_va416x0) || defined(TARGET_lpc55s69)
 #define isr_systick SysTick_Handler
 #elif !defined(APP_HAS_SYSTICK)
 #define isr_systick isr_empty

test-app/syscalls.c

@@ -141,6 +141,7 @@ int _getpid(void)
  * other OS facilities that don't exist in bare-metal.
  * wolfCrypt test/benchmark code calls standard printf, not wolfBoot_printf.
  */
+int vsnprintf(char *buf, unsigned int size, const char *fmt, va_list argp);
 
 /* Route all printf-family functions through our vsnprintf (in this file)
  * rather than uart_vprintf (in string.c). This ensures float formatting

test-app/wolfcrypt_support.c

@@ -42,6 +42,8 @@
 #elif defined(TARGET_va416x0)
     /* Use Vorago SDK HAL_time_ms (incremented by SysTick_Handler every 1ms) */
     extern volatile uint64_t HAL_time_ms;
+#elif defined(TARGET_lpc55s69)
+    extern volatile uint64_t SysTick_time_ms;
 #elif defined(TARGET_nxp_t2080) || defined(TARGET_nxp_t1024)
     /* PPC timebase register for accurate timing.
      * Timebase frequency = platform_clock / 16. */
@@ -96,6 +98,10 @@ unsigned long my_time(unsigned long* timer)
     unsigned long t = (unsigned long)(HAL_time_ms / 1000);
     if (timer) *timer = t;
     return t;
+#elif defined(TARGET_lpc55s69)
+    unsigned long t = (unsigned long)(SysTick_time_ms / 1000);
+    if (timer) *timer = t;
+    return t;
 #elif defined(TARGET_nxp_t2080) || defined(TARGET_nxp_t1024)
     if (ppc_tb_hz == 0)
         ppc_tb_hz = ppc_get_timebase_hz();
@@ -125,6 +131,9 @@ double current_time(int reset)
     (void)reset;
     /* Use Vorago SDK SysTick-based millisecond counter */
     return (double)HAL_time_ms / 1000.0;
+#elif defined(TARGET_lpc55s69)
+    (void)reset;
+    return (double)SysTick_time_ms / 1000.0;
 #elif defined(TARGET_nxp_t2080) || defined(TARGET_nxp_t1024)
     if (ppc_tb_hz == 0)
         ppc_tb_hz = ppc_get_timebase_hz();