Added draft benchmark script

Author: danielinux

Makefile

@@ -318,6 +318,7 @@ clean:
 	$(Q)rm -f $(MACHINE_OBJ) $(MAIN_TARGET) $(LSCRIPT)
 	$(Q)rm -f $(OBJS)
 	$(Q)rm -f tools/keytools/otp/otp-keystore-gen
+	$(Q)rm -f .stack_usage
 	$(Q)$(MAKE) -C test-app -s clean
 	$(Q)$(MAKE) -C tools/check_config -s clean
 	$(Q)$(MAKE) -C stage1 -s clean
@@ -385,6 +386,13 @@ line-count-nrf52:
 line-count-x86:
 	cloc --force-lang-def cloc_lang_def.txt src/boot_x86_fsp.c src/boot_x86_fsp_payload.c src/boot_x86_fsp_start.S src/image.c src/keystore.c src/libwolfboot.c src/loader.c src/string.c src/update_disk.c src/x86/ahci.c src/x86/ata.c src/x86/common.c src/x86/gpt.c src/x86/hob.c src/pci.c src/x86/tgl_fsp.c hal/x86_fsp_tgl.c hal/x86_uart.c
 
+stack-usage: wolfboot.bin
+	$(Q)echo $(STACK_USAGE) > .stack_usage
+
+image-header-size: wolfboot.bin
+	$(Q)echo $(IMAGE_HEADER_SIZE) > .image_header_size
+
+
 cppcheck:
 	cppcheck -f --enable=warning --enable=portability \
 		--suppress="ctunullpointer" --suppress="nullPointer" \

arch.mk

@@ -188,7 +188,8 @@ ifeq ($(ARCH),ARM)
 ifeq ($(CORTEX_A5),1)
   FPU=-mfpu=vfp4-d16
   CFLAGS+=-mcpu=cortex-a5  -mtune=cortex-a5 -static -z noexecstack
-  LDLAGS+=-mcpu=cortex-a5 -mtune=cortex-a5  -mtune=cortex-a5 -static -z noexecstack  -Ttext 0x300000
+  LDLAGS+=-mcpu=cortex-a5 -mtune=cortex-a5  -mtune=cortex-a5 -static \
+		  -z noexecstack  -Ttext 0x300000
   # Cortex-A uses boot_arm32.o
   OBJS+=src/boot_arm32.o src/boot_arm32_start.o
   ifeq ($(NO_ASM),1)
@@ -198,11 +199,29 @@ ifeq ($(CORTEX_A5),1)
     OBJS+=./lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha256.o
     OBJS+=./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha256-asm.o
     OBJS+=./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.o
-    CFLAGS+=-DWOLFSSL_SP_ARM32_ASM -DWOLFSSL_ARMASM -DWOLFSSL_ARMASM_NO_HW_CRYPTO -DWOLFSSL_ARM_ARCH=7 -DWOLFSSL_ARMASM_INLINE -DWOLFSSL_ARMASM_NO_NEON
+    CFLAGS+=-DWOLFSSL_SP_ARM32_ASM -DWOLFSSL_ARMASM -DWOLFSSL_ARMASM_NO_HW_CRYPTO \
+			-DWOLFSSL_ARM_ARCH=7 -DWOLFSSL_ARMASM_INLINE -DWOLFSSL_ARMASM_NO_NEON
   endif
 else
   # All others use boot_arm.o
   OBJS+=src/boot_arm.o
+  CORTEXM_ARM_EXTRA_OBJS= \
+          ./lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha256.o \
+          ./lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha512.o \
+          ./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha256-asm.o \
+          ./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.o \
+          ./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha512-asm.o \
+          ./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.o \
+          ./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha3-asm.o \
+          ./lib/wolfssl/wolfcrypt/src/port/arm/armv8-32-sha3-asm_c.o
+
+
+  CORTEXM_ARM_THUMB_EXTRA_OBJS= \
+          ./lib/wolfssl/wolfcrypt/src/port/arm/thumb2-sha256-asm.o \
+          ./lib/wolfssl/wolfcrypt/src/port/arm/thumb2-sha256-asm_c.o
+
+  CORTEXM_ARM_EXTRA_CFLAGS+=-DWOLFSSL_ARMASM -DWOLFSSL_ARMASM_NO_HW_CRYPTO \
+							-DWOLFSSL_ARMASM_INLINE -DWOLFSSL_ARMASM_NO_NEON
   ifeq ($(CORTEX_M33),1)
     CFLAGS+=-mcpu=cortex-m33 -DCORTEX_M33
     LDFLAGS+=-mcpu=cortex-m33
