Skip to content

Fixes for benchmark with small stack (RSA was being skipped) #7268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JacobBarthelmeh merged 3 commits into from
Feb 23, 2024
+110 −98
Merged

Fixes for benchmark with small stack (RSA was being skipped) #7268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd0301f
Fixes for benchmark with small stack (RSA was being skipped). Added T…
dgarske Feb 22, 2024
4055b0d
Fix for some variable null checks that are not needed.
dgarske Feb 22, 2024
06469a4
wolfcrypt/benchmark/benchmark.c:
douzzer Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 75 additions & 0 deletions IDE/STM32Cube/STM32_Benchmarks.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,81 @@ Benchmark complete
Benchmark Test: Return code 0
```

### STM32H753ZI (-O2, Thumb2 ARM ASM, SP-ASM Cortex M small)

Enable CPU I-Cache and D-Cache by calling:

```c
SCB_EnableICache();
SCB_EnableDCache();
```

Build options for ARM ASM:

```c
#define WOLFSSL_ARMASM
#define WOLFSSL_ARMASM_INLINE
#define WOLFSSL_ARMASM_NO_HW_CRYPTO
#define WOLFSSL_ARMASM_NO_NEON
#define WOLFSSL_ARM_ARCH 7
```

```
------------------------------------------------------------------------------
wolfSSL version 5.6.6
------------------------------------------------------------------------------
wolfCrypt Benchmark (block bytes 1024, min 1.0 sec each)
RNG 6 MiB took 1.000 seconds, 6.079 MiB/s
AES-128-CBC-enc 17 MiB took 1.000 seconds, 17.261 MiB/s
AES-128-CBC-dec 17 MiB took 1.000 seconds, 16.748 MiB/s
AES-192-CBC-enc 15 MiB took 1.000 seconds, 14.575 MiB/s
AES-192-CBC-dec 14 MiB took 1.000 seconds, 14.209 MiB/s
AES-256-CBC-enc 13 MiB took 1.000 seconds, 12.622 MiB/s
AES-256-CBC-dec 12 MiB took 1.000 seconds, 12.378 MiB/s
AES-128-GCM-enc 8 MiB took 1.000 seconds, 8.374 MiB/s
AES-128-GCM-dec 8 MiB took 1.000 seconds, 8.374 MiB/s
AES-192-GCM-enc 8 MiB took 1.000 seconds, 7.690 MiB/s
AES-192-GCM-dec 8 MiB took 1.000 seconds, 7.690 MiB/s
AES-256-GCM-enc 7 MiB took 1.000 seconds, 7.129 MiB/s
AES-256-GCM-dec 7 MiB took 1.000 seconds, 7.104 MiB/s
AES-128-GCM-enc-no_AAD 8 MiB took 1.000 seconds, 8.472 MiB/s
AES-128-GCM-dec-no_AAD 8 MiB took 1.000 seconds, 8.472 MiB/s
AES-192-GCM-enc-no_AAD 8 MiB took 1.000 seconds, 7.764 MiB/s
AES-192-GCM-dec-no_AAD 8 MiB took 1.000 seconds, 7.715 MiB/s
AES-256-GCM-enc-no_AAD 7 MiB took 1.000 seconds, 7.153 MiB/s
AES-256-GCM-dec-no_AAD 7 MiB took 1.000 seconds, 7.153 MiB/s
GMAC Table 4-bit 17 MiB took 1.000 seconds, 16.617 MiB/s
CHACHA 29 MiB took 1.000 seconds, 28.662 MiB/s
CHA-POLY 19 MiB took 1.000 seconds, 18.848 MiB/s
POLY1305 90 MiB took 1.000 seconds, 89.771 MiB/s
SHA-224 18 MiB took 1.000 seconds, 18.042 MiB/s
SHA-256 18 MiB took 1.000 seconds, 18.042 MiB/s
SHA-384 8 MiB took 1.000 seconds, 7.544 MiB/s
SHA-512 8 MiB took 1.000 seconds, 7.568 MiB/s
SHA-512/224 8 MiB took 1.000 seconds, 7.544 MiB/s
SHA-512/256 8 MiB took 1.000 seconds, 7.520 MiB/s
HMAC-SHA224 18 MiB took 1.000 seconds, 17.896 MiB/s
HMAC-SHA256 18 MiB took 1.000 seconds, 17.896 MiB/s
HMAC-SHA384 7 MiB took 1.000 seconds, 7.373 MiB/s
HMAC-SHA512 7 MiB took 1.000 seconds, 7.397 MiB/s
RSA 2048 public 508 ops took 1.000 sec, avg 1.969 ms, 508.000 ops/sec
RSA 2048 private 14 ops took 1.020 sec, avg 72.857 ms, 13.725 ops/sec
DH 2048 key gen 30 ops took 1.012 sec, avg 33.733 ms, 29.644 ops/sec
DH 2048 agree 30 ops took 1.012 sec, avg 33.733 ms, 29.644 ops/sec
ECC [ SECP256R1] 256 key gen 982 ops took 1.000 sec, avg 1.018 ms, 982.000 ops/sec
ECDHE [ SECP256R1] 256 agree 456 ops took 1.000 sec, avg 2.193 ms, 456.000 ops/sec
ECDSA [ SECP256R1] 256 sign 520 ops took 1.000 sec, avg 1.923 ms, 520.000 ops/sec
ECDSA [ SECP256R1] 256 verify 288 ops took 1.004 sec, avg 3.486 ms, 286.853 ops/sec
CURVE 25519 key gen 1112 ops took 1.000 sec, avg 0.899 ms, 1112.000 ops/sec
CURVE 25519 agree 1144 ops took 1.000 sec, avg 0.874 ms, 1144.000 ops/sec
ED 25519 key gen 2358 ops took 1.000 sec, avg 0.424 ms, 2358.000 ops/sec
ED 25519 sign 1716 ops took 1.000 sec, avg 0.583 ms, 1716.000 ops/sec
ED 25519 verify 862 ops took 1.000 sec, avg 1.160 ms, 862.000 ops/sec
Benchmark complete
Benchmark Test: Return code 0
```


### STM32H753ZI (No HW Crypto, -Os, FastMath)

```
Expand Down
133 changes: 35 additions & 98 deletions wolfcrypt/benchmark/benchmark.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4258,14 +4258,8 @@ static void bench_aesgcm_internal(int useDeviceID,
sizeof(Aes), HEAP_HINT);
#endif

