From patchwork Tue Mar 7 18:07:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Tomsich X-Patchwork-Id: 13164412 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5F73EC678DB for ; Tue, 7 Mar 2023 18:09:59 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZbim-0007cu-DR; Tue, 07 Mar 2023 13:07:32 -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 1pZbib-0007HU-As for qemu-devel@nongnu.org; Tue, 07 Mar 2023 13:07:21 -0500 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZbiX-0002Ed-Vj for qemu-devel@nongnu.org; Tue, 07 Mar 2023 13:07:21 -0500 Received: by mail-lf1-x12f.google.com with SMTP id i9so18222241lfc.6 for ; Tue, 07 Mar 2023 10:07:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vrull.eu; s=google; t=1678212435; 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=ERC/6VeDxTNXUnmBsoLervfyIDOlgZLJqgjanTmGNl4=; b=nXiJ2Ul04KbM0Yi5l3KtOjN1zIgYX9R8DCB8hG7kITam8GR3XigCnp9IvOyNHER3+X 8SFLLC0a001B5RGg1JOjt09Qtt3gApEuXODp4TKBLczfLTY9mUvpqs4TFL2k2UvNUbxx gfvPbmD8r9bVnfCPqM3N3/7QUmFuM9r3gQnuwwuX1Z4CawMcW/nCkhVk88G1wTi8JIT4 gd6zNQal2/+VeJDXZAiJ2GBuhIWybN+aEE3n4lOmSwf/XVAdisVT/cGaj8KByEeYU5qh Cf3t+0keqzGl5BO0MNTySSJXG5h6Nqw4SN+R0ZSv8sAU+jGWxseDCo/rZt2esoxdhcbX 2S0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678212435; 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=ERC/6VeDxTNXUnmBsoLervfyIDOlgZLJqgjanTmGNl4=; b=75/QJrr97gOnFLcu2jAx/2A2TPEKe4sUVjjF0P3w+yGgspMqNJXCfORYi7WbYbkpxl /hPrXeUd2j9AGF5OF7+PBm9LxpZss9xB/JRqDy5SUJKEP0JZDsZVy4LpBs/cxpKu9INk FYwjxXhNasLsDLcgz6nMm6lZCaWzDodXO9POBHzlxg65PQzi2Pa0VosPILQWd4c5RpYi a19Guq3VsPEVSSWwb7BWZzioVKrylP3wqsxmqbgJkdfl2o+J/ewKnhobhfMIiAStD4YM SO5e8i1iSkAwS8RJb9yFwE77z06nE1DwnTAQBM9o9qo/v4hlAxaP6i9cMzC8w73SOqcZ Dk/A== X-Gm-Message-State: AO0yUKX+emRCxUPqA5JgQma5KLZu7ZK+x5qqRWQrZgV8ZXM9o0G+n1iR xirxu+U2HNEIN8P5Xv2HC5JtWululGvM9rNUz9zWbw== X-Google-Smtp-Source: AK7set+YRT+pXLw7FD1p2wP9GYfbE4X0CDHpOKc/VAlOX1b2WlZYUoY19LH+vlpqgdITf+uPn2W/9Q== X-Received: by 2002:ac2:4857:0:b0:4e6:630f:3c1d with SMTP id 23-20020ac24857000000b004e6630f3c1dmr4019133lfy.19.1678212435536; Tue, 07 Mar 2023 10:07:15 -0800 (PST) Received: from ubuntu-focal.. ([2a01:4f9:3a:1e26::2]) by smtp.gmail.com with ESMTPSA id f13-20020a2eb5ad000000b0028b6e922ba1sm2266952ljn.30.2023.03.07.10.07.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 10:07:15 -0800 (PST) From: Philipp Tomsich To: qemu-devel@nongnu.org Cc: Alistair Francis , Richard Henderson , Christoph Muellner , Kito Cheng , Philipp Tomsich Subject: [PATCH v5 1/2] target/riscv: refactor Zicond support Date: Tue, 7 Mar 2023 19:07:07 +0100 Message-Id: <20230307180708.302867-2-philipp.tomsich@vrull.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230307180708.302867-1-philipp.tomsich@vrull.eu> References: <20230307180708.302867-1-philipp.tomsich@vrull.eu> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12f; envelope-from=philipp.tomsich@vrull.eu; helo=mail-lf1-x12f.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org After the original Zicond support was stuck/fell through the cracks on the mailing list at v3 (and a different implementation was merged in the meanwhile), we need to refactor Zicond to prepare it to be reused by XVentanaCondOps. This commit lifts the common logic out into gen_czero and uses this via gen_logic and 2 helper functions (effectively partial closures). Reviewed-by: Richard Henderson Signed-off-by: Philipp Tomsich Acked-by: Alistair Francis --- Changes in v5: - fix a rebase artifact - drop the 'inline' specifiers (as per review comments) Changes in v4: - rebase onto master Changes in v3: - don't add this to MAINTAINERS, as it is an official extension Changes in v2: - gates availability of the instructions through a REQUIRE_ZICOND macro (these were previously always enabled) target/riscv/insn_trans/trans_rvzicond.c.inc | 36 ++++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/target/riscv/insn_trans/trans_rvzicond.c.inc b/target/riscv/insn_trans/trans_rvzicond.c.inc index 645260164e..c8e43fa325 100644 --- a/target/riscv/insn_trans/trans_rvzicond.c.inc +++ b/target/riscv/insn_trans/trans_rvzicond.c.inc @@ -2,6 +2,7 @@ * RISC-V translation routines for the Zicond Standard Extension. * * Copyright (c) 2020-2023 PLCT Lab + * Copyright (c) 2022 VRULL GmbH. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -22,28 +23,33 @@ } \ } while (0) -static bool trans_czero_eqz(DisasContext *ctx, arg_czero_eqz *a) +/* Emits "$rd = ($rs2 $zero) ? $zero : $rs1" */ +static void gen_czero(TCGv dest, TCGv src1, TCGv src2, TCGCond cond) { - REQUIRE_ZICOND(ctx); + TCGv zero = tcg_constant_tl(0); + tcg_gen_movcond_tl(cond, dest, src2, zero, zero, src1); +} - TCGv dest = dest_gpr(ctx, a->rd); - TCGv src1 = get_gpr(ctx, a->rs1, EXT_NONE); - TCGv src2 = get_gpr(ctx, a->rs2, EXT_NONE); +static void gen_czero_eqz(TCGv dest, TCGv src1, TCGv src2) +{ + gen_czero(dest, src1, src2, TCG_COND_EQ); +} - tcg_gen_movcond_tl(TCG_COND_EQ, dest, src2, ctx->zero, ctx->zero, src1); - gen_set_gpr(ctx, a->rd, dest); - return true; +static void gen_czero_nez(TCGv dest, TCGv src1, TCGv src2) +{ + gen_czero(dest, src1, src2, TCG_COND_NE); } -static bool trans_czero_nez(DisasContext *ctx, arg_czero_nez *a) +static bool trans_czero_eqz(DisasContext *ctx, arg_r *a) { REQUIRE_ZICOND(ctx); - TCGv dest = dest_gpr(ctx, a->rd); - TCGv src1 = get_gpr(ctx, a->rs1, EXT_NONE); - TCGv src2 = get_gpr(ctx, a->rs2, EXT_NONE); + return gen_logic(ctx, a, gen_czero_eqz); +} + +static bool trans_czero_nez(DisasContext *ctx, arg_r *a) +{ + REQUIRE_ZICOND(ctx); - tcg_gen_movcond_tl(TCG_COND_NE, dest, src2, ctx->zero, ctx->zero, src1); - gen_set_gpr(ctx, a->rd, dest); - return true; + return gen_logic(ctx, a, gen_czero_nez); }