Skip to content

Commit 306fa9a

Browse files
committed
chore: realign function names in crypto_hash bench with upstream
We'll also do the same for Dash-specific tests to adopt the same style but this means our upstream portions now mirror 1:1.
1 parent 3bdc15a commit 306fa9a

File tree

1 file changed

+46
-46
lines changed

1 file changed

+46
-46
lines changed

src/bench/crypto_hash.cpp

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/* Number of bytes to hash per iteration */
2121
static const uint64_t BUFFER_SIZE = 1000*1000;
2222

23-
static void HASH_1MB_RIPEMD160(benchmark::Bench& bench)
23+
static void BenchRIPEMD160(benchmark::Bench& bench)
2424
{
2525
uint8_t hash[CRIPEMD160::OUTPUT_SIZE];
2626
std::vector<uint8_t> in(BUFFER_SIZE,0);
@@ -29,7 +29,7 @@ static void HASH_1MB_RIPEMD160(benchmark::Bench& bench)
2929
});
3030
}
3131

32-
static void HASH_1MB_SHA1(benchmark::Bench& bench)
32+
static void SHA1(benchmark::Bench& bench)
3333
{
3434
uint8_t hash[CSHA1::OUTPUT_SIZE];
3535
std::vector<uint8_t> in(BUFFER_SIZE,0);
@@ -38,7 +38,7 @@ static void HASH_1MB_SHA1(benchmark::Bench& bench)
3838
});
3939
}
4040

41-
static void HASH_1MB_SHA256(benchmark::Bench& bench)
41+
static void SHA256(benchmark::Bench& bench)
4242
{
4343
uint8_t hash[CSHA256::OUTPUT_SIZE];
4444
std::vector<uint8_t> in(BUFFER_SIZE,0);
@@ -47,7 +47,7 @@ static void HASH_1MB_SHA256(benchmark::Bench& bench)
4747
});
4848
}
4949

50-
static void HASH_1MB_SHA3_256(benchmark::Bench& bench)
50+
static void SHA3_256_1M(benchmark::Bench& bench)
5151
{
5252
uint8_t hash[SHA3_256::OUTPUT_SIZE];
5353
std::vector<uint8_t> in(BUFFER_SIZE,0);
@@ -56,7 +56,7 @@ static void HASH_1MB_SHA3_256(benchmark::Bench& bench)
5656
});
5757
}
5858

59-
static void HASH_SHA256_32b(benchmark::Bench& bench)
59+
static void SHA256_32b(benchmark::Bench& bench)
6060
{
6161
std::vector<uint8_t> in(32,0);
6262
bench.batch(in.size()).unit("byte").run([&] {
@@ -66,15 +66,15 @@ static void HASH_SHA256_32b(benchmark::Bench& bench)
6666
});
6767
}
6868

69-
static void HASH_SHA256D64_1024(benchmark::Bench& bench)
69+
static void SHA256D64_1024(benchmark::Bench& bench)
7070
{
7171
std::vector<uint8_t> in(64 * 1024, 0);
7272
bench.batch(in.size()).unit("byte").run([&] {
7373
SHA256D64(in.data(), in.data(), 1024);
7474
});
7575
}
7676

77-
static void HASH_1MB_SHA512(benchmark::Bench& bench)
77+
static void SHA512(benchmark::Bench& bench)
7878
{
7979
uint8_t hash[CSHA512::OUTPUT_SIZE];
8080
std::vector<uint8_t> in(BUFFER_SIZE,0);
@@ -83,7 +83,7 @@ static void HASH_1MB_SHA512(benchmark::Bench& bench)
8383
});
8484
}
8585

86-
static void HASH_SipHash_32b(benchmark::Bench& bench)
86+
static void SipHash_32b(benchmark::Bench& bench)
8787
{
8888
uint256 x;
8989
uint64_t k1 = 0;
@@ -152,15 +152,15 @@ static void MuHashPrecompute(benchmark::Bench& bench)
152152
});
153153
}
154154

155-
BENCHMARK(HASH_1MB_RIPEMD160);
156-
BENCHMARK(HASH_1MB_SHA1);
157-
BENCHMARK(HASH_1MB_SHA256);
158-
BENCHMARK(HASH_1MB_SHA512);
159-
BENCHMARK(HASH_1MB_SHA3_256);
155+
BENCHMARK(BenchRIPEMD160);
156+
BENCHMARK(SHA1);
157+
BENCHMARK(SHA256);
158+
BENCHMARK(SHA512);
159+
BENCHMARK(SHA3_256_1M);
160160

