OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests: fix output message formatting for crypto benchmarks

Browse Source 
The output was changed from g_print to g_test_message in

  commit 24441f912e
  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.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-09-09 13:01:45 +01:00
parent 9435a8b3dd
commit ca04c3cf15
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/benchmark-crypto-cipher.c
View File

@ -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);

4
tests/benchmark-crypto-hash.c
View File

@ -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);

7
tests/benchmark-crypto-hmac.c
View File

@ -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);