From patchwork Fri Jun 9 17:00:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 103536 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp301696qgd; Fri, 9 Jun 2017 10:01:17 -0700 (PDT) X-Received: by 10.237.42.15 with SMTP id c15mr41620699qtd.74.1497027677152; Fri, 09 Jun 2017 10:01:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497027677; cv=none; d=google.com; s=arc-20160816; b=IScvsgAZF1yU3ZdMnMRCriu9tIevSToaXdEBBimHFbpool/tvA0H8UhjFUt3NcIcTf CVD8AJzDi6I/k9AVG1mJT9LvcIZoJB+SCQA7r37r2bZM9RtTaFs0YsvtFTrJg21BJr5c /EP/OOnsis50anAUyAeSGlaUPmljTCzhcZ9315mKWwnER7jf+1SPXJDKt5XkSO819Pha x3K6VrtBTbjWch/ijtqlzHoalO8soRoXwAgxp3wem8DBafCq5+TLk4qpFnFZVtX8YpnM wrA0sBkQNv3LMyzayZ2AHFhJIqeuNyxht4JXAAdnUhpltQj5nqHQ9lgXUpCdCi7/jtDU R2ww== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=Xq305igwf68GoY7TpagijCF2pomAUxdWnGhiCPKuLhk=; b=wERAT5Y3NWQHSmnb7zl9T+NcmMNT6vj+kPBG6q+S7n7bD24waUYrslkCfmq8vMldne iXTYedfREM2bxiXqHeXzaMnFrrVmmVeWlmpHbU0sem/yfhCGcUxiPWvxTlAL73fOoRcU x8cBz9r3Mv4FlpgjqXaiIEB3NBfTFliJBly9Hs4gh111a/t1kDlKilbhrpnhZBpc5Upk g3tPHBHVLWqehli5A7EuIjCfXnCtSDqV+VHoJeU+2jgxAS55ZQOhbZI7GRY+fgk+BBXm cq1xQPTU1BGHrX1cEUjmZAYD41CK7JNRYPlitGJnfROVSS1suDqmnDJD0CSYso0sFj/8 34JQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a30si1516889qte.193.2017.06.09.10.01.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 09 Jun 2017 10:01:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:55815 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJNHe-00057v-Me for patch@linaro.org; Fri, 09 Jun 2017 13:01:14 -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) 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) 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) From: =?utf-8?q?Alex_Benn=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 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_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée --- tcg-runtime.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) -- 2.13.0 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 = ENV_GET_CPU(env); + unsigned int addr_hash = tb_jmp_cache_hash_func(addr); + void * code_ptr = NULL; TranslationBlock *tb; - target_ulong cs_base, pc; - uint32_t flags; - tb = atomic_rcu_read(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(addr)]); + tb = 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 == addr && tb->cs_base == cs_base && tb->flags == flags)) { - goto found; - } - tb = tb_htable_lookup(cpu, addr, cs_base, flags); - if (likely(tb)) { - atomic_set(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(addr)], tb); - goto found; + code_ptr = 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 = tb_htable_lookup(cpu, addr, cs_base, flags); + if (likely(tb)) { + atomic_set(&cpu->tb_jmp_cache[addr_hash], tb); + code_ptr = 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; } void HELPER(exit_atomic)(CPUArchState *env)