Modified Makefile and benchmark variables

-modified Makefile to execute clean target before building.
-modified Makefile to add CFLAGS for sp_x86_64.
-fixed BENCH_TIME_SEC possible to be defined by compiler flags.

Author: Shingo Morimoto

embedded/signature/ecc-sign-verify/Makefile

@@ -39,6 +39,7 @@ OBJ_TFM := \
 
 ifeq ($(math) $(arch),sp x64) 
 ASFLAGS+= -DSP_X86_64_FLAG
+CFLAGS += -DSP_X86_64_FLAG
 OBJ += $(OBJ_SP_X86_64)
 else ifeq ($(math) $(arch),sp arm64)
 CFLAGS += -DSP_ARM64_FLAG
@@ -59,13 +60,13 @@ endif
 
 all : ecc_sign_verify bench mem
 
-ecc_sign_verify: $(OBJ)
+ecc_sign_verify: clean $(OBJ)
 	$(CC) $(CFLAGS) -o ecc_sign_verify ecc_sign_verify.c $(OBJ)
 
-bench: $(OBJ)
+bench: clean $(OBJ)
 	$(CC) $(CFLAGS) -DBENCHMARK -o ecc_sign_verify_bench ecc_sign_verify.c $(OBJ)
 
-mem: $(OBJ)
+mem: clean $(OBJ)
 	$(CC) $(CFLAGS) -DDEBUG_MEMORY -o ecc_sign_verify_mem ecc_sign_verify.c $(OBJ)
 clean:
 	rm -f ecc_sign_verify ecc_sign_verify_bench ecc_sign_verify_mem $(WOLFROOT)/wolfcrypt/src/*.o

embedded/signature/ecc-sign-verify/ecc_sign_verify.c

@@ -47,7 +47,6 @@
 #define ECC_KEY_SIZE_512 512
 #define ECC_KEY_SIZE_521 521
 #define BYTE_SZ 8
-#define BENCH_TIME_SEC 1
 #define CHECK_RET(a, b, eLabel, msg) { \
                                         if (a != b) {                    \
                                             printf("failed %s\n", msg);  \
@@ -62,10 +61,6 @@ int do_sig_ver_test(int eccKeySz);
     static void hexdump(const void *buffer, word32 len, byte cols);
 #endif
 
-// int ret;
-double start_time, total_time;
-
-
 int ecc_sign_verify(void)
 {
     int ret = 0;
@@ -121,7 +116,13 @@ int do_sig_ver_test(int eccKeySz)
     byte* sig = NULL; // get rid of this magic number
     WC_RNG rng;
     int verified = 0;
-    int count;       // for the benchmark
+
+/* Variables for Benchmark */
+double start_time, total_time;
+#ifndef BENCH_TIME_SEC
+    #define BENCH_TIME_SEC 1
+#endif
+    int count;    
 
 
     /*
@@ -164,7 +165,7 @@ int do_sig_ver_test(int eccKeySz)
     count = 0;
     start_time = current_time(1);
 
-    while( BENCH_TIME_SEC > (total_time = current_time(0) - start_time ) ){
+    while( (double)BENCH_TIME_SEC > (total_time = current_time(0) - start_time ) ){
 #endif 
         ret = wc_ecc_init(&key);
         CHECK_RET(ret, 0, sig_done, "wc_ecc_init()");

embedded/signature/rsa_buffer/Makefile

@@ -1,5 +1,5 @@
 WOLFROOT = ../../../../wolfssl
-
+# EX_CFLAGS
 CFLAGS = $(EX_CFLAGS) -DWOLFSSL_USER_SETTINGS -I. -I$(WOLFROOT) -Os
 ASFLAGS=-DWOLFSSL_USER_SETTINGS -I. -I$(WOLFROOT)
 
@@ -41,6 +41,7 @@ OBJ_TFM := \
 
 ifeq ($(math) $(arch),sp x64) 
 ASFLAGS+= -DSP_X86_64_FLAG
+CFLAGS += -DSP_X86_64_FLAG
 OBJ += $(OBJ_SP_X86_64)
 else ifeq ($(math) $(arch),sp arm64)
 CFLAGS += -DSP_ARM64_FLAG
@@ -61,13 +62,13 @@ endif
 
 all: verify sign bench mem
 
-verify: $(OBJ)
+verify: clean $(OBJ)
 	$(CC) $(CFLAGS) -o verify verify.c $(OBJ)
-sign: $(OBJ)
+sign: clean $(OBJ)
 	$(CC) $(CFLAGS) -o sign sign.c $(OBJ)
-bench: $(OBJ)
+bench: clean $(OBJ)
 	$(CC) $(CFLAGS) -DBENCHMARK -o verify_bench verify.c $(OBJ)
-mem: $(OBJ)
+mem: clean $(OBJ)
 	$(CC) $(CFLAGS) -DDEBUG_MEMORY -o verify_mem verify.c $(OBJ)
 clean:
 	rm -f sign verify verify_bench verify_mem $(WOLFROOT)/wolfcrypt/src/*.o

embedded/signature/rsa_buffer/verify.c

@@ -56,8 +56,11 @@ int verify()
     unsigned char  decSig[sizeof(rsa_sig_2048)];
     word32         decSigLen = 0;
 
+/* Variables for benchmark */
     double start, total_time;
