feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #5903 from douzzer/20221216-fix-benchmark

Browse Source 
20221216-fix-benchmark
This commit is contained in:
JacobBarthelmeh
2022-12-16 14:35:12 -07:00
committed by GitHub
parent b90c07900b 04b31518ba
commit 91f8b5e58e
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
wolfcrypt/benchmark/benchmark.c
View File

@@ -3251,9 +3251,9 @@ static void bench_aesecb_internal(int useDeviceID, const byte* key, word32 keySz
Aes enc[BENCH_MAX_PENDING]; Aes enc[BENCH_MAX_PENDING];
double start; double start;
#ifdef HAVE_FIPS #ifdef HAVE_FIPS
int benchSz = AES_BLOCK_SIZE; static const int benchSz = AES_BLOCK_SIZE;
#else #else
int benchSz = BENCH_SIZE; static const int benchSz = BENCH_SIZE;
#endif #endif
/* clear for done cleanup */ /* clear for done cleanup */
@@ -3276,7 +3276,7 @@ static void bench_aesecb_internal(int useDeviceID, const byte* key, word32 keySz
bench_stats_start(&count, &start); bench_stats_start(&count, &start);
do { do {
int outer_loop_limit = ((bench_size / AES_BLOCK_SIZE) * 10) + 1; int outer_loop_limit = ((bench_size / benchSz) * 10) + 1;
for (times = 0; for (times = 0;
times < outer_loop_limit /* numBlocks */ || pending > 0; times < outer_loop_limit /* numBlocks */ || pending > 0;
) { ) {
@@ -3318,7 +3318,7 @@ exit_aes_enc:
bench_stats_start(&count, &start); bench_stats_start(&count, &start);
do { do {
int outer_loop_limit = (10 * (bench_size / AES_BLOCK_SIZE)) + 1; int outer_loop_limit = (10 * (bench_size / benchSz)) + 1;
for (times = 0; times < outer_loop_limit || pending > 0; ) { for (times = 0; times < outer_loop_limit || pending > 0; ) {
bench_async_poll(&pending); bench_async_poll(&pending);
@@ -3571,7 +3571,7 @@ void bench_aesctr(void)
#ifdef HAVE_AESCCM #ifdef HAVE_AESCCM
void bench_aesccm(int useDevId) void bench_aesccm(int useDeviceID)
{ {
Aes enc; Aes enc;
double start; double start;
@@ -3591,7 +3591,7 @@ void bench_aesccm(int useDevId)
XMEMSET(bench_additional, 0, AES_AUTH_ADD_SZ); XMEMSET(bench_additional, 0, AES_AUTH_ADD_SZ);
if ((ret = wc_AesInit(&enc, HEAP_HINT, if ((ret = wc_AesInit(&enc, HEAP_HINT,
(useDevId)? devId: INVALID_DEVID)) != 0) { useDeviceID ? devId : INVALID_DEVID)) != 0) {
printf("wc_AesInit failed, ret = %d\n", ret); printf("wc_AesInit failed, ret = %d\n", ret);
goto exit; goto exit;
} }
@@ -3610,7 +3610,7 @@ void bench_aesccm(int useDevId)
} }
count += i; count += i;
} while (bench_stats_check(start)); } while (bench_stats_check(start));
bench_stats_sym_finish(AES_AAD_STRING("AES-CCM-enc"), useDevId, count, bench_stats_sym_finish(AES_AAD_STRING("AES-CCM-enc"), useDeviceID, count,
bench_size, start, ret); bench_size, start, ret);
if (ret != 0) { if (ret != 0) {
printf("wc_AesCcmEncrypt failed, ret = %d\n", ret); printf("wc_AesCcmEncrypt failed, ret = %d\n", ret);
@@ -3626,7 +3626,7 @@ void bench_aesccm(int useDevId)
} }
count += i; count += i;
} while (bench_stats_check(start)); } while (bench_stats_check(start));
bench_stats_sym_finish(AES_AAD_STRING("AES-CCM-dec"), useDevId, count, bench_stats_sym_finish(AES_AAD_STRING("AES-CCM-dec"), useDeviceID, count,
bench_size, start, ret); bench_size, start, ret);
if (ret != 0) { if (ret != 0) {
printf("wc_AesCcmEncrypt failed, ret = %d\n", ret); printf("wc_AesCcmEncrypt failed, ret = %d\n", ret);
@@ -5194,7 +5194,7 @@ void bench_blake2s(void)
#ifdef WOLFSSL_CMAC #ifdef WOLFSSL_CMAC
static void bench_cmac_helper(int keySz, const char* outMsg, int useDevId) static void bench_cmac_helper(int keySz, const char* outMsg, int useDeviceID)
{ {
Cmac cmac; Cmac cmac;
byte digest[AES_BLOCK_SIZE]; byte digest[AES_BLOCK_SIZE];
@@ -5212,14 +5212,14 @@ static void bench_cmac_helper(int keySz, const char* outMsg, int useDevId)
keyType = CAAM_KEYTYPE_AES256; keyType = CAAM_KEYTYPE_AES256;
} }
if (useDevId && if (useDeviceID &&
wc_SECO_GenerateKey(CAAM_GENERATE_KEY, keyGroup, pubKey, 0, keyType, wc_SECO_GenerateKey(CAAM_GENERATE_KEY, keyGroup, pubKey, 0, keyType,
keyInfo, &keyID) != 0) { keyInfo, &keyID) != 0) {
printf("Error generating key in hsm\n"); printf("Error generating key in hsm\n");
return; return;
} }
#endif #endif
(void)useDevId; (void)useDeviceID;
bench_stats_start(&count, &start); bench_stats_start(&count, &start);
do { do {
@@ -5227,14 +5227,14 @@ static void bench_cmac_helper(int keySz, const char* outMsg, int useDevId)
ret = wc_InitCmac(&cmac, bench_key, keySz, WC_CMAC_AES, NULL); ret = wc_InitCmac(&cmac, bench_key, keySz, WC_CMAC_AES, NULL);
#else #else
ret = wc_InitCmac_ex(&cmac, bench_key, keySz, WC_CMAC_AES, NULL, ret = wc_InitCmac_ex(&cmac, bench_key, keySz, WC_CMAC_AES, NULL,
HEAP_HINT, (useDevId)? devId: INVALID_DEVID); HEAP_HINT, useDeviceID ? devId : INVALID_DEVID);
#endif #endif
if (ret != 0) { if (ret != 0) {
printf("InitCmac failed, ret = %d\n", ret); printf("InitCmac failed, ret = %d\n", ret);
return; return;
} }
#ifdef WOLFSSL_SECO_CAAM #ifdef WOLFSSL_SECO_CAAM
if (useDevId) { if (useDeviceID) {
wc_SECO_CMACSetKeyID(&cmac, keyID); wc_SECO_CMACSetKeyID(&cmac, keyID);
} }
#endif #endif
@@ -5257,13 +5257,13 @@ static void bench_cmac_helper(int keySz, const char* outMsg, int useDevId)
bench_stats_sym_finish(outMsg, 0, count, bench_size, start, ret); bench_stats_sym_finish(outMsg, 0, count, bench_size, start, ret);
} }
void bench_cmac(int useDevId) void bench_cmac(int useDeviceID)
{ {
#ifdef WOLFSSL_AES_128 #ifdef WOLFSSL_AES_128
bench_cmac_helper(16, "AES-128-CMAC", useDevId); bench_cmac_helper(16, "AES-128-CMAC", useDeviceID);
#endif #endif
#ifdef WOLFSSL_AES_256 #ifdef WOLFSSL_AES_256
bench_cmac_helper(32, "AES-256-CMAC", useDevId); bench_cmac_helper(32, "AES-256-CMAC", useDeviceID);
#endif #endif
} }
@@ -6834,7 +6834,7 @@ exit:
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
#ifdef HAVE_CURVE25519 #ifdef HAVE_CURVE25519
void bench_curve25519KeyGen(int useDevId) void bench_curve25519KeyGen(int useDeviceID)
{ {
curve25519_key genKey; curve25519_key genKey;
double start; double start;
@@ -6845,8 +6845,8 @@ void bench_curve25519KeyGen(int useDevId)
bench_stats_start(&count, &start); bench_stats_start(&count, &start);
do { do {
for (i = 0; i < genTimes; i++) { for (i = 0; i < genTimes; i++) {
ret = wc_curve25519_init_ex(&genKey, HEAP_HINT, (useDevId)? devId : ret = wc_curve25519_init_ex(&genKey, HEAP_HINT,
INVALID_DEVID); useDeviceID ? devId : INVALID_DEVID);
if (ret != 0) { if (ret != 0) {
printf("wc_curve25519_init_ex failed: %d\n", ret); printf("wc_curve25519_init_ex failed: %d\n", ret);
break; break;
@@ -6861,12 +6861,12 @@ void bench_curve25519KeyGen(int useDevId)
} }
count += i; count += i;
} while (bench_stats_check(start)); } while (bench_stats_check(start));
bench_stats_asym_finish("CURVE", 25519, desc[2], useDevId, count, start, bench_stats_asym_finish("CURVE", 25519, desc[2], useDeviceID, count, start,
ret); ret);
} }
#ifdef HAVE_CURVE25519_SHARED_SECRET #ifdef HAVE_CURVE25519_SHARED_SECRET
void bench_curve25519KeyAgree(int useDevId) void bench_curve25519KeyAgree(int useDeviceID)
{ {
curve25519_key genKey, genKey2; curve25519_key genKey, genKey2;
double start; double start;
@@ -6876,9 +6876,9 @@ void bench_curve25519KeyAgree(int useDevId)
word32 x = 0; word32 x = 0;
wc_curve25519_init_ex(&genKey, HEAP_HINT, wc_curve25519_init_ex(&genKey, HEAP_HINT,
(useDevId)? devId : INVALID_DEVID); useDeviceID ? devId : INVALID_DEVID);
wc_curve25519_init_ex(&genKey2, HEAP_HINT, wc_curve25519_init_ex(&genKey2, HEAP_HINT,
(useDevId)? devId : INVALID_DEVID); useDeviceID ? devId : INVALID_DEVID);
ret = wc_curve25519_make_key(&gRng, 32, &genKey); ret = wc_curve25519_make_key(&gRng, 32, &genKey);
if (ret != 0) { if (ret != 0) {
@@ -6906,7 +6906,7 @@ void bench_curve25519KeyAgree(int useDevId)
count += i; count += i;
} while (bench_stats_check(start)); } while (bench_stats_check(start));
exit: exit:
bench_stats_asym_finish("CURVE", 25519, desc[3], useDevId, count, start, bench_stats_asym_finish("CURVE", 25519, desc[3], useDeviceID, count, start,
ret); ret);
wc_curve25519_free(&genKey2); wc_curve25519_free(&genKey2);