#ifdef WOLFSSL_ASYNC_CRYPT
if (bench_additional)
#endif
XMEMSET(bench_additional, 0, AES_AUTH_ADD_SZ);
#ifdef WOLFSSL_ASYNC_CRYPT
if (bench_tag)
#endif
XMEMSET(bench_tag, 0, AES_AUTH_TAG_SZ);
XMEMSET(bench_additional, 0, AES_AUTH_ADD_SZ);
XMEMSET(bench_tag, 0, AES_AUTH_TAG_SZ);

/* init keys */
for (i = 0; i < BENCH_MAX_PENDING; i++) {
Expand Down Expand Up @@ -4427,14 +4421,8 @@ static void bench_aesgcm_stream_internal(int useDeviceID,
sizeof(Aes), HEAP_HINT);
#endif

#ifdef WOLFSSL_ASYNC_CRYPT
if (bench_additional)
#endif
XMEMSET(bench_additional, 0, AES_AUTH_ADD_SZ);
#ifdef WOLFSSL_ASYNC_CRYPT
if (bench_tag)
#endif
XMEMSET(bench_tag, 0, AES_AUTH_TAG_SZ);
XMEMSET(bench_additional, 0, AES_AUTH_ADD_SZ);
XMEMSET(bench_tag, 0, AES_AUTH_TAG_SZ);

/* init keys */
for (i = 0; i < BENCH_MAX_PENDING; i++) {
Expand Down Expand Up @@ -5476,17 +5464,14 @@ void bench_sm4_gcm(void)

WC_DECLARE_VAR(bench_additional, byte, AES_AUTH_ADD_SZ, HEAP_HINT);
WC_DECLARE_VAR(bench_tag, byte, AES_AUTH_TAG_SZ, HEAP_HINT);
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
if (bench_additional == NULL || bench_tag == NULL) {
printf("bench_aesgcm_internal malloc failed\n");
return;
}
#endif

WC_ALLOC_VAR(bench_additional, byte, AES_AUTH_ADD_SZ, HEAP_HINT);
WC_ALLOC_VAR(bench_tag, byte, AES_AUTH_TAG_SZ, HEAP_HINT);

ret = wc_Sm4GcmSetKey(&sm4, bench_key, SM4_KEY_SIZE);
if (ret != 0) {
printf("Sm4GcmSetKey failed, ret = %d\n", ret);
return;
goto exit;
}

bench_stats_start(&count, &start);
Expand All @@ -5497,7 +5482,7 @@ void bench_sm4_gcm(void)
bench_additional, aesAuthAddSz);
if (ret < 0) {
printf("Sm4GcmEncrypt failed: %d\n", ret);
return;
goto exit;
}
RECORD_MULTI_VALUE_STATS();
}
Expand All @@ -5523,7 +5508,7 @@ void bench_sm4_gcm(void)
bench_additional, aesAuthAddSz);
if (ret < 0) {
printf("Sm4GcmDecrypt failed: %d\n", ret);
return;
goto exit;
}
RECORD_MULTI_VALUE_STATS();
}
Expand All @@ -5538,6 +5523,11 @@ void bench_sm4_gcm(void)
#ifdef MULTI_VALUE_STATISTICS
bench_multi_value_stats(max, min, sum, squareSum, runs);
#endif

