Commit 68dbb6d0 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

tests/crypto: Use the IEC binary prefix definitions 



It eases code review, unit is explicit.

Patch generated using:

  $ git grep -n '[<>][<>]= ?[1-5]0'

and modified manually.

Suggested-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180625124238.25339-45-f4bug@amsat.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3dc54b0e

tests/benchmark-crypto-cipher.c

+3 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 * top-level directory.

 */

#include "qemu/osdep.h"

#include "qemu/units.h"

#include "crypto/init.h"

#include "crypto/cipher.h"
@@ -56,8 +57,7 @@ static void test_cipher_speed(const void *opaque) 
        total += chunk_size;

    } while (g_test_timer_elapsed() < 5.0);



    total /= 1024 * 1024; /* to MB */



    total /= MiB;

    g_print("cbc(aes128): ");

    g_print("Testing chunk_size %zu bytes ", chunk_size);

    g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
@@ -78,7 +78,7 @@ int main(int argc, char **argv) 
    g_test_init(&argc, &argv, NULL);

    g_assert(qcrypto_init(NULL) == 0);



    for (i = 512; i <= (64 * 1204); i *= 2) {

    for (i = 512; i <= 64 * KiB; i *= 2) {

        memset(name, 0 , sizeof(name));

        snprintf(name, sizeof(name), "/crypto/cipher/speed-%zu", i);

        g_test_add_data_func(name, (void *)i, test_cipher_speed);

tests/benchmark-crypto-hash.c

+3 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 * top-level directory.

 */

#include "qemu/osdep.h"

#include "qemu/units.h"

#include "crypto/init.h"

#include "crypto/hash.h"
@@ -39,7 +40,7 @@ static void test_hash_speed(const void *opaque) 
        total += chunk_size;

    } while (g_test_timer_elapsed() < 5.0);



    total /= 1024 * 1024; /* to MB */

    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());
@@ -57,7 +58,7 @@ int main(int argc, char **argv) 
    g_test_init(&argc, &argv, NULL);

    g_assert(qcrypto_init(NULL) == 0);



    for (i = 512; i <= (64 * 1204); i *= 2) {

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

tests/benchmark-crypto-hmac.c

+3 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 * top-level directory.

 */

#include "qemu/osdep.h"

#include "qemu/units.h"

#include "crypto/init.h"

#include "crypto/hmac.h"
@@ -53,8 +54,7 @@ static void test_hmac_speed(const void *opaque) 
        total += chunk_size;

    } while (g_test_timer_elapsed() < 5.0);



    total /= 1024 * 1024; /* to MB */



    total /= MiB;

    g_print("hmac(sha256): ");

    g_print("Testing chunk_size %zu bytes ", chunk_size);

    g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last());
@@ -72,7 +72,7 @@ int main(int argc, char **argv) 
    g_test_init(&argc, &argv, NULL);

    g_assert(qcrypto_init(NULL) == 0);



    for (i = 512; i <= (64 * 1204); i *= 2) {

    for (i = 512; i <= 64 * KiB; i *= 2) {

        memset(name, 0 , sizeof(name));

        snprintf(name, sizeof(name), "/crypto/hmac/speed-%zu", i);

        g_test_add_data_func(name, (void *)i, test_hmac_speed);