From 85adb21d04edea0c7b0408a9660d5a9a5aca9ae2 Mon Sep 17 00:00:00 2001 From: jiawei Date: Wed, 22 Dec 2021 17:23:02 +0800 Subject: [PATCH] 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. --- gas/testsuite/gas/riscv/k-ext-64.d | 74 +++++++++++++++--------------- gas/testsuite/gas/riscv/k-ext.d | 68 +++++++++++++-------------- gas/testsuite/gas/riscv/zbkb-32.d | 24 +++++----- gas/testsuite/gas/riscv/zbkb-64.d | 28 +++++------ gas/testsuite/gas/riscv/zbkc-32.d | 4 +- gas/testsuite/gas/riscv/zbkc-64.d | 4 +- gas/testsuite/gas/riscv/zbkx-32.d | 4 +- gas/testsuite/gas/riscv/zbkx-64.d | 4 +- gas/testsuite/gas/riscv/zknd-32.d | 4 +- gas/testsuite/gas/riscv/zknd-64.d | 10 ++-- gas/testsuite/gas/riscv/zkne-32.d | 4 +- gas/testsuite/gas/riscv/zkne-64.d | 8 ++-- gas/testsuite/gas/riscv/zknh-32.d | 20 ++++---- gas/testsuite/gas/riscv/zknh-64.d | 16 +++---- gas/testsuite/gas/riscv/zksed-32.d | 4 +- gas/testsuite/gas/riscv/zksed-64.d | 4 +- gas/testsuite/gas/riscv/zksh-32.d | 4 +- gas/testsuite/gas/riscv/zksh-64.d | 4 +- 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 06f47566ac8..3237c95b199 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 : -[ ]+.*:[ ]+.*[ ]+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 3ba65aadc74..57a720b60e3 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 : -[ ]+.*:[ ]+.*[ ]+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 75a9259c5d1..c2718a0965a 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 : -[ ]+.*:[ ]+.*[ ]+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 2f51db19f06..9e9c70638b1 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 : -[ ]+.*:[ ]+.*[ ]+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 7052f4be451..69d89875652 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 : -[ ]+.*:[ ]+.*[ ]+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 1620ea9c8db..26cdf7014c9 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 : -[ ]+.*:[ ]+.*[ ]+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 3306ab42e32..b1f7fc017bf 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 : -[ ]+.*:[ ]+.*[ ]+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 95cca8e9049..3ab8bf69c75 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 : -[ ]+.*:[ ]+.*[ ]+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 4571261e494..a6995bf6f1c 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 : -[ ]+.*:[ ]+.*[ ]+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 e12b3ef204b..ba4c91ceb34 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 : -[ ]+.*:[ ]+.*[ ]+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 2f5735971cc..4950e748800 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 : -[ ]+.*:[ ]+.*[ ]+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 6f6e9c31116..31bc084a807 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 : -[ ]+.*:[ ]+.*[ ]+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 ac4b2447629..c8ef70d67f4 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 : -[ ]+.*:[ ]+.*[ ]+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 890d5d826f3..b72e31e3547 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 : -[ ]+.*:[ ]+.*[ ]+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 228130ae4c1..3c84c0f31ce 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 : -[ ]+.*:[ ]+.*[ ]+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 9a4efdff649..29d828a9009 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 : -[ ]+.*:[ ]+.*[ ]+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 ab22b3f1f4f..14ac63d95e6 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 : -[ ]+.*:[ ]+.*[ ]+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 91a3f16e511..2d13e38dd37 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 : -[ ]+.*:[ ]+.*[ ]+sm3p0[ ]+a0,a0 -[ ]+.*:[ ]+.*[ ]+sm3p1[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+10851513[ ]+sm3p0[ ]+a0,a0 +[ ]+[0-9a-f]+:[ ]+10951513[ ]+sm3p1[ ]+a0,a0 -- 2.30.2