[for-2.10,15/19] tests: crypto: add cipher speed case

Commit Message

Longpeng(Mike) April 10, 2017, 9 a.m. UTC

Now we have afalg-backend and libiary-backend, it's necessary
to add the speed test in test-crypto-cipher.

We can use "./tests/test-crypto-cipher speed" to do the speed
test.

Signed-off-by: Longpeng(Mike) <[e-mail]>
---
 tests/test-crypto-cipher.c | 82 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 74 insertions(+), 8 deletions(-)

Comments

Daniel P. Berrangé April 10, 2017, 9:51 a.m. UTC | #1

On Mon, Apr 10, 2017 at 05:00:58PM +0800, Longpeng(Mike) wrote:
> Now we have afalg-backend and libiary-backend, it's necessary
> to add the speed test in test-crypto-cipher.
> 
> We can use "./tests/test-crypto-cipher speed" to do the speed
> test.

This is not using any of the existing code for the benchmark, so there's
no real benefit to having it in this file.

I'd suggest creating a separate test program for performance benchmarking,
eg  tests/benchmark-crypto-cipher, that would be invoked separately as &
when needed ie skipped by make check-unit, but run by a 'make check-speed'.

Likewise for the other tests you've changed later in this series.


Regards,
Daniel

Longpeng(Mike) April 10, 2017, 10:25 a.m. UTC | #2

Hi Daniel,

Ok, I'll take all your suggestions, and fix them in next version.

Thanks.

On 2017/4/10 17:51, Daniel P. Berrange wrote:

> On Mon, Apr 10, 2017 at 05:00:58PM +0800, Longpeng(Mike) wrote:
>> Now we have afalg-backend and libiary-backend, it's necessary
>> to add the speed test in test-crypto-cipher.
>>
>> We can use "./tests/test-crypto-cipher speed" to do the speed
>> test.
> 
> This is not using any of the existing code for the benchmark, so there's
> no real benefit to having it in this file.
> 
> I'd suggest creating a separate test program for performance benchmarking,
> eg  tests/benchmark-crypto-cipher, that would be invoked separately as &
> when needed ie skipped by make check-unit, but run by a 'make check-speed'.
> 
> Likewise for the other tests you've changed later in this series.
> 
> 
> Regards,
> Daniel

Patch

diff --git a/tests/test-crypto-cipher.c b/tests/test-crypto-cipher.c
index 8bb3308..ee0c2ca 100644
--- a/tests/test-crypto-cipher.c
+++ b/tests/test-crypto-cipher.c
@@ -789,6 +789,64 @@  static void test_cipher_short_plaintext(void)
     qcrypto_cipher_free(cipher);
 }
 
+static void test_cipher_speed(const void *opaque)
+{
+    QCryptoCipher *cipher;
+    Error *err = NULL;
+    double total = 0.0;
+    size_t chunk_size = (size_t)opaque;
+    uint8_t *key = NULL, *iv = NULL;
+    uint8_t *plaintext = NULL, *ciphertext = NULL;
+    size_t nkey = qcrypto_cipher_get_key_len(QCRYPTO_CIPHER_ALG_AES_128);
+    size_t niv = qcrypto_cipher_get_iv_len(QCRYPTO_CIPHER_ALG_AES_128,
+                                           QCRYPTO_CIPHER_MODE_CBC);
+
+    key = g_new0(uint8_t, nkey);
+    memset(key, g_test_rand_int(), nkey);
+
+    iv = g_new0(uint8_t, niv);
+    memset(iv, g_test_rand_int(), niv);
+
+    ciphertext = g_new0(uint8_t, chunk_size);
+
+    plaintext = g_new0(uint8_t, chunk_size);
+    memset(plaintext, g_test_rand_int(), chunk_size);
+
+    cipher = qcrypto_cipher_new(QCRYPTO_CIPHER_ALG_AES_128,
+                                QCRYPTO_CIPHER_MODE_CBC,
+                                key, nkey, &err);
+    g_assert(cipher != NULL);
+
+    g_assert(qcrypto_cipher_setiv(cipher,
+                                  iv, niv,
+                                  &err) == 0);
+
+    g_test_timer_start();
+    do {
+        g_assert(qcrypto_cipher_encrypt(cipher,
+                                        plaintext,
+                                        ciphertext,
+                                        chunk_size,
+                                        &err) == 0);
+        total += chunk_size;
+    } while (g_test_timer_elapsed() < 5.0);
+
+    total /= 1024 * 1024; /* to MB */
+
+    g_print("[drv:%s]", qcrypto_cipher_using_afalg_drv(cipher) ?
+            "afalg" : "libs");
+    g_print("Testing cbc(aes128): ");
+    g_print("Encrypting in chunks of %ld bytes: ", chunk_size);
+    g_print("done. %.2f MB in %.2f secs: ", total, g_test_timer_last());
+    g_print("%.2f MB/sec\t", total / g_test_timer_last());
+
+    qcrypto_cipher_free(cipher);
+    g_free(plaintext);
+    g_free(ciphertext);
+    g_free(iv);
+    g_free(key);
+}
+
 int main(int argc, char **argv)
 {
     size_t i;
@@ -797,17 +855,25 @@  int main(int argc, char **argv)
 
     g_assert(qcrypto_init(NULL) == 0);
 
-    for (i = 0; i < G_N_ELEMENTS(test_data); i++) {
-        if (qcrypto_cipher_supports(test_data[i].alg, test_data[i].mode)) {
-            g_test_add_data_func(test_data[i].path, &test_data[i], test_cipher);
+    if ((argc > 1) && !strcmp(argv[1], "speed")) {
+        for (i = 512; i <= (64 * 1204); i *= 2) {
+            g_test_add_data_func("/crypto/cipher/speed", (void *)i,
+                                 test_cipher_speed);
+        }
+    } else {
+        for (i = 0; i < G_N_ELEMENTS(test_data); i++) {
+            if (qcrypto_cipher_supports(test_data[i].alg, test_data[i].mode)) {
+                g_test_add_data_func(test_data[i].path, &test_data[i],
+                                     test_cipher);
+            }
         }
-    }
 
-    g_test_add_func("/crypto/cipher/null-iv",
-                    test_cipher_null_iv);
+        g_test_add_func("/crypto/cipher/null-iv",
+                        test_cipher_null_iv);
 
-    g_test_add_func("/crypto/cipher/short-plaintext",
-                    test_cipher_short_plaintext);
+        g_test_add_func("/crypto/cipher/short-plaintext",
+                        test_cipher_short_plaintext);
+    }
 
     return g_test_run();
 }