From patchwork Wed Feb 26 18:10:17 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: 183916 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp3453582ile; Wed, 26 Feb 2020 10:10:48 -0800 (PST) X-Google-Smtp-Source: APXvYqzgVuyxaKewV4zjMSeEDc2yINa7F0KJdiE3qOXqcGCmZ3UBfRIqlAt/mAM0gTWpxXBWUIxO X-Received: by 2002:a37:9d4b:: with SMTP id g72mr364198qke.195.1582740648506; Wed, 26 Feb 2020 10:10:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582740648; cv=none; d=google.com; s=arc-20160816; b=cSZDqWdJqj+1qRUmcwvVOXLMhI7tLo5zz0Z3CHDx3qnWl+cm+CqsFCcbXbBpUbfEpc c9E1y/feIDsLWBy4f1u6eA4H58lLM5D55VK01kcTSbq5HEXU34RifWtb2wANn2zwkXhd SYKhr8gAau4DX7FKyiM6r6/Sya1kIcOuoM3lNkS4wEefexc/76LtAJiS4IMbAMbIB5iN v/BK4wibvshfFrJJQQWQjwtbn4q3ggnFs97GMBPgT2oZbrGC0FBvReYNREvcRGg3PSEY 0o+6ZwtVGZtaZ7pHry0YtqTuYnF567XAUXc0rg1FW0RhFSgCZKQFrcvsikXeDQBPhbM0 FP+A== 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=BW1rVVuvHSIHaMM8u2a8l8PWRGvK4vmAgMmHgrFc8bQ=; b=NnWgZhYcA/RaX3ra6hYNAcEWlr/Rl99rPWXGyqCuy6C3QA8HYV4YoOSmcciXlEt23u CAXJ5Gtb9M4Tj6COBql/fUHIaADK3KDWCEUVG7sm6/XgmwwxtSMgLAvEfRVF1d9Txj0M SrIsF7abpP5QICDCiETSDYGxT7ToQg37IiDZ6HhxpLJiqykr9nzrlnjT29xjP3KJAoQD L220mJpZ3WQFOdsft4Z01kTQ8LMVBjD/WlhNIjpz5c+zLpB0UNSXtRuwGGLsaCB77FQd OUkKHc3YR3M79tyqpBzuVUdGn7Rd2MHJXuOJSaosOQuGl/b+yJjSjE9l/exb8eN+g4+h 78UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NRWIeo+T; 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 g9si150380qki.29.2020.02.26.10.10.48 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 26 Feb 2020 10:10:48 -0800 (PST) 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=NRWIeo+T; 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]:48320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j718y-0007WL-2P for patch@linaro.org; Wed, 26 Feb 2020 13:10:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40652) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j718d-00076v-Fz for qemu-devel@nongnu.org; Wed, 26 Feb 2020 13:10:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j718b-000642-Me for qemu-devel@nongnu.org; Wed, 26 Feb 2020 13:10:27 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:33449) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j718b-000637-GQ for qemu-devel@nongnu.org; Wed, 26 Feb 2020 13:10:25 -0500 Received: by mail-wr1-x441.google.com with SMTP id u6so4331237wrt.0 for ; Wed, 26 Feb 2020 10:10:25 -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=BW1rVVuvHSIHaMM8u2a8l8PWRGvK4vmAgMmHgrFc8bQ=; b=NRWIeo+TbwqyFHiuPlZeJfbjbxrZkRBenWPlixbEeIHkcZkhUjJOFOYs1KRoDIs1Cc Hr9SN7GFX/7lWvt5hq54iru7ozw0Q5eejip0/yJhULvtM+Q2Ib0LesSOnQ2TUXYDBPU0 4hFdevSeqtsXzulLw0a8IPGGGZix2HTUgVlOTiJ7V57S6iuVhTiJ+UenIOYLTOhRPaqa GUqqUWQJ4GRXQGijmul/6L9dB+hrbyohw5JkdA/MrlJr/O1ZqXA3ob9zzNqOPYnK5RIq 2quzMNw7AzaptbgvYjB8K1tj0nI9h9RfCv0ieXbzvdgHUuNfCOePTm6wyCdB7fvOgmwr VTBQ== 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=BW1rVVuvHSIHaMM8u2a8l8PWRGvK4vmAgMmHgrFc8bQ=; b=hTooTRIYgwY72ahDXbDZdpMvzdqEzWuQg5WpUe+J3hZZ7VqBjVgL6qKA543UHyNE4Q /uOf26dX5P6LORTHb1n8ORqlk9fQTy3oKBu/ipm/C4eI94TR+Uv8JDwQfo93+lYMAmRj nWwb1XHVk/d4T6nH2Ts873dcbWD4nMOOxX3k6cHTdpSsGmPh5ElzkIK7kYJ9GXvYQ/io vJ3e06eluEMGnUobIAGjbJYdePZNIH3N3U01YhYTtBKvV7VcgRciOo1AwDAeW2fzC5H+ bNyUFd0XOhwzg79EaUvEzgqvSZW0O3W3PSfx2poY98wvkL+XnBZe8Wb2gYkE7Z8kdLtz Gacg== X-Gm-Message-State: APjAAAX9RBhDksUI8xfSNdxMx5JJ9mqnFnoF3XxjsvCEzX5RtZOwSKcw GB0c7Nzr0rJsFeW26Kb0CttkGYk7aAM= X-Received: by 2002:adf:f606:: with SMTP id t6mr6780858wrp.304.1582740624387; Wed, 26 Feb 2020 10:10:24 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p26sm3725420wmc.24.2020.02.26.10.10.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2020 10:10:21 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E8FF51FF8C; Wed, 26 Feb 2020 18:10:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/4] accel/tcg: use units.h for defining code gen buffer sizes Date: Wed, 26 Feb 2020 18:10:17 +0000 Message-Id: <20200226181020.19592-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200226181020.19592-1-alex.bennee@linaro.org> References: <20200226181020.19592-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 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: Paolo Bonzini , qemu-arm@nongnu.org, =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" It's easier to read. Signed-off-by: Alex Bennée --- accel/tcg/translate-all.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) -- 2.20.1 Reviewed-by: Niek Linnenbank Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Niek Linnenbank <nieklinnenbank@gmail.com>
 
Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index a08ab11f657..238b0e575bf 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -18,6 +18,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "qemu-common.h" #define NO_CPU_IO_DEFS @@ -901,33 +902,33 @@ static void page_lock_pair(PageDesc **ret_p1, tb_page_addr_t phys1, /* 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) /* 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 -#define DEFAULT_CODE_GEN_BUFFER_SIZE_1 (32u * 1024 * 1024) +#define DEFAULT_CODE_GEN_BUFFER_SIZE_1 (32 * MiB) #define DEFAULT_CODE_GEN_BUFFER_SIZE \ (DEFAULT_CODE_GEN_BUFFER_SIZE_1 < MAX_CODE_GEN_BUFFER_SIZE \