From patchwork Fri Nov 10 07:34:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jin Ma X-Patchwork-Id: 163786 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp947216vqs; Thu, 9 Nov 2023 23:35:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IHJeGMdi2uj2I1AjkwNv7CqbX/rBkrl3LDIhNqaVLp/m6jV9WNVDBaht8GWA0NjLKAQ2SFL X-Received: by 2002:a05:620a:13c1:b0:775:9766:cb69 with SMTP id g1-20020a05620a13c100b007759766cb69mr6539328qkl.75.1699601701283; Thu, 09 Nov 2023 23:35:01 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1699601701; cv=pass; d=google.com; s=arc-20160816; b=A6IeZw3r5pC+60wTBYj2La/g7vwXF70qOGuv7nVrZXRi4myiAJMG1C0eLkTxMdwS/0 UcLfqqdJS0J32Ae38sqe3Vkp+OhMf7rcVA6O8Cto4ZKuGVytW95PgCOTpG7M4MCWnigX 1ZV5pAwzOc3aolUC5uNAR8WTXflqdA5+rG9Oja5BdV658oapLdXHWw1CdYprcQDM11JH tlYiS8Urji3IUrxsCTMNDBZlpmN1WPkTXYLG6IP2bD2DEe8uWK6j7qekiOFxj3CKejFG Zko0ZfLYSRFwNWqGv5oIM9MZqG8XQmVupJGFlyN3dsr2zBxtoPLtHlctINM1qnHsdp3h TpRA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to; bh=B0Iuz+jT5m9yxDwDpCi8zldQG8v/th9fbtnU4LWEwdk=; fh=zn+5wiT9OU3FDcK89PQRhJye+jap/WeWco5fxQ3I7vE=; b=XxInhHK5ZxXV0aSjSD90egHQLg7hFH4jyR8T2WoGusKlBML0SvyF7DX3PShteD1bJJ 7yO7jEshOxfvKL8EQClhtcmnU5yp4GuzrzkE9YoGGnS2VkHSTnXiyZ4rzmvgYu+e4dPG G11Ibuk4Bl+C0wn9BWULpcmtZ8NnlPd58qPG4Ma6zMcO5q6OHBc0mZONmXL1qJYv8jS3 Fk6Tm+MJjOMJo7GppGWsPFSGABlfb3lzIGKol8WCfHNS7c0UlAspS72i31RyUeVn/3hP YxpRa015CqtQgd7rWH00yLEPTQwHem2skCb9biBBhU0Vl0QNyGuirQBg5LyxzeNIjQ5o EfYA== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id ou32-20020a05620a622000b0076d9876dff0si4031452qkn.140.2023.11.09.23.35.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 23:35:01 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0EBBA3858C2B for ; Fri, 10 Nov 2023 07:35:01 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from out30-124.freemail.mail.aliyun.com (out30-124.freemail.mail.aliyun.com [115.124.30.124]) by sourceware.org (Postfix) with ESMTPS id 3C9C03858D38 for ; Fri, 10 Nov 2023 07:34:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3C9C03858D38 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.alibaba.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3C9C03858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=115.124.30.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699601696; cv=none; b=OS1NNlfsEISCwV7ML6FHe1/g38SNwZhNag5XrzvpomuTo7QBi/l9cXel8g7VQYCvnNhFdsgaKIC0e+IR00pNzwXmEobcowv/cwyLBEoJnU/ZA75iqFWnK5VugBlyh73NNEB2bPCRe+E5OBH4DkRV7xgEI2yjEynXy2bTOpadC8o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699601696; c=relaxed/simple; bh=7Fb0ztI8SfbreKwnQObCFO7iauGhj8D1SL2syJOdNGg=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=e8s3VvvhD00GLu8mkPLOTOOhEUu1ulA/sseks1P3sZ6wti4H0HxmcWYE7Efm85d2gd0CkbYIMhE53LgHFKefiuq8/3BjdaREjR/PZsf3RzpE9Z0qPXKenpiN/OQwfv0m9rjY1BvZrVnmDFcGIHMw4xg2x8eoyMGaWo9Og3VO7Bk= ARC-Authentication-Results: i=1; server2.sourceware.org X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R151e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=ay29a033018045176; MF=jinma@linux.alibaba.com; NM=1; PH=DS; RN=6; SR=0; TI=SMTPD_---0Vw3nIWt_1699601682; Received: from localhost.localdomain(mailfrom:jinma@linux.alibaba.com fp:SMTPD_---0Vw3nIWt_1699601682) by smtp.aliyun-inc.com; Fri, 10 Nov 2023 15:34:44 +0800 From: Jin Ma To: binutils@sourceware.org, nelson@rivosinc.com Cc: christoph.muellner@vrull.eu, lifang_xia@linux.alibaba.com, jinma.contrib@gmail.com, Jin Ma Subject: [PATCH 11/12] RISC-V: Add vector mask instructions for T-Head VECTOR vendor extension Date: Fri, 10 Nov 2023 15:34:35 +0800 Message-Id: <20231110073435.2098-1-jinma@linux.alibaba.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20231110071759.1640-1-jinma@linux.alibaba.com> References: <20231110071759.1640-1-jinma@linux.alibaba.com> MIME-Version: 1.0 X-Spam-Status: No, score=-20.4 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY, USER_IN_DEF_SPF_WL 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.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782161553132843160 X-GMAIL-MSGID: 1782161553132843160 T-Head has a range of vendor-specific instructions. Therefore it makes sense to group them into smaller chunks in form of vendor extensions. This patch adds mask instructions for the "XTheadVector" extension. The 'th' prefix and the "XTheadVector" extension are documented in a PR for the RISC-V toolchain conventions ([1]). [1] https://github.com/riscv-non-isa/riscv-toolchain-conventions/pull/19 Co-developed-by: Lifang Xia Co-developed-by: Christoph Müllner gas/ChangeLog: * testsuite/gas/riscv/x-thead-vector.d: Add tests for mask instructions. * testsuite/gas/riscv/x-thead-vector.s: Likewise. include/ChangeLog: * opcode/riscv-opc.h (MATCH_TH_VMANDMM): New. opcodes/ChangeLog: * riscv-opc.c: Likewise. --- gas/testsuite/gas/riscv/x-thead-vector.d | 26 ++++++++++++++++++++ gas/testsuite/gas/riscv/x-thead-vector.s | 30 ++++++++++++++++++++++++ include/opcode/riscv-opc.h | 30 ++++++++++++++++++++++++ opcodes/riscv-opc.c | 19 +++++++++++++++ 4 files changed, 105 insertions(+) diff --git a/gas/testsuite/gas/riscv/x-thead-vector.d b/gas/testsuite/gas/riscv/x-thead-vector.d index 50061606298..8a43fe38b8b 100644 --- a/gas/testsuite/gas/riscv/x-thead-vector.d +++ b/gas/testsuite/gas/riscv/x-thead-vector.d @@ -752,3 +752,29 @@ Disassembly of section .text: [ ]+[0-9a-f]+:[ ]+c6861257[ ]+th.vfwredsum.vs[ ]+v4,v8,v12 [ ]+[0-9a-f]+:[ ]+cc861257[ ]+th.vfwredosum.vs[ ]+v4,v8,v12,v0.t [ ]+[0-9a-f]+:[ ]+c4861257[ ]+th.vfwredsum.vs[ ]+v4,v8,v12,v0.t +[ ]+[0-9a-f]+:[ ]+66842257[ ]+th.vmcpy.m[ ]+v4,v8 +[ ]+[0-9a-f]+:[ ]+6e422257[ ]+th.vmclr.m[ ]+v4 +[ ]+[0-9a-f]+:[ ]+7e422257[ ]+th.vmset.m[ ]+v4 +[ ]+[0-9a-f]+:[ ]+76842257[ ]+th.vmnot.m[ ]+v4,v8 +[ ]+[0-9a-f]+:[ ]+66862257[ ]+th.vmand.mm[ ]+v4,v8,v12 +[ ]+[0-9a-f]+:[ ]+76862257[ ]+th.vmnand.mm[ ]+v4,v8,v12 +[ ]+[0-9a-f]+:[ ]+62862257[ ]+th.vmandnot.mm[ ]+v4,v8,v12 +[ ]+[0-9a-f]+:[ ]+6e862257[ ]+th.vmxor.mm[ ]+v4,v8,v12 +[ ]+[0-9a-f]+:[ ]+6a862257[ ]+th.vmor.mm[ ]+v4,v8,v12 +[ ]+[0-9a-f]+:[ ]+7a862257[ ]+th.vmnor.mm[ ]+v4,v8,v12 +[ ]+[0-9a-f]+:[ ]+72862257[ ]+th.vmornot.mm[ ]+v4,v8,v12 +[ ]+[0-9a-f]+:[ ]+7e862257[ ]+th.vmxnor.mm[ ]+v4,v8,v12 +[ ]+[0-9a-f]+:[ ]+52c02557[ ]+th.vmpopc.m[ ]+a0,v12 +[ ]+[0-9a-f]+:[ ]+56c02557[ ]+th.vmfirst.m[ ]+a0,v12 +[ ]+[0-9a-f]+:[ ]+5a80a257[ ]+th.vmsbf.m[ ]+v4,v8 +[ ]+[0-9a-f]+:[ ]+5a81a257[ ]+th.vmsif.m[ ]+v4,v8 +[ ]+[0-9a-f]+:[ ]+5a812257[ ]+th.vmsof.m[ ]+v4,v8 +[ ]+[0-9a-f]+:[ ]+5a882257[ ]+th.viota.m[ ]+v4,v8 +[ ]+[0-9a-f]+:[ ]+5a08a257[ ]+th.vid.v[ ]+v4 +[ ]+[0-9a-f]+:[ ]+50c02557[ ]+th.vmpopc.m[ ]+a0,v12,v0.t +[ ]+[0-9a-f]+:[ ]+54c02557[ ]+th.vmfirst.m[ ]+a0,v12,v0.t +[ ]+[0-9a-f]+:[ ]+5880a257[ ]+th.vmsbf.m[ ]+v4,v8,v0.t +[ ]+[0-9a-f]+:[ ]+5881a257[ ]+th.vmsif.m[ ]+v4,v8,v0.t +[ ]+[0-9a-f]+:[ ]+58812257[ ]+th.vmsof.m[ ]+v4,v8,v0.t +[ ]+[0-9a-f]+:[ ]+58882257[ ]+th.viota.m[ ]+v4,v8,v0.t +[ ]+[0-9a-f]+:[ ]+5808a257[ ]+th.vid.v[ ]+v4,v0.t diff --git a/gas/testsuite/gas/riscv/x-thead-vector.s b/gas/testsuite/gas/riscv/x-thead-vector.s index eb1eccc5abc..f23de9f7154 100644 --- a/gas/testsuite/gas/riscv/x-thead-vector.s +++ b/gas/testsuite/gas/riscv/x-thead-vector.s @@ -788,3 +788,33 @@ th.vfwredsum.vs v4, v8, v12 th.vfwredosum.vs v4, v8, v12, v0.t th.vfwredsum.vs v4, v8, v12, v0.t + + # Aliases + th.vmcpy.m v4, v8 + th.vmclr.m v4 + th.vmset.m v4 + th.vmnot.m v4, v8 + + th.vmand.mm v4, v8, v12 + th.vmnand.mm v4, v8, v12 + th.vmandnot.mm v4, v8, v12 + th.vmxor.mm v4, v8, v12 + th.vmor.mm v4, v8, v12 + th.vmnor.mm v4, v8, v12 + th.vmornot.mm v4, v8, v12 + th.vmxnor.mm v4, v8, v12 + + th.vmpopc.m a0, v12 + th.vmfirst.m a0, v12 + th.vmsbf.m v4, v8 + th.vmsif.m v4, v8 + th.vmsof.m v4, v8 + th.viota.m v4, v8 + th.vid.v v4 + th.vmpopc.m a0, v12, v0.t + th.vmfirst.m a0, v12, v0.t + th.vmsbf.m v4, v8, v0.t + th.vmsif.m v4, v8, v0.t + th.vmsof.m v4, v8, v0.t + th.viota.m v4, v8, v0.t + th.vid.v v4, v0.t diff --git a/include/opcode/riscv-opc.h b/include/opcode/riscv-opc.h index 233172d7c5f..9da64bf1a74 100644 --- a/include/opcode/riscv-opc.h +++ b/include/opcode/riscv-opc.h @@ -3871,6 +3871,36 @@ #define MASK_TH_VFWREDOSUMV 0xfc00707f #define MATCH_TH_VFWREDSUMV 0xc4001057 #define MASK_TH_VFWREDSUMV 0xfc00707f +#define MATCH_TH_VMANDMM 0x66002057 +#define MASK_TH_VMANDMM 0xfe00707f +#define MATCH_TH_VMNANDMM 0x76002057 +#define MASK_TH_VMNANDMM 0xfe00707f +#define MATCH_TH_VMANDNOTMM 0x62002057 +#define MASK_TH_VMANDNOTMM 0xfe00707f +#define MATCH_TH_VMXORMM 0x6e002057 +#define MASK_TH_VMXORMM 0xfe00707f +#define MATCH_TH_VMORMM 0x6a002057 +#define MASK_TH_VMORMM 0xfe00707f +#define MATCH_TH_VMNORMM 0x7a002057 +#define MASK_TH_VMNORMM 0xfe00707f +#define MATCH_TH_VMORNOTMM 0x72002057 +#define MASK_TH_VMORNOTMM 0xfe00707f +#define MATCH_TH_VMXNORMM 0x7e002057 +#define MASK_TH_VMXNORMM 0xfe00707f +#define MATCH_TH_VMPOPCM 0x50002057 +#define MASK_TH_VMPOPCM 0xfc0ff07f +#define MATCH_TH_VMFIRSTM 0x54002057 +#define MASK_TH_VMFIRSTM 0xfc0ff07f +#define MATCH_TH_VMSBFM 0x5800a057 +#define MASK_TH_VMSBFM 0xfc0ff07f +#define MATCH_TH_VMSIFM 0x5801a057 +#define MASK_TH_VMSIFM 0xfc0ff07f +#define MATCH_TH_VMSOFM 0x58012057 +#define MASK_TH_VMSOFM 0xfc0ff07f +#define MATCH_TH_VIOTAM 0x58082057 +#define MASK_TH_VIOTAM 0xfc0ff07f +#define MATCH_TH_VIDV 0x5808a057 +#define MASK_TH_VIDV 0xfdfff07f /* Vendor-specific (Ventana Microsystems) XVentanaCondOps instructions */ #define MATCH_VT_MASKC 0x607b #define MASK_VT_MASKC 0xfe00707f diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c index 39be63f2ee6..fab3f7c6c39 100644 --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -2860,6 +2860,25 @@ const struct riscv_opcode riscv_opcodes[] = {"th.vfredmin.vs", 0, INSN_CLASS_XTHEADVECTOR, "Vd,Vt,VsVm", MATCH_TH_VFREDMINV, MASK_TH_VFREDMINV, match_opcode, 0}, {"th.vfwredosum.vs",0, INSN_CLASS_XTHEADVECTOR, "Vd,Vt,VsVm", MATCH_TH_VFWREDOSUMV, MASK_TH_VFWREDOSUMV, match_opcode, 0}, {"th.vfwredsum.vs", 0, INSN_CLASS_XTHEADVECTOR, "Vd,Vt,VsVm", MATCH_TH_VFWREDSUMV, MASK_TH_VFWREDSUMV, match_opcode, 0}, +{"th.vmcpy.m", 0, INSN_CLASS_XTHEADVECTOR, "Vd,Vu", MATCH_TH_VMANDMM, MASK_TH_VMANDMM, match_vs1_eq_vs2, INSN_ALIAS}, +{"th.vmclr.m", 0, INSN_CLASS_XTHEADVECTOR, "Vv", MATCH_TH_VMXORMM, MASK_TH_VMXORMM, match_vd_eq_vs1_eq_vs2, INSN_ALIAS}, +{"th.vmset.m", 0, INSN_CLASS_XTHEADVECTOR, "Vv", MATCH_TH_VMXNORMM, MASK_TH_VMXNORMM, match_vd_eq_vs1_eq_vs2, INSN_ALIAS}, +{"th.vmnot.m", 0, INSN_CLASS_XTHEADVECTOR, "Vd,Vu", MATCH_TH_VMNANDMM, MASK_TH_VMNANDMM, match_vs1_eq_vs2, INSN_ALIAS}, +{"th.vmand.mm", 0, INSN_CLASS_XTHEADVECTOR, "Vd,Vt,Vs", MATCH_TH_VMANDMM, MASK_TH_VMANDMM, match_opcode, 0}, +{"th.vmnand.mm", 0, INSN_CLASS_XTHEADVECTOR, "Vd,Vt,Vs", MATCH_TH_VMNANDMM, MASK_TH_VMNANDMM, match_opcode, 0}, +{"th.vmandnot.mm",0, INSN_CLASS_XTHEADVECTOR, "Vd,Vt,Vs", MATCH_TH_VMANDNOTMM, MASK_TH_VMANDNOTMM, match_opcode, 0}, +{"th.vmxor.mm", 0, INSN_CLASS_XTHEADVECTOR, "Vd,Vt,Vs", MATCH_TH_VMXORMM, MASK_TH_VMXORMM, match_opcode, 0}, +{"th.vmor.mm", 0, INSN_CLASS_XTHEADVECTOR, "Vd,Vt,Vs", MATCH_TH_VMORMM, MASK_TH_VMORMM, match_opcode, 0}, +{"th.vmnor.mm", 0, INSN_CLASS_XTHEADVECTOR, "Vd,Vt,Vs", MATCH_TH_VMNORMM, MASK_TH_VMNORMM, match_opcode, 0}, +{"th.vmornot.mm", 0, INSN_CLASS_XTHEADVECTOR, "Vd,Vt,Vs", MATCH_TH_VMORNOTMM, MASK_TH_VMORNOTMM, match_opcode, 0}, +{"th.vmxnor.mm", 0, INSN_CLASS_XTHEADVECTOR, "Vd,Vt,Vs", MATCH_TH_VMXNORMM, MASK_TH_VMXNORMM, match_opcode, 0}, +{"th.vmpopc.m", 0, INSN_CLASS_XTHEADVECTOR, "d,VtVm", MATCH_TH_VMPOPCM, MASK_TH_VMPOPCM, match_opcode, 0}, +{"th.vmfirst.m", 0, INSN_CLASS_XTHEADVECTOR, "d,VtVm", MATCH_TH_VMFIRSTM, MASK_TH_VMFIRSTM, match_opcode, 0}, +{"th.vmsbf.m", 0, INSN_CLASS_XTHEADVECTOR, "Vd,VtVm", MATCH_TH_VMSBFM, MASK_TH_VMSBFM, match_opcode, 0}, +{"th.vmsif.m", 0, INSN_CLASS_XTHEADVECTOR, "Vd,VtVm", MATCH_TH_VMSIFM, MASK_TH_VMSIFM, match_opcode, 0}, +{"th.vmsof.m", 0, INSN_CLASS_XTHEADVECTOR, "Vd,VtVm", MATCH_TH_VMSOFM, MASK_TH_VMSOFM, match_opcode, 0}, +{"th.viota.m", 0, INSN_CLASS_XTHEADVECTOR, "Vd,VtVm", MATCH_TH_VIOTAM, MASK_TH_VIOTAM, match_opcode, 0}, +{"th.vid.v", 0, INSN_CLASS_XTHEADVECTOR, "VdVm", MATCH_TH_VIDV, MASK_TH_VIDV, match_opcode, 0}, /* Vendor-specific (Ventana Microsystems) XVentanaCondOps instructions */ {"vt.maskc", 64, INSN_CLASS_XVENTANACONDOPS, "d,s,t", MATCH_VT_MASKC, MASK_VT_MASKC, match_opcode, 0 },