From patchwork Mon Feb 26 09:14:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 775840 Delivered-To: patch@linaro.org Received: by 2002:a5d:6103:0:b0:33d:da16:65b6 with SMTP id v3csp233713wrt; Mon, 26 Feb 2024 01:15:59 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXZTS24Dnob0HNX9qEUlh+/v3kPPsevi3rt+hA4WYdlqYGUZ/6/YXEugCT5sN24BX/NZkvDeZrJERV1r/Sa9hIf X-Google-Smtp-Source: AGHT+IF945KNpdIxProhYw7KjwTK/PTzniKT4dzf053Xf+TWTA4ko0plNaZ2l5+JgSYNeDVMhTa5 X-Received: by 2002:a0c:ca83:0:b0:68f:e7c6:a48a with SMTP id a3-20020a0cca83000000b0068fe7c6a48amr5374919qvk.58.1708938959509; Mon, 26 Feb 2024 01:15:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708938959; cv=none; d=google.com; s=arc-20160816; b=ZEqAqNHZZcM1X0yO3cmik7ytTpGszZ5jHDIvtIFw65O3kY0IbRe0h2DlPfvvgHHMN2 iRMD763KUb8Z5fn4j+W2k6ibKWaH452LPdDykVy4hFeXROt5+cNtt4v7LQRtr0GFbo62 90Phndud7LDA7x/qyLPUjLRPRQ8bNXqU7SzDW/y8vlLLzAOwbfYTuhgXp33UWqWq/GCJ bspm9oB23yg/m56WPyGT9EfyM5buQ6ShQ/0RCW49puJvb1R4LmignCwB9Wb4JPj1Lp/s KE3tLFxX1JU7WaXq/93q69Lex4nPXRymGgo7m2UlE/OtCqtZJySmE7UoGdnUMgXzOq8M wr8A== 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=dNkK1YdASGhq7cpzL4oM731QmQ8XAlPsGKyetFEOQRg=; fh=l9WWdDUrM2GgKqlI4LjrMx7cGq7hKMPQ4FaYC0/RjNA=; b=xkSutqXSegtHHReL5D0vfWkRKTR6SeCrZZoFC72V/qN5MAQh1jvqEFMg7dc9DFQZIB SSffF4t5d6tSHVMfkZgKQVslRRNqIMaOASIBPq60XlaCE4aXs6ADSiq4InCWyqi47asW hXYs4zHT7zkoLjjRcdl4l83ygOLE+O04o2s4VrF9Hc8aBYEG/ibYtM6snZ7vSxgO1SRL wDEBtUCpydR3p1Ti/0vN7Hx0NF67Mdu7Dkk84h0viEFTYhAuHGQbyYHog0Jd6f4ZyMDm gwNakW2wQSAGUwTSXRO82ieCCba1OmQ3fjN35F9EJ06Pq3al/BhsGVL7mEKMMIWlx80E qN5Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DUmYNaIm; 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 hf9-20020a0562140e8900b0068ce329b12bsi4699165qvb.408.2024.02.26.01.15.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Feb 2024 01:15:59 -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=DUmYNaIm; 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 1reX4x-0003kF-6J; Mon, 26 Feb 2024 04:15:20 -0500 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 1reX4q-0003XM-Ov for qemu-devel@nongnu.org; Mon, 26 Feb 2024 04:15:16 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1reX4m-00059d-Ty for qemu-devel@nongnu.org; Mon, 26 Feb 2024 04:15:11 -0500 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-33d6f26ff33so1989745f8f.0 for ; Mon, 26 Feb 2024 01:15:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708938907; x=1709543707; 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=dNkK1YdASGhq7cpzL4oM731QmQ8XAlPsGKyetFEOQRg=; b=DUmYNaImplbViz27f5RiVrIP8J5luh1e7NNeyXW1iHy7jSz1E6nDnP/OQs88qSyhlx 1+oIXYftTTKqEIRIeGuWao74CnhqzEV9txmGnyQUbpPI5VXse344VVmQjypeFT5IzZda u4mfiQj8MVWPh2eOs61Y9l4XOu51c0m1EGYWPgb7i25uO2u1j70L/Ih+rnduGJX/i0Kf Qt8TIB90KeCVxFXmgsViUF801UNCJL5904x4/2GU6GvjXfXV4XzK3RuHr3QinFk/zKpn SgRy9B7LdOB1vkCD+CEI6gnEBSgkv1lBXj7DmytN3g15Yiypm025sTDKXLn28+emABn6 S9Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708938907; x=1709543707; 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=dNkK1YdASGhq7cpzL4oM731QmQ8XAlPsGKyetFEOQRg=; b=J6OJEiNULQ6yVeq5ONml1jKSCkRmN9ujbVzMu1Ytu2GqeKOn38jR8OZDOdrLiAGRII yuTGTiWZc3/uYKtk8c4ZY5/iZtP9pGCut226pL3mI9nClQAAIntlO4PQvcVAhPgEJsxD 5lrYVi3Pyth1MKvTNupysvY+30sk5e73tFcdg2bPtx3++TmUIlIHiJeVTBimhp7K8VR1 zIWAouNiLac5GUcZyj8xdqNGmVuhRoNw4V4c8mcmnOhZf3TeK+66OMVmNdRrJLQ7EzMk BJZEbIzc1xNw4qwwgtaHcn6RxEMc8b8SYXC477pMBEjKBGR+FzUDCbzj1dGkpDHpE/uG wvAg== X-Gm-Message-State: AOJu0Yz4AT/nzQhG+IQlURmcX8g88kfjoGXxEoedx8qRJ0hXl87wXoBs scJcsbDR2fC9YL05MwtOfANBvRtiiHTKNg4gUkUljwQVumhvQhyhvxGoAYQRfSnorQjwcKBWn41 4jq180g== X-Received: by 2002:a05:6000:9:b0:33d:5484:e451 with SMTP id h9-20020a056000000900b0033d5484e451mr4186713wrx.34.1708938907158; Mon, 26 Feb 2024 01:15:07 -0800 (PST) Received: from linaro.. ([102.35.208.160]) by smtp.gmail.com with ESMTPSA id g7-20020adfe407000000b0033d2ae84fafsm7578814wrm.52.2024.02.26.01.15.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 01:15:06 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Marcel Apfelbaum , Pierrick Bouvier , Yanan Wang , Paolo Bonzini , Mahmoud Mandour , Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , Eduardo Habkost Subject: [PATCH v5 03/12] plugins: implement inline operation relative to cpu_index Date: Mon, 26 Feb 2024 13:14:35 +0400 Message-ID: <20240226091446.479436-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240226091446.479436-1-pierrick.bouvier@linaro.org> References: <20240226091446.479436-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-wr1-x42f.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, T_SCC_BODY_TEXT_LINE=-0.01 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 Instead of working on a fixed memory location, allow to address it based on cpu_index, an element size and a given offset. Result address: ptr + offset + cpu_index * element_size. With this, we can target a member in a struct array from a base pointer. Current semantic is not modified, thus inline operation still targets always the same memory location. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier --- plugins/plugin.h | 2 +- accel/tcg/plugin-gen.c | 69 ++++++++++++++++++++++++++++++++++-------- plugins/api.c | 3 +- plugins/core.c | 12 +++++--- 4 files changed, 67 insertions(+), 19 deletions(-) diff --git a/plugins/plugin.h b/plugins/plugin.h index 043c740067d..3bf1aaf5c2d 100644 --- a/plugins/plugin.h +++ b/plugins/plugin.h @@ -99,7 +99,7 @@ void plugin_register_vcpu_mem_cb(GArray **arr, enum qemu_plugin_mem_rw rw, void *udata); -void exec_inline_op(struct qemu_plugin_dyn_cb *cb); +void exec_inline_op(struct qemu_plugin_dyn_cb *cb, int cpu_index); int plugin_num_vcpus(void); diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index ac6b52b9ec9..0f8be53d394 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -133,16 +133,28 @@ static void gen_empty_udata_cb_no_rwg(void) */ static void gen_empty_inline_cb(void) { + TCGv_i32 cpu_index = tcg_temp_ebb_new_i32(); + TCGv_ptr cpu_index_as_ptr = tcg_temp_ebb_new_ptr(); TCGv_i64 val = tcg_temp_ebb_new_i64(); TCGv_ptr ptr = tcg_temp_ebb_new_ptr(); + tcg_gen_ld_i32(cpu_index, tcg_env, + -offsetof(ArchCPU, env) + offsetof(CPUState, cpu_index)); + /* second operand will be replaced by immediate value */ + tcg_gen_mul_i32(cpu_index, cpu_index, cpu_index); + tcg_gen_ext_i32_ptr(cpu_index_as_ptr, cpu_index); + tcg_gen_movi_ptr(ptr, 0); + tcg_gen_add_ptr(ptr, ptr, cpu_index_as_ptr); tcg_gen_ld_i64(val, ptr, 0); - /* pass an immediate != 0 so that it doesn't get optimized away */ - tcg_gen_addi_i64(val, val, 0xdeadface); + /* second operand will be replaced by immediate value */ + tcg_gen_add_i64(val, val, val); + tcg_gen_st_i64(val, ptr, 0); tcg_temp_free_ptr(ptr); tcg_temp_free_i64(val); + tcg_temp_free_ptr(cpu_index_as_ptr); + tcg_temp_free_i32(cpu_index); } static void gen_empty_mem_cb(TCGv_i64 addr, uint32_t info) @@ -290,12 +302,37 @@ static TCGOp *copy_const_ptr(TCGOp **begin_op, TCGOp *op, void *ptr) return op; } +static TCGOp *copy_ld_i32(TCGOp **begin_op, TCGOp *op) +{ + return copy_op(begin_op, op, INDEX_op_ld_i32); +} + +static TCGOp *copy_ext_i32_ptr(TCGOp **begin_op, TCGOp *op) +{ + if (UINTPTR_MAX == UINT32_MAX) { + op = copy_op(begin_op, op, INDEX_op_mov_i32); + } else { + op = copy_op(begin_op, op, INDEX_op_ext_i32_i64); + } + return op; +} + +static TCGOp *copy_add_ptr(TCGOp **begin_op, TCGOp *op) +{ + if (UINTPTR_MAX == UINT32_MAX) { + op = copy_op(begin_op, op, INDEX_op_add_i32); + } else { + op = copy_op(begin_op, op, INDEX_op_add_i64); + } + return op; +} + static TCGOp *copy_ld_i64(TCGOp **begin_op, TCGOp *op) { if (TCG_TARGET_REG_BITS == 32) { /* 2x ld_i32 */ - op = copy_op(begin_op, op, INDEX_op_ld_i32); - op = copy_op(begin_op, op, INDEX_op_ld_i32); + op = copy_ld_i32(begin_op, op); + op = copy_ld_i32(begin_op, op); } else { /* ld_i64 */ op = copy_op(begin_op, op, INDEX_op_ld_i64); @@ -331,6 +368,13 @@ static TCGOp *copy_add_i64(TCGOp **begin_op, TCGOp *op, uint64_t v) return op; } +static TCGOp *copy_mul_i32(TCGOp **begin_op, TCGOp *op, uint32_t v) +{ + op = copy_op(begin_op, op, INDEX_op_mul_i32); + op->args[2] = tcgv_i32_arg(tcg_constant_i32(v)); + return op; +} + static TCGOp *copy_st_ptr(TCGOp **begin_op, TCGOp *op) { if (UINTPTR_MAX == UINT32_MAX) { @@ -396,18 +440,17 @@ static TCGOp *append_inline_cb(const struct qemu_plugin_dyn_cb *cb, TCGOp *begin_op, TCGOp *op, int *unused) { - /* const_ptr */ - op = copy_const_ptr(&begin_op, op, cb->userp); - - /* ld_i64 */ + char *ptr = cb->userp; + size_t elem_size = 0; + size_t offset = 0; + op = copy_ld_i32(&begin_op, op); + op = copy_mul_i32(&begin_op, op, elem_size); + op = copy_ext_i32_ptr(&begin_op, op); + op = copy_const_ptr(&begin_op, op, ptr + offset); + op = copy_add_ptr(&begin_op, op); op = copy_ld_i64(&begin_op, op); - - /* add_i64 */ op = copy_add_i64(&begin_op, op, cb->inline_insn.imm); - - /* st_i64 */ op = copy_st_i64(&begin_op, op); - return op; } diff --git a/plugins/api.c b/plugins/api.c index 579fe4a6e54..af4b98a1127 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -106,7 +106,8 @@ void qemu_plugin_register_vcpu_tb_exec_inline(struct qemu_plugin_tb *tb, void *ptr, uint64_t imm) { if (!tb->mem_only) { - plugin_register_inline_op(&tb->cbs[PLUGIN_CB_INLINE], 0, op, ptr, imm); + plugin_register_inline_op(&tb->cbs[PLUGIN_CB_INLINE], + 0, op, ptr, imm); } } diff --git a/plugins/core.c b/plugins/core.c index 12ec6911d5e..e3ec68ec286 100644 --- a/plugins/core.c +++ b/plugins/core.c @@ -317,7 +317,8 @@ static struct qemu_plugin_dyn_cb *plugin_get_dyn_cb(GArray **arr) void plugin_register_inline_op(GArray **arr, enum qemu_plugin_mem_rw rw, - enum qemu_plugin_op op, void *ptr, + enum qemu_plugin_op op, + void *ptr, uint64_t imm) { struct qemu_plugin_dyn_cb *dyn_cb; @@ -473,9 +474,12 @@ void qemu_plugin_flush_cb(void) plugin_cb__simple(QEMU_PLUGIN_EV_FLUSH); } -void exec_inline_op(struct qemu_plugin_dyn_cb *cb) +void exec_inline_op(struct qemu_plugin_dyn_cb *cb, int cpu_index) { - uint64_t *val = cb->userp; + char *ptr = cb->userp; + size_t elem_size = 0; + size_t offset = 0; + uint64_t *val = (uint64_t *)(ptr + offset + cpu_index * elem_size); switch (cb->inline_insn.op) { case QEMU_PLUGIN_INLINE_ADD_U64: @@ -508,7 +512,7 @@ void qemu_plugin_vcpu_mem_cb(CPUState *cpu, uint64_t vaddr, vaddr, cb->userp); break; case PLUGIN_CB_INLINE: - exec_inline_op(cb); + exec_inline_op(cb, cpu->cpu_index); break; default: g_assert_not_reached();