exit:

WC_FREE_VAR(bench_additional);
WC_FREE_VAR(bench_tag);
}
#endif

Expand All @@ -5552,12 +5542,8 @@ void bench_sm4_ccm()
WC_DECLARE_VAR(bench_additional, byte, AES_AUTH_ADD_SZ, HEAP_HINT);
WC_DECLARE_VAR(bench_tag, byte, AES_AUTH_TAG_SZ, HEAP_HINT);

#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
if (bench_additional == NULL || bench_tag == NULL) {
printf("bench_aesccm malloc failed\n");
goto exit;
}
#endif
WC_ALLOC_VAR(bench_additional, byte, AES_AUTH_ADD_SZ, HEAP_HINT);
WC_ALLOC_VAR(bench_tag, byte, AES_AUTH_TAG_SZ, HEAP_HINT);

XMEMSET(bench_tag, 0, AES_AUTH_TAG_SZ);
XMEMSET(bench_additional, 0, AES_AUTH_ADD_SZ);
Expand Down Expand Up @@ -8457,40 +8443,35 @@ static void bench_rsa_helper(int useDeviceID,
WC_DECLARE_HEAP_ARRAY(enc, byte, BENCH_MAX_PENDING,
rsaKeySz, HEAP_HINT);

#if ( !defined(WOLFSSL_RSA_VERIFY_INLINE) \
&& !defined(WOLFSSL_RSA_PUBLIC_ONLY) )
WC_DECLARE_HEAP_ARRAY(out, byte, BENCH_MAX_PENDING,
rsaKeySz, HEAP_HINT);
#else
byte* out[BENCH_MAX_PENDING];
#endif
#if (!defined(WOLFSSL_RSA_VERIFY_INLINE) && \
!defined(WOLFSSL_RSA_PUBLIC_ONLY))
WC_DECLARE_HEAP_ARRAY(out, byte, BENCH_MAX_PENDING,
rsaKeySz, HEAP_HINT);
#else
byte* out[BENCH_MAX_PENDING];
#endif

XMEMSET(out, 0, sizeof(out));

WC_ALLOC_HEAP_ARRAY(enc, byte, BENCH_MAX_PENDING,
rsaKeySz, HEAP_HINT);

#if ( !defined(WOLFSSL_RSA_VERIFY_INLINE) \
&& !defined(WOLFSSL_RSA_PUBLIC_ONLY) )
WC_ALLOC_HEAP_ARRAY(out, byte, BENCH_MAX_PENDING,
rsaKeySz, HEAP_HINT);
if (out[0] == NULL) {
ret = MEMORY_E;
goto exit;
}
#endif
if (enc[0] == NULL) {
#if (!defined(WOLFSSL_RSA_VERIFY_INLINE) && \
!defined(WOLFSSL_RSA_PUBLIC_ONLY))
WC_ALLOC_HEAP_ARRAY(out, byte, BENCH_MAX_PENDING,
rsaKeySz, HEAP_HINT);
if (out[0] == NULL) {
ret = MEMORY_E;
goto exit;
}

