From nobody Tue Feb 10 11:14:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635860636; cv=none; d=zohomail.com; s=zohoarc; b=OPskK2ByqReNApdaDYN3/y7oJHDutixh628RQVZwYkZNYhqaqkDDW3KdoPuyivDzO4/0m2hSuqMUjNqBju397bA68lewBVTySLPoH1bZNjcfaloqtgyf3x2jNUjx9YKL64HbM5zQRYYZ0bA03JU7B2DwdVnWTGLS5Q/34N3m0VQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635860636; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/blkpftsPcSQ6nROrJWlw52a9nymMffz2N9GqEnnow0=; b=RJVCtt0qnIYN7E2Fe+0HfA4khi46Fr6SSrCYs2CYNWlzApaA+cRnKy7bGXjX+HtQxHmvj9SzT2DwzqdgFEewfvx3183zo/unwmBR5jVGsyoXTcbtuu5tK5uqrf3zt6IEnh6eeWF76IEkd07j9jxBjD6pfpUZB/81dEMiQotXIis= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1635860636073821.7352729111294; Tue, 2 Nov 2021 06:43:56 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id d5so18097361wrc.1 for ; Tue, 02 Nov 2021 06:43:55 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id b197sm2661221wmb.24.2021.11.02.06.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 06:43:53 -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=/blkpftsPcSQ6nROrJWlw52a9nymMffz2N9GqEnnow0=; b=U/k1TN3YUNhft1KkvSOh4j2XWvYABiU2oT1ZJL+wTKrpYg+WXqkOT69MV4ZubCvIhX yqEpnf2B5DydaExtNro1cy3ColkCErCqWeludEvYweeOXAA0wFPwJk59Q96R6G8O11Kl LUEk+0dpCluB6z+5SjxVOx3kxBXCA4M0ERngHKAcLTqGfe741MtZMxXOWA3nWtC7DT55 HSlAUGiqvk2SmtBy2EcSum+xro5+pRB7hS9jeSW0zenD/9NSpk3Zg26xq0M4fHumAkwg 0PWMEtdHbBFfin+fMiAH1PZ/fYayFS9t8esRCls1BOxJ/fI4vlUAyO/8JoPWKmJ3HhGE H42Q== 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=/blkpftsPcSQ6nROrJWlw52a9nymMffz2N9GqEnnow0=; b=e1Zr/AHoLjQHsR5P/TWX42ZiAe4/bHyXA6ZkFZctLNRmXJQ+UzYA1ECEk7AHHONuZO jkTcy/QjOQhZM+6VIVu5KmDDaaZlGkklYGEnsU4mEczw3CHHKvtLpDpM/22i1YzbemsK Va+N8AwWZ5eHZ1H7q1xTnKjGjVmmVwif+9SANotsn9S59nWc3klnUQrLUtuG2sIxG3TA DY3KIWpLiqFPe4ThtEihNOEoCabvFdkzrEzGPNertGNPW7aVbgKbXnIw5SzOgLWQXddZ bFttwctD/71fYSa55nhw9UxroZfbuKpVkufmsDCd/nNJ6HVCZjMfcGfHAZVMgNB04X24 XqDg== X-Gm-Message-State: AOAM532ZdNfMY2DCUQ4jg+mun7YY4pLiaHhQXimf2MuYuv0ffxhQSj/E OJKjvkYuSXFP+g6fG17SXMA= X-Google-Smtp-Source: ABdhPJxIDb5soZpZeSzMsUGkHiDOk1EFCHdjFRPIkErIrvFVC4rtWNdEuC6fO26lymXQyST82uDGnA== X-Received: by 2002:adf:c604:: with SMTP id n4mr46108604wrg.202.1635860634369; Tue, 02 Nov 2021 06:43:54 -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: Jiaxun Yang , Aleksandar Rikalo , Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 15/41] target/mips: Convert MSA I8 instruction format to decodetree Date: Tue, 2 Nov 2021 14:42:14 +0100 Message-Id: <20211102134240.3036524-16-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211102134240.3036524-1-f4bug@amsat.org> References: <20211102134240.3036524-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: 1635860637034100003 Convert instructions with an 8-bit immediate value and either implicit data format or data format df to decodetree. Reviewed-by: Jiaxun Yang Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211028210843.2120802-13-f4bug@amsat.org> --- target/mips/tcg/msa.decode | 8 ++++ target/mips/tcg/msa_translate.c | 75 +++++++++------------------------ 2 files changed, 27 insertions(+), 56 deletions(-) diff --git a/target/mips/tcg/msa.decode b/target/mips/tcg/msa.decode index 8e887f54ad5..24847599a05 100644 --- a/target/mips/tcg/msa.decode +++ b/target/mips/tcg/msa.decode @@ -27,6 +27,7 @@ @u5 ...... ... df:2 sa:5 ws:5 wd:5 ...... &msa_i @s5 ...... ... df:2 sa:s5 ws:5 wd:5 ...... &msa_i @i8_df ...... df:2 sa:s8 ws:5 wd:5 ...... &msa_i +@i8 ...... .. sa:s8 ws:5 wd:5 ...... &msa_i df=3D0 @ldi ...... ... df:2 sa:s10 wd:5 ...... &msa_ldi @bit ...... ... ....... ws:5 wd:5 ...... &msa_bit df=3D= %bit_df m=3D%bit_m =20 @@ -39,6 +40,13 @@ BZ 010001 110 .. ..... ................= @bz BNZ 010001 111 .. ..... ................ @bz =20 { + ANDI 011110 00 ........ ..... ..... 000000 @i8 + ORI 011110 01 ........ ..... ..... 000000 @i8 + NORI 011110 10 ........ ..... ..... 000000 @i8 + XORI 011110 11 ........ ..... ..... 000000 @i8 + BMNZI 011110 00 ........ ..... ..... 000001 @i8 + BMZI 011110 01 ........ ..... ..... 000001 @i8 + BSELI 011110 10 ........ ..... ..... 000001 @i8 SHF 011110 .. ........ ..... ..... 000010 @i8_df =20 ADDVI 011110 000 .. ..... ..... ..... 000110 @u5 diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index 1b1d88ac646..7e5bd783df0 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -27,9 +27,6 @@ static int bit_df(DisasContext *ctx, int x); =20 #define MASK_MSA_MINOR(op) (MASK_OP_MAJOR(op) | (op & 0x3F)) enum { - OPC_MSA_I8_00 =3D 0x00 | OPC_MSA, - OPC_MSA_I8_01 =3D 0x01 | OPC_MSA, - OPC_MSA_I8_02 =3D 0x02 | OPC_MSA, OPC_MSA_3R_0D =3D 0x0D | OPC_MSA, OPC_MSA_3R_0E =3D 0x0E | OPC_MSA, OPC_MSA_3R_0F =3D 0x0F | OPC_MSA, @@ -57,15 +54,6 @@ enum { }; =20 enum { - /* I8 instruction */ - OPC_ANDI_B =3D (0x0 << 24) | OPC_MSA_I8_00, - OPC_BMNZI_B =3D (0x0 << 24) | OPC_MSA_I8_01, - OPC_ORI_B =3D (0x1 << 24) | OPC_MSA_I8_00, - OPC_BMZI_B =3D (0x1 << 24) | OPC_MSA_I8_01, - OPC_NORI_B =3D (0x2 << 24) | OPC_MSA_I8_00, - OPC_BSELI_B =3D (0x2 << 24) | OPC_MSA_I8_01, - OPC_XORI_B =3D (0x3 << 24) | OPC_MSA_I8_00, - /* VEC/2R/2RF instruction */ OPC_AND_V =3D (0x00 << 21) | OPC_MSA_VEC, OPC_OR_V =3D (0x01 << 21) | OPC_MSA_VEC, @@ -336,6 +324,7 @@ static inline bool check_msa_enabled(DisasContext *ctx) return true; } =20 +typedef void gen_helper_piii(TCGv_ptr, TCGv_i32, TCGv_i32, TCGv_i32); typedef void gen_helper_piiii(TCGv_ptr, TCGv_i32, TCGv_i32, TCGv_i32, TCGv= _i32); =20 static void gen_check_zero_element(TCGv tresult, uint8_t df, uint8_t wt, @@ -429,50 +418,29 @@ static bool trans_BNZ(DisasContext *ctx, arg_msa_bz *= a) return gen_msa_BxZ(ctx, a->df, a->wt, a->sa, true); } =20 -static void gen_msa_i8(DisasContext *ctx) +static bool trans_msa_i8(DisasContext *ctx, arg_msa_i *a, + gen_helper_piii *gen_msa_i8) { -#define MASK_MSA_I8(op) (MASK_MSA_MINOR(op) | (op & (0x03 << 24))) - uint8_t i8 =3D (ctx->opcode >> 16) & 0xff; - uint8_t ws =3D (ctx->opcode >> 11) & 0x1f; - uint8_t wd =3D (ctx->opcode >> 6) & 0x1f; - - TCGv_i32 twd =3D tcg_const_i32(wd); - TCGv_i32 tws =3D tcg_const_i32(ws); - TCGv_i32 ti8 =3D tcg_const_i32(i8); - - switch (MASK_MSA_I8(ctx->opcode)) { - case OPC_ANDI_B: - gen_helper_msa_andi_b(cpu_env, twd, tws, ti8); - break; - case OPC_ORI_B: - gen_helper_msa_ori_b(cpu_env, twd, tws, ti8); - break; - case OPC_NORI_B: - gen_helper_msa_nori_b(cpu_env, twd, tws, ti8); - break; - case OPC_XORI_B: - gen_helper_msa_xori_b(cpu_env, twd, tws, ti8); - break; - case OPC_BMNZI_B: - gen_helper_msa_bmnzi_b(cpu_env, twd, tws, ti8); - break; - case OPC_BMZI_B: - gen_helper_msa_bmzi_b(cpu_env, twd, tws, ti8); - break; - case OPC_BSELI_B: - gen_helper_msa_bseli_b(cpu_env, twd, tws, ti8); - break; - default: - MIPS_INVAL("MSA instruction"); - gen_reserved_instruction(ctx); - break; + if (!check_msa_enabled(ctx)) { + return true; } =20 - tcg_temp_free_i32(twd); - tcg_temp_free_i32(tws); - tcg_temp_free_i32(ti8); + gen_msa_i8(cpu_env, + tcg_constant_i32(a->wd), + tcg_constant_i32(a->ws), + tcg_constant_i32(a->sa)); + + return true; } =20 +TRANS(ANDI, trans_msa_i8, gen_helper_msa_andi_b); +TRANS(ORI, trans_msa_i8, gen_helper_msa_ori_b); +TRANS(NORI, trans_msa_i8, gen_helper_msa_nori_b); +TRANS(XORI, trans_msa_i8, gen_helper_msa_xori_b); +TRANS(BMNZI, trans_msa_i8, gen_helper_msa_bmnzi_b); +TRANS(BMZI, trans_msa_i8, gen_helper_msa_bmzi_b); +TRANS(BSELI, trans_msa_i8, gen_helper_msa_bseli_b); + static bool trans_SHF(DisasContext *ctx, arg_msa_i *a) { if (a->df =3D=3D DF_DOUBLE) { @@ -2106,11 +2074,6 @@ static bool trans_MSA(DisasContext *ctx, arg_MSA *a) } =20 switch (MASK_MSA_MINOR(opcode)) { - case OPC_MSA_I8_00: - case OPC_MSA_I8_01: - case OPC_MSA_I8_02: - gen_msa_i8(ctx); - break; case OPC_MSA_3R_0D: case OPC_MSA_3R_0E: case OPC_MSA_3R_0F: --=20 2.31.1