From patchwork Wed Jun 14 19:48:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9787339 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D733860325 for ; Wed, 14 Jun 2017 19:49:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC166284ED for ; Wed, 14 Jun 2017 19:49:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0CEE284F1; Wed, 14 Jun 2017 19:49:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 30B84284ED for ; Wed, 14 Jun 2017 19:49:49 +0000 (UTC) Received: from localhost ([::1]:50604 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLEIW-00013Z-Jd for patchwork-qemu-devel@patchwork.kernel.org; Wed, 14 Jun 2017 15:49:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLEHF-00012a-1V for qemu-devel@nongnu.org; Wed, 14 Jun 2017 15:48:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLEHC-0008SX-T4 for qemu-devel@nongnu.org; Wed, 14 Jun 2017 15:48:28 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:35998) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLEHC-0008Rp-Os for qemu-devel@nongnu.org; Wed, 14 Jun 2017 15:48:26 -0400 Received: by mail-qt0-x244.google.com with SMTP id s33so2212542qtg.3 for ; Wed, 14 Jun 2017 12:48:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=R0KUieLV3x77Hhe5cLKquBK1LeYuztL3IkrW5KKd/Ug=; b=l7g7cNoPHMO/uGG0JW+dVMRPoR9naHhXqtx8wdab7WEU6VANtv5bLMQnLyksylP6ze S5U0D7vLFBGhsv4HMqeX0Dp/eImKgILce0BR3UMR68/68c+TGdHhJxh2v7urg2MY7GZv YwyXoElyESJDhwONasqLq5BDiypfjznWuYSWdDHRkYFnm4lkZizoL8nRciW7s3fEzX45 h7UoQRdh8FUeokV6mnYSl1Lcx7VZGbNMD50memaRuqcEAk/wMDiNxaR1h704yf0viC5g OEBsmBFtYdN1WgUqYdZM6FQn5R55Bpqm68WcxkGddtXFJEJYnRSbC6aAndpRpVjS0tYY 4HhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=R0KUieLV3x77Hhe5cLKquBK1LeYuztL3IkrW5KKd/Ug=; b=OPLjI9qn+0jbm/1LeetqC0c+MpI7HNU6j5gPrD89SOhlJsVDVpMaJb6v/mlGQLImRE d2j9g1b26dI///0kfk5M/PURRy4x0Jdgyq6B1QScEE/LMxqPUwZkc8OfteKjFiX+Q4OC 2d/cOOhyuUb7tNnKY83buwbYJnQ7vQrw9Kp/OXL7qjHu36gDc74GT4wXTD+AuHVVxACn jpaE+Pqnk1va5XnnGE3aap8NeZ7HIeDFeCcz8OoiwtvBqcAsl//GTn+92NKLAYhTxFlX 9acD/50/ivBZe+4hLpBljyTSPi2EOwoGw2yKyFVtQuRSYDnNvbWdTIDvs05d8QxnxAzZ scaQ== X-Gm-Message-State: AKS2vOxsp6daQej0PmCueGbrsepBQtRams1/JHig3fJaPu4DBls7G2+U /dlgHgAPQJFo03EWPds= X-Received: by 10.200.51.244 with SMTP id d49mr2161027qtb.151.1497469705894; Wed, 14 Jun 2017 12:48:25 -0700 (PDT) Received: from bigtime.twiddle.net.com (97-113-165-157.tukw.qwest.net. [97.113.165.157]) by smtp.gmail.com with ESMTPSA id o93sm628571qte.41.2017.06.14.12.48.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jun 2017 12:48:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 14 Jun 2017 12:48:17 -0700 Message-Id: <20170614194821.8754-2-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170614194821.8754-1-rth@twiddle.net> References: <20170614194821.8754-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v2 1/5] tcg: Refactor helper_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: pbonzini@redhat.com, cota@braap.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP We can call tb_htable_lookup even when the tb_jmp_cache is completely empty. Therefore, un-nest most of the code dependent on tb != NULL from the read from the cache. Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée --- tcg-runtime.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/tcg-runtime.c b/tcg-runtime.c index 7fa90ce..a35c725 100644 --- a/tcg-runtime.c +++ b/tcg-runtime.c @@ -147,30 +147,32 @@ uint64_t HELPER(ctpop_i64)(uint64_t arg) void *HELPER(lookup_tb_ptr)(CPUArchState *env, target_ulong addr) { CPUState *cpu = ENV_GET_CPU(env); + void *ret = tcg_ctx.code_gen_epilogue; TranslationBlock *tb; target_ulong cs_base, pc; - uint32_t flags; - - tb = atomic_rcu_read(&cpu->tb_jmp_cache[tb_jmp_cache_hash_func(addr)]); - if (likely(tb)) { - 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; - } + uint32_t flags, addr_hash; + + addr_hash = tb_jmp_cache_hash_func(addr); + tb = atomic_rcu_read(&cpu->tb_jmp_cache[addr_hash]); + cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); + + if (unlikely(!(tb + && tb->pc == addr + && tb->cs_base == cs_base + && tb->flags == flags))) { 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; + if (!tb) { + return ret; } + atomic_set(&cpu->tb_jmp_cache[addr_hash], tb); } - return tcg_ctx.code_gen_epilogue; - found: + + ret = tb->tc_ptr; qemu_log_mask_and_addr(CPU_LOG_EXEC, addr, "Chain %p [%d: " TARGET_FMT_lx "] %s\n", - tb->tc_ptr, cpu->cpu_index, addr, + ret, cpu->cpu_index, addr, lookup_symbol(addr)); - return tb->tc_ptr; + return ret; } void HELPER(exit_atomic)(CPUArchState *env)