From patchwork Sat Jun 19 18:14:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 463907 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:102:0:0:0:0 with SMTP id x2csp1051833jao; Sat, 19 Jun 2021 11:27:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyal248N1WLh0Xpwyzp678RYMJBtlpaETDI6bRkT8lSdMyNJH9ujC6baHx8FAvhhYLqqo2n X-Received: by 2002:a05:6e02:612:: with SMTP id t18mr12296425ils.261.1624127260791; Sat, 19 Jun 2021 11:27:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624127260; cv=none; d=google.com; s=arc-20160816; b=MbC2aD/6VfIF/6bo3ErLKUQJJNM55PxK0Wn7CsKiGdZ4z+Ix2z/Qv1HSIUpVTJbkiC nKGROwYDd5wGNflmH+57rDZel4rttQaoPGLykmdeNwBz4wW0SF2bRxRNJFv9xqW0iy85 ohjr71Kx4cbZ5XR14wkKAchrfJNq4DYsLVskElU1kzxD2phGSG5/GWFwizSDWY7Ub8rX imS2xz1k9hQPUZ8/8NwrMSLCK/esEPqpeFoeXPJR8wfDNz6ADuQzuWW0nE0Fkadijnf7 TlrD0AxzBOhiI99zruofYMqTPGOtodk4CWOeGUX2EyQA+0DI0FijLjo32vKEK0MiA7pJ hJDA== 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=FIepckuQ0vf0IX35eDp/bRawEQA5SsFxOuzC6IQ1UvY=; b=dRyixe5koyUkPiEve9MpsJYitqpjNSDnWzSJKoV/jnb5OodJxFsf8RdlKrpXdV/Oh2 /oBk0UWPqzOLKiZRzxHssM8nqRZ40T6o83TRzOODu4sFdLCKElZVNh4CQPHcsnpuZflb 3kNsziODsyQJOJu2oI2+p/30GrvAGJ3i3BJEISksIghl3O+frEcwva/8UMyRUBkstx2E n4w/udWxHTNTYDl5f46hIySJAfyvJ48S4Rg7N6PcU60HB6uNmCE5hmiHsVaaVLKtkyb5 Vd6VEqfmClFuV2Iap0GeAfEkrmbXm02b0r/iRIU4X8bOEbo6xTcFRMtMoV/ZnzCowTe1 2HNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mrWN1x2q; 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 a1si12739228ioe.96.2021.06.19.11.27.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jun 2021 11:27:40 -0700 (PDT) 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=mrWN1x2q; 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]:38070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lufgy-0000cp-7M for patch@linaro.org; Sat, 19 Jun 2021 14:27:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lufUu-0000uq-T5 for qemu-devel@nongnu.org; Sat, 19 Jun 2021 14:15:14 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]:45599) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lufUm-0002Jj-5H for qemu-devel@nongnu.org; Sat, 19 Jun 2021 14:15:12 -0400 Received: by mail-pj1-x102c.google.com with SMTP id z3-20020a17090a3983b029016bc232e40bso7766693pjb.4 for ; Sat, 19 Jun 2021 11:15:03 -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=FIepckuQ0vf0IX35eDp/bRawEQA5SsFxOuzC6IQ1UvY=; b=mrWN1x2qb87Y/dgke9VdcfH56Oljdf6m51aLiYV2s3Dh6Rg9SmyNbX1YDsTZQSUTwL 6UygU6eXQKqneUc1yJF3qD5OyZphYBOHtfhZzy19dWCCPqvJKhk2fxI7JVC6QqsfcIsg 4M3q2ADPh8Fr6wBYVkyKNXupMRI1h33FDnzvgE/J1HtrdxmzXUBVrHPx+ejgvbwIPoE/ IEKbzawbZQ2eM+10bj/uM3eubXJx5SBtJZFgcFs1KRrmgHhWY7+EF6fgT6NXs9bDBoCD HnpLYijFsnYh+RKv7/ob07oj/pdwrX2ml+Si3BwqdTfMz6BW6M1BMk/zZ2BZaSrO3DZo fAUg== 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=FIepckuQ0vf0IX35eDp/bRawEQA5SsFxOuzC6IQ1UvY=; b=j9TwBW0BWjONzUGZ9W1g67iLoFF1BuBWnQ3F8LR2cOyepuUJ5y/jFOTA8N6tVKjY4K BxRUO4mzzz7WGvx9+HHuYrRA+MDjG5qGaRWXjPP+9jyDLEdxHHKaw0ZcMyH3p5jBWTaF pIeUPZKlNGnZweng/9R9qsc78d/GcuEDY8Lj43TYpxoh7bNWNtr87FISBGpCRQAQDRU0 Rf0AorpQsawY/xLgYfXYPemzcSCM3EaCCjzKpLrRPAnUFqWumcW3n8Ze6kutFV6kIVkv HfSZvEmOkEEnFQw78fgOQQ2krck0YTjfiTCgQMoC49vLgsRGNkQCSDw2fjy1hnW2fjdl wQWg== X-Gm-Message-State: AOAM5313EwL3BhCoF5aXU49hzX1I5vexranv85EmuxpjlP0CDgSyMZKs 9C8wJ1tHQTpnGYxJNMHrzbiI5fd3+q53RQ== X-Received: by 2002:a17:90b:2306:: with SMTP id mt6mr15675588pjb.71.1624126502819; Sat, 19 Jun 2021 11:15:02 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id k35sm12059113pgi.21.2021.06.19.11.15.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Jun 2021 11:15:02 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 16/33] tcg/tci: Implement goto_ptr Date: Sat, 19 Jun 2021 11:14:35 -0700 Message-Id: <20210619181452.877683-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210619181452.877683-1-richard.henderson@linaro.org> References: <20210619181452.877683-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102c.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: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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. Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/tci/tcg-target-con-set.h | 1 + tcg/tci/tcg-target.h | 2 +- tcg/tcg.c | 8 +++++++- tcg/tci.c | 19 +++++++++++++++++++ tcg/tci/tcg-target.c.inc | 16 ++++++++++++++++ 5 files changed, 44 insertions(+), 2 deletions(-) -- 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 c9cbe505a7..6ced9282c1 100644 --- a/tcg/tci/tcg-target.h +++ b/tcg/tci/tcg-target.h @@ -87,7 +87,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 6472c6a8f4..dd584f3bba 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -785,10 +785,16 @@ void tcg_prologue_init(TCGContext *s) } #endif - /* Assert that goto_ptr is implemented completely. */ +#ifndef CONFIG_TCG_INTERPRETER + /* + * Assert that goto_ptr is implemented completely, setting an epilogue. + * For tci, we use NULL as the signal to return from the interpreter, + * so skip this check. + */ 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 c82d5b2f51..4696ca161c 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -73,6 +73,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) { @@ -739,6 +744,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); @@ -996,6 +1010,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 f74328dcbd..fc73c199a0 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); @@ -565,6 +577,10 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, 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;