From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by sourceware.org (Postfix) with ESMTPS id D78A73828660 for ; Sun, 18 Sep 2022 08:07:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D78A73828660 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-x62f.google.com with SMTP id u9so58112330ejy.5 for ; Sun, 18 Sep 2022 01:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vrull.eu; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=SIckI2T1c6AMYOigJTPZjz5hg0y6FJKSf4C+oatYRls=; b=XdufZCoKZjZ8Xy/rW831th2igxHeunSr8ucBQssQwF32/ADOcffCKMUGwGMgPBbRGo Prm6Yrw5Y22I1507lrAxgd2FpYxQvmL7JACjldYYc9/nWBGHVVYJyZ/e/p9U9cRZj0it m11jIOhZafNwQSezXKJZ6hDuSnKaH22TOLpQDhs++s6n/6hkGIEcXqROF0xrJ1dJaZVV rbYItGEu84NgLNUY7gOVebb2wN3nbbtYsLFKn1xFGqXg9KJB6p6gBLcZJaQUmSxr4spw ylxlL60eTjf17n+fJuugm/MGnNx8UhIMYmy1OhJZLmIS12Obu6NSpIE3mgLqvDarLG5K 51ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=SIckI2T1c6AMYOigJTPZjz5hg0y6FJKSf4C+oatYRls=; b=3gBXX9OqJV4Gmko3hrWKiySMICgipy2HYpW6CijfDevMzn/9JTUZZkBaCRlkxVfccX IbEk2xPqElxqintJxLlqHwLt7QdOMoT614lSBxueoKrnkkkFn0kPI4S6Kjw8XttmTCIP +Xa2IyNr64VoTOhNaqZftUrkajjpEKDyZNp6NMa5eWRy3e2A0jKoIPEWm5uJCwubwgZa kRFh/1Sl3Acf8fhViDhM4s/6P3949qjGWTjtIX7+VSjCZGWI/gwUkRVOjTIMaGjoSZEe S6BQYbxhwQ32Qn8YSM0lsAzEDVlWX0F0EUK/fle7TUXORVXCLEj9EL/aGlNDAU7S9Vgf t3cw== X-Gm-Message-State: ACrzQf25f59KwFZN3PVgIwIbHomLWW4kSop+88GzwdHiW5fAhDGFNQkU a9RSWKzqpb3oEADPmBJZz/PgKs5/UQYunjxS X-Google-Smtp-Source: AMsMyM6KbB0Bgl/86wg96IjwWAi7oCSj2R45eqM8tJWuaRCVN8SzCS8rs0hdV1fyzyo9TlwxH3Wqgw== X-Received: by 2002:a17:907:9702:b0:77f:da35:e197 with SMTP id jg2-20020a170907970200b0077fda35e197mr8990302ejc.556.1663488461008; Sun, 18 Sep 2022 01:07:41 -0700 (PDT) Received: from beast.fritz.box (62-178-148-172.cable.dynamic.surfer.at. [62.178.148.172]) by smtp.gmail.com with ESMTPSA id i10-20020a17090671ca00b0074150f51d86sm13416042ejk.162.2022.09.18.01.07.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Sep 2022 01:07:40 -0700 (PDT) From: Christoph Muellner To: binutils@sourceware.org, Nelson Chu , Kito Cheng , Jim Wilson , Philipp Tomsich , Palmer Dabbelt , Aaron Durbin , Tsukasa OI Cc: =?UTF-8?q?Christoph=20M=C3=BCllner?= Subject: [PATCH v3] RISC-V: Add Zawrs ISA extension support Date: Sun, 18 Sep 2022 10:07:31 +0200 Message-Id: <20220918080731.2551374-1-christoph.muellner@vrull.eu> X-Mailer: git-send-email 2.37.2 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 patch adds support for the Zawrs ISA extension ("wrs.nto" and "wrs.sto" instructions). The specification can be found here: https://github.com/riscv/riscv-zawrs/blob/main/zawrs.adoc Note, that the Zawrs extension is frozen but not ratified yet. v3: * Fix location of added code (follow extension ordering policy) * Rebase on master (and resolve conflicts) * Drop RFC tag as Zawrs got frozen v2: * Adjustments according to a specification change Signed-off-by: Christoph Müllner --- bfd/elfxx-riscv.c | 5 +++++ gas/testsuite/gas/riscv/zawrs-32.d | 11 +++++++++++ gas/testsuite/gas/riscv/zawrs.d | 11 +++++++++++ gas/testsuite/gas/riscv/zawrs.s | 3 +++ include/opcode/riscv-opc.h | 8 ++++++++ include/opcode/riscv.h | 1 + opcodes/riscv-opc.c | 4 ++++ 7 files changed, 43 insertions(+) create mode 100644 gas/testsuite/gas/riscv/zawrs-32.d create mode 100644 gas/testsuite/gas/riscv/zawrs.d create mode 100644 gas/testsuite/gas/riscv/zawrs.s diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index e03b312a381..386bf185073 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1161,6 +1161,7 @@ static struct riscv_supported_ext riscv_supported_std_z_ext[] = {"zifencei", ISA_SPEC_CLASS_20191213, 2, 0, 0 }, {"zifencei", ISA_SPEC_CLASS_20190608, 2, 0, 0 }, {"zihintpause", ISA_SPEC_CLASS_DRAFT, 2, 0, 0 }, + {"zawrs", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zmmul", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zfh", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"zfhmin", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, @@ -2293,6 +2294,8 @@ riscv_multi_subset_supports (riscv_parse_subset_t *rps, return riscv_subset_supports (rps, "zmmul"); case INSN_CLASS_A: return riscv_subset_supports (rps, "a"); + case INSN_CLASS_ZAWRS: + return riscv_subset_supports (rps, "zawrs"); case INSN_CLASS_F: return riscv_subset_supports (rps, "f"); case INSN_CLASS_D: @@ -2410,6 +2413,8 @@ riscv_multi_subset_supports_ext (riscv_parse_subset_t *rps, return _ ("m' or `zmmul"); case INSN_CLASS_A: return "a"; + case INSN_CLASS_ZAWRS: + return "zawrs"; case INSN_CLASS_F: return "f"; case INSN_CLASS_D: diff --git a/gas/testsuite/gas/riscv/zawrs-32.d b/gas/testsuite/gas/riscv/zawrs-32.d new file mode 100644 index 00000000000..32e3a07fb3a --- /dev/null +++ b/gas/testsuite/gas/riscv/zawrs-32.d @@ -0,0 +1,11 @@ +#as: -march=rv32i_zawrs +#source: zawrs.s +#objdump: -dr + +.*:[ ]+file format .* + +Disassembly of section .text: + +0+000 : +[ ]+[0-9a-f]+:[ ]+00d00073[ ]+wrs.nto +[ ]+[0-9a-f]+:[ ]+01d00073[ ]+wrs.sto diff --git a/gas/testsuite/gas/riscv/zawrs.d b/gas/testsuite/gas/riscv/zawrs.d new file mode 100644 index 00000000000..9fe44f7e359 --- /dev/null +++ b/gas/testsuite/gas/riscv/zawrs.d @@ -0,0 +1,11 @@ +#as: -march=rv64i_zawrs +#source: zawrs.s +#objdump: -dr + +.*:[ ]+file format .* + +Disassembly of section .text: + +0+000 : +[ ]+[0-9a-f]+:[ ]+00d00073[ ]+wrs.nto +[ ]+[0-9a-f]+:[ ]+01d00073[ ]+wrs.sto diff --git a/gas/testsuite/gas/riscv/zawrs.s b/gas/testsuite/gas/riscv/zawrs.s new file mode 100644 index 00000000000..138b7b5ca77 --- /dev/null +++ b/gas/testsuite/gas/riscv/zawrs.s @@ -0,0 +1,3 @@ +target: + wrs.nto + wrs.sto diff --git a/include/opcode/riscv-opc.h b/include/opcode/riscv-opc.h index 88b8d7ff595..98fe6764ab9 100644 --- a/include/opcode/riscv-opc.h +++ b/include/opcode/riscv-opc.h @@ -2113,6 +2113,11 @@ #define MASK_CBO_INVAL 0xfff07fff #define MATCH_CBO_ZERO 0x40200f #define MASK_CBO_ZERO 0xfff07fff +/* Zawrs intructions. */ +#define MATCH_WRS_NTO 0x00d00073 +#define MASK_WRS_NTO 0xffffffff +#define MATCH_WRS_STO 0x01d00073 +#define MASK_WRS_STO 0xffffffff /* Unprivileged Counter/Timers CSR addresses. */ #define CSR_CYCLE 0xc00 #define CSR_TIME 0xc01 @@ -2852,6 +2857,9 @@ DECLARE_INSN(cbo_clean, MATCH_CBO_CLEAN, MASK_CBO_CLEAN); DECLARE_INSN(cbo_flush, MATCH_CBO_FLUSH, MASK_CBO_FLUSH); DECLARE_INSN(cbo_inval, MATCH_CBO_INVAL, MASK_CBO_INVAL); DECLARE_INSN(cbo_zero, MATCH_CBO_ZERO, MASK_CBO_ZERO); +/* Zawrs instructions. */ +DECLARE_INSN(wrs_nto, MATCH_WRS_NTO, MASK_WRS_NTO) +DECLARE_INSN(wrs_sto, MATCH_WRS_STO, MASK_WRS_STO) #endif /* DECLARE_INSN */ #ifdef DECLARE_CSR /* Unprivileged Counter/Timers CSRs. */ diff --git a/include/opcode/riscv.h b/include/opcode/riscv.h index f1dabeaab8e..b790833a89a 100644 --- a/include/opcode/riscv.h +++ b/include/opcode/riscv.h @@ -367,6 +367,7 @@ enum riscv_insn_class INSN_CLASS_ZICSR, INSN_CLASS_ZIFENCEI, INSN_CLASS_ZIHINTPAUSE, + INSN_CLASS_ZAWRS, INSN_CLASS_ZMMUL, INSN_CLASS_F_OR_ZFINX, INSN_CLASS_D_OR_ZDINX, diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c index 79be78eb367..0ea0f77a2d4 100644 --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -921,6 +921,10 @@ const struct riscv_opcode riscv_opcodes[] = {"cbo.inval", 0, INSN_CLASS_ZICBOM, "0(s)", MATCH_CBO_INVAL, MASK_CBO_INVAL, match_opcode, 0 }, {"cbo.zero", 0, INSN_CLASS_ZICBOZ, "0(s)", MATCH_CBO_ZERO, MASK_CBO_ZERO, match_opcode, 0 }, +/* Zawrs instructions. */ +{"wrs.nto", 0, INSN_CLASS_ZAWRS, "", MATCH_WRS_NTO, MASK_WRS_NTO, match_opcode, 0 }, +{"wrs.sto", 0, INSN_CLASS_ZAWRS, "", MATCH_WRS_STO, MASK_WRS_STO, match_opcode, 0 }, + /* Zbb or zbkb instructions. */ {"clz", 0, INSN_CLASS_ZBB, "d,s", MATCH_CLZ, MASK_CLZ, match_opcode, 0 }, {"ctz", 0, INSN_CLASS_ZBB, "d,s", MATCH_CTZ, MASK_CTZ, match_opcode, 0 }, -- 2.37.2