From: juzhe.zhong@rivai.ai
To: gcc-patches@gcc.gnu.org
Cc: kito.cheng@gmail.com, Ju-Zhe Zhong <juzhe.zhong@rivai.ai>
Subject: [PATCH] RISC-V: Add vwaddu.v C++ API tests
Date: Tue, 7 Feb 2023 14:51:55 +0800 [thread overview]
Message-ID: <20230207065155.49564-1-juzhe.zhong@rivai.ai> (raw)
From: Ju-Zhe Zhong <juzhe.zhong@rivai.ai>
gcc/testsuite/ChangeLog:
* g++.target/riscv/rvv/base/vwaddu_vv-1.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vv-2.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vv-3.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vv_mu-1.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vv_mu-2.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vv_mu-3.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vv_tu-1.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vv_tu-2.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vv_tu-3.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vv_tum-1.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vv_tum-2.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vv_tum-3.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vv_tumu-1.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vv_tumu-2.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vv_tumu-3.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vx-1.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vx-2.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vx-3.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vx_mu-1.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vx_mu-2.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vx_mu-3.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vx_tu-1.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vx_tu-2.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vx_tu-3.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vx_tum-1.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vx_tum-2.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vx_tum-3.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vx_tumu-1.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vx_tumu-2.C: New test.
* g++.target/riscv/rvv/base/vwaddu_vx_tumu-3.C: New test.
---
.../g++.target/riscv/rvv/base/vwaddu_vv-1.C | 216 ++++++++++++++++++
.../g++.target/riscv/rvv/base/vwaddu_vv-2.C | 216 ++++++++++++++++++
.../g++.target/riscv/rvv/base/vwaddu_vv-3.C | 216 ++++++++++++++++++
.../riscv/rvv/base/vwaddu_vv_mu-1.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vv_mu-2.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vv_mu-3.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vv_tu-1.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vv_tu-2.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vv_tu-3.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vv_tum-1.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vv_tum-2.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vv_tum-3.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vv_tumu-1.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vv_tumu-2.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vv_tumu-3.C | 111 +++++++++
.../g++.target/riscv/rvv/base/vwaddu_vx-1.C | 216 ++++++++++++++++++
.../g++.target/riscv/rvv/base/vwaddu_vx-2.C | 216 ++++++++++++++++++
.../g++.target/riscv/rvv/base/vwaddu_vx-3.C | 216 ++++++++++++++++++
.../riscv/rvv/base/vwaddu_vx_mu-1.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vx_mu-2.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vx_mu-3.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vx_tu-1.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vx_tu-2.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vx_tu-3.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vx_tum-1.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vx_tum-2.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vx_tum-3.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vx_tumu-1.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vx_tumu-2.C | 111 +++++++++
.../riscv/rvv/base/vwaddu_vx_tumu-3.C | 111 +++++++++
30 files changed, 3960 insertions(+)
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv-1.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv-2.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv-3.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_mu-1.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_mu-2.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_mu-3.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tu-1.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tu-2.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tu-3.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tum-1.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tum-2.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tum-3.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tumu-1.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tumu-2.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tumu-3.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx-1.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx-2.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx-3.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_mu-1.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_mu-2.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_mu-3.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tu-1.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tu-2.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tu-3.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tum-1.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tum-2.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tum-3.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tumu-1.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tumu-2.C
create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tumu-3.C
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv-1.C
new file mode 100644
index 00000000000..d02b3dc99c9
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv-1.C
@@ -0,0 +1,216 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vv(vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,vl);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv(vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,vl);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv(vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,vl);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv(vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,vl);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv(vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,vl);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv(vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,vl);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv(vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,vl);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv(vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,vl);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv(vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,vl);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv(vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,vl);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv(vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,vl);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv(vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,vl);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv(vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,vl);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv(vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,vl);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv(vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,vl);
+}
+
+
+vuint16mf4_t test___riscv_vwaddu_vv(vbool64_t mask,vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,vl);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv(vbool32_t mask,vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,vl);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv(vbool16_t mask,vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,vl);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv(vbool8_t mask,vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,vl);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv(vbool4_t mask,vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,vl);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv(vbool2_t mask,vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,vl);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv(vbool64_t mask,vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,vl);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv(vbool32_t mask,vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,vl);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv(vbool16_t mask,vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,vl);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv(vbool8_t mask,vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,vl);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv(vbool4_t mask,vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,vl);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv(vbool64_t mask,vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,vl);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv(vbool32_t mask,vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,vl);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv(vbool16_t mask,vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,vl);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv(vbool8_t mask,vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv-2.C
new file mode 100644
index 00000000000..761ee5d7ae1
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv-2.C
@@ -0,0 +1,216 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vv(vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,31);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv(vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,31);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv(vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,31);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv(vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,31);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv(vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,31);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv(vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,31);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv(vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,31);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv(vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,31);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv(vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,31);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv(vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,31);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv(vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,31);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv(vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,31);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv(vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,31);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv(vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,31);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv(vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,31);
+}
+
+
+vuint16mf4_t test___riscv_vwaddu_vv(vbool64_t mask,vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,31);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv(vbool32_t mask,vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,31);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv(vbool16_t mask,vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,31);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv(vbool8_t mask,vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,31);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv(vbool4_t mask,vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,31);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv(vbool2_t mask,vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,31);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv(vbool64_t mask,vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,31);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv(vbool32_t mask,vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,31);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv(vbool16_t mask,vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,31);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv(vbool8_t mask,vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,31);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv(vbool4_t mask,vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,31);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv(vbool64_t mask,vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,31);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv(vbool32_t mask,vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,31);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv(vbool16_t mask,vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,31);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv(vbool8_t mask,vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv-3.C
new file mode 100644
index 00000000000..ce250cad294
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv-3.C
@@ -0,0 +1,216 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vv(vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,32);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv(vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,32);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv(vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,32);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv(vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,32);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv(vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,32);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv(vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,32);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv(vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,32);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv(vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,32);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv(vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,32);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv(vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,32);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv(vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,32);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv(vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,32);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv(vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,32);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv(vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,32);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv(vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(op1,op2,32);
+}
+
+
+vuint16mf4_t test___riscv_vwaddu_vv(vbool64_t mask,vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,32);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv(vbool32_t mask,vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,32);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv(vbool16_t mask,vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,32);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv(vbool8_t mask,vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,32);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv(vbool4_t mask,vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,32);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv(vbool2_t mask,vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,32);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv(vbool64_t mask,vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,32);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv(vbool32_t mask,vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,32);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv(vbool16_t mask,vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,32);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv(vbool8_t mask,vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,32);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv(vbool4_t mask,vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,32);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv(vbool64_t mask,vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,32);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv(vbool32_t mask,vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,32);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv(vbool16_t mask,vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,32);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv(vbool8_t mask,vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv(mask,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_mu-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_mu-1.C
new file mode 100644
index 00000000000..e324e63c2eb
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_mu-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vv_mu(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv_mu(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv_mu(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv_mu(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv_mu(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv_mu(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv_mu(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv_mu(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv_mu(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv_mu(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv_mu(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv_mu(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv_mu(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv_mu(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv_mu(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_mu-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_mu-2.C
new file mode 100644
index 00000000000..1bca86eeb15
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_mu-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vv_mu(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv_mu(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv_mu(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv_mu(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv_mu(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv_mu(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv_mu(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv_mu(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv_mu(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv_mu(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv_mu(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv_mu(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv_mu(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv_mu(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv_mu(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_mu-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_mu-3.C
new file mode 100644
index 00000000000..365bacfe19b
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_mu-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vv_mu(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv_mu(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv_mu(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv_mu(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv_mu(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv_mu(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv_mu(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv_mu(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv_mu(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv_mu(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv_mu(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv_mu(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv_mu(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv_mu(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv_mu(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_mu(mask,merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tu-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tu-1.C
new file mode 100644
index 00000000000..f201e487fcb
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tu-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vv_tu(vuint16mf4_t merge,vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,vl);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv_tu(vuint16mf2_t merge,vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,vl);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv_tu(vuint16m1_t merge,vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,vl);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv_tu(vuint16m2_t merge,vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,vl);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv_tu(vuint16m4_t merge,vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,vl);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv_tu(vuint16m8_t merge,vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,vl);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv_tu(vuint32mf2_t merge,vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,vl);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv_tu(vuint32m1_t merge,vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,vl);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv_tu(vuint32m2_t merge,vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,vl);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv_tu(vuint32m4_t merge,vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,vl);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv_tu(vuint32m8_t merge,vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,vl);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv_tu(vuint64m1_t merge,vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,vl);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv_tu(vuint64m2_t merge,vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,vl);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv_tu(vuint64m4_t merge,vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,vl);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv_tu(vuint64m8_t merge,vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tu-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tu-2.C
new file mode 100644
index 00000000000..74c3769a828
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tu-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vv_tu(vuint16mf4_t merge,vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,31);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv_tu(vuint16mf2_t merge,vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,31);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv_tu(vuint16m1_t merge,vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,31);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv_tu(vuint16m2_t merge,vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,31);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv_tu(vuint16m4_t merge,vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,31);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv_tu(vuint16m8_t merge,vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,31);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv_tu(vuint32mf2_t merge,vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,31);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv_tu(vuint32m1_t merge,vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,31);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv_tu(vuint32m2_t merge,vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,31);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv_tu(vuint32m4_t merge,vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,31);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv_tu(vuint32m8_t merge,vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,31);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv_tu(vuint64m1_t merge,vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,31);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv_tu(vuint64m2_t merge,vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,31);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv_tu(vuint64m4_t merge,vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,31);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv_tu(vuint64m8_t merge,vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tu-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tu-3.C
new file mode 100644
index 00000000000..67278b15781
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tu-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vv_tu(vuint16mf4_t merge,vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,32);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv_tu(vuint16mf2_t merge,vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,32);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv_tu(vuint16m1_t merge,vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,32);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv_tu(vuint16m2_t merge,vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,32);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv_tu(vuint16m4_t merge,vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,32);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv_tu(vuint16m8_t merge,vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,32);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv_tu(vuint32mf2_t merge,vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,32);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv_tu(vuint32m1_t merge,vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,32);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv_tu(vuint32m2_t merge,vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,32);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv_tu(vuint32m4_t merge,vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,32);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv_tu(vuint32m8_t merge,vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,32);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv_tu(vuint64m1_t merge,vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,32);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv_tu(vuint64m2_t merge,vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,32);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv_tu(vuint64m4_t merge,vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,32);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv_tu(vuint64m8_t merge,vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tu(merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tum-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tum-1.C
new file mode 100644
index 00000000000..38985b8bfe8
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tum-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vv_tum(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv_tum(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv_tum(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv_tum(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv_tum(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv_tum(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv_tum(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv_tum(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv_tum(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv_tum(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv_tum(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv_tum(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv_tum(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv_tum(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv_tum(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tum-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tum-2.C
new file mode 100644
index 00000000000..ca6fad08683
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tum-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vv_tum(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv_tum(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv_tum(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv_tum(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv_tum(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv_tum(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv_tum(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv_tum(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv_tum(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv_tum(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv_tum(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv_tum(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv_tum(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv_tum(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv_tum(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tum-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tum-3.C
new file mode 100644
index 00000000000..51525f2c127
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tum-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vv_tum(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv_tum(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv_tum(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv_tum(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv_tum(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv_tum(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv_tum(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv_tum(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv_tum(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv_tum(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv_tum(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv_tum(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv_tum(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv_tum(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv_tum(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tum(mask,merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tumu-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tumu-1.C
new file mode 100644
index 00000000000..66ac7630ede
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tumu-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vv_tumu(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv_tumu(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv_tumu(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv_tumu(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv_tumu(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv_tumu(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv_tumu(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv_tumu(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv_tumu(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv_tumu(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv_tumu(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv_tumu(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv_tumu(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv_tumu(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv_tumu(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tumu-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tumu-2.C
new file mode 100644
index 00000000000..624b0e66364
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tumu-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vv_tumu(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv_tumu(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv_tumu(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv_tumu(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv_tumu(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv_tumu(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv_tumu(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv_tumu(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv_tumu(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv_tumu(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv_tumu(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv_tumu(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv_tumu(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv_tumu(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv_tumu(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tumu-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tumu-3.C
new file mode 100644
index 00000000000..2372bed84cb
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vv_tumu-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vv_tumu(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,vuint8mf8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vv_tumu(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,vuint8mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vv_tumu(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,vuint8mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vv_tumu(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,vuint8m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vv_tumu(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,vuint8m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vv_tumu(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,vuint8m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vv_tumu(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,vuint16mf4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vv_tumu(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,vuint16mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vv_tumu(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,vuint16m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vv_tumu(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,vuint16m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vv_tumu(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,vuint16m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vv_tumu(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,vuint32mf2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vv_tumu(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,vuint32m1_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vv_tumu(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,vuint32m2_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vv_tumu(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,vuint32m4_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vv_tumu(mask,merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*mu\s+vwaddu\.vv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx-1.C
new file mode 100644
index 00000000000..6134dd54fd8
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx-1.C
@@ -0,0 +1,216 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vx(vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,vl);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx(vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,vl);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx(vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,vl);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx(vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,vl);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx(vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,vl);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx(vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,vl);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx(vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,vl);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx(vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,vl);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx(vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,vl);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx(vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,vl);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx(vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,vl);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx(vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,vl);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx(vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,vl);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx(vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,vl);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx(vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,vl);
+}
+
+
+vuint16mf4_t test___riscv_vwaddu_vx(vbool64_t mask,vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,vl);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx(vbool32_t mask,vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,vl);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx(vbool16_t mask,vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,vl);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx(vbool8_t mask,vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,vl);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx(vbool4_t mask,vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,vl);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx(vbool2_t mask,vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,vl);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx(vbool64_t mask,vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,vl);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx(vbool32_t mask,vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,vl);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx(vbool16_t mask,vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,vl);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx(vbool8_t mask,vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,vl);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx(vbool4_t mask,vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,vl);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx(vbool64_t mask,vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,vl);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx(vbool32_t mask,vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,vl);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx(vbool16_t mask,vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,vl);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx(vbool8_t mask,vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx-2.C
new file mode 100644
index 00000000000..80b5f624250
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx-2.C
@@ -0,0 +1,216 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vx(vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,31);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx(vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,31);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx(vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,31);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx(vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,31);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx(vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,31);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx(vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,31);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx(vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,31);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx(vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,31);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx(vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,31);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx(vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,31);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx(vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,31);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx(vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,31);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx(vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,31);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx(vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,31);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx(vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,31);
+}
+
+
+vuint16mf4_t test___riscv_vwaddu_vx(vbool64_t mask,vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,31);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx(vbool32_t mask,vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,31);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx(vbool16_t mask,vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,31);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx(vbool8_t mask,vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,31);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx(vbool4_t mask,vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,31);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx(vbool2_t mask,vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,31);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx(vbool64_t mask,vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,31);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx(vbool32_t mask,vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,31);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx(vbool16_t mask,vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,31);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx(vbool8_t mask,vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,31);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx(vbool4_t mask,vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,31);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx(vbool64_t mask,vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,31);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx(vbool32_t mask,vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,31);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx(vbool16_t mask,vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,31);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx(vbool8_t mask,vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx-3.C
new file mode 100644
index 00000000000..0642838576e
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx-3.C
@@ -0,0 +1,216 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vx(vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,32);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx(vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,32);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx(vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,32);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx(vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,32);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx(vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,32);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx(vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,32);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx(vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,32);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx(vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,32);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx(vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,32);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx(vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,32);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx(vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,32);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx(vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,32);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx(vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,32);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx(vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,32);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx(vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(op1,op2,32);
+}
+
+
+vuint16mf4_t test___riscv_vwaddu_vx(vbool64_t mask,vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,32);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx(vbool32_t mask,vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,32);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx(vbool16_t mask,vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,32);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx(vbool8_t mask,vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,32);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx(vbool4_t mask,vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,32);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx(vbool2_t mask,vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,32);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx(vbool64_t mask,vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,32);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx(vbool32_t mask,vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,32);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx(vbool16_t mask,vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,32);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx(vbool8_t mask,vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,32);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx(vbool4_t mask,vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,32);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx(vbool64_t mask,vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,32);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx(vbool32_t mask,vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,32);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx(vbool16_t mask,vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,32);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx(vbool8_t mask,vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx(mask,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_mu-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_mu-1.C
new file mode 100644
index 00000000000..5634a62daff
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_mu-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vx_mu(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx_mu(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx_mu(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx_mu(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx_mu(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx_mu(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx_mu(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx_mu(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx_mu(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx_mu(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx_mu(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx_mu(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx_mu(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx_mu(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx_mu(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_mu-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_mu-2.C
new file mode 100644
index 00000000000..54682d9e424
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_mu-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vx_mu(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx_mu(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx_mu(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx_mu(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx_mu(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx_mu(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx_mu(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx_mu(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx_mu(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx_mu(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx_mu(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx_mu(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx_mu(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx_mu(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx_mu(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_mu-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_mu-3.C
new file mode 100644
index 00000000000..dbc437e67d1
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_mu-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vx_mu(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx_mu(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx_mu(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx_mu(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx_mu(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx_mu(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx_mu(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx_mu(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx_mu(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx_mu(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx_mu(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx_mu(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx_mu(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx_mu(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx_mu(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_mu(mask,merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tu-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tu-1.C
new file mode 100644
index 00000000000..44fe3c3cee2
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tu-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vx_tu(vuint16mf4_t merge,vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,vl);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx_tu(vuint16mf2_t merge,vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,vl);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx_tu(vuint16m1_t merge,vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,vl);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx_tu(vuint16m2_t merge,vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,vl);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx_tu(vuint16m4_t merge,vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,vl);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx_tu(vuint16m8_t merge,vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,vl);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx_tu(vuint32mf2_t merge,vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,vl);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx_tu(vuint32m1_t merge,vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,vl);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx_tu(vuint32m2_t merge,vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,vl);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx_tu(vuint32m4_t merge,vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,vl);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx_tu(vuint32m8_t merge,vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,vl);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx_tu(vuint64m1_t merge,vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,vl);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx_tu(vuint64m2_t merge,vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,vl);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx_tu(vuint64m4_t merge,vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,vl);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx_tu(vuint64m8_t merge,vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tu-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tu-2.C
new file mode 100644
index 00000000000..9171233156a
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tu-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vx_tu(vuint16mf4_t merge,vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,31);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx_tu(vuint16mf2_t merge,vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,31);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx_tu(vuint16m1_t merge,vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,31);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx_tu(vuint16m2_t merge,vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,31);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx_tu(vuint16m4_t merge,vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,31);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx_tu(vuint16m8_t merge,vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,31);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx_tu(vuint32mf2_t merge,vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,31);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx_tu(vuint32m1_t merge,vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,31);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx_tu(vuint32m2_t merge,vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,31);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx_tu(vuint32m4_t merge,vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,31);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx_tu(vuint32m8_t merge,vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,31);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx_tu(vuint64m1_t merge,vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,31);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx_tu(vuint64m2_t merge,vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,31);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx_tu(vuint64m4_t merge,vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,31);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx_tu(vuint64m8_t merge,vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tu-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tu-3.C
new file mode 100644
index 00000000000..1a7fa17f764
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tu-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vx_tu(vuint16mf4_t merge,vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,32);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx_tu(vuint16mf2_t merge,vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,32);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx_tu(vuint16m1_t merge,vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,32);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx_tu(vuint16m2_t merge,vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,32);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx_tu(vuint16m4_t merge,vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,32);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx_tu(vuint16m8_t merge,vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,32);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx_tu(vuint32mf2_t merge,vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,32);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx_tu(vuint32m1_t merge,vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,32);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx_tu(vuint32m2_t merge,vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,32);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx_tu(vuint32m4_t merge,vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,32);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx_tu(vuint32m8_t merge,vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,32);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx_tu(vuint64m1_t merge,vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,32);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx_tu(vuint64m2_t merge,vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,32);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx_tu(vuint64m4_t merge,vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,32);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx_tu(vuint64m8_t merge,vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tu(merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tum-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tum-1.C
new file mode 100644
index 00000000000..46a71709d10
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tum-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vx_tum(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx_tum(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx_tum(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx_tum(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx_tum(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx_tum(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx_tum(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx_tum(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx_tum(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx_tum(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx_tum(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx_tum(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx_tum(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx_tum(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx_tum(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tum-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tum-2.C
new file mode 100644
index 00000000000..abdb1c9a02b
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tum-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vx_tum(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx_tum(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx_tum(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx_tum(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx_tum(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx_tum(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx_tum(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx_tum(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx_tum(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx_tum(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx_tum(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx_tum(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx_tum(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx_tum(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,31);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx_tum(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tum-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tum-3.C
new file mode 100644
index 00000000000..f0b1c067ea4
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tum-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vx_tum(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx_tum(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx_tum(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx_tum(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx_tum(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx_tum(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx_tum(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx_tum(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx_tum(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx_tum(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx_tum(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx_tum(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx_tum(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx_tum(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,32);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx_tum(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tum(mask,merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tumu-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tumu-1.C
new file mode 100644
index 00000000000..0ca440d9cbb
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tumu-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vx_tumu(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx_tumu(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx_tumu(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx_tumu(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx_tumu(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx_tumu(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx_tumu(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx_tumu(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx_tumu(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx_tumu(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx_tumu(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx_tumu(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx_tumu(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx_tumu(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx_tumu(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tumu-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tumu-2.C
new file mode 100644
index 00000000000..ca6733915a3
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tumu-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vx_tumu(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx_tumu(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx_tumu(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx_tumu(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx_tumu(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx_tumu(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx_tumu(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx_tumu(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx_tumu(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx_tumu(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx_tumu(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx_tumu(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx_tumu(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx_tumu(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,31);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx_tumu(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tumu-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tumu-3.C
new file mode 100644
index 00000000000..6babdb1d7df
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwaddu_vx_tumu-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vuint16mf4_t test___riscv_vwaddu_vx_tumu(vbool64_t mask,vuint16mf4_t merge,vuint8mf8_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint16mf2_t test___riscv_vwaddu_vx_tumu(vbool32_t mask,vuint16mf2_t merge,vuint8mf4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m1_t test___riscv_vwaddu_vx_tumu(vbool16_t mask,vuint16m1_t merge,vuint8mf2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m2_t test___riscv_vwaddu_vx_tumu(vbool8_t mask,vuint16m2_t merge,vuint8m1_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m4_t test___riscv_vwaddu_vx_tumu(vbool4_t mask,vuint16m4_t merge,vuint8m2_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint16m8_t test___riscv_vwaddu_vx_tumu(vbool2_t mask,vuint16m8_t merge,vuint8m4_t op1,uint8_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint32mf2_t test___riscv_vwaddu_vx_tumu(vbool64_t mask,vuint32mf2_t merge,vuint16mf4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m1_t test___riscv_vwaddu_vx_tumu(vbool32_t mask,vuint32m1_t merge,vuint16mf2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m2_t test___riscv_vwaddu_vx_tumu(vbool16_t mask,vuint32m2_t merge,vuint16m1_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m4_t test___riscv_vwaddu_vx_tumu(vbool8_t mask,vuint32m4_t merge,vuint16m2_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint32m8_t test___riscv_vwaddu_vx_tumu(vbool4_t mask,vuint32m8_t merge,vuint16m4_t op1,uint16_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m1_t test___riscv_vwaddu_vx_tumu(vbool64_t mask,vuint64m1_t merge,vuint32mf2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m2_t test___riscv_vwaddu_vx_tumu(vbool32_t mask,vuint64m2_t merge,vuint32m1_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m4_t test___riscv_vwaddu_vx_tumu(vbool16_t mask,vuint64m4_t merge,vuint32m2_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,32);
+}
+
+
+vuint64m8_t test___riscv_vwaddu_vx_tumu(vbool8_t mask,vuint64m8_t merge,vuint32m4_t op1,uint32_t op2,size_t vl)
+{
+ return __riscv_vwaddu_vx_tumu(mask,merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*mu\s+vwaddu\.vx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
--
2.36.1
next reply other threads:[~2023-02-07 6:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-07 6:51 juzhe.zhong [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-07 6:35 [PATCH] RISC-V: Add vwaddu.v C " juzhe.zhong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230207065155.49564-1-juzhe.zhong@rivai.ai \
--to=juzhe.zhong@rivai.ai \
--cc=gcc-patches@gcc.gnu.org \
--cc=kito.cheng@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).