From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-sender-0.a4lg.com (mail-sender.a4lg.com [153.120.152.154]) by sourceware.org (Postfix) with ESMTPS id 2D584383EC6C for ; Sun, 5 Jun 2022 04:43:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2D584383EC6C Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail-sender-0.a4lg.com (Postfix) with ESMTPSA id 991AB300089; Sun, 5 Jun 2022 04:43:21 +0000 (UTC) From: Tsukasa OI To: Tsukasa OI , Palmer Dabbelt , Kito Cheng , Nelson Chu , Weiwei Li Cc: binutils@sourceware.org Subject: [PATCH 2/2] RISC-V: Fix requirement handling on Zhinx+{D,Q} Date: Sun, 5 Jun 2022 13:43:08 +0900 Message-Id: <566a9169a82a45e2c53fd9bf65ce946a54414637.1654404125.git.research_trasio@irq.a4lg.com> In-Reply-To: References: Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Jun 2022 04:43:25 -0000 This commit fixes how instructions are masked on Zhinx+Z{d,q}inx. fcvt.h.d and fcvt.d.h require ((D&&Zfh)||(Zdinx&&Zhinx)) and fcvt.h.q and fcvt.q.h require ((Q&&Zfh)||(Zqinx&&Zhinx)). bfd/ChangeLog: * elfxx-riscv.c (riscv_multi_subset_supports): Fix feature gate on INSN_CLASS_{D,Q}_AND_ZFH_INX. (riscv_multi_subset_supports_ext): Fix feature gate diagnostics on INSN_CLASS_{D,Q}_AND_ZFH_INX. gas/ChangeLog: * testsuite/gas/riscv/fp-zhinx-insns.d: Add Zqinx to -march for proper testing. --- bfd/elfxx-riscv.c | 30 ++++++++++++++++++++---- gas/testsuite/gas/riscv/fp-zhinx-insns.d | 2 +- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index 5c2c616a760..39b68c92317 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -2370,15 +2370,17 @@ riscv_multi_subset_supports (riscv_parse_subset_t *rps, return riscv_subset_supports (rps, "zfh"); case INSN_CLASS_ZFH_OR_ZHINX: return riscv_subset_supports (rps, "zfh") - || riscv_subset_supports (rps, "zhinx"); + || riscv_subset_supports (rps, "zhinx"); case INSN_CLASS_D_AND_ZFH_INX: return (riscv_subset_supports (rps, "d") && riscv_subset_supports (rps, "zfh")) - || riscv_subset_supports (rps, "zhinx"); + || (riscv_subset_supports (rps, "zdinx") + && riscv_subset_supports (rps, "zhinx")); case INSN_CLASS_Q_AND_ZFH_INX: return (riscv_subset_supports (rps, "q") && riscv_subset_supports (rps, "zfh")) - || riscv_subset_supports (rps, "zhinx"); + || (riscv_subset_supports (rps, "zqinx") + && riscv_subset_supports (rps, "zhinx")); case INSN_CLASS_ZBA: return riscv_subset_supports (rps, "zba"); case INSN_CLASS_ZBB: @@ -2522,9 +2524,27 @@ riscv_multi_subset_supports_ext (riscv_parse_subset_t *rps, case INSN_CLASS_ZFH_OR_ZHINX: return "zfh' or 'zhinx"; case INSN_CLASS_D_AND_ZFH_INX: - return "('d' and 'zfh') or 'zhinx"; + if (riscv_subset_supports (rps, "zfh")) + return "d"; + else if (riscv_subset_supports (rps, "d")) + return "zfh"; + else if (riscv_subset_supports (rps, "zhinx")) + return "zdinx"; + else if (riscv_subset_supports (rps, "zdinx")) + return "zhinx"; + else + return "zfh' and `d', or `zhinx' and `zdinx"; case INSN_CLASS_Q_AND_ZFH_INX: - return "('q' and 'zfh') or 'zhinx"; + if (riscv_subset_supports (rps, "zfh")) + return "q"; + else if (riscv_subset_supports (rps, "q")) + return "zfh"; + else if (riscv_subset_supports (rps, "zhinx")) + return "zqinx"; + else if (riscv_subset_supports (rps, "zqinx")) + return "zhinx"; + else + return "zfh' and `q', or `zhinx' and `zqinx"; default: rps->error_handler (_("internal: unreachable INSN_CLASS_*")); diff --git a/gas/testsuite/gas/riscv/fp-zhinx-insns.d b/gas/testsuite/gas/riscv/fp-zhinx-insns.d index 6e1c40e65f5..2592d8c74e2 100644 --- a/gas/testsuite/gas/riscv/fp-zhinx-insns.d +++ b/gas/testsuite/gas/riscv/fp-zhinx-insns.d @@ -1,4 +1,4 @@ -#as: -march=rv64ima_zhinx +#as: -march=rv64ima_zqinx_zhinx #source: fp-zhinx-insns.s #objdump: -dr -- 2.34.1