It is to be expected that crypto hardware would not only speed up
sha1_stream but also sha1_buffer (where the input is in memory).
As a first step towards this, I'm adding benchmarks of the sha1_buffer etc.
functions.
The way to use this benchmark is, from a testdir:
$ gltests/bench-sha1 100000 100
which will run 100 repetitions of sha1_buffer on a memory region of size 100000.
2018-05-06 Bruno Haible <br...@clisp.org>
crypto/{md5,sha1,sha256,sha512} tests: Add benchmarks.
* tests/bench-digest.h: New file.
* tests/bench-md5.c: New file.
* tests/bench-sha1.c: New file.
* tests/bench-sha224.c: New file.
* tests/bench-sha256.c: New file.
* tests/bench-sha384.c: New file.
* tests/bench-sha512.c: New file.
* modules/crypto/md5-tests (Files): Add tests/bench-md5.c,
tests/bench-digest.h.
(Depends-on): Add getrusage, gettimeofday.
(Makefile.am): Add variables to build bench-md5.
* modules/crypto/sha1-tests (Files): Add tests/bench-sha1.c,
tests/bench-digest.h.
(Depends-on): Add getrusage, gettimeofday.
(Makefile.am): Add variables to build bench-sha1.
* modules/crypto/sha256-tests (Files): Add tests/bench-sha224.c,
tests/bench-sha256.c, tests/bench-digest.h.
(Depends-on): Add getrusage, gettimeofday.
(Makefile.am): Add variables to build bench-sha224, bench-sha256.
* modules/crypto/sha512-tests (Files): Add tests/bench-sha384.c,
tests/bench-sha512.c, tests/bench-digest.h.
(Depends-on): Add getrusage, gettimeofday.
(Makefile.am): Add variables to build bench-sha384, bench-sha512.
>From 207cac7a3714a85b605332434cf2ebc20bbaf3ed Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Sun, 6 May 2018 16:46:57 +0200
Subject: [PATCH] crypto/{md5,sha1,sha256,sha512} tests: Add benchmarks.
* tests/bench-digest.h: New file.
* tests/bench-md5.c: New file.
* tests/bench-sha1.c: New file.
* tests/bench-sha224.c: New file.
* tests/bench-sha256.c: New file.
* tests/bench-sha384.c: New file.
* tests/bench-sha512.c: New file.
* modules/crypto/md5-tests (Files): Add tests/bench-md5.c,
tests/bench-digest.h.
(Depends-on): Add getrusage, gettimeofday.
(Makefile.am): Add variables to build bench-md5.
* modules/crypto/sha1-tests (Files): Add tests/bench-sha1.c,
tests/bench-digest.h.
(Depends-on): Add getrusage, gettimeofday.
(Makefile.am): Add variables to build bench-sha1.
* modules/crypto/sha256-tests (Files): Add tests/bench-sha224.c,
tests/bench-sha256.c, tests/bench-digest.h.
(Depends-on): Add getrusage, gettimeofday.
(Makefile.am): Add variables to build bench-sha224, bench-sha256.
* modules/crypto/sha512-tests (Files): Add tests/bench-sha384.c,
tests/bench-sha512.c, tests/bench-digest.h.
(Depends-on): Add getrusage, gettimeofday.
(Makefile.am): Add variables to build bench-sha384, bench-sha512.
---
ChangeLog | 27 +++++++++++
modules/crypto/md5-tests | 6 +++
modules/crypto/sha1-tests | 6 +++
modules/crypto/sha256-tests | 8 ++++
modules/crypto/sha512-tests | 8 ++++
tests/bench-digest.h | 108 ++++++++++++++++++++++++++++++++++++++++++++
tests/bench-md5.c | 24 ++++++++++
tests/bench-sha1.c | 24 ++++++++++
tests/bench-sha224.c | 24 ++++++++++
tests/bench-sha256.c | 24 ++++++++++
tests/bench-sha384.c | 24 ++++++++++
tests/bench-sha512.c | 24 ++++++++++
12 files changed, 307 insertions(+)
create mode 100644 tests/bench-digest.h
create mode 100644 tests/bench-md5.c
create mode 100644 tests/bench-sha1.c
create mode 100644 tests/bench-sha224.c
create mode 100644 tests/bench-sha256.c
create mode 100644 tests/bench-sha384.c
create mode 100644 tests/bench-sha512.c
diff --git a/ChangeLog b/ChangeLog
index 1d94458..29390f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,32 @@
2018-05-06 Bruno Haible <br...@clisp.org>
+ crypto/{md5,sha1,sha256,sha512} tests: Add benchmarks.
+ * tests/bench-digest.h: New file.
+ * tests/bench-md5.c: New file.
+ * tests/bench-sha1.c: New file.
+ * tests/bench-sha224.c: New file.
+ * tests/bench-sha256.c: New file.
+ * tests/bench-sha384.c: New file.
+ * tests/bench-sha512.c: New file.
+ * modules/crypto/md5-tests (Files): Add tests/bench-md5.c,
+ tests/bench-digest.h.
+ (Depends-on): Add getrusage, gettimeofday.
+ (Makefile.am): Add variables to build bench-md5.
+ * modules/crypto/sha1-tests (Files): Add tests/bench-sha1.c,
+ tests/bench-digest.h.
+ (Depends-on): Add getrusage, gettimeofday.
+ (Makefile.am): Add variables to build bench-sha1.
+ * modules/crypto/sha256-tests (Files): Add tests/bench-sha224.c,
+ tests/bench-sha256.c, tests/bench-digest.h.
+ (Depends-on): Add getrusage, gettimeofday.
+ (Makefile.am): Add variables to build bench-sha224, bench-sha256.
+ * modules/crypto/sha512-tests (Files): Add tests/bench-sha384.c,
+ tests/bench-sha512.c, tests/bench-digest.h.
+ (Depends-on): Add getrusage, gettimeofday.
+ (Makefile.am): Add variables to build bench-sha384, bench-sha512.
+
+2018-05-06 Bruno Haible <br...@clisp.org>
+
af_alg: Fix a resource leak.
* lib/af_alg.c (afalg_stream): Close socket before returning -EINVAL.
New local variable 'result'.
diff --git a/modules/crypto/md5-tests b/modules/crypto/md5-tests
index 23384e8..6e9c162 100644
--- a/modules/crypto/md5-tests
+++ b/modules/crypto/md5-tests
@@ -1,12 +1,18 @@
Files:
tests/test-md5.c
tests/test-digest.h
+tests/bench-md5.c
+tests/bench-digest.h
Depends-on:
+getrusage
+gettimeofday
configure.ac:
Makefile.am:
TESTS += test-md5
check_PROGRAMS += test-md5
+noinst_PROGRAMS += bench-md5
test_md5_LDADD = $(LDADD) @LIB_CRYPTO@
+bench_md5_LDADD = $(LDADD) @LIB_CRYPTO@
diff --git a/modules/crypto/sha1-tests b/modules/crypto/sha1-tests
index 493b6db..c0f68cf 100644
--- a/modules/crypto/sha1-tests
+++ b/modules/crypto/sha1-tests
@@ -1,12 +1,18 @@
Files:
tests/test-sha1.c
tests/test-digest.h
+tests/bench-sha1.c
+tests/bench-digest.h
Depends-on:
+getrusage
+gettimeofday
configure.ac:
Makefile.am:
TESTS += test-sha1
check_PROGRAMS += test-sha1
+noinst_PROGRAMS += bench-sha1
test_sha1_LDADD = $(LDADD) @LIB_CRYPTO@
+bench_sha1_LDADD = $(LDADD) @LIB_CRYPTO@
diff --git a/modules/crypto/sha256-tests b/modules/crypto/sha256-tests
index 3ecbc32..eecbee8 100644
--- a/modules/crypto/sha256-tests
+++ b/modules/crypto/sha256-tests
@@ -1,12 +1,20 @@
Files:
tests/test-sha256.c
tests/test-digest.h
+tests/bench-sha224.c
+tests/bench-sha256.c
+tests/bench-digest.h
Depends-on:
+getrusage
+gettimeofday
configure.ac:
Makefile.am:
TESTS += test-sha256
check_PROGRAMS += test-sha256
+noinst_PROGRAMS += bench-sha224 bench-sha256
test_sha256_LDADD = $(LDADD) @LIB_CRYPTO@
+bench_sha224_LDADD = $(LDADD) @LIB_CRYPTO@
+bench_sha256_LDADD = $(LDADD) @LIB_CRYPTO@
diff --git a/modules/crypto/sha512-tests b/modules/crypto/sha512-tests
index ee24afb..18f5f1c 100644
--- a/modules/crypto/sha512-tests
+++ b/modules/crypto/sha512-tests
@@ -1,12 +1,20 @@
Files:
tests/test-sha512.c
tests/test-digest.h
+tests/bench-sha384.c
+tests/bench-sha512.c
+tests/bench-digest.h
Depends-on:
+getrusage
+gettimeofday
configure.ac:
Makefile.am:
TESTS += test-sha512
check_PROGRAMS += test-sha512
+noinst_PROGRAMS += bench-sha384 bench-sha512
test_sha512_LDADD = $(LDADD) @LIB_CRYPTO@
+bench_sha384_LDADD = $(LDADD) @LIB_CRYPTO@
+bench_sha512_LDADD = $(LDADD) @LIB_CRYPTO@
diff --git a/tests/bench-digest.h b/tests/bench-digest.h
new file mode 100644
index 0000000..12bf242
--- /dev/null
+++ b/tests/bench-digest.h
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2018 Free Software Foundation, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/resource.h>
+#include <sys/time.h>
+
+struct timings_state
+{
+ /* Filled when the timings start. */
+ struct timeval real_start;
+ struct timeval user_start;
+ struct timeval sys_start;
+ /* Filled when the timings end. */
+ long real_usec;
+ long user_usec;
+ long sys_usec;
+};
+
+static void
+timing_start (struct timings_state *ts)
+{
+ struct rusage usage;
+
+ getrusage (RUSAGE_SELF, &usage);
+ ts->user_start = usage.ru_utime;
+ ts->sys_start = usage.ru_stime;
+
+ gettimeofday (&ts->real_start, NULL);
+}
+
+static void
+timing_end (struct timings_state *ts)
+{
+ struct timeval real_end;
+ struct rusage usage;
+
+ gettimeofday (&real_end, NULL);
+
+ getrusage (RUSAGE_SELF, &usage);
+
+ ts->real_usec = (real_end.tv_sec - ts->real_start.tv_sec) * 1000000
+ + real_end.tv_usec - ts->real_start.tv_usec;
+ ts->user_usec = (usage.ru_utime.tv_sec - ts->user_start.tv_sec) * 1000000
+ + usage.ru_utime.tv_usec - ts->user_start.tv_usec;
+ ts->sys_usec = (usage.ru_stime.tv_sec - ts->sys_start.tv_sec) * 1000000
+ + usage.ru_stime.tv_usec - ts->sys_start.tv_usec;
+}
+
+static void
+timing_output (const struct timings_state *ts)
+{
+ printf ("real %10.6f\n", (double)ts->real_usec / 1000000.0);
+ printf ("user %7.3f\n", (double)ts->user_usec / 1000000.0);
+ printf ("sys %7.3f\n", (double)ts->sys_usec / 1000000.0);
+}
+
+int
+main (int argc, char *argv[])
+{
+ if (argc != 3)
+ {
+ fprintf (stderr, "Usage: %s SIZE REPETITIONS\n", argv[0]);
+ exit (1);
+ }
+
+ size_t size = atol (argv[1]);
+ int repeat = atoi (argv[2]);
+
+ char *memblock = (char *) malloc (size);
+
+ /* Fill the memory block. */
+ {
+ size_t i;
+ for (i = 0; i < size; i++)
+ memblock[i] =
+ (unsigned char) (((i * (i-1) * (i-5)) >> 6) + (i % 499) + (i % 101));
+ }
+
+ struct timings_state ts;
+ timing_start (&ts);
+
+ int count;
+ for (count = 0; count < repeat; count++)
+ {
+ char digest[64];
+ FUNC (memblock, size, digest);
+ }
+
+ timing_end (&ts);
+ timing_output (&ts);
+
+ return 0;
+}
diff --git a/tests/bench-md5.c b/tests/bench-md5.c
new file mode 100644
index 0000000..c169500
--- /dev/null
+++ b/tests/bench-md5.c
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2018 Free Software Foundation, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Benchmark program for the md5_buffer function. */
+
+#include <config.h>
+
+#include "md5.h"
+
+#define FUNC md5_buffer
+#include "bench-digest.h"
diff --git a/tests/bench-sha1.c b/tests/bench-sha1.c
new file mode 100644
index 0000000..65efced
--- /dev/null
+++ b/tests/bench-sha1.c
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2018 Free Software Foundation, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Benchmark program for the sha1_buffer function. */
+
+#include <config.h>
+
+#include "sha1.h"
+
+#define FUNC sha1_buffer
+#include "bench-digest.h"
diff --git a/tests/bench-sha224.c b/tests/bench-sha224.c
new file mode 100644
index 0000000..91d7edb
--- /dev/null
+++ b/tests/bench-sha224.c
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2018 Free Software Foundation, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Benchmark program for the sha224_buffer function. */
+
+#include <config.h>
+
+#include "sha256.h"
+
+#define FUNC sha224_buffer
+#include "bench-digest.h"
diff --git a/tests/bench-sha256.c b/tests/bench-sha256.c
new file mode 100644
index 0000000..a91c790
--- /dev/null
+++ b/tests/bench-sha256.c
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2018 Free Software Foundation, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Benchmark program for the sha256_buffer function. */
+
+#include <config.h>
+
+#include "sha256.h"
+
+#define FUNC sha256_buffer
+#include "bench-digest.h"
diff --git a/tests/bench-sha384.c b/tests/bench-sha384.c
new file mode 100644
index 0000000..f6542dc
--- /dev/null
+++ b/tests/bench-sha384.c
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2018 Free Software Foundation, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Benchmark program for the sha384_buffer function. */
+
+#include <config.h>
+
+#include "sha512.h"
+
+#define FUNC sha384_buffer
+#include "bench-digest.h"
diff --git a/tests/bench-sha512.c b/tests/bench-sha512.c
new file mode 100644
index 0000000..d9edb02
--- /dev/null
+++ b/tests/bench-sha512.c
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2018 Free Software Foundation, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Benchmark program for the sha512_buffer function. */
+
+#include <config.h>
+
+#include "sha512.h"
+
+#define FUNC sha512_buffer
+#include "bench-digest.h"
--
2.7.4
