From nobody Mon Feb 9 16:54:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635358166; cv=none; d=zohomail.com; s=zohoarc; b=gvs9Qj7fLWiCQhT5wB7D5/dyBCixqKJB5mS3PbD/T+MrAXXRsaOjlFD+3T2Teuj1s5xQP/JniPy+mzp42/IBdyrLpF8HzOpXfR198tRacUKVPudZtcSayWIacBctZgNWgg1thwNCiE0mYA2W3MGSDuazuUbTzyfG8zDcfd77wEU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635358166; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UVOoDr7N9SJ2WBkzNmDFojqxRXyM23CZiWmnaqd7S/s=; b=L+5cmynQ6v4p5wipcRjAwFbXU5sIFYkv1qvoiOMzMFGs+4sD08mlUP7bCTNSg+glw6mv552P7bQ1H5bLZFsWpkeaiCg76ZdQaIEQ4T1nWmEMCU0GGGnkCpKCckpD2p32gKxHF/gWuPcqYN+X9CdzMCK0QGbO0apCO+XqDoyk9DI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1635358166833717.2939521689128; Wed, 27 Oct 2021 11:09:26 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id o14so5559078wra.12 for ; Wed, 27 Oct 2021 11:09:26 -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 z1sm629981wre.21.2021.10.27.11.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 11:09:24 -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=UVOoDr7N9SJ2WBkzNmDFojqxRXyM23CZiWmnaqd7S/s=; b=hKmCYZf3x31+jhHBxDjRmgrlZGtCFLodOq5GUy5hpuY9q0QtcVfZWUEj+7ZhJQQVAq mdK3YbR78qJlM8ep4doYhDMPHErZFyXxhxtAF8awUwGczlVArJiNvYR4CPQJeV7yfy04 TM1EyVqJ03mZEShTSjpda69PfTQKEOtIHlGXStzFNkGpdOYdn/7N1VVVQXL3DeUqnzy6 I4KlISf5Fce1LtQMyK9q2ypCa+FQnyez5MNgvlnoQAGy4EKXa3jdEa/KznQ2ruWG3FSH 79LnPKetlTDDzvoMOBIH7erGJ5qYxHMKpFCaPOkga+PF8imlZG3xs8/QkeYVdG6vulFW QfQQ== 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=UVOoDr7N9SJ2WBkzNmDFojqxRXyM23CZiWmnaqd7S/s=; b=zfCVtRtJRLNQubVHi8x4Fv86fIMU1vL7dgEtxb2tG1ohnn++zm+IL9vHynPym/tt4b dH9SBa3gMRIQBB56WT1rIUiAF/lwyAZUCPaRnmIARnHukVTRsRgDQK8/p1wgaJmRYYKg pZ9LupVnv4zy79FKf82qe+e2O9jYrOLdXVaaPMMSZORCHMSHDgHlKWLN2oHw3KH+7jdG Iirh7F994vAMIQTA54zPL98zdLYjCSRliA91dDvQ8tEkaNyIlChdB74w/EpPrhki5rNN ow9LWQVpS2juRwjdhsdTh6UkmkII4psRfUt7S00YWEYxYY3pr+ghFZE75bf8XcAiQ0TN xW0A== X-Gm-Message-State: AOAM533fEbniBpfEku4RolAyiiIkejFNkPyIeuNr+59PGWb9/4ZxMGWx Ee400fH1W1B0bK8qankBZCANUFA0Hr8= X-Google-Smtp-Source: ABdhPJzgMm9UJPnjC31yuUNPyo3UueiNkHMEAhG1+Vd4JbvV4IAOOZ3LzaVth+rPrIL1kv7bRQcg/Q== X-Received: by 2002:a5d:47c8:: with SMTP id o8mr24083183wrc.374.1635358165102; Wed, 27 Oct 2021 11:09:25 -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 Subject: [PATCH v2 24/32] target/mips: Convert MSA ELM instruction format to decodetree Date: Wed, 27 Oct 2021 20:07:22 +0200 Message-Id: <20211027180730.1551932-25-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: 1635358168895100001 Convert instructions with an immediate element index and data format df/n to decodetree. Since the 'data format' and 'n' fields are constant values, use tcg_constant_i32() instead of a TCG temporaries. Reviewed-by: Jiaxun Yang Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: Return 'false' (not decoded) for invalid DF values (Richard) --- target/mips/tcg/msa.decode | 8 +++++ target/mips/tcg/msa_translate.c | 53 +++++++++++++++++++++++++-------- 2 files changed, 48 insertions(+), 13 deletions(-) diff --git a/target/mips/tcg/msa.decode b/target/mips/tcg/msa.decode index 985af71889e..e701e507bfc 100644 --- a/target/mips/tcg/msa.decode +++ b/target/mips/tcg/msa.decode @@ -20,7 +20,10 @@ &msa_i8 df wd ws sa &msa_ldst df wd ws sa &msa_bit df wd ws m +&msa_elm_df df wd ws n =20 +%dfn_df 16:6 !function=3Dmsa_elm_df +%dfn_n 16:6 !function=3Dmsa_elm_n %dfm_df 16:7 !function=3Dmsa_bit_df %dfm_m 16:7 !function=3Dmsa_bit_m =20 @@ -28,6 +31,7 @@ @ldst ...... sa:s10 ws:5 wd:5 .... df:2 &msa_ldst @bz_v ...... ... .. wt:5 sa:16 &msa_bz df=3D3 @bz ...... ... df:2 wt:5 sa:16 &msa_bz +@elm_df ...... .... ...... ws:5 wd:5 ...... &msa_elm_df df= =3D%dfn_df n=3D%dfn_n @vec ...... ..... wt:5 ws:5 wd:5 ...... &msa_r df=3D0 @2r ...... ........ df:2 ws:5 wd:5 ...... &msa_r wt=3D0 @2rf ...... ......... df:1 ws:5 wd:5 ...... &msa_r wt=3D0 @@ -159,6 +163,10 @@ BNZ 010001 111 .. ..... ..............= .. @bz HSUB_S 011110 110.. ..... ..... ..... 010101 @3r HSUB_U 011110 111.. ..... ..... ..... 010101 @3r =20 + SLDI 011110 0000 ...... ..... ..... 011001 @elm_df + SPLATI 011110 0001 ...... ..... ..... 011001 @elm_df + INSVE 011110 0101 ...... ..... ..... 011001 @elm_df + FCAF 011110 0000 . ..... ..... ..... 011010 @3rf FCUN 011110 0001 . ..... ..... ..... 011010 @3rf FCEQ 011110 0010 . ..... ..... ..... 011010 @3rf diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index d846f72c72b..fabc7f5538b 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -17,6 +17,8 @@ #include "fpu_helper.h" #include "internal.h" =20 +static int msa_elm_n(DisasContext *ctx, int x); +static int msa_elm_df(DisasContext *ctx, int x); static int msa_bit_m(DisasContext *ctx, int x); static int msa_bit_df(DisasContext *ctx, int x); =20 @@ -32,15 +34,12 @@ enum { =20 enum { /* ELM instructions df(bits 21..16) =3D _b, _h, _w, _d */ - OPC_SLDI_df =3D (0x0 << 22) | (0x00 << 16) | OPC_MSA_ELM, OPC_CTCMSA =3D (0x0 << 22) | (0x3E << 16) | OPC_MSA_ELM, - OPC_SPLATI_df =3D (0x1 << 22) | (0x00 << 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_COPY_U_df =3D (0x3 << 22) | (0x00 << 16) | OPC_MSA_ELM, OPC_INSERT_df =3D (0x4 << 22) | (0x00 << 16) | OPC_MSA_ELM, - OPC_INSVE_df =3D (0x5 << 22) | (0x00 << 16) | OPC_MSA_ELM, }; =20 static const char msaregnames[][6] =3D { @@ -97,6 +96,24 @@ static int msa_df_extract_df(DisasContext *ctx, int x, c= onst struct dfe *s) return -1; } =20 +static const struct dfe df_elm[] =3D { + /* Table 3.26 ELM Instruction Format */ + [DF_BYTE] =3D {4, 2, 0b00}, + [DF_HALF] =3D {3, 3, 0b100}, + [DF_WORD] =3D {2, 4, 0b1100}, + [DF_DOUBLE] =3D {1, 5, 0b11100} +}; + +static int msa_elm_n(DisasContext *ctx, int x) +{ + return msa_df_extract_val(ctx, x, df_elm); +} + +static int msa_elm_df(DisasContext *ctx, int x) +{ + return msa_df_extract_df(ctx, x, df_elm); +} + static const struct dfe df_bit[] =3D { /* Table 3.28 BIT Instruction Format */ [DF_BYTE] =3D {3, 4, 0b1110}, @@ -528,6 +545,26 @@ static void gen_msa_elm_3e(DisasContext *ctx) tcg_temp_free_i32(tsr); } =20 +static bool trans_msa_elm_df(DisasContext *ctx, arg_msa_elm_df *a, + gen_helper_piiii *gen_msa_elm_df) +{ + if (a->df < 0) { + return false; + } + + gen_msa_elm_df(cpu_env, + tcg_constant_i32(a->df), + tcg_constant_i32(a->wd), + tcg_constant_i32(a->ws), + tcg_constant_i32(a->n)); + + return true; +} + +TRANS_MSA(SLDI, trans_msa_elm_df, gen_helper_msa_sldi_df); +TRANS_MSA(SPLATI, trans_msa_elm_df, gen_helper_msa_splati_df); +TRANS_MSA(INSVE, trans_msa_elm_df, gen_helper_msa_insve_df); + static void gen_msa_elm_df(DisasContext *ctx, uint32_t df, uint32_t n) { #define MASK_MSA_ELM(op) (MASK_MSA_MINOR(op) | (op & (0xf << 22))) @@ -537,18 +574,8 @@ static void gen_msa_elm_df(DisasContext *ctx, uint32_t= df, uint32_t n) TCGv_i32 tws =3D tcg_const_i32(ws); TCGv_i32 twd =3D tcg_const_i32(wd); TCGv_i32 tn =3D tcg_const_i32(n); - TCGv_i32 tdf =3D tcg_constant_i32(df); =20 switch (MASK_MSA_ELM(ctx->opcode)) { - case OPC_SLDI_df: - gen_helper_msa_sldi_df(cpu_env, tdf, twd, tws, tn); - break; - case OPC_SPLATI_df: - gen_helper_msa_splati_df(cpu_env, tdf, twd, tws, tn); - break; - case OPC_INSVE_df: - gen_helper_msa_insve_df(cpu_env, tdf, twd, tws, tn); - break; case OPC_COPY_S_df: case OPC_COPY_U_df: case OPC_INSERT_df: --=20 2.31.1