RISC-V: Remove the Scalar Bitmanip and Crypto Built-In function testsuites

The serials patch provides a mapping from the RV intrinsics to the builtin names.
There are some duplicates testsuites between intrinsic and built-in function.
Remove the Scalar Bitmanip and Scalar Crypto Built-In function testsuites
that will be included in the intrinsic functions.

gcc/testsuite/ChangeLog:

	* gcc.target/riscv/zbb_32_bswap-2.c: Moved to...
	* gcc.target/riscv/zbb_bswap16.c: ...here.
	* gcc.target/riscv/zbkb32.c: Remove __builtin_riscv_(un)zip and
	zip,__builtin_riscv_brev8.
	* gcc.target/riscv/zbkb64.c: Remove __builtin_riscv_brev8.
	* gcc.target/riscv/zbb_32_bswap-1.c: Removed.
	* gcc.target/riscv/zbb_bswap-1.c: Removed.
	* gcc.target/riscv/zbb_bswap-2.c: Removed.
	* gcc.target/riscv/zbbw.c: Removed.
	* gcc.target/riscv/zbc32.c: Removed.
	* gcc.target/riscv/zbc64.c: Removed.
	* gcc.target/riscv/zbkc32.c: Removed.
	* gcc.target/riscv/zbkc64.c: Removed.
	* gcc.target/riscv/zbkx32.c: Removed.
	* gcc.target/riscv/zbkx64.c: Removed.
	* gcc.target/riscv/zknd32-2.c: Removed.
	* gcc.target/riscv/zknd64-2.c: Removed.
	* gcc.target/riscv/zkne32-2.c: Removed.
	* gcc.target/riscv/zkne64-2.c: Removed.
	* gcc.target/riscv/zknh-sha256-32.c: Removed.
	* gcc.target/riscv/zknh-sha256-64.c: Removed.
	* gcc.target/riscv/zknh-sha512-32.c: Removed.
	* gcc.target/riscv/zknh-sha512-64.c: Removed.
	* gcc.target/riscv/zksed32-2.c: Removed.
	* gcc.target/riscv/zksed64-2.c: Removed.
	* gcc.target/riscv/zksh32.c: Removed.
	* gcc.target/riscv/zksh64.c: Removed.

25 files changed, 2 insertions, 539 deletions

diff --git a/gcc/testsuite/gcc.target/riscv/zbb_32_bswap-1.c b/gcc/testsuite/gcc.target/riscv/zbb_32_bswap-1.c
deleted file mode 100644
index 789dda1..0000000
--- a/gcc/testsuite/gcc.target/riscv/zbb_32_bswap-1.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-march=rv32gc_zbb -mabi=ilp32" } */
-/* { dg-skip-if "" { *-*-* } { "-O0" } } */
-
-int foo(int n)
-{
-  return __builtin_bswap32(n);
-}
-
-/* { dg-final { scan-assembler {\mrev8} } } */
-
diff --git a/gcc/testsuite/gcc.target/riscv/zbb_bswap-1.c b/gcc/testsuite/gcc.target/riscv/zbb_bswap-1.c
deleted file mode 100644
index 158d97b..0000000
--- a/gcc/testsuite/gcc.target/riscv/zbb_bswap-1.c
+++ /dev/null
@@ -1,11 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zbb -mabi=lp64" } */
-/* { dg-skip-if "" { *-*-* } { "-O0" } } */
-
-int foo(int n)
-{
-  return __builtin_bswap32(n);
-}
-
-/* { dg-final { scan-assembler {\mrev8} } } */
-
diff --git a/gcc/testsuite/gcc.target/riscv/zbb_bswap-2.c b/gcc/testsuite/gcc.target/riscv/zbb_bswap-2.c
deleted file mode 100644
index cb81f98..0000000
--- a/gcc/testsuite/gcc.target/riscv/zbb_bswap-2.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zbb -mabi=lp64" } */
-/* { dg-skip-if "" { *-*-* } { "-O0" } } */
-
-int foo(int n)
-{
-  return __builtin_bswap16(n);
-}
-
-/* { dg-final { scan-assembler {\mrev8} } } */
-/* { dg-final { scan-assembler {\msrli} } } */
-
diff --git a/gcc/testsuite/gcc.target/riscv/zbb_32_bswap-2.c b/gcc/testsuite/gcc.target/riscv/zbb_bswap16.c
index 3b8462d..d123e64 100644
--- a/gcc/testsuite/gcc.target/riscv/zbb_32_bswap-2.c
+++ b/gcc/testsuite/gcc.target/riscv/zbb_bswap16.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
-/* { dg-options "-march=rv32gc_zbb -mabi=ilp32" } */
+/* { dg-options "-march=rv64gc_zbb -mabi=lp64d"  { target { rv64 } } } */
+/* { dg-options "-march=rv32gc_zbb -mabi=ilp32d" { target { rv32 } } } */
 /* { dg-skip-if "" { *-*-* } { "-O0" } } */
 
 int foo(int n)