@@ -225,12 +244,16 @@ else
         else
           CFLAGS+=-DWOLFSSL_SP_ASM -DWOLFSSL_SP_ARM_CORTEX_M_ASM
           MATH_OBJS += ./lib/wolfssl/wolfcrypt/src/sp_cortexm.o
+          CFLAGS+=$(CORTEXM_ARM_EXTRA_CFLAGS) -DWOLFSSL_ARM_ARCH=8
+          OBJS+=$(CORTEXM_ARM_EXTRA_OBJS)
         endif
       endif
     else
       ifeq ($(SPMATH),1)
         CFLAGS+=-DWOLFSSL_SP_ASM -DWOLFSSL_SP_ARM_CORTEX_M_ASM
         MATH_OBJS += ./lib/wolfssl/wolfcrypt/src/sp_cortexm.o
+        CFLAGS+=$(CORTEXM_ARM_EXTRA_CFLAGS) -DWOLFSSL_ARM_ARCH=8
+        OBJS+=$(CORTEXM_ARM_EXTRA_OBJS)
       endif
     endif
   else
@@ -243,6 +266,8 @@ else
         else
           CFLAGS+=-DWOLFSSL_SP_ASM -DWOLFSSL_SP_ARM_CORTEX_M_ASM
           MATH_OBJS += ./lib/wolfssl/wolfcrypt/src/sp_cortexm.o
+          CFLAGS+=$(CORTEXM_ARM_EXTRA_CFLAGS) -DWOLFSSL_ARM_ARCH=7
+          OBJS+=$(CORTEXM_ARM_EXTRA_OBJS)
         endif
       endif
     else
@@ -255,6 +280,9 @@ else
           else
             CFLAGS+=-DWOLFSSL_SP_ASM -DWOLFSSL_SP_ARM_THUMB_ASM
             MATH_OBJS += ./lib/wolfssl/wolfcrypt/src/sp_armthumb.o
+			# TODO: integrate thumb2-asm
+            #CFLAGS+=$(CORTEXM_ARM_EXTRA_CFLAGS) -DWOLFSSL_ARM_ARCH=6
+            #OBJS+=$(CORTEXM_ARM_THUMB_EXTRA_OBJS)
           endif
         endif
       else
@@ -269,6 +297,8 @@ else
             ifeq ($(SPMATH),1)
               CFLAGS+=-DWOLFSSL_SP_ASM -DWOLFSSL_SP_ARM_CORTEX_M_ASM -DWOLFSSL_SP_NO_UMAAL
               MATH_OBJS += ./lib/wolfssl/wolfcrypt/src/sp_cortexm.o
+              CFLAGS+=$(CORTEXM_ARM_EXTRA_CFLAGS) -DWOLFSSL_ARM_ARCH=7
+              OBJS+=$(CORTEXM_ARM_EXTRA_OBJS)
             endif
           endif
       else
@@ -284,6 +314,8 @@ else
           ifeq ($(SPMATH),1)
             CFLAGS+=-DWOLFSSL_SP_ASM -DWOLFSSL_SP_ARM_CORTEX_M_ASM
             MATH_OBJS += ./lib/wolfssl/wolfcrypt/src/sp_cortexm.o
+            CFLAGS+=$(CORTEXM_ARM_EXTRA_CFLAGS) -DWOLFSSL_ARM_ARCH=7
+            OBJS+=$(CORTEXM_ARM_EXTRA_OBJS)
           endif
         endif
       endif

include/user_settings.h

@@ -70,12 +70,12 @@ extern int tolower(int c);
 #endif
 
 /* ED25519 and SHA512 */
+#define WOLFSSL_SHA512
 #ifdef WOLFBOOT_SIGN_ED25519
 #   define HAVE_ED25519
 #   define ED25519_SMALL
 #   define NO_ED25519_SIGN
 #   define NO_ED25519_EXPORT
-#   define WOLFSSL_SHA512
 #   define USE_SLOW_SHA512
 #endif
 
@@ -499,4 +499,8 @@ extern int tolower(int c);
 
 #endif /* WOLFBOOT_PKCS11_APP */
 
+#ifndef XTOLOWER
+#define XTOLOWER(x) (x)
+#endif
+
 #endif /* !_WOLFBOOT_USER_SETTINGS_H_ */

