diff mbox series

RISC-V: Removed privileged spec 1.9.1 support in assembler.

Message ID 20240322081441.18273-1-nelson@rivosinc.com
State New
Headers
Series RISC-V: Removed privileged spec 1.9.1 support in assembler. |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_binutils_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_binutils_check--master-arm success Testing passed

Commit Message

Nelson Chu March 22, 2024, 8:14 a.m. UTC 
  Removed since it's may have lots of conflicts with the newer extensions, but
still keep linker recognizes it in case of linking old objects.

gas/
	* NEWS: Updated.
	* config/tc-riscv.c (riscv_set_default_priv_spec): Regard 1.9.1 as
	an unknown version.
	(md_show_usage): Removed privileged spec 1.9.1 information.
	* testsuite/gas/riscv/attribute-05.s: Updated since privileged spec
	1.9.1 is unsupported.
	* testsuite/gas/riscv/attribute-05.d: Likewise.
	* testsuite/gas/riscv/attribute-12.d: Likewise.
	* testsuite/gas/riscv/attribute-13.d: Likewise.
	* testsuite/gas/riscv/csr-dw-regnums.d: Likewise.
	* testsuite/gas/riscv/csr-dw-regnums.s: Likewise.
	* testsuite/gas/riscv/csr.s: Likewise.
	* testsuite/gas/riscv/csr-version-1p10.d: Likewise.
	* testsuite/gas/riscv/csr-version-1p10.l: Likewise.
	* testsuite/gas/riscv/csr-version-1p11.d: Likewise.
	* testsuite/gas/riscv/csr-version-1p11.l: Likewise.
	* testsuite/gas/riscv/csr-version-1p12.d: Likewise.
	* testsuite/gas/riscv/csr-version-1p12.l: Likewise.
	* testsuite/gas/riscv/csr-version-1p9p1.d: Removed.
	* testsuite/gas/riscv/csr-version-1p9p1.l: Removed.
include/
	* opcode/riscv-opc.h: Updated since privileged spec 1.9.1 is
	unsupported.
ld/
	* testsuite/ld-riscv-elf/attr-merge-priv-spec-01.d: Updated since
	privileged spec 1.9.1 is unsupported.
	* testsuite/ld-riscv-elf/attr-merge-priv-spec-02.d: Likewise.
	* testsuite/ld-riscv-elf/attr-merge-priv-spec-03.d: Likewise.
	* testsuite/ld-riscv-elf/attr-merge-priv-spec-a.s: Likewise.
	* testsuite/ld-riscv-elf/attr-merge-priv-spec-b.s: Likewise.
	* testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d: Likewise.
	* testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d: Likewise.
	* testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d: Likewise.
	* testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d: Likewise.
	* testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d: Likewise.
	* testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d: Likewise.
---
 gas/NEWS                                      |    3 +
 gas/config/tc-riscv.c                         |    5 +-
 gas/testsuite/gas/riscv/attribute-05.d        |    3 +-
 gas/testsuite/gas/riscv/attribute-05.s        |    4 +-
 gas/testsuite/gas/riscv/attribute-12.d        |    5 +-
 gas/testsuite/gas/riscv/attribute-13.d        |    2 +-
 gas/testsuite/gas/riscv/csr-dw-regnums.d      |   13 -
 gas/testsuite/gas/riscv/csr-dw-regnums.s      |   13 -
 gas/testsuite/gas/riscv/csr-version-1p10.d    |   26 -
 gas/testsuite/gas/riscv/csr-version-1p10.l    |   52 -
 gas/testsuite/gas/riscv/csr-version-1p11.d    |   26 -
 gas/testsuite/gas/riscv/csr-version-1p11.l    |   52 -
 gas/testsuite/gas/riscv/csr-version-1p12.d    |   26 -
 gas/testsuite/gas/riscv/csr-version-1p12.l    |   52 -
 gas/testsuite/gas/riscv/csr-version-1p9p1.d   |  897 ---------
 gas/testsuite/gas/riscv/csr-version-1p9p1.l   | 1683 -----------------
 gas/testsuite/gas/riscv/csr.s                 |   33 +-
 include/opcode/riscv-opc.h                    |  389 ++--
 .../ld-riscv-elf/attr-merge-priv-spec-01.d    |    3 +-
 .../ld-riscv-elf/attr-merge-priv-spec-02.d    |    3 +-
 .../ld-riscv-elf/attr-merge-priv-spec-03.d    |    3 +-
 .../ld-riscv-elf/attr-merge-priv-spec-a.s     |    3 +-
 .../ld-riscv-elf/attr-merge-priv-spec-b.s     |    3 +-
 .../attr-merge-priv-spec-failed-01.d          |    3 +-
 .../attr-merge-priv-spec-failed-02.d          |    3 +-
 .../attr-merge-priv-spec-failed-03.d          |    3 +-
 .../attr-merge-priv-spec-failed-04.d          |    3 +-
 .../attr-merge-priv-spec-failed-05.d          |    3 +-
 .../attr-merge-priv-spec-failed-06.d          |    3 +-
 29 files changed, 218 insertions(+), 3099 deletions(-)
 delete mode 100644 gas/testsuite/gas/riscv/csr-version-1p9p1.d
 delete mode 100644 gas/testsuite/gas/riscv/csr-version-1p9p1.l

Comments

Kito Cheng March 25, 2024, 1:58 p.m. UTC | #1 
> Removed since it's may have lots of conflicts with the newer extensions, but
> still keep linker recognizes it in case of linking old objects.

LGTM, and hope one day we can get rid of whole -mpriv-spec= option :P
Nelson Chu March 28, 2024, 2:23 a.m. UTC | #2 
Thanks, committed.

Nelson

On Mon, Mar 25, 2024 at 9:58 PM Kito Cheng <kito.cheng@gmail.com> wrote:

> > Removed since it's may have lots of conflicts with the newer extensions,
> but
> > still keep linker recognizes it in case of linking old objects.
>
> LGTM, and hope one day we can get rid of whole -mpriv-spec= option :P
>
diff mbox series

Patch

diff --git a/gas/NEWS b/gas/NEWS
index 07e834e2071..92b02de00cd 100644
--- a/gas/NEWS
+++ b/gas/NEWS
@@ -1,5 +1,8 @@ 
 -*- text -*-
 
+* Remove support for RISC-V privileged spec 1.9.1, but linker can still
+  recognize it in case of linking old objects.
+
 * The base register operand in D(X,B) and D(L,B) may be explicitly omitted
   in assembly on s390. It can now be coded as D(X,) or D(L,) instead of D(X,0)
   D(X,%r0), D(L,0), and D(L,%r0).
diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c
index 2a2948fde17..94f0c679bb9 100644
--- a/gas/config/tc-riscv.c
+++ b/gas/config/tc-riscv.c
@@ -210,7 +210,8 @@  riscv_set_default_priv_spec (const char *s)
   obj_attribute *attr;
 
   RISCV_GET_PRIV_SPEC_CLASS (s, class);
