[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] tests: fix output message formatting for crypto benchmarks
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH] tests: fix output message formatting for crypto benchmarks |
Date: |
Wed, 9 Sep 2020 14:54:12 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 |
On 9/9/20 2:10 PM, Daniel P. Berrangé wrote:
> The output was changed from g_print to g_test_message in
>
> commit 24441f912e67233d9c52ce6b459ed75de2484525
> Author: Marc-André Lureau <marcandre.lureau@redhat.com>
> 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.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> 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(-)
>
> diff --git a/tests/benchmark-crypto-cipher.c b/tests/benchmark-crypto-cipher.c
> index 1936aa4ae0..c04f0a0fba 100644
> --- a/tests/benchmark-crypto-cipher.c
> +++ b/tests/benchmark-crypto-cipher.c
> @@ -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);
> diff --git a/tests/benchmark-crypto-hash.c b/tests/benchmark-crypto-hash.c
> index 598111e75a..927b00bb4d 100644
> --- a/tests/benchmark-crypto-hash.c
> +++ b/tests/benchmark-crypto-hash.c
> @@ -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);
> diff --git a/tests/benchmark-crypto-hmac.c b/tests/benchmark-crypto-hmac.c
> index f9fa22df95..5cca636789 100644
> --- a/tests/benchmark-crypto-hmac.c
> +++ b/tests/benchmark-crypto-hmac.c
> @@ -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);
>