From nobody Tue Feb 10 11:16:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) client-ip=209.85.128.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635860655; cv=none; d=zohomail.com; s=zohoarc; b=U2zzTIKm5DeTxQLJQa5yEmNPpHye0pDpS+gJiIn+B6SihUISlsYPcOILF5TIWYqwqsAm0f+0FpxrVS5CAWJY2a1o8pqhgiOCeCdDVrFkNAMG7Z7NfLCglwj9bwsMXWqI9dKnWklgpKyDksUIWD0508rgluPxaJf5BguGogngG08= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635860655; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/h4wAQ4D6fSVZ1JTKnWt4aHzK/yFuFidxCKOCYN9BJo=; b=jLhnmVRMxPJBG+/ejTo/NtuNNepGZKC1LkKUCzgURqVilScBC0+DQZ8OLKYA7QJVGp6T3NzXtvlbcIo25QDG+fqG9nFRyAINU4+f2zPNTmRRxXXQBSEgYncxqaCEEJ90LkaZ5pfxQTjWqbH0nOaiGKS0zkn6ktzLmKz+8WRPZcc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.zohomail.com with SMTPS id 1635860655162663.0433908981029; Tue, 2 Nov 2021 06:44:15 -0700 (PDT) Received: by mail-wm1-f54.google.com with SMTP id y84-20020a1c7d57000000b00330cb84834fso1989881wmc.2 for ; Tue, 02 Nov 2021 06:44:14 -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 z5sm3321784wmp.26.2021.11.02.06.44.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 06:44:13 -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=/h4wAQ4D6fSVZ1JTKnWt4aHzK/yFuFidxCKOCYN9BJo=; b=ET44fzymxp7c6NmOwIxtBaRk7T/HfSQqA9DEqvZeoVTqqx/WhqNs+EVWCKMCVv2GwN NZu4AZ6xMA5rBmNK7lrzYqY186fQqdooQI0/ab8HZC3a7usHW5rwPCx4ypaYGR8KEEls //dju3spp3f/Hla8tZrVg7mBF6S478jX0coiMbORDigiPFMVaQS1PcfOCzG5+KqbhQVX D240gwaGwnZ2CU4MDdcnhZcDeY2ozrc/wVNlScSvHIT9N/iQhzCuBjnVep5sckHCWQtF CEL6+TRQMoKEqu/YO9nbX+J6mlvERW3dkvBy16UcZvottjw5bTWKMtl3dPU89BgffCL3 S/hA== 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=/h4wAQ4D6fSVZ1JTKnWt4aHzK/yFuFidxCKOCYN9BJo=; b=AZbmIDiv6PJvGpHC0pVc3ZVyo/0sRX4CfiHpf62MwIKkLXKLIr/GlpOnlvFvZJA8ci KrKWKBUx005IlpinfH+htVBt+3SY+MbRiWeEerV//rb4EcHs6P0Z5bA5erTC0f1CCT7h dZsHZCU2tPFmiX+jVzix0WCtMSbD6+lcNIjjEiAAi1knQdvRZhhHINi6i4cjl5jyfRPr z1UWLADodndZbsRun3j8cPq4DpM8eKvo6ZQX17Otn3dBlAfk1QJXLxvOlVKtKT07X4EN VuGN06jWmnaqpVTf1iDuN8HyfOiUrWyAwDLtQf5Mp0QKdXWry4frrFeze3aaJ5R7P6V1 jXiQ== X-Gm-Message-State: AOAM5338LScGkpzdHB6v2B14+7b23cI+FCVH2ZbWVcnBK+enKzF2C3Cg VvS0yfzTFsVvemXvUDwsCfYYbdQwLvc= X-Google-Smtp-Source: ABdhPJz4s+H/vs/AwqIEYkvwg2D6C27pzhWRsezz0tnbqWdJCwMSUDEMMaI5mYGNcoL8oDWwrneEvg== X-Received: by 2002:a1c:2047:: with SMTP id g68mr7471210wmg.181.1635860653425; Tue, 02 Nov 2021 06:44:13 -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 19/41] target/mips: Convert MSA 2R instruction format to decodetree Date: Tue, 2 Nov 2021 14:42:18 +0100 Message-Id: <20211102134240.3036524-20-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: 1635860657146100001 Convert 2-register operations to decodetree. Reviewed-by: Jiaxun Yang Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211028210843.2120802-17-f4bug@amsat.org> --- target/mips/tcg/msa.decode | 3 ++ target/mips/tcg/msa_translate.c | 91 ++++++--------------------------- 2 files changed, 19 insertions(+), 75 deletions(-) diff --git a/target/mips/tcg/msa.decode b/target/mips/tcg/msa.decode index bcbc573deec..b6ac80560f6 100644 --- a/target/mips/tcg/msa.decode +++ b/target/mips/tcg/msa.decode @@ -84,6 +84,9 @@ BNZ 010001 111 .. ..... ................ = @bz SRLRI 011110 011 ....... ..... ..... 001010 @bit =20 FILL 011110 11000000 .. ..... ..... 011110 @2r + PCNT 011110 11000001 .. ..... ..... 011110 @2r + NLOC 011110 11000010 .. ..... ..... 011110 @2r + NLZC 011110 11000011 .. ..... ..... 011110 @2r FCLASS 011110 110010000 . ..... ..... 011110 @2rf FTRUNC_S 011110 110010001 . ..... ..... 011110 @2rf FTRUNC_U 011110 110010010 . ..... ..... 011110 @2rf diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index c7509088987..c6e38281a64 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -49,7 +49,7 @@ enum { }; =20 enum { - /* VEC/2R instruction */ + /* VEC instruction */ OPC_AND_V =3D (0x00 << 21) | OPC_MSA_VEC, OPC_OR_V =3D (0x01 << 21) | OPC_MSA_VEC, OPC_NOR_V =3D (0x02 << 21) | OPC_MSA_VEC, @@ -58,13 +58,6 @@ enum { OPC_BMZ_V =3D (0x05 << 21) | OPC_MSA_VEC, OPC_BSEL_V =3D (0x06 << 21) | OPC_MSA_VEC, =20 - OPC_MSA_2R =3D (0x18 << 21) | OPC_MSA_VEC, - - /* 2R instruction df(bits 17..16) =3D _b, _h, _w, _d */ - OPC_PCNT_df =3D (0x01 << 18) | OPC_MSA_2R, - OPC_NLOC_df =3D (0x02 << 18) | OPC_MSA_2R, - OPC_NLZC_df =3D (0x03 << 18) | OPC_MSA_2R, - /* 3R instruction df(bits 22..21) =3D _b, _h, _w, d */ OPC_SLL_df =3D (0x0 << 23) | OPC_MSA_3R_0D, OPC_ADDV_df =3D (0x0 << 23) | OPC_MSA_3R_0E, @@ -300,6 +293,7 @@ static inline bool check_msa_enabled(DisasContext *ctx) } =20 typedef void gen_helper_piv(TCGv_ptr, TCGv_i32, TCGv); +typedef void gen_helper_pii(TCGv_ptr, TCGv_i32, TCGv_i32); 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 @@ -312,6 +306,9 @@ typedef void gen_helper_piiii(TCGv_ptr, TCGv_i32, TCGv_= i32, TCGv_i32, TCGv_i32); #define TRANS_DF_iv(NAME, trans_func, gen_func) \ TRANS_DF_x(iv, NAME, trans_func, gen_func) =20 +#define TRANS_DF_ii(NAME, trans_func, gen_func) \ + TRANS_DF_x(ii, NAME, trans_func, gen_func) + static void gen_check_zero_element(TCGv tresult, uint8_t df, uint8_t wt, TCGCond cond) { @@ -1835,75 +1832,22 @@ static void gen_msa_3rf(DisasContext *ctx) tcg_temp_free_i32(twt); } =20 -static void gen_msa_2r(DisasContext *ctx) +static bool trans_msa_2r(DisasContext *ctx, arg_msa_r *a, + gen_helper_pii *gen_msa_2r) { -#define MASK_MSA_2R(op) (MASK_MSA_MINOR(op) | (op & (0x1f << 21)) | \ - (op & (0x7 << 18))) - uint8_t ws =3D (ctx->opcode >> 11) & 0x1f; - uint8_t wd =3D (ctx->opcode >> 6) & 0x1f; - uint8_t df =3D (ctx->opcode >> 16) & 0x3; - TCGv_i32 twd =3D tcg_const_i32(wd); - TCGv_i32 tws =3D tcg_const_i32(ws); - - switch (MASK_MSA_2R(ctx->opcode)) { - case OPC_NLOC_df: - switch (df) { - case DF_BYTE: - gen_helper_msa_nloc_b(cpu_env, twd, tws); - break; - case DF_HALF: - gen_helper_msa_nloc_h(cpu_env, twd, tws); - break; - case DF_WORD: - gen_helper_msa_nloc_w(cpu_env, twd, tws); - break; - case DF_DOUBLE: - gen_helper_msa_nloc_d(cpu_env, twd, tws); - break; - } - break; - case OPC_NLZC_df: - switch (df) { - case DF_BYTE: - gen_helper_msa_nlzc_b(cpu_env, twd, tws); - break; - case DF_HALF: - gen_helper_msa_nlzc_h(cpu_env, twd, tws); - break; - case DF_WORD: - gen_helper_msa_nlzc_w(cpu_env, twd, tws); - break; - case DF_DOUBLE: - gen_helper_msa_nlzc_d(cpu_env, twd, tws); - break; - } - break; - case OPC_PCNT_df: - switch (df) { - case DF_BYTE: - gen_helper_msa_pcnt_b(cpu_env, twd, tws); - break; - case DF_HALF: - gen_helper_msa_pcnt_h(cpu_env, twd, tws); - break; - case DF_WORD: - gen_helper_msa_pcnt_w(cpu_env, twd, tws); - break; - case DF_DOUBLE: - gen_helper_msa_pcnt_d(cpu_env, twd, tws); - break; - } - 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); + gen_msa_2r(cpu_env, tcg_constant_i32(a->wd), tcg_constant_i32(a->ws)); + + return true; } =20 +TRANS_DF_ii(PCNT, trans_msa_2r, gen_helper_msa_pcnt); +TRANS_DF_ii(NLOC, trans_msa_2r, gen_helper_msa_nloc); +TRANS_DF_ii(NLZC, trans_msa_2r, gen_helper_msa_nlzc); + static bool trans_FILL(DisasContext *ctx, arg_msa_r *a) { if (TARGET_LONG_BITS !=3D 64 && a->df =3D=3D DF_DOUBLE) { @@ -2010,9 +1954,6 @@ static void gen_msa_vec(DisasContext *ctx) case OPC_BSEL_V: gen_msa_vec_v(ctx); break; - case OPC_MSA_2R: - gen_msa_2r(ctx); - break; default: MIPS_INVAL("MSA instruction"); gen_reserved_instruction(ctx); --=20 2.31.1