From patchwork Wed Jul 1 13:56:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 192149 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp526143ilg; Wed, 1 Jul 2020 07:06:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJygYnIvkmJ1tonDOJ6ECcdbKfESdL88DHoAf5WFA/1YfuwGdyrESZd80LgJg57fvFqdFQQF X-Received: by 2002:a25:e481:: with SMTP id b123mr38221654ybh.126.1593612383207; Wed, 01 Jul 2020 07:06:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593612383; cv=none; d=google.com; s=arc-20160816; b=X3LU5BdVKvWfwMxsGljhWKXr44k5lgEvkPg++2As34dufMYy4avCGK38hVjYWwpT+N qRVPu1cjun7gc+yToKjzQP4ZT1Ektl2T5eu06yotFBXtBj0cmfxEylG0rwAjRB+bUHwD lm1Geqx0ZzgX7Pm1Omw51EFWtid2iEYRZYy9MzeYfq3RDTWPNvSvIMa5e3zJYMWqRwN2 dgTxSbKgEli/nnwZCtTnJ2qtaF4K97JnrCSsekYxnyHFgP70/RJX18+5VdBPpe3P/FW9 vigDGSJt57OkbMmYfEaGgn85ikqPHZy9QvkI1Jw3Ybo8iCDkigOtErbR0poRGCCENN0Y cAgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=utjQK07eZNS2y1B+oG+Ze8AGzZ6ibCv0Se22YqtS0r0=; b=CeKK8xNOVsxSA0YzqwiPGEYZhxFJuSMeye8r0QCHou/HcdJRcjuxTddPaaiDGL/588 fnTbIKbYcXiLZngDvB1U46b1a36yTq0plYEdVu1cScdLdaKFT7iCDnBurm+kufQhocz2 nODYxu4viPlZLN2jhYZ32Lg2SjvRCiJQHxxDKuMdK2aHjnwMQw2HQ9Xw2f44dJONhX2f M94kWX46XlxXiSmt46Kyw9UtTih25ksgtac18BCyh28Vo8r8HVD3z8jLINE4H60Y5qop +dSgulW3nTLNt3eVdz6K78Vln34w5uyzvDts5759p7CILZvIH8o4BlBMTMuzUp6ADiBW //6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ad46nvnV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y16si5883363yby.400.2020.07.01.07.06.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Jul 2020 07:06:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ad46nvnV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqdNW-0000tS-I4 for patch@linaro.org; Wed, 01 Jul 2020 10:06:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqdKl-0004ay-TA for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:31 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:40174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqdKk-0006og-4F for qemu-devel@nongnu.org; Wed, 01 Jul 2020 10:03:31 -0400 Received: by mail-wr1-x442.google.com with SMTP id h5so23977259wrc.7 for ; Wed, 01 Jul 2020 07:03:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=utjQK07eZNS2y1B+oG+Ze8AGzZ6ibCv0Se22YqtS0r0=; b=Ad46nvnVhRJa7GOwUF6AnPDsT5GSEkYL0Xv32G6ZbRoqanH2T5w+tMFHjZm24ISEl2 zkD3Nwp5TcS/+d5bK3IPlpGcjW++hW1STGIGqDM1WavtxNrcbCIC/fFi3CcT+S64Ir9x RDk2gL+he4GlclDc9PqsdxJxZYGF7Ztwd598Z5g8Lfs+bwe9hAp+BgvmMavy9iwjq2/Y QYDdsWpNwZvjyuZlKKymW70JIFidsUBXN8y0zBAMzLjkEF1GLGt263qGGqaTfUIgnONu 5mpaM8h5v7yDcC2n3ylirnCjCqMTWW3FjZVvECxHGZ77DSjVrp8u0AthxU0CPasp0cOj ArDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=utjQK07eZNS2y1B+oG+Ze8AGzZ6ibCv0Se22YqtS0r0=; b=tZa55pEocEWkrb45gemwN/rymCqU4EAfrKAwugQyou6WgmOhX5E7P3bjZr4d0LQD2s aHrnm8RlUs4psmKbret1PkcBUQpT26pc0PHwan78GmHolqCECDOYnUV/OFhyojhOfaKG 2/hHuXjv0uladNatnlRTrRunuZBekJpo5TKuWZs1PnZAU2u6+YwLchwu/o79xzDLI6h1 wpTF4dl8Ox8dWletPMFsTTo339DYUngwL2GGvjOw/9GriY/D/IrxvwYyZ8/CYAbx3TzL lEAXPIv7ZkwiXUuBJiEhzsJp9NwwsYNxAgWK+ghwoQ+TVKwGQNAC9E9uz1Jo/TXlf2nj LX2w== X-Gm-Message-State: AOAM531MjHhoXLv/rZe9wsCRKdJuhU1D4Yr8ncEjxm5PfjGWdIL07VbG OnPsb5lgGgHoDsrVZFWMm3sr2A== X-Received: by 2002:adf:f34e:: with SMTP id e14mr26740295wrp.299.1593612208754; Wed, 01 Jul 2020 07:03:28 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u20sm7006588wmc.44.2020.07.01.07.03.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:03:26 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 54CCD1FF9E; Wed, 1 Jul 2020 14:56:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v4 15/40] tests/vm: allow us to take advantage of MTTCG Date: Wed, 1 Jul 2020 14:56:27 +0100 Message-Id: <20200701135652.1366-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200701135652.1366-1-alex.bennee@linaro.org> References: <20200701135652.1366-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: , Cc: fam@euphon.net, berrange@redhat.com, Robert Foley , =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We currently limit TCG guests to -smp 1 but now we have added some aarch64 guests we can do better when running on x86_64 hardware. Raise the limit for TCG guests when it is safe to do so. Signed-off-by: Alex Bennée Reviewed-by: Robert Foley Reviewed-by: Philippe Mathieu-Daudé --- v4 - only attempt compute a bigger default_jobs is multiprocessing.cpu_count > 1 --- tests/vm/basevm.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 890bbc5549a..21f46d1957d 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -551,8 +551,15 @@ def parse_config(config, args): def parse_args(vmcls): def get_default_jobs(): - if kvm_available(vmcls.arch): - return multiprocessing.cpu_count() // 2 + if multiprocessing.cpu_count() > 1: + if kvm_available(vmcls.arch): + return multiprocessing.cpu_count() // 2 + elif os.uname().machine == "x86_64" and \ + vmcls.arch in ["aarch64", "x86_64", "i386"]: + # MTTCG is available on these arches and we can allow + # more cores. but only up to a reasonable limit. User + # can always override these limits with --jobs. + return min(multiprocessing.cpu_count() // 2, 8) else: return 1