From nobody Thu May 2 23:53:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1616507606; cv=pass; d=zohomail.com; s=zohoarc; b=cBkgnJqoXTPc1MmqbNI9VQQpPW70eMprPMro9saWoqqjqFoGH6tAL1/9mQEpoy+mPzRo0B9kY0vI12HFhRBOz/41mUCDP7MXyEcZdCr+tfuBbhohm6sW3LXPRW9tqzmDV4uE+CNZwhGIaJF6AcgBt318hMjOoF7vfoqhq76TnR4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616507606; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZHQ7ac2wPzOOmfJru0WutQsluIcD0iKdcjdz4ruWVGM=; b=gLqYcMG3BLj6RvPfJvIsDFiaEM1kTA+m9x5HkXb3s7WaV+o98Hhp90ytH/VIV/SGWThF4lsHyfOPhlCmDzmWgizlqHcP15gA4Fn5doykT+FGPjWWl6M7heObbqhzVTtbsjB+8elsa6GDa3Lc3BCV9yckg+bV/90gff4wwfvbz8s= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616507605496652.4283191529852; Tue, 23 Mar 2021 06:53:25 -0700 (PDT) Received: from localhost ([::1]:42576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOhTI-0006Vv-Br for importer@patchew.org; Tue, 23 Mar 2021 09:53:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOhOT-0007Ck-RL; Tue, 23 Mar 2021 09:48:26 -0400 Received: from mail-eopbgr130102.outbound.protection.outlook.com ([40.107.13.102]:31392 helo=EUR01-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOhOM-0001rq-6S; Tue, 23 Mar 2021 09:48:25 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4070.eurprd08.prod.outlook.com (2603:10a6:20b:a3::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.27; Tue, 23 Mar 2021 13:48:00 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%7]) with mapi id 15.20.3955.027; Tue, 23 Mar 2021 13:48:00 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR05CA0184.eurprd05.prod.outlook.com (2603:10a6:3:f8::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Tue, 23 Mar 2021 13:47:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Afr14d+mvJWjixnJaanTrA+0ItDX8ineuLS2PrLbw647Z8YG1TPKbCtXxPnkKEJcZ0aUSNV8Wf80tgxdJbswEThu9rV3DnHlDwZBtZxa+cVlmQzxwGtZ/6+VHnZiWmUj8SxYO3vU9GYlZlOVRWmqL20FVJDl9zYtBHNyC5Sx8svSlYudpm3Uz42EAMRB2btWKPRXxesjr9vSp3Kil9QyOtCDFIU6nu13AAOswiKtUaKCJ3kigk5TWTBFQ9K/pZmuVVR8l0DBoKRXiQtfvLrwXn+cnhcNmfUFyBFZp/g01bDdTvmqA7dnWQYfBj0zekQqzejFjcOm7xP/y9KAVloy9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZHQ7ac2wPzOOmfJru0WutQsluIcD0iKdcjdz4ruWVGM=; b=EObX24zUre3VsUaD85VQcMhKMTn5qGShtQW9ZFZ71w1Rcov5eK4qRtuqwUzCYC79cq+wqr7tEpyBX1I87L47x6+Ga1jc2MsompIfuZ7mnKPkxPYGEEjWgQcnSWrrgZhE0Tka+y3zVvqFx61vul6e3zxEslIi3IK7+HD4YqUaGZCNleqBZJ5s0L4uVEawRmef9fVawYBJ8Bs2fOgrpd/OdgO470IjbEgwDTCWcLZi05bvK6u/3Dbdbj4/rsKXFjLU3vvVwjQeOKOgrc+XOhtMb3N44NoBSlQ9Bk5uHa2u7ayqMYK5TIzj45rjtxDFys3LF5UE9nuiBrbTRvbLJTdpaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZHQ7ac2wPzOOmfJru0WutQsluIcD0iKdcjdz4ruWVGM=; b=tVkfQBurRG9/GYEA94jKxXCzkT8ObX+MnSekhC8nMb2LgNEpjJoGquNBZTEasjQjkJWj4g2DHeXifqWrAlqyk+5w78QP0xgzsqs0XI4ki68jmdxKaa+ZeMbbb8oLjCDSoRxSe3Bwhvei/eOwh0ALY/9m7smTz9gNYh89H8skvmU= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, den@openvz.org, vsementsov@virtuozzo.com, mreitz@redhat.com Subject: [PATCH v3 1/9] simplebench: bench_one(): add slow_limit argument Date: Tue, 23 Mar 2021 16:47:26 +0300 Message-Id: <20210323134734.72930-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210323134734.72930-1-vsementsov@virtuozzo.com> References: <20210323134734.72930-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR05CA0184.eurprd05.prod.outlook.com (2603:10a6:3:f8::32) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fa356c8b-c7c0-4476-11c3-08d8ee02459b X-MS-TrafficTypeDiagnostic: AM6PR08MB4070: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O6iP9Us0TxYhrkcfwyHjSPhCFLWlX/PS24xtFGexl1Sv98gciSUDmXSxFNqPkD6sY3CNpKiWCMbKWm4TqsBd8agfolW7FpKKDvbKcRlmdrew2l9Elg38sS0QfmEvmTosik0AJ4t6fvOGeVpnxj1DRyFHGGz3SMF74hfSy9QFwBoOYKdYA9lkecZIqeFVpeFzRH9gQjhjwIShFZRkY++wLg2OZYpmnaYrO8a89l90sSgYjGb+YOL3wS8SFBtaIk0jydDMgWQdOIXYHAjvuZ4hnJfJPGezxQrpZIqq4wBQl8Vk0skqZa+K7foo8iMtVjQWd1oCDH5OC2EvR9ArcnywenH4gQJ/exaNU8Rp+dt5XnDs6yHiwbUh0niQx5MJKHNwadg/1Cuqy9yZvZigBToqt6J3uX3HMaILwiVmwRDEX8pm3W+jTroH+8cClpRtWEw+i6KWbSgU4gHcbi/JHhgqg6DSUmC0JDsXuWCEz2UIZVD/oYxdxEuC0xtcTMJTBxtyZGxV4OY9JbzesimlGrd3DrAnPJRNlKBoURiHXtxSK+ppbNJMOrdZkUQDIZ/pyAeng4pqNd6nA5H0GAEfvuQzZRfK57e5gOFdf2pC/VoZy2krjiipILjZ/8nTCRIK6Evu7Cm3UNSkunvOSuI/UPJZrzUax0F+lRJLjQ9ZbxCGnYi7IRPVuVtRy4oXsNVC8/CK X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(396003)(376002)(39830400003)(346002)(69590400012)(52116002)(8936002)(6916009)(8676002)(1076003)(66476007)(6506007)(956004)(83380400001)(66946007)(4326008)(6512007)(5660300002)(2616005)(36756003)(38100700001)(478600001)(66556008)(316002)(26005)(16526019)(186003)(86362001)(6666004)(6486002)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?TU3jtzRdsXIJ+Cu0jsJ1u1MXrlrQGrNjnlMZ4DlypuV271Iyos0XwOzmJwAT?= =?us-ascii?Q?WsnIjRClhoQqdc+oUzHRQiMNBwiW80B2EqMQNhCB5nA+D8BKX0KMRwPiwdM8?= =?us-ascii?Q?J7SVkKFH66cNKhbokYX+d+yu/uMjQii3WdveY5OIPUifaBlCbQ3ffemF/Z7d?= =?us-ascii?Q?o2eAP9ZPzXAGvWE9aInKAnUcZn7YSW3ublSlrFHZ7YnjfnR7zcjhDsCPgG/E?= =?us-ascii?Q?GLjHbXDJWQVB2l8ouOjbbk4AHgfvKXdQF6w7rRzs18QKDACuPvVi0K4mGJRI?= =?us-ascii?Q?HM8jYcfuxyNnZMWIxRgR5XiLl9bw09/6+8XS9p/zyEhZ1HLy1jxRF1E++5SB?= =?us-ascii?Q?wTPh8tBPlYTUvUhb5Y0cU5IdDAmwp6huJ1BXu0Gvy0F7QNGT1ot8Xf+LGKib?= =?us-ascii?Q?IobAzxypccD87lrvMT9C/19kLlktFK86vTmV0Vi1IF6n12lQ+SdCFVzEmAqm?= =?us-ascii?Q?wmBnP9vowUrKPkcYb3qDYdEM4P6nEmx9TbFmKSPrnKUD/zxApfEQCwIfVzm2?= =?us-ascii?Q?0XsXY6pW6+diZqpOk+8gI9tHT5Gq1PanwIYvJnQ57HmkJoSDePHeEhJuEyd/?= =?us-ascii?Q?Rty41IaGEKDQ6kBEgjyvRnEkbqY2+8B2OCG/5X0kJAAhG4sBi1JRxkunijQQ?= =?us-ascii?Q?XCwcKuNiP4TgvAiDZg2uFTra1rPS4Wc+oKpUJi7OUrf56RESSj/7y6MjaTOs?= =?us-ascii?Q?itvxtEqFQySF4hPikTRDsd0uhwoJRCefzPa/skk3WLILPq9+5CxjmrVk6flK?= =?us-ascii?Q?Mb6IVjGg7+JihfIIpfWIDwnQYiuR0rwdrpvotqPpFbfrgzmy92JIw8i4/DIT?= =?us-ascii?Q?7VLcVbQAxpBoEZJiJgQKE8F7jz9B785fphkoIQLcA3voQuAMQBrOtayf+bvm?= =?us-ascii?Q?tYktJT682JYj71kRfjoFEOJd9vCTh9NIBeib/hrsBw9/DnpCUIWIEcCcsZ/M?= =?us-ascii?Q?l2l25sFameVvGvvS4FpZCCU/xJ+o2zGejJIkB7PKWrU+RrUgEuRJrgdpY56S?= =?us-ascii?Q?kuocONDQ8rDb2GGGt3kM0fVrEDGnt7lBpDG2fqWn0xdxH84DOtkyBO/9XbpV?= =?us-ascii?Q?IiWYD4xwuWy2nAkqckRH3v+CkNvVBaB6ATAlAbNRCm4xdRcFRfW7mAO3md3P?= =?us-ascii?Q?d9pI85SvHkZ2ck2Jhjwnk4z9kNNHCAZANtdv9/t3A0cazKzsBvUaF7b8LRao?= =?us-ascii?Q?q8VEFP7xq8E2RVC//6FdtH8WA+A07tmAQODeJGUNXjGX+crSNjV2iV6HRpyB?= =?us-ascii?Q?cqIfJn10SfMBAejVldbRqRdPxTirrPX6iXD1UIs+LAN8xtk7BMMhiIYtkJ0U?= =?us-ascii?Q?0KQDwrwYPAPzqi7kLC0I5B4w?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa356c8b-c7c0-4476-11c3-08d8ee02459b X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2021 13:48:00.0052 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1b9QNvE863WjiaJ/YjUGHIeLlUdB/KG+rRoAioz5bOI3Ajro6LybvEzYuptbSRFpkfyg1N2CVbp32xkOlR/eTzE+PLaXGUSq9UxzIm11c08= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4070 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.13.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Sometimes one of cells in a testing table runs too slow. And we really don't want to wait so long. Limit number of runs in this case. Signed-off-by: Vladimir Sementsov-Ogievskiy --- scripts/simplebench/simplebench.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/scripts/simplebench/simplebench.py b/scripts/simplebench/simpl= ebench.py index f61513af90..0a3035732c 100644 --- a/scripts/simplebench/simplebench.py +++ b/scripts/simplebench/simplebench.py @@ -19,9 +19,11 @@ # =20 import statistics +import time =20 =20 -def bench_one(test_func, test_env, test_case, count=3D5, initial_run=3DTru= e): +def bench_one(test_func, test_env, test_case, count=3D5, initial_run=3DTru= e, + slow_limit=3D100): """Benchmark one test-case =20 test_func -- benchmarking function with prototype @@ -36,6 +38,8 @@ def bench_one(test_func, test_env, test_case, count=3D5, = initial_run=3DTrue): test_case -- test case - opaque second argument for test_func count -- how many times to call test_func, to calculate average initial_run -- do initial run of test_func, which don't get into result + slow_limit -- stop at slow run (that exceedes the slow_limit by secon= ds). + (initial run is not measured) =20 Returns dict with the following fields: 'runs': list of test_func results @@ -53,11 +57,19 @@ def bench_one(test_func, test_env, test_case, count=3D5= , initial_run=3DTrue): =20 runs =3D [] for i in range(count): + t =3D time.time() + print(' #run {}'.format(i+1)) res =3D test_func(test_env, test_case) print(' ', res) runs.append(res) =20 + if time.time() - t > slow_limit: + print(' - run is too slow, stop here') + break + + count =3D len(runs) + result =3D {'runs': runs} =20 succeeded =3D [r for r in runs if ('seconds' in r or 'iops' in r)] --=20 2.29.2 From nobody Thu May 2 23:53:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1616507624; cv=pass; d=zohomail.com; s=zohoarc; b=Lnk18jH0Enuo+Z31/7ywdTGDErRP4a1hT9bxMPeHUavjc6Lbobc5Mle48Ch/U9ZhhrIw9wH/Iwfx4FJrh4VciVBXViFdhdk+v3HJdzsM/ZlmAXTg1f4MCGmtBPYJJmm6d59Ks84SXsV0NbqUoRCxx8gqgitiMvZHzKjyiJPKf+U= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616507624; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZQ8qAb8Ee1KlC8mBjDEKJ+xaN3/BIEq9d6ubMefqYDc=; b=OBMwVHLEAjPaBgoj6Rx+EZNlzUf9eP6qVrER80wsU89MoDcwNpG4rSvmvTAhrbyagPd+NkuDXfjnk1neKT6riW0c7Uw2sRqUP7jIXTi2SF3/nQqFr4hkY22WuoGuawPpM01FLtkiut14pHPMWUYOohI++vFJasnKtOsItybzfps= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616507624914850.6161734871207; Tue, 23 Mar 2021 06:53:44 -0700 (PDT) Received: from localhost ([::1]:44324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOhTb-0007nr-Sr for importer@patchew.org; Tue, 23 Mar 2021 09:53:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOhOX-0007GE-1f; Tue, 23 Mar 2021 09:48:29 -0400 Received: from mail-eopbgr130102.outbound.protection.outlook.com ([40.107.13.102]:31392 helo=EUR01-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOhOU-0001rq-J9; Tue, 23 Mar 2021 09:48:28 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4070.eurprd08.prod.outlook.com (2603:10a6:20b:a3::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.27; Tue, 23 Mar 2021 13:48:01 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%7]) with mapi id 15.20.3955.027; Tue, 23 Mar 2021 13:48:01 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR05CA0184.eurprd05.prod.outlook.com (2603:10a6:3:f8::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Tue, 23 Mar 2021 13:48:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lzqBpbS6EJ9++P86x2hQvLOtuJ+/Tkfj62NN9B92C5JYv2irWh+BFM2pbWgNtkNIpd1zDuu5o+dXgxnoQoiHAcDGPJAsrDbPnlU4C7x7KW+CzCkpaYEMCZ5sUJqoVi2MhXHjxXDfygle4mNMY2ty9ruECxoSLlZkMOVETqJs+2OCFawEAqDxgG6qkoRtFmVFFtpPDNCGGkaF2piBfaC46kgw4E3X5x7meqJDAIIEoq6E3EgEHPrchV/lk/JsnOG2RzWamHPNlDt8D1nO/QBIDKYlkvGxw0GX2sSWaO8rDANPG5AoE8NNLanp4CfROeJrg5/NihJudGt4gONoW18MyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZQ8qAb8Ee1KlC8mBjDEKJ+xaN3/BIEq9d6ubMefqYDc=; b=WpAEpN37bVJFY1ZVi+I4dUCieHYmb1P/uS4a7EkOlGcVaoLlWVspAWqMZk3U/KDbZnogw622RJBfIxIFx/YVZfhLnH9TTPM0pKbA/+op+7+fxOk3TbdVRUmNXzbiLKdlB+kr995ydy8446kM3WNLVAeOopIVRz5MPm6thxendGE4GKbPq5cLv00tNHor8Vv2OBmmqCmdCmtFh9kY9f9SoadCkJVL+B0g/1yfkZFDdIFSsntIetyy0Nxo4+nc/rEKiq0ifP56XGmSsC+rxPlSU3Vg01PqbqChOPQde1JJyT5V8IvAfxJDk+ZBTez3jvmLOiabXv3eOYhr82BVZT69mg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZQ8qAb8Ee1KlC8mBjDEKJ+xaN3/BIEq9d6ubMefqYDc=; b=VWbwptPETd3LG5cwCG+3h0P1jtIqgtRAvtWGXQi8dKHL9Z8MNqn/ZeZIz6yfNN5mXqUt2z9WMGAs9SgfyCFmEQBNf0tC5OJIvra/KqNp3OKuBiClqlHEkmFy0YHIkJsKpnObJcEra4exvxi/qcfdlbJtv01HAmhSn5Qjz4bVxvY= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, den@openvz.org, vsementsov@virtuozzo.com, mreitz@redhat.com, John Snow Subject: [PATCH v3 2/9] simplebench: bench_one(): support count=1 Date: Tue, 23 Mar 2021 16:47:27 +0300 Message-Id: <20210323134734.72930-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210323134734.72930-1-vsementsov@virtuozzo.com> References: <20210323134734.72930-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR05CA0184.eurprd05.prod.outlook.com (2603:10a6:3:f8::32) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 633aa85c-a91e-4299-0232-08d8ee024650 X-MS-TrafficTypeDiagnostic: AM6PR08MB4070: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2043; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v5m5QoXkPRdCakie7ncWUjVcFyqvmuxNU5qnUN4LxvofmQvwPL8LMwSw5oZDzpJFLOtYdJFqgBSXlt1ZUTXZMQ3u2TvS8b717bwYkEtxZFWiw5cLrthmxoGqYo5TITYMLNWMO43RKn0goJcosCaSFOnd8NR6HhkJa3N0XFCJtj/ImbM5YSP32mh5fYnGPFrt0wNbW0xM9Ks8xtQNqEuyi0h6D/rOnKbLu4jwU8hIclZGJbGY66XV5DTKD2dbPBITYgarFF9VsNeAYKTiRvMfs6zLNB7a7m7AzO/StQVQFb2GOOGOVKMpL45Lat1D9K17J7lF1YKzgtEOgqBhHONKfuaRuL17vIEirTA1PWyDeDr7V8MIjyueUkYDuZaik6UOidCxGMKlcfS5aVKLYr2IA4HN0jD6ivwT9BQI8FCjkGXju4dA0maEYwAmYoW5qJi7xa0EqkzEV7GMYV9Txe61wtnvVaWh2fwc984F8Q9r8c+f6B1EqUlWRpWMu7Lub7t8CAr/gXrQIrVCeKecrcCFVc3WZwMFGkEU3TsjklY8UFuHHPj9gmPAAB2HdRovRSl/B9SpHXMUDbLEyyAzRj+kNVh2bJPRiRntBMRJramHErh1gwGoCBwm1WhxYOv5b8e2gwY86jqXQDNLfaDZuCPsxmD0tt2kVzaEIgM5vFQ27pPNtfF4jhtPeVjxm3k8HLUz X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(396003)(376002)(39830400003)(346002)(69590400012)(52116002)(8936002)(6916009)(8676002)(1076003)(66476007)(6506007)(956004)(83380400001)(66946007)(4326008)(6512007)(5660300002)(4744005)(2616005)(36756003)(38100700001)(478600001)(66556008)(316002)(26005)(16526019)(186003)(86362001)(6666004)(6486002)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?lrwWtY5qYSHiyKTvHCDpVn5kzj152n9vj6i3Z8uUqx4gmh59d5vCDYqCRyiy?= =?us-ascii?Q?w9i23i15MJOhfcurJIQGIpxXGldbeafFgXf0nJohbGbt00LVaTZVTmk021R7?= =?us-ascii?Q?sCXTg8frAaiMmxwFTQkmSzFNqdZ3pjBWCggZRmmZRsJppwFZFZ54IK0AQO2w?= =?us-ascii?Q?+rp6GMnriLHTCNA72YE6DwdZdjM88m0NwRDQqNm5w2Eg510Z6LxtSBu6nwYm?= =?us-ascii?Q?ooUDck3YyGq+9mBSz2id3s8KtixkqGlDuPTQ9FSV/hOdYbFnwcC0AGMls6hA?= =?us-ascii?Q?fkcw8ds7K4biTvYi70+0U/QC2CMGPQ/0lxtERFwB9jpm4sirRYwf4HmUfSJ4?= =?us-ascii?Q?diAfeSmeh1jPfsBkinK6jKBPYhFFfRuG+HT9BOlNbiyNhbPryEfdIrnWwO2s?= =?us-ascii?Q?DYvtn2+3Ep7kR28FA7aeVPZaT3NrMyBmPdhUgVKkUZltEi1ffoLG44PNMY11?= =?us-ascii?Q?gNO2cOHptCKWFUrC6A2/Tpf38QiGB9Y0UUzuShocZqlUsCYPEKke5AOHSRNR?= =?us-ascii?Q?GGCyxf62rb096Cgn/aCF2n/IzV6GlI8KCnrkLDRh3T/lW06WtvquECIyjeEF?= =?us-ascii?Q?vxpqELjljE81TTsn9l/bJhnrg0mZcNDkH3Smq88ji9x/hQYqrDxG3MYftNSv?= =?us-ascii?Q?nc0/bjsGBszC9jg/18k7w2pn8H5YbxZ5Yhv8x0BQqKjVqimFv78D30axVmbe?= =?us-ascii?Q?3vecgQ7bw+Zmu6OOfHaigKwlSrw91PcXmYfjv2aLgS3j9YJ68rziFXMhT+bL?= =?us-ascii?Q?lky7kbCKA006gFNQttoRzs1GyQ49x2PPtN9Hz6wvZuuf9/2zxaSz7RWVV7Im?= =?us-ascii?Q?nBHLE0L6UlKlZJzSiLZQKyeErY5JU/rtHq5jmgZU3oAkDoeEr9PkGk5CiqFu?= =?us-ascii?Q?TA0sjTQaKVSziMkZHPc2UlJYDNPOaAN0bcemQpIEmkmNZ3ADc+w0gRzVIycU?= =?us-ascii?Q?eV9JT1ys9K7zUHGzJ0p9cn9DmL5eVObrqixg7Y8QBU5rr/R7IiRsPppbbydE?= =?us-ascii?Q?RWiaqZaMy9AgvbrEJ6oz2dGWE5l4uZkk6DW44Cf3WR2HIV7VwnvJTsPhw/Gs?= =?us-ascii?Q?BR+m4FtjdLgGKqlRfxGdmRRJhach09Gzwl/t13tAq+CfoZfw6If8Kwjn7MGo?= =?us-ascii?Q?qLQ17k8c5CfAMfTmMWkSQTPKs8+w2+nZlkOsZLx9ffm4vizktwdtxhNpy3rc?= =?us-ascii?Q?KyUd6F3MyUhCgxxrt7VCED+2iUM2BJiguA8VZ2y6BOcpv2Y5voeo0Eo4RMzB?= =?us-ascii?Q?v/A1crXl9CHSmhOBg8+GzJ4qQuQUMcZ1a+cBzC9EkUzO8Yf0Xohs5J2ma/zP?= =?us-ascii?Q?bsYcfr9GLQTHkEBHgVSHoc/L?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 633aa85c-a91e-4299-0232-08d8ee024650 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2021 13:48:01.1601 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1I39fJfuzPLgsknEEvrwGIgbLnRZIiwcqfm5fKIQEZ4RvCLU2XJqUbdpI5kbLWyn0UrXmWHnF3X0hunYVdDCNsNe3PeYzIzYLUKVaY0eNuY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4070 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.13.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" statistics.stdev raises if sequence length is less than two. Support that case by hand. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: John Snow --- scripts/simplebench/simplebench.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/simplebench/simplebench.py b/scripts/simplebench/simpl= ebench.py index 0a3035732c..27bc4d4715 100644 --- a/scripts/simplebench/simplebench.py +++ b/scripts/simplebench/simplebench.py @@ -83,7 +83,10 @@ def bench_one(test_func, test_env, test_case, count=3D5,= initial_run=3DTrue, dim =3D 'seconds' result['dimension'] =3D dim result['average'] =3D statistics.mean(r[dim] for r in succeeded) - result['stdev'] =3D statistics.stdev(r[dim] for r in succeeded) + if len(succeeded) =3D=3D 1: + result['stdev'] =3D 0 + else: + result['stdev'] =3D statistics.stdev(r[dim] for r in succeeded) =20 if len(succeeded) < count: result['n-failed'] =3D count - len(succeeded) --=20 2.29.2 From nobody Thu May 2 23:53:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1616507723; cv=pass; d=zohomail.com; s=zohoarc; b=W6YQYs7g5jmHcJ1xFzgpp5S+ku1CwNE2DciYqd2s8Pou3ToUdTVLgkFKrcU/sCLvxsxjzJOfF+vAKINKlVQdd8+Ano6A4kVBBwTB4fUvN3SF8C86NPNytZQ+R8dq8dnWP0PDL+Vah5o7g5U8TWSP0JsFr5GKGoIJQ3d+1VPkz8o= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616507723; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+Jk7bpcHmP57dmdGTMhum4TU5RdI78Qv+TLwSse18q8=; b=kciEaa2oEnu6FcdBKjSb/EoVPQ2Pqfg/2CBeN8ieGCkdUawJ1Ge1OTyY8TvfxQNDAp12moX9raFZnTBS1O4tQlZmBMvXj23uCIRJ95kxL7V/SeplvWEUI9/jyuLA9PifidRNKwed4A2haOvdwqsmXX9HVbH3n6/k83l07ZK8+2U= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1616507723888271.8594953692224; Tue, 23 Mar 2021 06:55:23 -0700 (PDT) Received: from localhost ([::1]:49396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOhVC-0002KA-Pn for importer@patchew.org; Tue, 23 Mar 2021 09:55:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOhOb-0007MC-2k; Tue, 23 Mar 2021 09:48:33 -0400 Received: from mail-eopbgr130102.outbound.protection.outlook.com ([40.107.13.102]:31392 helo=EUR01-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOhOX-0001rq-Pj; Tue, 23 Mar 2021 09:48:32 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4070.eurprd08.prod.outlook.com (2603:10a6:20b:a3::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.27; Tue, 23 Mar 2021 13:48:02 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%7]) with mapi id 15.20.3955.027; Tue, 23 Mar 2021 13:48:02 +0000 Received: from localhost.localdomain (185.215.60.202) by HE1PR05CA0184.eurprd05.prod.outlook.com (2603:10a6:3:f8::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Tue, 23 Mar 2021 13:48:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z2FnhZOywx6ELNzhPlS1rYYZAabkU1CQT2AM+SCjyKHSChWQ5q3lrm7IAbHHm31k0w9/7GEVw56kaqBMzuP2giD7k2H6f/g3flMRuHPyNLb5YUI9Y8FEsEOxWiGBI5B7OyeiJkvofyzLIXuqeQiRoSkvXvBALZN9Y7FWhoIHEY5XCx1S1xebC8Z6iZEihKp9fy5rjSkitRVC9b1LbUM8JgFEgAtBkib1Y7246pHmxEmSV7vQisMC86pRIo69p3PdiDW4V+tMVWRRb5rRbuULndY71bOglMIm3FKqZEg8TtCm/3+wJtMyQNIKf4z72Z68szjGS0PmW482x0Aiw/pCuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+Jk7bpcHmP57dmdGTMhum4TU5RdI78Qv+TLwSse18q8=; b=bSc9Ij1ZIAYV1W8YvH0HUJul2jZAqlHWiIKADWNtxZ11t7Hu1vsHXda2S9sEs4yjvSX0PH89jcFOSbXSKYgYl0gt4XY0BqvJzKDpvUQSFANl4FkHUDv0vva/b+f7J5wFXrhyaS/4WrJ7k8b2xkQJabRfjMOV2O7zOAuSClb4qiZE4e55eQ76AhCfk7VkhXUOviTz1S5Rr/KtISXufHpiK0kJTY8V2q+M6h+8XdJLBrqKfGQf1MOYv3936bilPE6pYsqD01wuWl+WRdlmIwd2jNTYTZzs5dy0di74HVmPhiMuryr1gvTJoWPJbEUbB0fVBFg+VNP5OrPfeTcpZzQEHg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+Jk7bpcHmP57dmdGTMhum4TU5RdI78Qv+TLwSse18q8=; b=Mz4GGvgt8S6JdfU4INLeOgHUAwQMeg0pHldfUwePAIrrNLSKLiPOOkbFeh4zfq5+jchC/UfxKHuEkOFQy+IPxUkrYCtEFhJXEiutjpNGfJcMqdZBOMYLmVXe+fVQFRYSxM7t6T9EynV/wKW/58Y50oBXk2gZX/Eq8cdtSm81z/o= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, den@openvz.org, vsementsov@virtuozzo.com, mreitz@redhat.com Subject: [PATCH v3 3/9] simplebench/bench-backup: add --compressed option Date: Tue, 23 Mar 2021 16:47:28 +0300 Message-Id: <20210323134734.72930-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210323134734.72930-1-vsementsov@virtuozzo.com> References: <20210323134734.72930-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.202] X-ClientProxiedBy: HE1PR05CA0184.eurprd05.prod.outlook.com (2603:10a6:3:f8::32) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1e4b02be-cc73-4f6d-e859-08d8ee0246f5 X-MS-TrafficTypeDiagnostic: AM6PR08MB4070: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JheQdQoDkOrGtFVN8ISLrt8czTRFIYarMuXEvWjTiOitBUHNbD2TApjiXX97iqDsZKv671FgtSVFQIvqybkIOzl3FbWjHj3+Nvz+k+freVPR9Q4n8G5ovSoVkFCYCCadXOVqJG4iV7Daf++0Gzr/uRHkIVjqXbxxS3Nnq99vvBTh6Ks6i9sN9W2XtWdy3TsOn0OwPYBeIJq2W2QfMWZC8OqhYs4mwqfnocEHA4Zo3D/v2gyzv7LRk1VPURwQV3rn/WWFPfl/g4wgWr0548USFUPpuJn/IbQVFhK98Q7n49fe3Vrq6iq1QZdBbYvCc2HYFgwepZYUqiz3g6PKJzFokv1nyr/No7/GCT4520SMxH1wbrYpPsak28pyT7WEeT4pHgfO7mSFrh57iUVariFF24z6lOaAD2KyXpc3exdXufvUVi57FxeHnncKnfOwuwNQm/YMkll/KuzA3yYFEDqgK7a6afwJ1vX/ZF74EWgEZVnE/dLRh/Ii2rfnJjgQXDdCSqJxBER4G47EI6jeH6qZL4aMs6xpmlh6p/yjLhyqtyO61lIMFarHS8HKnUHMRrXZ/3PisS9hwwyWID3z14ZRXGnqG/2DEtwbQQBTOb2stZv9Ua/6E5qyDbcL1bgWlwqScNNLS+tSU9b4UqlX7r3PVD7WxYaqH/SB4Jok6cT8GsKMzugtAnaYj2Q/dtp3mraK X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(396003)(376002)(39830400003)(346002)(69590400012)(52116002)(8936002)(6916009)(8676002)(1076003)(66476007)(6506007)(956004)(83380400001)(66946007)(4326008)(6512007)(5660300002)(2616005)(36756003)(38100700001)(478600001)(66556008)(316002)(26005)(16526019)(186003)(86362001)(6666004)(6486002)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?z4EI8WFCtaSMxoue2YjeI2B8gMlrYS0xCZSxyJjSfDBWNBoyXm14xZWXKtV+?= =?us-ascii?Q?AKDo+fqq2UlAkWS6b7RxJNZbwixSgX7ma+g00TVwiNsz93hZ+1FwLblrV8kX?= =?us-ascii?Q?hIYX6tm0OCUxHdBn8eOFVgF9c9zAiFLDjHWa4d0Slrc9rpEbF1hzqz6MmcGP?= =?us-ascii?Q?ScfSEgJM/sVrwrmzHzL+ohaxS81cyORkZIfDWmWMnDupRX1pp3/vrnLjbDvz?= =?us-ascii?Q?LdMovRPZapmUo/7yMUb1FObMf5i29tJbpbR7AXJcXX6oII095DEU5Zz4LFlm?= =?us-ascii?Q?X9Dke+2L4k65WJTW0IuxYFt7OCw1VQIeS0eV7jf+DmBS961J0vbZQBUTbExl?= =?us-ascii?Q?ysNx0A+2ITsm+GmFWhtm3V++2+Pf0KKz2f46UkYQaFDOLb10ADae5oxALqWn?= =?us-ascii?Q?X1GdMKwVvWgd4S/2XKpL5HluLsXQ0Fh42eQHZYOXULPTGxA4cpVKJtnGos1k?= =?us-ascii?Q?BT/G6+JueaDogTPXxf857rLyiQvhsFQY9SEC606bR/D12pAMld4WQghl8A6r?= =?us-ascii?Q?Sh5KiLNAuPcjBvc9eGW3m7REbLIC7ZyslWPJgHrau481JLKKGBUH851MFAUi?= =?us-ascii?Q?5Y7454pEiAkuo4+kugzEAqvgLMfzWHjMUn+sCNGqaxQPaJM9SiLrBP2SDSwp?= =?us-ascii?Q?z14F+n+MWafpyr5YyTYcAegn7McLCODIRDP0+MresDAl/KzaCmEamfCzurM+?= =?us-ascii?Q?RsMc4l//iBjF0ufEssdl25K+xtFnXfwpdg7LuxswhyPaBRt6voKGT3Vlvgr7?= =?us-ascii?Q?sbq888V2ToZDo02Kj8tZ38ij1elU63e8V5WGedvTzyjTV3DlZ4xzWQKcQbzI?= =?us-ascii?Q?KaMD+QLuAPF0tM4VK7YdhvxOGihpZja8rMYI4M0RCFmeFjMvXkQ02qpzWir1?= =?us-ascii?Q?/ggeSV4lq8rUZAlaNC3mEbVWfewAMNDaTRujRHY7znHC8k56CckutsLx01g5?= =?us-ascii?Q?X0zlb8MV2YqOH5CBdOhktBeY5ILJqkv0ifzRP1EX4tJBs+9g3qNSZkUJf+X5?= =?us-ascii?Q?BAVp0WOdrQYrT3XaXM+ys7kBLq/GAiBQ8zwMZKsdj7e+bTANKHQTfUweWv8N?= =?us-ascii?Q?Jzyaiq6F+hWfp4EueBO4IZF5wT0eJLiKD/mB8Z5768mgLOg5x7B//CCj+IzY?= =?us-ascii?Q?2u9K0g80R4wOX29Xm7tU5ICtR6lOz1+j/zwnyWpJG0kNyOLYn22yZfPiFr9x?= =?us-ascii?Q?Frv/oAl9MOS/sCHG9ePcU57ttAgzA0vpldwa4ZBM217/YyAHhs8HptvHlWYU?= =?us-ascii?Q?OtII2FAzyRaHALOntMg3of0jMB+ryO6q1WV6rF7yZ7M9TcoMvL2M7NtzPSr3?= =?us-ascii?Q?8JYxWe5tTPjNUuNL+KPVMjf4?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e4b02be-cc73-4f6d-e859-08d8ee0246f5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2021 13:48:02.3141 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EQzPCDrIIhJGZo+To5RQ57A7foLxo+SSoCFrzMX6z6ix2Bhs26b0LwPUYfxr1k7c6jT5x6gjMCofVFi4m05qUvfE3SDhmyN2ziKSeebjzak= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4070 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.13.102; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Allow bench compressed backup. Signed-off-by: Vladimir Sementsov-Ogievskiy --- scripts/simplebench/bench-backup.py | 55 ++++++++++++++++++-------- scripts/simplebench/bench_block_job.py | 23 +++++++++++ 2 files changed, 62 insertions(+), 16 deletions(-) diff --git a/scripts/simplebench/bench-backup.py b/scripts/simplebench/benc= h-backup.py index 33a1ecfefa..72eae85bb1 100755 --- a/scripts/simplebench/bench-backup.py +++ b/scripts/simplebench/bench-backup.py @@ -23,7 +23,7 @@ =20 import simplebench from results_to_text import results_to_text -from bench_block_job import bench_block_copy, drv_file, drv_nbd +from bench_block_job import bench_block_copy, drv_file, drv_nbd, drv_qcow2 =20 =20 def bench_func(env, case): @@ -37,29 +37,41 @@ def bench_func(env, case): def bench(args): test_cases =3D [] =20 - sources =3D {} - targets =3D {} - for d in args.dir: - label, path =3D d.split(':') # paths with colon not supported - sources[label] =3D drv_file(path + '/test-source') - targets[label] =3D drv_file(path + '/test-target') + # paths with colon not supported, so we just split by ':' + dirs =3D dict(d.split(':') for d in args.dir) =20 + nbd_drv =3D None if args.nbd: nbd =3D args.nbd.split(':') host =3D nbd[0] port =3D '10809' if len(nbd) =3D=3D 1 else nbd[1] - drv =3D drv_nbd(host, port) - sources['nbd'] =3D drv - targets['nbd'] =3D drv + nbd_drv =3D drv_nbd(host, port) =20 for t in args.test: src, dst =3D t.split(':') =20 - test_cases.append({ - 'id': t, - 'source': sources[src], - 'target': targets[dst] - }) + if src =3D=3D 'nbd' and dst =3D=3D 'nbd': + raise ValueError("Can't use 'nbd' label for both src and dst") + + if (src =3D=3D 'nbd' or dst =3D=3D 'nbd') and not nbd_drv: + raise ValueError("'nbd' label used but --nbd is not given") + + if src =3D=3D 'nbd': + source =3D nbd_drv + else: + source =3D drv_file(dirs[src] + '/test-source') + + if dst =3D=3D 'nbd': + test_cases.append({'id': t, 'source': source, 'target': nbd_dr= v}) + continue + + fname =3D dirs[dst] + '/test-target' + if args.compressed: + fname +=3D '.qcow2' + target =3D drv_file(fname) + if args.compressed: + target =3D drv_qcow2(target) + test_cases.append({'id': t, 'source': source, 'target': target}) =20 binaries =3D [] # list of (