RISC-V: Update Scalar Crypto testcases.

Add opcodes in testcases to make sure every instruction generate
right opcode after disassemble.

gas/ChangeLog:

        * testsuite/gas/riscv/k-ext-64.d: Add opcode detect.
        * testsuite/gas/riscv/k-ext.d: Ditto.
        * testsuite/gas/riscv/zbkb-32.d: Ditto.
        * testsuite/gas/riscv/zbkb-64.d: Ditto.
        * testsuite/gas/riscv/zbkc-32.d: Ditto.
        * testsuite/gas/riscv/zbkc-64.d: Ditto.
        * testsuite/gas/riscv/zbkx-32.d: Ditto.
        * testsuite/gas/riscv/zbkx-64.d: Ditto.
        * testsuite/gas/riscv/zknd-32.d: Ditto.
        * testsuite/gas/riscv/zknd-64.d: Ditto.
        * testsuite/gas/riscv/zkne-32.d: Ditto.
        * testsuite/gas/riscv/zkne-64.d: Ditto.
        * testsuite/gas/riscv/zknh-32.d: Ditto.
        * testsuite/gas/riscv/zknh-64.d: Ditto.
        * testsuite/gas/riscv/zksed-32.d: Ditto.
        * testsuite/gas/riscv/zksed-64.d: Ditto.
        * testsuite/gas/riscv/zksh-32.d: Ditto.
        * testsuite/gas/riscv/zksh-64.d: Ditto.

18 files changed, 144 insertions, 144 deletions

