From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PULL 21/30] simplebench: move results_to_text() into separate file
Date: Fri, 18 Dec 2020 16:12:40 +0100 [thread overview]
Message-ID: <20201218151249.715731-22-mreitz@redhat.com> (raw)
In-Reply-To: <20201218151249.715731-1-mreitz@redhat.com>
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Let's keep view part in separate: this way it's better to improve it in
the following commits.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20201021145859.11201-18-vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
scripts/simplebench/bench-example.py | 3 +-
scripts/simplebench/bench_write_req.py | 3 +-
scripts/simplebench/results_to_text.py | 48 ++++++++++++++++++++++++++
scripts/simplebench/simplebench.py | 31 -----------------
4 files changed, 52 insertions(+), 33 deletions(-)
create mode 100644 scripts/simplebench/results_to_text.py
diff --git a/scripts/simplebench/bench-example.py b/scripts/simplebench/bench-example.py
index f24cf22fe9..d9c7f7bc17 100644
--- a/scripts/simplebench/bench-example.py
+++ b/scripts/simplebench/bench-example.py
@@ -19,6 +19,7 @@
#
import simplebench
+from results_to_text import results_to_text
from bench_block_job import bench_block_copy, drv_file, drv_nbd
@@ -77,4 +78,4 @@ test_envs = [
]
result = simplebench.bench(bench_func, test_envs, test_cases, count=3)
-print(simplebench.results_to_text(result))
+print(results_to_text(result))
diff --git a/scripts/simplebench/bench_write_req.py b/scripts/simplebench/bench_write_req.py
index e175bcd7a4..da601ea2fe 100755
--- a/scripts/simplebench/bench_write_req.py
+++ b/scripts/simplebench/bench_write_req.py
@@ -26,6 +26,7 @@ import sys
import os
import subprocess
import simplebench
+from results_to_text import results_to_text
def bench_func(env, case):
@@ -167,4 +168,4 @@ if __name__ == '__main__':
result = simplebench.bench(bench_func, test_envs, test_cases, count=3,
initial_run=False)
- print(simplebench.results_to_text(result))
+ print(results_to_text(result))
diff --git a/scripts/simplebench/results_to_text.py b/scripts/simplebench/results_to_text.py
new file mode 100644
index 0000000000..58d909ffd9
--- /dev/null
+++ b/scripts/simplebench/results_to_text.py
@@ -0,0 +1,48 @@
+# Simple benchmarking framework
+#
+# Copyright (c) 2019 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/>.
+#
+
+
+def result_to_text(result):
+ """Return text representation of bench_one() returned dict."""
+ if 'average' in result:
+ s = '{:.2f} +- {:.2f}'.format(result['average'], result['stdev'])
+ if 'n-failed' in result:
+ s += '\n({} failed)'.format(result['n-failed'])
+ return s
+ else:
+ return 'FAILED'
+
+
+def results_to_text(results):
+ """Return text representation of bench() returned dict."""
+ from tabulate import tabulate
+
+ dim = None
+ tab = [[""] + [c['id'] for c in results['envs']]]
+ for case in results['cases']:
+ row = [case['id']]
+ for env in results['envs']:
+ res = results['tab'][case['id']][env['id']]
+ if dim is None:
+ dim = res['dimension']
+ else:
+ assert dim == res['dimension']
+ row.append(result_to_text(res))
+ tab.append(row)
+
+ return f'All results are in {dim}\n\n' + tabulate(tab)
diff --git a/scripts/simplebench/simplebench.py b/scripts/simplebench/simplebench.py
index aa74b78a04..f61513af90 100644
--- a/scripts/simplebench/simplebench.py
+++ b/scripts/simplebench/simplebench.py
@@ -79,17 +79,6 @@ def bench_one(test_func, test_env, test_case, count=5, initial_run=True):
return result
-def result_to_text(result):
- """Return text representation of bench_one() returned dict."""
- if 'average' in result:
- s = '{:.2f} +- {:.2f}'.format(result['average'], result['stdev'])
- if 'n-failed' in result:
- s += '\n({} failed)'.format(result['n-failed'])
- return s
- else:
- return 'FAILED'
-
-
def bench(test_func, test_envs, test_cases, *args, **vargs):
"""Fill benchmark table
@@ -125,23 +114,3 @@ def bench(test_func, test_envs, test_cases, *args, **vargs):
print('Done')
return results
-
-
-def results_to_text(results):
- """Return text representation of bench() returned dict."""
- from tabulate import tabulate
-
- dim = None
- tab = [[""] + [c['id'] for c in results['envs']]]
- for case in results['cases']:
- row = [case['id']]
- for env in results['envs']:
- res = results['tab'][case['id']][env['id']]
- if dim is None:
- dim = res['dimension']
- else:
- assert dim == res['dimension']
- row.append(result_to_text(res))
- tab.append(row)
-
- return f'All results are in {dim}\n\n' + tabulate(tab)
--
2.29.2
next prev parent reply other threads:[~2020-12-18 15:33 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-18 15:12 [PULL 00/30] Block patches Max Reitz
2020-12-18 15:12 ` [PULL 01/30] block: add bdrv_refresh_perms() helper Max Reitz
2020-12-18 15:12 ` [PULL 02/30] block: bdrv_set_perm() drop redundant parameters Max Reitz
2020-12-18 15:12 ` [PULL 03/30] block: bdrv_child_set_perm() " Max Reitz
2020-12-18 15:12 ` [PULL 04/30] block: drop tighten_restrictions Max Reitz
2020-12-18 15:12 ` [PULL 05/30] block: simplify comment to BDRV_REQ_SERIALISING Max Reitz
2020-12-18 15:12 ` [PULL 06/30] block/io.c: drop assertion on double waiting for request serialisation Max Reitz
2020-12-18 15:12 ` [PULL 07/30] block/io: split out bdrv_find_conflicting_request Max Reitz
2020-12-18 15:12 ` [PULL 08/30] block/io: bdrv_wait_serialising_requests_locked: drop extra bs arg Max Reitz
2020-12-18 15:12 ` [PULL 09/30] block: bdrv_mark_request_serialising: split non-waiting function Max Reitz
2020-12-18 15:12 ` [PULL 10/30] block: introduce BDRV_REQ_NO_WAIT flag Max Reitz
2020-12-18 15:12 ` [PULL 11/30] block: bdrv_check_perm(): process children anyway Max Reitz
2020-12-18 15:12 ` [PULL 12/30] block: introduce preallocate filter Max Reitz
2020-12-18 15:12 ` [PULL 13/30] qemu-io: add preallocate mode parameter for truncate command Max Reitz
2020-12-18 15:12 ` [PULL 14/30] iotests: qemu_io_silent: support --image-opts Max Reitz
2020-12-18 15:12 ` [PULL 15/30] iotests.py: execute_setup_common(): add required_fmts argument Max Reitz
2020-12-18 15:12 ` [PULL 16/30] iotests: add 298 to test new preallocate filter driver Max Reitz
2020-12-18 15:12 ` [PULL 17/30] scripts/simplebench: fix grammar: s/successed/succeeded/ Max Reitz
2020-12-18 15:12 ` [PULL 18/30] scripts/simplebench: support iops Max Reitz
2020-12-18 15:12 ` [PULL 19/30] scripts/simplebench: use standard deviation for +- error Max Reitz
2020-12-18 15:12 ` [PULL 20/30] simplebench: rename ascii() to results_to_text() Max Reitz
2020-12-18 15:12 ` Max Reitz [this message]
2020-12-18 15:12 ` [PULL 22/30] simplebench/results_to_text: improve view of the table Max Reitz
2020-12-18 15:12 ` [PULL 23/30] simplebench/results_to_text: add difference line to " Max Reitz
2020-12-18 15:12 ` [PULL 24/30] simplebench/results_to_text: make executable Max Reitz
2020-12-18 15:12 ` [PULL 25/30] scripts/simplebench: add bench_prealloc.py Max Reitz
2020-12-18 15:12 ` [PULL 26/30] quorum: Implement bdrv_co_block_status() Max Reitz
2020-12-18 15:12 ` [PULL 27/30] quorum: Implement bdrv_co_pwrite_zeroes() Max Reitz
2020-12-18 15:12 ` [PULL 28/30] block/nvme: Implement fake truncate() coroutine Max Reitz
2020-12-18 15:12 ` [PULL 29/30] iotests/102: Pass $QEMU_HANDLE to _send_qemu_cmd Max Reitz
2020-12-18 15:12 ` [PULL 30/30] iotests: Fix _send_qemu_cmd with bash 5.1 Max Reitz
2021-01-01 12:53 ` [PULL 00/30] 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=20201218151249.715731-22-mreitz@redhat.com \
--to=mreitz@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).