RISC-V: Tidy smstateen and ssstateen testcases.

gas/
	* testsuite/gas/riscv/march-imply-smstateen.d: Added.
	* testsuite/gas/riscv/smstateen-csr-s.d: Removed.
	* testsuite/gas/riscv/ssstateen-csr.d: Likewise.
	* testsuite/gas/riscv/ssstateen-csr.s: Likewise.

diff --git a/gas/testsuite/gas/riscv/march-imply-smstateen.d b/gas/testsuite/gas/riscv/march-imply-smstateen.d
new file mode 100644 (file)
index 0000000..2db14fd
--- /dev/null
+++ b/gas/testsuite/gas/riscv/march-imply-smstateen.d
@@ -0,0 +1,6 @@
+#as: -march=rv32i_smstateen -march-attr -misa-spec=20191213
+#readelf: -A
+#source: empty.s
+Attribute Section: riscv
+File Attributes
+  Tag_RISCV_arch: "rv32i2p1_zicsr2p0_smstateen1p0_ssstateen1p0"

diff --git a/gas/testsuite/gas/riscv/smstateen-csr-s.d b/gas/testsuite/gas/riscv/smstateen-csr-s.d
deleted file mode 100644 (file)
index 44b6dd6..0000000
--- a/gas/testsuite/gas/riscv/smstateen-csr-s.d
+++ /dev/null
@@ -1,22 +0,0 @@
-#as: -march=rv32ih_smstateen -mcsr-check -mpriv-spec=1.12
-#source: ssstateen-csr.s
-#objdump: -dr
-
-.*:[   ]+file format .*
-
-
-Disassembly of section .text:
-
-0+000 <target>:
-[      ]+[0-9a-f]+:[   ]+10c02573[     ]+csrr[         ]+a0,sstateen0
-[      ]+[0-9a-f]+:[   ]+10d02573[     ]+csrr[         ]+a0,sstateen1
-[      ]+[0-9a-f]+:[   ]+10e02573[     ]+csrr[         ]+a0,sstateen2
-[      ]+[0-9a-f]+:[   ]+10f02573[     ]+csrr[         ]+a0,sstateen3
-[      ]+[0-9a-f]+:[   ]+60c02573[     ]+csrr[         ]+a0,hstateen0
-[      ]+[0-9a-f]+:[   ]+60d02573[     ]+csrr[         ]+a0,hstateen1
-[      ]+[0-9a-f]+:[   ]+60e02573[     ]+csrr[         ]+a0,hstateen2
-[      ]+[0-9a-f]+:[   ]+60f02573[     ]+csrr[         ]+a0,hstateen3
-[      ]+[0-9a-f]+:[   ]+61c02573[     ]+csrr[         ]+a0,hstateen0h
-[      ]+[0-9a-f]+:[   ]+61d02573[     ]+csrr[         ]+a0,hstateen1h
-[      ]+[0-9a-f]+:[   ]+61e02573[     ]+csrr[         ]+a0,hstateen2h
-[      ]+[0-9a-f]+:[   ]+61f02573[     ]+csrr[         ]+a0,hstateen3h

diff --git a/gas/testsuite/gas/riscv/ssstateen-csr.d b/gas/testsuite/gas/riscv/ssstateen-csr.d
deleted file mode 100644 (file)
index 29b286a..0000000
--- a/gas/testsuite/gas/riscv/ssstateen-csr.d
+++ /dev/null
@@ -1,22 +0,0 @@
-#as: -march=rv32ih_ssstateen -mcsr-check -mpriv-spec=1.12
-#source: ssstateen-csr.s
-#objdump: -dr
-
-.*:[   ]+file format .*
-
-
-Disassembly of section .text:
-
-0+000 <target>:
-[      ]+[0-9a-f]+:[   ]+10c02573[     ]+csrr[         ]+a0,sstateen0
-[      ]+[0-9a-f]+:[   ]+10d02573[     ]+csrr[         ]+a0,sstateen1
-[      ]+[0-9a-f]+:[   ]+10e02573[     ]+csrr[         ]+a0,sstateen2
-[      ]+[0-9a-f]+:[   ]+10f02573[     ]+csrr[         ]+a0,sstateen3
-[      ]+[0-9a-f]+:[   ]+60c02573[     ]+csrr[         ]+a0,hstateen0
-[      ]+[0-9a-f]+:[   ]+60d02573[     ]+csrr[         ]+a0,hstateen1
-[      ]+[0-9a-f]+:[   ]+60e02573[     ]+csrr[         ]+a0,hstateen2
-[      ]+[0-9a-f]+:[   ]+60f02573[     ]+csrr[         ]+a0,hstateen3
-[      ]+[0-9a-f]+:[   ]+61c02573[     ]+csrr[         ]+a0,hstateen0h
-[      ]+[0-9a-f]+:[   ]+61d02573[     ]+csrr[         ]+a0,hstateen1h
-[      ]+[0-9a-f]+:[   ]+61e02573[     ]+csrr[         ]+a0,hstateen2h
-[      ]+[0-9a-f]+:[   ]+61f02573[     ]+csrr[         ]+a0,hstateen3h

diff --git a/gas/testsuite/gas/riscv/ssstateen-csr.s b/gas/testsuite/gas/riscv/ssstateen-csr.s
deleted file mode 100644 (file)
index 82707a4..0000000
--- a/gas/testsuite/gas/riscv/ssstateen-csr.s
+++ /dev/null
@@ -1,13 +0,0 @@
-target:
-       csrr    a0, sstateen0
-       csrr    a0, sstateen1
-       csrr    a0, sstateen2
-       csrr    a0, sstateen3
-       csrr    a0, hstateen0
-       csrr    a0, hstateen1
-       csrr    a0, hstateen2
-       csrr    a0, hstateen3
-       csrr    a0, hstateen0h
-       csrr    a0, hstateen1h
-       csrr    a0, hstateen2h
-       csrr    a0, hstateen3h