diff options
author | Thomas Huth <thuth@redhat.com> | 2021-03-12 10:22:38 +0100 |
---|---|---|
committer | Thomas Huth <thuth@redhat.com> | 2021-03-12 15:46:30 +0100 |
commit | 3b472e71d50fe33f2e0dfdd447dde5910ddf0761 (patch) | |
tree | 1cbbd713dcd7538794dbc569bd3f8c8309ad8ec0 | |
parent | da668aa15b99150a8595c491aee00d5d2426aaf9 (diff) | |
download | qemu-3b472e71d50fe33f2e0dfdd447dde5910ddf0761.zip qemu-3b472e71d50fe33f2e0dfdd447dde5910ddf0761.tar.gz qemu-3b472e71d50fe33f2e0dfdd447dde5910ddf0761.tar.bz2 |
tests: Move benchmarks into a separate folder
Make it clear that these files are related to benchmarks by moving
them into a new folder called "bench".
Message-Id: <20210312092238.79509-1-thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
-rw-r--r-- | MAINTAINERS | 2 | ||||
-rw-r--r-- | tests/bench/atomic64-bench.c (renamed from tests/atomic64-bench.c) | 0 | ||||
-rw-r--r-- | tests/bench/atomic_add-bench.c (renamed from tests/atomic_add-bench.c) | 0 | ||||
-rw-r--r-- | tests/bench/benchmark-crypto-cipher.c (renamed from tests/benchmark-crypto-cipher.c) | 0 | ||||
-rw-r--r-- | tests/bench/benchmark-crypto-hash.c (renamed from tests/benchmark-crypto-hash.c) | 0 | ||||
-rw-r--r-- | tests/bench/benchmark-crypto-hmac.c (renamed from tests/benchmark-crypto-hmac.c) | 0 | ||||
-rw-r--r-- | tests/bench/meson.build | 34 | ||||
-rw-r--r-- | tests/bench/qht-bench.c (renamed from tests/qht-bench.c) | 0 | ||||
-rw-r--r-- | tests/meson.build | 34 |
9 files changed, 36 insertions, 34 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e6c43c6..9a68f09 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2722,7 +2722,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 diff --git a/tests/atomic64-bench.c b/tests/bench/atomic64-bench.c index e474753..e474753 100644 --- a/tests/atomic64-bench.c +++ b/tests/bench/atomic64-bench.c diff --git a/tests/atomic_add-bench.c b/tests/bench/atomic_add-bench.c index f05471a..f05471a 100644 --- a/tests/atomic_add-bench.c +++ b/tests/bench/atomic_add-bench.c diff --git a/tests/benchmark-crypto-cipher.c b/tests/bench/benchmark-crypto-cipher.c index c04f0a0..c04f0a0 100644 --- a/tests/benchmark-crypto-cipher.c +++ b/tests/bench/benchmark-crypto-cipher.c diff --git a/tests/benchmark-crypto-hash.c b/tests/bench/benchmark-crypto-hash.c index 927b00b..927b00b 100644 --- a/tests/benchmark-crypto-hash.c +++ b/tests/bench/benchmark-crypto-hash.c diff --git a/tests/benchmark-crypto-hmac.c b/tests/bench/benchmark-crypto-hmac.c index 5cca636..5cca636 100644 --- a/tests/benchmark-crypto-hmac.c +++ b/tests/bench/benchmark-crypto-hmac.c diff --git a/tests/bench/meson.build b/tests/bench/meson.build new file mode 100644 index 0000000..00b3c20 --- /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 index 2e5b70c..2e5b70c 100644 --- a/tests/qht-bench.c +++ b/tests/bench/qht-bench.c diff --git a/tests/meson.build b/tests/meson.build index af43fd1..55a7b08 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'), |