Just one general review comment for this patch: - Add newline at end of this file to prevent "\ No newline at end of file" in the git commit log - I saw you've skip -g and -flto, I guess that because that cause fail since -g or -flto might add few more line to make the scan-assembler-times, I would suggest you add more "characteristic" to your scan pattern then you can drop those skip-if
e.g. Rewrite +/* { dg-final { scan-assembler-times "sm3p0" 1 } } */ into +/* { dg-final { scan-assembler-times "\tsm3p0\t" 1 } } */ Then it should be able to pass with -g and -flto On Wed, Feb 23, 2022 at 5:47 PM <shi...@iscas.ac.cn> wrote: > > From: LiaoShihua <shi...@iscas.ac.cn> > > These testcases use intrinsics . > > gcc/testsuite/ChangeLog: > > * gcc.target/riscv/zbkb32.c: New test. > * gcc.target/riscv/zbkb64.c: New test. > * gcc.target/riscv/zbkc32.c: New test. > * gcc.target/riscv/zbkc64.c: New test. > * gcc.target/riscv/zbkx32.c: New test. > * gcc.target/riscv/zbkx64.c: New test. > * gcc.target/riscv/zknd32.c: New test. > * gcc.target/riscv/zknd64.c: New test. > * gcc.target/riscv/zkne64.c: New test. > * gcc.target/riscv/zknh.c: New test. > * gcc.target/riscv/zknh32.c: New test. > * gcc.target/riscv/zknh64.c: New test. > * gcc.target/riscv/zksed.c: New test. > * gcc.target/riscv/zksh.c: New test. > > --- > gcc/testsuite/gcc.target/riscv/zbkb32.c | 34 +++++++++++++++++++++ > gcc/testsuite/gcc.target/riscv/zbkb64.c | 21 +++++++++++++ > gcc/testsuite/gcc.target/riscv/zbkc32.c | 16 ++++++++++ > gcc/testsuite/gcc.target/riscv/zbkc64.c | 16 ++++++++++ > gcc/testsuite/gcc.target/riscv/zbkx32.c | 16 ++++++++++ > gcc/testsuite/gcc.target/riscv/zbkx64.c | 16 ++++++++++ > gcc/testsuite/gcc.target/riscv/zknd32.c | 18 +++++++++++ > gcc/testsuite/gcc.target/riscv/zknd64.c | 35 ++++++++++++++++++++++ > gcc/testsuite/gcc.target/riscv/zkne64.c | 29 ++++++++++++++++++ > gcc/testsuite/gcc.target/riscv/zknh.c | 28 +++++++++++++++++ > gcc/testsuite/gcc.target/riscv/zknh32.c | 40 +++++++++++++++++++++++++ > gcc/testsuite/gcc.target/riscv/zknh64.c | 29 ++++++++++++++++++ > gcc/testsuite/gcc.target/riscv/zksed.c | 20 +++++++++++++ > gcc/testsuite/gcc.target/riscv/zksh.c | 17 +++++++++++ > 14 files changed, 335 insertions(+) > create mode 100644 gcc/testsuite/gcc.target/riscv/zbkb32.c > create mode 100644 gcc/testsuite/gcc.target/riscv/zbkb64.c > create mode 100644 gcc/testsuite/gcc.target/riscv/zbkc32.c > create mode 100644 gcc/testsuite/gcc.target/riscv/zbkc64.c > create mode 100644 gcc/testsuite/gcc.target/riscv/zbkx32.c > create mode 100644 gcc/testsuite/gcc.target/riscv/zbkx64.c > create mode 100644 gcc/testsuite/gcc.target/riscv/zknd32.c > create mode 100644 gcc/testsuite/gcc.target/riscv/zknd64.c > create mode 100644 gcc/testsuite/gcc.target/riscv/zkne64.c > create mode 100644 gcc/testsuite/gcc.target/riscv/zknh.c > create mode 100644 gcc/testsuite/gcc.target/riscv/zknh32.c > create mode 100644 gcc/testsuite/gcc.target/riscv/zknh64.c > create mode 100644 gcc/testsuite/gcc.target/riscv/zksed.c > create mode 100644 gcc/testsuite/gcc.target/riscv/zksh.c > > diff --git a/gcc/testsuite/gcc.target/riscv/zbkb32.c > b/gcc/testsuite/gcc.target/riscv/zbkb32.c > new file mode 100644 > index 00000000000..5bf588d58b4 > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zbkb32.c > @@ -0,0 +1,34 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -march=rv32gc_zbkb -mabi=ilp32" } */ > +/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ > +#include"riscv_crypto.h" > +int32_t foo1(int32_t rs1, int32_t rs2) > +{ > + return _rv32_ror(rs1,rs2); > +} > + > +int32_t foo2(int32_t rs1, int32_t rs2) > +{ > + return _rv32_rol(rs1,rs2); > +} > + > +int32_t foo3(int32_t rs1) > +{ > + return _rv32_brev8(rs1); > +} > + > +int32_t foo4(int32_t rs1) > +{ > + return _rv32_zip(rs1); > +} > + > +int32_t foo5(int32_t rs1) > +{ > + return _rv32_unzip(rs1); > +} > + > +/* { dg-final { scan-assembler-times "ror" 1 } } */ > +/* { dg-final { scan-assembler-times "rol" 1 } } */ > +/* { dg-final { scan-assembler-times "brev8" 1 } } */ > +/* { dg-final { scan-assembler-times "zip" 2 } } */ > +/* { dg-final { scan-assembler-times "unzip" 1 } } */ > \ No newline at end of file > diff --git a/gcc/testsuite/gcc.target/riscv/zbkb64.c > b/gcc/testsuite/gcc.target/riscv/zbkb64.c > new file mode 100644 > index 00000000000..2cd76a29750 > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zbkb64.c > @@ -0,0 +1,21 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -march=rv64gc_zbkb -mabi=lp64" } */ > +/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ > +#include"riscv_crypto.h" > +int64_t foo1(int64_t rs1, int64_t rs2) > +{ > + return _rv64_ror(rs1,rs2); > +} > + > +int64_t foo2(int64_t rs1, int64_t rs2) > +{ > + return _rv64_rol(rs1,rs2); > +} > + > +int64_t foo3(int64_t rs1, int64_t rs2) > +{ > + return _rv64_brev8(rs1); > +} > +/* { dg-final { scan-assembler-times "ror" 1 } } */ > +/* { dg-final { scan-assembler-times "rol" 1 } } */ > +/* { dg-final { scan-assembler-times "brev8" 1 } } */ > \ No newline at end of file > diff --git a/gcc/testsuite/gcc.target/riscv/zbkc32.c > b/gcc/testsuite/gcc.target/riscv/zbkc32.c > new file mode 100644 > index 00000000000..237085bfc7d > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zbkc32.c > @@ -0,0 +1,16 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -march=rv32gc_zbkc -mabi=ilp32" } */ > +/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ > +#include"riscv_crypto.h" > +int32_t foo1(int32_t rs1, int32_t rs2) > +{ > + return _rv32_clmul(rs1,rs2); > +} > + > +int32_t foo2(int32_t rs1, int32_t rs2) > +{ > + return _rv32_clmulh(rs1,rs2); > +} > + > +/* { dg-final { scan-assembler-times "clmul" 2 } } */ > +/* { dg-final { scan-assembler-times "clmulh" 1 } } */ > \ No newline at end of file > diff --git a/gcc/testsuite/gcc.target/riscv/zbkc64.c > b/gcc/testsuite/gcc.target/riscv/zbkc64.c > new file mode 100644 > index 00000000000..50e39423519 > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zbkc64.c > @@ -0,0 +1,16 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -march=rv64gc_zbkc -mabi=lp64" } */ > +/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ > +#include"riscv_crypto.h" > +int64_t foo1(int64_t rs1, int64_t rs2) > +{ > + return _rv64_clmul(rs1,rs2); > +} > + > +int64_t foo2(int64_t rs1, int64_t rs2) > +{ > + return _rv64_clmulh(rs1,rs2); > +} > + > +/* { dg-final { scan-assembler-times "clmul" 2 } } */ > +/* { dg-final { scan-assembler-times "clmulh" 1 } } */ > \ No newline at end of file > diff --git a/gcc/testsuite/gcc.target/riscv/zbkx32.c > b/gcc/testsuite/gcc.target/riscv/zbkx32.c > new file mode 100644 > index 00000000000..992ae64a11b > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zbkx32.c > @@ -0,0 +1,16 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -march=rv32gc_zbkx -mabi=ilp32" } */ > +/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ > +#include"riscv_crypto.h" > +int32_t foo3(int32_t rs1, int32_t rs2) > +{ > + return _rv32_xperm8(rs1,rs2); > +} > + > +int32_t foo4(int32_t rs1, int32_t rs2) > +{ > + return _rv32_xperm4(rs1,rs2); > +} > + > +/* { dg-final { scan-assembler-times "xperm8" 1 } } */ > +/* { dg-final { scan-assembler-times "xperm4" 1 } } */ > \ No newline at end of file > diff --git a/gcc/testsuite/gcc.target/riscv/zbkx64.c > b/gcc/testsuite/gcc.target/riscv/zbkx64.c > new file mode 100644 > index 00000000000..b8ec89d3c61 > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zbkx64.c > @@ -0,0 +1,16 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -march=rv64gc_zbkx -mabi=lp64" } */ > +/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ > +#include"riscv_crypto.h" > +int64_t foo1(int64_t rs1, int64_t rs2) > +{ > + return _rv64_xperm8(rs1,rs2); > +} > + > +int64_t foo2(int64_t rs1, int64_t rs2) > +{ > + return _rv64_xperm4(rs1,rs2); > +} > + > +/* { dg-final { scan-assembler-times "xperm8" 1 } } */ > +/* { dg-final { scan-assembler-times "xperm4" 1 } } */ > \ No newline at end of file > diff --git a/gcc/testsuite/gcc.target/riscv/zknd32.c > b/gcc/testsuite/gcc.target/riscv/zknd32.c > new file mode 100644 > index 00000000000..c7a109f333b > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zknd32.c > @@ -0,0 +1,18 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -march=rv32gc_zknd -mabi=ilp32" } */ > +/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ > +#include"riscv_crypto.h" > +int32_t foo1(int32_t rs1, int32_t rs2, int bs) > +{ > + bs = 1; > + return _rv32_aes32dsi(rs1,rs2,bs); > +} > + > +int32_t foo2(int32_t rs1, int32_t rs2, int bs) > +{ > + bs = 0; > + return _rv32_aes32dsmi(rs1,rs2,bs); > +} > + > +/* { dg-final { scan-assembler-times "aes32dsi" 1 } } */ > +/* { dg-final { scan-assembler-times "aes32dsmi" 1 } } */ > \ No newline at end of file > diff --git a/gcc/testsuite/gcc.target/riscv/zknd64.c > b/gcc/testsuite/gcc.target/riscv/zknd64.c > new file mode 100644 > index 00000000000..a7f4b20dead > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zknd64.c > @@ -0,0 +1,35 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -march=rv64gc_zknd -mabi=lp64" } */ > +/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ > +#include"riscv_crypto.h" > +int64_t foo1(int64_t rs1, int64_t rs2) > +{ > + return _rv64_aes64ds(rs1,rs2); > +} > + > +int64_t foo2(int64_t rs1, int64_t rs2) > +{ > + return _rv64_aes64dsm(rs1,rs2); > +} > + > +int64_t foo3(int64_t rs1, int rnum) > +{ > + rnum = 8; > + return _rv64_aes64ks1i(rs1,rnum); > +} > + > +int64_t foo4(int64_t rs1, int64_t rs2) > +{ > + return _rv64_aes64ks2(rs1,rs2); > +} > + > +int64_t foo5(int64_t rs1) > +{ > + return _rv64_aes64im(rs1); > +} > + > +/* { dg-final { scan-assembler-times "aes64ds" 2 } } */ > +/* { dg-final { scan-assembler-times "aes64dsm" 1 } } */ > +/* { dg-final { scan-assembler-times "aes64ks1i" 1 } } */ > +/* { dg-final { scan-assembler-times "aes64ks2" 1 } } */ > +/* { dg-final { scan-assembler-times "aes64im" 1 } } */ > \ No newline at end of file > diff --git a/gcc/testsuite/gcc.target/riscv/zkne64.c > b/gcc/testsuite/gcc.target/riscv/zkne64.c > new file mode 100644 > index 00000000000..69dbdcbb3ad > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zkne64.c > @@ -0,0 +1,29 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -march=rv64gc_zkne -mabi=lp64" } */ > +/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ > +#include"riscv_crypto.h" > +int64_t foo1(int64_t rs1, int64_t rs2) > +{ > + return _rv64_aes64es(rs1,rs2); > +} > + > +int64_t foo2(int64_t rs1, int64_t rs2) > +{ > + return _rv64_aes64esm(rs1,rs2); > +} > + > +int64_t foo3(int64_t rs1, int rnum) > +{ > + rnum = 8; > + return _rv64_aes64ks1i(rs1,rnum); > +} > + > +int64_t foo4(int64_t rs1, int64_t rs2) > +{ > + return _rv64_aes64ks2(rs1,rs2); > +} > + > +/* { dg-final { scan-assembler-times "aes64es" 2 } } */ > +/* { dg-final { scan-assembler-times "aes64esm" 1 } } */ > +/* { dg-final { scan-assembler-times "aes64ks1i" 1 } } */ > +/* { dg-final { scan-assembler-times "aes64ks2" 1 } } */ > \ No newline at end of file > diff --git a/gcc/testsuite/gcc.target/riscv/zknh.c > b/gcc/testsuite/gcc.target/riscv/zknh.c > new file mode 100644 > index 00000000000..a2ea0809e63 > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zknh.c > @@ -0,0 +1,28 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -march=rv64gc_zknh -mabi=lp64" } */ > +/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ > +#include"riscv_crypto.h" > +long foo1(long rs1) > +{ > + return _rv_sha256sig0(rs1); > +} > + > +long foo2(long rs1) > +{ > + return _rv_sha256sig1(rs1); > +} > + > +long foo3(long rs1) > +{ > + return _rv_sha256sum0(rs1); > +} > + > +long foo4(long rs1) > +{ > + return _rv_sha256sum1(rs1); > +} > + > +/* { dg-final { scan-assembler-times "sha256sig0" 1 } } */ > +/* { dg-final { scan-assembler-times "sha256sig1" 1 } } */ > +/* { dg-final { scan-assembler-times "sha256sum0" 1 } } */ > +/* { dg-final { scan-assembler-times "sha256sum1" 1 } } */ > \ No newline at end of file > diff --git a/gcc/testsuite/gcc.target/riscv/zknh32.c > b/gcc/testsuite/gcc.target/riscv/zknh32.c > new file mode 100644 > index 00000000000..2ef961c19a3 > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zknh32.c > @@ -0,0 +1,40 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -march=rv32gc_zknh -mabi=ilp32" } */ > +/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ > +#include"riscv_crypto.h" > +int32_t foo1(int32_t rs1, int32_t rs2) > +{ > + return _rv32_sha512sig0h(rs1,rs2); > +} > + > +int32_t foo2(int32_t rs1, int32_t rs2) > +{ > + return _rv32_sha512sig0l(rs1,rs2); > +} > + > +int32_t foo3(int32_t rs1, int32_t rs2) > +{ > + return _rv32_sha512sig1h(rs1,rs2); > +} > + > +int32_t foo4(int32_t rs1, int32_t rs2) > +{ > + return _rv32_sha512sig1l(rs1,rs2); > +} > + > +int32_t foo5(int32_t rs1, int32_t rs2) > +{ > + return _rv32_sha512sum0r(rs1,rs2); > +} > + > +int32_t foo6(int32_t rs1, int32_t rs2) > +{ > + return _rv32_sha512sum1r(rs1,rs2); > +} > + > +/* { dg-final { scan-assembler-times "sha512sig0h" 1 } } */ > +/* { dg-final { scan-assembler-times "sha512sig0l" 1 } } */ > +/* { dg-final { scan-assembler-times "sha512sig1h" 1 } } */ > +/* { dg-final { scan-assembler-times "sha512sig1l" 1 } } */ > +/* { dg-final { scan-assembler-times "sha512sum0r" 1 } } */ > +/* { dg-final { scan-assembler-times "sha512sum1r" 1 } } */ > \ No newline at end of file > diff --git a/gcc/testsuite/gcc.target/riscv/zknh64.c > b/gcc/testsuite/gcc.target/riscv/zknh64.c > new file mode 100644 > index 00000000000..7f1eb76fe5c > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zknh64.c > @@ -0,0 +1,29 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -march=rv64gc_zknh -mabi=lp64" } */ > +/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ > +#include"riscv_crypto.h" > +int64_t foo1(int64_t rs1) > +{ > + return _rv64_sha512sig0(rs1); > +} > + > +int64_t foo2(int64_t rs1) > +{ > + return _rv64_sha512sig1(rs1); > +} > + > +int64_t foo3(int64_t rs1) > +{ > + return _rv64_sha512sum0(rs1); > +} > + > +int64_t foo4(int64_t rs1) > +{ > + return _rv64_sha512sum1(rs1); > +} > + > + > +/* { dg-final { scan-assembler-times "sha512sig0" 1 } } */ > +/* { dg-final { scan-assembler-times "sha512sig1" 1 } } */ > +/* { dg-final { scan-assembler-times "sha512sum0" 1 } } */ > +/* { dg-final { scan-assembler-times "sha512sum1" 1 } } */ > \ No newline at end of file > diff --git a/gcc/testsuite/gcc.target/riscv/zksed.c > b/gcc/testsuite/gcc.target/riscv/zksed.c > new file mode 100644 > index 00000000000..02bf96d56b1 > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zksed.c > @@ -0,0 +1,20 @@ > + > +/* { dg-do compile } */ > +/* { dg-options "-O2 -march=rv64gc_zksed -mabi=lp64" } */ > +/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ > +#include"riscv_crypto.h" > +long foo1(int32_t rs1, int32_t rs2, int bs) > +{ > + bs = 1; > + return _rv_sm4ks(rs1,rs2,bs); > +} > + > +long foo2(int32_t rs1, int32_t rs2, int bs) > +{ > + bs = 2; > + return _rv_sm4ed(rs1,rs2,bs); > +} > + > + > +/* { dg-final { scan-assembler-times "sm4ks" 1 } } */ > +/* { dg-final { scan-assembler-times "sm4ed" 1 } } */ > \ No newline at end of file > diff --git a/gcc/testsuite/gcc.target/riscv/zksh.c > b/gcc/testsuite/gcc.target/riscv/zksh.c > new file mode 100644 > index 00000000000..ec47ed93221 > --- /dev/null > +++ b/gcc/testsuite/gcc.target/riscv/zksh.c > @@ -0,0 +1,17 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -march=rv64gc_zksh -mabi=lp64" } */ > +/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */ > +#include"riscv_crypto.h" > +long foo1(long rs1) > +{ > + return _rv_sm3p0(rs1); > +} > + > +long foo2(long rs1) > +{ > + return _rv_sm3p1(rs1); > +} > + > + > +/* { dg-final { scan-assembler-times "sm3p0" 1 } } */ > +/* { dg-final { scan-assembler-times "sm3p1" 1 } } */ > \ No newline at end of file > -- > 2.31.1.windows.1 >