diff --git a/gas/testsuite/gas/riscv/k-ext-64.d b/gas/testsuite/gas/riscv/k-ext-64.d
index 06f4756..3237c95 100644
--- a/gas/testsuite/gas/riscv/k-ext-64.d
+++ b/gas/testsuite/gas/riscv/k-ext-64.d
@@ -8,40 +8,40 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+ror[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+rol[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+rori[ 	]+a0,a1,0x2
-[ 	]+.*:[ 	]+.*[ 	]+rorw[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+rolw[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+roriw[ 	]+a0,a1,0x2
-[ 	]+.*:[ 	]+.*[ 	]+andn[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+orn[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+xnor[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+pack[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+packh[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+packw[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+brev8[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+rev8[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+clmul[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+clmulh[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+xperm4[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+xperm8[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+aes64ds[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+aes64dsm[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+aes64im[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+aes64ks1i[ 	]+a0,a1,0x4
-[ 	]+.*:[ 	]+.*[ 	]+aes64ks2[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+aes64es[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+aes64esm[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+sha256sig0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha256sig1[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha256sum0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha256sum1[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha512sig0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha512sig1[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha512sum0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha512sum1[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sm4ed[ 	]+a0,a1,a2,0x2
-[ 	]+.*:[ 	]+.*[ 	]+sm4ks[ 	]+a0,a1,a2,0x2
-[ 	]+.*:[ 	]+.*[ 	]+sm3p0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sm3p1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+60c5d533[ 	]+ror[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+60c59533[ 	]+rol[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+6025d513[ 	]+rori[ 	]+a0,a1,0x2
+[ 	]+[0-9a-f]+:[ 	]+60c5d53b[ 	]+rorw[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+60c5953b[ 	]+rolw[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+6025d51b[ 	]+roriw[ 	]+a0,a1,0x2
+[ 	]+[0-9a-f]+:[ 	]+40c5f533[ 	]+andn[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+40c5e533[ 	]+orn[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+40c5c533[ 	]+xnor[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+08c5c533[ 	]+pack[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+08c5f533[ 	]+packh[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+08c5c53b[ 	]+packw[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+68755513[ 	]+brev8[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+6b855513[ 	]+rev8[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+0ac59533[ 	]+clmul[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+0ac5b533[ 	]+clmulh[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+28c5a533[ 	]+xperm4[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+28c5c533[ 	]+xperm8[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+3ac58533[ 	]+aes64ds[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+3ec58533[ 	]+aes64dsm[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+30051513[ 	]+aes64im[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+31459513[ 	]+aes64ks1i[ 	]+a0,a1,0x4
+[ 	]+[0-9a-f]+:[ 	]+7ec58533[ 	]+aes64ks2[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+32c58533[ 	]+aes64es[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+36c58533[ 	]+aes64esm[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+10251513[ 	]+sha256sig0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10351513[ 	]+sha256sig1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10051513[ 	]+sha256sum0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10151513[ 	]+sha256sum1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10651513[ 	]+sha512sig0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10751513[ 	]+sha512sig1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10451513[ 	]+sha512sum0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10551513[ 	]+sha512sum1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+b0c58533[ 	]+sm4ed[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+b4c58533[ 	]+sm4ks[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+10851513[ 	]+sm3p0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10951513[ 	]+sm3p1[ 	]+a0,a0
diff --git a/gas/testsuite/gas/riscv/k-ext.d b/gas/testsuite/gas/riscv/k-ext.d
index 3ba65aa..57a720b 100644
--- a/gas/testsuite/gas/riscv/k-ext.d
+++ b/gas/testsuite/gas/riscv/k-ext.d
@@ -8,37 +8,37 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+ror[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+rol[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+rori[ 	]+a0,a1,0x2
-[ 	]+.*:[ 	]+.*[ 	]+andn[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+orn[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+xnor[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+pack[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+packh[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+brev8[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+rev8[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+zip[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+unzip[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+clmul[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+clmulh[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+xperm4[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+xperm8[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+aes32dsi[ 	]+a0,a1,a2,0x2
-[ 	]+.*:[ 	]+.*[ 	]+aes32dsmi[ 	]+a0,a1,a2,0x2
-[ 	]+.*:[ 	]+.*[ 	]+aes32esi[ 	]+a0,a1,a2,0x2
-[ 	]+.*:[ 	]+.*[ 	]+aes32esmi[ 	]+a0,a1,a2,0x2
-[ 	]+.*:[ 	]+.*[ 	]+sha256sig0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha256sig1[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha256sum0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha256sum1[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha512sig0h[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+sha512sig0l[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+sha512sig1h[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+sha512sig1l[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+sha512sum0r[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+sha512sum1r[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+sm4ed[ 	]+a0,a1,a2,0x2
-[ 	]+.*:[ 	]+.*[ 	]+sm4ks[ 	]+a0,a1,a2,0x2
-[ 	]+.*:[ 	]+.*[ 	]+sm3p0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sm3p1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+60c5d533[ 	]+ror[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+60c59533[ 	]+rol[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+6025d513[ 	]+rori[ 	]+a0,a1,0x2
+[ 	]+[0-9a-f]+:[ 	]+40c5f533[ 	]+andn[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+40c5e533[ 	]+orn[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+40c5c533[ 	]+xnor[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+08c5c533[ 	]+pack[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+08c5f533[ 	]+packh[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+68755513[ 	]+brev8[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+69855513[ 	]+rev8[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+08f51513[ 	]+zip[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+08f55513[ 	]+unzip[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+0ac59533[ 	]+clmul[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+0ac5b533[ 	]+clmulh[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+28c5a533[ 	]+xperm4[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+28c5c533[ 	]+xperm8[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+aac58533[ 	]+aes32dsi[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+aec58533[ 	]+aes32dsmi[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+a2c58533[ 	]+aes32esi[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+a6c58533[ 	]+aes32esmi[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+10251513[ 	]+sha256sig0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10351513[ 	]+sha256sig1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10051513[ 	]+sha256sum0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10151513[ 	]+sha256sum1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+5cc58533[ 	]+sha512sig0h[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+54c58533[ 	]+sha512sig0l[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+5ec58533[ 	]+sha512sig1h[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+56c58533[ 	]+sha512sig1l[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+50c58533[ 	]+sha512sum0r[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+52c58533[ 	]+sha512sum1r[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+b0c58533[ 	]+sm4ed[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+b4c58533[ 	]+sm4ks[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+10851513[ 	]+sm3p0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10951513[ 	]+sm3p1[ 	]+a0,a0
diff --git a/gas/testsuite/gas/riscv/zbkb-32.d b/gas/testsuite/gas/riscv/zbkb-32.d
index 75a9259..c2718a0 100644
--- a/gas/testsuite/gas/riscv/zbkb-32.d
+++ b/gas/testsuite/gas/riscv/zbkb-32.d
@@ -8,15 +8,15 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+ror[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+rol[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+rori[ 	]+a0,a1,0x2
-[ 	]+.*:[ 	]+.*[ 	]+andn[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+orn[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+xnor[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+pack[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+packh[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+brev8[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+rev8[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+zip[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+unzip[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+60c5d533[ 	]+ror[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+60c59533[ 	]+rol[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+6025d513[ 	]+rori[ 	]+a0,a1,0x2
+[ 	]+[0-9a-f]+:[ 	]+40c5f533[ 	]+andn[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+40c5e533[ 	]+orn[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+40c5c533[ 	]+xnor[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+08c5c533[ 	]+pack[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+08c5f533[ 	]+packh[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+68755513[ 	]+brev8[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+69855513[ 	]+rev8[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+08f51513[ 	]+zip[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+08f55513[ 	]+unzip[ 	]+a0,a0
diff --git a/gas/testsuite/gas/riscv/zbkb-64.d b/gas/testsuite/gas/riscv/zbkb-64.d
index 2f51db1..9e9c706 100644
--- a/gas/testsuite/gas/riscv/zbkb-64.d
+++ b/gas/testsuite/gas/riscv/zbkb-64.d
@@ -8,17 +8,17 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+ror[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+rol[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+rori[ 	]+a0,a1,0x2
-[ 	]+.*:[ 	]+.*[ 	]+rorw[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+rolw[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+roriw[ 	]+a0,a1,0x2
-[ 	]+.*:[ 	]+.*[ 	]+andn[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+orn[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+xnor[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+pack[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+packh[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+packw[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+brev8[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+rev8[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+60c5d533[ 	]+ror[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+60c59533[ 	]+rol[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+6025d513[ 	]+rori[ 	]+a0,a1,0x2
+[ 	]+[0-9a-f]+:[ 	]+60c5d53b[ 	]+rorw[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+60c5953b[ 	]+rolw[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+6025d51b[ 	]+roriw[ 	]+a0,a1,0x2
+[ 	]+[0-9a-f]+:[ 	]+40c5f533[ 	]+andn[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+40c5e533[ 	]+orn[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+40c5c533[ 	]+xnor[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+08c5c533[ 	]+pack[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+08c5f533[ 	]+packh[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+08c5c53b[ 	]+packw[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+68755513[ 	]+brev8[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+6b855513[ 	]+rev8[ 	]+a0,a0
diff --git a/gas/testsuite/gas/riscv/zbkc-32.d b/gas/testsuite/gas/riscv/zbkc-32.d
index 7052f4b..69d8987 100644
--- a/gas/testsuite/gas/riscv/zbkc-32.d
+++ b/gas/testsuite/gas/riscv/zbkc-32.d
@@ -8,5 +8,5 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+clmul[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+clmulh[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+0ac59533[ 	]+clmul[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+0ac5b533[ 	]+clmulh[ 	]+a0,a1,a2
diff --git a/gas/testsuite/gas/riscv/zbkc-64.d b/gas/testsuite/gas/riscv/zbkc-64.d
index 1620ea9..26cdf70 100644
--- a/gas/testsuite/gas/riscv/zbkc-64.d
+++ b/gas/testsuite/gas/riscv/zbkc-64.d
@@ -8,5 +8,5 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+clmul[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+clmulh[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+0ac59533[ 	]+clmul[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+0ac5b533[ 	]+clmulh[ 	]+a0,a1,a2
diff --git a/gas/testsuite/gas/riscv/zbkx-32.d b/gas/testsuite/gas/riscv/zbkx-32.d
index 3306ab4..b1f7fc0 100644
--- a/gas/testsuite/gas/riscv/zbkx-32.d
+++ b/gas/testsuite/gas/riscv/zbkx-32.d
@@ -8,5 +8,5 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+xperm4[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+xperm8[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+28c5a533[ 	]+xperm4[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+28c5c533[ 	]+xperm8[ 	]+a0,a1,a2
diff --git a/gas/testsuite/gas/riscv/zbkx-64.d b/gas/testsuite/gas/riscv/zbkx-64.d
index 95cca8e..3ab8bf6 100644
--- a/gas/testsuite/gas/riscv/zbkx-64.d
+++ b/gas/testsuite/gas/riscv/zbkx-64.d
@@ -8,5 +8,5 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+xperm4[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+xperm8[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+28c5a533[ 	]+xperm4[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+28c5c533[ 	]+xperm8[ 	]+a0,a1,a2
diff --git a/gas/testsuite/gas/riscv/zknd-32.d b/gas/testsuite/gas/riscv/zknd-32.d
index 4571261..a6995bf 100644
--- a/gas/testsuite/gas/riscv/zknd-32.d
+++ b/gas/testsuite/gas/riscv/zknd-32.d
@@ -8,5 +8,5 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+aes32dsi[ 	]+a0,a1,a2,0x2
-[ 	]+.*:[ 	]+.*[ 	]+aes32dsmi[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+aac58533[ 	]+aes32dsi[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+aec58533[ 	]+aes32dsmi[ 	]+a0,a1,a2,0x2
diff --git a/gas/testsuite/gas/riscv/zknd-64.d b/gas/testsuite/gas/riscv/zknd-64.d
index e12b3ef..ba4c91c 100644
--- a/gas/testsuite/gas/riscv/zknd-64.d
+++ b/gas/testsuite/gas/riscv/zknd-64.d
@@ -8,8 +8,8 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+aes64ds[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+aes64dsm[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+aes64im[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+aes64ks1i[ 	]+a0,a1,0x4
-[ 	]+.*:[ 	]+.*[ 	]+aes64ks2[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+3ac58533[ 	]+aes64ds[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+3ec58533[ 	]+aes64dsm[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+30051513[ 	]+aes64im[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+31459513[ 	]+aes64ks1i[ 	]+a0,a1,0x4
+[ 	]+[0-9a-f]+:[ 	]+7ec58533[ 	]+aes64ks2[ 	]+a0,a1,a2
diff --git a/gas/testsuite/gas/riscv/zkne-32.d b/gas/testsuite/gas/riscv/zkne-32.d
index 2f57359..4950e74 100644
--- a/gas/testsuite/gas/riscv/zkne-32.d
+++ b/gas/testsuite/gas/riscv/zkne-32.d
@@ -8,5 +8,5 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+aes32esi[ 	]+a0,a1,a2,0x2
-[ 	]+.*:[ 	]+.*[ 	]+aes32esmi[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+a2c58533[ 	]+aes32esi[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+a6c58533[ 	]+aes32esmi[ 	]+a0,a1,a2,0x2
diff --git a/gas/testsuite/gas/riscv/zkne-64.d b/gas/testsuite/gas/riscv/zkne-64.d
index 6f6e9c3..31bc084 100644
--- a/gas/testsuite/gas/riscv/zkne-64.d
+++ b/gas/testsuite/gas/riscv/zkne-64.d
@@ -8,7 +8,7 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+aes64es[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+aes64esm[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+aes64ks1i[ 	]+a0,a1,0x4
-[ 	]+.*:[ 	]+.*[ 	]+aes64ks2[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+32c58533[ 	]+aes64es[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+36c58533[ 	]+aes64esm[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+31459513[ 	]+aes64ks1i[ 	]+a0,a1,0x4
+[ 	]+[0-9a-f]+:[ 	]+7ec58533[ 	]+aes64ks2[ 	]+a0,a1,a2
diff --git a/gas/testsuite/gas/riscv/zknh-32.d b/gas/testsuite/gas/riscv/zknh-32.d
index ac4b244..c8ef70d 100644
--- a/gas/testsuite/gas/riscv/zknh-32.d
+++ b/gas/testsuite/gas/riscv/zknh-32.d
@@ -8,13 +8,13 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+sha256sig0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha256sig1[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha256sum0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha256sum1[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha512sig0h[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+sha512sig0l[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+sha512sig1h[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+sha512sig1l[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+sha512sum0r[ 	]+a0,a1,a2
-[ 	]+.*:[ 	]+.*[ 	]+sha512sum1r[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+10251513[ 	]+sha256sig0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10351513[ 	]+sha256sig1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10051513[ 	]+sha256sum0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10151513[ 	]+sha256sum1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+5cc58533[ 	]+sha512sig0h[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+54c58533[ 	]+sha512sig0l[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+5ec58533[ 	]+sha512sig1h[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+56c58533[ 	]+sha512sig1l[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+50c58533[ 	]+sha512sum0r[ 	]+a0,a1,a2
+[ 	]+[0-9a-f]+:[ 	]+52c58533[ 	]+sha512sum1r[ 	]+a0,a1,a2
diff --git a/gas/testsuite/gas/riscv/zknh-64.d b/gas/testsuite/gas/riscv/zknh-64.d
index 890d5d8..b72e31e 100644
--- a/gas/testsuite/gas/riscv/zknh-64.d
+++ b/gas/testsuite/gas/riscv/zknh-64.d
@@ -8,11 +8,11 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+sha256sig0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha256sig1[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha256sum0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha256sum1[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha512sig0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha512sig1[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha512sum0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sha512sum1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10251513[ 	]+sha256sig0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10351513[ 	]+sha256sig1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10051513[ 	]+sha256sum0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10151513[ 	]+sha256sum1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10651513[ 	]+sha512sig0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10751513[ 	]+sha512sig1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10451513[ 	]+sha512sum0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10551513[ 	]+sha512sum1[ 	]+a0,a0
diff --git a/gas/testsuite/gas/riscv/zksed-32.d b/gas/testsuite/gas/riscv/zksed-32.d
index 228130a..3c84c0f 100644
--- a/gas/testsuite/gas/riscv/zksed-32.d
+++ b/gas/testsuite/gas/riscv/zksed-32.d
@@ -8,5 +8,5 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+sm4ed[ 	]+a0,a1,a2,0x2
-[ 	]+.*:[ 	]+.*[ 	]+sm4ks[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+b0c58533[ 	]+sm4ed[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+b4c58533[ 	]+sm4ks[ 	]+a0,a1,a2,0x2
diff --git a/gas/testsuite/gas/riscv/zksed-64.d b/gas/testsuite/gas/riscv/zksed-64.d
index 9a4efdf..29d828a 100644
--- a/gas/testsuite/gas/riscv/zksed-64.d
+++ b/gas/testsuite/gas/riscv/zksed-64.d
@@ -8,5 +8,5 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+sm4ed[ 	]+a0,a1,a2,0x2
-[ 	]+.*:[ 	]+.*[ 	]+sm4ks[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+b0c58533[ 	]+sm4ed[ 	]+a0,a1,a2,0x2
+[ 	]+[0-9a-f]+:[ 	]+b4c58533[ 	]+sm4ks[ 	]+a0,a1,a2,0x2
diff --git a/gas/testsuite/gas/riscv/zksh-32.d b/gas/testsuite/gas/riscv/zksh-32.d
index ab22b3f..14ac63d 100644
--- a/gas/testsuite/gas/riscv/zksh-32.d
+++ b/gas/testsuite/gas/riscv/zksh-32.d
@@ -8,5 +8,5 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+sm3p0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sm3p1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10851513[ 	]+sm3p0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10951513[ 	]+sm3p1[ 	]+a0,a0
diff --git a/gas/testsuite/gas/riscv/zksh-64.d b/gas/testsuite/gas/riscv/zksh-64.d
index 91a3f16..2d13e38 100644
--- a/gas/testsuite/gas/riscv/zksh-64.d
+++ b/gas/testsuite/gas/riscv/zksh-64.d
@@ -8,5 +8,5 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+.*:[ 	]+.*[ 	]+sm3p0[ 	]+a0,a0
-[ 	]+.*:[ 	]+.*[ 	]+sm3p1[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10851513[ 	]+sm3p0[ 	]+a0,a0
+[ 	]+[0-9a-f]+:[ 	]+10951513[ 	]+sm3p1[ 	]+a0,a0