161-
BENCHMARK(HASH_SHA256_32b);
162-
BENCHMARK(HASH_SipHash_32b);
163-
BENCHMARK(HASH_SHA256D64_1024);
161+
BENCHMARK(SHA256_32b);
162+
BENCHMARK(SipHash_32b);
163+
BENCHMARK(SHA256D64_1024);
164164
BENCHMARK(FastRandom_32bit);
165165
BENCHMARK(FastRandom_1bit);
166166

@@ -171,7 +171,7 @@ BENCHMARK(MuHashPrecompute);
171171

172172
/* --------------------------- Dash-specific tests start here --------------------------- */
173173

174-
static void HASH_1MB_DSHA256(benchmark::Bench& bench)
174+
static void DSHA256_1M(benchmark::Bench& bench)
175175
{
176176
uint8_t hash[CSHA256::OUTPUT_SIZE];
177177
std::vector<uint8_t> in(BUFFER_SIZE,0);
@@ -180,7 +180,7 @@ static void HASH_1MB_DSHA256(benchmark::Bench& bench)
180180
});
181181
}
182182

183-
static void HASH_1MB_X11(benchmark::Bench& bench)
183+
static void X11_1M(benchmark::Bench& bench)
184184
{
185185
uint256 hash;
186186
std::vector<uint8_t> in(BUFFER_SIZE,0);
@@ -190,7 +190,7 @@ static void HASH_1MB_X11(benchmark::Bench& bench)
190190
}
191191

192192
/* Hash different number of bytes via DSHA256 */
193-
static void HASH_DSHA256_0032b_single(benchmark::Bench& bench)
193+
static void DSHA256_0032b_single(benchmark::Bench& bench)
194194
{
195195
uint8_t hash[CSHA256::OUTPUT_SIZE];
196196
std::vector<uint8_t> in(32,0);
@@ -199,7 +199,7 @@ static void HASH_DSHA256_0032b_single(benchmark::Bench& bench)
199199
});
200200
}
201201

202-
static void HASH_DSHA256_0080b_single(benchmark::Bench& bench)
202+
static void DSHA256_0080b_single(benchmark::Bench& bench)
203203
{
204204
uint8_t hash[CSHA256::OUTPUT_SIZE];
205205
std::vector<uint8_t> in(80,0);
@@ -208,7 +208,7 @@ static void HASH_DSHA256_0080b_single(benchmark::Bench& bench)
208208
});
209209
}
210210

211-
static void HASH_DSHA256_0128b_single(benchmark::Bench& bench)
211+
static void DSHA256_0128b_single(benchmark::Bench& bench)
212212
{
213213
uint8_t hash[CSHA256::OUTPUT_SIZE];
214214
std::vector<uint8_t> in(128,0);
@@ -217,7 +217,7 @@ static void HASH_DSHA256_0128b_single(benchmark::Bench& bench)
217217
});
218218
}
219219

220-
static void HASH_DSHA256_0512b_single(benchmark::Bench& bench)
220+
static void DSHA256_0512b_single(benchmark::Bench& bench)
221221
{
222222
uint8_t hash[CSHA256::OUTPUT_SIZE];
223223
std::vector<uint8_t> in(512,0);
@@ -226,7 +226,7 @@ static void HASH_DSHA256_0512b_single(benchmark::Bench& bench)
226226
});
227227
}
228228

229-
static void HASH_DSHA256_1024b_single(benchmark::Bench& bench)
229+
static void DSHA256_1024b_single(benchmark::Bench& bench)
230230
{
231231
uint8_t hash[CSHA256::OUTPUT_SIZE];
232232
std::vector<uint8_t> in(1024,0);
@@ -235,7 +235,7 @@ static void HASH_DSHA256_1024b_single(benchmark::Bench& bench)
235235
});
236236
}
237237

238-
static void HASH_DSHA256_2048b_single(benchmark::Bench& bench)
238+
static void DSHA256_2048b_single(benchmark::Bench& bench)
239239
{
240240
uint8_t hash[CSHA256::OUTPUT_SIZE];
241241
std::vector<uint8_t> in(2048,0);
@@ -245,7 +245,7 @@ static void HASH_DSHA256_2048b_single(benchmark::Bench& bench)
245245
}
246246

