From nobody Wed Apr 9 17:03:01 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1582944460; cv=none; d=zohomail.com; s=zohoarc; b=XPvg3ixWMx7yCKx1d5QLQzbgHuGXVnT3mHFzg6LNqaOb62cjlQ3PH9SWG8VDzqAd29ayOieTxrf3raeT52YjeJ38LljBzIboesO+1bJOXjzQjO+fzz9BdrhQ3lnpTUWgpinXrNyi+0qpoqF1bsYL8o0uIWMkGurw9nnC+Ft9Ecc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582944460; 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=yoR4lHIMH0qpeMnLjOHbbbErJmJaq6BNdKSX4fGfFYE=; b=UVjEkJUwNQm2CEo2fvkm3sp8rKvgx7srHL7+8pOhUMuS9QFIEDJeyDbDV0IY8chvowsbW9z8/2YzTXiuMOaveaEAtXyXjbTqMuQAbxp+EGmVnacDdi7sh1HGwwtIA6fENY81cCP97cgFglcKIcM9ZKhb8C8PUoOXMCGZADtmBBc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none 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 1582944460158536.8420503102693; Fri, 28 Feb 2020 18:47:40 -0800 (PST) Received: from localhost ([::1]:56564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7sAE-0004Eb-W2 for importer@patchew.org; Fri, 28 Feb 2020 21:47:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42739) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7s6i-00076w-Dr for qemu-devel@nongnu.org; Fri, 28 Feb 2020 21:44:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j7s6h-0003BY-BY for qemu-devel@nongnu.org; Fri, 28 Feb 2020 21:44:00 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:35872) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j7s6h-00038c-4y for qemu-devel@nongnu.org; Fri, 28 Feb 2020 21:43:59 -0500 Received: by mail-pl1-x630.google.com with SMTP id a6so1963337plm.3 for ; Fri, 28 Feb 2020 18:43:59 -0800 (PST) Received: from localhost.localdomain (97-126-123-70.tukw.qwest.net. [97.126.123.70]) by smtp.gmail.com with ESMTPSA id k9sm3649321pjo.19.2020.02.28.18.43.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 18:43:55 -0800 (PST) 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=yoR4lHIMH0qpeMnLjOHbbbErJmJaq6BNdKSX4fGfFYE=; b=u9WwVTAYzRYg3KP4fU5p87GW67pe0yNzYMuOPrhid+PwGKRQnT/i+nEfA1U79/ddSp L8eu4ixwWumA20LPF7uWJ2A225oKetz4cRdxff7HtEOy0OjliXE5CS8bLOKOQBpOJpCZ ifZ8V4lRn/xPJDkgHXWVMnkdesAIztNUQt/czPfH2lJexZe/sq9nA1e6HHWKNc8j+W11 0azNHWJ/7IBoJx0Jaf8dH37X2oEfYaaTOLLRuplhja8EaEXzYOXwuNKyoLZIAaom7GrA vGgIWFRmrAdJXr0DOOz6q6CVDdGEjPq4c0LBfNt4XwOTpVUkpXbanN1xmFt1m2KGXnbb /tZA== 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=yoR4lHIMH0qpeMnLjOHbbbErJmJaq6BNdKSX4fGfFYE=; b=crnmamHFTzQiKU1Wyj42TaOte4YibVRdPFwPpfMGPd8HvMiiSjIw/o+PTooFS2QbO7 dFsi5tK9to6OYMp6uLyC9MPEEk8CDSWPO2RnP0vpmcTYcs0/kwLIQD36snXQqLNn+Tpy AmCtoppFbc0u3a/+gy+iCvD9NlO+zm27wRPCQiEKUwmlqEBxVNW3i/pnp/y3xt167G1j xmjmZXe46Yx7S206S4ZdDG0qNmuKdnIBTJ6YvamfkZtzOfFOMZtZHYfXK3Y2FaMby8rQ qITXjKZ8H3eMzx7f6ur478ubGeoYFuZ/URoD2fIMq6XecAwPSmTp0uRQ5EOjeBy0Mkbb RX0Q== X-Gm-Message-State: APjAAAWo2BeJRswPYQdmEk6tLfg5GLuaVFjBW77iHhFaWTa/EZxduw3C TKkpfIc6h6Dc7Vodq9IcSjDDEPxNrek= X-Google-Smtp-Source: APXvYqw09I/s86W6TGDp3ADpS+xkOCrpnlhBnr8CB3kiWkFU3YUy8ImY1Ejg22fqmNATTO0RxxPilA== X-Received: by 2002:a17:90a:6545:: with SMTP id f5mr8094175pjs.42.1582944236626; Fri, 28 Feb 2020 18:43:56 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 5/8] accel/tcg: use units.h for defining code gen buffer sizes Date: Fri, 28 Feb 2020 18:43:44 -0800 Message-Id: <20200229024347.22826-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200229024347.22826-1-richard.henderson@linaro.org> References: <20200229024347.22826-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::630 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: peter.maydell@linaro.org, Niek Linnenbank , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Alex Benn=C3=A9e It's easier to read. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Niek Linnenbank Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200228192415.19867-2-alex.bennee@linaro.org> Signed-off-by: Richard Henderson --- accel/tcg/translate-all.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index a08ab11f65..238b0e575b 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -18,6 +18,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu-common.h" =20 #define NO_CPU_IO_DEFS @@ -901,33 +902,33 @@ static void page_lock_pair(PageDesc **ret_p1, tb_page= _addr_t phys1, =20 /* Minimum size of the code gen buffer. This number is randomly chosen, but not so small that we can't have a fair number of TB's live. */ -#define MIN_CODE_GEN_BUFFER_SIZE (1024u * 1024) +#define MIN_CODE_GEN_BUFFER_SIZE (1 * MiB) =20 /* Maximum size of the code gen buffer we'd like to use. Unless otherwise indicated, this is constrained by the range of direct branches on the host cpu, as used by the TCG implementation of goto_tb. */ #if defined(__x86_64__) -# define MAX_CODE_GEN_BUFFER_SIZE (2ul * 1024 * 1024 * 1024) +# define MAX_CODE_GEN_BUFFER_SIZE (2 * GiB) #elif defined(__sparc__) -# define MAX_CODE_GEN_BUFFER_SIZE (2ul * 1024 * 1024 * 1024) +# define MAX_CODE_GEN_BUFFER_SIZE (2 * GiB) #elif defined(__powerpc64__) -# define MAX_CODE_GEN_BUFFER_SIZE (2ul * 1024 * 1024 * 1024) +# define MAX_CODE_GEN_BUFFER_SIZE (2 * GiB) #elif defined(__powerpc__) -# define MAX_CODE_GEN_BUFFER_SIZE (32u * 1024 * 1024) +# define MAX_CODE_GEN_BUFFER_SIZE (32 * MiB) #elif defined(__aarch64__) -# define MAX_CODE_GEN_BUFFER_SIZE (2ul * 1024 * 1024 * 1024) +# define MAX_CODE_GEN_BUFFER_SIZE (2 * GiB) #elif defined(__s390x__) /* We have a +- 4GB range on the branches; leave some slop. */ -# define MAX_CODE_GEN_BUFFER_SIZE (3ul * 1024 * 1024 * 1024) +# define MAX_CODE_GEN_BUFFER_SIZE (3 * GiB) #elif defined(__mips__) /* We have a 256MB branch region, but leave room to make sure the main executable is also within that region. */ -# define MAX_CODE_GEN_BUFFER_SIZE (128ul * 1024 * 1024) +# define MAX_CODE_GEN_BUFFER_SIZE (128 * MiB) #else # define MAX_CODE_GEN_BUFFER_SIZE ((size_t)-1) #endif =20 -#define DEFAULT_CODE_GEN_BUFFER_SIZE_1 (32u * 1024 * 1024) +#define DEFAULT_CODE_GEN_BUFFER_SIZE_1 (32 * MiB) =20 #define DEFAULT_CODE_GEN_BUFFER_SIZE \ (DEFAULT_CODE_GEN_BUFFER_SIZE_1 < MAX_CODE_GEN_BUFFER_SIZE \ --=20 2.20.1