Further improvements to support benchmark

Author: dgarske

include/user_settings.h

@@ -584,9 +584,15 @@ extern int tolower(int c);
 #if defined(WOLFCRYPT_TEST) || defined(WOLFCRYPT_BENCHMARK)
     #define NO_WRITE_TEMP_FILES
 
-    /* Enable malloc for test/benchmark (they need dynamic allocation) */
-    #undef NO_WOLFSSL_MEMORY
-    #undef WOLFSSL_NO_MALLOC
+    /* Use static memory pool to avoid system malloc dependency.
+     * benchmark.c provides gBenchMemory static buffer.
+     * Default is 50KB with BENCH_EMBEDDED, override for smaller targets */
+    #ifndef WOLFSSL_STATIC_MEMORY
+        #define WOLFSSL_STATIC_MEMORY
+    #endif
+    #ifndef WOLFSSL_STATIC_MEMORY_TEST_SZ
+        #define WOLFSSL_STATIC_MEMORY_TEST_SZ (10 * 1024)
+    #endif
 
     /* Enable SP math digit operations */
     #define WOLFSSL_SP_MUL_D
@@ -629,7 +635,8 @@ extern int tolower(int c);
 #       define WOLFSSL_SP_NO_DYN_STACK
 #   endif
 #   if !defined(SECURE_PKCS11) && !defined(WOLFCRYPT_TZ_PSA) && \
-       !defined(WOLFBOOT_ENABLE_WOLFHSM_SERVER)
+       !defined(WOLFBOOT_ENABLE_WOLFHSM_SERVER) && \
+       !defined(WOLFCRYPT_TEST) && !defined(WOLFCRYPT_BENCHMARK)
 #       define NO_WOLFSSL_MEMORY
 #       define WOLFSSL_NO_MALLOC
 #   endif

test-app/ARM-va416x0.ld

@@ -1,4 +1,4 @@
-_Min_Heap_Size  = 0x00003000; /* required amount of heap  */
+_Min_Heap_Size  = 0x00000100; /* minimal heap (not using malloc) */
 _Min_Stack_Size = 0x00003000; /* required amount of stack */
 
 /* Memory areas */

test-app/wolfcrypt_support.c

@@ -87,7 +87,6 @@ double current_time(int reset)
 
 /* ========== RNG SEED FUNCTIONS ========== */
 
-#ifdef WOLFCRYPT_TEST
 /*
  * RNG seed generation strategy:
  * 1. If WOLFCRYPT_SECURE_MODE - use secure TRNG
@@ -98,7 +97,7 @@ double current_time(int reset)
 /* Simple incrementing RNG for testing (not cryptographically secure) */
 static uint32_t test_rng_counter = 0x12345678;
 
-/* my_rng_seed_gen() - Generate random seed/data for test suite
+/* my_rng_seed_gen() - Generate random seed/data for test/benchmark
  * This is NOT cryptographically secure - only for testing!
  * Returns: 0 on success
  */
@@ -114,8 +113,4 @@ int my_rng_seed_gen(unsigned char* output, unsigned int sz)
     return 0;
 }
 
-/* Alias for block generation - same implementation */
-#define my_rng_gen_block my_rng_seed_gen
-#endif /* WOLFCRYPT_TEST */
-
 #endif /* WOLFCRYPT_TEST || WOLFCRYPT_BENCHMARK */