From patchwork Fri Oct 25 14:21:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 11212493 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C64E413B1 for ; Fri, 25 Oct 2019 14:40:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9AD742053B for ; Fri, 25 Oct 2019 14:40:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="kgADHCdX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9AD742053B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:33008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO0l2-0001Lv-1N for patchwork-qemu-devel@patchwork.kernel.org; Fri, 25 Oct 2019 10:40:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44347) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO0Tj-000568-JD for qemu-devel@nongnu.org; Fri, 25 Oct 2019 10:22:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iO0Ti-0001dx-1S for qemu-devel@nongnu.org; Fri, 25 Oct 2019 10:22:11 -0400 Received: from mail-qt1-x835.google.com ([2607:f8b0:4864:20::835]:34774) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iO0Th-0001dh-Tl for qemu-devel@nongnu.org; Fri, 25 Oct 2019 10:22:09 -0400 Received: by mail-qt1-x835.google.com with SMTP id e14so3520995qto.1 for ; Fri, 25 Oct 2019 07:22:09 -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=24f0Uy6XcbwECMx4XXFRdMBRDyDtwvth7GCP6meHv7s=; b=kgADHCdXdWtY86p15cwD2GZzGrzn3MpPEHLIXypNFuGgmPfG7nSjIkEAUYYAZEgloN /lNxfqRTldKQ7NYG4N/9jz1ngwyV+CjGIjkWTK5T4tehGA2DVVURPJbh7PzgZj4obNoy Dh355L1HuvN20ppCiKyqrnRxBo8Ity32ltdmSs8YfvSIFw54pkWq1Z3yZ+LjnT6VeDlS w+zgvZz/NUSckhdC6QpnL5tOn1G3CWKqOTanx7RPOB/TQh/t+iBPQnuMaHh1tfDrGrSu bNbZa9kX3iegaZdzs+bAWKcFRNmF405PemVnL/GGpCpYw9HyRaq4akKqm2fdRDCTE9SI VU1Q== 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=24f0Uy6XcbwECMx4XXFRdMBRDyDtwvth7GCP6meHv7s=; b=p4Qwdle31/BoAwtj8GvSMeKiYTEG+RwWETBinSjxkoDWn0OriFUETCo4MMzjcHrZMe LFdbE3SQQkYq29FQLFqIIY33LDmhVVH/EzpQF971WcI9ftlFNeLU2k1uECEYRAXxN/j1 RvVAf9xPipth03jfHZN/bewlm6uJVI0gcYRB7wFyrc40qSk24vt1ec3Z8cyU3DYDk4kW L1e7umA/zbf/NMiumC8lxLdqULD4yq35xoIaOfxsfxSxjE9/09mSoId/BB4q1SKvvAFY yj7QYtps3vwifri3gCcuKmroNxjGCD956U4DPDytl8/PENLr3IZ8aSJPoSvouQw9jLLW igPQ== X-Gm-Message-State: APjAAAWLOe/32TQfK88gS2ooQueGud9l2kbIdwP5X0l3Bj8cEZPteFlN 4kxNBYDzKUZuXKZ4ZrkA4TeG7TozfMc= X-Google-Smtp-Source: APXvYqxNek+dL37/NsUHaRlWNVK3lr5zY+PsNwRmhSo/HOFp7YHMTyfCG16IkiHc6192GZQPGY2vew== X-Received: by 2002:ac8:44d9:: with SMTP id b25mr3211600qto.347.1572013328903; Fri, 25 Oct 2019 07:22:08 -0700 (PDT) Received: from localhost.localdomain (rrcs-172-254-253-50.nyc.biz.rr.com. [172.254.253.50]) by smtp.gmail.com with ESMTPSA id q17sm1137050qtq.58.2019.10.25.07.22.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2019 07:22:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 06/12] exec: Use const alias for TARGET_PAGE_BITS_VARY Date: Fri, 25 Oct 2019 10:21:53 -0400 Message-Id: <20191025142159.12459-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191025142159.12459-1-richard.henderson@linaro.org> References: <20191025142159.12459-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::835 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 Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Using a variable that is declared "const" for this tells the compiler that it may read the value once and assume that it does not change across function calls. For target_page_size, this means we have only one assert per function, and one read of the variable. This reduces the size of qemu-system-aarch64 by 8k. Reviewed-by: Alex Bennée Reviewed-by: Paolo Bonzini Signed-off-by: Richard Henderson --- include/exec/cpu-all.h | 14 +++++++--- exec-vary.c | 60 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 62 insertions(+), 12 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 255bb186ac..76515dc8d9 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -210,10 +210,16 @@ static inline void stl_phys_notdirty(AddressSpace *as, hwaddr addr, uint32_t val /* page related stuff */ #ifdef TARGET_PAGE_BITS_VARY -extern bool target_page_bits_decided; -extern int target_page_bits; -#define TARGET_PAGE_BITS ({ assert(target_page_bits_decided); \ - target_page_bits; }) +typedef struct { + bool decided; + int bits; +} TargetPageBits; +# if defined(CONFIG_ATTRIBUTE_ALIAS) || !defined(IN_EXEC_VARY) +extern const TargetPageBits target_page; +#else +extern TargetPageBits target_page; +# endif +#define TARGET_PAGE_BITS (assert(target_page.decided), target_page.bits) #else #define TARGET_PAGE_BITS_MIN TARGET_PAGE_BITS #endif diff --git a/exec-vary.c b/exec-vary.c index 48c0ab306c..e0befd502a 100644 --- a/exec-vary.c +++ b/exec-vary.c @@ -19,11 +19,55 @@ #include "qemu/osdep.h" #include "qemu-common.h" + +#define IN_EXEC_VARY 1 + #include "exec/exec-all.h" #ifdef TARGET_PAGE_BITS_VARY -int target_page_bits; -bool target_page_bits_decided; +# ifdef CONFIG_ATTRIBUTE_ALIAS +/* + * We want to declare the "target_page" variable as const, which tells + * the compiler that it can cache any value that it reads across calls. + * This avoids multiple assertions and multiple reads within any one user. + * + * This works because we initialize the target_page data very early, in a + * location far removed from the functions that require the final results. + * + * This also requires that we have a non-constant symbol by which we can + * perform the actual initialization, and which forces the data to be + * allocated within writable memory. Thus "init_target_page", and we use + * that symbol exclusively in the two functions that initialize this value. + * + * The "target_page" symbol is created as an alias of "init_target_page". + */ +static TargetPageBits init_target_page; + +/* + * Note that this is *not* a redundant decl, this is the definition of + * the "target_page" symbol. The syntax for this definition requires + * the use of the extern keyword. This seems to be a GCC bug in + * either the syntax for the alias attribute or in -Wredundant-decls. + * + * See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91765 + */ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wredundant-decls" + +extern const TargetPageBits target_page + __attribute__((alias("init_target_page"))); + +# pragma GCC diagnostic pop +# else +/* + * When aliases are not supported then we force two different declarations, + * by way of suppressing the header declaration with IN_EXEC_VARY. + * We assume that on such an old compiler, LTO cannot be used, and so the + * compiler cannot not detect the mismatched declarations, and all is well. + */ +TargetPageBits target_page; +# define init_target_page target_page +# endif #endif bool set_preferred_target_page_bits(int bits) @@ -36,11 +80,11 @@ bool set_preferred_target_page_bits(int bits) */ #ifdef TARGET_PAGE_BITS_VARY assert(bits >= TARGET_PAGE_BITS_MIN); - if (target_page_bits == 0 || target_page_bits > bits) { - if (target_page_bits_decided) { + if (init_target_page.bits == 0 || init_target_page.bits > bits) { + if (init_target_page.decided) { return false; } - target_page_bits = bits; + init_target_page.bits = bits; } #endif return true; @@ -49,9 +93,9 @@ bool set_preferred_target_page_bits(int bits) void finalize_target_page_bits(void) { #ifdef TARGET_PAGE_BITS_VARY - if (target_page_bits == 0) { - target_page_bits = TARGET_PAGE_BITS_MIN; + if (init_target_page.bits == 0) { + init_target_page.bits = TARGET_PAGE_BITS_MIN; } - target_page_bits_decided = true; + init_target_page.decided = true; #endif }