From patchwork Wed Jun 14 14:02:08 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: 105522 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp309570qgd; Wed, 14 Jun 2017 07:04:24 -0700 (PDT) X-Received: by 10.31.47.65 with SMTP id v62mr154328vkv.2.1497449064592; Wed, 14 Jun 2017 07:04:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497449064; cv=none; d=google.com; s=arc-20160816; b=CPMm/VoexmxscuyKNGkurFyo01h5ZPE2nLT+sE5pSk63OImSxisV1muUq45FlJbiN7 BlXRylEwpwwyPq3Rhx+oZvtHTysQjEsShvot2XU+cEdHJhk/S50lr4CJq/oC5mI/R8pu tbEYycb29r+bN24P2kcImalvCDU2Wb4nIvY+aKmrkiINlVivvcYQKo0pypyGz5COae9V 9GXcAeW5X6iW6GCzQ6GJdnMlW0cmMcXqy7ZLLUdCAGJFzmPRvx98pczpufmEg0khEn2S W5QIDRNsLTcmqxQQKCsoAVCTuP5CaTY6tGSOuCZzAMN3dpxAqIrsrECz3A1bbqkNwrEo hV6w== 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=gjM9369STrcxFlNMiJb+57+3L63URBsDxRDGawQlRhs=; b=L3NMZdOMA8jz1TBpzQg+nV+NoSlteJxGcQ5f1H9Fmaz0ihZn2XS8KvtHyuZ2uZulvk UxL2uR8Sng9g/elL737PIJ4zZAlj2dB4TEUns/sQ96g3ca/rPiEYKntsG3iPge0EaeVC hmGJlCPJQXW4glHjjp7Nvap/AnZX3ewxII6zZi0WA8/gJ8gN9279QnQbmAuxuwEfwcDu 57BtYjpwYPWWa8mJZ85I6eaPxLczcLvwNwesoJR+ON2kpBLv8NqDMOCyP5pXzq6zxJF+ VxqFDJWhl7jsTZSK8MJ5fyCaDg9BZ7XE74h0BWY9708UsV7MGJA0dUmb9nKbzrwkQFNL 11KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=cKCQ99OC; 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 v128si57828vkd.58.2017.06.14.07.04.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 14 Jun 2017 07:04:24 -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 header.b=cKCQ99OC; 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]:49233 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dL8uF-0008Er-TC for patch@linaro.org; Wed, 14 Jun 2017 10:04:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dL8re-0005rj-Lh for qemu-devel@nongnu.org; Wed, 14 Jun 2017 10:01:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dL8rb-0008GZ-Nw for qemu-devel@nongnu.org; Wed, 14 Jun 2017 10:01:42 -0400 Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]:33822) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dL8rb-0008G3-Ic for qemu-devel@nongnu.org; Wed, 14 Jun 2017 10:01:39 -0400 Received: by mail-wr0-x230.google.com with SMTP id 77so2071192wrb.1 for ; Wed, 14 Jun 2017 07:01:39 -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=gjM9369STrcxFlNMiJb+57+3L63URBsDxRDGawQlRhs=; b=cKCQ99OCO84BTEkizxv3rd2Qaydeeu1m5TIaWxpqabgwXvKqFLwMeNAnNc2UDlK5zY BSKPPmkZtpdrBIRvdN8sHS1/8rDklHD9CCkDGw3tNgo1oHjvJKvVdxmtU23Jr86oh2pt zHgPQi8fRY1E3U0bVgnW/XtkyCT9WeIs3BelY= 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=gjM9369STrcxFlNMiJb+57+3L63URBsDxRDGawQlRhs=; b=gdLvNDOhzRsJGZp8vz8NoKwoEGjFejDIs/Lqrr6ojRVwal0uUNnKfBadFuj9AZyHRe lTxlggoUbi19O4A7Xpl/YoHmBNqJz7sDuSOoB3D0tdziDo7a1+V2r8wDuHRZbs254gUW RqU2kuNHSjzBL1Y/IOJuABqZoiHVIsirCpP9w86PasEI1rYAYrKW5+GTuGRPDnkMsGtv cR8izQwMhp0Qm2zdRHMT0FAOZlPYT4eN4Hei6TlPJbQSC2xres0kri2oWwzU4d3N9VLj w+MghuwcICk14aLbX2qoG54cw0vcF8IPpUHltosbrqiZ2mUJl6aMh62RY/6avymNrqNo l+Bg== X-Gm-Message-State: AKS2vOx8lL+70kISfri3ko/tfPHUbCsgZtfFgJERyLNx1akRaxHzeG7/ 9au/hRL7UcRgQEOs X-Received: by 10.28.19.206 with SMTP id 197mr124296wmt.70.1497448897219; Wed, 14 Jun 2017 07:01:37 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c11sm118069wrb.58.2017.06.14.07.01.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jun 2017 07:01:35 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7EE583E035F; Wed, 14 Jun 2017 15:02:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org, pbonzini@redhat.com, rth@twiddle.net, cota@braap.org Date: Wed, 14 Jun 2017 15:02:08 +0100 Message-Id: <20170614140209.29847-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170614140209.29847-1-alex.bennee@linaro.org> References: <20170614140209.29847-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::230 Subject: [Qemu-devel] [PATCH v1 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 Tested-by: Pranith Kumar diff --git a/tcg-runtime.c b/tcg-runtime.c index 7fa90ce508..f4bfa9cea6 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)