From nobody Mon Feb 9 19:54:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635358129; cv=none; d=zohomail.com; s=zohoarc; b=Pn1Rg9JywOH2VsOdQNn8ZWupOuhrFfOGpOdo+FO6Thl1G/yqxR8umg/OCTaBm8IV/obNfn0yTatKi8+P/OFtEOROWkSJwk3bH5yE8R0HVpWwdl1jX/CK3wB2g4Q8kNN2PkQrnsGF+kQC78nEJILlKDGQ3+fsMug30wyU7KVWNDk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635358129; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JTgI+iPpQNdvgufBDB2uqJD9mB6gcImXLdg0icSgpzM=; b=CPXx6lOQV02qpzmcOFB6qfSn07akQKGMD98tEK7LpVItC4JLBnbnevV1JpsycwJBUFGM5JlN5mOstMO4Bju/A1o1Alj8TLpU4IRI4b9rcCLu9mAhyOmxieqGuGn1UcDFQAwKv8yG02auwLiM8LI8uyRiBawu1xaiLlb0yKTLLSY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1635358129535928.6197362632157; Wed, 27 Oct 2021 11:08:49 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id d13so5571730wrf.11 for ; Wed, 27 Oct 2021 11:08:48 -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 g2sm567898wrb.20.2021.10.27.11.08.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Oct 2021 11:08:47 -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=JTgI+iPpQNdvgufBDB2uqJD9mB6gcImXLdg0icSgpzM=; b=O8LbkqnJYYOwqsRKnr/Yk093RXQpNG30b10y83pNcInzOngJyuPqs1P1SZ+5ZYU+e9 uGPH6gUvgXMqcGcHy3Qoz9yLUriDwzaaLN2zTr7eKTaKaNuHKrAeEfKgFMF598iX0NrU 2HpDkRBQFW6AzeJCP1gYG1MmmRLUDBPFruOpUckKhY5h4dGC8Vt87Tz5sUCMZJ4MtxJs 4kKxbAABB0MNcu5vWcY3SjDwnE7E77JAurugpsDDAegn1mS/tgCzvtFVVTNX8X8PAaS/ x1sm6mXve18+pgzfUnqIwtSkKUixKBI9Shgjb++CLmVGRU1ITfhgc8AtM2zgpmAhuWlb 4pHA== 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=JTgI+iPpQNdvgufBDB2uqJD9mB6gcImXLdg0icSgpzM=; b=vD3vc5uARCUBlg6kVGy1PEPtBgKXoCkZUNmne4RDpYXjKLOUNvrrXMSvzmTyXhc6JB p3FzosuMASG6ec6X1rA5vIPUQBT8XYP6HoBLfnbUcz+DaAImxpvsQHLoJ2AD0jkDesGi UR0q0dfZW+qhBH9cnxXF3SqcTreIRGpVh/CsjF5zAxCOLgUD0FGJmGzzExxwbaDuNwVT YkjN/gEgsvzDMnrQJVa2Dx0j018FbiJmSolljdqEL269xciaJ5P98baguakms7N5Uaem yMimZmc0IlpqD9ubi9HG9eB/TkfAK3XqVJDiZ1gwueKFcLd9o0BpQFpN2YM2aNMYIJ45 D/9w== X-Gm-Message-State: AOAM532ugV0v6UkqPHMZvshUd3HOMMeDmURSsrRCA6ScvcL1v+GCADEi FFQiIhnPjBd4eYqjyPRlHO16Ogajxis= X-Google-Smtp-Source: ABdhPJy+IB4F++MklxQJGdAAmPMRUEvwv9+zKpeC7RrR/rb2nIW+8UZzwe9x8GxSuU3xuwZoU6UWDQ== X-Received: by 2002:adf:c183:: with SMTP id x3mr40380561wre.90.1635358127639; Wed, 27 Oct 2021 11:08:47 -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 16/32] target/mips: Convert MSA 2R instruction format to decodetree Date: Wed, 27 Oct 2021 20:07:14 +0200 Message-Id: <20211027180730.1551932-17-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: 1635358131621100001 Convert 2-register operations to decodetree. Reviewed-by: Jiaxun Yang Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- v2: - TRANS_DF_ii() uses array[4] --- target/mips/tcg/msa.decode | 3 ++ target/mips/tcg/msa_translate.c | 87 +++++---------------------------- 2 files changed, 15 insertions(+), 75 deletions(-) diff --git a/target/mips/tcg/msa.decode b/target/mips/tcg/msa.decode index 030ffa9321b..a92763af451 100644 --- a/target/mips/tcg/msa.decode +++ b/target/mips/tcg/msa.decode @@ -85,6 +85,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 004eb0b7700..bff998356ac 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -53,13 +53,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, @@ -293,6 +286,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 @@ -319,6 +313,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) { @@ -1831,75 +1828,18 @@ 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); + gen_msa_2r(cpu_env, tcg_constant_i32(a->wd), tcg_constant_i32(a->ws)); =20 - 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; - } - - tcg_temp_free_i32(twd); - tcg_temp_free_i32(tws); + 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) { @@ -2003,9 +1943,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