+#ifndef BENCH_TIME_SEC
     #define BENCH_TIME_SEC 3
+#endif
     int count;
 
 #ifdef DEBUG_MEMORY
@@ -97,7 +100,7 @@ int verify()
     printf("Running benchmark...\n");
     printf("Please Wait %.2f seconds\n", (double)BENCH_TIME_SEC);
     start = current_time(0);// 1 0
-    while( BENCH_TIME_SEC > (total_time = current_time(0) - start ) ){
+    while( (double)BENCH_TIME_SEC > (total_time = current_time(0) - start ) ){
 #endif
         /* Verify the signature by decrypting the value. */
         if (ret == 0) {

embedded/signature/rsa_vfy_only/Makefile

@@ -42,6 +42,7 @@ OBJ_TFM := \
 
 ifeq ($(math) $(arch),sp x64) 
 ASFLAGS+= -DSP_X86_64_FLAG
+CFLAGS += -DSP_X86_64_FLAG
 OBJ += $(OBJ_SP_X86_64)
 else ifeq ($(math) $(arch),sp arm64)
 CFLAGS += -DSP_ARM64_FLAG
@@ -62,11 +63,11 @@ endif
 
 all: verify bench mem
 
-verify: $(OBJ)
+verify: clean $(OBJ)
 	$(CC) $(CFLAGS) -o verify verify.c $(OBJ)
-bench: $(OBJ)
+bench: clean $(OBJ)
 	$(CC) $(CFLAGS) -DBENCHMARK -o verify_bench verify.c $(OBJ)
-mem: $(OBJ)
+mem: clean $(OBJ)
 	$(CC) $(CFLAGS) -DDEBUG_MEMORY -o verify_mem verify.c $(OBJ)
 clean:
 	rm -f verify verify_bench verify_mem $(WOLFROOT)/wolfcrypt/src/*.o

embedded/signature/rsa_vfy_only/verify.c

@@ -147,8 +147,11 @@ int verify()
         0x00, 0x04, 0x20, 0x00,
     };
 
+/* Variables for a benchmark*/
     double start, total_time;
+#ifndef BENCH_TIME_SEC
     #define BENCH_TIME_SEC 3
+#endif
     int count;
 
 #ifdef DEBUG_MEMORY
@@ -181,7 +184,7 @@ int verify()
     printf("Running benchmark...\n");
     printf("Please Wait %.2f seconds\n", (double)BENCH_TIME_SEC);
     start = current_time(0);// 1 0
-    while( BENCH_TIME_SEC > (total_time = current_time(0) - start ) ){
+    while( (double)BENCH_TIME_SEC > (total_time = current_time(0) - start ) ){
     if (ret != 0 ) printf("Invalid signature in benchmark\n");    
 #endif
     /* Verify the signature by decrypting the value. */