From patchwork Wed Sep 18 18:02:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 173992 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2777113ill; Wed, 18 Sep 2019 11:03:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqykXoKQ1VDiGSxSY7kTGWqXmx/t47lwfoi1hhEH5M2msjF7X0mL/M1LwcXC8fr7a8Hqs56v X-Received: by 2002:a17:906:4a06:: with SMTP id w6mr8076079eju.214.1568829835758; Wed, 18 Sep 2019 11:03:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568829835; cv=none; d=google.com; s=arc-20160816; b=PAEw8hvElfUJ9SrgBf0EDD2Kg9ef61Q48gKvBPDKzg2Aqz1ONPm4dIvilIFTu2rDHl vwWz3YX9XmSFWy0X1L2/xwWyhk3dR/YqZ6t6gYm+gUA8Dzwvh/62n9R5OIQM77sJaAv9 7KMVIiVX8k9iX0rj7Avub37TxEUOKTAgQ7LfdKcdMSNra1p5N+Iah2XioZWQiG5mLaRM hqQXaEZgSdh8k3o4wYqLUeR++uiCxt7kStAIHBdj0b78ePo38yTNms58LeiwiP/6Z9Rv 9LyEsCpENSg6wjNBmhqcMZcMdltqjWKIVqwMW9pJiURMUKczahCamrxp/G+ANBwTvbrL XQGg== 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:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=YucIarDiughcNjItqw4GzM0WuzRRGrmYnyWJbXHK1Xc=; b=PgjmapPq35GBpokEUSa+XhQWhsY6wu1zZz9RRApem89Z9EiVxdbqyn3yv7Pe/CTl// 7izJLT6JLbTM/ODyN2KLjgxwx0g5B5qQKuvKUJjNQazbDVjh0Lhz3QP7ETItg7J81OVB D5FNwrd51nFrNgVZqu7JE9agTZ2cTtji7eB2ZmK4HSk4CDIEeNTLfkJDbb6HqHrFvYV+ V5lAwl+0UZSd3Wnze8dn6lLdYY/wWAhDH8IAQD2lshAIn1YNVqxaX4f0ROx+Ht97ORTZ xJ6YsUwCS0czME5eW1A1edecnmZurhVx7FAw/KVkSZpGH5a8z3bBmL+J+U1IbM7/SWIm 34fA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=uFGlCSOW; 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 g21si3919744edg.339.2019.09.18.11.03.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Sep 2019 11:03:55 -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=uFGlCSOW; 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]:33902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAeIz-00020b-Dm for patch@linaro.org; Wed, 18 Sep 2019 14:03:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45835) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAeI5-0001y5-P3 for qemu-devel@nongnu.org; Wed, 18 Sep 2019 14:02:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAeI4-0000RE-HV for qemu-devel@nongnu.org; Wed, 18 Sep 2019 14:02:57 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:41085) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iAeI4-0000QG-C4 for qemu-devel@nongnu.org; Wed, 18 Sep 2019 14:02:56 -0400 Received: by mail-pf1-x436.google.com with SMTP id q7so487625pfh.8 for ; Wed, 18 Sep 2019 11:02:56 -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=YucIarDiughcNjItqw4GzM0WuzRRGrmYnyWJbXHK1Xc=; b=uFGlCSOWaQ9pQd3SvbCiO9C6FlvhlqZSoeFpvmgEgvp3iwl1XnrYNWgeu3zb5nUqd3 g2P5J2ghYZUwV2iS7KA3lfqAyOq3Vb/oDz7V7zb3BFWQ1du1w89Q73UzS8ZYRmrUJPdk VkAzEkZ9XcoWj0kmsHR+bNH3f9jxmA8jAftVbTBItI+2Ia+C9Qq6IYqrpxzHIfs7atiX 3n4c+MGZ6TWyd9BnYtbIkr5T1i1dfBvHjhWA8T43KTW8jP2AUKnmFFKi7aCRSNwh2/xq jt8xd9JMbz/WFG+97tLpYltfNdmfkVSARZqo1Or9dADhbKdSBM0BsbZ4uBm+f0nKQiVL tcow== 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=YucIarDiughcNjItqw4GzM0WuzRRGrmYnyWJbXHK1Xc=; b=dPZOaePNTQuy1AyR2mvzCJahFgOJFKAYCnWmzxpRTOoa9MyjQaH/XvYQI59A7TLHJE jGP9vNHK5U2OJ/BZuni+U5NQlVpvxZ0Gh7Q0CDQRf8TKn8rzKAaY5QXUeR3Paeus5I8W Ep4IalCshhwKlXIw56mWZq8pCUm3oC91JLvAcrkNIgSxmGTVZFgqObE1gcgkd3PMpyYI zze8Uzm1urnVRtO5XeXTs58bFKCnHNB1ANGWHX8tPRebr4+JWX5zzS+BCJmXweYHyXU+ GCjfBiRcimNkXmOqj1vKzOG63rTp6g95+ll+7vjaDJ4OWtiQBJB/I0XAjk/1LSFpH/xj GHNg== X-Gm-Message-State: APjAAAX8m3hGz2lPSo//HS2VvGPeZ+rda0yXKFwWPhXrvmaJTtO7dH9F n4blPaAG6i1r+ZaII59/HwKzx+yZcEI= X-Received: by 2002:a63:cf0a:: with SMTP id j10mr5032746pgg.388.1568829774491; Wed, 18 Sep 2019 11:02:54 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id b16sm13319518pfb.54.2019.09.18.11.02.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 11:02:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 18 Sep 2019 11:02:47 -0700 Message-Id: <20190918180251.32003-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190918180251.32003-1-richard.henderson@linaro.org> References: <20190918180251.32003-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::436 Subject: [Qemu-devel] [RFC v2 1/5] cputlb: Disable __always_inline__ without optimization 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" This forced inlining can result in missing symbols, which makes a debugging build harder to follow. Reported-by: Peter Maydell Signed-off-by: Richard Henderson --- include/qemu/compiler.h | 11 +++++++++++ accel/tcg/cputlb.c | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) -- 2.17.1 Reviewed-by: David Hildenbrand diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h index 09fc44cca4..d6d400c523 100644 --- a/include/qemu/compiler.h +++ b/include/qemu/compiler.h @@ -170,6 +170,17 @@ # define QEMU_NONSTRING #endif +/* + * Forced inlining may be desired to encourage constant propagation + * of function parameters. However, it can also make debugging harder, + * so disable it for a non-optimizing build. + */ +#if defined(__OPTIMIZE__) && __has_attribute(always_inline) +#define QEMU_ALWAYS_INLINE __attribute__((always_inline)) +#else +#define QEMU_ALWAYS_INLINE +#endif + /* Implement C11 _Generic via GCC builtins. Example: * * QEMU_GENERIC(x, (float, sinf), (long double, sinl), sin) (x) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index abae79650c..2222b87764 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1281,7 +1281,7 @@ static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr, typedef uint64_t FullLoadHelper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi, uintptr_t retaddr); -static inline uint64_t __attribute__((always_inline)) +static inline uint64_t QEMU_ALWAYS_INLINE load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi, uintptr_t retaddr, MemOp op, bool code_read, FullLoadHelper *full_load) @@ -1530,7 +1530,7 @@ tcg_target_ulong helper_be_ldsl_mmu(CPUArchState *env, target_ulong addr, * Store Helpers */ -static inline void __attribute__((always_inline)) +static inline void QEMU_ALWAYS_INLINE store_helper(CPUArchState *env, target_ulong addr, uint64_t val, TCGMemOpIdx oi, uintptr_t retaddr, MemOp op) {