From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by sourceware.org (Postfix) with ESMTPS id 6E4663858000 for ; Fri, 20 Jan 2023 19:55:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6E4663858000 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-wm1-x332.google.com with SMTP id o17-20020a05600c511100b003db021ef437so4470381wms.4 for ; Fri, 20 Jan 2023 11:55:44 -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=KbWFc2ONNfYfF31B/9UpkaQzf1bQUdj7pLgmP4O9eGU=; b=BqIq/XNNuy7PSxZB0IQrJo7rfn+hE6Mp/W5VcoG7mSJnqAZ3IKi3NJxyYnQnFHdG0o d3+RGLwTHNPZlA4kJ1OJvG9AN58qNlwxQPFlFojhOqreu2QCEbkyKZF45oRu5YU9Uwt+ y7qAsGFxVEZlxv4gDQYAZnmzlz+phLiRZa0qhjsaa9e2zN0H6QkIL6txVXNQTQrgvObB P+dXXxvbaV+UzLOKDq5Fx/lCw7pGWggu2c1FA8AsZP/ua/8aIkqbVi4nYKLl987Q7pho qeIq9UGVOcG3bS3vK8AkTpvnNuyVzuXqEu0dCSWNdGFHVEpOOOPWlcXoBlJ7TFBcpKI8 k0ZQ== 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=KbWFc2ONNfYfF31B/9UpkaQzf1bQUdj7pLgmP4O9eGU=; b=54eAJSvuVz742Gm/h/MOJBn/NfvBIhvy2q5cqMaIn4TWX0FlVHQxQEDYz9EQiFqgSo DX/RWF1rVjgnO1JTkyq01/tE+zINH3mM0spovZWnets67v5irVUNCR0Z22LQ8KwkLIr9 /1WG1VEqsDSkVGqu0PT1P2nv34tsXRdWEcPKaN87N+FPK6i/ENQmV4G5dQFDfAr8OP1J /RtkGmOh5ZdEWMXJehoGFFZF9j4J4Ih4WESuaP64Lf/TjbDE84807mbElY0dIjfdcvIi SjCS1Ptj9bwUNuSFd+aTF5knRe9hgi47eJldE4tgEx9PFY8zgAQLQ0RbDmHM+uaVSOQe /i8A== X-Gm-Message-State: AFqh2kpxauj9S3VaFM2E+QuQYL84UBrLpnZA2EFMoNNyn+T7U/r6s9Bu QMVo+QQxpnVNA8e/otCjJonMoPBBblS/3ffX X-Google-Smtp-Source: AMrXdXtGXBGkta2c3pv0U0gePHP8BIycALTih54UPDgeT9V0UJ5KuZ+a4ZDR9UmwK1oubKpKvXX4FQ== X-Received: by 2002:a05:600c:4256:b0:3da:2a78:d7a3 with SMTP id r22-20020a05600c425600b003da2a78d7a3mr14826283wmm.33.1674244542917; Fri, 20 Jan 2023 11:55:42 -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 m9-20020a7bca49000000b003c65c9a36dfsm3050553wml.48.2023.01.20.11.55.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 11:55:42 -0800 (PST) From: Christoph Muellner To: binutils@sourceware.org, Nelson Chu , Andrew Waterman , Palmer Dabbelt , Jim Wilson , Philipp Tomsich , Elda Kuka , Aaron Durbin , Andrew de los Reyes , Eric Gouriou , Barna Ibrahim , Jeff Law Cc: =?UTF-8?q?Christoph=20M=C3=BCllner?= Subject: [RFC PATCH v2 6/6] RISC-V: Add Zvksh ISA extension support Date: Fri, 20 Jan 2023 20:55:32 +0100 Message-Id: <20230120195532.917113-7-christoph.muellner@vrull.eu> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230120195532.917113-1-christoph.muellner@vrull.eu> References: <20230120195532.917113-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.6 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 08f892ed987..ac388bc1287 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[] = {"zvknhb", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zvkns", 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 }, @@ -2376,6 +2377,8 @@ riscv_multi_subset_supports (riscv_parse_subset_t *rps, return riscv_subset_supports (rps, "zvkns"); 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: @@ -2546,6 +2549,8 @@ riscv_multi_subset_supports_ext (riscv_parse_subset_t *rps, return _("zvkns"); 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 0a1fd0b69e8..2ba138c00f4 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 c2d70728749..52a7dc63e11 100644 --- a/include/opcode/riscv.h +++ b/include/opcode/riscv.h @@ -416,6 +416,7 @@ enum riscv_insn_class INSN_CLASS_ZVKNHA_OR_ZVKNHB, INSN_CLASS_ZVKNS, 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 1a4b3738744..ed26232c90a 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.39.0