tests/{ => bench}/atomic64-bench.c | 0 tests/{ => bench}/atomic_add-bench.c | 0 tests/{ => bench}/benchmark-crypto-cipher.c | 0 tests/{ => bench}/benchmark-crypto-hash.c | 0 tests/{ => bench}/benchmark-crypto-hmac.c | 0 tests/bench/meson.build | 34 +++++++++++++++++++++ tests/{ => bench}/qht-bench.c | 0 tests/meson.build | 34 +-------------------- 8 files changed, 35 insertions(+), 33 deletions(-) rename tests/{ => bench}/atomic64-bench.c (100%) rename tests/{ => bench}/atomic_add-bench.c (100%) rename tests/{ => bench}/benchmark-crypto-cipher.c (100%) rename tests/{ => bench}/benchmark-crypto-hash.c (100%) rename tests/{ => bench}/benchmark-crypto-hmac.c (100%) create mode 100644 tests/bench/meson.build rename tests/{ => bench}/qht-bench.c (100%)
Make it clear that these files are related to benchmarks by moving
them into a new folder called "bench".
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
Based-on: 20210310063314.1049838-1-thuth@redhat.com
tests/{ => bench}/atomic64-bench.c | 0
tests/{ => bench}/atomic_add-bench.c | 0
tests/{ => bench}/benchmark-crypto-cipher.c | 0
tests/{ => bench}/benchmark-crypto-hash.c | 0
tests/{ => bench}/benchmark-crypto-hmac.c | 0
tests/bench/meson.build | 34 +++++++++++++++++++++
tests/{ => bench}/qht-bench.c | 0
tests/meson.build | 34 +--------------------
8 files changed, 35 insertions(+), 33 deletions(-)
rename tests/{ => bench}/atomic64-bench.c (100%)
rename tests/{ => bench}/atomic_add-bench.c (100%)
rename tests/{ => bench}/benchmark-crypto-cipher.c (100%)
rename tests/{ => bench}/benchmark-crypto-hash.c (100%)
rename tests/{ => bench}/benchmark-crypto-hmac.c (100%)
create mode 100644 tests/bench/meson.build
rename tests/{ => bench}/qht-bench.c (100%)
diff --git a/tests/atomic64-bench.c b/tests/bench/atomic64-bench.c
similarity index 100%
rename from tests/atomic64-bench.c
rename to tests/bench/atomic64-bench.c
diff --git a/tests/atomic_add-bench.c b/tests/bench/atomic_add-bench.c
similarity index 100%
rename from tests/atomic_add-bench.c
rename to tests/bench/atomic_add-bench.c
diff --git a/tests/benchmark-crypto-cipher.c b/tests/bench/benchmark-crypto-cipher.c
similarity index 100%
rename from tests/benchmark-crypto-cipher.c
rename to tests/bench/benchmark-crypto-cipher.c
diff --git a/tests/benchmark-crypto-hash.c b/tests/bench/benchmark-crypto-hash.c
similarity index 100%
rename from tests/benchmark-crypto-hash.c
rename to tests/bench/benchmark-crypto-hash.c
diff --git a/tests/benchmark-crypto-hmac.c b/tests/bench/benchmark-crypto-hmac.c
similarity index 100%
rename from tests/benchmark-crypto-hmac.c
rename to tests/bench/benchmark-crypto-hmac.c
diff --git a/tests/bench/meson.build b/tests/bench/meson.build
new file mode 100644
index 0000000000..00b3c209dc
--- /dev/null
+++ b/tests/bench/meson.build
@@ -0,0 +1,34 @@
+
+qht_bench = executable('qht-bench',
+ sources: 'qht-bench.c',
+ dependencies: [qemuutil])
+
+executable('atomic_add-bench',
+ sources: files('atomic_add-bench.c'),
+ dependencies: [qemuutil],
+ build_by_default: false)
+
+executable('atomic64-bench',
+ sources: files('atomic64-bench.c'),
+ dependencies: [qemuutil],
+ build_by_default: false)
+
+benchs = {}
+
+if have_block
+ benchs += {
+ 'benchmark-crypto-hash': [crypto],
+ 'benchmark-crypto-hmac': [crypto],
+ 'benchmark-crypto-cipher': [crypto],
+ }
+endif
+
+foreach bench_name, deps: benchs
+ exe = executable(bench_name, bench_name + '.c',
+ dependencies: [qemuutil] + deps)
+ benchmark(bench_name, exe,
+ args: ['--tap', '-k'],
+ protocol: 'tap',
+ timeout: 0,
+ suite: ['speed'])
+endforeach
diff --git a/tests/qht-bench.c b/tests/bench/qht-bench.c
similarity index 100%
rename from tests/qht-bench.c
rename to tests/bench/qht-bench.c
diff --git a/tests/meson.build b/tests/meson.build
index af43fd1eaf..55a7b08275 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,18 +1,6 @@
py3 = import('python').find_installation()
-qht_bench = executable('qht-bench',
- sources: 'qht-bench.c',
- dependencies: [qemuutil])
-
-executable('atomic_add-bench',
- sources: files('atomic_add-bench.c'),
- dependencies: [qemuutil],
- build_by_default: false)
-
-executable('atomic64-bench',
- sources: files('atomic64-bench.c'),
- dependencies: [qemuutil],
- build_by_default: false)
+subdir('bench')
test_qapi_outputs = [
'qapi-builtin-types.c',
@@ -73,26 +61,6 @@ test_deps = {
'test-qht-par': qht_bench,
}
-benchs = {}
-
-if have_block
- benchs += {
- 'benchmark-crypto-hash': [crypto],
- 'benchmark-crypto-hmac': [crypto],
- 'benchmark-crypto-cipher': [crypto],
- }
-endif
-
-foreach bench_name, deps: benchs
- exe = executable(bench_name, bench_name + '.c',
- dependencies: [qemuutil] + deps)
- benchmark(bench_name, exe,
- args: ['--tap', '-k'],
- protocol: 'tap',
- timeout: 0,
- suite: ['speed'])
-endforeach
-
if have_tools and 'CONFIG_VHOST_USER' in config_host and 'CONFIG_LINUX' in config_host
executable('vhost-user-bridge',
sources: files('vhost-user-bridge.c'),
--
2.27.0
On 12/03/21 10:22, Thomas Huth wrote: > Make it clear that these files are related to benchmarks by moving > them into a new folder called "bench". > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > Based-on: 20210310063314.1049838-1-thuth@redhat.com > > tests/{ => bench}/atomic64-bench.c | 0 > tests/{ => bench}/atomic_add-bench.c | 0 > tests/{ => bench}/benchmark-crypto-cipher.c | 0 > tests/{ => bench}/benchmark-crypto-hash.c | 0 > tests/{ => bench}/benchmark-crypto-hmac.c | 0 > tests/bench/meson.build | 34 +++++++++++++++++++++ > tests/{ => bench}/qht-bench.c | 0 > tests/meson.build | 34 +-------------------- > 8 files changed, 35 insertions(+), 33 deletions(-) > rename tests/{ => bench}/atomic64-bench.c (100%) > rename tests/{ => bench}/atomic_add-bench.c (100%) > rename tests/{ => bench}/benchmark-crypto-cipher.c (100%) > rename tests/{ => bench}/benchmark-crypto-hash.c (100%) > rename tests/{ => bench}/benchmark-crypto-hmac.c (100%) > create mode 100644 tests/bench/meson.build > rename tests/{ => bench}/qht-bench.c (100%) > > diff --git a/tests/atomic64-bench.c b/tests/bench/atomic64-bench.c > similarity index 100% > rename from tests/atomic64-bench.c > rename to tests/bench/atomic64-bench.c > diff --git a/tests/atomic_add-bench.c b/tests/bench/atomic_add-bench.c > similarity index 100% > rename from tests/atomic_add-bench.c > rename to tests/bench/atomic_add-bench.c > diff --git a/tests/benchmark-crypto-cipher.c b/tests/bench/benchmark-crypto-cipher.c > similarity index 100% > rename from tests/benchmark-crypto-cipher.c > rename to tests/bench/benchmark-crypto-cipher.c > diff --git a/tests/benchmark-crypto-hash.c b/tests/bench/benchmark-crypto-hash.c > similarity index 100% > rename from tests/benchmark-crypto-hash.c > rename to tests/bench/benchmark-crypto-hash.c > diff --git a/tests/benchmark-crypto-hmac.c b/tests/bench/benchmark-crypto-hmac.c > similarity index 100% > rename from tests/benchmark-crypto-hmac.c > rename to tests/bench/benchmark-crypto-hmac.c > diff --git a/tests/bench/meson.build b/tests/bench/meson.build > new file mode 100644 > index 0000000000..00b3c209dc > --- /dev/null > +++ b/tests/bench/meson.build > @@ -0,0 +1,34 @@ > + > +qht_bench = executable('qht-bench', > + sources: 'qht-bench.c', > + dependencies: [qemuutil]) > + > +executable('atomic_add-bench', > + sources: files('atomic_add-bench.c'), > + dependencies: [qemuutil], > + build_by_default: false) > + > +executable('atomic64-bench', > + sources: files('atomic64-bench.c'), > + dependencies: [qemuutil], > + build_by_default: false) > + > +benchs = {} > + > +if have_block > + benchs += { > + 'benchmark-crypto-hash': [crypto], > + 'benchmark-crypto-hmac': [crypto], > + 'benchmark-crypto-cipher': [crypto], > + } > +endif > + > +foreach bench_name, deps: benchs > + exe = executable(bench_name, bench_name + '.c', > + dependencies: [qemuutil] + deps) > + benchmark(bench_name, exe, > + args: ['--tap', '-k'], > + protocol: 'tap', > + timeout: 0, > + suite: ['speed']) > +endforeach > diff --git a/tests/qht-bench.c b/tests/bench/qht-bench.c > similarity index 100% > rename from tests/qht-bench.c > rename to tests/bench/qht-bench.c > diff --git a/tests/meson.build b/tests/meson.build > index af43fd1eaf..55a7b08275 100644 > --- a/tests/meson.build > +++ b/tests/meson.build > @@ -1,18 +1,6 @@ > py3 = import('python').find_installation() > > -qht_bench = executable('qht-bench', > - sources: 'qht-bench.c', > - dependencies: [qemuutil]) > - > -executable('atomic_add-bench', > - sources: files('atomic_add-bench.c'), > - dependencies: [qemuutil], > - build_by_default: false) > - > -executable('atomic64-bench', > - sources: files('atomic64-bench.c'), > - dependencies: [qemuutil], > - build_by_default: false) > +subdir('bench') > > test_qapi_outputs = [ > 'qapi-builtin-types.c', > @@ -73,26 +61,6 @@ test_deps = { > 'test-qht-par': qht_bench, > } > > -benchs = {} > - > -if have_block > - benchs += { > - 'benchmark-crypto-hash': [crypto], > - 'benchmark-crypto-hmac': [crypto], > - 'benchmark-crypto-cipher': [crypto], > - } > -endif > - > -foreach bench_name, deps: benchs > - exe = executable(bench_name, bench_name + '.c', > - dependencies: [qemuutil] + deps) > - benchmark(bench_name, exe, > - args: ['--tap', '-k'], > - protocol: 'tap', > - timeout: 0, > - suite: ['speed']) > -endforeach > - > if have_tools and 'CONFIG_VHOST_USER' in config_host and 'CONFIG_LINUX' in config_host > executable('vhost-user-bridge', > sources: files('vhost-user-bridge.c'), > Acked-by: Paolo Bonzini <pbonzini@redhat.com>
On 12/03/2021 10.22, Thomas Huth wrote: > Make it clear that these files are related to benchmarks by moving > them into a new folder called "bench". > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > Based-on: 20210310063314.1049838-1-thuth@redhat.com > > tests/{ => bench}/atomic64-bench.c | 0 > tests/{ => bench}/atomic_add-bench.c | 0 > tests/{ => bench}/benchmark-crypto-cipher.c | 0 > tests/{ => bench}/benchmark-crypto-hash.c | 0 > tests/{ => bench}/benchmark-crypto-hmac.c | 0 > tests/bench/meson.build | 34 +++++++++++++++++++++ > tests/{ => bench}/qht-bench.c | 0 > tests/meson.build | 34 +-------------------- > 8 files changed, 35 insertions(+), 33 deletions(-) > rename tests/{ => bench}/atomic64-bench.c (100%) > rename tests/{ => bench}/atomic_add-bench.c (100%) > rename tests/{ => bench}/benchmark-crypto-cipher.c (100%) > rename tests/{ => bench}/benchmark-crypto-hash.c (100%) > rename tests/{ => bench}/benchmark-crypto-hmac.c (100%) > create mode 100644 tests/bench/meson.build > rename tests/{ => bench}/qht-bench.c (100%) I just noticed that I forgot to update MAINTAINERS... I'll squash in this hunk: diff --git a/MAINTAINERS b/MAINTAINERS --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2729,7 +2729,7 @@ F: crypto/ F: include/crypto/ F: qapi/crypto.json F: tests/unit/test-crypto-* -F: tests/benchmark-crypto-* +F: tests/bench/benchmark-crypto-* F: tests/unit/crypto-tls-* F: tests/unit/pkix_asn1_tab.c F: qemu.sasl Thomas
On Fri, Mar 12, 2021 at 10:22:38AM +0100, Thomas Huth wrote: > Make it clear that these files are related to benchmarks by moving > them into a new folder called "bench". > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > Based-on: 20210310063314.1049838-1-thuth@redhat.com > > tests/{ => bench}/atomic64-bench.c | 0 > tests/{ => bench}/atomic_add-bench.c | 0 > tests/{ => bench}/benchmark-crypto-cipher.c | 0 > tests/{ => bench}/benchmark-crypto-hash.c | 0 > tests/{ => bench}/benchmark-crypto-hmac.c | 0 > tests/bench/meson.build | 34 +++++++++++++++++++++ > tests/{ => bench}/qht-bench.c | 0 > tests/meson.build | 34 +-------------------- > 8 files changed, 35 insertions(+), 33 deletions(-) > rename tests/{ => bench}/atomic64-bench.c (100%) > rename tests/{ => bench}/atomic_add-bench.c (100%) > rename tests/{ => bench}/benchmark-crypto-cipher.c (100%) > rename tests/{ => bench}/benchmark-crypto-hash.c (100%) > rename tests/{ => bench}/benchmark-crypto-hmac.c (100%) > create mode 100644 tests/bench/meson.build > rename tests/{ => bench}/qht-bench.c (100%) Acked-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
© 2016 - 2024 Red Hat, Inc.