247247
/* Hash different number of bytes via X11 */
248-
static void HASH_X11_0032b_single(benchmark::Bench& bench)
248+
static void X11_0032b_single(benchmark::Bench& bench)
249249
{
250250
uint256 hash;
251251
std::vector<uint8_t> in(32,0);
@@ -254,7 +254,7 @@ static void HASH_X11_0032b_single(benchmark::Bench& bench)
254254
});
255255
}
256256

257-
static void HASH_X11_0080b_single(benchmark::Bench& bench)
257+
static void X11_0080b_single(benchmark::Bench& bench)
258258
{
259259
uint256 hash;
260260
std::vector<uint8_t> in(80,0);
@@ -263,7 +263,7 @@ static void HASH_X11_0080b_single(benchmark::Bench& bench)
263263
});
264264
}
265265

266-
static void HASH_X11_0128b_single(benchmark::Bench& bench)
266+
static void X11_0128b_single(benchmark::Bench& bench)
267267
{
268268
uint256 hash;
269269
std::vector<uint8_t> in(128,0);
@@ -272,7 +272,7 @@ static void HASH_X11_0128b_single(benchmark::Bench& bench)
272272
});
273273
}
274274

275-
static void HASH_X11_0512b_single(benchmark::Bench& bench)
275+
static void X11_0512b_single(benchmark::Bench& bench)
276276
{
277277
uint256 hash;
278278
std::vector<uint8_t> in(512,0);
@@ -281,7 +281,7 @@ static void HASH_X11_0512b_single(benchmark::Bench& bench)
281281
});
282282
}
283283

284-
static void HASH_X11_1024b_single(benchmark::Bench& bench)
284+
static void X11_1024b_single(benchmark::Bench& bench)
285285
{
286286
uint256 hash;
287287
std::vector<uint8_t> in(1024,0);
@@ -290,7 +290,7 @@ static void HASH_X11_1024b_single(benchmark::Bench& bench)
290290
});
291291
}
292292

293-
static void HASH_X11_2048b_single(benchmark::Bench& bench)
293+
static void X11_2048b_single(benchmark::Bench& bench)
294294
{
295295
uint256 hash;
296296
std::vector<uint8_t> in(2048,0);
@@ -299,19 +299,19 @@ static void HASH_X11_2048b_single(benchmark::Bench& bench)
299299
});
300300
}
301301

302-
BENCHMARK(HASH_1MB_DSHA256);
303-
BENCHMARK(HASH_1MB_X11);
304-
305-
BENCHMARK(HASH_DSHA256_0032b_single);
306-
BENCHMARK(HASH_DSHA256_0080b_single);
307-
BENCHMARK(HASH_DSHA256_0128b_single);
308-
BENCHMARK(HASH_DSHA256_0512b_single);
309-
BENCHMARK(HASH_DSHA256_1024b_single);
310-
BENCHMARK(HASH_DSHA256_2048b_single);
311-
312-
BENCHMARK(HASH_X11_0032b_single);
313-
BENCHMARK(HASH_X11_0080b_single);
314-
BENCHMARK(HASH_X11_0128b_single);
315-
BENCHMARK(HASH_X11_0512b_single);
316-
BENCHMARK(HASH_X11_1024b_single);
317-
BENCHMARK(HASH_X11_2048b_single);
302+
BENCHMARK(DSHA256_1M);
303+
BENCHMARK(X11_1M);
304+
305+
BENCHMARK(DSHA256_0032b_single);
306+
BENCHMARK(DSHA256_0080b_single);
307+
BENCHMARK(DSHA256_0128b_single);
308+
BENCHMARK(DSHA256_0512b_single);
309+
BENCHMARK(DSHA256_1024b_single);
310+
BENCHMARK(DSHA256_2048b_single);
311+
312+
BENCHMARK(X11_0032b_single);
313+
BENCHMARK(X11_0080b_single);
314+
BENCHMARK(X11_0128b_single);
315+
BENCHMARK(X11_0512b_single);
316+
BENCHMARK(X11_1024b_single);
317+
BENCHMARK(X11_2048b_single);

0 commit comments

Comments
 (0)