From nobody Thu Dec 18 13:37:35 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635025745; cv=none; d=zohomail.com; s=zohoarc; b=i8a1inLQG6bnRB7WWyjSihXNnMTyUoXSDQjTKTQffsrQx/8pCL3V44xELniXmP1afTVaW3WMoA49woyB80TGcRkMOSJFkTzwN2TU7OF+ZgoIuVYNu4tAjVDOobyuyXhak/EMzFsBauBHQxXoxm9yOOw3MMi8dME7xND1WuOlsMY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635025745; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nsEohNEwrhu8Aem4tlRNJJjtbidr9jHp4BNgaPtAgyw=; b=SHQ4iNx4aYMGFNmKBjyrIFdYMnKGfvY5vx3G2UBiGw4P4hdnk1vm0nppVl9gFt5eQoSBgg3RrI8iT+HaBsjATzyj3L3uDd325Q/wEgOaI9sJ8UFCFFFDWd7d0Yrc1wwwiK1jTkLnAfksF9duJUwyNvwUsXmCIwgqU08TlwbsQoY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1635025745443297.7137492805464; Sat, 23 Oct 2021 14:49:05 -0700 (PDT) Received: by mail-wm1-f52.google.com with SMTP id 67-20020a1c1946000000b0030d4c90fa87so5838569wmz.2 for ; Sat, 23 Oct 2021 14:49:04 -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 z135sm16764317wmc.45.2021.10.23.14.49.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Oct 2021 14:49:03 -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=nsEohNEwrhu8Aem4tlRNJJjtbidr9jHp4BNgaPtAgyw=; b=LY3t46G4tZTk2WgPPx8j/chF6bfU2dlqZwFpJmpJ8RPvxR1HyBB4nng/adf7gtJFRs eAzaNeC/v39pt9NvyK8drO4TFTWzM4byAjsXRdssvwui7k0aEAh5CIl6ZyMvzgIjcYTv QbK6fwsZ5BwtBgOSI1d29m5uI290ZEkMTKkI+CVQgwoT714/BhaKHb4AD+BEvSEFd32P ebjnfAMhdyfREXe+sbJtr65u/L7kiUftAzSY86szdql4GxkdZRPFqnFThXoOMhogf6DI EO9Dol7hLVmTKXipSX+l9M3AuMu9hm1QGvJ6vjWrgw232x5vF6PbUr8tRuMtRmWpH3Sx sUzg== 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=nsEohNEwrhu8Aem4tlRNJJjtbidr9jHp4BNgaPtAgyw=; b=ft8YEsTwj/FhAFr8NTOEX1CWwjMCewMjRf6lLAU9rcjEI1v2bcJLu2GUXxdv8cbzRz Ljlefl+ZITFlmpeS0vrwDC4liEXiu0vTJphgFRdXAKHKAur2mDVYOz7oPPTF5mCxHiz4 xIavsyDwoionIumi5TEYDdSxHRSAX3X8oIbkJhKkYwkClaNeaNjkm1CYDY+eLz/3SNfW +T/hY16un7fHH9F4gGFpZiwnXKQysnOA+MsV6fKyg5IKQvnpBjTJsxxcntRpn76zt48f 9hr6Mxrl+oqZ5wJBwFMpN0iy928z5UhKSp5to6zedWan+d4dolNq73t63xW3uIJBAuIn buXA== X-Gm-Message-State: AOAM530K5yOzVcX3/YODZ2MIdIMblaaTRLg+PDaFAqrx4oRTj2b14/mo 6XJZrygv2BWjPzHDicJHouo= X-Google-Smtp-Source: ABdhPJzGwyuo6DTM9YMczF5R5OOnAwmJ3P5ys5zRPgIeKlrhZrKOKPiUWNdQnOTs4osMKJmKh7LqCg== X-Received: by 2002:a05:600c:2257:: with SMTP id a23mr18951295wmm.182.1635025743672; Sat, 23 Oct 2021 14:49:03 -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: Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Luis Pires Subject: [PATCH 12/33] target/mips: Convert MSA BIT instruction format to decodetree Date: Sat, 23 Oct 2021 23:47:42 +0200 Message-Id: <20211023214803.522078-13-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211023214803.522078-1-f4bug@amsat.org> References: <20211023214803.522078-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: 1635025746927100001 Convert instructions with an immediate bit index and data format df/m to decodetree. Since the 'data format' field is a constant value, use tcg_constant_i32() instead of a TCG temporary. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/tcg/msa.decode | 15 +++++ target/mips/tcg/msa_translate.c | 98 ++++++++------------------------- 2 files changed, 39 insertions(+), 74 deletions(-) diff --git a/target/mips/tcg/msa.decode b/target/mips/tcg/msa.decode index 5aaa85456da..91d71ff560c 100644 --- a/target/mips/tcg/msa.decode +++ b/target/mips/tcg/msa.decode @@ -22,6 +22,7 @@ @u5 ...... ... df:2 sa:5 ws:5 wd:5 ...... &msa_ldst @s5 ...... ... df:2 sa:s5 ws:5 wd:5 ...... &msa_ldst @ldi ...... ... df:2 sa:s10 wd:5 ...... &msa_ldst ws= =3D0 +@bit ...... ... df:7 ws:5 wd:5 ...... &msa_ldst sa= =3D0 =20 LSA 000000 ..... ..... ..... 000 .. 000101 @lsa DLSA 000000 ..... ..... ..... 000 .. 010101 @lsa @@ -47,5 +48,19 @@ BNZ 010001 111 .. ..... ................= @bz =20 LDI 011110 110 .. .......... ..... 000111 @ldi =20 + SLLI 011110 000 ....... ..... ..... 001001 @bit + SRAI 011110 001 ....... ..... ..... 001001 @bit + SRLI 011110 010 ....... ..... ..... 001001 @bit + BCLRI 011110 011 ....... ..... ..... 001001 @bit + BSETI 011110 100 ....... ..... ..... 001001 @bit + BNEGI 011110 101 ....... ..... ..... 001001 @bit + BINSLI 011110 110 ....... ..... ..... 001001 @bit + BINSRI 011110 111 ....... ..... ..... 001001 @bit + + SAT_S 011110 000 ....... ..... ..... 001010 @bit + SAT_U 011110 001 ....... ..... ..... 001010 @bit + SRARI 011110 010 ....... ..... ..... 001010 @bit + SRLRI 011110 011 ....... ..... ..... 001010 @bit + MSA 011110 -------------------------- } diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index 962aef601cb..10bbe25172a 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -27,8 +27,6 @@ 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_BIT_09 =3D 0x09 | OPC_MSA, - OPC_MSA_BIT_0A =3D 0x0A | 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, @@ -222,20 +220,6 @@ enum { OPC_MSUBR_Q_df =3D (0xE << 22) | OPC_MSA_3RF_1C, OPC_FSULE_df =3D (0xF << 22) | OPC_MSA_3RF_1A, OPC_FMAX_A_df =3D (0xF << 22) | OPC_MSA_3RF_1B, - - /* BIT instruction df(bits 22..16) =3D _B _H _W _D */ - OPC_SLLI_df =3D (0x0 << 23) | OPC_MSA_BIT_09, - OPC_SAT_S_df =3D (0x0 << 23) | OPC_MSA_BIT_0A, - OPC_SRAI_df =3D (0x1 << 23) | OPC_MSA_BIT_09, - OPC_SAT_U_df =3D (0x1 << 23) | OPC_MSA_BIT_0A, - OPC_SRLI_df =3D (0x2 << 23) | OPC_MSA_BIT_09, - OPC_SRARI_df =3D (0x2 << 23) | OPC_MSA_BIT_0A, - OPC_BCLRI_df =3D (0x3 << 23) | OPC_MSA_BIT_09, - OPC_SRLRI_df =3D (0x3 << 23) | OPC_MSA_BIT_0A, - OPC_BSETI_df =3D (0x4 << 23) | OPC_MSA_BIT_09, - OPC_BNEGI_df =3D (0x5 << 23) | OPC_MSA_BIT_09, - OPC_BINSLI_df =3D (0x6 << 23) | OPC_MSA_BIT_09, - OPC_BINSRI_df =3D (0x7 << 23) | OPC_MSA_BIT_09, }; =20 static const char msaregnames[][6] =3D { @@ -547,78 +531,48 @@ static bool trans_LDI(DisasContext *ctx, arg_msa_ldst= *a) return true; } =20 -static void gen_msa_bit(DisasContext *ctx) +static bool trans_msa_bit(DisasContext *ctx, arg_msa_ldst *a, + void (*gen_msa_bit)(TCGv_ptr, TCGv_i32, TCGv_i32, + TCGv_i32, TCGv_i32)) { -#define MASK_MSA_BIT(op) (MASK_MSA_MINOR(op) | (op & (0x7 << 23))) - uint8_t dfm =3D (ctx->opcode >> 16) & 0x7f; - uint8_t ws =3D (ctx->opcode >> 11) & 0x1f; - uint8_t wd =3D (ctx->opcode >> 6) & 0x1f; - TCGv_i32 tdf; TCGv_i32 tm; TCGv_i32 twd; TCGv_i32 tws; uint32_t df, m; =20 - if (!df_extract(df_bit, dfm, &df, &m)) { + if (!df_extract(df_bit, a->df, &df, &m)) { gen_reserved_instruction(ctx); - return; + return true; } =20 - tdf =3D tcg_const_i32(df); + tdf =3D tcg_constant_i32(df); tm =3D tcg_const_i32(m); - twd =3D tcg_const_i32(wd); - tws =3D tcg_const_i32(ws); + twd =3D tcg_const_i32(a->wd); + tws =3D tcg_const_i32(a->ws); =20 - switch (MASK_MSA_BIT(ctx->opcode)) { - case OPC_SLLI_df: - gen_helper_msa_slli_df(cpu_env, tdf, twd, tws, tm); - break; - case OPC_SRAI_df: - gen_helper_msa_srai_df(cpu_env, tdf, twd, tws, tm); - break; - case OPC_SRLI_df: - gen_helper_msa_srli_df(cpu_env, tdf, twd, tws, tm); - break; - case OPC_BCLRI_df: - gen_helper_msa_bclri_df(cpu_env, tdf, twd, tws, tm); - break; - case OPC_BSETI_df: - gen_helper_msa_bseti_df(cpu_env, tdf, twd, tws, tm); - break; - case OPC_BNEGI_df: - gen_helper_msa_bnegi_df(cpu_env, tdf, twd, tws, tm); - break; - case OPC_BINSLI_df: - gen_helper_msa_binsli_df(cpu_env, tdf, twd, tws, tm); - break; - case OPC_BINSRI_df: - gen_helper_msa_binsri_df(cpu_env, tdf, twd, tws, tm); - break; - case OPC_SAT_S_df: - gen_helper_msa_sat_s_df(cpu_env, tdf, twd, tws, tm); - break; - case OPC_SAT_U_df: - gen_helper_msa_sat_u_df(cpu_env, tdf, twd, tws, tm); - break; - case OPC_SRARI_df: - gen_helper_msa_srari_df(cpu_env, tdf, twd, tws, tm); - break; - case OPC_SRLRI_df: - gen_helper_msa_srlri_df(cpu_env, tdf, twd, tws, tm); - break; - default: - MIPS_INVAL("MSA instruction"); - gen_reserved_instruction(ctx); - break; - } + gen_msa_bit(cpu_env, tdf, twd, tws, tm); =20 - tcg_temp_free_i32(tdf); tcg_temp_free_i32(tm); tcg_temp_free_i32(twd); tcg_temp_free_i32(tws); + + return true; } =20 +TRANS_MSA(SLLI, trans_msa_bit, gen_helper_msa_slli_df); +TRANS_MSA(SRAI, trans_msa_bit, gen_helper_msa_srai_df); +TRANS_MSA(SRLI, trans_msa_bit, gen_helper_msa_srli_df); +TRANS_MSA(BCLRI, trans_msa_bit, gen_helper_msa_bclri_df); +TRANS_MSA(BSETI, trans_msa_bit, gen_helper_msa_bseti_df); +TRANS_MSA(BNEGI, trans_msa_bit, gen_helper_msa_bnegi_df); +TRANS_MSA(BINSLI, trans_msa_bit, gen_helper_msa_binsli_df); +TRANS_MSA(BINSRI, trans_msa_bit, gen_helper_msa_binsri_df); +TRANS_MSA(SAT_S, trans_msa_bit, gen_helper_msa_sat_u_df); +TRANS_MSA(SAT_U, trans_msa_bit, gen_helper_msa_sat_u_df); +TRANS_MSA(SRARI, trans_msa_bit, gen_helper_msa_srari_df); +TRANS_MSA(SRLRI, trans_msa_bit, gen_helper_msa_srlri_df); + static void gen_msa_3r(DisasContext *ctx) { #define MASK_MSA_3R(op) (MASK_MSA_MINOR(op) | (op & (0x7 << 23))) @@ -2151,10 +2105,6 @@ static bool trans_MSA(DisasContext *ctx, arg_MSA *a) case OPC_MSA_I8_02: gen_msa_i8(ctx); break; - case OPC_MSA_BIT_09: - case OPC_MSA_BIT_0A: - gen_msa_bit(ctx); - break; case OPC_MSA_3R_0D: case OPC_MSA_3R_0E: case OPC_MSA_3R_0F: --=20 2.31.1