From patchwork Thu Feb 4 01:57:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 376231 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp870286jah; Wed, 3 Feb 2021 18:58:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJxQipHLRFvHpGLsOsI52B2HdCNlPByTTQNsEOe5fLe2VM7WNJLXYxF8Rnx0KKxM3WwtjaT2 X-Received: by 2002:a25:bd8f:: with SMTP id f15mr8799661ybh.463.1612407496870; Wed, 03 Feb 2021 18:58:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612407496; cv=none; d=google.com; s=arc-20160816; b=UcPkDysj5xJ4kruHrFjgV82QrJn6YaOFTUTVLhk6HIXiV10wO3Vo2IEXYhX+nF0iQT plTcZ6ISp4QxqjQ6K2iE0QHVAcw3aFPu89xl55z3VnQvJ9UCDj4+6YfLC5y+5VtmZp1J gP1YIUyMdRaGG0HcR2PhWDTt6MMrdbvSo1L4w46NJ5/2j1PcQiSX3VDsWLBbLjmyvc52 Z4kHp7iJoReQ1j0jUpI6nJqYCNwbrzJQRHqKwaj2ZXx1hlrLpoiHDSuPQNK7xvO9Y/io eAS+ocsp/hCmD++kX0S6bObx0dZuZpvGfwDLV+cRWu0nUkgw1T1HXxnhRNTkFWC5NlI1 4ISg== 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=ZqOw+gxfHcL+GE2Ru72t2p+WgkIxr/f1vF2n8FMDX2k=; b=LC0zB4uCnXoF56x27C85qrwsaLmZa0S4YH67AZ9GkqMPBh8zP5IhR7d27vhyqWF54q bg4oEQmY4jvdSFehj3dgAhHWxJnN0aNE4KYgCaxSLCE1DXKR9aBAna6UcJMT6IFVci9T UMWv4ffFpf5utSfz0DF21op3aVt8MjRKUBP3NsMBAigwLfQus0syG6PS5oBv9/1KmpuL 6ENgoyimiJw1+3pZTTzJoe600Slerpx5BqZzmiKy+hRLerAT4lYKnOnomzz0/4oyM3FC ig8EChPvMtmTUGIII+OCRx18Nhhz9xNaaN9P/fHLfRHVLDfHqw3YfGCaLr5NT3UuqpXF hgtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GpBqUzAn; 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=pass (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 u64si4052119ybi.45.2021.02.03.18.58.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Feb 2021 18:58:16 -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=pass header.i=@linaro.org header.s=google header.b=GpBqUzAn; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7UqW-0007ey-Ae for patch@linaro.org; Wed, 03 Feb 2021 21:58:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7TtR-0001Nf-4y for qemu-devel@nongnu.org; Wed, 03 Feb 2021 20:57:13 -0500 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]:35995) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l7TtL-0007Bz-GM for qemu-devel@nongnu.org; Wed, 03 Feb 2021 20:57:09 -0500 Received: by mail-pf1-x42e.google.com with SMTP id y142so1094307pfb.3 for ; Wed, 03 Feb 2021 17:57:07 -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=ZqOw+gxfHcL+GE2Ru72t2p+WgkIxr/f1vF2n8FMDX2k=; b=GpBqUzAnFIKA/lbJ3a8umNNPl+oG24xZ0UdZ8oKz1mn7VZFCCo1EfbYlFwGFy8WGPQ o0aQbOf3nxXl7s80ni068/A8n3minVkl8icb7S1jzS9vDA+cJi8c6MsFOcxQAs5IdDfu ykkhh2e7jFCa2KMNCEu9wfusoX+vP2pXEYSumbAkLtU17Xe8CDQxolHPJSiGFIfRKsJw UJu71QYQ2sD3UiL6XwVDWF6OEaAqytayo/AMQ+4A+F64vUVHxFdLrD5V5r5ZkqtwLtCw 8GOGJqjXcf10YMOY4Zq9r5sXdjord0i1mewqDyBfvzkDr34VAwiZC8pbGHyMTpXF4wkN 15Xw== 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=ZqOw+gxfHcL+GE2Ru72t2p+WgkIxr/f1vF2n8FMDX2k=; b=DDangCWOk3W7l1bKffLqQuGwzPSX9VvkAIFuw8LTNp+mdPIw4+pKEEyK/F4RwgfLUA 0q04iBMtTw30EkfFI/g5CmTa8tdfUo9TTZ6o4RXMXrkEycedwUjzOardB9hpfv1Nw0PU 3Wt9Lhy9og7vY1k5txxqX1VrRKYrAWozI7YRAPar7XcV6y1S1oJ0jig8xpTVfFIhTb1q xrjWvTxWrcNDPKDwFa3P7TLFFrZyVc71sQcXowgrbJwHcOOzgNVNj1f7/EgMusT1dSjq BPrTtB3N7Dd4z7BQC+XR1v80hzJsXBs41HTcSNWwiOFUVi8gCE1RETiOVvObJ8Fw/80X yWZQ== X-Gm-Message-State: AOAM533RGaqxhY/PHERc0VrYyYY1ff4KPByxCAlcrZzEuAbKmc6zAU+P cL3baiMKgZV0biwsCcDrKCqoJtcws4GfVB4E X-Received: by 2002:a63:4f09:: with SMTP id d9mr6793173pgb.70.1612403826136; Wed, 03 Feb 2021 17:57:06 -0800 (PST) Received: from localhost.localdomain (cpe-66-27-222-29.hawaii.res.rr.com. [66.27.222.29]) by smtp.gmail.com with ESMTPSA id y200sm266845pfc.103.2021.02.03.17.57.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 17:57:05 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v2 87/93] tcg/tci: Implement goto_ptr Date: Wed, 3 Feb 2021 15:57:03 -1000 Message-Id: <20210204015703.885660-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210204014509.882821-1-richard.henderson@linaro.org> References: <20210204014509.882821-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.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 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 c4f0a7e82d..a6e30d31a9 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) { @@ -748,6 +753,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); @@ -1005,6 +1019,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;