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.

diff --git a/gas/testsuite/gas/riscv/k-ext-64.d b/gas/testsuite/gas/riscv/k-ext-64.d
index 06f47566ac81ba0b5b92ee029794e921f9652c7a..3237c95b199c7638065d568fd2adb030feafcd2a 100644 (file)
--- 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 3ba65aadc746854f30bff41ba0976545a65fcc51..57a720b60e323aa5bd741d866b880ff97d6d6199 100644 (file)
--- 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 75a9259c5d1d29cdc1892cbe4813c860bc3b8051..c2718a0965a76ca2f9a2a27d295d6894bf6d9025 100644 (file)
--- 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 2f51db19f061a3dafaaee3b0ffd9274d4843eac9..9e9c70638b100e56d7d05177df6253f0c508c1a9 100644 (file)
--- 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 7052f4be451861ba55f7ab0d964db25784bff15e..69d89875652529f13a8992250b261d95f4efa14f 100644 (file)
--- 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 1620ea9c8dbc35d573f579b21209f7fd87aa7dc2..26cdf7014c910857a70b5f50c05361a1a5f3bf65 100644 (file)
--- 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 3306ab42e32de665c32a83d8b41e02f22d110ae0..b1f7fc017bff9a4e07b8c7c8c8c7a3ac333f208b 100644 (file)
--- 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 95cca8e90490621670ba90be7a1f9efd39721ce5..3ab8bf69c75a9f03ef0d29a0a3436d0e691d3e69 100644 (file)
--- 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 4571261e4949df88b6a99ac8c41f438063d86e4f..a6995bf6f1ccc6a49285d3120e6f388433868b58 100644 (file)
--- 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 e12b3ef204bcbec4289f16c92fbc0a4caf7dd8a5..ba4c91ceb34dfe0f2d985cd7568cb818ced5b54f 100644 (file)
--- 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 2f5735971cc3a15611472925031ea48a50d63ee6..4950e7488001ca34b79ac30c2802481dec62bcbb 100644 (file)
--- 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 6f6e9c31116468ad8c87b58027051bc12d0a1e16..31bc084a807936ecb035bcaa4cdaac7f1221c02d 100644 (file)
--- 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 ac4b2447629d5250d1853a668c2cb443d809e6ca..c8ef70d67f41f636f4d344efbdf45b1171d125c4 100644 (file)
--- 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 890d5d826f3ece892dcc5a4b18b3978d1701b852..b72e31e35470c753b06f789af15f42e128e7d1a6 100644 (file)
--- 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 228130ae4c1367a262fbabd7efcdbc29011ed2c6..3c84c0f31ce25fcc761343a03f8154263ded6d0e 100644 (file)
--- 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 9a4efdff649611080f86dde64cb53223403b9070..29d828a9009f0d0120720a95bd55d9138e222a0a 100644 (file)
--- 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 ab22b3f1f4f12f4248b1b1d7cc25d1ce67b92f36..14ac63d95e6e5243fbdef2033b0fc41019153cdb 100644 (file)
--- 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 91a3f16e511c105e8352618b103d3b3ccd98b197..2d13e38dd37d74b01249241afda59b6299f0f980 100644 (file)
--- 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