Skip to content

Commit 6b84b78

Browse files
JacobBarthelmehJacobBarthelmeh
committed
use heap hints where possible in benchmark
1 parent 7486183 commit 6b84b78

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

‎wolfcrypt/benchmark/benchmark.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2548,7 +2548,7 @@ typedef enum bench_stat_type {
25482548

25492549
if (bstat == NULL) {
25502550
/* allocate new and put on list */
2551-
bstat = (bench_stats_t*)XMALLOC(sizeof(bench_stats_t), NULL,
2551+
bstat = (bench_stats_t*)XMALLOC(sizeof(bench_stats_t), HEAP_HINT,
25522552
DYNAMIC_TYPE_INFO);
25532553
if (bstat) {
25542554
XMEMSET(bstat, 0, sizeof(bench_stats_t));
@@ -3614,7 +3614,7 @@ static WC_INLINE void bench_stats_free(void)
36143614
bench_stats_t* bstat;
36153615
for (bstat = bench_stats_head; bstat != NULL; ) {
36163616
bench_stats_t* next = bstat->next;
3617-
XFREE(bstat, NULL, DYNAMIC_TYPE_INFO);
3617+
XFREE(bstat, HEAP_HINT, DYNAMIC_TYPE_INFO);
36183618
bstat = next;
36193619
}
36203620
bench_stats_head = NULL;
@@ -6113,7 +6113,7 @@ static void bench_aesofb_internal(const byte* key,
61136113

61146114
bench_stats_prepare();
61156115

6116-
ret = wc_AesInit(&enc, NULL, INVALID_DEVID);
6116+
ret = wc_AesInit(&enc, HEAP_HINT, INVALID_DEVID);
61176117
if (ret != 0) {
61186118
printf("AesInit failed at L%d, ret = %d\n", __LINE__, ret);
61196119
return;
@@ -11180,7 +11180,7 @@ static void bench_lms_keygen(enum wc_LmsParm parm, byte* pub)
1118011180
return;
1118111181
}
1118211182

11183-
ret = wc_LmsKey_Init(&key, NULL, INVALID_DEVID);
11183+
ret = wc_LmsKey_Init(&key, HEAP_HINT, devId);
1118411184
if (ret) {
1118511185
printf("wc_LmsKey_Init failed: %d\n", ret);
1118611186
wc_FreeRng(&rng);
@@ -11196,7 +11196,7 @@ static void bench_lms_keygen(enum wc_LmsParm parm, byte* pub)
1119611196

1119711197
wc_LmsKey_Free(&key);
1119811198

11199-
ret = wc_LmsKey_Init(&key, NULL, INVALID_DEVID);
11199+
ret = wc_LmsKey_Init(&key, HEAP_HINT, devId);
1120011200
if (ret) {
1120111201
printf("wc_LmsKey_Init failed: %d\n", ret);
1120211202
goto exit_lms_keygen;
@@ -11285,7 +11285,7 @@ static void bench_lms_sign_verify(enum wc_LmsParm parm, byte* pub)
1128511285

1128611286
bench_stats_prepare();
1128711287

11288-
ret = wc_LmsKey_Init(&key, NULL, INVALID_DEVID);
11288+
ret = wc_LmsKey_Init(&key, HEAP_HINT, devId);
1128911289
if (ret) {
1129011290
printf("wc_LmsKey_Init failed: %d\n", ret);
1129111291
goto exit_lms_sign_verify;
@@ -11716,7 +11716,7 @@ static void bench_xmss_sign_verify(const char * params)
1171611716

1171711717
freeRng = 1;
1171811718

11719-
ret = wc_XmssKey_Init(&key, NULL, INVALID_DEVID);
11719+
ret = wc_XmssKey_Init(&key, HEAP_HINT, devId);
1172011720
if (ret != 0) {
1172111721
printf("wc_XmssKey_Init failed: %d\n", ret);
1172211722
goto exit_xmss_sign_verify;
@@ -12201,7 +12201,7 @@ void bench_slhdsa(enum SlhDsaParam param)
1220112201
WC_ALLOC_VAR_EX(sig, byte, WC_SLHDSA_MAX_SIG_LEN, HEAP_HINT,
1220212202
DYNAMIC_TYPE_TMP_BUFFER, goto exit);
1220312203

12204-
ret = wc_SlhDsaKey_Init(key, param, NULL, INVALID_DEVID);
12204+
ret = wc_SlhDsaKey_Init(key, param, HEAP_HINT, devId);
1220512205
if (ret != 0) {
1220612206
goto exit;
1220712207
}
@@ -12250,7 +12250,7 @@ void bench_slhdsa(enum SlhDsaParam param)
1225012250
goto exit;
1225112251
}
1225212252

12253-
ret = wc_SlhDsaKey_Init(key_vfy, param, NULL, INVALID_DEVID);
12253+
ret = wc_SlhDsaKey_Init(key_vfy, param, HEAP_HINT, devId);
1225412254
if (ret != 0) {
1225512255
goto exit;
1225612256
}
@@ -13729,7 +13729,7 @@ void bench_eccsiKeyGen(void)
1372913729
bench_stats_start(&count, &start);
1373013730
do {
1373113731
for (i = 0; i < genTimes; i++) {
13732-
wc_InitEccsiKey(genKey, NULL, INVALID_DEVID);
13732+
wc_InitEccsiKey(genKey, HEAP_HINT, devId);
1373313733
ret = wc_MakeEccsiKey(genKey, &gRng);
1373413734
wc_FreeEccsiKey(genKey);
1373513735
if (ret != 0) {
@@ -13774,7 +13774,7 @@ void bench_eccsiPairGen(void)
1377413774

1377513775
(void)mp_init(ssk);
1377613776
pvt = wc_ecc_new_point();
13777-
wc_InitEccsiKey(genKey, NULL, INVALID_DEVID);
13777+
wc_InitEccsiKey(genKey, HEAP_HINT, devId);
1377813778
(void)wc_MakeEccsiKey(genKey, &gRng);
1377913779

1378013780
/* RSK Gen */
@@ -13833,7 +13833,7 @@ void bench_eccsiValidate(void)
1383313833

1383413834
(void)mp_init(ssk);
1383513835
pvt = wc_ecc_new_point();
13836-
wc_InitEccsiKey(genKey, NULL, INVALID_DEVID);
13836+
wc_InitEccsiKey(genKey, HEAP_HINT, devId);
1383713837
(void)wc_MakeEccsiKey(genKey, &gRng);
1383813838
(void)wc_MakeEccsiPair(genKey, &gRng, WC_HASH_TYPE_SHA256, id, sizeof(id),
1383913839
ssk, pvt);
@@ -13898,7 +13898,7 @@ void bench_eccsi(void)
1389813898

1389913899
(void)mp_init(ssk);
1390013900
pvt = wc_ecc_new_point();
13901-
(void)wc_InitEccsiKey(genKey, NULL, INVALID_DEVID);
13901+
(void)wc_InitEccsiKey(genKey, HEAP_HINT, devId);
1390213902
(void)wc_MakeEccsiKey(genKey, &gRng);
1390313903
(void)wc_MakeEccsiPair(genKey, &gRng, WC_HASH_TYPE_SHA256, id, sizeof(id),
1390413904
ssk, pvt);
@@ -13989,7 +13989,7 @@ void bench_sakkeKeyGen(void)
1398913989
bench_stats_start(&count, &start);
1399013990
do {
1399113991
for (i = 0; i < genTimes; i++) {
13992-
wc_InitSakkeKey_ex(genKey, 128, ECC_SAKKE_1, NULL, INVALID_DEVID);
13992+
wc_InitSakkeKey_ex(genKey, 128, ECC_SAKKE_1, HEAP_HINT, devId);
1399313993
ret = wc_MakeSakkeKey(genKey, &gRng);
1399413994
if (ret != 0) {
1399513995
printf("wc_MakeSakkeKey failed: %d\n", ret);
@@ -14031,7 +14031,7 @@ void bench_sakkeRskGen(void)
1403114031
WC_ALLOC_VAR(genKey, SakkeKey, 1, HEAP_HINT);
1403214032

1403314033
rsk = wc_ecc_new_point();
14034-
wc_InitSakkeKey_ex(genKey, 128, ECC_SAKKE_1, NULL, INVALID_DEVID);
14034+
wc_InitSakkeKey_ex(genKey, 128, ECC_SAKKE_1, HEAP_HINT, devId);
1403514035
(void)wc_MakeSakkeKey(genKey, &gRng);
1403614036

1403714037
/* RSK Gen */
@@ -14084,7 +14084,7 @@ void bench_sakkeValidate(void)
1408414084
WC_ALLOC_VAR(genKey, SakkeKey, 1, HEAP_HINT);
1408514085

1408614086
rsk = wc_ecc_new_point();
14087-
(void)wc_InitSakkeKey_ex(genKey, 128, ECC_SAKKE_1, NULL, INVALID_DEVID);
14087+
(void)wc_InitSakkeKey_ex(genKey, 128, ECC_SAKKE_1, HEAP_HINT, devId);
1408814088
(void)wc_MakeSakkeKey(genKey, &gRng);
1408914089
(void)wc_MakeSakkeRsk(genKey, id, sizeof(id), rsk);
1409014090
(void)wc_ValidateSakkeRsk(genKey, id, sizeof(id), rsk, &valid);
@@ -14148,7 +14148,7 @@ void bench_sakke(void)
1414814148
XMEMCPY(ssv, ssv_init, sizeof ssv);
1414914149

1415014150
rsk = wc_ecc_new_point();
14151-
(void)wc_InitSakkeKey_ex(genKey, 128, ECC_SAKKE_1, NULL, INVALID_DEVID);
14151+
(void)wc_InitSakkeKey_ex(genKey, 128, ECC_SAKKE_1, HEAP_HINT, devId);
1415214152
(void)wc_MakeSakkeKey(genKey, &gRng);
1415314153
(void)wc_MakeSakkeRsk(genKey, id, sizeof(id), rsk);
1415414154
(void)wc_SetSakkeRsk(genKey, rsk, NULL, 0);
@@ -14375,9 +14375,9 @@ void bench_falconKeySign(byte level)
1437514375

1437614376
bench_stats_prepare();
1437714377

14378-
ret = wc_falcon_init(&key);
14378+
ret = wc_falcon_init_ex(&key, HEAP_HINT, devId);
1437914379
if (ret != 0) {
14380-
printf("wc_falcon_init failed %d\n", ret);
14380+
printf("wc_falcon_init_ex failed %d\n", ret);
1438114381
return;
1438214382
}
1438314383

0 commit comments

Comments
 (0)