From nobody Wed Nov 5 15:38:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497027766265373.33543961299074; Fri, 9 Jun 2017 10:02:46 -0700 (PDT) Received: from localhost ([::1]:55821 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJNJ6-0006YZ-8p for importer@patchew.org; Fri, 09 Jun 2017 13:02:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJNHD-00056z-Po for qemu-devel@nongnu.org; Fri, 09 Jun 2017 13:00:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJNHC-0004id-Th for qemu-devel@nongnu.org; Fri, 09 Jun 2017 13:00:47 -0400 Received: from mail-wr0-x22d.google.com ([2a00:1450:400c:c0c::22d]:33489) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dJNHC-0004iN-NR for qemu-devel@nongnu.org; Fri, 09 Jun 2017 13:00:46 -0400 Received: by mail-wr0-x22d.google.com with SMTP id v104so39319983wrb.0 for ; Fri, 09 Jun 2017 10:00:46 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p139sm355893wmg.14.2017.06.09.10.00.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Jun 2017 10:00:43 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A843B3E03EC; Fri, 9 Jun 2017 18:01:11 +0100 (BST) 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=Xq305igwf68GoY7TpagijCF2pomAUxdWnGhiCPKuLhk=; b=CSXMjExYmhE5t/eCWoMdoniAlj/t/hs8Sfc214kL8Rml3HWxoA5WUI/gQP5ydR2MY5 cMh0yu6kf/RwaCkV7+lVlmvtXJGAYyR/TN4TiGIlVXkPRRydABPPUcxo9bwwM/7xuL4N ls8Dl2dAizOIze169nWQpZlFAbS+Dv0K3goPs= 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=Xq305igwf68GoY7TpagijCF2pomAUxdWnGhiCPKuLhk=; b=DhdYrGjkfgi2QKt0jUo3atMY0XDeSVK9t5fUOMg4OX/juiCbnrANz0sJb787Bec7cJ cMIYcf86hphAGS8PyfOO0XOnjnsMq9n5AbZAaeYQRcUETbTi/uUXyuApX0pzoawuMCeW /2JdBuc4hKaSz6aOtUiHoVV0dzocmKIyaqds/sU1h1CBHV/fnmGMhBJssx65w2r7yzS8 h0sNqIANbWEeQX4YApGpclURPwjmKz2huaX++weo0XqGaMfZNoRhC+xq5YsmDyPkMQE+ MxkB0/1ybLt/zEMLv2cz4baNXw6vHu2u6E+0kPgMwksP83PkfMWoqXyOQuLFrFWu0rcX m8jA== X-Gm-Message-State: AODbwcBQLCVqoVzDnOC8wjAKXSQbPz0Bg2gSDHk3i/3ovglrhJGkhRFq rb4DtBOduL7SZWHI X-Received: by 10.28.5.82 with SMTP id 79mr485037wmf.103.1497027645483; Fri, 09 Jun 2017 10:00:45 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org, pbonzini@redhat.com, edgar.iglesias@xilinx.com, cota@braap.org Date: Fri, 9 Jun 2017 18:00:59 +0100 Message-Id: <20170609170100.3599-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170609170100.3599-1-alex.bennee@linaro.org> References: <20170609170100.3599-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22d Subject: [Qemu-devel] [RFC DEBUG PATCH 2/3] tcg-runtime: light re-factor of lookup_tb_ptr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Just a little precursor re-factoring before I was going to add a trace point: - single return point, defaulting to tcg_ctx.code_gen_epilogue - move cs_base, pc and flags inside the jump cache hit scope - calculate the tb_jmp_cache hash once Signed-off-by: Alex Benn=C3=A9e --- tcg-runtime.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/tcg-runtime.c b/tcg-runtime.c index 7fa90ce508..e987c1f6bb 100644 --- a/tcg-runtime.c +++ b/tcg-runtime.c @@ -147,30 +147,33 @@ uint64_t HELPER(ctpop_i64)(uint64_t arg) void *HELPER(lookup_tb_ptr)(CPUArchState *env, target_ulong addr) { CPUState *cpu =3D ENV_GET_CPU(env); + unsigned int addr_hash =3D tb_jmp_cache_hash_func(addr); + void * code_ptr =3D NULL; TranslationBlock *tb; - target_ulong cs_base, pc; - uint32_t flags; =20 - tb =3D atomic_rcu_read(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(addr)= ]); + tb =3D atomic_rcu_read(&cpu->tb_jmp_cache[addr_hash]); if (likely(tb)) { + target_ulong cs_base, pc; + uint32_t flags; + cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); + if (likely(tb->pc =3D=3D addr && tb->cs_base =3D=3D cs_base && tb->flags =3D=3D flags)) { - goto found; - } - tb =3D tb_htable_lookup(cpu, addr, cs_base, flags); - if (likely(tb)) { - atomic_set(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(addr)], t= b); - goto found; + code_ptr =3D tb->tc_ptr; + } else { + /* If we didn't find it in the jmp_cache we still might + * find it in the global tb_htable + */ + tb =3D tb_htable_lookup(cpu, addr, cs_base, flags); + if (likely(tb)) { + atomic_set(&cpu->tb_jmp_cache[addr_hash], tb); + code_ptr =3D tb->tc_ptr; + } } } - return tcg_ctx.code_gen_epilogue; - found: - qemu_log_mask_and_addr(CPU_LOG_EXEC, addr, - "Chain %p [%d: " TARGET_FMT_lx "] %s\n", - tb->tc_ptr, cpu->cpu_index, addr, - lookup_symbol(addr)); - return tb->tc_ptr; + + return code_ptr ? code_ptr : tcg_ctx.code_gen_epilogue; } =20 void HELPER(exit_atomic)(CPUArchState *env) --=20 2.13.0