diff --git a/gcc/testsuite/gcc.target/riscv/zbbw.c b/gcc/testsuite/gcc.target/riscv/zbbw.c
deleted file mode 100644
index bdf6b0c..0000000
--- a/gcc/testsuite/gcc.target/riscv/zbbw.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-march=rv64gc_zbb -mabi=lp64" } */
-
-int
-clz (int i)
-{
-  return __builtin_clz (i);
-}
-
-int
-ctz (int i)
-{
-  return __builtin_ctz (i);
-}
-
-int
-popcount (int i)
-{
-  return __builtin_popcount (i);
-}
-
-
-/* { dg-final { scan-assembler-times {\mclzw} 1 } } */
-/* { dg-final { scan-assembler-times {\mctzw} 1 } } */
-/* { dg-final { scan-assembler-times {\mcpopw} 1 } } */
-/* { dg-final { scan-assembler-not "andi\t" } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbc32.c b/gcc/testsuite/gcc.target/riscv/zbc32.c
deleted file mode 100644
index 049ea95..0000000
--- a/gcc/testsuite/gcc.target/riscv/zbc32.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv32gc_zbc -mabi=ilp32" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-#include <stdint-gcc.h>
-
-uint32_t foo1(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_clmul(rs1, rs2);
-}
-
-uint32_t foo2(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_clmulh(rs1, rs2);
-}
-
-uint32_t foo3(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_clmulr(rs1, rs2);
-}
-
-/* { dg-final { scan-assembler-times "clmul\t" 1 } } */
-/* { dg-final { scan-assembler-times {\mclmulh} 1 } } */
-/* { dg-final { scan-assembler-times {\mclmulr} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbc64.c b/gcc/testsuite/gcc.target/riscv/zbc64.c
deleted file mode 100644
index 69dadd1..0000000
--- a/gcc/testsuite/gcc.target/riscv/zbc64.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv64gc_zbc -mabi=lp64" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-#include <stdint-gcc.h>
-
-uint64_t foo1(uint64_t rs1, uint64_t rs2)
-{
-    return __builtin_riscv_clmul(rs1, rs2);
-}
-
-uint64_t foo2(uint64_t rs1, uint64_t rs2)
-{
-    return __builtin_riscv_clmulh(rs1, rs2);
-}
-
-uint64_t foo3(uint64_t rs1, uint64_t rs2)
-{
-    return __builtin_riscv_clmulr(rs1, rs2);
-}
-
-/* { dg-final { scan-assembler-times "clmul\t" 1 } } */
-/* { dg-final { scan-assembler-times {\mclmulh} 1 } } */
-/* { dg-final { scan-assembler-times {\mclmulr} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbkb32.c b/gcc/testsuite/gcc.target/riscv/zbkb32.c
index 841f5e0..8f6afd1 100644
--- a/gcc/testsuite/gcc.target/riscv/zbkb32.c
+++ b/gcc/testsuite/gcc.target/riscv/zbkb32.c
@@ -14,23 +14,5 @@ uint32_t foo2(uint8_t rs1, uint8_t rs2)
     return __builtin_riscv_packh(rs1, rs2);
 }
 
-uint32_t foo3(uint32_t rs1)
-{
-    return __builtin_riscv_brev8(rs1);
-}
-
-uint32_t foo4(uint32_t rs1)
-{
-    return __builtin_riscv_zip(rs1);
-}
-
-uint32_t foo5(uint32_t rs1)
-{
-    return __builtin_riscv_unzip(rs1);
-}
-
 /* { dg-final { scan-assembler-times "pack\t" 1 } } */
 /* { dg-final { scan-assembler-times {\mpackh} 1 } } */
