[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 23/46] meson: convert the speed tests
From: |
Paolo Bonzini |
Subject: |
[PULL 23/46] meson: convert the speed tests |
Date: |
Fri, 4 Sep 2020 07:40:59 -0400 |
Use meson benchmark() for them, adjust mtest2make.py for that.
A new target "make bench" can be used to run all benchmarks.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200828110734.1638685-14-marcandre.lureau@redhat.com>
[Rewrite mtest2make part. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 3 ++-
scripts/mtest2make.py | 9 ++++++++-
tests/Makefile.include | 15 ++++-----------
tests/meson.build | 15 +++++++++++++++
4 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index ed354c43b0..d4d6a67d96 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ ${ninja-targets-c_COMPILER} ${ninja-targets-cpp_COMPILER}:
.var.command += -MP
# reread (and MESON won't be empty anymore).
ifneq ($(MESON),)
Makefile.mtest: build.ninja scripts/mtest2make.py
- $(MESON) introspect --tests | $(PYTHON) scripts/mtest2make.py > $@
+ $(MESON) introspect --tests --benchmarks | $(PYTHON)
scripts/mtest2make.py > $@
-include Makefile.mtest
endif
@@ -283,6 +283,7 @@ help:
@echo ''
@echo 'Test targets:'
$(call print-help,check,Run all tests (check-help for details))
+ $(call print-help,bench,Run all benchmarks)
$(call print-help,docker,Help about targets running tests inside
containers)
$(call print-help,vm-help,Help about targets running tests inside VM)
@echo ''
diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py
index af6dd0d3b1..9cbb2e374d 100644
--- a/scripts/mtest2make.py
+++ b/scripts/mtest2make.py
@@ -103,10 +103,17 @@ def emit_suite(name, suite, prefix):
print('endif')
testsuites = defaultdict(Suite)
-for test in introspect:
+for test in introspect['tests']:
process_tests(test, testsuites)
emit_prolog(testsuites, 'check')
for name, suite in testsuites.items():
emit_suite(name, suite, 'check')
+benchsuites = defaultdict(Suite)
+for test in introspect['benchmarks']:
+ process_tests(test, benchsuites)
+emit_prolog(benchsuites, 'bench')
+for name, suite in benchsuites.items():
+ emit_suite(name, suite, 'bench')
+
print('run-tests: $(patsubst %, run-test-%, $(.tests))')
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 0388a0e4fd..fe22ccfcc6 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -38,16 +38,8 @@ export SRC_PATH
SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
$(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak)))
-check-speed-$(CONFIG_BLOCK) += tests/benchmark-crypto-hash$(EXESUF)
-check-speed-$(CONFIG_BLOCK) += tests/benchmark-crypto-hmac$(EXESUF)
-check-speed-$(CONFIG_BLOCK) += tests/benchmark-crypto-cipher$(EXESUF)
-
QEMU_CFLAGS += -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest
-tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o
$(test-crypto-obj-y)
-tests/benchmark-crypto-hmac$(EXESUF): tests/benchmark-crypto-hmac.o
$(test-crypto-obj-y)
-tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark-crypto-cipher.o
$(test-crypto-obj-y)
-
tests/migration/stress$(EXESUF): tests/migration/stress.o
$(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $<
,"LINK","$(TARGET_DIR)$@")
@@ -97,9 +89,6 @@ define do_test_tap
"TAP","$@")
endef
-check-speed: $(check-speed-y)
- $(call do_test_human, $^)
-
# Per guest TCG tests
BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS))
@@ -212,6 +201,10 @@ check-clean:
clean: check-clean
+# For backwards compatibility
+
+check-speed: bench-speed
+
# Build the help program automatically
-include $(wildcard tests/*.d)
diff --git a/tests/meson.build b/tests/meson.build
index e97927d0be..17536de589 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -111,6 +111,8 @@ test_deps = {
'test-qht-par': qht_bench,
}
+benchs = {}
+
if have_block
tests += {
'test-coroutine': [testblock],
@@ -167,6 +169,11 @@ if have_block
if 'CONFIG_NETTLE' in config_host or 'CONFIG_GCRYPT' in config_host
tests += {'test-crypto-pbkdf': [io]}
endif
+ benchs += {
+ 'benchmark-crypto-hash': [crypto],
+ 'benchmark-crypto-hmac': [crypto],
+ 'benchmark-crypto-cipher': [crypto],
+ }
endif
if have_system
@@ -230,6 +237,14 @@ foreach test_name, extra: tests
suite: ['unit'])
endforeach
+foreach bench_name, deps: benchs
+ exe = executable(bench_name, bench_name + '.c',
+ dependencies: [qemuutil] + deps)
+ benchmark(bench_name, exe,
+ args: ['--tap', '-k'],
+ protocol: 'tap',
+ suite: ['speed'])
+endforeach
if have_tools and 'CONFIG_VHOST_USER' in config_host
executable('vhost-user-bridge',
--
2.26.2
- [PULL 20/46] meson: convert vhost-user-bridge, (continued)
- [PULL 20/46] meson: convert vhost-user-bridge, Paolo Bonzini, 2020/09/04
- [PULL 15/46] meson: declare keyutils dependency, Paolo Bonzini, 2020/09/04
- [PULL 05/46] mtest2make: split working directory from test command, Paolo Bonzini, 2020/09/04
- [PULL 03/46] tests: handling signal on win32 properly, Paolo Bonzini, 2020/09/04
- [PULL 11/46] ninjatool: use constant names for stamp files, Paolo Bonzini, 2020/09/04
- [PULL 18/46] meson: move keyutils dependency check, Paolo Bonzini, 2020/09/04
- [PULL 19/46] meson: remove old socket_scm_helper rule, Paolo Bonzini, 2020/09/04
- [PULL 21/46] meson: convert atomic*-bench, Paolo Bonzini, 2020/09/04
- [PULL 22/46] tests: do not print benchmark output to stdout, Paolo Bonzini, 2020/09/04
- [PULL 24/46] tests/migration/stress: remove unused exit_success, Paolo Bonzini, 2020/09/04
- [PULL 23/46] meson: convert the speed tests,
Paolo Bonzini <=
- [PULL 25/46] meson: fix migration/stress compilation with glibc>=2.30, Paolo Bonzini, 2020/09/04
- [PULL 26/46] meson: convert migration/initrd-stress, Paolo Bonzini, 2020/09/04
- [PULL 27/46] configure: remove dead code for in-tree builds, Paolo Bonzini, 2020/09/04
- [PULL 28/46] meson: compute config_all_devices directly, Paolo Bonzini, 2020/09/04
- [PULL 29/46] Makefile: remove dead variables and includes, Paolo Bonzini, 2020/09/04
- [PULL 31/46] configure: move disassembler configuration to meson, Paolo Bonzini, 2020/09/04
- [PULL 32/46] configure: move C++ compiler handling to meson, Paolo Bonzini, 2020/09/04
- [PULL 33/46] meson: keep all compiler flags detection together, Paolo Bonzini, 2020/09/04
- [PULL 35/46] configure: remove unnecessary libm test, Paolo Bonzini, 2020/09/04
- [PULL 40/46] docs: suggest Meson replacements for various configure functions, Paolo Bonzini, 2020/09/04