From nobody Fri Apr 26 16:02:52 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=1620119280; cv=pass; d=zohomail.com; s=zohoarc; b=f0KgGrjS7Jp7plFCi+8e2zeFYwqhtGq6/X7WLT7hYIWpRsrxri4CHp4F30lRQ/hS1JB2Ew2xU0tSqlyOYzfVp5WNM4iodNLCQ0JHP49MQdet4R9JUL0zBLp6lVjIDZMwVfjbfQL24CjmwFI1cLIY/WHM+JwuOWAgMZmIbNq+hvA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620119280; 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=FqTohtQH0tSgPL4/tFXOLQEf4hTtSKooRhOLSrjnOJZSbXXUn0ClPlMXHR8k2UX5K3hR72tUfnUC4dAQIBulhGcb0Dm7uFivtun3GZnoNUdKUann0wJ4RN8oXdoBQjbFse8PUWO7u6G1zz7lE+uAo7564w3IFe90ReilYSut8T8= 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 1620119280781973.735471192785; Tue, 4 May 2021 02:08:00 -0700 (PDT) Received: from localhost ([::1]:60900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldr27-0006Fd-Eu for importer@patchew.org; Tue, 04 May 2021 05:07:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqvx-0000w8-J8; Tue, 04 May 2021 05:01:41 -0400 Received: from mail-he1eur01on0729.outbound.protection.outlook.com ([2a01:111:f400:fe1e::729]:27621 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 1ldqvu-0001xi-Ce; Tue, 04 May 2021 05:01:37 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6870.eurprd08.prod.outlook.com (2603:10a6:20b:39a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.40; Tue, 4 May 2021 09:01:30 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4108.024; Tue, 4 May 2021 09:01:30 +0000 Received: from localhost.localdomain (185.215.60.251) by HE1P190CA0024.EURP190.PROD.OUTLOOK.COM (2603:10a6:3:bc::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Tue, 4 May 2021 09:01:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LZjxvqt5AAZ1aftl2CKrdaccjBRadjSDTkvIHdZ+p5FWESQhzOIDs+X5Z8mwHOFkBdlWDg0XsHZJjUPf5C98/fLUKoNV5XVSwuvIrp5HEJxJu5s9VufWubtFL6SXKKU00g8gSpEkA3Mgdq9C5WH3HCdC0IlO2oxvoE5zEBMzlIZUIqGZ92Honxq9KGJVfr3qWo5Yc7jLfSKc9L23OZ64sv0q9jeDJgrhd+GVsUzgT47SUzvrbH6tDDzTXznKw6PfCI4jGp8afhD1RTFvEMa8uS7Y+94t/XBNGYAXCJ3r+VGfZ1oXernbXOk5Na1nOWBN8wnkmKjxoJa5SLWSq1PKNw== 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=hBi5dWd8FoMxxgz0TOo+PV3gV6XwagI0ACwCD4Qvs3SS5y65rbpdN10A64reBOiEDao83V0yYtrS5USss1RpOeDNIh12wPtaGZgrEWemLm1JehlN+FhIhdOtEYcqzCTSzjT2HxLUPPX6GxaTZpcp2VAXe6WhD/LZMD0fs+mtbLNuWfqt3nWRYGOs3tFoWo353g8RbHgCUAXlMMyzoGMpnQJjfoOjGcP94xVtO1F+pcMvck0tlPtJRzMXObSpDUQeS9pHXgt2h5QZEusVvKm90p7pL2ghf2FlGqkcze8FBNO3gViCuvm9w+evMvQ7/4zP58tj+U4wRDHg9OeofdMi6g== 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=rS8WYCfRkg9gJw/B2JuieeuiV5YktRjqG9m+hhtV+SuS5xH5xllIoAouDGmemapF8+6zm+t9q4U/dwe3I2p+2pF6fWv52hJkYepY2nnL8XF0aRPL/+hEBaHJEpP6i2ZRd0cEDXoHca2ZxkNmjTFSlK3HXdww444viD/fGTLwgGY= 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, vsementsov@virtuozzo.com, peter.maydell@linaro.org Subject: [PULL 1/9] simplebench: bench_one(): add slow_limit argument Date: Tue, 4 May 2021 12:01:05 +0300 Message-Id: <20210504090113.21311-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210504090113.21311-1-vsementsov@virtuozzo.com> References: <20210504090113.21311-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.251] X-ClientProxiedBy: HE1P190CA0024.EURP190.PROD.OUTLOOK.COM (2603:10a6:3:bc::34) 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: 5b976c05-753f-4f10-ea20-08d90edb3502 X-MS-TrafficTypeDiagnostic: AS8PR08MB6870: 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: Zckqxp5qL45GuT+/A9tmZbYNirirWcGu2r4K7P070NarxdKW9g2CGzokSEaGBckwSWaM/hVs3UeNdK7OMwAlYLX5qElb88g4AEMHHmPD3WxE7kQRrY2AFZFO6P/D2RP9q4YL3QS9a0ic8x8OVOG7k4UeTQP7MrGWkJYb7ahDDr39LdN5OWp8Um3/P64Fcf995yR8x8Vf9GjfrmhZD0fN/tr+3FuoRocpXFLONtgmTDbdh/W7MDHFuGjliJ0e7yzoTLLwucucr0XUN2GcPAClScexNAgTfEWuNkz4vXWsSxyOkkRvrOMKnUKxkupCjyc+iA7RLbbw3xdNaWE8kop49TqUHTInXGZaCS81/TxpmM6TCPqWfr0v2O4lvQDU8gfy68Ubb8TFJ1pwaWggbDtlQsG8Cx9r7n3R4cT9s6FAFwBkL9EBogeEkAnbPcKUhZJggEUfI3wSpkrwC3dPbe3TA5PGUO8OAqoHVmArXiQtkh8Ps9GW3Ft/vvgc5rVzcAteC35dHV94wL94t2ydYomWFfENzyVsBdnYKwy9L/hufScVhVzsJ7dYx0mkf+lgsB7VS1w+EXKiMz+AtTbhefe6Ny5hd1Tg8vZxxJwty8imQpbczmPdU5ks2slYXLeYZ9gP3GZceOPbetVFNT6/q0E66/cRuEw3z34SLALxBTyhGvI2nsuaTGwvaBuEfR9BlkNX 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)(39840400004)(136003)(396003)(366004)(346002)(376002)(6506007)(6486002)(86362001)(8676002)(4326008)(8936002)(83380400001)(6512007)(2616005)(66556008)(6916009)(1076003)(66946007)(478600001)(5660300002)(38100700002)(38350700002)(66476007)(52116002)(6666004)(956004)(36756003)(186003)(316002)(16526019)(2906002)(26005)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?elUIVuiOPTgIaG4QDiTbT9AZXVHuCaYlMgDz6/nEk8GH9ETroP+DhRG6QXyA?= =?us-ascii?Q?45aQZkhvdy2CdBbWKFQxJ7r/h1lgZAoQ7jmu0qsLVCRCSCEl57n7WGMFEegC?= =?us-ascii?Q?ODeUy2czM32a7cFvh4GWW1M5U0jzR65VplRp8gbPF6WlzN6k2L6WKVMjwuLS?= =?us-ascii?Q?Uztma8GP9eIC5yqZ3cADHZKQgHEtX0uxIkFE7h6JAuaP7QgQjujXP6suZ0Xm?= =?us-ascii?Q?skO1X3tDKQt5sjbjdyfhMT5cSYZITePPr2Y5xeMdlKOtv9Eh2xCAI1Ag44C/?= =?us-ascii?Q?lR8ACyrvjOcpFbTY7pBuRUCSYqn1cyS5S23jSe638ZFxQ5k01Iq6qE5QBzup?= =?us-ascii?Q?3Um+06GJGZZK1mMjnzt0BHZwcn17I8YgDoGH5gratg8oAu6pPLQOw5HpoPKt?= =?us-ascii?Q?n2mGPd8/YINLBTXCQscVM9eORlN7/ycXUOBVlvtLHvhPSw0Sm7e/+r3VCVeM?= =?us-ascii?Q?8STh0TwILNRsff4+25La98yDDQRXm8QZvawjIeN7yFyKC4reZ9f+IBAsVrVf?= =?us-ascii?Q?oCCr3iYrx75OjgEry7rKW+ZB+zjl0GkKK/FpRuaKvv5AC9f3t7NrHpgrP668?= =?us-ascii?Q?Lc+u/hxeXQUJR9tLg8PHAs+jjhSEhJHaxQEv5sne5i+8C6ipw2z+Wqm1GASx?= =?us-ascii?Q?EACll7ph/LbAId0BcMvES2RUx0OPBz77C3Fn25/l1FTD2I6TWfmICGAYlq4O?= =?us-ascii?Q?Mkz737a9f/xSR9cbgAxu34EyZvL3mEu/fcRT75PHgUB+CKeEFDY0u2tCUesI?= =?us-ascii?Q?m+WC0dqrX6lBY+lkoZOqbxhj2t1UxiGzr24/FOz4aeIsnpjEHzZHcmuEC9u/?= =?us-ascii?Q?lJosDq36ZHohxqOGRtwLAeCMXTLNpRaNbquXKus+0d0mu7ESM+h1DbaqGiPh?= =?us-ascii?Q?+InKbDt8CCx5YKHIiCwM34v6Q68AINLCAPnxOZFG7b7MlRrr2JNsybLUWhfy?= =?us-ascii?Q?9cAgCOZYdqUBZGcQq6Q2MDJ0J3dr0M46iPmobopp7kdPeOgpUdSBuc2jWVEJ?= =?us-ascii?Q?+fBr+TJvFgAuCFzW9BiAT2hL58IaPxc4wpyah+lA4U4g3G+Tg/jPcIebx2a7?= =?us-ascii?Q?MwkfUg91/tFNbrCOLVA280SeG0+sDKM5eYedFOacy3ZJVfizG0ILdjdwdirG?= =?us-ascii?Q?VCZYs8rF0fmWNcK//xbPUO5PtjWIIHebUiJLWNPg8NsF9lV2IIUkN8e4gkrT?= =?us-ascii?Q?EWa0fd3g9QYpw4GTesaJije5yo6tz1C8LSjlRcX5tRaDp1Too+R6kc1KjOca?= =?us-ascii?Q?HsjjsPVcKq7De26Hpl3NkJn2LJb7H2uhi9kkg8Abx5Omdu2kxtEVx9+hct/g?= =?us-ascii?Q?+ZkFNgJXhOpoCc6v5Sq+nuGW?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b976c05-753f-4f10-ea20-08d90edb3502 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2021 09:01:30.0950 (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: FkiX2ugnp6Y9riCw70lKv1lWK9odDn+rREemEZiSgcohvBukT9+Hk+SmbyHXvFuHC0ojqjaWAlaOQbbkRUyfwiaY/CMPRv0v5rIEsZMgZaI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6870 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=2a01:111:f400:fe1e::729; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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 Fri Apr 26 16:02:52 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=1620119595; cv=pass; d=zohomail.com; s=zohoarc; b=ZKOxC8B0gOsq8YHjCMlR2f6YoqyOuKbBR/FJODtLoQ++h4ItH5h1A60QNXvCM51q1wHnw2Hbi6/DVeSwdTs+FMygMe/Jf5RLGXJ619zgBXvEXtH6A0osmpuNZQBFce4WPOTd6lmUa10OYpNVA2vVF8BikLe20Z0lcFng6vN2+8Y= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620119595; 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=bzdtan0VH95XeSvdbPr9KwIDBbNtdV7u8ZIN30Z9YMMkMI1JHMYEsZthq24p3Eau6PX0KvguLDqQwyWTJvnyLv9hFQHyg1TVAF6tEXJwllu1XJj+9j3nWCmnCLdGyD01NkTp2K0t5lXNSmEEUZKjLBerX7YnBKeNM+QzaLhUtnY= 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 1620119595027313.01223695029944; Tue, 4 May 2021 02:13:15 -0700 (PDT) Received: from localhost ([::1]:44366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldr7B-00031A-T5 for importer@patchew.org; Tue, 04 May 2021 05:13:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqw9-0000wq-Ke; Tue, 04 May 2021 05:01:52 -0400 Received: from mail-eopbgr130128.outbound.protection.outlook.com ([40.107.13.128]:35166 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 1ldqw2-0001xj-NT; Tue, 04 May 2021 05:01:49 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB5077.eurprd08.prod.outlook.com (2603:10a6:20b:e6::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.38; Tue, 4 May 2021 09:01:31 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4108.024; Tue, 4 May 2021 09:01:30 +0000 Received: from localhost.localdomain (185.215.60.251) by HE1P190CA0024.EURP190.PROD.OUTLOOK.COM (2603:10a6:3:bc::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Tue, 4 May 2021 09:01:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Buu7Vf5WPobp0tj3UGsOZwaaFPXTZSrOGMUqLQHm6GYb4MnxE6PCxSgP0dHgc5ZDApNJQiHvLSqdgWFmu6x6Sl5bdGl+0AhrMPQoQnTeNqDQhoUd/sANGntaHUwA70c54J5/CbTcQ4I9mNmNJIxFQEeZpM0FQIiOghBSxy3Bs30RFt5cqPJ0LQ2/xszOaPI796WW1zPbrdMICwxiSSNqeXpUd32NU349LAQmGRq6UFfS5j3qio4ft35HdMSCCjj7pHf+te3afBH/dS6bJvuvBsLk4ksxXIUW3sVxDSdGkIa+X7AxFz+ZhwP3s7s6LtD1JIN5PHSMexg79r9RCimcCA== 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=Hqm8fV9J8yQRM8XYNMCjnBXia8IcTVJBVBhmUhOezOWUXsRgqdKlFCDamfe8CMAClZXtJjUhc+bU7RU2ds51piGnGXPh/iEFhxj3VmkTOdRrKsSmrhm9I/5Q+sSRk1Hw5tkMYkNnAxDa48Uww5XMcifWVQNBQw9RXoTNYyWHRXPnAOLksxMPGFm5UAvCGuY3wOr1c9BRMBSibCvX5aMLhQGAbnfK5mK+AdtOPlFJe7KgFUX3XTINsapX6j+jEocZVPvGucP1kbvxz1f3fMalfwSyBEc0gj1nV51H1Lq36KruPynWG1j/GF2W1ApzNSSPuCH9kPDxKN2UqkWjCzACDA== 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=UdUMirhJVsaUbW78O8XSqXykOO5UWykoH7AgAyL/5J7QdZJyd7WerEaghEfwwbn1uSOkbqwDEADxdEtb/gdYfLiEUYh49h0eEtbK9XAnaV7oVQ0QAayRr0uNVz+xbb7AdqSFcRMvLTwq9W0OSW4crqsfT+/JBSrte7gxYAewdgs= 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, vsementsov@virtuozzo.com, peter.maydell@linaro.org, John Snow Subject: [PULL 2/9] simplebench: bench_one(): support count=1 Date: Tue, 4 May 2021 12:01:06 +0300 Message-Id: <20210504090113.21311-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210504090113.21311-1-vsementsov@virtuozzo.com> References: <20210504090113.21311-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.251] X-ClientProxiedBy: HE1P190CA0024.EURP190.PROD.OUTLOOK.COM (2603:10a6:3:bc::34) 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: be9b5cd6-0647-4af7-3306-08d90edb3584 X-MS-TrafficTypeDiagnostic: AM6PR08MB5077: 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: thCCqxRSlATCjVEcWTXNCn/vl1ORZMT6QGeHHQcoYJZDZ6Yc27fGC1SAAZ6Bm4X0WwaX/ZGZzb8Zxm46nI73AXZX6Cl47qIcLUZ2YP6xDpEJNQ5xDNs4YHpgjxLg1AHKdp/nasvK2W7x5C+BKaLSLuxZFO/zVas8GnFyBzpme+x78h9dZMQtlw2HPcdACl/oqJoa41kuxypRxDWTFgOIivhUVGt/YLvfDtUiQGs8M0rh/EtaMp7I9iLgot0Ld4Cd9NBYYXzYdCLXknDeWRdZQPFAIp5Pbx7jEnk6u/LWBEz1q9J+OCBQBKcRmiiMV2qnN/G+gbENqt8VTMSY7ahT7EbWKUPTQnj2FrMIJy3vOSIc9UGAGj2ARcuyI8DmEOe0LjrbnxIEi77TJIFoJpc4ZCgZFjZsqF+Fu90liP/WT86ahizwWiAThLQm3DknzupdD4X3hj6MxR+2Q5xzfwvI9/VLcRmb4yPID/Th4FT+kA3lg8hXbAyi+mjOe0ZMahCB1geeHgB75wKtKGbyzmTuWnpNGnQURueJ8SzkDd+XJsrZsSpOdAMkYiHdYEy24TSkkK0zJ/Qwm7QRKMKdk5hoMGteiPhtBgInlpZ7mJ9gUsRUTPXd/Gjd6X6kO3gntGOjJ3KF0d9w2uA1ovZ4JTshyYeHp4kJY5za3TYtmR2LUZ2uGJgsFWuLiLgzWQHaoBO+ 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)(366004)(396003)(376002)(346002)(39840400004)(136003)(956004)(52116002)(1076003)(38350700002)(16526019)(186003)(8676002)(38100700002)(86362001)(6916009)(6666004)(4326008)(2616005)(2906002)(6512007)(478600001)(4744005)(6506007)(316002)(66476007)(66946007)(66556008)(83380400001)(36756003)(8936002)(6486002)(26005)(5660300002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?BlowDJAguntAtQJfyO7ls4Eie26A/ZHKHUiCxWDpG5RFqEYaxzwf0QNmuUzH?= =?us-ascii?Q?73t6dRgJC+Sj1668neybI1JEARBfsYeOPdjWIT5OhTaPEA6wowtmjSX3vSwW?= =?us-ascii?Q?9bBkuujIcslrpzD9rb3s6W4l13nOlJmu+vVXFCiWm7ixqj5JWThMC4W/OswM?= =?us-ascii?Q?ofVClatjZ4cqSmJ04MZos8UCq4xvOLLmgVJODd29ys0iyYlEN4k0EagJljM1?= =?us-ascii?Q?66CppU9OAdMlkMEwo8XdBzfexwqdjN2+CrvRInXm13aGeDML0hmUH7KmjmN7?= =?us-ascii?Q?T3necgfX5+1caaLEc9xGWm5BSOHX4lkzWLLjUO3pIRwxp03UP/anRXtEXTwa?= =?us-ascii?Q?GMHEE5qea05DHiHCBAvHrxtl7NdbTAOtVeB1NXdhNSLP4ywuelvekEzLUH7x?= =?us-ascii?Q?zbgRlPtCNRI/RMIuSsJp8QREw4aOzxo0U+KWtxKss7q+ReVmALPRO0ZdM6/h?= =?us-ascii?Q?IIEsbq9ln670KrkcgLJ+rqVCNyZoeP331BUmCWUffS8wTA99NApFxeSgXHtn?= =?us-ascii?Q?aOuBQ6/djXHuxg55MROXJryyjkxnLZWniGjpuGKPz5zcrI7IRnHmYjuXBj2J?= =?us-ascii?Q?cyZRuXesm3ohyqZMIn+IcGYLGHx6jeQGocSkNmnLnQcWn/+FP1CicH1biD5O?= =?us-ascii?Q?jZjmEjL5mAo/0gVljH0Fh/qnyI3NbeEbbDr11XOAdEJwFLgxQR+haavwhr78?= =?us-ascii?Q?suaZcedQbTgQ1c7Qdft6BXmH8iYNYJKcfQ0h1vfQCWzVKaXOBXFCJK6VcIkq?= =?us-ascii?Q?7zDIKneJ1zaYZFB/FY7WYbjWDkyRn12Eed6hvjZIG4JaeJ5zg/Puk3013lvC?= =?us-ascii?Q?w/KynNKNKDwajp19DjSytoiqYasgSq7ngBiOnkaZNr0B1MVfz2+qIZrz5c2d?= =?us-ascii?Q?QZ+wgYUVDbN/DSwPDBIZXLExYcpz2kDI8QnZh/paR6JXxEu4gG9g4uQi+oMn?= =?us-ascii?Q?ResuSGAFMSxHoA8br+OwBrJBEIwWp72lnv+u7eDFJ0PzH4IWfV6CgUAR+oSd?= =?us-ascii?Q?bqC7r3y81LJGheC5BG/ZmmZGhA4CdVFgGQEkwLDe9zP0ZfO+L9/f9oVod1zx?= =?us-ascii?Q?n5HQa61ZxajghsMWk/PJVmkLRSbMvaR1PDdUPteBAnLxKM5xmGY3ci2+FQ4H?= =?us-ascii?Q?pEQgXVeqTDBTP8lJWjnnkPANhTZRqzCSezTDi/gykWXOMSlICisgkewvpIy+?= =?us-ascii?Q?u4OdQHaz50O+9L/FjHT4kHYhbTvUFY2VrbnXt2/tJ03beAokxeuTj/tyISr2?= =?us-ascii?Q?ggw6D6/CthEJStazAU46/tq+hi/u9VAuTFo9d7z6wZA7P62uzz8noq70AqWC?= =?us-ascii?Q?gEGQTdl53qpDtK9IsuAdK1RB?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: be9b5cd6-0647-4af7-3306-08d90edb3584 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2021 09:01:30.9642 (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: zuwQmDLRJSDywDGYr0YB2fOFskSoDeG5sqNfdJPZ6os5zyf2dnQJF+QaXeNm52dy0GtjZAaCan4IflCp9/x9bXkRemfEtzf6FAWP7R+xSbw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB5077 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.128; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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 Fri Apr 26 16:02:52 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=1620119678; cv=pass; d=zohomail.com; s=zohoarc; b=gxhIEg8pF9haasxaIqChWLIxo8dHMbatkeieCt/9NS+W6F62akiCXvHbVtzc3eu/yrAMhmH+RMiPwvomR7Tp8TVrq7PGVHVOJQFGuB/tS1oKe0CpijyCVQvXPOPFiPe9M+JdPahN8nNorMppDvWzC0caT9F1a+bqcZIWg6+pX5Q= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620119678; 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=F7J0F2kCv9j1RpOMsIwfWUI6awCwUnTUP0n3I6f/76ltUV87EfadWHefzTqE8prTF1nX09Bhj1zqiI1YAZtZr+26JqoPsuHqNy+lqrtDTajpOJWizcYCKqAobgTd91IFf3zjOzkkVaxwAAn1O7UsqztPETmg1Sj0ntkW8R2M+yI= 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 1620119678945520.5552150998299; Tue, 4 May 2021 02:14:38 -0700 (PDT) Received: from localhost ([::1]:48012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldr8X-0004ae-NX for importer@patchew.org; Tue, 04 May 2021 05:14:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldqwM-00011J-3Q; Tue, 04 May 2021 05:02:04 -0400 Received: from mail-eopbgr130128.outbound.protection.outlook.com ([40.107.13.128]:35166 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 1ldqwB-0001xj-G0; Tue, 04 May 2021 05:02:00 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB5077.eurprd08.prod.outlook.com (2603:10a6:20b:e6::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.38; Tue, 4 May 2021 09:01:31 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4108.024; Tue, 4 May 2021 09:01:31 +0000 Received: from localhost.localdomain (185.215.60.251) by HE1P190CA0024.EURP190.PROD.OUTLOOK.COM (2603:10a6:3:bc::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.27 via Frontend Transport; Tue, 4 May 2021 09:01:31 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YRxg/3Me0sJIkAwbw63qFT9GmP4IILNiKYEwjwGHrgzVL8m1WZEWQpovVxiPgYYlb1VhovaaHq8RMWWn919xoMwyKspNzmClRkWwx2SLWoglcs+tW0tcLd7yi9fQTg6rkM9xVUKIWFdwe7AVJX09OT7rOeTgmbNsWZRaDbGpx175vfHAsl9s6+ZuTzTC2/PQsu2cmndxrlUmtbObggW7cDDd+uufyCdmMTggDTXs8LdKQcd/Y/pK7z2UnJzS0917OUsj7qQmTnRsrU5b/cQgrMkZQRJDWWjWBkqvHa+do1hv+rsnHc1aG5pJI+K/6TjyDBKeKbylKgTRq9d40VZYRQ== 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=V+OL0O0zk+DQUTjS78AIbXGqXmNl7qbinNJtBlW4kSTqhw+U1vi5SpcOGzrbg4I6aGcBRFRzm/Y56irk1iKVxGf96JcB8y065+QSMlrlAV5IFazRed1ew8U543i1QQXQ6TDlqkGxQQfMSHdAQGo5aL4c+CL1g1wJ9maNuR90xuwrwTIbXeMLXoWthYbdDgFGWC4ePcycWtf3BtxtHFaiP0d0o8njgCKy7AmfYPhCBoYxbd2gTBRrU8RZyaksDqdnMKnbEdNGwlnRZ/5mzqpvOvzro0AJdC75LchugeU9/j9Fk1kEpfSVwB16TAW2HV3Nol9KZmxUh4Botf3/K/4fJQ== 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=Cf+T9Y8DA2uadiddQVPfCga8uRHTl/IlW2c0WUgTWV/RpvFDyf8hl8bwFLBL56oi2p8ZlznBmTwwFEOeASugM82I6snmKyk90AJpxm9W8Ow4O2fljY2zPACSHIDDe0iTA8LToZMWbByklIrSHji0sdw80ylg/QU2KVA8cjktrJg= 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, vsementsov@virtuozzo.com, peter.maydell@linaro.org Subject: [PULL 3/9] simplebench/bench-backup: add --compressed option Date: Tue, 4 May 2021 12:01:07 +0300 Message-Id: <20210504090113.21311-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210504090113.21311-1-vsementsov@virtuozzo.com> References: <20210504090113.21311-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.251] X-ClientProxiedBy: HE1P190CA0024.EURP190.PROD.OUTLOOK.COM (2603:10a6:3:bc::34) 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: 540a08f4-a420-4c2b-140b-08d90edb3601 X-MS-TrafficTypeDiagnostic: AM6PR08MB5077: 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: pLiQXR1ewbBjPE2wiE0nynoZ535hdmfn6D9b5PnzGzXNe7oV981/FL36tyxMT3lNy8TG2X1ZjXQeo7B2MLSxxgfTXa4nfsj4rK8PpjxNtpGtnjANBtGfKO37gA76pAKyu6qXPBZdyBa2VHM6k+TplhTZg9P3DasgoBgJqghSxQeZ8NF3EVenIE/C/f5gqQVtKmZ/KQv9zLGUB/nqhu4bfvY87iVA1bIxfIwfm/yuP/7ckh2VvNfcVeoRsUUeO/ynY1NT24lXxL0y1OOQIZktfkCySUaECfZxilJsQNAZw2iafIRZ1UJOOjAmEFBVPeLrc3W0TAvUNrMH/JZRdfWWOyDFBRTNuwyolaueHegVQgOzHmWxEdyEMz5TYDFG2Ef1t/kpYptZykgmzvKU4WwuwrRCu923bVlJc/KCAg8r6h3Ip+QKpVrsjZ9QTza8nEMwusS4HbZJfdV5jQIcDb+qE4B2359VNfi5ynHIhzcbVQhQSAHqwX8vqA5SwrgLRXtR4tQsUJ+s61J/+8ttfcBwSX65Pmva+SqVs7JECF3GiyEbn1SRgm6F3KbkUn0BPmHZJQt/2GzgDGeaf4CvpLqNf/8h70kBoO2Rc3gG7M7DEdT7wAXIzTzdSj924FPYQ0KvRd0cwEtm8myDOz0Bdv9na7nzCXSXww2ZSeVSsF0i0W2j/PSUTM8ybc0w2XUee+4j 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)(366004)(396003)(376002)(346002)(39840400004)(136003)(956004)(52116002)(1076003)(38350700002)(16526019)(186003)(8676002)(38100700002)(86362001)(6916009)(6666004)(4326008)(2616005)(2906002)(6512007)(478600001)(6506007)(316002)(66476007)(66946007)(66556008)(83380400001)(36756003)(8936002)(6486002)(26005)(5660300002)(69590400013); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?ImcHy+VMEZf75YXqZJfpeZBFS6SQj9hzpxw0Nbsd+y4fAykRWFYOf87dKSVm?= =?us-ascii?Q?Nor4GmtdlR2njgzeCOkVoxCkVwdCV91cetHKFEqfPRDXo1JvfV2rWC1Y0yyI?= =?us-ascii?Q?ePbKfeoR7J+ga3hUH87gPGQhncNiZFwyC9b46sn8U7AqSi40TtlbMTxZs4Te?= =?us-ascii?Q?nzosgGZNQQHZ+tYmXV5rDM+2Hg6tlTezzrALvDb7HGy9B1BgHZCimNX5+Ldo?= =?us-ascii?Q?OaccYqrzJkZrOB9d0jOulg99rOL96/WBmGmmRB/EKc2H+6hALUu/YNiydWof?= =?us-ascii?Q?k+IkTjKJSCk0dSjEmK1C5mymuVMuMzSVEned/iFfnEp07ZWBJ0BCsOYSS34B?= =?us-ascii?Q?EX8v4KyB9kPGf3m5w2rGvwQCSBnT6E2r7uBRrchLISQ0GnsD2uxpF25gSdfJ?= =?us-ascii?Q?PmRHNNIwjh4G9P5HpFXKMcV4o39e97jCF4sOw5s0/4QNmqbP5Pd19MGk+MzY?= =?us-ascii?Q?D0B8PqHIjudZZM3W5dqvqhw3FrkoXkOcFawPEyCT9OHk+ypwAU8Lkdbo/xGq?= =?us-ascii?Q?SWEnyP3YIlo1sSay3eFpeaVGzpli5s93E9zROG1p/qNaNe5wLryf8wEYy4rC?= =?us-ascii?Q?6B4lrDtStW6Yyh/e6+eM4+QpWF5/9Z6iq5PBKp2V/PH1M0r0U9WoREmOI/Rc?= =?us-ascii?Q?1Eg5oRsAGlSR0hLmoSqMuut3m+Dq6FE8Mg6tdSUIb/wpV4FhaiZfo4VkXb17?= =?us-ascii?Q?A49nka/7dEfrQR5b6kaNiAcQjpcydLPKItH+dJMJBuyF7EmsiT4sUGlyrycA?= =?us-ascii?Q?eO+rJDxlcqpVGN2U1ynz0aMbn8yDIF6ZX5syyxwiLniWD5vGIF7F3ZlIZLaa?= =?us-ascii?Q?8ruGyZXBHVnINXWPcBv8/+QhT/3V9dLQygjCmaPfeW7HUls0qifyS26kgCIg?= =?us-ascii?Q?hF3NFTXpqDd+y21EMx4c5ojWsLo7AceKMDKaEcHdv/ox7m9d2dqPCwI24s9o?= =?us-ascii?Q?IAbBCcK0AzMkTI0pom5CnBRg/cR0h/r8Y9rAIuntK4NjzQ+fJDShNYI8X2Ud?= =?us-ascii?Q?Pj7KQMwCFy75uYF3oFdwi2cMgX5LYF2sx31WsKjNEMHTBrmCux2mf/IW8qln?= =?us-ascii?Q?cIXu6GCQ3X7QBzaNtosFMwT7JIN4vHdCB8jsFjA1Q8Npm0abaq+USMWA6O0+?= =?us-ascii?Q?0bbJcVlPk584PnqB+tztYTiLQyzg3pcc+hKfya7OdbpWbqQibcGGWYU3Mkbx?= =?us-ascii?Q?AmhnexkeJORnztinUc2HqCstTNfIi51MqsPO65+tqBZuNIXLs5COMWoBqFPa?= =?us-ascii?Q?1GmcV9fmDnZZwrH4fh4TC9B4NXvtvKyDtnHe+25EEAaSQbfejwOpcUT+PFKa?= =?us-ascii?Q?ZH8v32hnlYVddbZinJl7JWJ5?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 540a08f4-a420-4c2b-140b-08d90edb3601 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2021 09:01:31.7537 (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: 9FQSClKbXCUNnLEfYGF94i4eIf+apG64TGseD7G/atpgK9YZ6r+RXYBc7jpLQ8BC0sSZe4OZ0IdqSTgO+qA0MDr1+8WnyU6ogQTrt0AoVDY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB5077 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.128; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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 (