Skip to content

Commit 2c72484

Browse files
author
Lealem Amedie
committed
Rename macro
1 parent ac89c90 commit 2c72484

1 file changed

Lines changed: 35 additions & 35 deletions

File tree

‎wolfcrypt/benchmark/benchmark.c‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -255,15 +255,15 @@
255255
squareSum += delta * delta;\
256256
runs++;\
257257
prev = current_time(0)
258-
#define RESET_MULTI_VALUE_STATS() prev = 0;\
258+
#define RESET_MULTI_VALUE_STATS_VARS() prev = 0;\
259259
runs = 0;\
260260
sum = 0;\
261261
squareSum = 0
262262
#else
263263
#define STATS_CLAUSE_SEPARATOR "\n"
264264
#define DECLARE_MULTI_VALUE_STATS_VARS()
265265
#define RECORD_MULTI_VALUE_STATS() WC_DO_NOTHING
266-
#define RESET_MULTI_VALUE_STATS() WC_DO_NOTHING
266+
#define RESET_MULTI_VALUE_STATS_VARS() WC_DO_NOTHING
267267
#endif
268268

269269
#ifdef WOLFSSL_NO_FLOAT_FMT
@@ -3824,7 +3824,7 @@ static void bench_aescbc_internal(int useDeviceID,
38243824
}
38253825
}
38263826

3827-
RESET_MULTI_VALUE_STATS();
3827+
RESET_MULTI_VALUE_STATS_VARS();
38283828

