* [PATCH v3] RISC-V: Add Zawrs ISA extension support
@ 2022-09-18 8:07 Christoph Muellner
2022-09-18 8:19 ` Tsukasa OI
0 siblings, 1 reply; 5+ messages in thread
From: Christoph Muellner @ 2022-09-18 8:07 UTC (permalink / raw)
To: binutils, Nelson Chu, Kito Cheng, Jim Wilson, Philipp Tomsich,
Palmer Dabbelt, Aaron Durbin, Tsukasa OI
Cc: Christoph Müllner
From: Christoph Müllner <christoph.muellner@vrull.eu>
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 <christoph.muellner@vrull.eu>
---
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 <target>:
+[ ]+[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 <target>:
+[ ]+[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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v3] RISC-V: Add Zawrs ISA extension support
2022-09-18 8:07 [PATCH v3] RISC-V: Add Zawrs ISA extension support Christoph Muellner
@ 2022-09-18 8:19 ` Tsukasa OI
2022-09-18 8:48 ` Christoph Müllner
2022-09-23 4:34 ` Nelson Chu
0 siblings, 2 replies; 5+ messages in thread
From: Tsukasa OI @ 2022-09-18 8:19 UTC (permalink / raw)
To: Christoph Muellner, binutils
Functionally, this is good as is.
For formatting, there is a small room for further improvements (as I
comment below). This is not your fault but because of my recently
upstreamed 'Zmmul' patchset.
Thanks,
Tsukasa
On 2022/09/18 17:07, Christoph Muellner wrote:
> From: Christoph Müllner <christoph.muellner@vrull.eu>
>
> 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 <christoph.muellner@vrull.eu>
> ---
> 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 },
"zmmul" -> "zawrs"?
> {"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 <target>:
> +[ ]+[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 <target>:
> +[ ]+[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,
Likewise.
> 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 },
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v3] RISC-V: Add Zawrs ISA extension support
2022-09-18 8:19 ` Tsukasa OI
@ 2022-09-18 8:48 ` Christoph Müllner
2022-09-23 4:34 ` Nelson Chu
1 sibling, 0 replies; 5+ messages in thread
From: Christoph Müllner @ 2022-09-18 8:48 UTC (permalink / raw)
To: Tsukasa OI; +Cc: binutils
[-- Attachment #1: Type: text/plain, Size: 7195 bytes --]
On Sun, Sep 18, 2022 at 10:19 AM Tsukasa OI <research_trasio@irq.a4lg.com>
wrote:
> Functionally, this is good as is.
>
> For formatting, there is a small room for further improvements (as I
> comment below). This is not your fault but because of my recently
> upstreamed 'Zmmul' patchset.
>
Grml... I got it right in most places, but not all.
I need to get more used to IMAFD.
Thanks for the review and spotting this!
>
> Thanks,
> Tsukasa
>
> On 2022/09/18 17:07, Christoph Muellner wrote:
> > From: Christoph Müllner <christoph.muellner@vrull.eu>
> >
> > 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 <christoph.muellner@vrull.eu>
> > ---
> > 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 },
>
> "zmmul" -> "zawrs"?
>
> > {"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 <target>:
> > +[ ]+[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 <target>:
> > +[ ]+[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,
>
> Likewise.
>
> > 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 },
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v3] RISC-V: Add Zawrs ISA extension support
2022-09-18 8:19 ` Tsukasa OI
2022-09-18 8:48 ` Christoph Müllner
@ 2022-09-23 4:34 ` Nelson Chu
2022-09-23 7:13 ` Tsukasa OI
1 sibling, 1 reply; 5+ messages in thread
From: Nelson Chu @ 2022-09-23 4:34 UTC (permalink / raw)
To: Tsukasa OI; +Cc: Christoph Muellner, binutils
On Sun, Sep 18, 2022 at 4:20 PM Tsukasa OI via Binutils
<binutils@sourceware.org> wrote:
>
> Functionally, this is good as is.
>
> For formatting, there is a small room for further improvements (as I
> comment below). This is not your fault but because of my recently
> upstreamed 'Zmmul' patchset.
The extension orders in the riscv_supported_* tables are not really
important for now. For the single letter standard extensions, the
order is kept in the riscv_ext_canonical_order. All extensions should
be arranged to the correct places by calling riscv_lookup_subset and
riscv_compare_subsets, and all rules of order are mentioned in the
riscv_compare_subsets. So make them in order just for tidy, but won't
break anything. The problem we met for the zmmul is g's imply. The
order in the riscv_implicit_subsets really matters based on the
current implementation, and not sure if we will have another choice to
remove the order limitation when adding implicit extensions.
Anyway, the v4 patch looks good and approved, so please commit it when
you think it's time.
Thanks
Nelson
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3] RISC-V: Add Zawrs ISA extension support
2022-09-23 4:34 ` Nelson Chu
@ 2022-09-23 7:13 ` Tsukasa OI
0 siblings, 0 replies; 5+ messages in thread
From: Tsukasa OI @ 2022-09-23 7:13 UTC (permalink / raw)
To: Nelson Chu, Binutils
On 2022/09/23 13:34, Nelson Chu wrote:
> On Sun, Sep 18, 2022 at 4:20 PM Tsukasa OI via Binutils
> <binutils@sourceware.org> wrote:
>>
>> Functionally, this is good as is.
>>
>> For formatting, there is a small room for further improvements (as I
>> comment below). This is not your fault but because of my recently
>> upstreamed 'Zmmul' patchset.
>
> The extension orders in the riscv_supported_* tables are not really
> important for now. For the single letter standard extensions, the
> order is kept in the riscv_ext_canonical_order. All extensions should
> be arranged to the correct places by calling riscv_lookup_subset and
> riscv_compare_subsets, and all rules of order are mentioned in the
> riscv_compare_subsets. So make them in order just for tidy, but won't
> break anything. The problem we met for the zmmul is g's imply. The
> order in the riscv_implicit_subsets really matters based on the
> current implementation, and not sure if we will have another choice to
> remove the order limitation when adding implicit extensions.
Yep, just for tidying (and I said "functionally" good). And I didn't
pointed that 'Zmmul' broke something in that mail.
Because 'Zmmul' is upstreamed after his 'Zawrs' PATCH v2 and 'Zmmul' is
(supposed to be) placed next to 'Zawrs', it caused extension order
different from the canonical ordering while rebasing, that's it.
Thanks,
Tsukasa
p.s.
Talking of 'G' -> 'Zmmul' issue I accidentally created...
I made a script to prevent that from happening again. It's a hack
(sensitive to code formatting) but works perfectly. It checks (A -> B)
-> (B -> X) -> (A -> X) for all extensions A, B and X ("->": imply).
It reported 'G' -> 'Zmmul' related error just after my 'Zmmul' patchset
and reported no errors on the latest master.
<https://github.com/a4lg/riscv-binutils-devmemo/blob/main/check-implicit-subsets.py>
>
> Anyway, the v4 patch looks good and approved, so please commit it when
> you think it's time.
>
> Thanks
> Nelson
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-09-23 7:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-18 8:07 [PATCH v3] RISC-V: Add Zawrs ISA extension support Christoph Muellner
2022-09-18 8:19 ` Tsukasa OI
2022-09-18 8:48 ` Christoph Müllner
2022-09-23 4:34 ` Nelson Chu
2022-09-23 7:13 ` Tsukasa OI
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).