From nobody Mon Feb 9 17:59:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635358175; cv=none; d=zohomail.com; s=zohoarc; b=Ufw5nMGIt5Wqt8ep+irTr7nP2DcZMxtlIRxcMDUnpCgIG500uOl5nhVNjXJYXpi3IwEpaIwSTk0hBxJeiStHs+R/jcPMp3jGEVYc3vSDe/fwVxJzMskAE/9XdHTB81PGTo4Pj+mwaZZxjf4m5qXi61+4zksTwpc74ENnQc4tBDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635358175; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tnJ7lxQHoEU7HEUczsJI2BkznSNicr9VZoz+wFH7RLw=; b=WB1Pq0XVQggwJIFa3f0irCDSLg7CihtIkQ6ddd/Hhn1JkyWli0IAjLfhEGMl1JNWqID+g9COYn9B23/r0rvqw+JEbPAu/G0GxmjHDJl6Z+RJL84JNtfjKFbywLkuNcOGM2ZBdacapO5qYL/IJHQVmHRb/mqWJSEq1cwJLKG42ro= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1635358175918754.8937596790952; Wed, 27 Oct 2021 11:09:35 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id b12so1165501wrh.4 for ; Wed, 27 Oct 2021 11:09:35 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id y8sm580611wrq.77.2021.10.27.11.09.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 11:09:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tnJ7lxQHoEU7HEUczsJI2BkznSNicr9VZoz+wFH7RLw=; b=Kb0nPQryKUJVuhlWfWsigJwFLa0HfN0aWNIcQ8P7t8SB+Eeo+pwEDXARw9IrkZ0pQE ATcFog+9WMjSvLRwpwp8sAMJD78pzOz8n9Jk6mXt1u1v5vDhaWRUghQlGx/rBT1JDRjp xVcOmOCcGEMvQcF6aj2MqCLcQu1wqyXUueLp7urPmMX2yRBf944yKoXUCU4FJgXJP8CY FOXXXZ+6F7e1PzcGpn4i+WrhvI+qc++las0YnI/VD8OBCkZY8AQgbthrt985SF87HDtx uFddRhWYuF6eResi1G+nAc7rx8WRVzL4bilayD+7CopKCNQhBfxtJn/DbC6AjfB9sb/U i/ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=tnJ7lxQHoEU7HEUczsJI2BkznSNicr9VZoz+wFH7RLw=; b=LS9krhwPaDDg9zCNbEAODbFJPIAnCdSxh87gA1/M0+99Hb5pNiQTVNC71hJIOyRHxE Ct1vOB+i9nBLQh9WfnoLvj2/+SlvKV7y5/tigUhp6q0078zG7jyWuF/JyczWSBIMvWTZ cp/5WHi7ukL1PGHuO3yvNxHmXerbeqfF1BO5QDi3kW/hDjDS5gkJv86fpZmzWYTu1h9B zBbDurU50ZhCAR0ZnXDvHbFqF6Y52ufv3L8XRahH8YummSv03UYES8wO9k7ZKbMC29Fq g57hgUcJQcyRDbAAwbv71aiXQj0JfyoBNuGo1km64AJiY/0fCfUGCgaWEn0Tr7HTG6WK g4HA== X-Gm-Message-State: AOAM532oSN4yYKhdJXz9B+SgzTLrC42TeV2GBOHj8dJmYrJoStUenLgp L0nQRdM7MK8Tl07KkIEFBUKI2v/yHMs= X-Google-Smtp-Source: ABdhPJwFGOkm5+ifULVK3JgR1gxsiLLzVB0hWe73DmCer43xP3J6Xg/8pxLWOCRaUYedYroMzaqNAA== X-Received: by 2002:a5d:6c62:: with SMTP id r2mr24204307wrz.284.1635358174156; Wed, 27 Oct 2021 11:09:34 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Aleksandar Rikalo , Jiaxun Yang , Richard Henderson Subject: [PATCH v2 26/32] target/mips: Convert MSA COPY_S and INSERT opcodes to decodetree Date: Wed, 27 Oct 2021 20:07:24 +0200 Message-Id: <20211027180730.1551932-27-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211027180730.1551932-1-f4bug@amsat.org> References: <20211027180730.1551932-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1635358177972100001 Convert the COPY_S (Element Copy to GPR Signed) opcode and INSERT (GPR Insert Element) opcode to decodetree. Reviewed-by: Jiaxun Yang Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/tcg/msa.decode | 2 + target/mips/tcg/msa_translate.c | 103 +++++--------------------------- 2 files changed, 18 insertions(+), 87 deletions(-) diff --git a/target/mips/tcg/msa.decode b/target/mips/tcg/msa.decode index 4e1d3caadc5..7c309526444 100644 --- a/target/mips/tcg/msa.decode +++ b/target/mips/tcg/msa.decode @@ -165,7 +165,9 @@ BNZ 010001 111 .. ..... ...............= . @bz =20 SLDI 011110 0000 ...... ..... ..... 011001 @elm_df SPLATI 011110 0001 ...... ..... ..... 011001 @elm_df + COPY_S 011110 0010 ...... ..... ..... 011001 @elm_df COPY_U 011110 0011 ...... ..... ..... 011001 @elm_df + INSERT 011110 0100 ...... ..... ..... 011001 @elm_df INSVE 011110 0101 ...... ..... ..... 011001 @elm_df =20 FCAF 011110 0000 . ..... ..... ..... 011010 @3rf diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index a2d7bbe912f..2ed637f16da 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -36,9 +36,7 @@ enum { /* ELM instructions df(bits 21..16) =3D _b, _h, _w, _d */ OPC_CTCMSA =3D (0x0 << 22) | (0x3E << 16) | OPC_MSA_ELM, OPC_CFCMSA =3D (0x1 << 22) | (0x3E << 16) | OPC_MSA_ELM, - OPC_COPY_S_df =3D (0x2 << 22) | (0x00 << 16) | OPC_MSA_ELM, OPC_MOVE_V =3D (0x2 << 22) | (0x3E << 16) | OPC_MSA_ELM, - OPC_INSERT_df =3D (0x4 << 22) | (0x00 << 16) | OPC_MSA_ELM, }; =20 static const char msaregnames[][6] =3D { @@ -604,98 +602,31 @@ static bool trans_COPY_U(DisasContext *ctx, arg_msa_e= lm_df *a) return trans_msa_elm_d64(ctx, a, gen_msa_copy_u); } =20 -static void gen_msa_elm_df(DisasContext *ctx, uint32_t df, uint32_t n) +static bool trans_COPY_S(DisasContext *ctx, arg_msa_elm_df *a) { -#define MASK_MSA_ELM(op) (MASK_MSA_MINOR(op) | (op & (0xf << 22))) - uint8_t ws =3D (ctx->opcode >> 11) & 0x1f; - uint8_t wd =3D (ctx->opcode >> 6) & 0x1f; + static gen_helper_piii * const gen_msa_copy_s[4] =3D { + gen_helper_msa_copy_s_b, gen_helper_msa_copy_s_h, + gen_helper_msa_copy_s_w, NULL_IF_TARGET_MIPS32(gen_helper_msa_copy= _s_d) + }; =20 - TCGv_i32 tws =3D tcg_const_i32(ws); - TCGv_i32 twd =3D tcg_const_i32(wd); - TCGv_i32 tn =3D tcg_const_i32(n); + return trans_msa_elm_d64(ctx, a, gen_msa_copy_s); +} =20 - switch (MASK_MSA_ELM(ctx->opcode)) { - case OPC_COPY_S_df: - case OPC_INSERT_df: -#if !defined(TARGET_MIPS64) - /* Double format valid only for MIPS64 */ - if (df =3D=3D DF_DOUBLE) { - gen_reserved_instruction(ctx); - break; - } -#endif - switch (MASK_MSA_ELM(ctx->opcode)) { - case OPC_COPY_S_df: - if (likely(wd !=3D 0)) { - switch (df) { - case DF_BYTE: - gen_helper_msa_copy_s_b(cpu_env, twd, tws, tn); - break; - case DF_HALF: - gen_helper_msa_copy_s_h(cpu_env, twd, tws, tn); - break; - case DF_WORD: - gen_helper_msa_copy_s_w(cpu_env, twd, tws, tn); - break; -#if defined(TARGET_MIPS64) - case DF_DOUBLE: - gen_helper_msa_copy_s_d(cpu_env, twd, tws, tn); - break; -#endif - default: - assert(0); - } - } - break; - case OPC_INSERT_df: - switch (df) { - case DF_BYTE: - gen_helper_msa_insert_b(cpu_env, twd, tws, tn); - break; - case DF_HALF: - gen_helper_msa_insert_h(cpu_env, twd, tws, tn); - break; - case DF_WORD: - gen_helper_msa_insert_w(cpu_env, twd, tws, tn); - break; -#if defined(TARGET_MIPS64) - case DF_DOUBLE: - gen_helper_msa_insert_d(cpu_env, twd, tws, tn); - break; -#endif - default: - assert(0); - } - break; - } - break; - default: - MIPS_INVAL("MSA instruction"); - gen_reserved_instruction(ctx); - } - tcg_temp_free_i32(twd); - tcg_temp_free_i32(tws); - tcg_temp_free_i32(tn); +static bool trans_INSERT(DisasContext *ctx, arg_msa_elm_df *a) +{ + static gen_helper_piii * const gen_msa_insert[4] =3D { + gen_helper_msa_insert_b, gen_helper_msa_insert_h, + gen_helper_msa_insert_w, NULL_IF_TARGET_MIPS32(gen_helper_msa_inse= rt_d) + }; + + return trans_msa_elm_d64(ctx, a, gen_msa_insert); } =20 static void gen_msa_elm(DisasContext *ctx) { uint8_t dfn =3D (ctx->opcode >> 16) & 0x3f; - uint32_t df =3D 0, n =3D 0; =20 - if ((dfn & 0x30) =3D=3D 0x00) { - n =3D dfn & 0x0f; - df =3D DF_BYTE; - } else if ((dfn & 0x38) =3D=3D 0x20) { - n =3D dfn & 0x07; - df =3D DF_HALF; - } else if ((dfn & 0x3c) =3D=3D 0x30) { - n =3D dfn & 0x03; - df =3D DF_WORD; - } else if ((dfn & 0x3e) =3D=3D 0x38) { - n =3D dfn & 0x01; - df =3D DF_DOUBLE; - } else if (dfn =3D=3D 0x3E) { + if (dfn =3D=3D 0x3E) { /* CTCMSA, CFCMSA, MOVE.V */ gen_msa_elm_3e(ctx); return; @@ -703,8 +634,6 @@ static void gen_msa_elm(DisasContext *ctx) gen_reserved_instruction(ctx); return; } - - gen_msa_elm_df(ctx, df, n); } =20 static bool trans_msa_3rf(DisasContext *ctx, arg_msa_r *a, --=20 2.31.1