* [PATCH] crypto: extend hash benchmark to cover more algorithms
@ 2019-09-27 10:11 Daniel P. Berrangé
0 siblings, 0 replies; 3+ messages in thread
From: Daniel P. Berrangé @ 2019-09-27 10:11 UTC (permalink / raw)
To: qemu-devel; +Cc: Daniel P. Berrangé
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/benchmark-crypto-hash.c | 75 +++++++++++++++++++++++++++--------
1 file changed, 59 insertions(+), 16 deletions(-)
diff --git a/tests/benchmark-crypto-hash.c b/tests/benchmark-crypto-hash.c
index 9b6f7a9155..948a0be3c6 100644
--- a/tests/benchmark-crypto-hash.c
+++ b/tests/benchmark-crypto-hash.c
@@ -15,36 +15,38 @@
#include "crypto/init.h"
#include "crypto/hash.h"
+typedef struct QCryptoHashOpts {
+ size_t chunk_size;
+ QCryptoHashAlgorithm alg;
+} QCryptoHashOpts;
+
static void test_hash_speed(const void *opaque)
{
- size_t chunk_size = (size_t)opaque;
+ const QCryptoHashOpts *opts = opaque;
uint8_t *in = NULL, *out = NULL;
size_t out_len = 0;
double total = 0.0;
struct iovec iov;
int ret;
- in = g_new0(uint8_t, chunk_size);
- memset(in, g_test_rand_int(), chunk_size);
+ in = g_new0(uint8_t, opts->chunk_size);
+ memset(in, g_test_rand_int(), opts->chunk_size);
iov.iov_base = (char *)in;
- iov.iov_len = chunk_size;
+ iov.iov_len = opts->chunk_size;
g_test_timer_start();
do {
- ret = qcrypto_hash_bytesv(QCRYPTO_HASH_ALG_SHA256,
+ ret = qcrypto_hash_bytesv(opts->alg,
&iov, 1, &out, &out_len,
NULL);
g_assert(ret == 0);
- total += chunk_size;
+ total += opts->chunk_size;
} while (g_test_timer_elapsed() < 5.0);
total /= MiB;
- g_print("sha256: ");
- g_print("Testing chunk_size %zu bytes ", chunk_size);
- g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
- g_print("%.2f MB/sec\n", total / g_test_timer_last());
+ g_print("%.2f MB/sec ", total / g_test_timer_last());
g_free(out);
g_free(in);
@@ -52,17 +54,58 @@ static void test_hash_speed(const void *opaque)
int main(int argc, char **argv)
{
- size_t i;
char name[64];
g_test_init(&argc, &argv, NULL);
g_assert(qcrypto_init(NULL) == 0);
- for (i = 512; i <= 64 * KiB; i *= 2) {
- memset(name, 0 , sizeof(name));
- snprintf(name, sizeof(name), "/crypto/hash/speed-%zu", i);
- g_test_add_data_func(name, (void *)i, test_hash_speed);
- }
+#define TEST_ONE(a, c) \
+ QCryptoHashOpts opts ## a ## c = { \
+ .alg = QCRYPTO_HASH_ALG_ ## a, .chunk_size = c, \
+ }; \
+ memset(name, 0 , sizeof(name)); \
+ snprintf(name, sizeof(name), \
+ "/crypto/hash/%s/speed-%d", \
+ QCryptoHashAlgorithm_str(QCRYPTO_HASH_ALG_ ## a), \
+ c); \
+ g_test_add_data_func(name, \
+ &opts ## a ## c, \
+ test_hash_speed);
+
+ TEST_ONE(MD5, 512);
+ TEST_ONE(MD5, 1024);
+ TEST_ONE(MD5, 4096);
+ TEST_ONE(MD5, 16384);
+
+ TEST_ONE(SHA1, 512);
+ TEST_ONE(SHA1, 1024);
+ TEST_ONE(SHA1, 4096);
+ TEST_ONE(SHA1, 16384);
+
+ TEST_ONE(SHA224, 512);
+ TEST_ONE(SHA224, 1024);
+ TEST_ONE(SHA224, 4096);
+ TEST_ONE(SHA224, 16384);
+
+ TEST_ONE(SHA384, 512);
+ TEST_ONE(SHA384, 1024);
+ TEST_ONE(SHA384, 4096);
+ TEST_ONE(SHA384, 16384);
+
+ TEST_ONE(SHA256, 512);
+ TEST_ONE(SHA256, 1024);
+ TEST_ONE(SHA256, 4096);
+ TEST_ONE(SHA256, 16384);
+
+ TEST_ONE(SHA512, 512);
+ TEST_ONE(SHA512, 1024);
+ TEST_ONE(SHA512, 4096);
+ TEST_ONE(SHA512, 16384);
+
+ TEST_ONE(RIPEMD160, 512);
+ TEST_ONE(RIPEMD160, 1024);
+ TEST_ONE(RIPEMD160, 4096);
+ TEST_ONE(RIPEMD160, 16384);
return g_test_run();
}
--
2.21.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] crypto: extend hash benchmark to cover more algorithms
@ 2020-05-06 13:51 Daniel P. Berrangé
2020-05-06 14:29 ` Eric Blake
0 siblings, 1 reply; 3+ messages in thread
From: Daniel P. Berrangé @ 2020-05-06 13:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Daniel P. Berrangé
Extend the hash benchmark so that it can validate all algorithms
supported by QEMU instead of being limited to sha256.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/benchmark-crypto-hash.c | 73 ++++++++++++++++++++++++++++-------
1 file changed, 59 insertions(+), 14 deletions(-)
diff --git a/tests/benchmark-crypto-hash.c b/tests/benchmark-crypto-hash.c
index 7f659f7323..d16837d00a 100644
--- a/tests/benchmark-crypto-hash.c
+++ b/tests/benchmark-crypto-hash.c
@@ -15,9 +15,14 @@
#include "crypto/init.h"
#include "crypto/hash.h"
+typedef struct QCryptoHashOpts {
+ size_t chunk_size;
+ QCryptoHashAlgorithm alg;
+} QCryptoHashOpts;
+
static void test_hash_speed(const void *opaque)
{
- size_t chunk_size = (size_t)opaque;
+ const QCryptoHashOpts *opts = opaque;
uint8_t *in = NULL, *out = NULL;
size_t out_len = 0;
const size_t total = 2 * GiB;
@@ -25,26 +30,24 @@ static void test_hash_speed(const void *opaque)
struct iovec iov;
int ret;
- in = g_new0(uint8_t, chunk_size);
- memset(in, g_test_rand_int(), chunk_size);
+ in = g_new0(uint8_t, opts->chunk_size);
+ memset(in, g_test_rand_int(), opts->chunk_size);
iov.iov_base = (char *)in;
- iov.iov_len = chunk_size;
+ iov.iov_len = opts->chunk_size;
g_test_timer_start();
remain = total;
while (remain) {
- ret = qcrypto_hash_bytesv(QCRYPTO_HASH_ALG_SHA256,
+ ret = qcrypto_hash_bytesv(opts->alg,
&iov, 1, &out, &out_len,
NULL);
g_assert(ret == 0);
- remain -= chunk_size;
+ remain -= opts->chunk_size;
}
g_test_timer_elapsed();
- g_print("sha256: ");
- g_print("Hash %zu GB chunk size %zu bytes ", total / GiB, chunk_size);
g_print("%.2f MB/sec ", (double)total / MiB / g_test_timer_last());
g_free(out);
@@ -53,17 +56,59 @@ static void test_hash_speed(const void *opaque)
int main(int argc, char **argv)
{
- size_t i;
char name[64];
g_test_init(&argc, &argv, NULL);
g_assert(qcrypto_init(NULL) == 0);
- for (i = 512; i <= 64 * KiB; i *= 2) {
- memset(name, 0 , sizeof(name));
- snprintf(name, sizeof(name), "/crypto/hash/speed-%zu", i);
- g_test_add_data_func(name, (void *)i, test_hash_speed);
- }
+#define TEST_ONE(a, c) \
+ QCryptoHashOpts opts ## a ## c = { \
+ .alg = QCRYPTO_HASH_ALG_ ## a, .chunk_size = c, \
+ }; \
+ memset(name, 0 , sizeof(name)); \
+ snprintf(name, sizeof(name), \
+ "/crypto/benchmark/hash/%s/bufsize-%d", \
+ QCryptoHashAlgorithm_str(QCRYPTO_HASH_ALG_ ## a), \
+ c); \
+ if (qcrypto_hash_supports(QCRYPTO_HASH_ALG_ ## a)) \
+ g_test_add_data_func(name, \
+ &opts ## a ## c, \
+ test_hash_speed);
+
+ TEST_ONE(MD5, 512);
+ TEST_ONE(MD5, 1024);
+ TEST_ONE(MD5, 4096);
+ TEST_ONE(MD5, 16384);
+
+ TEST_ONE(SHA1, 512);
+ TEST_ONE(SHA1, 1024);
+ TEST_ONE(SHA1, 4096);
+ TEST_ONE(SHA1, 16384);
+
+ TEST_ONE(SHA224, 512);
+ TEST_ONE(SHA224, 1024);
+ TEST_ONE(SHA224, 4096);
+ TEST_ONE(SHA224, 16384);
+
+ TEST_ONE(SHA384, 512);
+ TEST_ONE(SHA384, 1024);
+ TEST_ONE(SHA384, 4096);
+ TEST_ONE(SHA384, 16384);
+
+ TEST_ONE(SHA256, 512);
+ TEST_ONE(SHA256, 1024);
+ TEST_ONE(SHA256, 4096);
+ TEST_ONE(SHA256, 16384);
+
+ TEST_ONE(SHA512, 512);
+ TEST_ONE(SHA512, 1024);
+ TEST_ONE(SHA512, 4096);
+ TEST_ONE(SHA512, 16384);
+
+ TEST_ONE(RIPEMD160, 512);
+ TEST_ONE(RIPEMD160, 1024);
+ TEST_ONE(RIPEMD160, 4096);
+ TEST_ONE(RIPEMD160, 16384);
return g_test_run();
}
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] crypto: extend hash benchmark to cover more algorithms
2020-05-06 13:51 Daniel P. Berrangé
@ 2020-05-06 14:29 ` Eric Blake
0 siblings, 0 replies; 3+ messages in thread
From: Eric Blake @ 2020-05-06 14:29 UTC (permalink / raw)
To: Daniel P. Berrangé, qemu-devel
On 5/6/20 8:51 AM, Daniel P. Berrangé wrote:
> Extend the hash benchmark so that it can validate all algorithms
> supported by QEMU instead of being limited to sha256.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
> tests/benchmark-crypto-hash.c | 73 ++++++++++++++++++++++++++++-------
> 1 file changed, 59 insertions(+), 14 deletions(-)
>
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-06 14:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-27 10:11 [PATCH] crypto: extend hash benchmark to cover more algorithms Daniel P. Berrangé
-- strict thread matches above, loose matches on Subject: below --
2020-05-06 13:51 Daniel P. Berrangé
2020-05-06 14:29 ` Eric Blake
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).