From patchwork Sun Sep 22 03:54:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 174198 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1305393ill; Sat, 21 Sep 2019 20:58:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqxuzIi3HiKxSiNhl4Ssjav+Pk4d9F02eoGZOCa0a8k1HJxt3UvYEkchlZPzLLhqefFviW3B X-Received: by 2002:aa7:c749:: with SMTP id c9mr30443554eds.232.1569124715955; Sat, 21 Sep 2019 20:58:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569124715; cv=none; d=google.com; s=arc-20160816; b=cLU1GjMhBFVB28nfP9Kvfa5XCQCfLwcuMxhiL0dQQ/mkZSGweP7xdnsBH/oWBR9SS8 Zs4vXQCG2/w1Ey4yTokJxwbrVgmmxbWmgTcQkooFQXX/vakqGOi4ymnxWfOIceWM7eZt 9+jHTfaqD0n5YRyiz+rFZaMvEnFP600G6SGIXROV+OxroZSTrLqMnc2gKbMvPMgtm8lt J6Hr9jJkZwz8SAAE1tpTuuz+zO8gR8qv0+A/ix4qLKebttmk2lE80HXv+3DoqALihOGo ZxF2JZap2B1ArL18kPHUaaGMY/5WHna2c5GxpcnEdR1VdHcajiZRjRN9EoA8EtTcu+BQ 1DgA== 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:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=byxOPmOWUxDtiAxAlrSZ0T4d6Z5pot/AQfly4fPI+LE=; b=UUutxaSNPGt022266Fq5ICRkDfNWKlp2XK+yDm9vZW9zgNOSlbQ2qJ6xqNwZ7AwCSm exWkl3PtQrA9QPmfSRXHgMDdDhSxEAWiKkXaoq35twqOBR+7/16VWvL/C8rraD+Eu/7O tlxQLVSn4uXwB3dgV2DuQGWHASrJo/BvdRxlXvM8ml/hOh63MRWV+s0+Vb7cXkppDTIh kFxWY5qzvEfdVLTfybw5pQ4AnXn3WF2tkfAUVITjj5F0DdumxB2wu4VAjBlQzfcMmoPW aFORiBUlpOQ/LfO5yO8KWmeshapu2eXTeKhvdxBIeLmxDVelpb2H3hILzlaD/BjQwONy OwHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=IHq64Hpw; 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 e50si4909007edb.177.2019.09.21.20.58.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Sep 2019 20:58:35 -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=IHq64Hpw; 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]:44926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iBt18-0005Ml-Ql for patch@linaro.org; Sat, 21 Sep 2019 23:58:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40797) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iBsxn-0001LU-7P for qemu-devel@nongnu.org; Sat, 21 Sep 2019 23:55:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iBsxl-00085h-QH for qemu-devel@nongnu.org; Sat, 21 Sep 2019 23:55:07 -0400 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]:42060) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iBsxl-00085K-KX for qemu-devel@nongnu.org; Sat, 21 Sep 2019 23:55:05 -0400 Received: by mail-pg1-x542.google.com with SMTP id z12so5989848pgp.9 for ; Sat, 21 Sep 2019 20:55:05 -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; bh=byxOPmOWUxDtiAxAlrSZ0T4d6Z5pot/AQfly4fPI+LE=; b=IHq64Hpw987w/v4gQ/depF8PupqP1t18Ieyvie54MBJpTzZRG0VgxoZmaSqkYIuFR6 so8NZvhwtWEYnMJO3I2VW1rc4Ng9XO2nRBbXCvxkd/bE4RGoC5lE7c23mpJyV2mnkdpU f4qXjZsGnTNZzC1Lf3j41m6cYSgsmPx/3MaYZGPeyy12gBNFEzYTJjOhrrb8EvcDRCAA RGSHZiYFRUiG5HouPeti5AH/YFsDmf9vG1sautkZOeXaSp73Gev14YIdCLD9AOHsaZvY I7V+KfR+UJLvdPDdxKNyZaiHUm7RYcUIaFz6/hxOg7EKEgunRET32IDZyjvdue3aNtDs E1uw== 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; bh=byxOPmOWUxDtiAxAlrSZ0T4d6Z5pot/AQfly4fPI+LE=; b=CPRV0sssA0ZCt/kJVcz90FVA1KUrb9IS0V/00c1E9wtaQPy2qWDeMoDj5Y1O5ewpH4 +U4GdXOsuMVbfM9aZrEHHayQpwGX80dGH3DcIesrLfxb7H1vWs4iMH/bYj0LJdXqAzx/ JcZQ0+2kxLmn4IT+wBVEW38c5ffNyUIYi90GsH0F9TCL7PebuKcMP+K7APpeUfjXpZMp G6HPNwRIQsYS6Yr3qipg51GA9DO4RAVp7WT8/brUFmEbe/zVlWDJez3y8tjwzy3s50Ki /K6I9+jtHAL5BnLeQuay6LmjvoTMiLTcmE2zk5hCyrDDRinbSbe/buy2JxnERY/aN3uf +MAA== X-Gm-Message-State: APjAAAV0veU+7lFM5oGgfNGYYcLjl6PkkMRFP4HbNezfaQZf04GZAqJD l7X3RKmuHglD17fplW6HxDQkRGxAb9E= X-Received: by 2002:a63:5754:: with SMTP id h20mr22412937pgm.195.1569124504267; Sat, 21 Sep 2019 20:55:04 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id z4sm6452921pjt.17.2019.09.21.20.55.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Sep 2019 20:55:03 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 03/20] exec: Use const alias for TARGET_PAGE_BITS_VARY Date: Sat, 21 Sep 2019 20:54:41 -0700 Message-Id: <20190922035458.14879-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190922035458.14879-1-richard.henderson@linaro.org> References: <20190922035458.14879-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::542 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: pbonzini@redhat.com, alex.bennee@linaro.org, stefanha@redhat.com, david@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.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: Paolo Bonzini Signed-off-by: Richard Henderson --- include/exec/cpu-all.h | 10 +++++---- exec-vary.c | 46 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 44 insertions(+), 12 deletions(-) -- 2.17.1 diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index e0c8dc540c..a53b761b48 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -210,10 +210,12 @@ 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; +extern const TargetPageBits target_page; +#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..67cdf57a9c 100644 --- a/exec-vary.c +++ b/exec-vary.c @@ -22,8 +22,38 @@ #include "exec/exec-all.h" #ifdef TARGET_PAGE_BITS_VARY -int target_page_bits; -bool target_page_bits_decided; +/* + * 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 #endif bool set_preferred_target_page_bits(int bits) @@ -36,11 +66,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 +79,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 }