From: Hanna Reitz <hreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Hanna Reitz <hreitz@redhat.com>,
qemu-devel@nongnu.org
Subject: [PULL 18/32] simplebench: add img_bench_templater.py
Date: Wed, 15 Sep 2021 19:53:04 +0200 [thread overview]
Message-ID: <20210915175318.853225-19-hreitz@redhat.com> (raw)
In-Reply-To: <20210915175318.853225-1-hreitz@redhat.com>
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Add simple grammar-parsing template benchmark. New tool consume test
template written in bash with some special grammar injections and
produces multiple tests, run them and finally print a performance
comparison table of different tests produced from one template.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210824101517.59802-2-vsementsov@virtuozzo.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
scripts/simplebench/img_bench_templater.py | 95 ++++++++++++++++++++++
scripts/simplebench/table_templater.py | 62 ++++++++++++++
2 files changed, 157 insertions(+)
create mode 100755 scripts/simplebench/img_bench_templater.py
create mode 100644 scripts/simplebench/table_templater.py
diff --git a/scripts/simplebench/img_bench_templater.py b/scripts/simplebench/img_bench_templater.py
new file mode 100755
index 0000000000..f8e1540ada
--- /dev/null
+++ b/scripts/simplebench/img_bench_templater.py
@@ -0,0 +1,95 @@
+#!/usr/bin/env python3
+#
+# Process img-bench test templates
+#
+# Copyright (c) 2021 Virtuozzo International GmbH.
+#
+# 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 2 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 <http://www.gnu.org/licenses/>.
+#
+
+
+import sys
+import subprocess
+import re
+import json
+
+import simplebench
+from results_to_text import results_to_text
+from table_templater import Templater
+
+
+def bench_func(env, case):
+ test = templater.gen(env['data'], case['data'])
+
+ p = subprocess.run(test, shell=True, stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT, universal_newlines=True)
+
+ if p.returncode == 0:
+ try:
+ m = re.search(r'Run completed in (\d+.\d+) seconds.', p.stdout)
+ return {'seconds': float(m.group(1))}
+ except Exception:
+ return {'error': f'failed to parse qemu-img output: {p.stdout}'}
+ else:
+ return {'error': f'qemu-img failed: {p.returncode}: {p.stdout}'}
+
+
+if __name__ == '__main__':
+ if len(sys.argv) > 1:
+ print("""
+Usage: img_bench_templater.py < path/to/test-template.sh
+
+This script generates performance tests from a test template (example below),
+runs them, and displays the results in a table. The template is read from
+stdin. It must be written in bash and end with a `qemu-img bench` invocation
+(whose result is parsed to get the test instance’s result).
+
+Use the following syntax in the template to create the various different test
+instances:
+
+ column templating: {var1|var2|...} - test will use different values in
+ different columns. You may use several {} constructions in the test, in this
+ case product of all choice-sets will be used.
+
+ row templating: [var1|var2|...] - similar thing to define rows (test-cases)
+
+Test template example:
+
+Assume you want to compare two qemu-img binaries, called qemu-img-old and
+qemu-img-new in your build directory in two test-cases with 4K writes and 64K
+writes. The template may look like this:
+
+qemu_img=/path/to/qemu/build/qemu-img-{old|new}
+$qemu_img create -f qcow2 /ssd/x.qcow2 1G
+$qemu_img bench -c 100 -d 8 [-s 4K|-s 64K] -w -t none -n /ssd/x.qcow2
+
+When passing this to stdin of img_bench_templater.py, the resulting comparison
+table will contain two columns (for two binaries) and two rows (for two
+test-cases).
+
+In addition to displaying the results, script also stores results in JSON
+format into results.json file in current directory.
+""")
+ sys.exit()
+
+ templater = Templater(sys.stdin.read())
+
+ envs = [{'id': ' / '.join(x), 'data': x} for x in templater.columns]
+ cases = [{'id': ' / '.join(x), 'data': x} for x in templater.rows]
+
+ result = simplebench.bench(bench_func, envs, cases, count=5,
+ initial_run=False)
+ print(results_to_text(result))
+ with open('results.json', 'w') as f:
+ json.dump(result, f, indent=4)
diff --git a/scripts/simplebench/table_templater.py b/scripts/simplebench/table_templater.py
new file mode 100644
index 0000000000..950f3b3024
--- /dev/null
+++ b/scripts/simplebench/table_templater.py
@@ -0,0 +1,62 @@
+# Parser for test templates
+#
+# Copyright (c) 2021 Virtuozzo International GmbH.
+#
+# 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 2 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 <http://www.gnu.org/licenses/>.
+#
+
+import itertools
+from lark import Lark
+
+grammar = """
+start: ( text | column_switch | row_switch )+
+
+column_switch: "{" text ["|" text]+ "}"
+row_switch: "[" text ["|" text]+ "]"
+text: /[^|{}\[\]]+/
+"""
+
+parser = Lark(grammar)
+
+class Templater:
+ def __init__(self, template):
+ self.tree = parser.parse(template)
+
+ c_switches = []
+ r_switches = []
+ for x in self.tree.children:
+ if x.data == 'column_switch':
+ c_switches.append([el.children[0].value for el in x.children])
+ elif x.data == 'row_switch':
+ r_switches.append([el.children[0].value for el in x.children])
+
+ self.columns = list(itertools.product(*c_switches))
+ self.rows = list(itertools.product(*r_switches))
+
+ def gen(self, column, row):
+ i = 0
+ j = 0
+ result = []
+
+ for x in self.tree.children:
+ if x.data == 'text':
+ result.append(x.children[0].value)
+ elif x.data == 'column_switch':
+ result.append(column[i])
+ i += 1
+ elif x.data == 'row_switch':
+ result.append(row[j])
+ j += 1
+
+ return ''.join(result)
--
2.31.1
next prev parent reply other threads:[~2021-09-15 18:16 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-15 17:52 [PULL 00/32] Block patches Hanna Reitz
2021-09-15 17:52 ` [PULL 01/32] gluster: Align block-status tail Hanna Reitz
2021-09-15 17:52 ` [PULL 02/32] block: Drop BDS comment regarding bdrv_append() Hanna Reitz
2021-09-15 17:52 ` [PULL 03/32] block: block-status cache for data regions Hanna Reitz
2021-09-15 17:52 ` [PULL 04/32] block: Clarify that @bytes is no limit on *pnum Hanna Reitz
2021-09-15 17:52 ` [PULL 05/32] block/file-posix: Do not force-cap *pnum Hanna Reitz
2021-09-15 17:52 ` [PULL 06/32] block/gluster: " Hanna Reitz
2021-09-15 17:52 ` [PULL 07/32] block/iscsi: " Hanna Reitz
2021-09-15 17:52 ` [PULL 08/32] iotests: Fix unspecified-encoding pylint warnings Hanna Reitz
2021-09-15 17:52 ` [PULL 09/32] iotests: Fix use-{list,dict}-literal warnings Hanna Reitz
2021-09-15 17:52 ` [PULL 10/32] iotests/297: Drop 169 and 199 from the skip list Hanna Reitz
2021-09-15 17:52 ` [PULL 11/32] migrate-bitmaps-postcopy-test: Fix pylint warnings Hanna Reitz
2021-09-15 17:52 ` [PULL 12/32] migrate-bitmaps-test: " Hanna Reitz
2021-09-15 17:52 ` [PULL 13/32] mirror-top-perms: Fix AbnormalShutdown path Hanna Reitz
2021-09-15 17:53 ` [PULL 14/32] iotests/297: Cover tests/ Hanna Reitz
2021-09-15 17:53 ` [PULL 15/32] block/mirror: fix NULL pointer dereference in mirror_wait_on_conflicts() Hanna Reitz
2021-09-15 17:53 ` [PULL 16/32] tests: add migrate-during-backup Hanna Reitz
2021-09-15 17:53 ` [PULL 17/32] block: bdrv_inactivate_recurse(): check for permissions and fix crash Hanna Reitz
2021-09-15 17:53 ` Hanna Reitz [this message]
2021-09-15 17:53 ` [PULL 19/32] qcow2: refactor handle_dependencies() loop body Hanna Reitz
2021-09-15 17:53 ` [PULL 20/32] qcow2: handle_dependencies(): relax conflict detection Hanna Reitz
2021-09-15 17:53 ` [PULL 21/32] qemu-img: Allow target be aligned to sector size Hanna Reitz
2021-09-15 17:53 ` [PULL 22/32] qcow2-refcount: improve style of check_refcounts_l2() Hanna Reitz
2021-09-15 17:53 ` [PULL 23/32] qcow2: compressed read: simplify cluster descriptor passing Hanna Reitz
2021-09-15 17:53 ` [PULL 24/32] qcow2: introduce qcow2_parse_compressed_l2_entry() helper Hanna Reitz
2021-09-15 17:53 ` [PULL 25/32] qcow2-refcount: introduce fix_l2_entry_by_zero() Hanna Reitz
2021-09-15 17:53 ` [PULL 26/32] qcow2-refcount: fix_l2_entry_by_zero(): also zero L2 entry bitmap Hanna Reitz
2021-09-15 17:53 ` [PULL 27/32] qcow2-refcount: check_refcounts_l2(): check l2_bitmap Hanna Reitz
2021-09-15 17:53 ` [PULL 28/32] qcow2-refcount: check_refcounts_l2(): check reserved bits Hanna Reitz
2021-09-15 17:53 ` [PULL 29/32] qcow2-refcount: improve style of check_refcounts_l1() Hanna Reitz
2021-09-15 17:53 ` [PULL 30/32] qcow2-refcount: check_refcounts_l1(): check reserved bits Hanna Reitz
2021-09-15 17:53 ` [PULL 31/32] qcow2-refcount: check_refblocks(): add separate message for reserved Hanna Reitz
2021-09-15 17:53 ` [PULL 32/32] qemu-img: Add -F shorthand to convert Hanna Reitz
2021-09-16 10:18 ` [PULL 00/32] Block patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210915175318.853225-19-hreitz@redhat.com \
--to=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).