-/* { dg-final { scan-assembler-times {\mbrev8} 1 } } */
-/* { dg-final { scan-assembler-times "\tzip\t" 1 } } */
-/* { dg-final { scan-assembler-times {\munzip} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbkb64.c b/gcc/testsuite/gcc.target/riscv/zbkb64.c
index 8b6a0bf..492151e 100644
--- a/gcc/testsuite/gcc.target/riscv/zbkb64.c
+++ b/gcc/testsuite/gcc.target/riscv/zbkb64.c
@@ -18,11 +18,6 @@ uint64_t foo3(uint16_t rs1, uint16_t rs2)
     return __builtin_riscv_packw(rs1, rs2);
 }
 
-uint64_t foo4(uint64_t rs1, uint64_t rs2)
-{
-    return __builtin_riscv_brev8(rs1);
-}
 /* { dg-final { scan-assembler-times "pack\t" 1 } } */
 /* { dg-final { scan-assembler-times {\mpackh} 1 } } */
 /* { dg-final { scan-assembler-times {\mpackw} 1 } } */
-/* { dg-final { scan-assembler-times {\mbrev8} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbkc32.c b/gcc/testsuite/gcc.target/riscv/zbkc32.c
deleted file mode 100644
index 6d2a8ff..0000000
--- a/gcc/testsuite/gcc.target/riscv/zbkc32.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv32gc_zbkc -mabi=ilp32" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-#include <stdint-gcc.h>
-
-uint32_t foo1(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_clmul(rs1, rs2);
-}
-
-uint32_t foo2(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_clmulh(rs1, rs2);
-}
-
-/* { dg-final { scan-assembler-times "clmul\t" 1 } } */
-/* { dg-final { scan-assembler-times {\mclmulh} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbkc64.c b/gcc/testsuite/gcc.target/riscv/zbkc64.c
deleted file mode 100644
index 3708fb5..0000000
--- a/gcc/testsuite/gcc.target/riscv/zbkc64.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv64gc_zbkc -mabi=lp64" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-#include <stdint-gcc.h>
-
-uint64_t foo1(uint64_t rs1, uint64_t rs2)
-{
-    return __builtin_riscv_clmul(rs1, rs2);
-}
-
-uint64_t foo2(uint64_t rs1, uint64_t rs2)
-{
-    return __builtin_riscv_clmulh(rs1, rs2);
-}
-
-/* { dg-final { scan-assembler-times "clmul\t" 1 } } */
-/* { dg-final { scan-assembler-times {\mclmulh} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbkx32.c b/gcc/testsuite/gcc.target/riscv/zbkx32.c
deleted file mode 100644
index b41fd90..0000000
--- a/gcc/testsuite/gcc.target/riscv/zbkx32.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv32gc_zbkx -mabi=ilp32" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-
-#include <stdint-gcc.h>
-
-uint32_t foo3(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_xperm8(rs1, rs2);
-}
-
-uint32_t foo4(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_xperm4(rs1, rs2);
-}
-
-/* { dg-final { scan-assembler-times {\mxperm8} 1 } } */
-/* { dg-final { scan-assembler-times {\mxperm4} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zbkx64.c b/gcc/testsuite/gcc.target/riscv/zbkx64.c
deleted file mode 100644
index 9ed42b4..0000000
--- a/gcc/testsuite/gcc.target/riscv/zbkx64.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv64gc_zbkx -mabi=lp64" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-
-#include <stdint-gcc.h>
-
-uint64_t foo1(uint64_t rs1, uint64_t rs2)
-{
-    return __builtin_riscv_xperm8(rs1, rs2);
-}
-
-uint64_t foo2(uint64_t rs1, uint64_t rs2)
-{
-    return __builtin_riscv_xperm4(rs1, rs2);
-}
-
-/* { dg-final { scan-assembler-times {\mxperm8} 1 } } */
-/* { dg-final { scan-assembler-times {\mxperm4} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zknd32-2.c b/gcc/testsuite/gcc.target/riscv/zknd32-2.c
deleted file mode 100644
index f3549e7..0000000
--- a/gcc/testsuite/gcc.target/riscv/zknd32-2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv32gc_zknd -mabi=ilp32d" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-
-#include <stdint-gcc.h>
-
-uint32_t foo1(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_aes32dsi(rs1,rs2,0);
-}
-
-uint32_t foo2(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_aes32dsmi(rs1,rs2,0);
-}
-
-uint32_t foo3(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_aes32dsi(rs1,rs2,3);
-}
-
-uint32_t foo4(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_aes32dsmi(rs1,rs2,3);
-}
-
-/* { dg-final { scan-assembler-times "aes32dsi" 2 } } */
-/* { dg-final { scan-assembler-times "aes32dsmi" 2 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zknd64-2.c b/gcc/testsuite/gcc.target/riscv/zknd64-2.c
deleted file mode 100644
index cd0e79d..0000000
--- a/gcc/testsuite/gcc.target/riscv/zknd64-2.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv64gc_zknd -mabi=lp64" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-
-#include <stdint-gcc.h>
-
-uint64_t foo1(uint64_t rs1, uint64_t rs2)
-{
-    return __builtin_riscv_aes64ds(rs1,rs2);
-}
-
-uint64_t foo2(uint64_t rs1, uint64_t rs2)
-{
-    return __builtin_riscv_aes64dsm(rs1,rs2);
-}
-
-uint64_t foo3(uint64_t rs1, unsigned rnum)
-{
-    return __builtin_riscv_aes64ks1i(rs1,0);
-}
-
-uint64_t foo3a(uint64_t rs1, unsigned rnum)
-{
-    return __builtin_riscv_aes64ks1i(rs1,10);
-}
-
-uint64_t foo4(uint64_t rs1, uint64_t rs2)
-{
-    return __builtin_riscv_aes64ks2(rs1,rs2);
-}
-
-uint64_t foo5(uint64_t rs1)
-{
-    return __builtin_riscv_aes64im(rs1);
-}
-
-/* { dg-final { scan-assembler-times "aes64ds\t" 1 } } */
-/* { dg-final { scan-assembler-times "aes64dsm" 1 } } */
-/* { dg-final { scan-assembler-times "aes64ks1i" 2 } } */
-/* { dg-final { scan-assembler-times "aes64ks2" 1 } } */
-/* { dg-final { scan-assembler-times {\maes64im} 1 } } */
-
diff --git a/gcc/testsuite/gcc.target/riscv/zkne32-2.c b/gcc/testsuite/gcc.target/riscv/zkne32-2.c
deleted file mode 100644
index 4ad1cdc..0000000
--- a/gcc/testsuite/gcc.target/riscv/zkne32-2.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv32gc_zkne -mabi=ilp32d" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-
-#include <stdint-gcc.h>
-
-uint32_t foo1(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_aes32esi(rs1, rs2, 0);
-}
-
-uint32_t foo2(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_aes32esmi(rs1, rs2, 0);
-}
-
-uint32_t foo3(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_aes32esi(rs1, rs2, 3);
-}
-
-uint32_t foo4(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_aes32esmi(rs1, rs2, 3);
-}
-
-/* { dg-final { scan-assembler-times "aes32esi" 2 } } */
-/* { dg-final { scan-assembler-times "aes32esmi" 2 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zkne64-2.c b/gcc/testsuite/gcc.target/riscv/zkne64-2.c
deleted file mode 100644
index 144c394..0000000
--- a/gcc/testsuite/gcc.target/riscv/zkne64-2.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv64gc_zkne -mabi=lp64" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-
-#include <stdint-gcc.h>
-
-uint64_t foo1(uint64_t rs1, uint64_t rs2)
-{
-    return __builtin_riscv_aes64es(rs1,rs2);
-}
-
-uint64_t foo2(uint64_t rs1, uint64_t rs2)
-{
-    return __builtin_riscv_aes64esm(rs1,rs2);
-}
-
-uint64_t foo3(uint64_t rs1, unsigned rnum)
-{
-    return __builtin_riscv_aes64ks1i(rs1,0);
-}
-
-uint64_t foo3a(uint64_t rs1, unsigned rnum)
-{
-    return __builtin_riscv_aes64ks1i(rs1,10);
-}
-uint64_t foo4(uint64_t rs1, uint64_t rs2)
-{
-    return __builtin_riscv_aes64ks2(rs1,rs2);
-}
-
-/* { dg-final { scan-assembler-times "aes64es\t" 1 } } */
-/* { dg-final { scan-assembler-times "aes64esm" 1 } } */
-/* { dg-final { scan-assembler-times "aes64ks1i" 2 } } */
-/* { dg-final { scan-assembler-times "aes64ks2" 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zknh-sha256-32.c b/gcc/testsuite/gcc.target/riscv/zknh-sha256-32.c
deleted file mode 100644
index c51b143..0000000
--- a/gcc/testsuite/gcc.target/riscv/zknh-sha256-32.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv32gc_zknh -mabi=ilp32d" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-
-#include "zknh-sha256-64.c"
-
-/* { 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 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zknh-sha256-64.c b/gcc/testsuite/gcc.target/riscv/zknh-sha256-64.c
deleted file mode 100644
index 2ef3760..0000000
--- a/gcc/testsuite/gcc.target/riscv/zknh-sha256-64.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv64gc_zknh -mabi=lp64" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-
-unsigned int foo1(unsigned int rs1)
-{
-    return __builtin_riscv_sha256sig0(rs1);
-}
-
-unsigned int foo2(unsigned int rs1)
-{
-    return __builtin_riscv_sha256sig1(rs1);
-}
-
-unsigned int foo3(unsigned int rs1)
-{
-    return __builtin_riscv_sha256sum0(rs1);
-}
-
-unsigned int foo4(unsigned int rs1)
-{
-    return __builtin_riscv_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 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zknh-sha512-32.c b/gcc/testsuite/gcc.target/riscv/zknh-sha512-32.c
deleted file mode 100644
index f2bcae3..0000000
--- a/gcc/testsuite/gcc.target/riscv/zknh-sha512-32.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv32gc_zknh -mabi=ilp32" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-
-#include <stdint-gcc.h>
-
-uint32_t foo1(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_sha512sig0h(rs1,rs2);
-}
-
-uint32_t foo2(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_sha512sig0l(rs1,rs2);
-}
-
-uint32_t foo3(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_sha512sig1h(rs1,rs2);
-}
-
-uint32_t foo4(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_sha512sig1l(rs1,rs2);
-}
-
-uint32_t foo5(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_sha512sum0r(rs1,rs2);
-}
-
-uint32_t foo6(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_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 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zknh-sha512-64.c b/gcc/testsuite/gcc.target/riscv/zknh-sha512-64.c
deleted file mode 100644
index 4f24857..0000000
--- a/gcc/testsuite/gcc.target/riscv/zknh-sha512-64.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv64gc_zknh -mabi=lp64" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-
-#include <stdint-gcc.h>
-
-uint64_t foo1(uint64_t rs1)
-{
-    return __builtin_riscv_sha512sig0(rs1);
-}
-
-uint64_t foo2(uint64_t rs1)
-{
-    return __builtin_riscv_sha512sig1(rs1);
-}
-
-uint64_t foo3(uint64_t rs1)
-{
-    return __builtin_riscv_sha512sum0(rs1);
-}
-
-uint64_t foo4(uint64_t rs1)
-{
-    return __builtin_riscv_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 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zksed32-2.c b/gcc/testsuite/gcc.target/riscv/zksed32-2.c
deleted file mode 100644
index cee8cc2..0000000
--- a/gcc/testsuite/gcc.target/riscv/zksed32-2.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv32gc_zksed -mabi=ilp32" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-
-#include <stdint-gcc.h>
-
-uint32_t foo1(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_sm4ks(rs1,rs2,0);
-}
-
-uint32_t foo2(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_sm4ed(rs1,rs2,0);
-}
-
-uint32_t foo3(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_sm4ks(rs1,rs2,3);
-}
-
-uint32_t foo4(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_sm4ed(rs1,rs2,3);
-}
-
-
-/* { dg-final { scan-assembler-times {\msm4ks} 2 } } */
-/* { dg-final { scan-assembler-times {\msm4ed} 2 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zksed64-2.c b/gcc/testsuite/gcc.target/riscv/zksed64-2.c
deleted file mode 100644
index ee20aa1..0000000
--- a/gcc/testsuite/gcc.target/riscv/zksed64-2.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv64gc_zksed -mabi=lp64" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-
-#include <stdint-gcc.h>
-
-uint32_t foo1(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_sm4ks(rs1,rs2,0);
-}
-
-uint32_t foo2(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_sm4ed(rs1,rs2,0);
-}
-
-uint32_t foo3(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_sm4ks(rs1,rs2,3);
-}
-
-uint32_t foo4(uint32_t rs1, uint32_t rs2)
-{
-    return __builtin_riscv_sm4ed(rs1,rs2,3);
-}
-
-
-/* { dg-final { scan-assembler-times {\msm4ks} 2 } } */
-/* { dg-final { scan-assembler-times {\msm4ed} 2 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zksh32.c b/gcc/testsuite/gcc.target/riscv/zksh32.c
deleted file mode 100644
index c182e55..0000000
--- a/gcc/testsuite/gcc.target/riscv/zksh32.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv32gc_zksh -mabi=ilp32" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-
-#include <stdint-gcc.h>
-
-uint32_t foo1(uint32_t rs1)
-{
-    return __builtin_riscv_sm3p0(rs1);
-}
-
-uint32_t foo2(uint32_t rs1)
-{
-    return __builtin_riscv_sm3p1(rs1);
-}
-
-
-/* { dg-final { scan-assembler-times {\msm3p0} 1 } } */
-/* { dg-final { scan-assembler-times {\msm3p1} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/zksh64.c b/gcc/testsuite/gcc.target/riscv/zksh64.c
deleted file mode 100644
index d794b39..0000000
--- a/gcc/testsuite/gcc.target/riscv/zksh64.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -march=rv64gc_zksh -mabi=lp64" } */
-/* { dg-skip-if "" { *-*-* } { "-g" "-flto"} } */
-
-#include <stdint-gcc.h>
-
-uint32_t foo1(uint32_t rs1)
-{
-    return __builtin_riscv_sm3p0(rs1);
-}
-
-uint32_t foo2(uint32_t rs1)
-{
-    return __builtin_riscv_sm3p1(rs1);
-}
-
-
-/* { dg-final { scan-assembler-times {\msm3p0} 1 } } */
-/* { dg-final { scan-assembler-times {\msm3p1} 1 } } */