lib/wolfssl

@@ -362,6 +362,9 @@ void uart_print(const char *s)
     }
 }
 
+#define FILLER_SIZE (100 * 1024)
+static volatile uint8_t filler_data[FILLER_SIZE] = { 0x01, 0x02, 0x03 };
+
 void main(void)
 {
     uint8_t firmware_version = 0;
@@ -373,6 +376,7 @@ void main(void)
     if (FIRMWARE_A)
         ld3_write(LED_INIT);
 
+    filler_data[FILLER_SIZE - 1] = 0xAA;
     /* LED Indicator of successful UART initialization. SUCCESS = ON, FAIL = OFF */
     if (uart_setup(115200) < 0)
         ld2_write(LED_OFF);

test-app/app_stm32h7.c

@@ -0,0 +1,76 @@
+#!/bin/bash
+#
+function run_on_board() {
+    # GPIO2: RST
+    # GPIO3: BOOT (input)
+
+    if ! (st-flash reset &>/dev/null); then
+        echo -n "No data."
+    else
+        echo "2" > /sys/class/gpio/export
+        echo "3" > /sys/class/gpio/export
+        echo "out" > /sys/class/gpio/gpio2/direction
+        echo "in" > /sys/class/gpio/gpio3/direction
+        echo "1" > /sys/class/gpio/gpio2/value # Release reset
+        sleep .2
+        st-flash --connect-under-reset write factory.bin 0x8000000
+        echo "0" > /sys/class/gpio/gpio0/value # Keep reset low
+        sleep 1
+        echo "1" > /sys/class/gpio/gpio0/value # Release reset
+        time $(while grep "0" /sys/class/gpio/gpio3/value; do true; done)
+    fi
+}
+
+function set_benchmark {
+    NAME=$1
+    shift
+    CONFIG=$@
+    make clean &>/dev/null
+    make distclean &>/dev/null
+    make keysclean &>/dev/null
+    make $@ &>/dev/null
+    make $@ stack-usage &>/dev/null 
+    make $@ image-header-size &>/dev/null
+    # Name
+    echo -n "| "
+    echo -n $NAME
+    echo -n " | "
+    # Configuration
+    echo -n $CONFIG | tr -d '\n'
+    echo -n " | "
+    # Bootloader size
+    echo -n `ls -l wolfboot.bin | cut -d " " -f 5 | tr -d '\n'`
+    echo -n " | "
+    # Stack size
+    cat .stack_usage | tr -d '\n'
+    echo -n " | "
+    # Image header size
+    cat .image_header_size | tr -d '\n'
+    echo -n " | "
+    # Boot time
+    run_on_board 2>&1 
+    echo " |"
+}
+
+# Output benchmark results in a Markdown table
+echo "| Name | Configuration | Bootloader size | Stack size | Image header size | Boot time |"
+echo "|------|---------------|-----------------|------------|-------------------|-----------|"
+
+set_benchmark "no sign" SIGN=NONE
+set_benchmark "ed25519 with sha384, small" SIGN=ED25519 HASH=SHA384 NO_ASM=1
+set_benchmark "ed25519 with sha384" SIGN=ED25519 HASH=SHA384
+set_benchmark "ed25519 fast" SIGN=ED25519 NO_ASM=0
+set_benchmark "ed25519 small" SIGN=ED25519 NO_ASM=1
+set_benchmark "LMS 1-10-8" SIGN=LMS LMS_LEVELS=1 LMS_HEIGHT=10 LMS_WINTERNITZ=8 IMAGE_HEADER_SIZE=4096 IMAGE_SIGNATURE_SIZE=1456
+set_benchmark "ed448" SIGN=ED448
+set_benchmark "ecdsa384 with sha384" SIGN=ECC384 HASH=SHA384
+set_benchmark "rsa2048" SIGN=RSA2048
+set_benchmark "rsa3072" SIGN=RSA3072
+set_benchmark "rsa4096" SIGN=RSA4096
+set_benchmark "ecdsa256" SIGN=ECC256
+set_benchmark "ecdsa256, no asm" SIGN=ECC256 NO_ASM=1
+set_benchmark "ecdsa384" SIGN=ECC384
+set_benchmark "ecdsa384, no asm" SIGN=ECC384 NO_ASM=1
+set_benchmark "ecdsa521" SIGN=ECC521
+set_benchmark "ecdsa521, no asm" SIGN=ECC521 NO_ASM=1
+