From patchwork Wed Dec 21 17:07:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christoph_M=C3=BCllner?= X-Patchwork-Id: 35434 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp3639282wrn; Wed, 21 Dec 2022 09:10:04 -0800 (PST) X-Google-Smtp-Source: AMrXdXulRrRa7hnmY4V6AaINxvONadF1eUTBj8usHcg2qMGuQlW5UJzk8J/mhxo6LD7k2xYx3BxF X-Received: by 2002:a17:907:8c06:b0:7c1:3fbd:d569 with SMTP id ta6-20020a1709078c0600b007c13fbdd569mr1926548ejc.8.1671642604125; Wed, 21 Dec 2022 09:10:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671642604; cv=none; d=google.com; s=arc-20160816; b=jCMuuhf5+WOrX2/x3rsjQ4fazMe6iSj5YXxRgmE9wLoOp29UFCA3Kmzac0+FwycUh8 XHLezXJOAVqIk329p6VBxJs8dLkcO9Vww6+VDg6ntsVILKKT6Z3+DihwWsAry1ImesK0 bbTj1YsKikiV7yeixf8ulQ++QUwEGiw0cHTA4zklzMvBwpwJ6pLdsduo4lkIyQBBBFRN Jj8jS9Ix3+nG9rH5BOBZ1npeg5uvQaZ5D8UbAj4RcA4bPE0jBFhbAZRCdRftT3HejMNf Jyhg3He01Sy5Esg42S9ssgo7lCQKMfdZYlHPCfNCeFtFO9vCb2fmgBJMY99NqTlHKFXA xTZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender: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:dkim-signature:dmarc-filter:delivered-to; bh=HnFSNBhhKmmrLywjPFTF6Hx4xgQy23KDHdHGmLb91jk=; b=segv1KuDk4VRGC4vxOA43yyrTkGsuoroThJX/eidCbEGImhpFruu+wRjyt+ez2Ruu3 glYSvF7GIWM4b5Pix2Dt/aQXbeDXbTxEeeojrL5qcQfRJIzs4fcONyt47RaRX/PQjzu5 kIpzqn8nlt6F1QwJyg6QlLykIg3oKy82BHFspZxQhAs5cquz3wfrwDmbd4UReNc86lVM HAYVYbPQMb3QJuEqkRmjmKPpGWB5xWCYNzaz8/C5/8/AZ2ybeQfklJmX4z/NOPnhEaz2 OAWnSen4VXeQtODuPLxRX636JlzUHWcuM91gr9NCFhtQhnf5wy0PRUR2GygUZaerV7bN JFiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@vrull.eu header.s=google header.b=kEDahNot; 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" Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id wf10-20020a170907d68a00b007c1292a824asi3631077ejc.731.2022.12.21.09.10.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 09:10:04 -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; dkim=pass header.i=@vrull.eu header.s=google header.b=kEDahNot; 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" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A4B9B3832361 for ; Wed, 21 Dec 2022 17:08:30 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by sourceware.org (Postfix) with ESMTPS id 5CDBB385843D for ; Wed, 21 Dec 2022 17:07:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5CDBB385843D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=vrull.eu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=vrull.eu Received: by mail-ej1-x62a.google.com with SMTP id gh17so38354444ejb.6 for ; Wed, 21 Dec 2022 09:07:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vrull.eu; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HnFSNBhhKmmrLywjPFTF6Hx4xgQy23KDHdHGmLb91jk=; b=kEDahNotHTqeMvlPlH+N1GY8WAMj5bMC4Rr59b0gjHctpvAKtzb+Asm55OUWBfZxNh gVLB0ff/GPr+ORdsXzdAXCxqV77RsDTDFLJCBUUdzTHuifDed/zJqmu415KFftU6DTuJ NEW+nF/lOB7fzv1XQ3ZS1PJ8L4VQyuGIpB2yv84kdvlKPIj5ittNkLRAzzYW5HXsMBOL QXXwVRlJH+10wOTSeu9F66inaEwtOIpmUQDFgcsb9Lrf4deX/9xzhNVd0awbesdP+TeB hVtn6w+d89Z0elRtHhor1hXKJwTEjQtsGOocCaQOAHA/VDvR62M5IZYy1U4yz53hWJC5 5S4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HnFSNBhhKmmrLywjPFTF6Hx4xgQy23KDHdHGmLb91jk=; b=W4KPuCduOHW+L2tx2h+5iaHz+djluoQWQ89x1ShUWSwNywXLTFNOW6B3aYjeImWUuK oX0D+Kk82sLYJrmaScFdHvMn/5tWRXo+5GZmoL7ueNUOkVRV4Uf15Gnku+yY6OhKGXWV cz7pDBwkKE4x6wk+ItENJx3lLaPETXpMYtI8WlQsxVDdUtPi2/Zx3lFjPD7JZgCvrn9W ksRXkWBMBlmTCm+VV3kqdHXRfvllesUdYTclJzN83umgTdHm2CRuVBMDTEVIysmQCJhe 15wzmXzzUBJW5xh7fKUttWdXkIrNAsamSLt7J+ErMzt2F7LbD9yOgmf02AVCuzCSxciQ oJ9A== X-Gm-Message-State: AFqh2krBcatm2rDHuAYC3MozPVxndJhMqodGWsLSwxfW1MGgQNIa2Yub xDhTJCksN/I5eI6vbBlEiuMxOVPSrh3oFOTK X-Received: by 2002:a17:906:2ccc:b0:7c0:e23d:12c4 with SMTP id r12-20020a1709062ccc00b007c0e23d12c4mr1988076ejr.63.1671642433744; Wed, 21 Dec 2022 09:07:13 -0800 (PST) Received: from beast.fritz.box (62-178-148-172.cable.dynamic.surfer.at. [62.178.148.172]) by smtp.gmail.com with ESMTPSA id t18-20020a17090605d200b007c16430e5c8sm7344770ejt.92.2022.12.21.09.07.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 09:07:12 -0800 (PST) From: Christoph Muellner To: binutils@sourceware.org, Nelson Chu , Andrew Waterman , Palmer Dabbelt , Jim Wilson , Philipp Tomsich , Aaron Durbin , Andrew de los Reyes , Eric Gouriou , Barna Ibrahim Cc: =?utf-8?q?Christoph_M=C3=BCllner?= Subject: [RFC PATCH 3/6] RISC-V: Add Zvkh[a,b] ISA extension support Date: Wed, 21 Dec 2022 18:07:03 +0100 Message-Id: <20221221170706.2877188-4-christoph.muellner@vrull.eu> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221221170706.2877188-1-christoph.muellner@vrull.eu> References: <20221221170706.2877188-1-christoph.muellner@vrull.eu> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_MANYTO, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org Sender: "Binutils" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752844315202103694?= X-GMAIL-MSGID: =?utf-8?q?1752844315202103694?= From: Christoph Müllner This commit adds the Zvkh[a,b] ISA extension instructions, which are part of the vector crypto extensions. Signed-off-by: Christoph Müllner --- bfd/elfxx-riscv.c | 13 +++++++++++++ gas/testsuite/gas/riscv/zvkha.d | 12 ++++++++++++ gas/testsuite/gas/riscv/zvkha_zvkhb.s | 3 +++ gas/testsuite/gas/riscv/zvkhb.d | 12 ++++++++++++ include/opcode/riscv-opc.h | 11 +++++++++++ include/opcode/riscv.h | 3 +++ opcodes/riscv-opc.c | 5 +++++ 7 files changed, 59 insertions(+) create mode 100644 gas/testsuite/gas/riscv/zvkha.d create mode 100644 gas/testsuite/gas/riscv/zvkha_zvkhb.s create mode 100644 gas/testsuite/gas/riscv/zvkhb.d diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index 6dfae35ff0b..fad49e4176a 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1207,6 +1207,8 @@ static struct riscv_supported_ext riscv_supported_std_z_ext[] = {"zve64d", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zvkb", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zvkg", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, + {"zvkha", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, + {"zvkhb", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zvl32b", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zvl64b", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zvl128b", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, @@ -2421,6 +2423,13 @@ riscv_multi_subset_supports (riscv_parse_subset_t *rps, return riscv_subset_supports (rps, "zvkb"); case INSN_CLASS_ZVKG: return riscv_subset_supports (rps, "zvkg"); + case INSN_CLASS_ZVKHA: + return riscv_subset_supports (rps, "zvkha"); + case INSN_CLASS_ZVKHB: + return riscv_subset_supports (rps, "zvkhb"); + case INSN_CLASS_ZVKHA_OR_ZVKHB: + return (riscv_subset_supports (rps, "zvkha") + || riscv_subset_supports (rps, "zvkhb")); case INSN_CLASS_SVINVAL: return riscv_subset_supports (rps, "svinval"); case INSN_CLASS_H: @@ -2583,6 +2592,10 @@ riscv_multi_subset_supports_ext (riscv_parse_subset_t *rps, return _("zvkb"); case INSN_CLASS_ZVKG: return _("zvkg"); + case INSN_CLASS_ZVKHA: + return _("zvkha"); + case INSN_CLASS_ZVKHB: + return _("zvkhb"); case INSN_CLASS_SVINVAL: return "svinval"; case INSN_CLASS_H: diff --git a/gas/testsuite/gas/riscv/zvkha.d b/gas/testsuite/gas/riscv/zvkha.d new file mode 100644 index 00000000000..61d6f4e77bb --- /dev/null +++ b/gas/testsuite/gas/riscv/zvkha.d @@ -0,0 +1,12 @@ +#as: -march=rv64gc_zvkha +#source: zvkha_zvkhb.s +#objdump: -dr + +.*:[ ]+file format .* + + +Disassembly of section .text: +0+000 <.text>: +[ ]+[0-9a-f]+:[ ]+ba862277[ ]+vsha2ch.vv[ ]+v4,v8,v12 +[ ]+[0-9a-f]+:[ ]+be862277[ ]+vsha2cl.vv[ ]+v4,v8,v12 +[ ]+[0-9a-f]+:[ ]+b6862277[ ]+vsha2ms.vv[ ]+v4,v8,v12 diff --git a/gas/testsuite/gas/riscv/zvkha_zvkhb.s b/gas/testsuite/gas/riscv/zvkha_zvkhb.s new file mode 100644 index 00000000000..d20e6310531 --- /dev/null +++ b/gas/testsuite/gas/riscv/zvkha_zvkhb.s @@ -0,0 +1,3 @@ + vsha2ch.vv v4, v8, v12 + vsha2cl.vv v4, v8, v12 + vsha2ms.vv v4, v8, v12 diff --git a/gas/testsuite/gas/riscv/zvkhb.d b/gas/testsuite/gas/riscv/zvkhb.d new file mode 100644 index 00000000000..61d0c1c4652 --- /dev/null +++ b/gas/testsuite/gas/riscv/zvkhb.d @@ -0,0 +1,12 @@ +#as: -march=rv64gc_zvkhb +#source: zvkha_zvkhb.s +#objdump: -dr + +.*:[ ]+file format .* + + +Disassembly of section .text: +0+000 <.text>: +[ ]+[0-9a-f]+:[ ]+ba862277[ ]+vsha2ch.vv[ ]+v4,v8,v12 +[ ]+[0-9a-f]+:[ ]+be862277[ ]+vsha2cl.vv[ ]+v4,v8,v12 +[ ]+[0-9a-f]+:[ ]+b6862277[ ]+vsha2ms.vv[ ]+v4,v8,v12 diff --git a/include/opcode/riscv-opc.h b/include/opcode/riscv-opc.h index 4daffed4d84..2d22f88acb7 100644 --- a/include/opcode/riscv-opc.h +++ b/include/opcode/riscv-opc.h @@ -2087,6 +2087,13 @@ /* Zvkg instructions. */ #define MATCH_VGHMACVV 0xb2002077 #define MASK_VGHMACVV 0xfe00707f +/* Zvkh[a,b] instructions. */ +#define MATCH_VSHA2CHVV 0xba002077 +#define MASK_VSHA2CHVV 0xfe00707f +#define MATCH_VSHA2CLVV 0xbe002077 +#define MASK_VSHA2CLVV 0xfe00707f +#define MATCH_VSHA2MSVV 0xb6002077 +#define MASK_VSHA2MSVV 0xfe00707f /* Svinval instruction. */ #define MATCH_SINVAL_VMA 0x16000073 #define MASK_SINVAL_VMA 0xfe007fff @@ -3167,6 +3174,10 @@ DECLARE_INSN(vandnvx, MATCH_VANDNVX, MASK_VANDNVX) DECLARE_INSN(vandnvi, MATCH_VANDNVI, MASK_VANDNVI) /* Zvkg instructions. */ DECLARE_INSN(vghmacvv, MATCH_VGHMACVV, MASK_VGHMACVV) +/* Zvkh[a,b] instructions. */ +DECLARE_INSN(vsha2chvv, MATCH_VSHA2CHVV, MASK_VSHA2CHVV) +DECLARE_INSN(vsha2clvv, MATCH_VSHA2CLVV, MASK_VSHA2CLVV) +DECLARE_INSN(vsha2msvv, MATCH_VSHA2MSVV, MASK_VSHA2MSVV) /* Vendor-specific (T-Head) XTheadBa instructions. */ DECLARE_INSN(th_addsl, MATCH_TH_ADDSL, MASK_TH_ADDSL) /* Vendor-specific (T-Head) XTheadBb instructions. */ diff --git a/include/opcode/riscv.h b/include/opcode/riscv.h index 060438a64d0..be5650297a7 100644 --- a/include/opcode/riscv.h +++ b/include/opcode/riscv.h @@ -411,6 +411,9 @@ enum riscv_insn_class INSN_CLASS_ZVEF, INSN_CLASS_ZVKB, INSN_CLASS_ZVKG, + INSN_CLASS_ZVKHA, + INSN_CLASS_ZVKHB, + INSN_CLASS_ZVKHA_OR_ZVKHB, INSN_CLASS_SVINVAL, INSN_CLASS_ZICBOM, INSN_CLASS_ZICBOP, diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c index bb716c8c9d0..35d3e653147 100644 --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -1834,6 +1834,11 @@ const struct riscv_opcode riscv_opcodes[] = /* Zvkg instructions. */ {"vghmac.vv", 0, INSN_CLASS_ZVKG, "Vd,Vt,Vs", MATCH_VGHMACVV, MASK_VGHMACVV, match_opcode, 0}, +/* Xvkh[a,b] instructions. */ +{"vsha2ch.vv", 0, INSN_CLASS_ZVKHA_OR_ZVKHB, "Vd,Vt,Vs", MATCH_VSHA2CHVV, MASK_VSHA2CHVV, match_opcode, 0}, +{"vsha2cl.vv", 0, INSN_CLASS_ZVKHA_OR_ZVKHB, "Vd,Vt,Vs", MATCH_VSHA2CLVV, MASK_VSHA2CLVV, match_opcode, 0}, +{"vsha2ms.vv", 0, INSN_CLASS_ZVKHA_OR_ZVKHB, "Vd,Vt,Vs", MATCH_VSHA2MSVV, MASK_VSHA2MSVV, match_opcode, 0}, + /* Supervisor instructions. */ {"csrr", 0, INSN_CLASS_ZICSR, "d,E", MATCH_CSRRS, MASK_CSRRS|MASK_RS1, match_opcode, INSN_ALIAS }, {"csrw", 0, INSN_CLASS_ZICSR, "E,s", MATCH_CSRRW, MASK_CSRRW|MASK_RD, match_opcode, INSN_ALIAS },