38293829
bench_stats_start(&count, &start);
38303830
do {
@@ -3986,7 +3986,7 @@ static void bench_aesgcm_internal(int useDeviceID,
39863986
#ifdef HAVE_AES_DECRYPT
39873987
XMEMSET(dec, 0, sizeof(dec));
39883988

3989-
RESET_MULTI_VALUE_STATS();
3989+
RESET_MULTI_VALUE_STATS_VARS();
39903990

39913991
/* init keys */
39923992
for (i = 0; i < BENCH_MAX_PENDING; i++) {
@@ -4168,7 +4168,7 @@ static void bench_aesgcm_stream_internal(int useDeviceID,
41684168
}
41694169
}
41704170

4171-
RESET_MULTI_VALUE_STATS();
4171+
RESET_MULTI_VALUE_STATS_VARS();
41724172

41734173
bench_stats_start(&count, &start);
41744174
do {
@@ -4425,7 +4425,7 @@ static void bench_aesecb_internal(int useDeviceID,
44254425
}
44264426
}
44274427

4428-
RESET_MULTI_VALUE_STATS();
4428+
RESET_MULTI_VALUE_STATS_VARS();
44294429

44304430
bench_stats_start(&count, &start);
44314431
do {
@@ -4666,7 +4666,7 @@ void bench_aesxts(void)
46664666
return;
46674667
}
46684668

4669-
RESET_MULTI_VALUE_STATS();
4669+
RESET_MULTI_VALUE_STATS_VARS();
46704670

46714671
bench_stats_start(&count, &start);
46724672
do {
@@ -4811,7 +4811,7 @@ void bench_aesccm(int useDeviceID)
48114811
goto exit;
48124812
}
48134813

4814-
RESET_MULTI_VALUE_STATS();
4814+
RESET_MULTI_VALUE_STATS_VARS();
48154815

48164816
bench_stats_start(&count, &start);
48174817
do {
@@ -4883,7 +4883,7 @@ static void bench_aessiv_internal(const byte* key, word32 keySz, const char*
48834883
bench_multi_value_stats(max, min, sum, squareSum, runs);
48844884
#endif
48854885

4886-
RESET_MULTI_VALUE_STATS();
4886+
RESET_MULTI_VALUE_STATS_VARS();
48874887

48884888
bench_stats_start(&count, &start);
48894889
do {
@@ -5068,7 +5068,7 @@ void bench_sm4_cbc(void)
50685068
bench_multi_value_stats(max, min, sum, squareSum, runs);
50695069
#endif
50705070

5071-
RESET_MULTI_VALUE_STATS();
5071+
RESET_MULTI_VALUE_STATS_VARS();
50725072

50735073
bench_stats_start(&count, &start);
50745074
do {
@@ -5143,7 +5143,7 @@ void bench_sm4_gcm(void)
51435143
bench_multi_value_stats(max, min, sum, squareSum, runs);
51445144
#endif
51455145

5146-
RESET_MULTI_VALUE_STATS();
5146+
RESET_MULTI_VALUE_STATS_VARS();
51475147

51485148
bench_stats_start(&count, &start);
51495149
do {
@@ -5221,7 +5221,7 @@ void bench_sm4_ccm()
52215221
goto exit;
52225222
}
52235223

5224-
RESET_MULTI_VALUE_STATS();
5224+
RESET_MULTI_VALUE_STATS_VARS();
52255225

52265226
bench_stats_start(&count, &start);
52275227
do {
@@ -7693,7 +7693,7 @@ void bench_siphash(void)
76937693
bench_multi_value_stats(max, min, sum, squareSum, runs);
76947694
#endif
76957695

7696-
RESET_MULTI_VALUE_STATS();
7696+
RESET_MULTI_VALUE_STATS_VARS();
76977697

76987698
bench_stats_start(&count, &start);
76997699
do {
@@ -7752,7 +7752,7 @@ void bench_srtpkdf(void)
77527752
bench_multi_value_stats(max, min, sum, squareSum, runs);
77537753
#endif
77547754

7755-
RESET_MULTI_VALUE_STATS();
7755+
RESET_MULTI_VALUE_STATS_VARS();
77567756

77577757
bench_stats_start(&count, &start);
77587758
do {
@@ -7773,7 +7773,7 @@ void bench_srtpkdf(void)
77737773
bench_multi_value_stats(max, min, sum, squareSum, runs);
77747774
#endif
77757775

7776-
RESET_MULTI_VALUE_STATS();
7776+
RESET_MULTI_VALUE_STATS_VARS();
77777777

77787778
bench_stats_start(&count, &start);
77797779
do {
@@ -7794,7 +7794,7 @@ void bench_srtpkdf(void)
77947794
bench_multi_value_stats(max, min, sum, squareSum, runs);
77957795
#endif
77967796

7797-
RESET_MULTI_VALUE_STATS();
7797+
RESET_MULTI_VALUE_STATS_VARS();
77987798

77997799
bench_stats_start(&count, &start);
78007800
do {
@@ -8124,7 +8124,7 @@ static void bench_rsa_helper(int useDeviceID, RsaKey rsaKey[BENCH_MAX_PENDING],
81248124
goto exit;
81258125
}
81268126

8127-
RESET_MULTI_VALUE_STATS();
8127+
RESET_MULTI_VALUE_STATS_VARS();
81288128

81298129
/* capture resulting encrypt length */
81308130
idx = (word32)(rsaKeySz/8);
@@ -8207,7 +8207,7 @@ static void bench_rsa_helper(int useDeviceID, RsaKey rsaKey[BENCH_MAX_PENDING],
82078207
goto exit;
82088208
}
82098209

8210-
RESET_MULTI_VALUE_STATS();
8210+
RESET_MULTI_VALUE_STATS_VARS();
82118211

82128212
#endif /* !WOLFSSL_RSA_PUBLIC_ONLY && !WOLFSSL_RSA_VERIFY_ONLY */
82138213

@@ -8707,7 +8707,7 @@ void bench_dh(int useDeviceID)
87078707
goto exit;
87088708
}
87098709

8710-
RESET_MULTI_VALUE_STATS();
8710+
RESET_MULTI_VALUE_STATS_VARS();
87118711

87128712
/* Generate key to use as other public */
87138713
PRIVATE_KEY_UNLOCK();
@@ -8864,7 +8864,7 @@ static void bench_kyber_encap(const char* name, int keySize, KyberKey* key)
88648864
bench_multi_value_stats(max, min, sum, squareSum, runs);
88658865
#endif
88668866

8867-
RESET_MULTI_VALUE_STATS();
8867+
RESET_MULTI_VALUE_STATS_VARS();
88688868

88698869
/* KYBER Decapsulate */
88708870
bench_stats_start(&count, &start);
@@ -9254,7 +9254,7 @@ static void bench_lms_sign_verify(enum wc_LmsParm parm)
92549254
bench_multi_value_stats(max, min, sum, squareSum, runs);
92559255
#endif
92569256

9257-
RESET_MULTI_VALUE_STATS();
9257+
RESET_MULTI_VALUE_STATS_VARS();
92589258
count = 0;
92599259
bench_stats_start(&count, &start);
92609260

@@ -9820,7 +9820,7 @@ void bench_ecc(int useDeviceID, int curveId)
98209820
bench_multi_value_stats(max, min, sum, squareSum, runs);
98219821
#endif
98229822

9823-
RESET_MULTI_VALUE_STATS();
9823+
RESET_MULTI_VALUE_STATS_VARS();
98249824

98259825
if (ret < 0) {
98269826
goto exit;
@@ -9881,7 +9881,7 @@ void bench_ecc(int useDeviceID, int curveId)
98819881
bench_multi_value_stats(max, min, sum, squareSum, runs);
98829882
#endif
98839883

9884-
RESET_MULTI_VALUE_STATS();
9884+
RESET_MULTI_VALUE_STATS_VARS();
98859885

98869886
if (ret < 0) {
98879887
goto exit;
@@ -10082,7 +10082,7 @@ void bench_eccEncrypt(int curveId)
1008210082
bench_multi_value_stats(max, min, sum, squareSum, runs);
1008310083
#endif
1008410084

10085-
RESET_MULTI_VALUE_STATS();
10085+
RESET_MULTI_VALUE_STATS_VARS();
1008610086

1008710087
bench_stats_start(&count, &start);
1008810088
do {
@@ -10337,7 +10337,7 @@ void bench_sm2(int useDeviceID)
1033710337
}
1033810338
}
1033910339

10340-
RESET_MULTI_VALUE_STATS();
10340+
RESET_MULTI_VALUE_STATS_VARS();
1034110341

1034210342
/* ECC Sign */
1034310343
bench_stats_start(&count, &start);
@@ -10649,7 +10649,7 @@ void bench_ed25519KeySign(void)
1064910649
bench_multi_value_stats(max, min, sum, squareSum, runs);
1065010650
#endif
1065110651

10652-
RESET_MULTI_VALUE_STATS();
10652+
RESET_MULTI_VALUE_STATS_VARS();
1065310653

1065410654
#ifdef HAVE_ED25519_VERIFY
1065510655
bench_stats_start(&count, &start);
@@ -10858,7 +10858,7 @@ void bench_ed448KeySign(void)
1085810858
bench_multi_value_stats(max, min, sum, squareSum, runs);
1085910859
#endif
1086010860

10861-
RESET_MULTI_VALUE_STATS();
10861+
RESET_MULTI_VALUE_STATS_VARS();
1086210862

1086310863
#ifdef HAVE_ED448_VERIFY
1086410864
bench_stats_start(&count, &start);
@@ -11080,7 +11080,7 @@ void bench_eccsi(void)
1108011080
bench_multi_value_stats(max, min, sum, squareSum, runs);
1108111081
#endif
1108211082

11083-
RESET_MULTI_VALUE_STATS();
11083+
RESET_MULTI_VALUE_STATS_VARS();
1108411084

1108511085
/* Derive */
1108611086
bench_stats_start(&count, &start);
@@ -11296,7 +11296,7 @@ void bench_sakke(void)
1129611296
bench_multi_value_stats(max, min, sum, squareSum, runs);
1129711297
#endif
1129811298

11299-
RESET_MULTI_VALUE_STATS();
11299+
RESET_MULTI_VALUE_STATS_VARS();
1130011300

1130111301
/* Derive */
1130211302
bench_stats_start(&count, &start);
@@ -11360,7 +11360,7 @@ void bench_sakke(void)
1136011360
bench_multi_value_stats(max, min, sum, squareSum, runs);
1136111361
#endif
1136211362

11363-
RESET_MULTI_VALUE_STATS();
11363+
RESET_MULTI_VALUE_STATS_VARS();
1136411364

1136511365
(void)wc_SetSakkeRsk(&genKey, rsk, table, len);
1136611366

@@ -11391,7 +11391,7 @@ void bench_sakke(void)
1139111391
bench_multi_value_stats(max, min, sum, squareSum, runs);
1139211392
#endif
1139311393

11394-
RESET_MULTI_VALUE_STATS();
11394+
RESET_MULTI_VALUE_STATS_VARS();
1139511395

1139611396
len = 0;
1139711397
(void)wc_GenerateSakkeRskTable(&genKey, rsk, NULL, &len);
@@ -11428,7 +11428,7 @@ void bench_sakke(void)
1142811428
bench_multi_value_stats(max, min, sum, squareSum, runs);
1142911429
#endif
1143011430

11431-
RESET_MULTI_VALUE_STATS();
11431+
RESET_MULTI_VALUE_STATS_VARS();
1143211432

1143311433
wc_ClearSakkePointITable(&genKey);
1143411434
/* Derive with RSK table */
@@ -11544,7 +11544,7 @@ void bench_falconKeySign(byte level)
1154411544
#endif
1154511545
}
1154611546

11547-
RESET_MULTI_VALUE_STATS();
11547+
RESET_MULTI_VALUE_STATS_VARS();
1154811548

1154911549
bench_stats_start(&count, &start);
1155011550
do {
@@ -11665,7 +11665,7 @@ void bench_dilithiumKeySign(byte level)
1166511665
#endif
1166611666
}
1166711667

11668-
RESET_MULTI_VALUE_STATS();
11668+
RESET_MULTI_VALUE_STATS_VARS();
1166911669

1167011670
bench_stats_start(&count, &start);
1167111671
do {
@@ -11817,7 +11817,7 @@ void bench_sphincsKeySign(byte level, byte optim)
1181711817
#endif
1181811818
}
1181911819

11820-
RESET_MULTI_VALUE_STATS();
11820+
RESET_MULTI_VALUE_STATS_VARS();
1182111821

1182211822
bench_stats_start(&count, &start);
1182311823
do {

0 commit comments

Comments
 (0)