From nobody Wed May 1 23:48:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623952003; cv=none; d=zohomail.com; s=zohoarc; b=ef/OJ3xzXqRukVYbpi3v1zypzgGn9aJlGIEkvoh+W9iPSpqV1n+SkqDVN49aRW6lWbxlCQbTwJm4KE9XT+iZ24j8iH2La3kMQzionoF1rIHAOe6H7hKRLUO4OiZMIgMcFL08zuQlhhTF9COFaxfJj+XN6MRatM62AD7QWzt6fBw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623952003; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3smcwuzSyCbPmC7mfgonm6k+LUdP18Ge4mtsj1HUfy0=; b=H/tRvFpEFMoEAUNIY94CQv4R+OpI/Jqy5cW+WJaTocUjsqeO6dmd2E5WfaVTsnDLvRqJGL+i8sq0XwIDtKnZeKZtRTOPD0UhRlL96Ucb/46hzu8i+gm6lCQzLxtbK3pxBG5Fn1CiFqm1ig86zZP5ec7l3la1L9GmeurGXe4wI5Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1623952003867823.9767937944792; Thu, 17 Jun 2021 10:46:43 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id l7-20020a05600c1d07b02901b0e2ebd6deso4175684wms.1 for ; Thu, 17 Jun 2021 10:46:43 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id q11sm6075010wrx.80.2021.06.17.10.46.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 10:46:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3smcwuzSyCbPmC7mfgonm6k+LUdP18Ge4mtsj1HUfy0=; b=aZcRijtOmmYE0momLXTCFNdyKcACtyoPgRA17PwEwfhaUcuuNMlSbgj1ausVzW2SX0 s8l3ppMZiSPfuihijITq6EvOKVYHE6CDDOPlPg5H9ewuv6gXIxzkyhRr441xsemRlbhA q91IaW231eneXuwEDjx5hP6703h5CTSy01ZEbuLJEb50hpEeygd5M00w6t0/xMapNwV2 GkdvCMssW+PB+m3kRonMUJjTcVdNygOl+e6Nsy463UX45u1beUQE7MdSPsO6dlgsRiWC YvjuBdszqJareyqP/MNB0NY7OBRwIoHvH5e998VoCmeneDO2gCxGCcTZ8d2pnn3e/nAO ivtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=3smcwuzSyCbPmC7mfgonm6k+LUdP18Ge4mtsj1HUfy0=; b=cGI1cpFBNlZ1SMQt9gAu9ANKnYIL9BjbKFPwua4TOlgeArtXUAIwSX1I495QhpBcpK i9MnK+RZqg5/GbKGOVWvfwnBXaJVNRBuCo7RpkFZBGLlVSzt1s9zGDX+0s2O4Vp++ILF 2ynvCHNiuM4HM8Qa+qvEH6RkNVkXvAWNH3X0gr2VbLigse89YcSG/TjhlnasKAqTHni6 L3IoOxcP+xN2Uz6n9+tgF5ZjjTQqkZ3CVo2Bo5m28DadPA4T6f8n//54DtjCZfo1vrb8 mYLmKsLjFWemnH4Btx7FLlEjPWk9u8Rt73mF+dnXI2vu8d7HnrTnMG1ErGDJFOVaobvb IGTw== X-Gm-Message-State: AOAM533leReG98ys+B5rwvNvbJmz97VlGUDhgutfgVQ160YCWe2wD0bi NeMCnDmENxZtGF2pxcxARlw= X-Google-Smtp-Source: ABdhPJx2FXRv107QiANW8FXTsmfBjwH7hRK/wOdsKSkXC3yAmq1GF0rrGsDGgA+UDTNNtrExu6XPLA== X-Received: by 2002:a05:600c:1d0a:: with SMTP id l10mr6543305wms.124.1623952002217; Thu, 17 Jun 2021 10:46:42 -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 , Richard Henderson , Aurelien Jarno , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] target/mips: Remove pointless gen_msa() Date: Thu, 17 Jun 2021 19:46:35 +0200 Message-Id: <20210617174636.2902654-2-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617174636.2902654-1-f4bug@amsat.org> References: <20210617174636.2902654-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) Only trans_MSA() calls gen_msa(), inline it to simplify. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/tcg/msa_translate.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index a2f7d6a1e08..429039cc7c9 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -2162,7 +2162,7 @@ static void gen_msa_vec(DisasContext *ctx) } } =20 -static void gen_msa(DisasContext *ctx) +static bool trans_MSA(DisasContext *ctx, arg_MSA *a) { uint32_t opcode =3D ctx->opcode; =20 @@ -2258,11 +2258,6 @@ static void gen_msa(DisasContext *ctx) gen_reserved_instruction(ctx); break; } -} - -static bool trans_MSA(DisasContext *ctx, arg_MSA *a) -{ - gen_msa(ctx); =20 return true; } --=20 2.31.1 From nobody Wed May 1 23:48:17 2024 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=1623952008; cv=none; d=zohomail.com; s=zohoarc; b=nyFIg/YuUGvpC9hLw+cjJ0NRatSjYIxRIKN/+KAZDnsn/9HqnAplkucCbD0KmwfkHCsiLiqIzOO7b+ycciktuGnJ7myoVEIe533yqSZp1pLEfzaJhAfxLiADx2fBCKoCsW51IJi88lFCz7l5gwlqtQX5s6PkjBpkrwrWTLIxJw4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623952008; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HDQm9DpsNmYxvtGWJs0R9tBWsFhduwTnC55OIbQEXSs=; b=bmNl6IIObMoUkSBuqXiD1WbIKnP0tKdl1AqaHxqMi07COf6CK3C9z5d5ILeg8bzjHud29YnJONjzpSfPgUIJCT31aEGKV3I/1L+Z+dcoIo+Zqib3vRI1qSPAawI+NPEoS5+ByEGlbnUEOW/n8yD1H0sQPftXK2Q53BiBb+HZrT8= 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 1623952008692629.9572483910854; Thu, 17 Jun 2021 10:46:48 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id c5so7701736wrq.9 for ; Thu, 17 Jun 2021 10:46:48 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id j11sm5255178wmq.4.2021.06.17.10.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 10:46:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HDQm9DpsNmYxvtGWJs0R9tBWsFhduwTnC55OIbQEXSs=; b=LnRKeQu3AParML8aJlK7eJ4g1XjHLAA/x2Xc/T4d2/dO9lm3ozdRUy8dqU8gyzPaCn 7U00YYCuDNARXX/ys7PGnQsXR8+mcURuJsK4x5gmo8pISq9ov08PdLP/hoURGWveWjDf 2gc6qlZPXTXA+FvP+nWXhv6lGYCLFF9LWOwRo97Y9c56rpFLfA8R2dwtzd1Zc5H5Kpne itoC6KfK9vmWVQF1citBh0YY5hoEKT/xlhKaNkp+74luTVpzAAnOGpLWlVH+qzhcKmoB ZToHKwuOi41ixmm3Gr1jQVRTaGYZnbNoR0jaHuavwUrXYFnX0c8+15SZGe62HmJW6lFx 4a9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=HDQm9DpsNmYxvtGWJs0R9tBWsFhduwTnC55OIbQEXSs=; b=AfExokMTklJrQiehE5elT+fOUkPE2eEpXiwrK1B41Imvevb4AeDKKyye4717p3fz4n Md/xy0NRU5DI4MGX3TA/ZFwI9ez0NhEkVvqWfuWvcjUNII2YbtfAG4ZfDoViPF/szBWC A9Y5QsbvZ17tdwN9iYCTyN7UFpYQaAQBp/tsm+Owl1BAX2Hod76loQ2ZBtjoKKvo5+zH 4KoVY/R97qzF+0X9CK9PS3B36EHn4BYkMi8DdEkO531SPdJt2Qvw4BrAdD3JcLI+Yt5p CVpfxAxji01CINsvwjzPQ2GxB4/EyQLINc1/IxPUmWyoQoP/kgL0E6ekkz/OztCWpdXE B8QA== X-Gm-Message-State: AOAM530UrVVaOuoNpGzSU2u7cYbBw30VKKKlOsw+6j6EHaVhThfaDOw8 gdBBpqrNMBC9RqbFsbW+wzw= X-Google-Smtp-Source: ABdhPJzf2HTrlzVtXtSdHRVd2uIVR2DhUFihhd6bJ+wMlORTZ2DlLguFEwTiBAcTW/C9ZxE9C5SVQQ== X-Received: by 2002:adf:ea8b:: with SMTP id s11mr7076715wrm.178.1623952006996; Thu, 17 Jun 2021 10:46:46 -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 , Richard Henderson , Aurelien Jarno , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] target/mips: Merge msa32/msa64 decodetree definitions Date: Thu, 17 Jun 2021 19:46:36 +0200 Message-Id: <20210617174636.2902654-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617174636.2902654-1-f4bug@amsat.org> References: <20210617174636.2902654-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) We don't need to maintain 2 sets of decodetree definitions. Merge them into a single file. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- target/mips/tcg/{msa32.decode =3D> msa.decode} | 8 +++++--- target/mips/tcg/msa64.decode | 17 ----------------- target/mips/tcg/msa_translate.c | 14 ++++---------- target/mips/tcg/meson.build | 3 +-- 4 files changed, 10 insertions(+), 32 deletions(-) rename target/mips/tcg/{msa32.decode =3D> msa.decode} (74%) delete mode 100644 target/mips/tcg/msa64.decode diff --git a/target/mips/tcg/msa32.decode b/target/mips/tcg/msa.decode similarity index 74% rename from target/mips/tcg/msa32.decode rename to target/mips/tcg/msa.decode index ca200e373b1..bf132e36b9b 100644 --- a/target/mips/tcg/msa32.decode +++ b/target/mips/tcg/msa.decode @@ -6,9 +6,10 @@ # # Reference: # MIPS Architecture for Programmers Volume IV-j -# The MIPS32 SIMD Architecture Module, Revision 1.12 -# (Document Number: MD00866-2B-MSA32-AFP-01.12) -# +# - The MIPS32 SIMD Architecture Module, Revision 1.12 +# (Document Number: MD00866-2B-MSA32-AFP-01.12) +# - The MIPS64 SIMD Architecture Module, Revision 1.12 +# (Document Number: MD00868-1D-MSA64-AFP-01.12) =20 &rtype rs rt rd sa =20 @@ -19,6 +20,7 @@ @bz_df ...... ... df:2 wt:5 s16:16 &msa_bz =20 LSA 000000 ..... ..... ..... 000 .. 000101 @lsa +DLSA 000000 ..... ..... ..... 000 .. 010101 @lsa =20 BZ_V 010001 01011 ..... ................ @bz BNZ_V 010001 01111 ..... ................ @bz diff --git a/target/mips/tcg/msa64.decode b/target/mips/tcg/msa64.decode deleted file mode 100644 index d2442474d0b..00000000000 --- a/target/mips/tcg/msa64.decode +++ /dev/null @@ -1,17 +0,0 @@ -# MIPS SIMD Architecture Module instruction set -# -# Copyright (C) 2020 Philippe Mathieu-Daud=C3=A9 -# -# SPDX-License-Identifier: LGPL-2.1-or-later -# -# Reference: -# MIPS Architecture for Programmers Volume IV-j -# The MIPS64 SIMD Architecture Module, Revision 1.12 -# (Document Number: MD00868-1D-MSA64-AFP-01.12) -# - -&rtype rs rt rd sa !extern - -@lsa ...... rs:5 rt:5 rd:5 ... sa:2 ...... &rtype - -DLSA 000000 ..... ..... ..... 000 .. 010101 @lsa diff --git a/target/mips/tcg/msa_translate.c b/target/mips/tcg/msa_translat= e.c index 429039cc7c9..1ce0d87168c 100644 --- a/target/mips/tcg/msa_translate.c +++ b/target/mips/tcg/msa_translate.c @@ -18,8 +18,7 @@ #include "internal.h" =20 /* Include the auto-generated decoder. */ -#include "decode-msa32.c.inc" -#include "decode-msa64.c.inc" +#include "decode-msa.c.inc" =20 #define OPC_MSA (0x1E << 26) =20 @@ -2269,13 +2268,8 @@ static bool trans_LSA(DisasContext *ctx, arg_rtype *= a) =20 static bool trans_DLSA(DisasContext *ctx, arg_rtype *a) { + if (TARGET_LONG_BITS !=3D 64) { + return false; + } return gen_dlsa(ctx, a->rd, a->rt, a->rs, a->sa); } - -bool decode_ase_msa(DisasContext *ctx, uint32_t insn) -{ - if (TARGET_LONG_BITS =3D=3D 64 && decode_msa64(ctx, insn)) { - return true; - } - return decode_msa32(ctx, insn); -} diff --git a/target/mips/tcg/meson.build b/target/mips/tcg/meson.build index 5d8acbaf0d3..bf4001e5741 100644 --- a/target/mips/tcg/meson.build +++ b/target/mips/tcg/meson.build @@ -1,8 +1,7 @@ gen =3D [ decodetree.process('mips32r6.decode', extra_args: '--static-decode=3Ddec= ode_mips32r6'), decodetree.process('mips64r6.decode', extra_args: '--static-decode=3Ddec= ode_mips64r6'), - decodetree.process('msa32.decode', extra_args: '--static-decode=3Ddecode= _msa32'), - decodetree.process('msa64.decode', extra_args: '--static-decode=3Ddecode= _msa64'), + decodetree.process('msa.decode', extra_args: '--decode=3Ddecode_ase_msa'= ), decodetree.process('tx79.decode', extra_args: '--static-decode=3Ddecode_= tx79'), ] =20 --=20 2.31.1