From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by sourceware.org (Postfix) with ESMTPS id 0133B385703F for ; Wed, 21 Dec 2022 17:07:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0133B385703F 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-x62b.google.com with SMTP id jo4so29413401ejb.7 for ; Wed, 21 Dec 2022 09:07:18 -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=HRK+b/JdfUqaCt6br0diNluWMnnnb66hGW+J75GVy+E=; b=b46eEXLHUw5Ys/jjUmVAeWwpLtzOR8SRAGCvybMDHxMJRcXeILooxO/Sb3zwwYFvYg qH593qgU95XaRQMWLSfCwpfquz3iQkqN/oN1bHnb0CoeoEaF2Nq/pjOJ2F07YXYYt1Jn VAtQS9I/M7MFqzVk3mHUbwSjb++MnjaA+BYeO1ULLf6g6SJdkV3dyFbbtm7bBeI3oidk hCwURY7pdN6lfVRj5+6RVilwtorf7PexV+VVCxIL/leJPHKOPOiPuaqLzkXKfMNKmqc4 SzKuN1ptjOexI/3QrcLEStlpMepqGPg4P3GPasmSogpVmLuKoUv2oIun2/r4xg4uWJb0 MUOQ== 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=HRK+b/JdfUqaCt6br0diNluWMnnnb66hGW+J75GVy+E=; b=nod7w36Zqb+1YgyilNYsOXInX8L3kLjT/7u6w6W5GfpZZr5WF2ugh1LfdF7wfdnxH4 acFEIjtREs15ZPjKdmG6g1k3JP6V8GNeiM2/hWPMEybBkjg8F+ByVuO+1/sNLeDEEPc+ Uzqqkk4KSMpsXQjf+5NzYBN2u8+nEI+dfXUZBgvj3lEM+H1GVaSqkgDS53uB9SQgW+Oz 7GCrdfHjXKZ7bA+SDxPpVkmHrDn0c5EZhCvjEqskJ0syO1fs9igCmrWkHLNzVM6kXxmi wES3ifsIAabPjY6ptyZLQ0Pn4GqEin3rffKeg3eVN07mRsCtWXjIeh5gJM4wxp5ox/Kb igBg== X-Gm-Message-State: AFqh2kpYsO235Rr1eiKeKMEjmwQF0wNl9MbNSm3t6DSRmRXEVbRu1+Es +4Z9ohfBxDnSyU9hmW6pKrjwA2EYxVNRHjXQ X-Google-Smtp-Source: AMrXdXsrp6GX2y8iALrWV+ygfRYGC5wARw2av67lBAk+nn0bIMRBJcjr9NNP6EB+nR/P+7x+YSakkw== X-Received: by 2002:a17:906:6402:b0:7c1:962e:cf24 with SMTP id d2-20020a170906640200b007c1962ecf24mr1925161ejm.50.1671642437470; Wed, 21 Dec 2022 09:07:17 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 09:07:17 -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=20M=C3=BCllner?= Subject: [RFC PATCH 6/6] RISC-V: Add Zvksh ISA extension support Date: Wed, 21 Dec 2022 18:07:06 +0100 Message-Id: <20221221170706.2877188-7-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 List-Id: From: Christoph Müllner This commit adds the Zvksh ISA extension instructions, which are part of the vector crypto extensions. Signed-off-by: Christoph Müllner --- bfd/elfxx-riscv.c | 5 +++++ gas/testsuite/gas/riscv/zvksh.d | 11 +++++++++++ gas/testsuite/gas/riscv/zvksh.s | 3 +++ include/opcode/riscv-opc.h | 8 ++++++++ include/opcode/riscv.h | 1 + opcodes/riscv-opc.c | 4 ++++ 6 files changed, 32 insertions(+) create mode 100644 gas/testsuite/gas/riscv/zvksh.d create mode 100644 gas/testsuite/gas/riscv/zvksh.s diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index c7956a22abb..2c968825707 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1211,6 +1211,7 @@ static struct riscv_supported_ext riscv_supported_std_z_ext[] = {"zvkhb", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zvkn", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zvksed", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, + {"zvksh", 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 }, @@ -2436,6 +2437,8 @@ riscv_multi_subset_supports (riscv_parse_subset_t *rps, return riscv_subset_supports (rps, "zvkn"); case INSN_CLASS_ZVKSED: return riscv_subset_supports (rps, "zvksed"); + case INSN_CLASS_ZVKSH: + return riscv_subset_supports (rps, "zvksh"); case INSN_CLASS_SVINVAL: return riscv_subset_supports (rps, "svinval"); case INSN_CLASS_H: @@ -2606,6 +2609,8 @@ riscv_multi_subset_supports_ext (riscv_parse_subset_t *rps, return _("zvkn"); case INSN_CLASS_ZVKSED: return _("zvksed"); + case INSN_CLASS_ZVKSH: + return _("zvksh"); case INSN_CLASS_SVINVAL: return "svinval"; case INSN_CLASS_H: diff --git a/gas/testsuite/gas/riscv/zvksh.d b/gas/testsuite/gas/riscv/zvksh.d new file mode 100644 index 00000000000..b24d126ed7b --- /dev/null +++ b/gas/testsuite/gas/riscv/zvksh.d @@ -0,0 +1,11 @@ +#as: -march=rv64gc_zvksh +#objdump: -dr + +.*:[ ]+file format .* + + +Disassembly of section .text: +0+000 <.text>: +[ ]+[0-9a-f]+:[ ]+ae802277[ ]+vsm3c.vi[ ]+v4,v8,0 +[ ]+[0-9a-f]+:[ ]+ae8fa277[ ]+vsm3c.vi[ ]+v4,v8,31 +[ ]+[0-9a-f]+:[ ]+82862277[ ]+vsm3me.vv[ ]+v4,v8,v12 diff --git a/gas/testsuite/gas/riscv/zvksh.s b/gas/testsuite/gas/riscv/zvksh.s new file mode 100644 index 00000000000..bde705c5e33 --- /dev/null +++ b/gas/testsuite/gas/riscv/zvksh.s @@ -0,0 +1,3 @@ + vsm3c.vi v4, v8, 0 + vsm3c.vi v4, v8, 31 + vsm3me.vv v4, v8, v12 diff --git a/include/opcode/riscv-opc.h b/include/opcode/riscv-opc.h index b44d2190250..8d60eaf260e 100644 --- a/include/opcode/riscv-opc.h +++ b/include/opcode/riscv-opc.h @@ -2124,6 +2124,11 @@ #define MASK_VSM4RVV 0xfe0ff07f #define MATCH_VSM4RVS 0xa6082077 #define MASK_VSM4RVS 0xfe0ff07f +/* Zvksh instructions. */ +#define MATCH_VSM3CVI 0xae002077 +#define MASK_VSM3CVI 0xfe00707f +#define MATCH_VSM3MEVV 0x82002077 +#define MASK_VSM3MEVV 0xfe00707f /* Svinval instruction. */ #define MATCH_SINVAL_VMA 0x16000073 #define MASK_SINVAL_VMA 0xfe007fff @@ -3224,6 +3229,9 @@ DECLARE_INSN(vaeszvs, MATCH_VAESZVS, MASK_VAESZVS) DECLARE_INSN(vsm4kvi, MATCH_VSM4KVI, MASK_VSM4KVI) DECLARE_INSN(vsm4rvv, MATCH_VSM4RVV, MASK_VSM4RVV) DECLARE_INSN(vsm4rvs, MATCH_VSM4RVS, MASK_VSM4RVS) +/* Zvksh instructions. */ +DECLARE_INSN(vsm3cvi, MATCH_VSM3CVI, MASK_VSM3CVI) +DECLARE_INSN(vsm3mevv, MATCH_VSM3MEVV, MASK_VSM3MEVV) /* 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 d6465c2a2a4..864644f9f9b 100644 --- a/include/opcode/riscv.h +++ b/include/opcode/riscv.h @@ -416,6 +416,7 @@ enum riscv_insn_class INSN_CLASS_ZVKHA_OR_ZVKHB, INSN_CLASS_ZVKN, INSN_CLASS_ZVKSED, + INSN_CLASS_ZVKSH, INSN_CLASS_SVINVAL, INSN_CLASS_ZICBOM, INSN_CLASS_ZICBOP, diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c index 69e833f666c..86b07e8c1ce 100644 --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -1857,6 +1857,10 @@ const struct riscv_opcode riscv_opcodes[] = {"vsm4r.vv", 0, INSN_CLASS_ZVKSED, "Vd,Vt", MATCH_VSM4RVV, MASK_VSM4RVV, match_opcode, 0}, {"vsm4r.vs", 0, INSN_CLASS_ZVKSED, "Vd,Vt", MATCH_VSM4RVS, MASK_VSM4RVS, match_opcode, 0}, +/* Zvksh instructions. */ +{"vsm3c.vi", 0, INSN_CLASS_ZVKSH, "Vd,Vt,Vj", MATCH_VSM3CVI, MASK_VSM3CVI, match_opcode, 0}, +{"vsm3me.vv", 0, INSN_CLASS_ZVKSH, "Vd,Vt,Vs", MATCH_VSM3MEVV, MASK_VSM3MEVV, 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 }, -- 2.38.1