From patchwork Fri Oct 11 15:55:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 176003 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp983454ill; Fri, 11 Oct 2019 09:30:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqwxSrFjwzzXF4Pc+rAFMGeKMhKU3795uaJoQZLn/Fq2NmZJ4MqjZ21G6gFSpyw65XwtCqyl X-Received: by 2002:a17:906:6a8e:: with SMTP id p14mr14620480ejr.137.1570811429857; Fri, 11 Oct 2019 09:30:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570811429; cv=none; d=google.com; s=arc-20160816; b=W35kBkPCoKDsh1l62Z1Lha6qGQKZGdPlB8TGlWBMuD2lBgNV9Ki9YhwP6NR4SwD1bL SCcHLWf7Zuxb5j/rj1hoxXnxjXN6BTE6juhmlHF7EWwJ+vtj2D7KZuYioq2EBRZqgi6u Z2/9xVk7QYxy1oA6LHcQFUmRDJ4IZlkc10bDTB3hMsVx0O7SlsNpBO7Jeh4qXYAaGpam r9EboOWVVJCyHLhyLn6YgrFbG57gGpv73Qa8ExXi/kj2JjwIzPSStSEYFtuYB4/4DC/4 ieiI3gyDqbYYuQA88+xGQdkV/+8uRd/cUjRCvqT6i6P2HESpvXL3SDkh29AnvXEaRsVu ETcA== 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=5TK2BjuSMMDdIP7qbR+6sWroGlmanOV91VZR8RZQmXE=; b=Nm4rX0w3MmQwLMBZh8Ui4ljdFz46nP4absS8LpkAUwu8eOX9qAAeHJK3Zuq5gSmRmL Kmvzgdl9EsAVr+WYR6rjdM6/h+gJ3scoz915K772WlA3jE1hou/sbIi4AoEXZ37NXxJU BtbdATxPSiqzfLI/YBvB4brTsqdEbaj85SafkJXef++8ytQZHkEkFjTrIvYGeleYNp3E ojLaetm/+z0gYjUR+emYgK7o4Hbt/GIrOtm+AYmKj7Orzf5xtknLJaNzDJCSu1CGzSnC uvq5MwwJe4/fBIDkMSVKvbii/iWhzgtyOXBPn6iLAV1t+x7xakQAOXiXgrMOKjhmu3aA a3EQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=a2ptiFRh; 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 v26si5703279ejw.276.2019.10.11.09.30.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Oct 2019 09:30:29 -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=a2ptiFRh; 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]:53886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxoC-0000n6-If for patch@linaro.org; Fri, 11 Oct 2019 12:30:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34022) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxH3-0002nz-Aj for qemu-devel@nongnu.org; Fri, 11 Oct 2019 11:56:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxH2-0007tg-5B for qemu-devel@nongnu.org; Fri, 11 Oct 2019 11:56:13 -0400 Received: from mail-yb1-xb41.google.com ([2607:f8b0:4864:20::b41]:39344) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iIxH2-0007tP-1Z for qemu-devel@nongnu.org; Fri, 11 Oct 2019 11:56:12 -0400 Received: by mail-yb1-xb41.google.com with SMTP id z2so217309ybn.6 for ; Fri, 11 Oct 2019 08:56:12 -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=5TK2BjuSMMDdIP7qbR+6sWroGlmanOV91VZR8RZQmXE=; b=a2ptiFRhsf7+BU+L02eLqokAt4Qi1y0BibWRYxGi/ZF+3m3nbc4NmXIl/R3aDr7ok5 nqTnu4S6Gl9V0/LxPeY+FI6M0M82BVKHVTIWCUnGhi+p+V82kc6Tq0GijY+h65EWCeHY eXeFxPatzoEQe/rbsaFMNviY/nYdUVwPYEUIgahuzhJIVPszMcycLBsLhIjsXSBC/tZ9 nRX/Af09keUd5vo5cotY7UXkAP969d/zgNvxqbR/pzVayxQDRuN7cyh8tNCkH0Yqgzwu lAA6Wl+N4I8fb9S0tIArdmHANmciHVXB3pd076tTQNTY+gAMNNseDkq/6DV6E6qxYYD1 J63g== 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=5TK2BjuSMMDdIP7qbR+6sWroGlmanOV91VZR8RZQmXE=; b=kbUtMGsnxoT1pSxYRof53WO+PpRV82ZP0oX/gFu982djZJ55DUXTnfsPeWfvaozfIA Dnhq/+6nDmrHVNAOK95MDSeyF52tGjHql1wK/yTqG6PKyI52U/o7Umqxsk2i10lt9nWp es6tNAd3mTQA64ENyavj9iZPbF9KJrFuB+DmAoz+i5smC3QE0+8dPDCKVy3g51+d25CC 24TKeFnIlI3avZfs3UgFynMaoYt39RyWSI07RnbGEPkq3eh8qhy2QSaGSVrUlo97rxtR xO7qUWbQxG18OVqs5VihTw4jgW2AI//hVIVLhxv1abHd/EsbDu4HtToLcdKZXpg4MtxE BR2g== X-Gm-Message-State: APjAAAVENVxQOIRu1Yz7O17EqoUOgwcq6BAqOYjQSrUFPuwn1mZk1hHq gC7ZIsANS2Bd/f/GvaOKbVp/f1Q+klc= X-Received: by 2002:a5b:d:: with SMTP id a13mr10962807ybp.187.1570809371167; Fri, 11 Oct 2019 08:56:11 -0700 (PDT) Received: from cloudburst.gateway.pace.com (67.216.151.25.pool.hargray.net. [67.216.151.25]) by smtp.gmail.com with ESMTPSA id d17sm2473139ywb.95.2019.10.11.08.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2019 08:56:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v6 20/20] target/arm: Rely on hflags correct in cpu_get_tb_cpu_state Date: Fri, 11 Oct 2019 11:55:46 -0400 Message-Id: <20191011155546.14342-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011155546.14342-1-richard.henderson@linaro.org> References: <20191011155546.14342-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::b41 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: laurent.desnogues@gmail.com, peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is the payoff. >From perf record -g data of ubuntu 18 boot and shutdown: BEFORE: - 23.02% 2.82% qemu-system-aar [.] helper_lookup_tb_ptr - 20.22% helper_lookup_tb_ptr + 10.05% tb_htable_lookup - 9.13% cpu_get_tb_cpu_state 3.20% aa64_va_parameters_both 0.55% fp_exception_el - 11.66% 4.74% qemu-system-aar [.] cpu_get_tb_cpu_state - 6.96% cpu_get_tb_cpu_state 3.63% aa64_va_parameters_both 0.60% fp_exception_el 0.53% sve_exception_el AFTER: - 16.40% 3.40% qemu-system-aar [.] helper_lookup_tb_ptr - 13.03% helper_lookup_tb_ptr + 11.19% tb_htable_lookup 0.55% cpu_get_tb_cpu_state 0.98% 0.71% qemu-system-aar [.] cpu_get_tb_cpu_state 0.87% 0.24% qemu-system-aar [.] rebuild_hflags_a64 Before, helper_lookup_tb_ptr is the second hottest function in the application, consuming almost a quarter of the runtime. Within the entire execution, cpu_get_tb_cpu_state consumes about 12%. After, helper_lookup_tb_ptr has dropped to the fourth hottest function, with consumption dropping to a sixth of the runtime. Within the entire execution, cpu_get_tb_cpu_state has dropped below 1%, and the supporting function to rebuild hflags also consumes about 1%. Assertions are retained for --enable-debug-tcg. Tested-by: Alex Bennée Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- v2: Retain asserts for future debugging. --- target/arm/helper.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index aae7b62458..c3e3dd2c41 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11249,12 +11249,15 @@ void HELPER(rebuild_hflags_a64)(CPUARMState *env, int el) void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, target_ulong *cs_base, uint32_t *pflags) { - uint32_t flags, pstate_for_ss; + uint32_t flags = env->hflags; + uint32_t pstate_for_ss; *cs_base = 0; - flags = rebuild_hflags_internal(env); +#ifdef CONFIG_DEBUG_TCG + assert(flags == rebuild_hflags_internal(env)); +#endif - if (is_a64(env)) { + if (FIELD_EX32(flags, TBFLAG_ANY, AARCH64_STATE)) { *pc = env->pc; if (cpu_isar_feature(aa64_bti, env_archcpu(env))) { flags = FIELD_DP32(flags, TBFLAG_A64, BTYPE, env->btype);