From patchwork Thu Mar 11 14:39:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 397526 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp396455jai; Thu, 11 Mar 2021 07:10:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJw2KHG8Q+eDa4yueUiaLpyELJCdNOyfQPdDUZ9zQRsziQZ8qp46jDzRQNVkg9ZIO+fiBDwm X-Received: by 2002:ab0:2458:: with SMTP id g24mr1054310uan.24.1615475417578; Thu, 11 Mar 2021 07:10:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615475417; cv=none; d=google.com; s=arc-20160816; b=XzouJzRmPDP2AGrNI7oonObJrFb3PyNANJY+2vedYls2NGth+O2F5bFz1g7jgD/64j AWZ0iMSbuyJLAZTpCcxgV9DJQwC9gS6YQC4I/W5vNuGWbyPW/3vQmnynAoOCJWiI6dwC nEjurykyNvPl4biQHFQyBejyXKs4s/JDsUPtTxCsAyMQE/yxhEYlyjGRZvV5pEY/JzZA riKzbIyJP/pGIBpsRTVEmnTFEHo3JzJUubnNI3VxzSnmNVXeBmjLWMC+JPvSP2z1U45v qWK/04/NHiF5pXFtMX5ZP9OxEfD0MHZoizPnDY7+JnXBusopVZydYnKqxQolE2Sw9tZP HxGg== 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=9jHEmEI6EV8qZCeh+tCL5YyTrUMsHZff/il96+nDzSE=; b=Oc8LnGDnfC+y9oy90IR56qbKg4rhmgX51miDDbVXKlIkW88rBDxQVIZDWcv3XKF2cG pSJZjttvBwvTx36vyFANHSF5Vc62JR+uWqqXeHhq3Kf8WeeD9DKXqSqA0lPcXzR5ewfK NkiupB35TEWM/aacv270jOuHZH3tuMve5uOaa9WaTecK6u1OYnlxREB3vuMrWAsMWGTK dhyDYltaDsbmO4wxvJafF8fNY18dVZBgZXBKZYj7SQM0ab9J/yiGSY+ZL/whZWegZWTp UkKRWMjgViBZK4ois+/pf8DNuY/50aj7rzrINjmAqx3dxAfvvrIp3ERJBc9jPmwniN8Y xPVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=I02QE7go; 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 c10si502019vso.277.2021.03.11.07.10.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Mar 2021 07:10:17 -0800 (PST) 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=I02QE7go; 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]:55478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKMx6-00041n-N4 for patch@linaro.org; Thu, 11 Mar 2021 10:10:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKMVR-0004Bf-5A for qemu-devel@nongnu.org; Thu, 11 Mar 2021 09:41:41 -0500 Received: from mail-qv1-xf2a.google.com ([2607:f8b0:4864:20::f2a]:35466) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lKMVL-0006ty-1W for qemu-devel@nongnu.org; Thu, 11 Mar 2021 09:41:40 -0500 Received: by mail-qv1-xf2a.google.com with SMTP id x27so2637076qvd.2 for ; Thu, 11 Mar 2021 06:41:34 -0800 (PST) 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=9jHEmEI6EV8qZCeh+tCL5YyTrUMsHZff/il96+nDzSE=; b=I02QE7goGQeSkoprYxOzVvzhpmpDMnIiO+alAmhu20MUtN1ziVmo9yZOeFzYxD/nbY csLA4czW4PPfPpUFw+IeDmXEGg8cffgMG3icBoS9MRWC3cn4DPfrdqcsOkcpHjko2M9d WbyCr7puMBT6Ow8GtQPZmCyqVuPISqz3REU063ucTMIcdU+Or2uIOqyZWPXB5D9uckYI GF7900+gUx1M0UImysAV5er3PhzDt+nzY8Cc3QXCGmC1CURlIl7tZZuxqo6H4IbHNFlk /urP9GdtdjVzEXxXMweWc9ZVhSIe0HoWE8mSskSduAKKLVe8X+PppWtwOiRg2sM/M8cS L/1Q== 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=9jHEmEI6EV8qZCeh+tCL5YyTrUMsHZff/il96+nDzSE=; b=D1IaEw8jDnbuSINF3q74asjRq73HqcCcj3U79GCpGLZFA/IPE3jY0JZgha4PHNDq0J U9+s2follAUSdoR436k+urJZhCuox/R8o2Yi2mN466LNeh3zWBGuZSzol3DaaufnYxW7 7s8AYYF5qbCC44EVAXTDl3sfMNbrsg5OO2QSrxpScYGy0ddzH6zekArVoSKkmphOJJOf I6EXQG1QUnF1GYF0m6zXrZv2u+rWAsWjLSHeyKYQ55gIDKZBPV+mQrga4qTZuPg5TDPJ SdnL/oh2CFMS384krEpOUU7kxp/UcD6NKrsK/Q+Ixch6JlIJau9Yy3Wet7+ZL2eWK2Bp R2Aw== X-Gm-Message-State: AOAM533AMsgoYwnFAyhuZuGX/WzQU5yeHQ4cVdQndz8fY+7JWxzazP9V JKdaic4t11LSVj5vFTtm5yT1zdgJTalFy58c X-Received: by 2002:a05:6214:20a7:: with SMTP id 7mr5664117qvd.24.1615473693751; Thu, 11 Mar 2021 06:41:33 -0800 (PST) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id g14sm1962421qkm.98.2021.03.11.06.41.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 06:41:33 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 47/57] tcg/tci: Implement goto_ptr Date: Thu, 11 Mar 2021 08:39:48 -0600 Message-Id: <20210311143958.562625-48-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210311143958.562625-1-richard.henderson@linaro.org> References: <20210311143958.562625-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::f2a; envelope-from=richard.henderson@linaro.org; helo=mail-qv1-xf2a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: sw@weilnetz.de, alex.bennee@linaro.org, f4bug@amsat.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This operation is critical to staying within the interpretation loop longer, which avoids the overhead of setup and teardown for many TBs. The check in tcg_prologue_init is disabled because TCI does want to use NULL to indicate exit, as opposed to branching to a real epilogue. Signed-off-by: Richard Henderson --- tcg/tci/tcg-target-con-set.h | 1 + tcg/tci/tcg-target.h | 2 +- tcg/tcg.c | 2 ++ tcg/tci.c | 19 +++++++++++++++++++ tcg/tci/tcg-target.c.inc | 16 ++++++++++++++++ 5 files changed, 39 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/tcg/tci/tcg-target-con-set.h b/tcg/tci/tcg-target-con-set.h index 316730f32c..ae2dc3b844 100644 --- a/tcg/tci/tcg-target-con-set.h +++ b/tcg/tci/tcg-target-con-set.h @@ -9,6 +9,7 @@ * Each operand should be a sequence of constraint letters as defined by * tcg-target-con-str.h; the constraint combination is inclusive or. */ +C_O0_I1(r) C_O0_I2(r, r) C_O0_I3(r, r, r) C_O0_I4(r, r, r, r) diff --git a/tcg/tci/tcg-target.h b/tcg/tci/tcg-target.h index d953f2ead3..17911d3297 100644 --- a/tcg/tci/tcg-target.h +++ b/tcg/tci/tcg-target.h @@ -86,7 +86,7 @@ #define TCG_TARGET_HAS_muls2_i32 0 #define TCG_TARGET_HAS_muluh_i32 0 #define TCG_TARGET_HAS_mulsh_i32 0 -#define TCG_TARGET_HAS_goto_ptr 0 +#define TCG_TARGET_HAS_goto_ptr 1 #define TCG_TARGET_HAS_direct_jump 0 #define TCG_TARGET_HAS_qemu_st8_i32 0 diff --git a/tcg/tcg.c b/tcg/tcg.c index 92aec0d238..ce80adcfbe 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1314,10 +1314,12 @@ void tcg_prologue_init(TCGContext *s) } #endif +#ifndef CONFIG_TCG_INTERPRETER /* Assert that goto_ptr is implemented completely. */ if (TCG_TARGET_HAS_goto_ptr) { tcg_debug_assert(tcg_code_gen_epilogue != NULL); } +#endif } void tcg_func_start(TCGContext *s) diff --git a/tcg/tci.c b/tcg/tci.c index 76bbf440a8..c229050c66 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -69,6 +69,11 @@ static void tci_args_l(uint32_t insn, const void *tb_ptr, void **l0) *l0 = diff ? (void *)tb_ptr + diff : NULL; } +static void tci_args_r(uint32_t insn, TCGReg *r0) +{ + *r0 = extract32(insn, 8, 4); +} + static void tci_args_nl(uint32_t insn, const void *tb_ptr, uint8_t *n0, void **l1) { @@ -738,6 +743,15 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, tb_ptr = *(void **)ptr; break; + case INDEX_op_goto_ptr: + tci_args_r(insn, &r0); + ptr = (void *)regs[r0]; + if (!ptr) { + return 0; + } + tb_ptr = ptr; + break; + case INDEX_op_qemu_ld_i32: if (TARGET_LONG_BITS <= TCG_TARGET_REG_BITS) { tci_args_rrm(insn, &r0, &r1, &oi); @@ -995,6 +1009,11 @@ int print_insn_tci(bfd_vma addr, disassemble_info *info) info->fprintf_func(info->stream, "%-12s %p", op_name, ptr); break; + case INDEX_op_goto_ptr: + tci_args_r(insn, &r0); + info->fprintf_func(info->stream, "%-12s %s", op_name, str_r(r0)); + break; + case INDEX_op_call: tci_args_nl(insn, tb_ptr, &len, &ptr); info->fprintf_func(info->stream, "%-12s %d,%p", op_name, len, ptr); diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index 0df8384be7..db29bc6e54 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -27,6 +27,9 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpcode op) { switch (op) { + case INDEX_op_goto_ptr: + return C_O0_I1(r); + case INDEX_op_ld8u_i32: case INDEX_op_ld8s_i32: case INDEX_op_ld16u_i32: @@ -263,6 +266,15 @@ static void tcg_out_op_p(TCGContext *s, TCGOpcode op, void *p0) tcg_out32(s, insn); } +static void tcg_out_op_r(TCGContext *s, TCGOpcode op, TCGReg r0) +{ + tcg_insn_unit insn = 0; + + insn = deposit32(insn, 0, 8, op); + insn = deposit32(insn, 8, 4, r0); + tcg_out32(s, insn); +} + static void tcg_out_op_v(TCGContext *s, TCGOpcode op) { tcg_out32(s, (uint8_t)op); @@ -567,6 +579,10 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, set_jmp_reset_offset(s, args[0]); break; + case INDEX_op_goto_ptr: + tcg_out_op_r(s, opc, args[0]); + break; + case INDEX_op_br: tcg_out_op_l(s, opc, arg_label(args[0])); break;