#ifndef WOLFSSL_RSA_VERIFY_ONLY
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
if (message == NULL) {
#endif
if (enc[0] == NULL) {
ret = MEMORY_E;
goto exit;
}
#endif

#ifndef WOLFSSL_RSA_VERIFY_ONLY
WC_ALLOC_VAR(message, byte, TEST_STRING_SZ, HEAP_HINT);
XMEMCPY(message, messageStr, len);
#endif

Expand Down Expand Up @@ -8714,12 +8695,6 @@ void bench_rsa(int useDeviceID)

WC_CALLOC_ARRAY(rsaKey, RsaKey, BENCH_MAX_PENDING,
sizeof(RsaKey), HEAP_HINT);
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
if (rsaKey[0] == NULL) {
printf("bench_rsa malloc failed\n");
return;
}
#endif

#ifdef USE_CERT_BUFFERS_1024
tmp = rsa_key_der_1024;
Expand Down Expand Up @@ -8822,12 +8797,6 @@ void bench_rsa_key(int useDeviceID, word32 rsaKeySz)

WC_CALLOC_ARRAY(rsaKey, RsaKey, BENCH_MAX_PENDING,
sizeof(RsaKey), HEAP_HINT);
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
if (rsaKey[0] == NULL) {
printf("bench_rsa_key malloc failed\n");
return;
}
#endif

/* init keys */
do {
Expand Down Expand Up @@ -8956,7 +8925,6 @@ void bench_dh(int useDeviceID)
WC_ALLOC_VAR(pub2, byte, BENCH_DH_KEY_SIZE, HEAP_HINT);
WC_ALLOC_VAR(priv2, byte, BENCH_DH_PRIV_SIZE, HEAP_HINT);


(void)tmp;

if (!use_ffdhe) {
Expand Down Expand Up @@ -10249,14 +10217,6 @@ void bench_eccMakeKey(int useDeviceID, int curveId)

WC_CALLOC_ARRAY(genKey, ecc_key, BENCH_MAX_PENDING,
sizeof(ecc_key), HEAP_HINT);
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
if (genKey[0] == NULL) {
printf("bench_eccMakeKey malloc failed\n");
return;
}
for (i = 0; i < BENCH_MAX_PENDING; ++i)
XMEMSET(genKey[i], 0, sizeof(ecc_key));
#endif

deviceID = useDeviceID ? devId : INVALID_DEVID;
keySize = wc_ecc_get_curve_size_from_id(curveId);
Expand Down Expand Up @@ -10359,23 +10319,10 @@ void bench_ecc(int useDeviceID, int curveId)

WC_CALLOC_ARRAY(genKey, ecc_key, BENCH_MAX_PENDING,
sizeof(ecc_key), HEAP_HINT);
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
if (genKey[0] == NULL) {
printf("bench_eccMakeKey malloc failed\n");
return;
}
#endif

#ifdef HAVE_ECC_DHE
WC_CALLOC_ARRAY(genKey2, ecc_key, BENCH_MAX_PENDING,
sizeof(ecc_key), HEAP_HINT);
#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
if (genKey2[0] == NULL) {
XFREE(genKey, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
printf("bench_eccMakeKey malloc failed\n");
return;
}
#endif
WC_ALLOC_ARRAY(shared, byte,
BENCH_MAX_PENDING, MAX_ECC_BYTES, HEAP_HINT);
#endif
Expand Down Expand Up @@ -10796,15 +10743,6 @@ static void bench_sm2_MakeKey(int useDeviceID)
WC_CALLOC_ARRAY(genKey, ecc_key, BENCH_MAX_PENDING,
sizeof(ecc_key), HEAP_HINT);

#ifdef WC_DECLARE_VAR_IS_HEAP_ALLOC
if (genKey[0] == NULL) {
printf("bench_sm2_MakeKey malloc failed\n");
return;
}
for (i = 0; i < BENCH_MAX_PENDING; ++i)
XMEMSET(genKey[i], 0, sizeof(ecc_key));
#endif

/* ECC Make Key */
bench_stats_start(&count, &start);
do {
Expand Down Expand Up @@ -11474,7 +11412,6 @@ void bench_ed448KeyGen(void)
#endif
}


void bench_ed448KeySign(void)
{
int ret;
Expand All @@ -11496,7 +11433,7 @@ void bench_ed448KeySign(void)
ret = wc_ed448_make_key(&gRng, ED448_KEY_SIZE, genKey);
if (ret != 0) {
printf("ed448_make_key failed\n");
return;
goto exit;
}

#ifdef HAVE_ED448_SIGN
Expand Down