tests: fix output message formatting for crypto benchmarks
PATCH 1/1 tests: fix output message formatting for crypto benchmarks
The output was changed from g_print to g_test_message in
commit 24441f912e67233d9c52ce6b459ed75de2484525
Author: Marc-André Lureau <[email protected]>
Date: Fri Aug 28 15:07:30 2020 +0400
tests: do not print benchmark output to stdout
As this makes the TAP output invalid. Use g_test_message().
The functions do not result in equivalent output. The g_print statements were putting all the information on a single line for ease of interpretation. The change to g_test_message split the output across many lines making it painful to read.
The opportunity is used to tweak the information printed to be more consistent across tests.
--- tests/benchmark-crypto-cipher.c | 12 ++++++++---- tests/benchmark-crypto-hash.c | 4 +++- tests/benchmark-crypto-hmac.c | 7 +++---- 3 files changed, 14 insertions(+), 9 deletions(-)
tests/benchmark-crypto-cipher.c +8 -4
@@ -70,8 +70,10 @@ static void test_cipher_speed(size_t chunk_size, }g_test_timer_elapsed (); -g_test_message ("Enc chunk %zu bytes " , chunk_size); -g_test_message ("%.2f MB/sec " , (double )total / MiB /g_test_timer_last ()); +g_test_message ("enc(%s-%s) chunk %zu bytes %.2f MB/sec " , +QCryptoCipherAlgorithm_str (alg), +QCryptoCipherMode_str (mode), + chunk_size, (double )total / MiB /g_test_timer_last ());g_test_timer_start (); remain = total;
@@ -85,8 +87,10 @@ static void test_cipher_speed(size_t chunk_size, }g_test_timer_elapsed (); -g_test_message ("Dec chunk %zu bytes " , chunk_size); -g_test_message ("%.2f MB/sec " , (double )total / MiB /g_test_timer_last ()); +g_test_message ("dec(%s-%s) chunk %zu bytes %.2f MB/sec " , +QCryptoCipherAlgorithm_str (alg), +QCryptoCipherMode_str (mode), + chunk_size, (double )total / MiB /g_test_timer_last ());qcrypto_cipher_free (cipher);g_free (plaintext);
tests/benchmark-crypto-hash.c +3 -1
@@ -48,7 +48,9 @@ static void test_hash_speed(const void *opaque) }g_test_timer_elapsed (); -g_test_message ("%.2f MB/sec " , (double )total / MiB /g_test_timer_last ()); +g_test_message ("hash(%s): chunk %zu bytes %.2f MB/sec" , +QCryptoHashAlgorithm_str (opts->alg), + opts->chunk_size, total /g_test_timer_last ());g_free (out);g_free (in);
tests/benchmark-crypto-hmac.c +3 -4
@@ -55,10 +55,9 @@ static void test_hmac_speed(const void *opaque) }while (g_test_timer_elapsed () <5.0 ); total /= MiB; -g_test_message ("hmac(sha256): " ); -g_test_message ("Testing chunk_size %zu bytes " , chunk_size); -g_test_message ("done: %.2f MB in %.2f secs: " , total,g_test_timer_last ()); -g_test_message ("%.2f MB/sec\n" , total /g_test_timer_last ()); +g_test_message ("hmac(%s): chunk %zu bytes %.2f MB/sec" , +QCryptoHashAlgorithm_str (QCRYPTO_HASH_ALG_SHA256 ), + chunk_size, total /g_test_timer_last ());g_free (out);g_free (in);
Signature · 1 line
2.26.2
Quoted 15 lines · Daniel P. Berrangé
The output was changed from
g_printtog_test_messageincommit
24441f912e67233d9c52ce6b459ed75de2484525
Author: Marc-André Lureau <[email protected]>
Date: Fri Aug 28 15:07:30 2020 +0400tests: do not print benchmark output to stdout
As this makes the TAP output invalid. Use
g_test_message().The functions do not result in equivalent output. The
g_printstatements were putting all the information on a single line for ease of interpretation. The change tog_test_messagesplit the output across many lines making it painful to read.
Quoted 4 lines
The opportunity is used to tweak the information printed to be more consistent across tests.
Signed-off-by Daniel P. Berrangé <[email protected]>
Quoted 70 lines
--- tests/benchmark-crypto-cipher.c | 12 ++++++++---- tests/benchmark-crypto-hash.c | 4 +++- tests/benchmark-crypto-hmac.c | 7 +++---- 3 files changed, 14 insertions(+), 9 deletions(-)tests/benchmark-crypto-cipher.c +8
-4@@ -70,8 +70,10 @@ static void test_cipher_speed(size_t chunk_size, }g_test_timer_elapsed (); -g_test_message ("Enc chunk %zu bytes " , chunk_size); -g_test_message ("%.2f MB/sec " , (double )total / MiB /g_test_timer_last ()); +g_test_message ("enc(%s-%s) chunk %zu bytes %.2f MB/sec " , +QCryptoCipherAlgorithm_str (alg), +QCryptoCipherMode_str (mode), + chunk_size, (double )total / MiB /g_test_timer_last ());g_test_timer_start (); remain = total;@@ -85,8 +87,10 @@ static void test_cipher_speed(size_t chunk_size, }g_test_timer_elapsed (); -g_test_message ("Dec chunk %zu bytes " , chunk_size); -g_test_message ("%.2f MB/sec " , (double )total / MiB /g_test_timer_last ()); +g_test_message ("dec(%s-%s) chunk %zu bytes %.2f MB/sec " , +QCryptoCipherAlgorithm_str (alg), +QCryptoCipherMode_str (mode), + chunk_size, (double )total / MiB /g_test_timer_last ());qcrypto_cipher_free (cipher);g_free (plaintext);tests/benchmark-crypto-hash.c +3
-1@@ -48,7 +48,9 @@ static void test_hash_speed(const void *opaque) }g_test_timer_elapsed (); -g_test_message ("%.2f MB/sec " , (double )total / MiB /g_test_timer_last ()); +g_test_message ("hash(%s): chunk %zu bytes %.2f MB/sec" , +QCryptoHashAlgorithm_str (opts->alg), + opts->chunk_size, total /g_test_timer_last ());g_free (out);g_free (in);tests/benchmark-crypto-hmac.c +3
-4@@ -55,10 +55,9 @@ static void test_hmac_speed(const void *opaque) }while (g_test_timer_elapsed () <5.0 ); total /= MiB; -g_test_message ("hmac(sha256): " ); -g_test_message ("Testing chunk_size %zu bytes " , chunk_size); -g_test_message ("done: %.2f MB in %.2f secs: " , total,g_test_timer_last ()); -g_test_message ("%.2f MB/sec\n" , total /g_test_timer_last ()); +g_test_message ("hmac(%s): chunk %zu bytes %.2f MB/sec" , +QCryptoHashAlgorithm_str (QCRYPTO_HASH_ALG_SHA256 ), + chunk_size, total /g_test_timer_last ());g_free (out);g_free (in);