From patchwork Wed May 1 14:37:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 793729 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:54f:b0:34d:5089:5a9e with SMTP id b15csp791287wrf; Wed, 1 May 2024 07:40:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWiLM3J2dGHfsrCQ2hLZP9DdXd+T79XVmsD/MkFfKG43kvBPZ+kKrd95kHgSvZ4XupFOTV71rPDjkcA0M9kQt3i X-Google-Smtp-Source: AGHT+IEBt5H/sheIZpCzYvYI/JsbHxg/C5/2ol3oy14exuTWl4CfQz5CsZAUncqDPfE+nDpS7BCg X-Received: by 2002:a05:622a:2299:b0:437:bedb:3ff with SMTP id ay25-20020a05622a229900b00437bedb03ffmr9884544qtb.27.1714574440396; Wed, 01 May 2024 07:40:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714574440; cv=none; d=google.com; s=arc-20160816; b=Yu9e1D6N4XVAYs1IxE8EE/2RFx7gjqx9n+r58hxkZ/T7i7i4VRljU0I+YA5R0kyCU1 LXS3sPvhWpM/3PS5pVLb19U+jgIz3CG0TqqBWa36LjgULUnNtAl1BEggH+r/jzOomARJ DAqXJBu7se1YrLr41cuz4t3GFPi1JOEYOgYyVeuwoNZVzuygApF9j1YgtjGzEHyjrFRT kuZxEgyanIVrrgp3t+O0DYLoXb7f3vb/mUFjEAQ1pO6jZ6ZTuA6EclbpaZvuPEt3vhR3 0BddQfcggPZ9agCFEfBf4UxBRa8/O5bW+5IWCPu0o3GpfTUpzxUGdqCGSYZr2BApo9Ws w+Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=I+chihv+aCHSo8sD0JFlhAbGFbkZ1HxgertwSMQKsZo=; fh=vm85eyWrvOAHduw3sqEA+cYBqvHB7M0MHFcRJg7VWOo=; b=gJQrnk3KAdCKhxWGlvhOJL8BVHzH/U9dDdVCWCHQJeKs5+y1JZ0dHefrlSaZezQZPa TUj7bfqywePlRkVG9yjkI20frOvDyf7ckD6r+PSTFaO8+qcGTJLtOoexFj7SRIQDt6dY 99LgwJdxTsnyLoZo70q6WQt1XiSDxnRtdqL0OlzK0qxCLQiPebbsLUAZSl82uxdVoa4a 6l1kl1EPx1Wik36ZMgRqQ+/Xy2pCOA11Yw98rYst59mrSAJQLC3Piyy40N2a+hlWB8u+ Wm/9zIQpPEuwiVfAvtpB6zIeSQ5jE0jOH6ugvwy0DM/rIbXoHQa2XX9DhQ4ER1Ok/FR2 tt/A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dUw5Gb0R; 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 er13-20020a05622a5e8d00b004313889961dsi27557240qtb.557.2024.05.01.07.40.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 May 2024 07:40: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=dUw5Gb0R; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2B6G-0002rQ-42; Wed, 01 May 2024 10:38:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s2B5i-0002fl-Fs for qemu-devel@nongnu.org; Wed, 01 May 2024 10:37:53 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2B5g-00027c-G6 for qemu-devel@nongnu.org; Wed, 01 May 2024 10:37:50 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1ec85c2f469so6239705ad.1 for ; Wed, 01 May 2024 07:37:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714574267; x=1715179067; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I+chihv+aCHSo8sD0JFlhAbGFbkZ1HxgertwSMQKsZo=; b=dUw5Gb0RKNUbheHth2F8cKp984zPnnAWTEsgMGpW70DXZVp0Xs9gKaNVIbF0G5iIjg pvuKKxOm+17ZNFI0TXFsNPo3Bi6yV5D+oeHM6qW5CZ5PBxtTHjO7GcvnmRMQlYlno5/A 4m6VYnZjHqqs8ma6nni8ufSpCmk/RWruGkH7++xO9cbBxXtry/RIQ9A8pPxH3crj+F9W Zhq0gcx7b1BwxYN6RL60cmHz1Ey5X79liHxZhUL4i9FBa6/FByh3t9JiIuYAY7uMUNsW VrS4Cjuni8WKj96d8mnXWdO/F2YfXUJot9OwY/nnj1JIyFZ2wxZyRUVGCXcxtSpgrVXE +Gaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714574267; x=1715179067; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I+chihv+aCHSo8sD0JFlhAbGFbkZ1HxgertwSMQKsZo=; b=QYITX83F43mb5TdSidjrtDZ7OoIDz3VmEajWXCNedBET2YOovnihm2MfH+yLgVvlXA RrTnXB5VomkCb4B2x6iKZfJRSze83ePRw9xZx80GVft7ia3Q3sSiivWijX0M8foyRhJg bYpqFH235bZO1GvzCSRCHqH7MkMV5Az/YhWwcFPM58ZqLNSPx7z6vz+7kxxHH1kFd/+B bwIgneuwuW3Z9WBj69UcCvPlLrZtQyKJYkTa0/a7lM2X4bVF0q6lGK23OUTjTSZDo1H4 g+CfOY/qL6WmZDH44VJIYZ0kyGRvqNBcsJMV3N2f4fTbj5qeByI1dsgi9n9nj516DrMQ r44g== X-Gm-Message-State: AOJu0YxB4LFNWDrOgHBZdv9FgEKOvdxCW+HeGM7oYAfiSo6OC+j2UyQm bT4lB1eNDvfldBDwDthtczGSEd0eB34H/Vp6QzIMtPKm9PBtJCQ00suSXKiT3ykP3Oz8NfVAz3v W X-Received: by 2002:a17:902:8b89:b0:1e4:733c:eac8 with SMTP id ay9-20020a1709028b8900b001e4733ceac8mr3709168plb.8.1714574267276; Wed, 01 May 2024 07:37:47 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id h12-20020a170902f54c00b001ebd73f61fcsm5751573plf.121.2024.05.01.07.37.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 07:37:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PULL 06/20] plugins: Use emit_before_op for PLUGIN_GEN_AFTER_INSN Date: Wed, 1 May 2024 07:37:25 -0700 Message-Id: <20240501143739.10541-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240501143739.10541-1-richard.henderson@linaro.org> References: <20240501143739.10541-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Introduce a new plugin_cb op and migrate one operation. By using emit_before_op, we do not need to emit opcodes early and modify them later -- we can simply emit the final set of opcodes once. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- include/tcg/tcg-op-common.h | 1 + include/tcg/tcg-opc.h | 1 + accel/tcg/plugin-gen.c | 74 +++++++++++++++++++++---------------- tcg/tcg-op.c | 5 +++ 4 files changed, 50 insertions(+), 31 deletions(-) diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h index 2d932a515e..9de5a7f280 100644 --- a/include/tcg/tcg-op-common.h +++ b/include/tcg/tcg-op-common.h @@ -74,6 +74,7 @@ void tcg_gen_goto_tb(unsigned idx); */ void tcg_gen_lookup_and_goto_ptr(void); +void tcg_gen_plugin_cb(unsigned from); void tcg_gen_plugin_cb_start(unsigned from, unsigned type, unsigned wr); void tcg_gen_plugin_cb_end(void); diff --git a/include/tcg/tcg-opc.h b/include/tcg/tcg-opc.h index b80227fa1c..3b7cb2bce1 100644 --- a/include/tcg/tcg-opc.h +++ b/include/tcg/tcg-opc.h @@ -197,6 +197,7 @@ DEF(exit_tb, 0, 0, 1, TCG_OPF_BB_EXIT | TCG_OPF_BB_END) DEF(goto_tb, 0, 0, 1, TCG_OPF_BB_EXIT | TCG_OPF_BB_END) DEF(goto_ptr, 0, 1, 0, TCG_OPF_BB_EXIT | TCG_OPF_BB_END) +DEF(plugin_cb, 0, 0, 1, TCG_OPF_NOT_PRESENT) DEF(plugin_cb_start, 0, 0, 3, TCG_OPF_NOT_PRESENT) DEF(plugin_cb_end, 0, 0, 0, TCG_OPF_NOT_PRESENT) diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 4b488943ff..4b02c0bfbf 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -201,8 +201,7 @@ static void plugin_gen_empty_callback(enum plugin_gen_from from) { switch (from) { case PLUGIN_GEN_AFTER_INSN: - gen_wrapped(from, PLUGIN_GEN_DISABLE_MEM_HELPER, - gen_empty_mem_helper); + tcg_gen_plugin_cb(from); break; case PLUGIN_GEN_FROM_INSN: /* @@ -608,16 +607,6 @@ static void inject_mem_enable_helper(struct qemu_plugin_tb *ptb, inject_mem_helper(begin_op, arr); } -static void inject_mem_disable_helper(struct qemu_plugin_insn *plugin_insn, - TCGOp *begin_op) -{ - if (likely(!plugin_insn->mem_helper)) { - rm_ops(begin_op); - return; - } - inject_mem_helper(begin_op, NULL); -} - /* called before finishing a TB with exit_tb, goto_tb or goto_ptr */ void plugin_gen_disable_mem_helpers(void) { @@ -703,11 +692,14 @@ static void plugin_gen_enable_mem_helper(struct qemu_plugin_tb *ptb, inject_mem_enable_helper(ptb, insn, begin_op); } -static void plugin_gen_disable_mem_helper(struct qemu_plugin_tb *ptb, - TCGOp *begin_op, int insn_idx) +static void gen_disable_mem_helper(struct qemu_plugin_tb *ptb, + struct qemu_plugin_insn *insn) { - struct qemu_plugin_insn *insn = g_ptr_array_index(ptb->insns, insn_idx); - inject_mem_disable_helper(insn, begin_op); + if (insn->mem_helper) { + tcg_gen_st_ptr(tcg_constant_ptr(0), tcg_env, + offsetof(CPUState, plugin_mem_cbs) - + offsetof(ArchCPU, env)); + } } /* #define DEBUG_PLUGIN_GEN_OPS */ @@ -766,16 +758,49 @@ static void pr_ops(void) static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) { - TCGOp *op; + TCGOp *op, *next; int insn_idx = -1; pr_ops(); - QTAILQ_FOREACH(op, &tcg_ctx->ops, link) { + /* + * While injecting code, we cannot afford to reuse any ebb temps + * that might be live within the existing opcode stream. + * The simplest solution is to release them all and create new. + */ + memset(tcg_ctx->free_temps, 0, sizeof(tcg_ctx->free_temps)); + + QTAILQ_FOREACH_SAFE(op, &tcg_ctx->ops, link, next) { switch (op->opc) { case INDEX_op_insn_start: insn_idx++; break; + + case INDEX_op_plugin_cb: + { + enum plugin_gen_from from = op->args[0]; + struct qemu_plugin_insn *insn = NULL; + + if (insn_idx >= 0) { + insn = g_ptr_array_index(plugin_tb->insns, insn_idx); + } + + tcg_ctx->emit_before_op = op; + + switch (from) { + case PLUGIN_GEN_AFTER_INSN: + assert(insn != NULL); + gen_disable_mem_helper(plugin_tb, insn); + break; + default: + g_assert_not_reached(); + } + + tcg_ctx->emit_before_op = NULL; + tcg_op_remove(tcg_ctx, op); + break; + } + case INDEX_op_plugin_cb_start: { enum plugin_gen_from from = op->args[0]; @@ -840,19 +865,6 @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb) break; } - case PLUGIN_GEN_AFTER_INSN: - { - g_assert(insn_idx >= 0); - - switch (type) { - case PLUGIN_GEN_DISABLE_MEM_HELPER: - plugin_gen_disable_mem_helper(plugin_tb, op, insn_idx); - break; - default: - g_assert_not_reached(); - } - break; - } default: g_assert_not_reached(); } diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index aa6bc6f57d..0f2026c91c 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -312,6 +312,11 @@ void tcg_gen_mb(TCGBar mb_type) } } +void tcg_gen_plugin_cb(unsigned from) +{ + tcg_gen_op1(INDEX_op_plugin_cb, from); +} + void tcg_gen_plugin_cb_start(unsigned from, unsigned type, unsigned wr) { tcg_gen_op3(INDEX_op_plugin_cb_start, from, type, wr);