-  if (class != PRIV_SPEC_CLASS_NONE)
+  if (class != PRIV_SPEC_CLASS_NONE
+      && class != PRIV_SPEC_CLASS_1P9P1)
     {
       default_priv_spec = class;
       return 1;
@@ -5009,7 +5010,7 @@  RISC-V options:\n\
   -fno-pic                    don't generate position-independent code (default)\n\
   -march=ISA                  set the RISC-V architecture\n\
   -misa-spec=ISAspec          set the RISC-V ISA spec (2.2, 20190608, 20191213)\n\
-  -mpriv-spec=PRIVspec        set the RISC-V privilege spec (1.9.1, 1.10, 1.11, 1.12)\n\
+  -mpriv-spec=PRIVspec        set the RISC-V privilege spec (1.10, 1.11, 1.12)\n\
   -mabi=ABI                   set the RISC-V ABI\n\
   -mrelax                     enable relax (default)\n\
   -mno-relax                  disable relax\n\
diff --git a/gas/testsuite/gas/riscv/attribute-05.d b/gas/testsuite/gas/riscv/attribute-05.d
index 9507b43976d..7d90612e0ae 100644
--- a/gas/testsuite/gas/riscv/attribute-05.d
+++ b/gas/testsuite/gas/riscv/attribute-05.d
@@ -7,5 +7,4 @@  File Attributes
   Tag_RISCV_arch: "rv32i2p0_m2p0_a2p0_f2p0_d2p0_zmmul1p0"
   Tag_RISCV_unaligned_access: Unaligned access
   Tag_RISCV_priv_spec: 1
-  Tag_RISCV_priv_spec_minor: 9
-  Tag_RISCV_priv_spec_revision: 1
+  Tag_RISCV_priv_spec_minor: 12
diff --git a/gas/testsuite/gas/riscv/attribute-05.s b/gas/testsuite/gas/riscv/attribute-05.s
index 49203097994..7cda21823d0 100644
--- a/gas/testsuite/gas/riscv/attribute-05.s
+++ b/gas/testsuite/gas/riscv/attribute-05.s
@@ -1,6 +1,6 @@ 
 	.attribute arch, "rv32g"
 	.attribute priv_spec, 1
-	.attribute priv_spec_minor, 9
-	.attribute priv_spec_revision, 1
+	.attribute priv_spec_minor, 12
+	#.attribute priv_spec_revision, version
 	.attribute unaligned_access, 1
 	.attribute stack_align, 16
diff --git a/gas/testsuite/gas/riscv/attribute-12.d b/gas/testsuite/gas/riscv/attribute-12.d
index 980b36cada6..1441df41cf1 100644
--- a/gas/testsuite/gas/riscv/attribute-12.d
+++ b/gas/testsuite/gas/riscv/attribute-12.d
@@ -1,9 +1,8 @@ 
-#as: -march-attr -mpriv-spec=1.9.1
+#as: -march-attr -mpriv-spec=1.12
 #readelf: -A
 #source: attribute-11.s
 Attribute Section: riscv
 File Attributes
   Tag_RISCV_arch: [a-zA-Z0-9_\"].*
   Tag_RISCV_priv_spec: 1
-  Tag_RISCV_priv_spec_minor: 9
-  Tag_RISCV_priv_spec_revision: 1
+  Tag_RISCV_priv_spec_minor: 12
diff --git a/gas/testsuite/gas/riscv/attribute-13.d b/gas/testsuite/gas/riscv/attribute-13.d
index b8dfe3a7dee..b6a160c4596 100644
--- a/gas/testsuite/gas/riscv/attribute-13.d
+++ b/gas/testsuite/gas/riscv/attribute-13.d
@@ -1,4 +1,4 @@ 
-#as: -march-attr -mpriv-spec=1.9.1
+#as: -march-attr -mpriv-spec=1.12
 #readelf: -A
 #source: empty.s
 Attribute Section: riscv
diff --git a/gas/testsuite/gas/riscv/csr-dw-regnums.d b/gas/testsuite/gas/riscv/csr-dw-regnums.d
index cabb7c71918..2d85996ad5c 100644
--- a/gas/testsuite/gas/riscv/csr-dw-regnums.d
+++ b/gas/testsuite/gas/riscv/csr-dw-regnums.d
@@ -403,19 +403,6 @@  Contents of the .* section:
   DW_CFA_offset_extended_sf: r4445 \(stimecmph\) at cfa\+1396
   DW_CFA_offset_extended_sf: r4685 \(vstimecmp\) at cfa\+2356
   DW_CFA_offset_extended_sf: r4701 \(vstimecmph\) at cfa\+2420
-  DW_CFA_offset_extended_sf: r4163 \(utval\) at cfa\+268
-  DW_CFA_offset_extended_sf: r4419 \(stval\) at cfa\+1292
-  DW_CFA_offset_extended_sf: r4480 \(satp\) at cfa\+1536
-  DW_CFA_offset_extended_sf: r4931 \(mtval\) at cfa\+3340
-  DW_CFA_offset_extended_sf: r4896 \(mcountinhibit\) at cfa\+3200
-  DW_CFA_offset_extended_sf: r4897 \(mcyclecfg\) at cfa\+3204
-  DW_CFA_offset_extended_sf: r4898 \(minstretcfg\) at cfa\+3208
-  DW_CFA_offset_extended_sf: r4992 \(mbase\) at cfa\+3584
-  DW_CFA_offset_extended_sf: r4993 \(mbound\) at cfa\+3588
-  DW_CFA_offset_extended_sf: r4994 \(mibase\) at cfa\+3592
-  DW_CFA_offset_extended_sf: r4995 \(mibound\) at cfa\+3596
-  DW_CFA_offset_extended_sf: r4996 \(mdbase\) at cfa\+3600
-  DW_CFA_offset_extended_sf: r4997 \(mdbound\) at cfa\+3604
   DW_CFA_offset_extended: r4096 \(ustatus\) at cfa\+0
   DW_CFA_offset_extended_sf: r4100 \(uie\) at cfa\+16
   DW_CFA_offset_extended_sf: r4101 \(utvec\) at cfa\+20
diff --git a/gas/testsuite/gas/riscv/csr-dw-regnums.s b/gas/testsuite/gas/riscv/csr-dw-regnums.s
index 428d0770779..a4cf56dd799 100644
--- a/gas/testsuite/gas/riscv/csr-dw-regnums.s
+++ b/gas/testsuite/gas/riscv/csr-dw-regnums.s
@@ -406,19 +406,6 @@  _start:
 	.cfi_offset vstimecmp, 2356
 	.cfi_offset vstimecmph, 2420
 	# dropped
-	.cfi_offset ubadaddr, 268	# aliases
-	.cfi_offset sbadaddr, 1292	# aliases
-	.cfi_offset sptbr, 1536		# aliases
-	.cfi_offset mbadaddr, 3340	# aliases
-	.cfi_offset mucounteren, 3200	# aliases
-	.cfi_offset mscounteren, 3204	# aliases
-	.cfi_offset mhcounteren, 3208	# aliases
-	.cfi_offset mbase, 3584
-	.cfi_offset mbound, 3588
-	.cfi_offset mibase, 3592
-	.cfi_offset mibound, 3596
-	.cfi_offset mdbase, 3600
-	.cfi_offset mdbound, 3604
 	.cfi_offset ustatus, 0
 	.cfi_offset uie, 16
 	.cfi_offset utvec, 20
diff --git a/gas/testsuite/gas/riscv/csr-version-1p10.d b/gas/testsuite/gas/riscv/csr-version-1p10.d
index dbdc077adac..2ee4ee55ecd 100644
--- a/gas/testsuite/gas/riscv/csr-version-1p10.d
+++ b/gas/testsuite/gas/riscv/csr-version-1p10.d
@@ -781,32 +781,6 @@  Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+24d59073[ 	]+csrw[ 	]+vstimecmp,a1
 [ 	]+[0-9a-f]+:[ 	]+25d02573[ 	]+csrr[ 	]+a0,vstimecmph
 [ 	]+[0-9a-f]+:[ 	]+25d59073[ 	]+csrw[ 	]+vstimecmph,a1
-[ 	]+[0-9a-f]+:[ 	]+04302573[ 	]+csrr[ 	]+a0,utval
-[ 	]+[0-9a-f]+:[ 	]+04359073[ 	]+csrw[ 	]+utval,a1
-[ 	]+[0-9a-f]+:[ 	]+14302573[ 	]+csrr[ 	]+a0,stval
-[ 	]+[0-9a-f]+:[ 	]+14359073[ 	]+csrw[ 	]+stval,a1
-[ 	]+[0-9a-f]+:[ 	]+18002573[ 	]+csrr[ 	]+a0,satp
-[ 	]+[0-9a-f]+:[ 	]+18059073[ 	]+csrw[ 	]+satp,a1
-[ 	]+[0-9a-f]+:[ 	]+34302573[ 	]+csrr[ 	]+a0,mtval
-[ 	]+[0-9a-f]+:[ 	]+34359073[ 	]+csrw[ 	]+mtval,a1
-[ 	]+[0-9a-f]+:[ 	]+32002573[ 	]+csrr[ 	]+a0,0x320
-[ 	]+[0-9a-f]+:[ 	]+32059073[ 	]+csrw[ 	]+0x320,a1
-[ 	]+[0-9a-f]+:[ 	]+32102573[ 	]+csrr[ 	]+a0,mcyclecfg
-[ 	]+[0-9a-f]+:[ 	]+32159073[ 	]+csrw[ 	]+mcyclecfg,a1
-[ 	]+[0-9a-f]+:[ 	]+32202573[ 	]+csrr[ 	]+a0,minstretcfg
-[ 	]+[0-9a-f]+:[ 	]+32259073[ 	]+csrw[ 	]+minstretcfg,a1
-[ 	]+[0-9a-f]+:[ 	]+38002573[ 	]+csrr[ 	]+a0,0x380
-[ 	]+[0-9a-f]+:[ 	]+38059073[ 	]+csrw[ 	]+0x380,a1
-[ 	]+[0-9a-f]+:[ 	]+38102573[ 	]+csrr[ 	]+a0,0x381
-[ 	]+[0-9a-f]+:[ 	]+38159073[ 	]+csrw[ 	]+0x381,a1
-[ 	]+[0-9a-f]+:[ 	]+38202573[ 	]+csrr[ 	]+a0,0x382
-[ 	]+[0-9a-f]+:[ 	]+38259073[ 	]+csrw[ 	]+0x382,a1
-[ 	]+[0-9a-f]+:[ 	]+38302573[ 	]+csrr[ 	]+a0,0x383
-[ 	]+[0-9a-f]+:[ 	]+38359073[ 	]+csrw[ 	]+0x383,a1
-[ 	]+[0-9a-f]+:[ 	]+38402573[ 	]+csrr[ 	]+a0,0x384
-[ 	]+[0-9a-f]+:[ 	]+38459073[ 	]+csrw[ 	]+0x384,a1
-[ 	]+[0-9a-f]+:[ 	]+38502573[ 	]+csrr[ 	]+a0,0x385
-[ 	]+[0-9a-f]+:[ 	]+38559073[ 	]+csrw[ 	]+0x385,a1
 [ 	]+[0-9a-f]+:[ 	]+00002573[ 	]+csrr[ 	]+a0,ustatus
 [ 	]+[0-9a-f]+:[ 	]+00059073[ 	]+csrw[ 	]+ustatus,a1
 [ 	]+[0-9a-f]+:[ 	]+00402573[ 	]+csrr[ 	]+a0,uie
diff --git a/gas/testsuite/gas/riscv/csr-version-1p10.l b/gas/testsuite/gas/riscv/csr-version-1p10.l
index 054179a416d..63991d5023c 100644
--- a/gas/testsuite/gas/riscv/csr-version-1p10.l
+++ b/gas/testsuite/gas/riscv/csr-version-1p10.l
@@ -1511,58 +1511,6 @@ 
 .*Info: macro .*
 .*Warning: invalid CSR `vstimecmph', needs `sstc' extension
 .*Info: macro .*
-.*Warning: invalid CSR `ubadaddr' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `ubadaddr' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `sbadaddr' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `sbadaddr' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `sptbr' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `sptbr' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mbadaddr' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mbadaddr' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mucounteren' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mucounteren' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mscounteren' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mscounteren' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mhcounteren' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mhcounteren' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mbase' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mbase' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mbound' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mbound' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mibase' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mibase' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mibound' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mibound' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mdbase' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mdbase' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mdbound' for the privileged spec `1.10'
-.*Info: macro .*
-.*Warning: invalid CSR `mdbound' for the privileged spec `1.10'
-.*Info: macro .*
 .*Warning: invalid CSR `fflags', needs `f' extension
 .*Info: macro .*
 .*Warning: invalid CSR `fflags', needs `f' extension
diff --git a/gas/testsuite/gas/riscv/csr-version-1p11.d b/gas/testsuite/gas/riscv/csr-version-1p11.d
index 7ba88b6d1d5..836dedef86a 100644
--- a/gas/testsuite/gas/riscv/csr-version-1p11.d
+++ b/gas/testsuite/gas/riscv/csr-version-1p11.d
@@ -781,32 +781,6 @@  Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+24d59073[ 	]+csrw[ 	]+vstimecmp,a1
 [ 	]+[0-9a-f]+:[ 	]+25d02573[ 	]+csrr[ 	]+a0,vstimecmph
 [ 	]+[0-9a-f]+:[ 	]+25d59073[ 	]+csrw[ 	]+vstimecmph,a1
-[ 	]+[0-9a-f]+:[ 	]+04302573[ 	]+csrr[ 	]+a0,utval
-[ 	]+[0-9a-f]+:[ 	]+04359073[ 	]+csrw[ 	]+utval,a1
-[ 	]+[0-9a-f]+:[ 	]+14302573[ 	]+csrr[ 	]+a0,stval
-[ 	]+[0-9a-f]+:[ 	]+14359073[ 	]+csrw[ 	]+stval,a1
-[ 	]+[0-9a-f]+:[ 	]+18002573[ 	]+csrr[ 	]+a0,satp
-[ 	]+[0-9a-f]+:[ 	]+18059073[ 	]+csrw[ 	]+satp,a1
-[ 	]+[0-9a-f]+:[ 	]+34302573[ 	]+csrr[ 	]+a0,mtval
-[ 	]+[0-9a-f]+:[ 	]+34359073[ 	]+csrw[ 	]+mtval,a1
-[ 	]+[0-9a-f]+:[ 	]+32002573[ 	]+csrr[ 	]+a0,mcountinhibit
-[ 	]+[0-9a-f]+:[ 	]+32059073[ 	]+csrw[ 	]+mcountinhibit,a1
-[ 	]+[0-9a-f]+:[ 	]+32102573[ 	]+csrr[ 	]+a0,mcyclecfg
-[ 	]+[0-9a-f]+:[ 	]+32159073[ 	]+csrw[ 	]+mcyclecfg,a1
-[ 	]+[0-9a-f]+:[ 	]+32202573[ 	]+csrr[ 	]+a0,minstretcfg
-[ 	]+[0-9a-f]+:[ 	]+32259073[ 	]+csrw[ 	]+minstretcfg,a1
-[ 	]+[0-9a-f]+:[ 	]+38002573[ 	]+csrr[ 	]+a0,0x380
-[ 	]+[0-9a-f]+:[ 	]+38059073[ 	]+csrw[ 	]+0x380,a1
-[ 	]+[0-9a-f]+:[ 	]+38102573[ 	]+csrr[ 	]+a0,0x381
-[ 	]+[0-9a-f]+:[ 	]+38159073[ 	]+csrw[ 	]+0x381,a1
-[ 	]+[0-9a-f]+:[ 	]+38202573[ 	]+csrr[ 	]+a0,0x382
-[ 	]+[0-9a-f]+:[ 	]+38259073[ 	]+csrw[ 	]+0x382,a1
-[ 	]+[0-9a-f]+:[ 	]+38302573[ 	]+csrr[ 	]+a0,0x383
-[ 	]+[0-9a-f]+:[ 	]+38359073[ 	]+csrw[ 	]+0x383,a1
-[ 	]+[0-9a-f]+:[ 	]+38402573[ 	]+csrr[ 	]+a0,0x384
-[ 	]+[0-9a-f]+:[ 	]+38459073[ 	]+csrw[ 	]+0x384,a1
-[ 	]+[0-9a-f]+:[ 	]+38502573[ 	]+csrr[ 	]+a0,0x385
-[ 	]+[0-9a-f]+:[ 	]+38559073[ 	]+csrw[ 	]+0x385,a1
 [ 	]+[0-9a-f]+:[ 	]+00002573[ 	]+csrr[ 	]+a0,ustatus
 [ 	]+[0-9a-f]+:[ 	]+00059073[ 	]+csrw[ 	]+ustatus,a1
 [ 	]+[0-9a-f]+:[ 	]+00402573[ 	]+csrr[ 	]+a0,uie
diff --git a/gas/testsuite/gas/riscv/csr-version-1p11.l b/gas/testsuite/gas/riscv/csr-version-1p11.l
index cc365f1df41..6caec9f63a5 100644
--- a/gas/testsuite/gas/riscv/csr-version-1p11.l
+++ b/gas/testsuite/gas/riscv/csr-version-1p11.l
@@ -1507,58 +1507,6 @@ 
 .*Info: macro .*
 .*Warning: invalid CSR `vstimecmph', needs `sstc' extension
 .*Info: macro .*
-.*Warning: invalid CSR `ubadaddr' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `ubadaddr' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `sbadaddr' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `sbadaddr' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `sptbr' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `sptbr' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mbadaddr' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mbadaddr' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mucounteren' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mucounteren' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mscounteren' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mscounteren' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mhcounteren' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mhcounteren' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mbase' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mbase' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mbound' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mbound' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mibase' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mibase' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mibound' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mibound' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mdbase' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mdbase' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mdbound' for the privileged spec `1.11'
-.*Info: macro .*
-.*Warning: invalid CSR `mdbound' for the privileged spec `1.11'
-.*Info: macro .*
 .*Warning: invalid CSR `fflags', needs `f' extension
 .*Info: macro .*
 .*Warning: invalid CSR `fflags', needs `f' extension
diff --git a/gas/testsuite/gas/riscv/csr-version-1p12.d b/gas/testsuite/gas/riscv/csr-version-1p12.d
index 677820b9526..beeec9a580f 100644
--- a/gas/testsuite/gas/riscv/csr-version-1p12.d
+++ b/gas/testsuite/gas/riscv/csr-version-1p12.d
@@ -781,32 +781,6 @@  Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+24d59073[ 	]+csrw[ 	]+vstimecmp,a1
 [ 	]+[0-9a-f]+:[ 	]+25d02573[ 	]+csrr[ 	]+a0,vstimecmph
 [ 	]+[0-9a-f]+:[ 	]+25d59073[ 	]+csrw[ 	]+vstimecmph,a1
-[ 	]+[0-9a-f]+:[ 	]+04302573[ 	]+csrr[ 	]+a0,0x43
-[ 	]+[0-9a-f]+:[ 	]+04359073[ 	]+csrw[ 	]+0x43,a1
-[ 	]+[0-9a-f]+:[ 	]+14302573[ 	]+csrr[ 	]+a0,stval
-[ 	]+[0-9a-f]+:[ 	]+14359073[ 	]+csrw[ 	]+stval,a1
-[ 	]+[0-9a-f]+:[ 	]+18002573[ 	]+csrr[ 	]+a0,satp
-[ 	]+[0-9a-f]+:[ 	]+18059073[ 	]+csrw[ 	]+satp,a1
-[ 	]+[0-9a-f]+:[ 	]+34302573[ 	]+csrr[ 	]+a0,mtval
-[ 	]+[0-9a-f]+:[ 	]+34359073[ 	]+csrw[ 	]+mtval,a1
-[ 	]+[0-9a-f]+:[ 	]+32002573[ 	]+csrr[ 	]+a0,mcountinhibit
-[ 	]+[0-9a-f]+:[ 	]+32059073[ 	]+csrw[ 	]+mcountinhibit,a1
-[ 	]+[0-9a-f]+:[ 	]+32102573[ 	]+csrr[ 	]+a0,mcyclecfg
-[ 	]+[0-9a-f]+:[ 	]+32159073[ 	]+csrw[ 	]+mcyclecfg,a1
-[ 	]+[0-9a-f]+:[ 	]+32202573[ 	]+csrr[ 	]+a0,minstretcfg
-[ 	]+[0-9a-f]+:[ 	]+32259073[ 	]+csrw[ 	]+minstretcfg,a1
-[ 	]+[0-9a-f]+:[ 	]+38002573[ 	]+csrr[ 	]+a0,0x380
-[ 	]+[0-9a-f]+:[ 	]+38059073[ 	]+csrw[ 	]+0x380,a1
-[ 	]+[0-9a-f]+:[ 	]+38102573[ 	]+csrr[ 	]+a0,0x381
-[ 	]+[0-9a-f]+:[ 	]+38159073[ 	]+csrw[ 	]+0x381,a1
-[ 	]+[0-9a-f]+:[ 	]+38202573[ 	]+csrr[ 	]+a0,0x382
-[ 	]+[0-9a-f]+:[ 	]+38259073[ 	]+csrw[ 	]+0x382,a1
-[ 	]+[0-9a-f]+:[ 	]+38302573[ 	]+csrr[ 	]+a0,0x383
-[ 	]+[0-9a-f]+:[ 	]+38359073[ 	]+csrw[ 	]+0x383,a1
-[ 	]+[0-9a-f]+:[ 	]+38402573[ 	]+csrr[ 	]+a0,0x384
-[ 	]+[0-9a-f]+:[ 	]+38459073[ 	]+csrw[ 	]+0x384,a1
-[ 	]+[0-9a-f]+:[ 	]+38502573[ 	]+csrr[ 	]+a0,0x385
-[ 	]+[0-9a-f]+:[ 	]+38559073[ 	]+csrw[ 	]+0x385,a1
 [ 	]+[0-9a-f]+:[ 	]+00002573[ 	]+csrr[ 	]+a0,0x0
 [ 	]+[0-9a-f]+:[ 	]+00059073[ 	]+csrw[ 	]+0x0,a1
 [ 	]+[0-9a-f]+:[ 	]+00402573[ 	]+csrr[ 	]+a0,0x4
diff --git a/gas/testsuite/gas/riscv/csr-version-1p12.l b/gas/testsuite/gas/riscv/csr-version-1p12.l
index 7a7f5f717c5..b83a0012004 100644
--- a/gas/testsuite/gas/riscv/csr-version-1p12.l
+++ b/gas/testsuite/gas/riscv/csr-version-1p12.l
@@ -1231,58 +1231,6 @@ 
 .*Info: macro .*
 .*Warning: invalid CSR `vstimecmph', needs `sstc' extension
 .*Info: macro .*
-.*Warning: invalid CSR `ubadaddr' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `ubadaddr' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `sbadaddr' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `sbadaddr' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `sptbr' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `sptbr' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mbadaddr' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mbadaddr' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mucounteren' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mucounteren' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mscounteren' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mscounteren' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mhcounteren' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mhcounteren' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mbase' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mbase' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mbound' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mbound' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mibase' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mibase' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mibound' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mibound' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mdbase' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mdbase' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mdbound' for the privileged spec `1.12'
-.*Info: macro .*
-.*Warning: invalid CSR `mdbound' for the privileged spec `1.12'
-.*Info: macro .*
 .*Warning: invalid CSR `ustatus' for the privileged spec `1.12'
 .*Info: macro .*
 .*Warning: invalid CSR `ustatus' for the privileged spec `1.12'
diff --git a/gas/testsuite/gas/riscv/csr-version-1p9p1.d b/gas/testsuite/gas/riscv/csr-version-1p9p1.d
deleted file mode 100644
index f4d2b04ca6a..00000000000
--- a/gas/testsuite/gas/riscv/csr-version-1p9p1.d
+++ /dev/null
@@ -1,897 +0,0 @@ 
-#as: -march=rv64i_zicsr -mcsr-check -mpriv-spec=1.9.1
-#source: csr.s
-#warning_output: csr-version-1p9p1.l
-#objdump: -dr -Mpriv-spec=1.9.1
-
-.*:[ 	]+file format .*
-
-
-Disassembly of section .text:
-
-0+000 <.text>:
-[ 	]+[0-9a-f]+:[ 	]+c0002573[ 	]+rdcycle[ 	]+a0
-[ 	]+[0-9a-f]+:[ 	]+c0059073[ 	]+csrw[ 	]+cycle,a1
-[ 	]+[0-9a-f]+:[ 	]+c0102573[ 	]+rdtime[ 	]+a0
-[ 	]+[0-9a-f]+:[ 	]+c0159073[ 	]+csrw[ 	]+time,a1
-[ 	]+[0-9a-f]+:[ 	]+c0202573[ 	]+rdinstret[ 	]+a0
-[ 	]+[0-9a-f]+:[ 	]+c0259073[ 	]+csrw[ 	]+instret,a1
-[ 	]+[0-9a-f]+:[ 	]+c0302573[ 	]+csrr[ 	]+a0,hpmcounter3
-[ 	]+[0-9a-f]+:[ 	]+c0359073[ 	]+csrw[ 	]+hpmcounter3,a1
-[ 	]+[0-9a-f]+:[ 	]+c0402573[ 	]+csrr[ 	]+a0,hpmcounter4
-[ 	]+[0-9a-f]+:[ 	]+c0459073[ 	]+csrw[ 	]+hpmcounter4,a1
-[ 	]+[0-9a-f]+:[ 	]+c0502573[ 	]+csrr[ 	]+a0,hpmcounter5
-[ 	]+[0-9a-f]+:[ 	]+c0559073[ 	]+csrw[ 	]+hpmcounter5,a1
-[ 	]+[0-9a-f]+:[ 	]+c0602573[ 	]+csrr[ 	]+a0,hpmcounter6
-[ 	]+[0-9a-f]+:[ 	]+c0659073[ 	]+csrw[ 	]+hpmcounter6,a1
-[ 	]+[0-9a-f]+:[ 	]+c0702573[ 	]+csrr[ 	]+a0,hpmcounter7
-[ 	]+[0-9a-f]+:[ 	]+c0759073[ 	]+csrw[ 	]+hpmcounter7,a1
-[ 	]+[0-9a-f]+:[ 	]+c0802573[ 	]+csrr[ 	]+a0,hpmcounter8
-[ 	]+[0-9a-f]+:[ 	]+c0859073[ 	]+csrw[ 	]+hpmcounter8,a1
-[ 	]+[0-9a-f]+:[ 	]+c0902573[ 	]+csrr[ 	]+a0,hpmcounter9
-[ 	]+[0-9a-f]+:[ 	]+c0959073[ 	]+csrw[ 	]+hpmcounter9,a1
-[ 	]+[0-9a-f]+:[ 	]+c0a02573[ 	]+csrr[ 	]+a0,hpmcounter10
-[ 	]+[0-9a-f]+:[ 	]+c0a59073[ 	]+csrw[ 	]+hpmcounter10,a1
-[ 	]+[0-9a-f]+:[ 	]+c0b02573[ 	]+csrr[ 	]+a0,hpmcounter11
-[ 	]+[0-9a-f]+:[ 	]+c0b59073[ 	]+csrw[ 	]+hpmcounter11,a1
-[ 	]+[0-9a-f]+:[ 	]+c0c02573[ 	]+csrr[ 	]+a0,hpmcounter12
-[ 	]+[0-9a-f]+:[ 	]+c0c59073[ 	]+csrw[ 	]+hpmcounter12,a1
-[ 	]+[0-9a-f]+:[ 	]+c0d02573[ 	]+csrr[ 	]+a0,hpmcounter13
-[ 	]+[0-9a-f]+:[ 	]+c0d59073[ 	]+csrw[ 	]+hpmcounter13,a1
-[ 	]+[0-9a-f]+:[ 	]+c0e02573[ 	]+csrr[ 	]+a0,hpmcounter14
-[ 	]+[0-9a-f]+:[ 	]+c0e59073[ 	]+csrw[ 	]+hpmcounter14,a1
-[ 	]+[0-9a-f]+:[ 	]+c0f02573[ 	]+csrr[ 	]+a0,hpmcounter15
-[ 	]+[0-9a-f]+:[ 	]+c0f59073[ 	]+csrw[ 	]+hpmcounter15,a1
-[ 	]+[0-9a-f]+:[ 	]+c1002573[ 	]+csrr[ 	]+a0,hpmcounter16
-[ 	]+[0-9a-f]+:[ 	]+c1059073[ 	]+csrw[ 	]+hpmcounter16,a1
-[ 	]+[0-9a-f]+:[ 	]+c1102573[ 	]+csrr[ 	]+a0,hpmcounter17
-[ 	]+[0-9a-f]+:[ 	]+c1159073[ 	]+csrw[ 	]+hpmcounter17,a1
-[ 	]+[0-9a-f]+:[ 	]+c1202573[ 	]+csrr[ 	]+a0,hpmcounter18
-[ 	]+[0-9a-f]+:[ 	]+c1259073[ 	]+csrw[ 	]+hpmcounter18,a1
-[ 	]+[0-9a-f]+:[ 	]+c1302573[ 	]+csrr[ 	]+a0,hpmcounter19
-[ 	]+[0-9a-f]+:[ 	]+c1359073[ 	]+csrw[ 	]+hpmcounter19,a1
-[ 	]+[0-9a-f]+:[ 	]+c1402573[ 	]+csrr[ 	]+a0,hpmcounter20
-[ 	]+[0-9a-f]+:[ 	]+c1459073[ 	]+csrw[ 	]+hpmcounter20,a1
-[ 	]+[0-9a-f]+:[ 	]+c1502573[ 	]+csrr[ 	]+a0,hpmcounter21
-[ 	]+[0-9a-f]+:[ 	]+c1559073[ 	]+csrw[ 	]+hpmcounter21,a1
-[ 	]+[0-9a-f]+:[ 	]+c1602573[ 	]+csrr[ 	]+a0,hpmcounter22
-[ 	]+[0-9a-f]+:[ 	]+c1659073[ 	]+csrw[ 	]+hpmcounter22,a1
-[ 	]+[0-9a-f]+:[ 	]+c1702573[ 	]+csrr[ 	]+a0,hpmcounter23
-[ 	]+[0-9a-f]+:[ 	]+c1759073[ 	]+csrw[ 	]+hpmcounter23,a1
-[ 	]+[0-9a-f]+:[ 	]+c1802573[ 	]+csrr[ 	]+a0,hpmcounter24
-[ 	]+[0-9a-f]+:[ 	]+c1859073[ 	]+csrw[ 	]+hpmcounter24,a1
-[ 	]+[0-9a-f]+:[ 	]+c1902573[ 	]+csrr[ 	]+a0,hpmcounter25
-[ 	]+[0-9a-f]+:[ 	]+c1959073[ 	]+csrw[ 	]+hpmcounter25,a1
-[ 	]+[0-9a-f]+:[ 	]+c1a02573[ 	]+csrr[ 	]+a0,hpmcounter26
-[ 	]+[0-9a-f]+:[ 	]+c1a59073[ 	]+csrw[ 	]+hpmcounter26,a1
-[ 	]+[0-9a-f]+:[ 	]+c1b02573[ 	]+csrr[ 	]+a0,hpmcounter27
-[ 	]+[0-9a-f]+:[ 	]+c1b59073[ 	]+csrw[ 	]+hpmcounter27,a1
-[ 	]+[0-9a-f]+:[ 	]+c1c02573[ 	]+csrr[ 	]+a0,hpmcounter28
-[ 	]+[0-9a-f]+:[ 	]+c1c59073[ 	]+csrw[ 	]+hpmcounter28,a1
-[ 	]+[0-9a-f]+:[ 	]+c1d02573[ 	]+csrr[ 	]+a0,hpmcounter29
-[ 	]+[0-9a-f]+:[ 	]+c1d59073[ 	]+csrw[ 	]+hpmcounter29,a1
-[ 	]+[0-9a-f]+:[ 	]+c1e02573[ 	]+csrr[ 	]+a0,hpmcounter30
-[ 	]+[0-9a-f]+:[ 	]+c1e59073[ 	]+csrw[ 	]+hpmcounter30,a1
-[ 	]+[0-9a-f]+:[ 	]+c1f02573[ 	]+csrr[ 	]+a0,hpmcounter31
-[ 	]+[0-9a-f]+:[ 	]+c1f59073[ 	]+csrw[ 	]+hpmcounter31,a1
-[ 	]+[0-9a-f]+:[ 	]+c8002573[ 	]+csrr[ 	]+a0,cycleh
-[ 	]+[0-9a-f]+:[ 	]+c8059073[ 	]+csrw[ 	]+cycleh,a1
-[ 	]+[0-9a-f]+:[ 	]+c8102573[ 	]+csrr[ 	]+a0,timeh
-[ 	]+[0-9a-f]+:[ 	]+c8159073[ 	]+csrw[ 	]+timeh,a1
-[ 	]+[0-9a-f]+:[ 	]+c8202573[ 	]+csrr[ 	]+a0,instreth
-[ 	]+[0-9a-f]+:[ 	]+c8259073[ 	]+csrw[ 	]+instreth,a1
-[ 	]+[0-9a-f]+:[ 	]+c8302573[ 	]+csrr[ 	]+a0,hpmcounter3h
-[ 	]+[0-9a-f]+:[ 	]+c8359073[ 	]+csrw[ 	]+hpmcounter3h,a1
-[ 	]+[0-9a-f]+:[ 	]+c8402573[ 	]+csrr[ 	]+a0,hpmcounter4h
-[ 	]+[0-9a-f]+:[ 	]+c8459073[ 	]+csrw[ 	]+hpmcounter4h,a1
-[ 	]+[0-9a-f]+:[ 	]+c8502573[ 	]+csrr[ 	]+a0,hpmcounter5h
-[ 	]+[0-9a-f]+:[ 	]+c8559073[ 	]+csrw[ 	]+hpmcounter5h,a1
-[ 	]+[0-9a-f]+:[ 	]+c8602573[ 	]+csrr[ 	]+a0,hpmcounter6h
-[ 	]+[0-9a-f]+:[ 	]+c8659073[ 	]+csrw[ 	]+hpmcounter6h,a1
-[ 	]+[0-9a-f]+:[ 	]+c8702573[ 	]+csrr[ 	]+a0,hpmcounter7h
-[ 	]+[0-9a-f]+:[ 	]+c8759073[ 	]+csrw[ 	]+hpmcounter7h,a1
-[ 	]+[0-9a-f]+:[ 	]+c8802573[ 	]+csrr[ 	]+a0,hpmcounter8h
-[ 	]+[0-9a-f]+:[ 	]+c8859073[ 	]+csrw[ 	]+hpmcounter8h,a1
-[ 	]+[0-9a-f]+:[ 	]+c8902573[ 	]+csrr[ 	]+a0,hpmcounter9h
-[ 	]+[0-9a-f]+:[ 	]+c8959073[ 	]+csrw[ 	]+hpmcounter9h,a1
-[ 	]+[0-9a-f]+:[ 	]+c8a02573[ 	]+csrr[ 	]+a0,hpmcounter10h
-[ 	]+[0-9a-f]+:[ 	]+c8a59073[ 	]+csrw[ 	]+hpmcounter10h,a1
-[ 	]+[0-9a-f]+:[ 	]+c8b02573[ 	]+csrr[ 	]+a0,hpmcounter11h
-[ 	]+[0-9a-f]+:[ 	]+c8b59073[ 	]+csrw[ 	]+hpmcounter11h,a1
-[ 	]+[0-9a-f]+:[ 	]+c8c02573[ 	]+csrr[ 	]+a0,hpmcounter12h
-[ 	]+[0-9a-f]+:[ 	]+c8c59073[ 	]+csrw[ 	]+hpmcounter12h,a1
-[ 	]+[0-9a-f]+:[ 	]+c8d02573[ 	]+csrr[ 	]+a0,hpmcounter13h
-[ 	]+[0-9a-f]+:[ 	]+c8d59073[ 	]+csrw[ 	]+hpmcounter13h,a1
-[ 	]+[0-9a-f]+:[ 	]+c8e02573[ 	]+csrr[ 	]+a0,hpmcounter14h
-[ 	]+[0-9a-f]+:[ 	]+c8e59073[ 	]+csrw[ 	]+hpmcounter14h,a1
-[ 	]+[0-9a-f]+:[ 	]+c8f02573[ 	]+csrr[ 	]+a0,hpmcounter15h
-[ 	]+[0-9a-f]+:[ 	]+c8f59073[ 	]+csrw[ 	]+hpmcounter15h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9002573[ 	]+csrr[ 	]+a0,hpmcounter16h
-[ 	]+[0-9a-f]+:[ 	]+c9059073[ 	]+csrw[ 	]+hpmcounter16h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9102573[ 	]+csrr[ 	]+a0,hpmcounter17h
-[ 	]+[0-9a-f]+:[ 	]+c9159073[ 	]+csrw[ 	]+hpmcounter17h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9202573[ 	]+csrr[ 	]+a0,hpmcounter18h
-[ 	]+[0-9a-f]+:[ 	]+c9259073[ 	]+csrw[ 	]+hpmcounter18h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9302573[ 	]+csrr[ 	]+a0,hpmcounter19h
-[ 	]+[0-9a-f]+:[ 	]+c9359073[ 	]+csrw[ 	]+hpmcounter19h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9402573[ 	]+csrr[ 	]+a0,hpmcounter20h
-[ 	]+[0-9a-f]+:[ 	]+c9459073[ 	]+csrw[ 	]+hpmcounter20h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9502573[ 	]+csrr[ 	]+a0,hpmcounter21h
-[ 	]+[0-9a-f]+:[ 	]+c9559073[ 	]+csrw[ 	]+hpmcounter21h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9602573[ 	]+csrr[ 	]+a0,hpmcounter22h
-[ 	]+[0-9a-f]+:[ 	]+c9659073[ 	]+csrw[ 	]+hpmcounter22h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9702573[ 	]+csrr[ 	]+a0,hpmcounter23h
-[ 	]+[0-9a-f]+:[ 	]+c9759073[ 	]+csrw[ 	]+hpmcounter23h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9802573[ 	]+csrr[ 	]+a0,hpmcounter24h
-[ 	]+[0-9a-f]+:[ 	]+c9859073[ 	]+csrw[ 	]+hpmcounter24h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9902573[ 	]+csrr[ 	]+a0,hpmcounter25h
-[ 	]+[0-9a-f]+:[ 	]+c9959073[ 	]+csrw[ 	]+hpmcounter25h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9a02573[ 	]+csrr[ 	]+a0,hpmcounter26h
-[ 	]+[0-9a-f]+:[ 	]+c9a59073[ 	]+csrw[ 	]+hpmcounter26h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9b02573[ 	]+csrr[ 	]+a0,hpmcounter27h
-[ 	]+[0-9a-f]+:[ 	]+c9b59073[ 	]+csrw[ 	]+hpmcounter27h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9c02573[ 	]+csrr[ 	]+a0,hpmcounter28h
-[ 	]+[0-9a-f]+:[ 	]+c9c59073[ 	]+csrw[ 	]+hpmcounter28h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9d02573[ 	]+csrr[ 	]+a0,hpmcounter29h
-[ 	]+[0-9a-f]+:[ 	]+c9d59073[ 	]+csrw[ 	]+hpmcounter29h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9e02573[ 	]+csrr[ 	]+a0,hpmcounter30h
-[ 	]+[0-9a-f]+:[ 	]+c9e59073[ 	]+csrw[ 	]+hpmcounter30h,a1
-[ 	]+[0-9a-f]+:[ 	]+c9f02573[ 	]+csrr[ 	]+a0,hpmcounter31h
-[ 	]+[0-9a-f]+:[ 	]+c9f59073[ 	]+csrw[ 	]+hpmcounter31h,a1
-[ 	]+[0-9a-f]+:[ 	]+10002573[ 	]+csrr[ 	]+a0,sstatus
-[ 	]+[0-9a-f]+:[ 	]+10059073[ 	]+csrw[ 	]+sstatus,a1
-[ 	]+[0-9a-f]+:[ 	]+10402573[ 	]+csrr[ 	]+a0,sie
-[ 	]+[0-9a-f]+:[ 	]+10459073[ 	]+csrw[ 	]+sie,a1
-[ 	]+[0-9a-f]+:[ 	]+10502573[ 	]+csrr[ 	]+a0,stvec
-[ 	]+[0-9a-f]+:[ 	]+10559073[ 	]+csrw[ 	]+stvec,a1
-[ 	]+[0-9a-f]+:[ 	]+10602573[ 	]+csrr[ 	]+a0,0x106
-[ 	]+[0-9a-f]+:[ 	]+10659073[ 	]+csrw[ 	]+0x106,a1
-[ 	]+[0-9a-f]+:[ 	]+10a02573[ 	]+csrr[ 	]+a0,0x10a
-[ 	]+[0-9a-f]+:[ 	]+10a59073[ 	]+csrw[ 	]+0x10a,a1
-[ 	]+[0-9a-f]+:[ 	]+14002573[ 	]+csrr[ 	]+a0,sscratch
-[ 	]+[0-9a-f]+:[ 	]+14059073[ 	]+csrw[ 	]+sscratch,a1
-[ 	]+[0-9a-f]+:[ 	]+14102573[ 	]+csrr[ 	]+a0,sepc
-[ 	]+[0-9a-f]+:[ 	]+14159073[ 	]+csrw[ 	]+sepc,a1
-[ 	]+[0-9a-f]+:[ 	]+14202573[ 	]+csrr[ 	]+a0,scause
-[ 	]+[0-9a-f]+:[ 	]+14259073[ 	]+csrw[ 	]+scause,a1
-[ 	]+[0-9a-f]+:[ 	]+14302573[ 	]+csrr[ 	]+a0,sbadaddr
-[ 	]+[0-9a-f]+:[ 	]+14359073[ 	]+csrw[ 	]+sbadaddr,a1
-[ 	]+[0-9a-f]+:[ 	]+14402573[ 	]+csrr[ 	]+a0,sip
-[ 	]+[0-9a-f]+:[ 	]+14459073[ 	]+csrw[ 	]+sip,a1
-[ 	]+[0-9a-f]+:[ 	]+18002573[ 	]+csrr[ 	]+a0,sptbr
-[ 	]+[0-9a-f]+:[ 	]+18059073[ 	]+csrw[ 	]+sptbr,a1
-[ 	]+[0-9a-f]+:[ 	]+f1102573[ 	]+csrr[ 	]+a0,mvendorid
-[ 	]+[0-9a-f]+:[ 	]+f1159073[ 	]+csrw[ 	]+mvendorid,a1
-[ 	]+[0-9a-f]+:[ 	]+f1202573[ 	]+csrr[ 	]+a0,marchid
-[ 	]+[0-9a-f]+:[ 	]+f1259073[ 	]+csrw[ 	]+marchid,a1
-[ 	]+[0-9a-f]+:[ 	]+f1302573[ 	]+csrr[ 	]+a0,mimpid
-[ 	]+[0-9a-f]+:[ 	]+f1359073[ 	]+csrw[ 	]+mimpid,a1
-[ 	]+[0-9a-f]+:[ 	]+f1402573[ 	]+csrr[ 	]+a0,mhartid
-[ 	]+[0-9a-f]+:[ 	]+f1459073[ 	]+csrw[ 	]+mhartid,a1
-[ 	]+[0-9a-f]+:[ 	]+f1502573[ 	]+csrr[ 	]+a0,0xf15
-[ 	]+[0-9a-f]+:[ 	]+f1559073[ 	]+csrw[ 	]+0xf15,a1
-[ 	]+[0-9a-f]+:[ 	]+30002573[ 	]+csrr[ 	]+a0,mstatus
-[ 	]+[0-9a-f]+:[ 	]+30059073[ 	]+csrw[ 	]+mstatus,a1
-[ 	]+[0-9a-f]+:[ 	]+30102573[ 	]+csrr[ 	]+a0,misa
-[ 	]+[0-9a-f]+:[ 	]+30159073[ 	]+csrw[ 	]+misa,a1
-[ 	]+[0-9a-f]+:[ 	]+30202573[ 	]+csrr[ 	]+a0,medeleg
-[ 	]+[0-9a-f]+:[ 	]+30259073[ 	]+csrw[ 	]+medeleg,a1
-[ 	]+[0-9a-f]+:[ 	]+30302573[ 	]+csrr[ 	]+a0,mideleg
-[ 	]+[0-9a-f]+:[ 	]+30359073[ 	]+csrw[ 	]+mideleg,a1
-[ 	]+[0-9a-f]+:[ 	]+30402573[ 	]+csrr[ 	]+a0,mie
-[ 	]+[0-9a-f]+:[ 	]+30459073[ 	]+csrw[ 	]+mie,a1
-[ 	]+[0-9a-f]+:[ 	]+30502573[ 	]+csrr[ 	]+a0,mtvec
-[ 	]+[0-9a-f]+:[ 	]+30559073[ 	]+csrw[ 	]+mtvec,a1
-[ 	]+[0-9a-f]+:[ 	]+30602573[ 	]+csrr[ 	]+a0,0x306
-[ 	]+[0-9a-f]+:[ 	]+30659073[ 	]+csrw[ 	]+0x306,a1
-[ 	]+[0-9a-f]+:[ 	]+31002573[ 	]+csrr[ 	]+a0,0x310
-[ 	]+[0-9a-f]+:[ 	]+31059073[ 	]+csrw[ 	]+0x310,a1
-[ 	]+[0-9a-f]+:[ 	]+34002573[ 	]+csrr[ 	]+a0,mscratch
-[ 	]+[0-9a-f]+:[ 	]+34059073[ 	]+csrw[ 	]+mscratch,a1
-[ 	]+[0-9a-f]+:[ 	]+34102573[ 	]+csrr[ 	]+a0,mepc
-[ 	]+[0-9a-f]+:[ 	]+34159073[ 	]+csrw[ 	]+mepc,a1
-[ 	]+[0-9a-f]+:[ 	]+34202573[ 	]+csrr[ 	]+a0,mcause
-[ 	]+[0-9a-f]+:[ 	]+34259073[ 	]+csrw[ 	]+mcause,a1
-[ 	]+[0-9a-f]+:[ 	]+34302573[ 	]+csrr[ 	]+a0,mbadaddr
-[ 	]+[0-9a-f]+:[ 	]+34359073[ 	]+csrw[ 	]+mbadaddr,a1
-[ 	]+[0-9a-f]+:[ 	]+34402573[ 	]+csrr[ 	]+a0,mip
-[ 	]+[0-9a-f]+:[ 	]+34459073[ 	]+csrw[ 	]+mip,a1
-[ 	]+[0-9a-f]+:[ 	]+34a02573[ 	]+csrr[ 	]+a0,0x34a
-[ 	]+[0-9a-f]+:[ 	]+34a59073[ 	]+csrw[ 	]+0x34a,a1
-[ 	]+[0-9a-f]+:[ 	]+34b02573[ 	]+csrr[ 	]+a0,0x34b
-[ 	]+[0-9a-f]+:[ 	]+34b59073[ 	]+csrw[ 	]+0x34b,a1
-[ 	]+[0-9a-f]+:[ 	]+30a02573[ 	]+csrr[ 	]+a0,0x30a
-[ 	]+[0-9a-f]+:[ 	]+30a59073[ 	]+csrw[ 	]+0x30a,a1
-[ 	]+[0-9a-f]+:[ 	]+31a02573[ 	]+csrr[ 	]+a0,0x31a
-[ 	]+[0-9a-f]+:[ 	]+31a59073[ 	]+csrw[ 	]+0x31a,a1
-[ 	]+[0-9a-f]+:[ 	]+74702573[ 	]+csrr[ 	]+a0,0x747
-[ 	]+[0-9a-f]+:[ 	]+74759073[ 	]+csrw[ 	]+0x747,a1
-[ 	]+[0-9a-f]+:[ 	]+75702573[ 	]+csrr[ 	]+a0,0x757
-[ 	]+[0-9a-f]+:[ 	]+75759073[ 	]+csrw[ 	]+0x757,a1
-[ 	]+[0-9a-f]+:[ 	]+3a002573[ 	]+csrr[ 	]+a0,0x3a0
-[ 	]+[0-9a-f]+:[ 	]+3a059073[ 	]+csrw[ 	]+0x3a0,a1
-[ 	]+[0-9a-f]+:[ 	]+3a102573[ 	]+csrr[ 	]+a0,0x3a1
-[ 	]+[0-9a-f]+:[ 	]+3a159073[ 	]+csrw[ 	]+0x3a1,a1
-[ 	]+[0-9a-f]+:[ 	]+3a202573[ 	]+csrr[ 	]+a0,0x3a2
-[ 	]+[0-9a-f]+:[ 	]+3a259073[ 	]+csrw[ 	]+0x3a2,a1
-[ 	]+[0-9a-f]+:[ 	]+3a302573[ 	]+csrr[ 	]+a0,0x3a3
-[ 	]+[0-9a-f]+:[ 	]+3a359073[ 	]+csrw[ 	]+0x3a3,a1
-[ 	]+[0-9a-f]+:[ 	]+3a402573[ 	]+csrr[ 	]+a0,0x3a4
-[ 	]+[0-9a-f]+:[ 	]+3a459073[ 	]+csrw[ 	]+0x3a4,a1
-[ 	]+[0-9a-f]+:[ 	]+3a502573[ 	]+csrr[ 	]+a0,0x3a5
-[ 	]+[0-9a-f]+:[ 	]+3a559073[ 	]+csrw[ 	]+0x3a5,a1
-[ 	]+[0-9a-f]+:[ 	]+3a602573[ 	]+csrr[ 	]+a0,0x3a6
-[ 	]+[0-9a-f]+:[ 	]+3a659073[ 	]+csrw[ 	]+0x3a6,a1
-[ 	]+[0-9a-f]+:[ 	]+3a702573[ 	]+csrr[ 	]+a0,0x3a7
-[ 	]+[0-9a-f]+:[ 	]+3a759073[ 	]+csrw[ 	]+0x3a7,a1
-[ 	]+[0-9a-f]+:[ 	]+3a802573[ 	]+csrr[ 	]+a0,0x3a8
-[ 	]+[0-9a-f]+:[ 	]+3a859073[ 	]+csrw[ 	]+0x3a8,a1
-[ 	]+[0-9a-f]+:[ 	]+3a902573[ 	]+csrr[ 	]+a0,0x3a9
-[ 	]+[0-9a-f]+:[ 	]+3a959073[ 	]+csrw[ 	]+0x3a9,a1
-[ 	]+[0-9a-f]+:[ 	]+3aa02573[ 	]+csrr[ 	]+a0,0x3aa
-[ 	]+[0-9a-f]+:[ 	]+3aa59073[ 	]+csrw[ 	]+0x3aa,a1
-[ 	]+[0-9a-f]+:[ 	]+3ab02573[ 	]+csrr[ 	]+a0,0x3ab
-[ 	]+[0-9a-f]+:[ 	]+3ab59073[ 	]+csrw[ 	]+0x3ab,a1
-[ 	]+[0-9a-f]+:[ 	]+3ac02573[ 	]+csrr[ 	]+a0,0x3ac
-[ 	]+[0-9a-f]+:[ 	]+3ac59073[ 	]+csrw[ 	]+0x3ac,a1
-[ 	]+[0-9a-f]+:[ 	]+3ad02573[ 	]+csrr[ 	]+a0,0x3ad
-[ 	]+[0-9a-f]+:[ 	]+3ad59073[ 	]+csrw[ 	]+0x3ad,a1
-[ 	]+[0-9a-f]+:[ 	]+3ae02573[ 	]+csrr[ 	]+a0,0x3ae
-[ 	]+[0-9a-f]+:[ 	]+3ae59073[ 	]+csrw[ 	]+0x3ae,a1
-[ 	]+[0-9a-f]+:[ 	]+3af02573[ 	]+csrr[ 	]+a0,0x3af
-[ 	]+[0-9a-f]+:[ 	]+3af59073[ 	]+csrw[ 	]+0x3af,a1
-[ 	]+[0-9a-f]+:[ 	]+3b002573[ 	]+csrr[ 	]+a0,0x3b0
-[ 	]+[0-9a-f]+:[ 	]+3b059073[ 	]+csrw[ 	]+0x3b0,a1
-[ 	]+[0-9a-f]+:[ 	]+3b102573[ 	]+csrr[ 	]+a0,0x3b1
-[ 	]+[0-9a-f]+:[ 	]+3b159073[ 	]+csrw[ 	]+0x3b1,a1
-[ 	]+[0-9a-f]+:[ 	]+3b202573[ 	]+csrr[ 	]+a0,0x3b2
-[ 	]+[0-9a-f]+:[ 	]+3b259073[ 	]+csrw[ 	]+0x3b2,a1
-[ 	]+[0-9a-f]+:[ 	]+3b302573[ 	]+csrr[ 	]+a0,0x3b3
-[ 	]+[0-9a-f]+:[ 	]+3b359073[ 	]+csrw[ 	]+0x3b3,a1
-[ 	]+[0-9a-f]+:[ 	]+3b402573[ 	]+csrr[ 	]+a0,0x3b4
-[ 	]+[0-9a-f]+:[ 	]+3b459073[ 	]+csrw[ 	]+0x3b4,a1
-[ 	]+[0-9a-f]+:[ 	]+3b502573[ 	]+csrr[ 	]+a0,0x3b5
-[ 	]+[0-9a-f]+:[ 	]+3b559073[ 	]+csrw[ 	]+0x3b5,a1
-[ 	]+[0-9a-f]+:[ 	]+3b602573[ 	]+csrr[ 	]+a0,0x3b6
-[ 	]+[0-9a-f]+:[ 	]+3b659073[ 	]+csrw[ 	]+0x3b6,a1
-[ 	]+[0-9a-f]+:[ 	]+3b702573[ 	]+csrr[ 	]+a0,0x3b7
-[ 	]+[0-9a-f]+:[ 	]+3b759073[ 	]+csrw[ 	]+0x3b7,a1
-[ 	]+[0-9a-f]+:[ 	]+3b802573[ 	]+csrr[ 	]+a0,0x3b8
-[ 	]+[0-9a-f]+:[ 	]+3b859073[ 	]+csrw[ 	]+0x3b8,a1
-[ 	]+[0-9a-f]+:[ 	]+3b902573[ 	]+csrr[ 	]+a0,0x3b9
-[ 	]+[0-9a-f]+:[ 	]+3b959073[ 	]+csrw[ 	]+0x3b9,a1
-[ 	]+[0-9a-f]+:[ 	]+3ba02573[ 	]+csrr[ 	]+a0,0x3ba
-[ 	]+[0-9a-f]+:[ 	]+3ba59073[ 	]+csrw[ 	]+0x3ba,a1
-[ 	]+[0-9a-f]+:[ 	]+3bb02573[ 	]+csrr[ 	]+a0,0x3bb
-[ 	]+[0-9a-f]+:[ 	]+3bb59073[ 	]+csrw[ 	]+0x3bb,a1
-[ 	]+[0-9a-f]+:[ 	]+3bc02573[ 	]+csrr[ 	]+a0,0x3bc
-[ 	]+[0-9a-f]+:[ 	]+3bc59073[ 	]+csrw[ 	]+0x3bc,a1
-[ 	]+[0-9a-f]+:[ 	]+3bd02573[ 	]+csrr[ 	]+a0,0x3bd
-[ 	]+[0-9a-f]+:[ 	]+3bd59073[ 	]+csrw[ 	]+0x3bd,a1
-[ 	]+[0-9a-f]+:[ 	]+3be02573[ 	]+csrr[ 	]+a0,0x3be
-[ 	]+[0-9a-f]+:[ 	]+3be59073[ 	]+csrw[ 	]+0x3be,a1
-[ 	]+[0-9a-f]+:[ 	]+3bf02573[ 	]+csrr[ 	]+a0,0x3bf
-[ 	]+[0-9a-f]+:[ 	]+3bf59073[ 	]+csrw[ 	]+0x3bf,a1
-[ 	]+[0-9a-f]+:[ 	]+3c002573[ 	]+csrr[ 	]+a0,0x3c0
-[ 	]+[0-9a-f]+:[ 	]+3c059073[ 	]+csrw[ 	]+0x3c0,a1
-[ 	]+[0-9a-f]+:[ 	]+3c102573[ 	]+csrr[ 	]+a0,0x3c1
-[ 	]+[0-9a-f]+:[ 	]+3c159073[ 	]+csrw[ 	]+0x3c1,a1
-[ 	]+[0-9a-f]+:[ 	]+3c202573[ 	]+csrr[ 	]+a0,0x3c2
-[ 	]+[0-9a-f]+:[ 	]+3c259073[ 	]+csrw[ 	]+0x3c2,a1
-[ 	]+[0-9a-f]+:[ 	]+3c302573[ 	]+csrr[ 	]+a0,0x3c3
-[ 	]+[0-9a-f]+:[ 	]+3c359073[ 	]+csrw[ 	]+0x3c3,a1
-[ 	]+[0-9a-f]+:[ 	]+3c402573[ 	]+csrr[ 	]+a0,0x3c4
-[ 	]+[0-9a-f]+:[ 	]+3c459073[ 	]+csrw[ 	]+0x3c4,a1
-[ 	]+[0-9a-f]+:[ 	]+3c502573[ 	]+csrr[ 	]+a0,0x3c5
-[ 	]+[0-9a-f]+:[ 	]+3c559073[ 	]+csrw[ 	]+0x3c5,a1
-[ 	]+[0-9a-f]+:[ 	]+3c602573[ 	]+csrr[ 	]+a0,0x3c6
-[ 	]+[0-9a-f]+:[ 	]+3c659073[ 	]+csrw[ 	]+0x3c6,a1
-[ 	]+[0-9a-f]+:[ 	]+3c702573[ 	]+csrr[ 	]+a0,0x3c7
-[ 	]+[0-9a-f]+:[ 	]+3c759073[ 	]+csrw[ 	]+0x3c7,a1
-[ 	]+[0-9a-f]+:[ 	]+3c802573[ 	]+csrr[ 	]+a0,0x3c8
-[ 	]+[0-9a-f]+:[ 	]+3c859073[ 	]+csrw[ 	]+0x3c8,a1
-[ 	]+[0-9a-f]+:[ 	]+3c902573[ 	]+csrr[ 	]+a0,0x3c9
-[ 	]+[0-9a-f]+:[ 	]+3c959073[ 	]+csrw[ 	]+0x3c9,a1
-[ 	]+[0-9a-f]+:[ 	]+3ca02573[ 	]+csrr[ 	]+a0,0x3ca
-[ 	]+[0-9a-f]+:[ 	]+3ca59073[ 	]+csrw[ 	]+0x3ca,a1
-[ 	]+[0-9a-f]+:[ 	]+3cb02573[ 	]+csrr[ 	]+a0,0x3cb
-[ 	]+[0-9a-f]+:[ 	]+3cb59073[ 	]+csrw[ 	]+0x3cb,a1
-[ 	]+[0-9a-f]+:[ 	]+3cc02573[ 	]+csrr[ 	]+a0,0x3cc
-[ 	]+[0-9a-f]+:[ 	]+3cc59073[ 	]+csrw[ 	]+0x3cc,a1
-[ 	]+[0-9a-f]+:[ 	]+3cd02573[ 	]+csrr[ 	]+a0,0x3cd
-[ 	]+[0-9a-f]+:[ 	]+3cd59073[ 	]+csrw[ 	]+0x3cd,a1
-[ 	]+[0-9a-f]+:[ 	]+3ce02573[ 	]+csrr[ 	]+a0,0x3ce
-[ 	]+[0-9a-f]+:[ 	]+3ce59073[ 	]+csrw[ 	]+0x3ce,a1
-[ 	]+[0-9a-f]+:[ 	]+3cf02573[ 	]+csrr[ 	]+a0,0x3cf
-[ 	]+[0-9a-f]+:[ 	]+3cf59073[ 	]+csrw[ 	]+0x3cf,a1
-[ 	]+[0-9a-f]+:[ 	]+3d002573[ 	]+csrr[ 	]+a0,0x3d0
-[ 	]+[0-9a-f]+:[ 	]+3d059073[ 	]+csrw[ 	]+0x3d0,a1
-[ 	]+[0-9a-f]+:[ 	]+3d102573[ 	]+csrr[ 	]+a0,0x3d1
-[ 	]+[0-9a-f]+:[ 	]+3d159073[ 	]+csrw[ 	]+0x3d1,a1
-[ 	]+[0-9a-f]+:[ 	]+3d202573[ 	]+csrr[ 	]+a0,0x3d2
-[ 	]+[0-9a-f]+:[ 	]+3d259073[ 	]+csrw[ 	]+0x3d2,a1
-[ 	]+[0-9a-f]+:[ 	]+3d302573[ 	]+csrr[ 	]+a0,0x3d3
-[ 	]+[0-9a-f]+:[ 	]+3d359073[ 	]+csrw[ 	]+0x3d3,a1
-[ 	]+[0-9a-f]+:[ 	]+3d402573[ 	]+csrr[ 	]+a0,0x3d4
-[ 	]+[0-9a-f]+:[ 	]+3d459073[ 	]+csrw[ 	]+0x3d4,a1
-[ 	]+[0-9a-f]+:[ 	]+3d502573[ 	]+csrr[ 	]+a0,0x3d5
-[ 	]+[0-9a-f]+:[ 	]+3d559073[ 	]+csrw[ 	]+0x3d5,a1
-[ 	]+[0-9a-f]+:[ 	]+3d602573[ 	]+csrr[ 	]+a0,0x3d6
-[ 	]+[0-9a-f]+:[ 	]+3d659073[ 	]+csrw[ 	]+0x3d6,a1
-[ 	]+[0-9a-f]+:[ 	]+3d702573[ 	]+csrr[ 	]+a0,0x3d7
-[ 	]+[0-9a-f]+:[ 	]+3d759073[ 	]+csrw[ 	]+0x3d7,a1
-[ 	]+[0-9a-f]+:[ 	]+3d802573[ 	]+csrr[ 	]+a0,0x3d8
-[ 	]+[0-9a-f]+:[ 	]+3d859073[ 	]+csrw[ 	]+0x3d8,a1
-[ 	]+[0-9a-f]+:[ 	]+3d902573[ 	]+csrr[ 	]+a0,0x3d9
-[ 	]+[0-9a-f]+:[ 	]+3d959073[ 	]+csrw[ 	]+0x3d9,a1
-[ 	]+[0-9a-f]+:[ 	]+3da02573[ 	]+csrr[ 	]+a0,0x3da
-[ 	]+[0-9a-f]+:[ 	]+3da59073[ 	]+csrw[ 	]+0x3da,a1
-[ 	]+[0-9a-f]+:[ 	]+3db02573[ 	]+csrr[ 	]+a0,0x3db
-[ 	]+[0-9a-f]+:[ 	]+3db59073[ 	]+csrw[ 	]+0x3db,a1
-[ 	]+[0-9a-f]+:[ 	]+3dc02573[ 	]+csrr[ 	]+a0,0x3dc
-[ 	]+[0-9a-f]+:[ 	]+3dc59073[ 	]+csrw[ 	]+0x3dc,a1
-[ 	]+[0-9a-f]+:[ 	]+3dd02573[ 	]+csrr[ 	]+a0,0x3dd
-[ 	]+[0-9a-f]+:[ 	]+3dd59073[ 	]+csrw[ 	]+0x3dd,a1
-[ 	]+[0-9a-f]+:[ 	]+3de02573[ 	]+csrr[ 	]+a0,0x3de
-[ 	]+[0-9a-f]+:[ 	]+3de59073[ 	]+csrw[ 	]+0x3de,a1
-[ 	]+[0-9a-f]+:[ 	]+3df02573[ 	]+csrr[ 	]+a0,0x3df
-[ 	]+[0-9a-f]+:[ 	]+3df59073[ 	]+csrw[ 	]+0x3df,a1
-[ 	]+[0-9a-f]+:[ 	]+3e002573[ 	]+csrr[ 	]+a0,0x3e0
-[ 	]+[0-9a-f]+:[ 	]+3e059073[ 	]+csrw[ 	]+0x3e0,a1
-[ 	]+[0-9a-f]+:[ 	]+3e102573[ 	]+csrr[ 	]+a0,0x3e1
-[ 	]+[0-9a-f]+:[ 	]+3e159073[ 	]+csrw[ 	]+0x3e1,a1
-[ 	]+[0-9a-f]+:[ 	]+3e202573[ 	]+csrr[ 	]+a0,0x3e2
-[ 	]+[0-9a-f]+:[ 	]+3e259073[ 	]+csrw[ 	]+0x3e2,a1
-[ 	]+[0-9a-f]+:[ 	]+3e302573[ 	]+csrr[ 	]+a0,0x3e3
-[ 	]+[0-9a-f]+:[ 	]+3e359073[ 	]+csrw[ 	]+0x3e3,a1
-[ 	]+[0-9a-f]+:[ 	]+3e402573[ 	]+csrr[ 	]+a0,0x3e4
-[ 	]+[0-9a-f]+:[ 	]+3e459073[ 	]+csrw[ 	]+0x3e4,a1
-[ 	]+[0-9a-f]+:[ 	]+3e502573[ 	]+csrr[ 	]+a0,0x3e5
-[ 	]+[0-9a-f]+:[ 	]+3e559073[ 	]+csrw[ 	]+0x3e5,a1
-[ 	]+[0-9a-f]+:[ 	]+3e602573[ 	]+csrr[ 	]+a0,0x3e6
-[ 	]+[0-9a-f]+:[ 	]+3e659073[ 	]+csrw[ 	]+0x3e6,a1
-[ 	]+[0-9a-f]+:[ 	]+3e702573[ 	]+csrr[ 	]+a0,0x3e7
-[ 	]+[0-9a-f]+:[ 	]+3e759073[ 	]+csrw[ 	]+0x3e7,a1
-[ 	]+[0-9a-f]+:[ 	]+3e802573[ 	]+csrr[ 	]+a0,0x3e8
-[ 	]+[0-9a-f]+:[ 	]+3e859073[ 	]+csrw[ 	]+0x3e8,a1
-[ 	]+[0-9a-f]+:[ 	]+3e902573[ 	]+csrr[ 	]+a0,0x3e9
-[ 	]+[0-9a-f]+:[ 	]+3e959073[ 	]+csrw[ 	]+0x3e9,a1
-[ 	]+[0-9a-f]+:[ 	]+3ea02573[ 	]+csrr[ 	]+a0,0x3ea
-[ 	]+[0-9a-f]+:[ 	]+3ea59073[ 	]+csrw[ 	]+0x3ea,a1
-[ 	]+[0-9a-f]+:[ 	]+3eb02573[ 	]+csrr[ 	]+a0,0x3eb
-[ 	]+[0-9a-f]+:[ 	]+3eb59073[ 	]+csrw[ 	]+0x3eb,a1
-[ 	]+[0-9a-f]+:[ 	]+3ec02573[ 	]+csrr[ 	]+a0,0x3ec
-[ 	]+[0-9a-f]+:[ 	]+3ec59073[ 	]+csrw[ 	]+0x3ec,a1
-[ 	]+[0-9a-f]+:[ 	]+3ed02573[ 	]+csrr[ 	]+a0,0x3ed
-[ 	]+[0-9a-f]+:[ 	]+3ed59073[ 	]+csrw[ 	]+0x3ed,a1
-[ 	]+[0-9a-f]+:[ 	]+3ee02573[ 	]+csrr[ 	]+a0,0x3ee
-[ 	]+[0-9a-f]+:[ 	]+3ee59073[ 	]+csrw[ 	]+0x3ee,a1
-[ 	]+[0-9a-f]+:[ 	]+3ef02573[ 	]+csrr[ 	]+a0,0x3ef
-[ 	]+[0-9a-f]+:[ 	]+3ef59073[ 	]+csrw[ 	]+0x3ef,a1
-[ 	]+[0-9a-f]+:[ 	]+b0002573[ 	]+csrr[ 	]+a0,mcycle
-[ 	]+[0-9a-f]+:[ 	]+b0059073[ 	]+csrw[ 	]+mcycle,a1
-[ 	]+[0-9a-f]+:[ 	]+b0202573[ 	]+csrr[ 	]+a0,minstret
-[ 	]+[0-9a-f]+:[ 	]+b0259073[ 	]+csrw[ 	]+minstret,a1
-[ 	]+[0-9a-f]+:[ 	]+b0302573[ 	]+csrr[ 	]+a0,mhpmcounter3
-[ 	]+[0-9a-f]+:[ 	]+b0359073[ 	]+csrw[ 	]+mhpmcounter3,a1
-[ 	]+[0-9a-f]+:[ 	]+b0402573[ 	]+csrr[ 	]+a0,mhpmcounter4
-[ 	]+[0-9a-f]+:[ 	]+b0459073[ 	]+csrw[ 	]+mhpmcounter4,a1
-[ 	]+[0-9a-f]+:[ 	]+b0502573[ 	]+csrr[ 	]+a0,mhpmcounter5
-[ 	]+[0-9a-f]+:[ 	]+b0559073[ 	]+csrw[ 	]+mhpmcounter5,a1
-[ 	]+[0-9a-f]+:[ 	]+b0602573[ 	]+csrr[ 	]+a0,mhpmcounter6
-[ 	]+[0-9a-f]+:[ 	]+b0659073[ 	]+csrw[ 	]+mhpmcounter6,a1
-[ 	]+[0-9a-f]+:[ 	]+b0702573[ 	]+csrr[ 	]+a0,mhpmcounter7
-[ 	]+[0-9a-f]+:[ 	]+b0759073[ 	]+csrw[ 	]+mhpmcounter7,a1
-[ 	]+[0-9a-f]+:[ 	]+b0802573[ 	]+csrr[ 	]+a0,mhpmcounter8
-[ 	]+[0-9a-f]+:[ 	]+b0859073[ 	]+csrw[ 	]+mhpmcounter8,a1
-[ 	]+[0-9a-f]+:[ 	]+b0902573[ 	]+csrr[ 	]+a0,mhpmcounter9
-[ 	]+[0-9a-f]+:[ 	]+b0959073[ 	]+csrw[ 	]+mhpmcounter9,a1
-[ 	]+[0-9a-f]+:[ 	]+b0a02573[ 	]+csrr[ 	]+a0,mhpmcounter10
-[ 	]+[0-9a-f]+:[ 	]+b0a59073[ 	]+csrw[ 	]+mhpmcounter10,a1
-[ 	]+[0-9a-f]+:[ 	]+b0b02573[ 	]+csrr[ 	]+a0,mhpmcounter11
-[ 	]+[0-9a-f]+:[ 	]+b0b59073[ 	]+csrw[ 	]+mhpmcounter11,a1
-[ 	]+[0-9a-f]+:[ 	]+b0c02573[ 	]+csrr[ 	]+a0,mhpmcounter12
-[ 	]+[0-9a-f]+:[ 	]+b0c59073[ 	]+csrw[ 	]+mhpmcounter12,a1
-[ 	]+[0-9a-f]+:[ 	]+b0d02573[ 	]+csrr[ 	]+a0,mhpmcounter13
-[ 	]+[0-9a-f]+:[ 	]+b0d59073[ 	]+csrw[ 	]+mhpmcounter13,a1
-[ 	]+[0-9a-f]+:[ 	]+b0e02573[ 	]+csrr[ 	]+a0,mhpmcounter14
-[ 	]+[0-9a-f]+:[ 	]+b0e59073[ 	]+csrw[ 	]+mhpmcounter14,a1
-[ 	]+[0-9a-f]+:[ 	]+b0f02573[ 	]+csrr[ 	]+a0,mhpmcounter15
-[ 	]+[0-9a-f]+:[ 	]+b0f59073[ 	]+csrw[ 	]+mhpmcounter15,a1
-[ 	]+[0-9a-f]+:[ 	]+b1002573[ 	]+csrr[ 	]+a0,mhpmcounter16
-[ 	]+[0-9a-f]+:[ 	]+b1059073[ 	]+csrw[ 	]+mhpmcounter16,a1
-[ 	]+[0-9a-f]+:[ 	]+b1102573[ 	]+csrr[ 	]+a0,mhpmcounter17
-[ 	]+[0-9a-f]+:[ 	]+b1159073[ 	]+csrw[ 	]+mhpmcounter17,a1
-[ 	]+[0-9a-f]+:[ 	]+b1202573[ 	]+csrr[ 	]+a0,mhpmcounter18
-[ 	]+[0-9a-f]+:[ 	]+b1259073[ 	]+csrw[ 	]+mhpmcounter18,a1
-[ 	]+[0-9a-f]+:[ 	]+b1302573[ 	]+csrr[ 	]+a0,mhpmcounter19
-[ 	]+[0-9a-f]+:[ 	]+b1359073[ 	]+csrw[ 	]+mhpmcounter19,a1
-[ 	]+[0-9a-f]+:[ 	]+b1402573[ 	]+csrr[ 	]+a0,mhpmcounter20
-[ 	]+[0-9a-f]+:[ 	]+b1459073[ 	]+csrw[ 	]+mhpmcounter20,a1
-[ 	]+[0-9a-f]+:[ 	]+b1502573[ 	]+csrr[ 	]+a0,mhpmcounter21
-[ 	]+[0-9a-f]+:[ 	]+b1559073[ 	]+csrw[ 	]+mhpmcounter21,a1
-[ 	]+[0-9a-f]+:[ 	]+b1602573[ 	]+csrr[ 	]+a0,mhpmcounter22
-[ 	]+[0-9a-f]+:[ 	]+b1659073[ 	]+csrw[ 	]+mhpmcounter22,a1
-[ 	]+[0-9a-f]+:[ 	]+b1702573[ 	]+csrr[ 	]+a0,mhpmcounter23
-[ 	]+[0-9a-f]+:[ 	]+b1759073[ 	]+csrw[ 	]+mhpmcounter23,a1
-[ 	]+[0-9a-f]+:[ 	]+b1802573[ 	]+csrr[ 	]+a0,mhpmcounter24
-[ 	]+[0-9a-f]+:[ 	]+b1859073[ 	]+csrw[ 	]+mhpmcounter24,a1
-[ 	]+[0-9a-f]+:[ 	]+b1902573[ 	]+csrr[ 	]+a0,mhpmcounter25
-[ 	]+[0-9a-f]+:[ 	]+b1959073[ 	]+csrw[ 	]+mhpmcounter25,a1
-[ 	]+[0-9a-f]+:[ 	]+b1a02573[ 	]+csrr[ 	]+a0,mhpmcounter26
-[ 	]+[0-9a-f]+:[ 	]+b1a59073[ 	]+csrw[ 	]+mhpmcounter26,a1
-[ 	]+[0-9a-f]+:[ 	]+b1b02573[ 	]+csrr[ 	]+a0,mhpmcounter27
-[ 	]+[0-9a-f]+:[ 	]+b1b59073[ 	]+csrw[ 	]+mhpmcounter27,a1
-[ 	]+[0-9a-f]+:[ 	]+b1c02573[ 	]+csrr[ 	]+a0,mhpmcounter28
-[ 	]+[0-9a-f]+:[ 	]+b1c59073[ 	]+csrw[ 	]+mhpmcounter28,a1
-[ 	]+[0-9a-f]+:[ 	]+b1d02573[ 	]+csrr[ 	]+a0,mhpmcounter29
-[ 	]+[0-9a-f]+:[ 	]+b1d59073[ 	]+csrw[ 	]+mhpmcounter29,a1
-[ 	]+[0-9a-f]+:[ 	]+b1e02573[ 	]+csrr[ 	]+a0,mhpmcounter30
-[ 	]+[0-9a-f]+:[ 	]+b1e59073[ 	]+csrw[ 	]+mhpmcounter30,a1
-[ 	]+[0-9a-f]+:[ 	]+b1f02573[ 	]+csrr[ 	]+a0,mhpmcounter31
-[ 	]+[0-9a-f]+:[ 	]+b1f59073[ 	]+csrw[ 	]+mhpmcounter31,a1
-[ 	]+[0-9a-f]+:[ 	]+b8002573[ 	]+csrr[ 	]+a0,mcycleh
-[ 	]+[0-9a-f]+:[ 	]+b8059073[ 	]+csrw[ 	]+mcycleh,a1
-[ 	]+[0-9a-f]+:[ 	]+b8202573[ 	]+csrr[ 	]+a0,minstreth
-[ 	]+[0-9a-f]+:[ 	]+b8259073[ 	]+csrw[ 	]+minstreth,a1
-[ 	]+[0-9a-f]+:[ 	]+b8302573[ 	]+csrr[ 	]+a0,mhpmcounter3h
-[ 	]+[0-9a-f]+:[ 	]+b8359073[ 	]+csrw[ 	]+mhpmcounter3h,a1
-[ 	]+[0-9a-f]+:[ 	]+b8402573[ 	]+csrr[ 	]+a0,mhpmcounter4h
-[ 	]+[0-9a-f]+:[ 	]+b8459073[ 	]+csrw[ 	]+mhpmcounter4h,a1
-[ 	]+[0-9a-f]+:[ 	]+b8502573[ 	]+csrr[ 	]+a0,mhpmcounter5h
-[ 	]+[0-9a-f]+:[ 	]+b8559073[ 	]+csrw[ 	]+mhpmcounter5h,a1
-[ 	]+[0-9a-f]+:[ 	]+b8602573[ 	]+csrr[ 	]+a0,mhpmcounter6h
-[ 	]+[0-9a-f]+:[ 	]+b8659073[ 	]+csrw[ 	]+mhpmcounter6h,a1
-[ 	]+[0-9a-f]+:[ 	]+b8702573[ 	]+csrr[ 	]+a0,mhpmcounter7h
-[ 	]+[0-9a-f]+:[ 	]+b8759073[ 	]+csrw[ 	]+mhpmcounter7h,a1
-[ 	]+[0-9a-f]+:[ 	]+b8802573[ 	]+csrr[ 	]+a0,mhpmcounter8h
-[ 	]+[0-9a-f]+:[ 	]+b8859073[ 	]+csrw[ 	]+mhpmcounter8h,a1
-[ 	]+[0-9a-f]+:[ 	]+b8902573[ 	]+csrr[ 	]+a0,mhpmcounter9h
-[ 	]+[0-9a-f]+:[ 	]+b8959073[ 	]+csrw[ 	]+mhpmcounter9h,a1
-[ 	]+[0-9a-f]+:[ 	]+b8a02573[ 	]+csrr[ 	]+a0,mhpmcounter10h
-[ 	]+[0-9a-f]+:[ 	]+b8a59073[ 	]+csrw[ 	]+mhpmcounter10h,a1
-[ 	]+[0-9a-f]+:[ 	]+b8b02573[ 	]+csrr[ 	]+a0,mhpmcounter11h
-[ 	]+[0-9a-f]+:[ 	]+b8b59073[ 	]+csrw[ 	]+mhpmcounter11h,a1
-[ 	]+[0-9a-f]+:[ 	]+b8c02573[ 	]+csrr[ 	]+a0,mhpmcounter12h
-[ 	]+[0-9a-f]+:[ 	]+b8c59073[ 	]+csrw[ 	]+mhpmcounter12h,a1
-[ 	]+[0-9a-f]+:[ 	]+b8d02573[ 	]+csrr[ 	]+a0,mhpmcounter13h
-[ 	]+[0-9a-f]+:[ 	]+b8d59073[ 	]+csrw[ 	]+mhpmcounter13h,a1
-[ 	]+[0-9a-f]+:[ 	]+b8e02573[ 	]+csrr[ 	]+a0,mhpmcounter14h
-[ 	]+[0-9a-f]+:[ 	]+b8e59073[ 	]+csrw[ 	]+mhpmcounter14h,a1
-[ 	]+[0-9a-f]+:[ 	]+b8f02573[ 	]+csrr[ 	]+a0,mhpmcounter15h
-[ 	]+[0-9a-f]+:[ 	]+b8f59073[ 	]+csrw[ 	]+mhpmcounter15h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9002573[ 	]+csrr[ 	]+a0,mhpmcounter16h
-[ 	]+[0-9a-f]+:[ 	]+b9059073[ 	]+csrw[ 	]+mhpmcounter16h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9102573[ 	]+csrr[ 	]+a0,mhpmcounter17h
-[ 	]+[0-9a-f]+:[ 	]+b9159073[ 	]+csrw[ 	]+mhpmcounter17h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9202573[ 	]+csrr[ 	]+a0,mhpmcounter18h
-[ 	]+[0-9a-f]+:[ 	]+b9259073[ 	]+csrw[ 	]+mhpmcounter18h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9302573[ 	]+csrr[ 	]+a0,mhpmcounter19h
-[ 	]+[0-9a-f]+:[ 	]+b9359073[ 	]+csrw[ 	]+mhpmcounter19h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9402573[ 	]+csrr[ 	]+a0,mhpmcounter20h
-[ 	]+[0-9a-f]+:[ 	]+b9459073[ 	]+csrw[ 	]+mhpmcounter20h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9502573[ 	]+csrr[ 	]+a0,mhpmcounter21h
-[ 	]+[0-9a-f]+:[ 	]+b9559073[ 	]+csrw[ 	]+mhpmcounter21h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9602573[ 	]+csrr[ 	]+a0,mhpmcounter22h
-[ 	]+[0-9a-f]+:[ 	]+b9659073[ 	]+csrw[ 	]+mhpmcounter22h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9702573[ 	]+csrr[ 	]+a0,mhpmcounter23h
-[ 	]+[0-9a-f]+:[ 	]+b9759073[ 	]+csrw[ 	]+mhpmcounter23h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9802573[ 	]+csrr[ 	]+a0,mhpmcounter24h
-[ 	]+[0-9a-f]+:[ 	]+b9859073[ 	]+csrw[ 	]+mhpmcounter24h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9902573[ 	]+csrr[ 	]+a0,mhpmcounter25h
-[ 	]+[0-9a-f]+:[ 	]+b9959073[ 	]+csrw[ 	]+mhpmcounter25h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9a02573[ 	]+csrr[ 	]+a0,mhpmcounter26h
-[ 	]+[0-9a-f]+:[ 	]+b9a59073[ 	]+csrw[ 	]+mhpmcounter26h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9b02573[ 	]+csrr[ 	]+a0,mhpmcounter27h
-[ 	]+[0-9a-f]+:[ 	]+b9b59073[ 	]+csrw[ 	]+mhpmcounter27h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9c02573[ 	]+csrr[ 	]+a0,mhpmcounter28h
-[ 	]+[0-9a-f]+:[ 	]+b9c59073[ 	]+csrw[ 	]+mhpmcounter28h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9d02573[ 	]+csrr[ 	]+a0,mhpmcounter29h
-[ 	]+[0-9a-f]+:[ 	]+b9d59073[ 	]+csrw[ 	]+mhpmcounter29h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9e02573[ 	]+csrr[ 	]+a0,mhpmcounter30h
-[ 	]+[0-9a-f]+:[ 	]+b9e59073[ 	]+csrw[ 	]+mhpmcounter30h,a1
-[ 	]+[0-9a-f]+:[ 	]+b9f02573[ 	]+csrr[ 	]+a0,mhpmcounter31h
-[ 	]+[0-9a-f]+:[ 	]+b9f59073[ 	]+csrw[ 	]+mhpmcounter31h,a1
-[ 	]+[0-9a-f]+:[ 	]+32002573[ 	]+csrr[ 	]+a0,mucounteren
-[ 	]+[0-9a-f]+:[ 	]+32059073[ 	]+csrw[ 	]+mucounteren,a1
-[ 	]+[0-9a-f]+:[ 	]+32302573[ 	]+csrr[ 	]+a0,mhpmevent3
-[ 	]+[0-9a-f]+:[ 	]+32359073[ 	]+csrw[ 	]+mhpmevent3,a1
-[ 	]+[0-9a-f]+:[ 	]+32402573[ 	]+csrr[ 	]+a0,mhpmevent4
-[ 	]+[0-9a-f]+:[ 	]+32459073[ 	]+csrw[ 	]+mhpmevent4,a1
-[ 	]+[0-9a-f]+:[ 	]+32502573[ 	]+csrr[ 	]+a0,mhpmevent5
-[ 	]+[0-9a-f]+:[ 	]+32559073[ 	]+csrw[ 	]+mhpmevent5,a1
-[ 	]+[0-9a-f]+:[ 	]+32602573[ 	]+csrr[ 	]+a0,mhpmevent6
-[ 	]+[0-9a-f]+:[ 	]+32659073[ 	]+csrw[ 	]+mhpmevent6,a1
-[ 	]+[0-9a-f]+:[ 	]+32702573[ 	]+csrr[ 	]+a0,mhpmevent7
-[ 	]+[0-9a-f]+:[ 	]+32759073[ 	]+csrw[ 	]+mhpmevent7,a1
-[ 	]+[0-9a-f]+:[ 	]+32802573[ 	]+csrr[ 	]+a0,mhpmevent8
-[ 	]+[0-9a-f]+:[ 	]+32859073[ 	]+csrw[ 	]+mhpmevent8,a1
-[ 	]+[0-9a-f]+:[ 	]+32902573[ 	]+csrr[ 	]+a0,mhpmevent9
-[ 	]+[0-9a-f]+:[ 	]+32959073[ 	]+csrw[ 	]+mhpmevent9,a1
-[ 	]+[0-9a-f]+:[ 	]+32a02573[ 	]+csrr[ 	]+a0,mhpmevent10
-[ 	]+[0-9a-f]+:[ 	]+32a59073[ 	]+csrw[ 	]+mhpmevent10,a1
-[ 	]+[0-9a-f]+:[ 	]+32b02573[ 	]+csrr[ 	]+a0,mhpmevent11
-[ 	]+[0-9a-f]+:[ 	]+32b59073[ 	]+csrw[ 	]+mhpmevent11,a1
-[ 	]+[0-9a-f]+:[ 	]+32c02573[ 	]+csrr[ 	]+a0,mhpmevent12
-[ 	]+[0-9a-f]+:[ 	]+32c59073[ 	]+csrw[ 	]+mhpmevent12,a1
-[ 	]+[0-9a-f]+:[ 	]+32d02573[ 	]+csrr[ 	]+a0,mhpmevent13
-[ 	]+[0-9a-f]+:[ 	]+32d59073[ 	]+csrw[ 	]+mhpmevent13,a1
-[ 	]+[0-9a-f]+:[ 	]+32e02573[ 	]+csrr[ 	]+a0,mhpmevent14
-[ 	]+[0-9a-f]+:[ 	]+32e59073[ 	]+csrw[ 	]+mhpmevent14,a1
-[ 	]+[0-9a-f]+:[ 	]+32f02573[ 	]+csrr[ 	]+a0,mhpmevent15
-[ 	]+[0-9a-f]+:[ 	]+32f59073[ 	]+csrw[ 	]+mhpmevent15,a1
-[ 	]+[0-9a-f]+:[ 	]+33002573[ 	]+csrr[ 	]+a0,mhpmevent16
-[ 	]+[0-9a-f]+:[ 	]+33059073[ 	]+csrw[ 	]+mhpmevent16,a1
-[ 	]+[0-9a-f]+:[ 	]+33102573[ 	]+csrr[ 	]+a0,mhpmevent17
-[ 	]+[0-9a-f]+:[ 	]+33159073[ 	]+csrw[ 	]+mhpmevent17,a1
-[ 	]+[0-9a-f]+:[ 	]+33202573[ 	]+csrr[ 	]+a0,mhpmevent18
-[ 	]+[0-9a-f]+:[ 	]+33259073[ 	]+csrw[ 	]+mhpmevent18,a1
-[ 	]+[0-9a-f]+:[ 	]+33302573[ 	]+csrr[ 	]+a0,mhpmevent19
-[ 	]+[0-9a-f]+:[ 	]+33359073[ 	]+csrw[ 	]+mhpmevent19,a1
-[ 	]+[0-9a-f]+:[ 	]+33402573[ 	]+csrr[ 	]+a0,mhpmevent20
-[ 	]+[0-9a-f]+:[ 	]+33459073[ 	]+csrw[ 	]+mhpmevent20,a1
-[ 	]+[0-9a-f]+:[ 	]+33502573[ 	]+csrr[ 	]+a0,mhpmevent21
-[ 	]+[0-9a-f]+:[ 	]+33559073[ 	]+csrw[ 	]+mhpmevent21,a1
-[ 	]+[0-9a-f]+:[ 	]+33602573[ 	]+csrr[ 	]+a0,mhpmevent22
-[ 	]+[0-9a-f]+:[ 	]+33659073[ 	]+csrw[ 	]+mhpmevent22,a1
-[ 	]+[0-9a-f]+:[ 	]+33702573[ 	]+csrr[ 	]+a0,mhpmevent23
-[ 	]+[0-9a-f]+:[ 	]+33759073[ 	]+csrw[ 	]+mhpmevent23,a1
-[ 	]+[0-9a-f]+:[ 	]+33802573[ 	]+csrr[ 	]+a0,mhpmevent24
-[ 	]+[0-9a-f]+:[ 	]+33859073[ 	]+csrw[ 	]+mhpmevent24,a1
-[ 	]+[0-9a-f]+:[ 	]+33902573[ 	]+csrr[ 	]+a0,mhpmevent25
-[ 	]+[0-9a-f]+:[ 	]+33959073[ 	]+csrw[ 	]+mhpmevent25,a1
-[ 	]+[0-9a-f]+:[ 	]+33a02573[ 	]+csrr[ 	]+a0,mhpmevent26
-[ 	]+[0-9a-f]+:[ 	]+33a59073[ 	]+csrw[ 	]+mhpmevent26,a1
-[ 	]+[0-9a-f]+:[ 	]+33b02573[ 	]+csrr[ 	]+a0,mhpmevent27
-[ 	]+[0-9a-f]+:[ 	]+33b59073[ 	]+csrw[ 	]+mhpmevent27,a1
-[ 	]+[0-9a-f]+:[ 	]+33c02573[ 	]+csrr[ 	]+a0,mhpmevent28
-[ 	]+[0-9a-f]+:[ 	]+33c59073[ 	]+csrw[ 	]+mhpmevent28,a1
-[ 	]+[0-9a-f]+:[ 	]+33d02573[ 	]+csrr[ 	]+a0,mhpmevent29
-[ 	]+[0-9a-f]+:[ 	]+33d59073[ 	]+csrw[ 	]+mhpmevent29,a1
-[ 	]+[0-9a-f]+:[ 	]+33e02573[ 	]+csrr[ 	]+a0,mhpmevent30
-[ 	]+[0-9a-f]+:[ 	]+33e59073[ 	]+csrw[ 	]+mhpmevent30,a1
-[ 	]+[0-9a-f]+:[ 	]+33f02573[ 	]+csrr[ 	]+a0,mhpmevent31
-[ 	]+[0-9a-f]+:[ 	]+33f59073[ 	]+csrw[ 	]+mhpmevent31,a1
-[ 	]+[0-9a-f]+:[ 	]+60002573[ 	]+csrr[ 	]+a0,hstatus
-[ 	]+[0-9a-f]+:[ 	]+60059073[ 	]+csrw[ 	]+hstatus,a1
-[ 	]+[0-9a-f]+:[ 	]+60202573[ 	]+csrr[ 	]+a0,hedeleg
-[ 	]+[0-9a-f]+:[ 	]+60259073[ 	]+csrw[ 	]+hedeleg,a1
-[ 	]+[0-9a-f]+:[ 	]+60302573[ 	]+csrr[ 	]+a0,hideleg
-[ 	]+[0-9a-f]+:[ 	]+60359073[ 	]+csrw[ 	]+hideleg,a1
-[ 	]+[0-9a-f]+:[ 	]+60402573[ 	]+csrr[ 	]+a0,hie
-[ 	]+[0-9a-f]+:[ 	]+60459073[ 	]+csrw[ 	]+hie,a1
-[ 	]+[0-9a-f]+:[ 	]+60602573[ 	]+csrr[ 	]+a0,hcounteren
-[ 	]+[0-9a-f]+:[ 	]+60659073[ 	]+csrw[ 	]+hcounteren,a1
-[ 	]+[0-9a-f]+:[ 	]+60702573[ 	]+csrr[ 	]+a0,hgeie
-[ 	]+[0-9a-f]+:[ 	]+60759073[ 	]+csrw[ 	]+hgeie,a1
-[ 	]+[0-9a-f]+:[ 	]+64302573[ 	]+csrr[ 	]+a0,htval
-[ 	]+[0-9a-f]+:[ 	]+64359073[ 	]+csrw[ 	]+htval,a1
-[ 	]+[0-9a-f]+:[ 	]+64402573[ 	]+csrr[ 	]+a0,hip
-[ 	]+[0-9a-f]+:[ 	]+64459073[ 	]+csrw[ 	]+hip,a1
-[ 	]+[0-9a-f]+:[ 	]+64502573[ 	]+csrr[ 	]+a0,hvip
-[ 	]+[0-9a-f]+:[ 	]+64559073[ 	]+csrw[ 	]+hvip,a1
-[ 	]+[0-9a-f]+:[ 	]+64a02573[ 	]+csrr[ 	]+a0,htinst
-[ 	]+[0-9a-f]+:[ 	]+64a59073[ 	]+csrw[ 	]+htinst,a1
-[ 	]+[0-9a-f]+:[ 	]+e1202573[ 	]+csrr[ 	]+a0,hgeip
-[ 	]+[0-9a-f]+:[ 	]+e1259073[ 	]+csrw[ 	]+hgeip,a1
-[ 	]+[0-9a-f]+:[ 	]+60a02573[ 	]+csrr[ 	]+a0,henvcfg
-[ 	]+[0-9a-f]+:[ 	]+60a59073[ 	]+csrw[ 	]+henvcfg,a1
-[ 	]+[0-9a-f]+:[ 	]+61a02573[ 	]+csrr[ 	]+a0,henvcfgh
-[ 	]+[0-9a-f]+:[ 	]+61a59073[ 	]+csrw[ 	]+henvcfgh,a1
-[ 	]+[0-9a-f]+:[ 	]+68002573[ 	]+csrr[ 	]+a0,hgatp
-[ 	]+[0-9a-f]+:[ 	]+68059073[ 	]+csrw[ 	]+hgatp,a1
-[ 	]+[0-9a-f]+:[ 	]+60502573[ 	]+csrr[ 	]+a0,htimedelta
-[ 	]+[0-9a-f]+:[ 	]+60559073[ 	]+csrw[ 	]+htimedelta,a1
-[ 	]+[0-9a-f]+:[ 	]+61502573[ 	]+csrr[ 	]+a0,htimedeltah
-[ 	]+[0-9a-f]+:[ 	]+61559073[ 	]+csrw[ 	]+htimedeltah,a1
-[ 	]+[0-9a-f]+:[ 	]+20002573[ 	]+csrr[ 	]+a0,vsstatus
-[ 	]+[0-9a-f]+:[ 	]+20059073[ 	]+csrw[ 	]+vsstatus,a1
-[ 	]+[0-9a-f]+:[ 	]+20402573[ 	]+csrr[ 	]+a0,vsie
-[ 	]+[0-9a-f]+:[ 	]+20459073[ 	]+csrw[ 	]+vsie,a1
-[ 	]+[0-9a-f]+:[ 	]+20502573[ 	]+csrr[ 	]+a0,vstvec
-[ 	]+[0-9a-f]+:[ 	]+20559073[ 	]+csrw[ 	]+vstvec,a1
-[ 	]+[0-9a-f]+:[ 	]+24002573[ 	]+csrr[ 	]+a0,vsscratch
-[ 	]+[0-9a-f]+:[ 	]+24059073[ 	]+csrw[ 	]+vsscratch,a1
-[ 	]+[0-9a-f]+:[ 	]+24102573[ 	]+csrr[ 	]+a0,vsepc
-[ 	]+[0-9a-f]+:[ 	]+24159073[ 	]+csrw[ 	]+vsepc,a1
-[ 	]+[0-9a-f]+:[ 	]+24202573[ 	]+csrr[ 	]+a0,vscause
-[ 	]+[0-9a-f]+:[ 	]+24259073[ 	]+csrw[ 	]+vscause,a1
-[ 	]+[0-9a-f]+:[ 	]+24302573[ 	]+csrr[ 	]+a0,vstval
-[ 	]+[0-9a-f]+:[ 	]+24359073[ 	]+csrw[ 	]+vstval,a1
-[ 	]+[0-9a-f]+:[ 	]+24402573[ 	]+csrr[ 	]+a0,vsip
-[ 	]+[0-9a-f]+:[ 	]+24459073[ 	]+csrw[ 	]+vsip,a1
-[ 	]+[0-9a-f]+:[ 	]+28002573[ 	]+csrr[ 	]+a0,vsatp
-[ 	]+[0-9a-f]+:[ 	]+28059073[ 	]+csrw[ 	]+vsatp,a1
-[ 	]+[0-9a-f]+:[ 	]+35002573[ 	]+csrr[ 	]+a0,miselect
-[ 	]+[0-9a-f]+:[ 	]+35059073[ 	]+csrw[ 	]+miselect,a1
-[ 	]+[0-9a-f]+:[ 	]+35102573[ 	]+csrr[ 	]+a0,mireg
-[ 	]+[0-9a-f]+:[ 	]+35159073[ 	]+csrw[ 	]+mireg,a1
-[ 	]+[0-9a-f]+:[ 	]+35c02573[ 	]+csrr[ 	]+a0,mtopei
-[ 	]+[0-9a-f]+:[ 	]+35c59073[ 	]+csrw[ 	]+mtopei,a1
-[ 	]+[0-9a-f]+:[ 	]+fb002573[ 	]+csrr[ 	]+a0,mtopi
-[ 	]+[0-9a-f]+:[ 	]+fb059073[ 	]+csrw[ 	]+mtopi,a1
-[ 	]+[0-9a-f]+:[ 	]+30802573[ 	]+csrr[ 	]+a0,mvien
-[ 	]+[0-9a-f]+:[ 	]+30859073[ 	]+csrw[ 	]+mvien,a1
-[ 	]+[0-9a-f]+:[ 	]+30902573[ 	]+csrr[ 	]+a0,mvip
-[ 	]+[0-9a-f]+:[ 	]+30959073[ 	]+csrw[ 	]+mvip,a1
-[ 	]+[0-9a-f]+:[ 	]+31302573[ 	]+csrr[ 	]+a0,midelegh
-[ 	]+[0-9a-f]+:[ 	]+31359073[ 	]+csrw[ 	]+midelegh,a1
-[ 	]+[0-9a-f]+:[ 	]+31402573[ 	]+csrr[ 	]+a0,mieh
-[ 	]+[0-9a-f]+:[ 	]+31459073[ 	]+csrw[ 	]+mieh,a1
-[ 	]+[0-9a-f]+:[ 	]+31802573[ 	]+csrr[ 	]+a0,mvienh
-[ 	]+[0-9a-f]+:[ 	]+31859073[ 	]+csrw[ 	]+mvienh,a1
-[ 	]+[0-9a-f]+:[ 	]+31902573[ 	]+csrr[ 	]+a0,mviph
-[ 	]+[0-9a-f]+:[ 	]+31959073[ 	]+csrw[ 	]+mviph,a1
-[ 	]+[0-9a-f]+:[ 	]+35402573[ 	]+csrr[ 	]+a0,miph
-[ 	]+[0-9a-f]+:[ 	]+35459073[ 	]+csrw[ 	]+miph,a1
-[ 	]+[0-9a-f]+:[ 	]+32102573[ 	]+csrr[ 	]+a0,mscounteren
-[ 	]+[0-9a-f]+:[ 	]+32159073[ 	]+csrw[ 	]+mscounteren,a1
-[ 	]+[0-9a-f]+:[ 	]+32202573[ 	]+csrr[ 	]+a0,mhcounteren
-[ 	]+[0-9a-f]+:[ 	]+32259073[ 	]+csrw[ 	]+mhcounteren,a1
-[ 	]+[0-9a-f]+:[ 	]+72102573[ 	]+csrr[ 	]+a0,0x721
-[ 	]+[0-9a-f]+:[ 	]+72159073[ 	]+csrw[ 	]+0x721,a1
-[ 	]+[0-9a-f]+:[ 	]+72202573[ 	]+csrr[ 	]+a0,0x722
-[ 	]+[0-9a-f]+:[ 	]+72259073[ 	]+csrw[ 	]+0x722,a1
-[ 	]+[0-9a-f]+:[ 	]+30c02573[ 	]+csrr[ 	]+a0,mstateen0
-[ 	]+[0-9a-f]+:[ 	]+30c59073[ 	]+csrw[ 	]+mstateen0,a1
-[ 	]+[0-9a-f]+:[ 	]+30d02573[ 	]+csrr[ 	]+a0,mstateen1
-[ 	]+[0-9a-f]+:[ 	]+30d59073[ 	]+csrw[ 	]+mstateen1,a1
-[ 	]+[0-9a-f]+:[ 	]+30e02573[ 	]+csrr[ 	]+a0,mstateen2
-[ 	]+[0-9a-f]+:[ 	]+30e59073[ 	]+csrw[ 	]+mstateen2,a1
-[ 	]+[0-9a-f]+:[ 	]+30f02573[ 	]+csrr[ 	]+a0,mstateen3
-[ 	]+[0-9a-f]+:[ 	]+30f59073[ 	]+csrw[ 	]+mstateen3,a1
-[ 	]+[0-9a-f]+:[ 	]+10c02573[ 	]+csrr[ 	]+a0,sstateen0
-[ 	]+[0-9a-f]+:[ 	]+10c59073[ 	]+csrw[ 	]+sstateen0,a1
-[ 	]+[0-9a-f]+:[ 	]+10d02573[ 	]+csrr[ 	]+a0,sstateen1
-[ 	]+[0-9a-f]+:[ 	]+10d59073[ 	]+csrw[ 	]+sstateen1,a1
-[ 	]+[0-9a-f]+:[ 	]+10e02573[ 	]+csrr[ 	]+a0,sstateen2
-[ 	]+[0-9a-f]+:[ 	]+10e59073[ 	]+csrw[ 	]+sstateen2,a1
-[ 	]+[0-9a-f]+:[ 	]+10f02573[ 	]+csrr[ 	]+a0,sstateen3
-[ 	]+[0-9a-f]+:[ 	]+10f59073[ 	]+csrw[ 	]+sstateen3,a1
-[ 	]+[0-9a-f]+:[ 	]+60c02573[ 	]+csrr[ 	]+a0,hstateen0
-[ 	]+[0-9a-f]+:[ 	]+60c59073[ 	]+csrw[ 	]+hstateen0,a1
-[ 	]+[0-9a-f]+:[ 	]+60d02573[ 	]+csrr[ 	]+a0,hstateen1
-[ 	]+[0-9a-f]+:[ 	]+60d59073[ 	]+csrw[ 	]+hstateen1,a1
-[ 	]+[0-9a-f]+:[ 	]+60e02573[ 	]+csrr[ 	]+a0,hstateen2
-[ 	]+[0-9a-f]+:[ 	]+60e59073[ 	]+csrw[ 	]+hstateen2,a1
-[ 	]+[0-9a-f]+:[ 	]+60f02573[ 	]+csrr[ 	]+a0,hstateen3
-[ 	]+[0-9a-f]+:[ 	]+60f59073[ 	]+csrw[ 	]+hstateen3,a1
-[ 	]+[0-9a-f]+:[ 	]+31c02573[ 	]+csrr[ 	]+a0,mstateen0h
-[ 	]+[0-9a-f]+:[ 	]+31c59073[ 	]+csrw[ 	]+mstateen0h,a1
-[ 	]+[0-9a-f]+:[ 	]+31d02573[ 	]+csrr[ 	]+a0,mstateen1h
-[ 	]+[0-9a-f]+:[ 	]+31d59073[ 	]+csrw[ 	]+mstateen1h,a1
-[ 	]+[0-9a-f]+:[ 	]+31e02573[ 	]+csrr[ 	]+a0,mstateen2h
-[ 	]+[0-9a-f]+:[ 	]+31e59073[ 	]+csrw[ 	]+mstateen2h,a1
-[ 	]+[0-9a-f]+:[ 	]+31f02573[ 	]+csrr[ 	]+a0,mstateen3h
-[ 	]+[0-9a-f]+:[ 	]+31f59073[ 	]+csrw[ 	]+mstateen3h,a1
-[ 	]+[0-9a-f]+:[ 	]+61c02573[ 	]+csrr[ 	]+a0,hstateen0h
-[ 	]+[0-9a-f]+:[ 	]+61c59073[ 	]+csrw[ 	]+hstateen0h,a1
-[ 	]+[0-9a-f]+:[ 	]+61d02573[ 	]+csrr[ 	]+a0,hstateen1h
-[ 	]+[0-9a-f]+:[ 	]+61d59073[ 	]+csrw[ 	]+hstateen1h,a1
-[ 	]+[0-9a-f]+:[ 	]+61e02573[ 	]+csrr[ 	]+a0,hstateen2h
-[ 	]+[0-9a-f]+:[ 	]+61e59073[ 	]+csrw[ 	]+hstateen2h,a1
-[ 	]+[0-9a-f]+:[ 	]+61f02573[ 	]+csrr[ 	]+a0,hstateen3h
-[ 	]+[0-9a-f]+:[ 	]+61f59073[ 	]+csrw[ 	]+hstateen3h,a1
-[ 	]+[0-9a-f]+:[ 	]+15002573[ 	]+csrr[ 	]+a0,siselect
-[ 	]+[0-9a-f]+:[ 	]+15059073[ 	]+csrw[ 	]+siselect,a1
-[ 	]+[0-9a-f]+:[ 	]+15102573[ 	]+csrr[ 	]+a0,sireg
-[ 	]+[0-9a-f]+:[ 	]+15159073[ 	]+csrw[ 	]+sireg,a1
-[ 	]+[0-9a-f]+:[ 	]+15c02573[ 	]+csrr[ 	]+a0,stopei
-[ 	]+[0-9a-f]+:[ 	]+15c59073[ 	]+csrw[ 	]+stopei,a1
-[ 	]+[0-9a-f]+:[ 	]+db002573[ 	]+csrr[ 	]+a0,stopi
-[ 	]+[0-9a-f]+:[ 	]+db059073[ 	]+csrw[ 	]+stopi,a1
-[ 	]+[0-9a-f]+:[ 	]+11402573[ 	]+csrr[ 	]+a0,sieh
-[ 	]+[0-9a-f]+:[ 	]+11459073[ 	]+csrw[ 	]+sieh,a1
-[ 	]+[0-9a-f]+:[ 	]+15402573[ 	]+csrr[ 	]+a0,siph
-[ 	]+[0-9a-f]+:[ 	]+15459073[ 	]+csrw[ 	]+siph,a1
-[ 	]+[0-9a-f]+:[ 	]+60802573[ 	]+csrr[ 	]+a0,hvien
-[ 	]+[0-9a-f]+:[ 	]+60859073[ 	]+csrw[ 	]+hvien,a1
-[ 	]+[0-9a-f]+:[ 	]+60902573[ 	]+csrr[ 	]+a0,hvictl
-[ 	]+[0-9a-f]+:[ 	]+60959073[ 	]+csrw[ 	]+hvictl,a1
-[ 	]+[0-9a-f]+:[ 	]+64602573[ 	]+csrr[ 	]+a0,hviprio1
-[ 	]+[0-9a-f]+:[ 	]+64659073[ 	]+csrw[ 	]+hviprio1,a1
-[ 	]+[0-9a-f]+:[ 	]+64702573[ 	]+csrr[ 	]+a0,hviprio2
-[ 	]+[0-9a-f]+:[ 	]+64759073[ 	]+csrw[ 	]+hviprio2,a1
-[ 	]+[0-9a-f]+:[ 	]+25002573[ 	]+csrr[ 	]+a0,vsiselect
-[ 	]+[0-9a-f]+:[ 	]+25059073[ 	]+csrw[ 	]+vsiselect,a1
-[ 	]+[0-9a-f]+:[ 	]+25102573[ 	]+csrr[ 	]+a0,vsireg
-[ 	]+[0-9a-f]+:[ 	]+25159073[ 	]+csrw[ 	]+vsireg,a1
-[ 	]+[0-9a-f]+:[ 	]+25c02573[ 	]+csrr[ 	]+a0,vstopei
-[ 	]+[0-9a-f]+:[ 	]+25c59073[ 	]+csrw[ 	]+vstopei,a1
-[ 	]+[0-9a-f]+:[ 	]+eb002573[ 	]+csrr[ 	]+a0,vstopi
-[ 	]+[0-9a-f]+:[ 	]+eb059073[ 	]+csrw[ 	]+vstopi,a1
-[ 	]+[0-9a-f]+:[ 	]+61302573[ 	]+csrr[ 	]+a0,hidelegh
-[ 	]+[0-9a-f]+:[ 	]+61359073[ 	]+csrw[ 	]+hidelegh,a1
-[ 	]+[0-9a-f]+:[ 	]+61802573[ 	]+csrr[ 	]+a0,hvienh
-[ 	]+[0-9a-f]+:[ 	]+61859073[ 	]+csrw[ 	]+hvienh,a1
-[ 	]+[0-9a-f]+:[ 	]+65502573[ 	]+csrr[ 	]+a0,hviph
-[ 	]+[0-9a-f]+:[ 	]+65559073[ 	]+csrw[ 	]+hviph,a1
-[ 	]+[0-9a-f]+:[ 	]+65602573[ 	]+csrr[ 	]+a0,hviprio1h
-[ 	]+[0-9a-f]+:[ 	]+65659073[ 	]+csrw[ 	]+hviprio1h,a1
-[ 	]+[0-9a-f]+:[ 	]+65702573[ 	]+csrr[ 	]+a0,hviprio2h
-[ 	]+[0-9a-f]+:[ 	]+65759073[ 	]+csrw[ 	]+hviprio2h,a1
-[ 	]+[0-9a-f]+:[ 	]+21402573[ 	]+csrr[ 	]+a0,vsieh
-[ 	]+[0-9a-f]+:[ 	]+21459073[ 	]+csrw[ 	]+vsieh,a1
-[ 	]+[0-9a-f]+:[ 	]+25402573[ 	]+csrr[ 	]+a0,vsiph
-[ 	]+[0-9a-f]+:[ 	]+25459073[ 	]+csrw[ 	]+vsiph,a1
-[ 	]+[0-9a-f]+:[ 	]+da002573[ 	]+csrr[ 	]+a0,scountovf
-[ 	]+[0-9a-f]+:[ 	]+da059073[ 	]+csrw[ 	]+scountovf,a1
-[ 	]+[0-9a-f]+:[ 	]+72302573[ 	]+csrr[ 	]+a0,mhpmevent3h
-[ 	]+[0-9a-f]+:[ 	]+72359073[ 	]+csrw[ 	]+mhpmevent3h,a1
-[ 	]+[0-9a-f]+:[ 	]+72402573[ 	]+csrr[ 	]+a0,mhpmevent4h
-[ 	]+[0-9a-f]+:[ 	]+72459073[ 	]+csrw[ 	]+mhpmevent4h,a1
-[ 	]+[0-9a-f]+:[ 	]+72502573[ 	]+csrr[ 	]+a0,mhpmevent5h
-[ 	]+[0-9a-f]+:[ 	]+72559073[ 	]+csrw[ 	]+mhpmevent5h,a1
-[ 	]+[0-9a-f]+:[ 	]+72602573[ 	]+csrr[ 	]+a0,mhpmevent6h
-[ 	]+[0-9a-f]+:[ 	]+72659073[ 	]+csrw[ 	]+mhpmevent6h,a1
-[ 	]+[0-9a-f]+:[ 	]+72702573[ 	]+csrr[ 	]+a0,mhpmevent7h
-[ 	]+[0-9a-f]+:[ 	]+72759073[ 	]+csrw[ 	]+mhpmevent7h,a1
-[ 	]+[0-9a-f]+:[ 	]+72802573[ 	]+csrr[ 	]+a0,mhpmevent8h
-[ 	]+[0-9a-f]+:[ 	]+72859073[ 	]+csrw[ 	]+mhpmevent8h,a1
-[ 	]+[0-9a-f]+:[ 	]+72902573[ 	]+csrr[ 	]+a0,mhpmevent9h
-[ 	]+[0-9a-f]+:[ 	]+72959073[ 	]+csrw[ 	]+mhpmevent9h,a1
-[ 	]+[0-9a-f]+:[ 	]+72a02573[ 	]+csrr[ 	]+a0,mhpmevent10h
-[ 	]+[0-9a-f]+:[ 	]+72a59073[ 	]+csrw[ 	]+mhpmevent10h,a1
-[ 	]+[0-9a-f]+:[ 	]+72b02573[ 	]+csrr[ 	]+a0,mhpmevent11h
-[ 	]+[0-9a-f]+:[ 	]+72b59073[ 	]+csrw[ 	]+mhpmevent11h,a1
-[ 	]+[0-9a-f]+:[ 	]+72c02573[ 	]+csrr[ 	]+a0,mhpmevent12h
-[ 	]+[0-9a-f]+:[ 	]+72c59073[ 	]+csrw[ 	]+mhpmevent12h,a1
-[ 	]+[0-9a-f]+:[ 	]+72d02573[ 	]+csrr[ 	]+a0,mhpmevent13h
-[ 	]+[0-9a-f]+:[ 	]+72d59073[ 	]+csrw[ 	]+mhpmevent13h,a1
-[ 	]+[0-9a-f]+:[ 	]+72e02573[ 	]+csrr[ 	]+a0,mhpmevent14h
-[ 	]+[0-9a-f]+:[ 	]+72e59073[ 	]+csrw[ 	]+mhpmevent14h,a1
-[ 	]+[0-9a-f]+:[ 	]+72f02573[ 	]+csrr[ 	]+a0,mhpmevent15h
-[ 	]+[0-9a-f]+:[ 	]+72f59073[ 	]+csrw[ 	]+mhpmevent15h,a1
-[ 	]+[0-9a-f]+:[ 	]+73002573[ 	]+csrr[ 	]+a0,mhpmevent16h
-[ 	]+[0-9a-f]+:[ 	]+73059073[ 	]+csrw[ 	]+mhpmevent16h,a1
-[ 	]+[0-9a-f]+:[ 	]+73102573[ 	]+csrr[ 	]+a0,mhpmevent17h
-[ 	]+[0-9a-f]+:[ 	]+73159073[ 	]+csrw[ 	]+mhpmevent17h,a1
-[ 	]+[0-9a-f]+:[ 	]+73202573[ 	]+csrr[ 	]+a0,mhpmevent18h
-[ 	]+[0-9a-f]+:[ 	]+73259073[ 	]+csrw[ 	]+mhpmevent18h,a1
-[ 	]+[0-9a-f]+:[ 	]+73302573[ 	]+csrr[ 	]+a0,mhpmevent19h
-[ 	]+[0-9a-f]+:[ 	]+73359073[ 	]+csrw[ 	]+mhpmevent19h,a1
-[ 	]+[0-9a-f]+:[ 	]+73402573[ 	]+csrr[ 	]+a0,mhpmevent20h
-[ 	]+[0-9a-f]+:[ 	]+73459073[ 	]+csrw[ 	]+mhpmevent20h,a1
-[ 	]+[0-9a-f]+:[ 	]+73502573[ 	]+csrr[ 	]+a0,mhpmevent21h
-[ 	]+[0-9a-f]+:[ 	]+73559073[ 	]+csrw[ 	]+mhpmevent21h,a1
-[ 	]+[0-9a-f]+:[ 	]+73602573[ 	]+csrr[ 	]+a0,mhpmevent22h
-[ 	]+[0-9a-f]+:[ 	]+73659073[ 	]+csrw[ 	]+mhpmevent22h,a1
-[ 	]+[0-9a-f]+:[ 	]+73702573[ 	]+csrr[ 	]+a0,mhpmevent23h
-[ 	]+[0-9a-f]+:[ 	]+73759073[ 	]+csrw[ 	]+mhpmevent23h,a1
-[ 	]+[0-9a-f]+:[ 	]+73802573[ 	]+csrr[ 	]+a0,mhpmevent24h
-[ 	]+[0-9a-f]+:[ 	]+73859073[ 	]+csrw[ 	]+mhpmevent24h,a1
-[ 	]+[0-9a-f]+:[ 	]+73902573[ 	]+csrr[ 	]+a0,mhpmevent25h
-[ 	]+[0-9a-f]+:[ 	]+73959073[ 	]+csrw[ 	]+mhpmevent25h,a1
-[ 	]+[0-9a-f]+:[ 	]+73a02573[ 	]+csrr[ 	]+a0,mhpmevent26h
-[ 	]+[0-9a-f]+:[ 	]+73a59073[ 	]+csrw[ 	]+mhpmevent26h,a1
-[ 	]+[0-9a-f]+:[ 	]+73b02573[ 	]+csrr[ 	]+a0,mhpmevent27h
-[ 	]+[0-9a-f]+:[ 	]+73b59073[ 	]+csrw[ 	]+mhpmevent27h,a1
-[ 	]+[0-9a-f]+:[ 	]+73c02573[ 	]+csrr[ 	]+a0,mhpmevent28h
-[ 	]+[0-9a-f]+:[ 	]+73c59073[ 	]+csrw[ 	]+mhpmevent28h,a1
-[ 	]+[0-9a-f]+:[ 	]+73d02573[ 	]+csrr[ 	]+a0,mhpmevent29h
-[ 	]+[0-9a-f]+:[ 	]+73d59073[ 	]+csrw[ 	]+mhpmevent29h,a1
-[ 	]+[0-9a-f]+:[ 	]+73e02573[ 	]+csrr[ 	]+a0,mhpmevent30h
-[ 	]+[0-9a-f]+:[ 	]+73e59073[ 	]+csrw[ 	]+mhpmevent30h,a1
-[ 	]+[0-9a-f]+:[ 	]+73f02573[ 	]+csrr[ 	]+a0,mhpmevent31h
-[ 	]+[0-9a-f]+:[ 	]+73f59073[ 	]+csrw[ 	]+mhpmevent31h,a1
-[ 	]+[0-9a-f]+:[ 	]+14d02573[ 	]+csrr[ 	]+a0,stimecmp
-[ 	]+[0-9a-f]+:[ 	]+14d59073[ 	]+csrw[ 	]+stimecmp,a1
-[ 	]+[0-9a-f]+:[ 	]+15d02573[ 	]+csrr[ 	]+a0,stimecmph
-[ 	]+[0-9a-f]+:[ 	]+15d59073[ 	]+csrw[ 	]+stimecmph,a1
-[ 	]+[0-9a-f]+:[ 	]+24d02573[ 	]+csrr[ 	]+a0,vstimecmp
-[ 	]+[0-9a-f]+:[ 	]+24d59073[ 	]+csrw[ 	]+vstimecmp,a1
-[ 	]+[0-9a-f]+:[ 	]+25d02573[ 	]+csrr[ 	]+a0,vstimecmph
-[ 	]+[0-9a-f]+:[ 	]+25d59073[ 	]+csrw[ 	]+vstimecmph,a1
-[ 	]+[0-9a-f]+:[ 	]+04302573[ 	]+csrr[ 	]+a0,ubadaddr
-[ 	]+[0-9a-f]+:[ 	]+04359073[ 	]+csrw[ 	]+ubadaddr,a1
-[ 	]+[0-9a-f]+:[ 	]+14302573[ 	]+csrr[ 	]+a0,sbadaddr
-[ 	]+[0-9a-f]+:[ 	]+14359073[ 	]+csrw[ 	]+sbadaddr,a1
-[ 	]+[0-9a-f]+:[ 	]+18002573[ 	]+csrr[ 	]+a0,sptbr
-[ 	]+[0-9a-f]+:[ 	]+18059073[ 	]+csrw[ 	]+sptbr,a1
-[ 	]+[0-9a-f]+:[ 	]+34302573[ 	]+csrr[ 	]+a0,mbadaddr
-[ 	]+[0-9a-f]+:[ 	]+34359073[ 	]+csrw[ 	]+mbadaddr,a1
-[ 	]+[0-9a-f]+:[ 	]+32002573[ 	]+csrr[ 	]+a0,mucounteren
-[ 	]+[0-9a-f]+:[ 	]+32059073[ 	]+csrw[ 	]+mucounteren,a1
-[ 	]+[0-9a-f]+:[ 	]+32102573[ 	]+csrr[ 	]+a0,mscounteren
-[ 	]+[0-9a-f]+:[ 	]+32159073[ 	]+csrw[ 	]+mscounteren,a1
-[ 	]+[0-9a-f]+:[ 	]+32202573[ 	]+csrr[ 	]+a0,mhcounteren
-[ 	]+[0-9a-f]+:[ 	]+32259073[ 	]+csrw[ 	]+mhcounteren,a1
-[ 	]+[0-9a-f]+:[ 	]+38002573[ 	]+csrr[ 	]+a0,mbase
-[ 	]+[0-9a-f]+:[ 	]+38059073[ 	]+csrw[ 	]+mbase,a1
-[ 	]+[0-9a-f]+:[ 	]+38102573[ 	]+csrr[ 	]+a0,mbound
-[ 	]+[0-9a-f]+:[ 	]+38159073[ 	]+csrw[ 	]+mbound,a1
-[ 	]+[0-9a-f]+:[ 	]+38202573[ 	]+csrr[ 	]+a0,mibase
-[ 	]+[0-9a-f]+:[ 	]+38259073[ 	]+csrw[ 	]+mibase,a1
-[ 	]+[0-9a-f]+:[ 	]+38302573[ 	]+csrr[ 	]+a0,mibound
-[ 	]+[0-9a-f]+:[ 	]+38359073[ 	]+csrw[ 	]+mibound,a1
-[ 	]+[0-9a-f]+:[ 	]+38402573[ 	]+csrr[ 	]+a0,mdbase
-[ 	]+[0-9a-f]+:[ 	]+38459073[ 	]+csrw[ 	]+mdbase,a1
-[ 	]+[0-9a-f]+:[ 	]+38502573[ 	]+csrr[ 	]+a0,mdbound
-[ 	]+[0-9a-f]+:[ 	]+38559073[ 	]+csrw[ 	]+mdbound,a1
-[ 	]+[0-9a-f]+:[ 	]+00002573[ 	]+csrr[ 	]+a0,ustatus
-[ 	]+[0-9a-f]+:[ 	]+00059073[ 	]+csrw[ 	]+ustatus,a1
-[ 	]+[0-9a-f]+:[ 	]+00402573[ 	]+csrr[ 	]+a0,uie
-[ 	]+[0-9a-f]+:[ 	]+00459073[ 	]+csrw[ 	]+uie,a1
-[ 	]+[0-9a-f]+:[ 	]+00502573[ 	]+csrr[ 	]+a0,utvec
-[ 	]+[0-9a-f]+:[ 	]+00559073[ 	]+csrw[ 	]+utvec,a1
-[ 	]+[0-9a-f]+:[ 	]+04002573[ 	]+csrr[ 	]+a0,uscratch
-[ 	]+[0-9a-f]+:[ 	]+04059073[ 	]+csrw[ 	]+uscratch,a1
-[ 	]+[0-9a-f]+:[ 	]+04102573[ 	]+csrr[ 	]+a0,uepc
-[ 	]+[0-9a-f]+:[ 	]+04159073[ 	]+csrw[ 	]+uepc,a1
-[ 	]+[0-9a-f]+:[ 	]+04202573[ 	]+csrr[ 	]+a0,ucause
-[ 	]+[0-9a-f]+:[ 	]+04259073[ 	]+csrw[ 	]+ucause,a1
-[ 	]+[0-9a-f]+:[ 	]+04302573[ 	]+csrr[ 	]+a0,ubadaddr
-[ 	]+[0-9a-f]+:[ 	]+04359073[ 	]+csrw[ 	]+ubadaddr,a1
-[ 	]+[0-9a-f]+:[ 	]+04402573[ 	]+csrr[ 	]+a0,uip
-[ 	]+[0-9a-f]+:[ 	]+04459073[ 	]+csrw[ 	]+uip,a1
-[ 	]+[0-9a-f]+:[ 	]+10202573[ 	]+csrr[ 	]+a0,sedeleg
-[ 	]+[0-9a-f]+:[ 	]+10259073[ 	]+csrw[ 	]+sedeleg,a1
-[ 	]+[0-9a-f]+:[ 	]+10302573[ 	]+csrr[ 	]+a0,sideleg
-[ 	]+[0-9a-f]+:[ 	]+10359073[ 	]+csrw[ 	]+sideleg,a1
-[ 	]+[0-9a-f]+:[ 	]+00102573[ 	]+csrr[ 	]+a0,fflags
-[ 	]+[0-9a-f]+:[ 	]+00159073[ 	]+csrw[ 	]+fflags,a1
-[ 	]+[0-9a-f]+:[ 	]+00202573[ 	]+csrr[ 	]+a0,frm
-[ 	]+[0-9a-f]+:[ 	]+00259073[ 	]+csrw[ 	]+frm,a1
-[ 	]+[0-9a-f]+:[ 	]+00302573[ 	]+csrr[ 	]+a0,fcsr
-[ 	]+[0-9a-f]+:[ 	]+00359073[ 	]+csrw[ 	]+fcsr,a1
-[ 	]+[0-9a-f]+:[ 	]+7b002573[ 	]+csrr[ 	]+a0,dcsr
-[ 	]+[0-9a-f]+:[ 	]+7b059073[ 	]+csrw[ 	]+dcsr,a1
-[ 	]+[0-9a-f]+:[ 	]+7b102573[ 	]+csrr[ 	]+a0,dpc
-[ 	]+[0-9a-f]+:[ 	]+7b159073[ 	]+csrw[ 	]+dpc,a1
-[ 	]+[0-9a-f]+:[ 	]+7b202573[ 	]+csrr[ 	]+a0,dscratch0
-[ 	]+[0-9a-f]+:[ 	]+7b259073[ 	]+csrw[ 	]+dscratch0,a1
-[ 	]+[0-9a-f]+:[ 	]+7b302573[ 	]+csrr[ 	]+a0,dscratch1
-[ 	]+[0-9a-f]+:[ 	]+7b359073[ 	]+csrw[ 	]+dscratch1,a1
-[ 	]+[0-9a-f]+:[ 	]+7b202573[ 	]+csrr[ 	]+a0,dscratch0
-[ 	]+[0-9a-f]+:[ 	]+7b259073[ 	]+csrw[ 	]+dscratch0,a1
-[ 	]+[0-9a-f]+:[ 	]+7a002573[ 	]+csrr[ 	]+a0,tselect
-[ 	]+[0-9a-f]+:[ 	]+7a059073[ 	]+csrw[ 	]+tselect,a1
-[ 	]+[0-9a-f]+:[ 	]+7a102573[ 	]+csrr[ 	]+a0,tdata1
-[ 	]+[0-9a-f]+:[ 	]+7a159073[ 	]+csrw[ 	]+tdata1,a1
-[ 	]+[0-9a-f]+:[ 	]+7a202573[ 	]+csrr[ 	]+a0,tdata2
-[ 	]+[0-9a-f]+:[ 	]+7a259073[ 	]+csrw[ 	]+tdata2,a1
-[ 	]+[0-9a-f]+:[ 	]+7a302573[ 	]+csrr[ 	]+a0,tdata3
-[ 	]+[0-9a-f]+:[ 	]+7a359073[ 	]+csrw[ 	]+tdata3,a1
-[ 	]+[0-9a-f]+:[ 	]+7a402573[ 	]+csrr[ 	]+a0,tinfo
-[ 	]+[0-9a-f]+:[ 	]+7a459073[ 	]+csrw[ 	]+tinfo,a1
-[ 	]+[0-9a-f]+:[ 	]+7a502573[ 	]+csrr[ 	]+a0,tcontrol
-[ 	]+[0-9a-f]+:[ 	]+7a559073[ 	]+csrw[ 	]+tcontrol,a1
-[ 	]+[0-9a-f]+:[ 	]+6a802573[ 	]+csrr[ 	]+a0,hcontext
-[ 	]+[0-9a-f]+:[ 	]+6a859073[ 	]+csrw[ 	]+hcontext,a1
-[ 	]+[0-9a-f]+:[ 	]+5a802573[ 	]+csrr[ 	]+a0,scontext
-[ 	]+[0-9a-f]+:[ 	]+5a859073[ 	]+csrw[ 	]+scontext,a1
-[ 	]+[0-9a-f]+:[ 	]+7a802573[ 	]+csrr[ 	]+a0,mcontext
-[ 	]+[0-9a-f]+:[ 	]+7a859073[ 	]+csrw[ 	]+mcontext,a1
-[ 	]+[0-9a-f]+:[ 	]+7aa02573[ 	]+csrr[ 	]+a0,mscontext
-[ 	]+[0-9a-f]+:[ 	]+7aa59073[ 	]+csrw[ 	]+mscontext,a1
-[ 	]+[0-9a-f]+:[ 	]+7a102573[ 	]+csrr[ 	]+a0,tdata1
-[ 	]+[0-9a-f]+:[ 	]+7a159073[ 	]+csrw[ 	]+tdata1,a1
-[ 	]+[0-9a-f]+:[ 	]+7a102573[ 	]+csrr[ 	]+a0,tdata1
-[ 	]+[0-9a-f]+:[ 	]+7a159073[ 	]+csrw[ 	]+tdata1,a1
-[ 	]+[0-9a-f]+:[ 	]+7a102573[ 	]+csrr[ 	]+a0,tdata1
-[ 	]+[0-9a-f]+:[ 	]+7a159073[ 	]+csrw[ 	]+tdata1,a1
-[ 	]+[0-9a-f]+:[ 	]+7a102573[ 	]+csrr[ 	]+a0,tdata1
-[ 	]+[0-9a-f]+:[ 	]+7a159073[ 	]+csrw[ 	]+tdata1,a1
-[ 	]+[0-9a-f]+:[ 	]+7a102573[ 	]+csrr[ 	]+a0,tdata1
-[ 	]+[0-9a-f]+:[ 	]+7a159073[ 	]+csrw[ 	]+tdata1,a1
-[ 	]+[0-9a-f]+:[ 	]+7a102573[ 	]+csrr[ 	]+a0,tdata1
-[ 	]+[0-9a-f]+:[ 	]+7a159073[ 	]+csrw[ 	]+tdata1,a1
-[ 	]+[0-9a-f]+:[ 	]+7a302573[ 	]+csrr[ 	]+a0,tdata3
-[ 	]+[0-9a-f]+:[ 	]+7a359073[ 	]+csrw[ 	]+tdata3,a1
-[ 	]+[0-9a-f]+:[ 	]+7a302573[ 	]+csrr[ 	]+a0,tdata3
-[ 	]+[0-9a-f]+:[ 	]+7a359073[ 	]+csrw[ 	]+tdata3,a1
-[ 	]+[0-9a-f]+:[ 	]+01502573[ 	]+csrr[ 	]+a0,seed
-[ 	]+[0-9a-f]+:[ 	]+01559073[ 	]+csrw[ 	]+seed,a1
-[ 	]+[0-9a-f]+:[ 	]+00802573[ 	]+csrr[ 	]+a0,vstart
-[ 	]+[0-9a-f]+:[ 	]+00859073[ 	]+csrw[ 	]+vstart,a1
-[ 	]+[0-9a-f]+:[ 	]+00902573[ 	]+csrr[ 	]+a0,vxsat
-[ 	]+[0-9a-f]+:[ 	]+00959073[ 	]+csrw[ 	]+vxsat,a1
-[ 	]+[0-9a-f]+:[ 	]+00a02573[ 	]+csrr[ 	]+a0,vxrm
-[ 	]+[0-9a-f]+:[ 	]+00a59073[ 	]+csrw[ 	]+vxrm,a1
-[ 	]+[0-9a-f]+:[ 	]+00f02573[ 	]+csrr[ 	]+a0,vcsr
-[ 	]+[0-9a-f]+:[ 	]+00f59073[ 	]+csrw[ 	]+vcsr,a1
-[ 	]+[0-9a-f]+:[ 	]+c2002573[ 	]+csrr[ 	]+a0,vl
-[ 	]+[0-9a-f]+:[ 	]+c2059073[ 	]+csrw[ 	]+vl,a1
-[ 	]+[0-9a-f]+:[ 	]+c2102573[ 	]+csrr[ 	]+a0,vtype
-[ 	]+[0-9a-f]+:[ 	]+c2159073[ 	]+csrw[ 	]+vtype,a1
-[ 	]+[0-9a-f]+:[ 	]+c2202573[ 	]+csrr[ 	]+a0,vlenb
-[ 	]+[0-9a-f]+:[ 	]+c2259073[ 	]+csrw[ 	]+vlenb,a1
diff --git a/gas/testsuite/gas/riscv/csr-version-1p9p1.l b/gas/testsuite/gas/riscv/csr-version-1p9p1.l
deleted file mode 100644
index 7fcd73ab7dd..00000000000
--- a/gas/testsuite/gas/riscv/csr-version-1p9p1.l
+++ /dev/null
@@ -1,1683 +0,0 @@ 
-.*Assembler messages:
-.*Warning: read-only CSR is written `csrw cycle,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw time,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw instret,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter3,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter4,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter5,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter6,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter7,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter8,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter9,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter10,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter11,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter12,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter13,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter14,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter15,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter16,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter17,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter18,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter19,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter20,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter21,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter22,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter23,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter24,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter25,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter26,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter27,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter28,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter29,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter30,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter31,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `cycleh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `cycleh', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw cycleh,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `timeh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `timeh', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw timeh,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `instreth', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `instreth', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw instreth,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter3h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter3h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter3h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter4h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter4h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter4h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter5h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter5h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter5h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter6h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter6h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter6h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter7h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter7h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter7h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter8h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter8h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter8h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter9h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter9h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter9h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter10h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter10h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter10h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter11h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter11h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter11h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter12h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter12h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter12h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter13h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter13h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter13h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter14h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter14h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter14h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter15h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter15h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter15h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter16h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter16h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter16h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter17h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter17h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter17h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter18h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter18h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter18h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter19h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter19h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter19h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter20h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter20h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter20h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter21h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter21h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter21h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter22h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter22h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter22h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter23h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter23h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter23h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter24h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter24h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter24h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter25h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter25h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter25h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter26h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter26h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter26h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter27h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter27h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter27h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter28h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter28h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter28h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter29h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter29h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter29h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter30h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter30h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter30h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter31h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hpmcounter31h', needs rv32i extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hpmcounter31h,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `scounteren' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `scounteren' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `senvcfg' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `senvcfg' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `stval' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `stval' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `satp' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `satp' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw mvendorid,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw marchid,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw mimpid,a1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw mhartid,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `mconfigptr' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mconfigptr' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw mconfigptr,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `mcounteren' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mcounteren' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mstatush', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstatush' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mstatush', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstatush' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mtval' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mtval' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mtinst' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mtinst' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mtval2' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mtval2' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `menvcfg' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `menvcfg' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `menvcfgh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `menvcfgh' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `menvcfgh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `menvcfgh' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mseccfg' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mseccfg' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mseccfgh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mseccfgh' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mseccfgh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mseccfgh' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg0' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg0' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg1', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg1' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg1', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg1' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg2' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg2' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg3', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg3' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg3', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg3' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg4' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg4' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg5', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg5' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg5', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg5' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg6' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg6' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg7', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg7' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg7', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg7' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg8' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg8' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg9', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg9' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg9', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg9' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg10' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg10' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg11', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg11' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg11', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg11' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg12' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg12' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg13', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg13' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg13', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg13' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg14' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg14' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg15', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg15' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg15', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `pmpcfg15' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr0' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr0' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr1' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr1' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr2' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr2' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr3' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr3' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr4' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr4' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr5' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr5' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr6' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr6' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr7' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr7' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr8' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr8' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr9' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr9' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr10' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr10' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr11' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr11' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr12' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr12' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr13' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr13' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr14' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr14' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr15' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr15' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr16' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr16' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr17' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr17' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr18' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr18' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr19' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr19' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr20' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr20' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr21' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr21' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr22' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr22' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr23' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr23' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr24' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr24' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr25' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr25' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr26' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr26' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr27' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr27' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr28' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr28' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr29' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr29' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr30' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr30' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr31' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr31' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr32' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr32' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr33' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr33' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr34' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr34' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr35' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr35' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr36' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr36' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr37' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr37' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr38' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr38' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr39' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr39' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr40' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr40' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr41' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr41' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr42' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr42' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr43' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr43' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr44' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr44' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr45' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr45' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr46' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr46' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr47' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr47' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr48' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr48' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr49' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr49' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr50' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr50' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr51' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr51' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr52' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr52' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr53' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr53' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr54' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr54' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr55' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr55' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr56' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr56' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr57' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr57' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr58' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr58' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr59' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr59' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr60' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr60' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr61' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr61' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr62' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr62' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr63' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `pmpaddr63' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mcycleh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mcycleh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `minstreth', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `minstreth', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter3h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter3h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter4h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter4h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter5h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter5h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter6h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter6h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter7h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter7h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter8h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter8h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter9h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter9h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter10h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter10h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter11h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter11h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter12h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter12h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter13h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter13h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter14h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter14h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter15h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter15h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter16h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter16h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter17h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter17h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter18h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter18h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter19h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter19h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter20h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter20h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter21h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter21h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter22h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter22h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter23h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter23h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter24h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter24h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter25h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter25h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter26h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter26h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter27h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter27h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter28h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter28h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter29h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter29h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter30h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter30h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter31h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmcounter31h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mcountinhibit' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mcountinhibit' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `hstatus', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstatus', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hedeleg', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hedeleg', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hideleg', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hideleg', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hie', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hie', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hcounteren', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hcounteren', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hgeie', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hgeie', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `htval', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `htval', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hip', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hip', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvip', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvip', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `htinst', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `htinst', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hgeip', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hgeip', needs `h' extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw hgeip,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `henvcfg', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `henvcfg', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `henvcfgh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `henvcfgh', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `henvcfgh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `henvcfgh', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hgatp', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hgatp', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `htimedelta', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `htimedelta', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `htimedeltah', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `htimedeltah', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `htimedeltah', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `htimedeltah', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsstatus', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsstatus', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsie', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsie', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstvec', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstvec', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsscratch', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsscratch', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsepc', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsepc', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vscause', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vscause', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstval', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstval', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsip', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsip', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsatp', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsatp', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `miselect', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `miselect', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mireg', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mireg', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mtopei', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mtopei', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mtopi', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mtopi', needs `smaia' extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw mtopi,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `mvien', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mvien', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mvip', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mvip', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `midelegh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `midelegh', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `midelegh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `midelegh', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mieh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mieh', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mieh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mieh', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mvienh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mvienh', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mvienh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mvienh', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mviph', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mviph', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mviph', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mviph', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `miph', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `miph', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `miph', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `miph', needs `smaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mcyclecfg', needs `smcntrpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mcyclecfg' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mcyclecfg', needs `smcntrpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mcyclecfg' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `minstretcfg', needs `smcntrpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `minstretcfg' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `minstretcfg', needs `smcntrpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `minstretcfg' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mcyclecfgh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mcyclecfgh', needs `smcntrpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mcyclecfgh' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mcyclecfgh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mcyclecfgh', needs `smcntrpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mcyclecfgh' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `minstretcfgh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `minstretcfgh', needs `smcntrpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `minstretcfgh' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `minstretcfgh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `minstretcfgh', needs `smcntrpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `minstretcfgh' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen0', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen0', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen1', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen1', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen2', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen2', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen3', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen3', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `sstateen0', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `sstateen0', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `sstateen1', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `sstateen1', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `sstateen2', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `sstateen2', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `sstateen3', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `sstateen3', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen0', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen0', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen0', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen0', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen1', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen1', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen1', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen1', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen2', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen2', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen2', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen2', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen3', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen3', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen3', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen3', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen0h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen0h', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen0h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen0h', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen1h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen1h', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen1h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen1h', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen2h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen2h', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen2h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen2h', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen3h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen3h', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen3h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mstateen3h', needs `smstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen0h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen0h', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen0h', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen0h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen0h', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen0h', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen1h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen1h', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen1h', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen1h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen1h', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen1h', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen2h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen2h', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen2h', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen2h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen2h', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen2h', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen3h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen3h', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen3h', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen3h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen3h', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hstateen3h', needs `ssstateen' extension
-.*Info: macro .*
-.*Warning: invalid CSR `siselect', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `siselect', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `sireg', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `sireg', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `stopei', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `stopei', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `stopi', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `stopi', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw stopi,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `sieh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `sieh', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `sieh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `sieh', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `siph', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `siph', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `siph', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `siph', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvien', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvien', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvien', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvien', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvictl', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvictl', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvictl', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvictl', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio1', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio1', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio1', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio1', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio2', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio2', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio2', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio2', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsiselect', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsiselect', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsiselect', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsiselect', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsireg', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsireg', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsireg', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsireg', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstopei', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstopei', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstopei', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstopei', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstopi', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstopi', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstopi', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstopi', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw vstopi,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `hidelegh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hidelegh', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hidelegh', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hidelegh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hidelegh', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hidelegh', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvienh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvienh', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvienh', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvienh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvienh', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hvienh', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviph', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviph', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviph', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviph', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviph', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviph', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio1h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio1h', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio1h', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio1h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio1h', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio1h', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio2h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio2h', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio2h', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio2h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio2h', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `hviprio2h', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsieh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsieh', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsieh', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsieh', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsieh', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsieh', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsiph', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsiph', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsiph', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsiph', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsiph', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vsiph', needs `ssaia' extension
-.*Info: macro .*
-.*Warning: invalid CSR `scountovf', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `scountovf', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw scountovf,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent3h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent3h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent3h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent3h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent4h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent4h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent4h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent4h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent5h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent5h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent5h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent5h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent6h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent6h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent6h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent6h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent7h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent7h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent7h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent7h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent8h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent8h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent8h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent8h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent9h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent9h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent9h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent9h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent10h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent10h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent10h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent10h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent11h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent11h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent11h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent11h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent12h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent12h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent12h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent12h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent13h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent13h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent13h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent13h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent14h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent14h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent14h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent14h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent15h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent15h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent15h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent15h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent16h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent16h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent16h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent16h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent17h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent17h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent17h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent17h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent18h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent18h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent18h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent18h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent19h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent19h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent19h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent19h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent20h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent20h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent20h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent20h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent21h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent21h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent21h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent21h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent22h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent22h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent22h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent22h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent23h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent23h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent23h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent23h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent24h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent24h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent24h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent24h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent25h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent25h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent25h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent25h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent26h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent26h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent26h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent26h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent27h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent27h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent27h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent27h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent28h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent28h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent28h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent28h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent29h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent29h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent29h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent29h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent30h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent30h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent30h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent30h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent31h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent31h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent31h', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `mhpmevent31h', needs `sscofpmf' extension
-.*Info: macro .*
-.*Warning: invalid CSR `stimecmp', needs `sstc' extension
-.*Info: macro .*
-.*Warning: invalid CSR `stimecmp', needs `sstc' extension
-.*Info: macro .*
-.*Warning: invalid CSR `stimecmph', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `stimecmph', needs `sstc' extension
-.*Info: macro .*
-.*Warning: invalid CSR `stimecmph', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `stimecmph', needs `sstc' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstimecmp', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstimecmp', needs `sstc' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstimecmp', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstimecmp', needs `sstc' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstimecmph', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstimecmph', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstimecmph', needs `sstc' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstimecmph', needs rv32i extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstimecmph', needs `h' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstimecmph', needs `sstc' extension
-.*Info: macro .*
-.*Warning: invalid CSR `utval' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `utval' for the privileged spec `1.9.1'
-.*Info: macro .*
-.*Warning: invalid CSR `fflags', needs `f' extension
-.*Info: macro .*
-.*Warning: invalid CSR `fflags', needs `f' extension
-.*Info: macro .*
-.*Warning: invalid CSR `frm', needs `f' extension
-.*Info: macro .*
-.*Warning: invalid CSR `frm', needs `f' extension
-.*Info: macro .*
-.*Warning: invalid CSR `fcsr', needs `f' extension
-.*Info: macro .*
-.*Warning: invalid CSR `fcsr', needs `f' extension
-.*Info: macro .*
-.*Warning: invalid CSR `seed', needs `zkr' extension
-.*Info: macro .*
-.*Warning: invalid CSR `seed', needs `zkr' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstart', needs `zve32x' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vstart', needs `zve32x' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vxsat', needs `zve32x' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vxsat', needs `zve32x' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vxrm', needs `zve32x' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vxrm', needs `zve32x' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vcsr', needs `zve32x' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vcsr', needs `zve32x' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vl', needs `zve32x' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vl', needs `zve32x' extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw vl,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `vtype', needs `zve32x' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vtype', needs `zve32x' extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw vtype,a1'
-.*Info: macro .*
-.*Warning: invalid CSR `vlenb', needs `zve32x' extension
-.*Info: macro .*
-.*Warning: invalid CSR `vlenb', needs `zve32x' extension
-.*Info: macro .*
-.*Warning: read-only CSR is written `csrw vlenb,a1'
-.*Info: macro .*
diff --git a/gas/testsuite/gas/riscv/csr.s b/gas/testsuite/gas/riscv/csr.s
index 3d8da5488a0..42bb158547b 100644
--- a/gas/testsuite/gas/riscv/csr.s
+++ b/gas/testsuite/gas/riscv/csr.s
@@ -3,7 +3,7 @@ 
 	csrw \val, a1
 	.endm
 
-	# Supported privileged specs, 1.9.1, 1.10, 1.11 and 1.12.
+	# Supported privileged specs, 1.10, 1.11 and 1.12.
 
 	# User Counter/Timers
 	csr cycle
@@ -441,29 +441,16 @@ 
 
 	# Supported in previous priv spec, but dropped now
 
-	csr ubadaddr		# 0x043 in 1.9.1, but the value is utval since 1.10
-	csr sbadaddr		# 0x143 in 1.9.1, but the value is stval since 1.10
-	csr sptbr		# 0x180 in 1.9.1, but the value is satp since 1.10
-	csr mbadaddr		# 0x343 in 1.9.1, but the value is mtval since 1.10
-	csr mucounteren		# 0x320 in 1.9.1, dropped in 1.10, but the value is mcountinhibit since 1.11
-	csr mscounteren		# 0x321 in 1.9.1, dropped in 1.10, but the value is mcyclecfg for Smcntrpmf extension
-	csr mhcounteren		# 0x322 in 1.9.1, dropped in 1.10, but the value is minstretcfg for Smcntrpmf extension
-	csr mbase		# 0x380 in 1.9.1, dropped in 1.10
-	csr mbound		# 0x381 in 1.9.1, dropped in 1.10
-	csr mibase		# 0x382 in 1.9.1, dropped in 1.10
-	csr mibound		# 0x383 in 1.9.1, dropped in 1.10
-	csr mdbase		# 0x384 in 1.9.1, dropped in 1.10
-	csr mdbound		# 0x385 in 1.9.1, dropped in 1.10
-	csr ustatus		# 0x0   in 1.9.1, dropped in 1.12
-	csr uie			# 0x4   in 1.9.1, dropped in 1.12
-	csr utvec		# 0x5   in 1.9.1, dropped in 1.12
-	csr uscratch		# 0x40  in 1.9.1, dropped in 1.12
-	csr uepc		# 0x41  in 1.9.1, dropped in 1.12
-	csr ucause		# 0x42  in 1.9.1, dropped in 1.12
+	csr ustatus		# 0x0   in 1.10, dropped in 1.12
+	csr uie			# 0x4   in 1.10, dropped in 1.12
+	csr utvec		# 0x5   in 1.10, dropped in 1.12
+	csr uscratch		# 0x40  in 1.10, dropped in 1.12
+	csr uepc		# 0x41  in 1.10, dropped in 1.12
+	csr ucause		# 0x42  in 1.10, dropped in 1.12
 	csr utval		# 0x43  in 1.10,  dropped in 1.12
-	csr uip			# 0x44  in 1.9.1, dropped in 1.12
-	csr sedeleg		# 0x102 in 1.9.1, dropped in 1.12
-	csr sideleg		# 0x103 in 1.9.1, dropped in 1.12
+	csr uip			# 0x44  in 1.10, dropped in 1.12
+	csr sedeleg		# 0x102 in 1.10, dropped in 1.12
+	csr sideleg		# 0x103 in 1.10, dropped in 1.12
 
 	# Unprivileged CSR which are not controlled by privilege spec
 
diff --git a/include/opcode/riscv-opc.h b/include/opcode/riscv-opc.h
index 587d81b5e3c..1459ef231dd 100644
--- a/include/opcode/riscv-opc.h
+++ b/include/opcode/riscv-opc.h
@@ -3368,12 +3368,6 @@ 
 #define CSR_VSIP 0x244
 #define CSR_VSATP 0x280
 /* Droppped CSR addresses.  */
-#define CSR_MBASE 0x380
-#define CSR_MBOUND 0x381
-#define CSR_MIBASE 0x382
-#define CSR_MIBOUND 0x383
-#define CSR_MDBASE 0x384
-#define CSR_MDBOUND 0x385
 #define CSR_USTATUS 0x0
 #define CSR_UIE 0x4
 #define CSR_UTVEC 0x5
@@ -4094,101 +4088,101 @@  DECLARE_INSN(vt_maskcn, MATCH_VT_MASKCN, MASK_VT_MASKCN)
 #endif /* DECLARE_INSN */
 #ifdef DECLARE_CSR
 /* Unprivileged Counter/Timers CSRs.  */
-DECLARE_CSR(cycle, CSR_CYCLE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(time, CSR_TIME, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(instret, CSR_INSTRET, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter3, CSR_HPMCOUNTER3, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter4, CSR_HPMCOUNTER4, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter5, CSR_HPMCOUNTER5, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter6, CSR_HPMCOUNTER6, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter7, CSR_HPMCOUNTER7, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter8, CSR_HPMCOUNTER8, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter9, CSR_HPMCOUNTER9, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter10, CSR_HPMCOUNTER10, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter11, CSR_HPMCOUNTER11, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter12, CSR_HPMCOUNTER12, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter13, CSR_HPMCOUNTER13, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter14, CSR_HPMCOUNTER14, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter15, CSR_HPMCOUNTER15, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter16, CSR_HPMCOUNTER16, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter17, CSR_HPMCOUNTER17, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter18, CSR_HPMCOUNTER18, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter19, CSR_HPMCOUNTER19, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter20, CSR_HPMCOUNTER20, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter21, CSR_HPMCOUNTER21, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter22, CSR_HPMCOUNTER22, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter23, CSR_HPMCOUNTER23, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter24, CSR_HPMCOUNTER24, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter25, CSR_HPMCOUNTER25, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter26, CSR_HPMCOUNTER26, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter27, CSR_HPMCOUNTER27, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter28, CSR_HPMCOUNTER28, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter29, CSR_HPMCOUNTER29, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter30, CSR_HPMCOUNTER30, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter31, CSR_HPMCOUNTER31, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(cycleh, CSR_CYCLEH, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(timeh, CSR_TIMEH, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(instreth, CSR_INSTRETH, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter3h, CSR_HPMCOUNTER3H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter4h, CSR_HPMCOUNTER4H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter5h, CSR_HPMCOUNTER5H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter6h, CSR_HPMCOUNTER6H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter7h, CSR_HPMCOUNTER7H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter8h, CSR_HPMCOUNTER8H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter9h, CSR_HPMCOUNTER9H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter10h, CSR_HPMCOUNTER10H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter11h, CSR_HPMCOUNTER11H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter12h, CSR_HPMCOUNTER12H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter13h, CSR_HPMCOUNTER13H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter14h, CSR_HPMCOUNTER14H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter15h, CSR_HPMCOUNTER15H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter16h, CSR_HPMCOUNTER16H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter17h, CSR_HPMCOUNTER17H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter18h, CSR_HPMCOUNTER18H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter19h, CSR_HPMCOUNTER19H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter20h, CSR_HPMCOUNTER20H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter21h, CSR_HPMCOUNTER21H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter22h, CSR_HPMCOUNTER22H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter23h, CSR_HPMCOUNTER23H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter24h, CSR_HPMCOUNTER24H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter25h, CSR_HPMCOUNTER25H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter26h, CSR_HPMCOUNTER26H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter27h, CSR_HPMCOUNTER27H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter28h, CSR_HPMCOUNTER28H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter29h, CSR_HPMCOUNTER29H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter30h, CSR_HPMCOUNTER30H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(hpmcounter31h, CSR_HPMCOUNTER31H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(cycle, CSR_CYCLE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(time, CSR_TIME, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(instret, CSR_INSTRET, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter3, CSR_HPMCOUNTER3, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter4, CSR_HPMCOUNTER4, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter5, CSR_HPMCOUNTER5, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter6, CSR_HPMCOUNTER6, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter7, CSR_HPMCOUNTER7, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter8, CSR_HPMCOUNTER8, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter9, CSR_HPMCOUNTER9, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter10, CSR_HPMCOUNTER10, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter11, CSR_HPMCOUNTER11, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter12, CSR_HPMCOUNTER12, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter13, CSR_HPMCOUNTER13, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter14, CSR_HPMCOUNTER14, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter15, CSR_HPMCOUNTER15, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter16, CSR_HPMCOUNTER16, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter17, CSR_HPMCOUNTER17, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter18, CSR_HPMCOUNTER18, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter19, CSR_HPMCOUNTER19, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter20, CSR_HPMCOUNTER20, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter21, CSR_HPMCOUNTER21, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter22, CSR_HPMCOUNTER22, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter23, CSR_HPMCOUNTER23, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter24, CSR_HPMCOUNTER24, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter25, CSR_HPMCOUNTER25, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter26, CSR_HPMCOUNTER26, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter27, CSR_HPMCOUNTER27, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter28, CSR_HPMCOUNTER28, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter29, CSR_HPMCOUNTER29, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter30, CSR_HPMCOUNTER30, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter31, CSR_HPMCOUNTER31, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(cycleh, CSR_CYCLEH, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(timeh, CSR_TIMEH, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(instreth, CSR_INSTRETH, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter3h, CSR_HPMCOUNTER3H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter4h, CSR_HPMCOUNTER4H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter5h, CSR_HPMCOUNTER5H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter6h, CSR_HPMCOUNTER6H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter7h, CSR_HPMCOUNTER7H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter8h, CSR_HPMCOUNTER8H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter9h, CSR_HPMCOUNTER9H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter10h, CSR_HPMCOUNTER10H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter11h, CSR_HPMCOUNTER11H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter12h, CSR_HPMCOUNTER12H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter13h, CSR_HPMCOUNTER13H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter14h, CSR_HPMCOUNTER14H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter15h, CSR_HPMCOUNTER15H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter16h, CSR_HPMCOUNTER16H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter17h, CSR_HPMCOUNTER17H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter18h, CSR_HPMCOUNTER18H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter19h, CSR_HPMCOUNTER19H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter20h, CSR_HPMCOUNTER20H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter21h, CSR_HPMCOUNTER21H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter22h, CSR_HPMCOUNTER22H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter23h, CSR_HPMCOUNTER23H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter24h, CSR_HPMCOUNTER24H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter25h, CSR_HPMCOUNTER25H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter26h, CSR_HPMCOUNTER26H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter27h, CSR_HPMCOUNTER27H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter28h, CSR_HPMCOUNTER28H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter29h, CSR_HPMCOUNTER29H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter30h, CSR_HPMCOUNTER30H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(hpmcounter31h, CSR_HPMCOUNTER31H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 /* Privileged Supervisor CSRs.  */
-DECLARE_CSR(sstatus, CSR_SSTATUS, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(sie, CSR_SIE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(stvec, CSR_STVEC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(sstatus, CSR_SSTATUS, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(sie, CSR_SIE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(stvec, CSR_STVEC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(scounteren, CSR_SCOUNTEREN, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(senvcfg, CSR_SENVCFG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(sscratch, CSR_SSCRATCH, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(sepc, CSR_SEPC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(scause, CSR_SCAUSE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(sscratch, CSR_SSCRATCH, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(sepc, CSR_SEPC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(scause, CSR_SCAUSE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(stval, CSR_STVAL, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(sip, CSR_SIP, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(sip, CSR_SIP, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(satp, CSR_SATP, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 /* Privileged Machine CSRs.  */
-DECLARE_CSR(mvendorid, CSR_MVENDORID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(marchid, CSR_MARCHID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mimpid, CSR_MIMPID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhartid, CSR_MHARTID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mvendorid, CSR_MVENDORID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(marchid, CSR_MARCHID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mimpid, CSR_MIMPID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhartid, CSR_MHARTID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mconfigptr, CSR_MCONFIGPTR, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mstatus, CSR_MSTATUS, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(misa, CSR_MISA, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(medeleg, CSR_MEDELEG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mideleg, CSR_MIDELEG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mie, CSR_MIE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mtvec, CSR_MTVEC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mstatus, CSR_MSTATUS, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(misa, CSR_MISA, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(medeleg, CSR_MEDELEG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mideleg, CSR_MIDELEG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mie, CSR_MIE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mtvec, CSR_MTVEC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mcounteren, CSR_MCOUNTEREN, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mstatush, CSR_MSTATUSH, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mscratch, CSR_MSCRATCH, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mepc, CSR_MEPC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mcause, CSR_MCAUSE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mscratch, CSR_MSCRATCH, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mepc, CSR_MEPC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mcause, CSR_MCAUSE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mtval, CSR_MTVAL, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mip, CSR_MIP, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mip, CSR_MIP, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mtinst, CSR_MTINST, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mtval2, CSR_MTVAL2, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(menvcfg, CSR_MENVCFG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
@@ -4275,98 +4269,98 @@  DECLARE_CSR(pmpaddr60, CSR_PMPADDR60, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SP
 DECLARE_CSR(pmpaddr61, CSR_PMPADDR61, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(pmpaddr62, CSR_PMPADDR62, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(pmpaddr63, CSR_PMPADDR63, CSR_CLASS_I, PRIV_SPEC_CLASS_1P12, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mcycle, CSR_MCYCLE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(minstret, CSR_MINSTRET, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter3, CSR_MHPMCOUNTER3, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter4, CSR_MHPMCOUNTER4, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter5, CSR_MHPMCOUNTER5, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter6, CSR_MHPMCOUNTER6, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter7, CSR_MHPMCOUNTER7, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter8, CSR_MHPMCOUNTER8, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter9, CSR_MHPMCOUNTER9, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter10, CSR_MHPMCOUNTER10, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter11, CSR_MHPMCOUNTER11, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter12, CSR_MHPMCOUNTER12, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter13, CSR_MHPMCOUNTER13, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter14, CSR_MHPMCOUNTER14, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter15, CSR_MHPMCOUNTER15, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter16, CSR_MHPMCOUNTER16, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter17, CSR_MHPMCOUNTER17, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter18, CSR_MHPMCOUNTER18, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter19, CSR_MHPMCOUNTER19, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter20, CSR_MHPMCOUNTER20, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter21, CSR_MHPMCOUNTER21, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter22, CSR_MHPMCOUNTER22, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter23, CSR_MHPMCOUNTER23, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter24, CSR_MHPMCOUNTER24, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter25, CSR_MHPMCOUNTER25, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter26, CSR_MHPMCOUNTER26, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter27, CSR_MHPMCOUNTER27, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter28, CSR_MHPMCOUNTER28, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter29, CSR_MHPMCOUNTER29, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter30, CSR_MHPMCOUNTER30, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter31, CSR_MHPMCOUNTER31, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mcycleh, CSR_MCYCLEH, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(minstreth, CSR_MINSTRETH, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter3h, CSR_MHPMCOUNTER3H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter4h, CSR_MHPMCOUNTER4H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter5h, CSR_MHPMCOUNTER5H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter6h, CSR_MHPMCOUNTER6H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter7h, CSR_MHPMCOUNTER7H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter8h, CSR_MHPMCOUNTER8H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter9h, CSR_MHPMCOUNTER9H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter10h, CSR_MHPMCOUNTER10H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter11h, CSR_MHPMCOUNTER11H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter12h, CSR_MHPMCOUNTER12H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter13h, CSR_MHPMCOUNTER13H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter14h, CSR_MHPMCOUNTER14H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter15h, CSR_MHPMCOUNTER15H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter16h, CSR_MHPMCOUNTER16H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter17h, CSR_MHPMCOUNTER17H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter18h, CSR_MHPMCOUNTER18H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter19h, CSR_MHPMCOUNTER19H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter20h, CSR_MHPMCOUNTER20H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter21h, CSR_MHPMCOUNTER21H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter22h, CSR_MHPMCOUNTER22H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter23h, CSR_MHPMCOUNTER23H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter24h, CSR_MHPMCOUNTER24H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter25h, CSR_MHPMCOUNTER25H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter26h, CSR_MHPMCOUNTER26H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter27h, CSR_MHPMCOUNTER27H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter28h, CSR_MHPMCOUNTER28H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter29h, CSR_MHPMCOUNTER29H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter30h, CSR_MHPMCOUNTER30H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmcounter31h, CSR_MHPMCOUNTER31H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mcycle, CSR_MCYCLE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(minstret, CSR_MINSTRET, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter3, CSR_MHPMCOUNTER3, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter4, CSR_MHPMCOUNTER4, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter5, CSR_MHPMCOUNTER5, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter6, CSR_MHPMCOUNTER6, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter7, CSR_MHPMCOUNTER7, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter8, CSR_MHPMCOUNTER8, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter9, CSR_MHPMCOUNTER9, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter10, CSR_MHPMCOUNTER10, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter11, CSR_MHPMCOUNTER11, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter12, CSR_MHPMCOUNTER12, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter13, CSR_MHPMCOUNTER13, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter14, CSR_MHPMCOUNTER14, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter15, CSR_MHPMCOUNTER15, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter16, CSR_MHPMCOUNTER16, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter17, CSR_MHPMCOUNTER17, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter18, CSR_MHPMCOUNTER18, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter19, CSR_MHPMCOUNTER19, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter20, CSR_MHPMCOUNTER20, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter21, CSR_MHPMCOUNTER21, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter22, CSR_MHPMCOUNTER22, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter23, CSR_MHPMCOUNTER23, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter24, CSR_MHPMCOUNTER24, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter25, CSR_MHPMCOUNTER25, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter26, CSR_MHPMCOUNTER26, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter27, CSR_MHPMCOUNTER27, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter28, CSR_MHPMCOUNTER28, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter29, CSR_MHPMCOUNTER29, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter30, CSR_MHPMCOUNTER30, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter31, CSR_MHPMCOUNTER31, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mcycleh, CSR_MCYCLEH, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(minstreth, CSR_MINSTRETH, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter3h, CSR_MHPMCOUNTER3H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter4h, CSR_MHPMCOUNTER4H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter5h, CSR_MHPMCOUNTER5H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter6h, CSR_MHPMCOUNTER6H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter7h, CSR_MHPMCOUNTER7H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter8h, CSR_MHPMCOUNTER8H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter9h, CSR_MHPMCOUNTER9H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter10h, CSR_MHPMCOUNTER10H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter11h, CSR_MHPMCOUNTER11H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter12h, CSR_MHPMCOUNTER12H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter13h, CSR_MHPMCOUNTER13H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter14h, CSR_MHPMCOUNTER14H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter15h, CSR_MHPMCOUNTER15H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter16h, CSR_MHPMCOUNTER16H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter17h, CSR_MHPMCOUNTER17H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter18h, CSR_MHPMCOUNTER18H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter19h, CSR_MHPMCOUNTER19H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter20h, CSR_MHPMCOUNTER20H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter21h, CSR_MHPMCOUNTER21H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter22h, CSR_MHPMCOUNTER22H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter23h, CSR_MHPMCOUNTER23H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter24h, CSR_MHPMCOUNTER24H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter25h, CSR_MHPMCOUNTER25H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter26h, CSR_MHPMCOUNTER26H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter27h, CSR_MHPMCOUNTER27H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter28h, CSR_MHPMCOUNTER28H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter29h, CSR_MHPMCOUNTER29H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter30h, CSR_MHPMCOUNTER30H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmcounter31h, CSR_MHPMCOUNTER31H, CSR_CLASS_I_32, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 DECLARE_CSR(mcountinhibit, CSR_MCOUNTINHIBIT, CSR_CLASS_I, PRIV_SPEC_CLASS_1P11, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent3, CSR_MHPMEVENT3, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent4, CSR_MHPMEVENT4, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent5, CSR_MHPMEVENT5, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent6, CSR_MHPMEVENT6, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent7, CSR_MHPMEVENT7, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent8, CSR_MHPMEVENT8, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent9, CSR_MHPMEVENT9, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent10, CSR_MHPMEVENT10, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent11, CSR_MHPMEVENT11, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent12, CSR_MHPMEVENT12, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent13, CSR_MHPMEVENT13, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent14, CSR_MHPMEVENT14, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent15, CSR_MHPMEVENT15, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent16, CSR_MHPMEVENT16, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent17, CSR_MHPMEVENT17, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent18, CSR_MHPMEVENT18, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent19, CSR_MHPMEVENT19, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent20, CSR_MHPMEVENT20, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent21, CSR_MHPMEVENT21, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent22, CSR_MHPMEVENT22, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent23, CSR_MHPMEVENT23, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent24, CSR_MHPMEVENT24, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent25, CSR_MHPMEVENT25, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent26, CSR_MHPMEVENT26, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent27, CSR_MHPMEVENT27, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent28, CSR_MHPMEVENT28, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent29, CSR_MHPMEVENT29, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent30, CSR_MHPMEVENT30, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
-DECLARE_CSR(mhpmevent31, CSR_MHPMEVENT31, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent3, CSR_MHPMEVENT3, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent4, CSR_MHPMEVENT4, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent5, CSR_MHPMEVENT5, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent6, CSR_MHPMEVENT6, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent7, CSR_MHPMEVENT7, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent8, CSR_MHPMEVENT8, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent9, CSR_MHPMEVENT9, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent10, CSR_MHPMEVENT10, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent11, CSR_MHPMEVENT11, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent12, CSR_MHPMEVENT12, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent13, CSR_MHPMEVENT13, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent14, CSR_MHPMEVENT14, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent15, CSR_MHPMEVENT15, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent16, CSR_MHPMEVENT16, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent17, CSR_MHPMEVENT17, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent18, CSR_MHPMEVENT18, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent19, CSR_MHPMEVENT19, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent20, CSR_MHPMEVENT20, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent21, CSR_MHPMEVENT21, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent22, CSR_MHPMEVENT22, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent23, CSR_MHPMEVENT23, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent24, CSR_MHPMEVENT24, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent25, CSR_MHPMEVENT25, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent26, CSR_MHPMEVENT26, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent27, CSR_MHPMEVENT27, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent28, CSR_MHPMEVENT28, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent29, CSR_MHPMEVENT29, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent30, CSR_MHPMEVENT30, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
+DECLARE_CSR(mhpmevent31, CSR_MHPMEVENT31, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_DRAFT)
 /* Privileged Hypervisor CSRs.  */
 DECLARE_CSR(hstatus, CSR_HSTATUS, CSR_CLASS_H, PRIV_SPEC_CLASS_NONE, PRIV_SPEC_CLASS_NONE)
 DECLARE_CSR(hedeleg, CSR_HEDELEG, CSR_CLASS_H, PRIV_SPEC_CLASS_NONE, PRIV_SPEC_CLASS_NONE)
@@ -4490,22 +4484,16 @@  DECLARE_CSR(stimecmph, CSR_STIMECMPH, CSR_CLASS_SSTC_32, PRIV_SPEC_CLASS_NONE, P
 DECLARE_CSR(vstimecmp, CSR_VSTIMECMP, CSR_CLASS_SSTC_AND_H, PRIV_SPEC_CLASS_NONE, PRIV_SPEC_CLASS_NONE)
 DECLARE_CSR(vstimecmph, CSR_VSTIMECMPH, CSR_CLASS_SSTC_AND_H_32, PRIV_SPEC_CLASS_NONE, PRIV_SPEC_CLASS_NONE)
 /* Dropped CSRs.  */
-DECLARE_CSR(mbase, CSR_MBASE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P10)
-DECLARE_CSR(mbound, CSR_MBOUND, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P10)
-DECLARE_CSR(mibase, CSR_MIBASE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P10)
-DECLARE_CSR(mibound, CSR_MIBOUND, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P10)
-DECLARE_CSR(mdbase, CSR_MDBASE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P10)
-DECLARE_CSR(mdbound, CSR_MDBOUND, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P10)
-DECLARE_CSR(ustatus, CSR_USTATUS, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P12)
-DECLARE_CSR(uie, CSR_UIE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P12)
-DECLARE_CSR(utvec, CSR_UTVEC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P12)
-DECLARE_CSR(uscratch, CSR_USCRATCH, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P12)
-DECLARE_CSR(uepc, CSR_UEPC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P12)
-DECLARE_CSR(ucause, CSR_UCAUSE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P12)
+DECLARE_CSR(ustatus, CSR_USTATUS, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_1P12)
+DECLARE_CSR(uie, CSR_UIE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_1P12)
+DECLARE_CSR(utvec, CSR_UTVEC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_1P12)
+DECLARE_CSR(uscratch, CSR_USCRATCH, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_1P12)
+DECLARE_CSR(uepc, CSR_UEPC, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_1P12)
+DECLARE_CSR(ucause, CSR_UCAUSE, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_1P12)
 DECLARE_CSR(utval, CSR_UTVAL, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_1P12)
-DECLARE_CSR(uip, CSR_UIP, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P12)
-DECLARE_CSR(sedeleg, CSR_SEDELEG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P12)
-DECLARE_CSR(sideleg, CSR_SIDELEG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P12)
+DECLARE_CSR(uip, CSR_UIP, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_1P12)
+DECLARE_CSR(sedeleg, CSR_SEDELEG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_1P12)
+DECLARE_CSR(sideleg, CSR_SIDELEG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P10, PRIV_SPEC_CLASS_1P12)
 /* Unprivileged Floating-Point CSRs.  */
 DECLARE_CSR(fflags, CSR_FFLAGS, CSR_CLASS_F, PRIV_SPEC_CLASS_NONE, PRIV_SPEC_CLASS_NONE)
 DECLARE_CSR(frm, CSR_FRM, CSR_CLASS_F, PRIV_SPEC_CLASS_NONE, PRIV_SPEC_CLASS_NONE)
@@ -4537,13 +4525,6 @@  DECLARE_CSR(vtype, CSR_VTYPE, CSR_CLASS_V, PRIV_SPEC_CLASS_NONE, PRIV_SPEC_CLASS
 DECLARE_CSR(vlenb, CSR_VLENB, CSR_CLASS_V, PRIV_SPEC_CLASS_NONE, PRIV_SPEC_CLASS_NONE)
 #endif /* DECLARE_CSR */
 #ifdef DECLARE_CSR_ALIAS
-DECLARE_CSR_ALIAS(ubadaddr, CSR_UTVAL, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P10)
-DECLARE_CSR_ALIAS(sbadaddr, CSR_STVAL, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P10)
-DECLARE_CSR_ALIAS(sptbr, CSR_SATP, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P10)
-DECLARE_CSR_ALIAS(mbadaddr, CSR_MTVAL, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P10)
-DECLARE_CSR_ALIAS(mucounteren, CSR_MCOUNTINHIBIT, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P10)
-DECLARE_CSR_ALIAS(mscounteren, CSR_MCYCLECFG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P10)
-DECLARE_CSR_ALIAS(mhcounteren, CSR_MINSTRETCFG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_1P10)
 DECLARE_CSR_ALIAS(dscratch, CSR_DSCRATCH0, CSR_CLASS_DEBUG, PRIV_SPEC_CLASS_NONE, PRIV_SPEC_CLASS_NONE)
 DECLARE_CSR_ALIAS(mcontrol, CSR_TDATA1, CSR_CLASS_DEBUG, PRIV_SPEC_CLASS_NONE, PRIV_SPEC_CLASS_NONE)
 DECLARE_CSR_ALIAS(mcontrol6, CSR_TDATA1, CSR_CLASS_DEBUG, PRIV_SPEC_CLASS_NONE, PRIV_SPEC_CLASS_NONE)
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-01.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-01.d
index 0aa6fe0701b..122161d7025 100644
--- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-01.d
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-01.d
@@ -8,5 +8,4 @@  Attribute Section: riscv
 File Attributes
   Tag_RISCV_arch: [a-zA-Z0-9_\"].*
   Tag_RISCV_priv_spec: 1
-  Tag_RISCV_priv_spec_minor: 9
-  Tag_RISCV_priv_spec_revision: 1
+  Tag_RISCV_priv_spec_minor: 10
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-02.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-02.d
index 0ac4ca7c045..f13010c9d41 100644
--- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-02.d
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-02.d
@@ -8,5 +8,4 @@  Attribute Section: riscv
 File Attributes
   Tag_RISCV_arch: [a-zA-Z0-9_\"].*
   Tag_RISCV_priv_spec: 1
-  Tag_RISCV_priv_spec_minor: 9
-  Tag_RISCV_priv_spec_revision: 1
+  Tag_RISCV_priv_spec_minor: 10
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-03.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-03.d
index 69504839d72..ca004c8c107 100644
--- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-03.d
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-03.d
@@ -8,5 +8,4 @@  Attribute Section: riscv
 File Attributes
   Tag_RISCV_arch: [a-zA-Z0-9_\"].*
   Tag_RISCV_priv_spec: 1
-  Tag_RISCV_priv_spec_minor: 9
-  Tag_RISCV_priv_spec_revision: 1
+  Tag_RISCV_priv_spec_minor: 10
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-a.s b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-a.s
index 0b7ffea1fc2..12df9fffd87 100644
--- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-a.s
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-a.s
@@ -1,3 +1,2 @@ 
 	.attribute priv_spec, 1
-	.attribute priv_spec_minor, 9
-	.attribute priv_spec_revision, 1
+	.attribute priv_spec_minor, 10
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-b.s b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-b.s
index 0b7ffea1fc2..12df9fffd87 100644
--- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-b.s
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-b.s
@@ -1,3 +1,2 @@ 
 	.attribute priv_spec, 1
-	.attribute priv_spec_minor, 9
-	.attribute priv_spec_revision, 1
+	.attribute priv_spec_minor, 10
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d
index 3509caeed58..7f987070ea0 100644
--- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d
@@ -2,8 +2,7 @@ 
 #source: attr-merge-priv-spec-c.s
 #as:
 #ld: -r
-#warning: .*use privileged spec version 1.11.0 but the output use version 1.9.1
-#warning: .*privileged spec version 1.9.1 can not be linked with other spec versions
+#warning: .*use privileged spec version 1.11.0 but the output use version 1.10.0
 #readelf: -A
 
 Attribute Section: riscv
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d
index 88defe1dced..f86ef10b6bc 100644
--- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d
@@ -2,8 +2,7 @@ 
 #source: attr-merge-priv-spec-a.s
 #as:
 #ld: -r
-#warning: .*use privileged spec version 1.9.1 but the output use version 1.11.0
-#warning: .*privileged spec version 1.9.1 can not be linked with other spec versions
+#warning: .*use privileged spec version 1.10.0 but the output use version 1.11.0
 #readelf: -A
 
 Attribute Section: riscv
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d
index 7a1b977bbcf..cfbb23328a6 100644
--- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d
@@ -3,8 +3,7 @@ 
 #source: attr-merge-priv-spec-c.s
 #as:
 #ld: -r
-#warning: .*use privileged spec version 1.11.0 but the output use version 1.9.1
-#warning: .*privileged spec version 1.9.1 can not be linked with other spec versions
+#warning: .*use privileged spec version 1.11.0 but the output use version 1.10.0
 #readelf: -A
 
 Attribute Section: riscv
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d
index 37b8afcff6f..4332597daa4 100644
--- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d
@@ -3,8 +3,7 @@ 
 #source: attr-merge-priv-spec-c.s
 #as:
 #ld: -r
-#warning: .*use privileged spec version 1.11.0 but the output use version 1.9.1
-#warning: .*privileged spec version 1.9.1 can not be linked with other spec versions
+#warning: .*use privileged spec version 1.11.0 but the output use version 1.10.0
 #readelf: -A
 
 Attribute Section: riscv
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d
index 30446c9dd3e..bb6573df51f 100644
--- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d
@@ -3,8 +3,7 @@ 
 #source: attr-merge-priv-spec-a.s
 #as:
 #ld: -r
-#warning: .*use privileged spec version 1.9.1 but the output use version 1.11.0
-#warning: .*privileged spec version 1.9.1 can not be linked with other spec versions
+#warning: .*use privileged spec version 1.10.0 but the output use version 1.11.0
 #readelf: -A
 
 Attribute Section: riscv
diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d
index 8c7624c8daa..9d97ff99a7b 100644
--- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d
+++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d
@@ -3,8 +3,7 @@ 
 #source: attr-merge-priv-spec-a.s
 #as:
 #ld: -r
-#warning: .*use privileged spec version 1.9.1 but the output use version 1.11.0
-#warning: .*privileged spec version 1.9.1 can not be linked with other spec versions
+#warning: .*use privileged spec version 1.10.0 but the output use version 1.11.0
 #readelf: -A
 
 Attribute Section: riscv